Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Resource/VisitSchedule.vue

@@ -4,7 +4,8 @@
             <el-form ref="form" label-width="75px">
                 <el-form-item style="width: 340px;" label="团组名称:">
                     <el-select @change="ApprovalJourneyInit" filterable v-model="diid" placeholder="请选择团组名称">
-                        <el-option v-for="(item,index) in groupList" :key="index" :label="item.teamName" :value="item.id"></el-option>
+                        <el-option v-for="(item, index) in groupList" :key="index" :label="item.teamName"
+                            :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -18,31 +19,20 @@
         <div class="VisitSchedule-content">
             <div class="VisitSchedule-content-title">出访行程</div>
             <div class="VisitSchedule-content-info">
-                团组名:{{groupInfo.teamName}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;团组号:{{groupInfo.tourCode}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;出访日期:{{groupInfo.visitStartDate+'~'+groupInfo.visitEndDate}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{groupInfo.visitDays+'天/'+groupInfo.visitPNumber+'人'}}
+                团组名:{{ groupInfo.teamName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;团组号:{{ groupInfo.tourCode }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;出访日期:{{ groupInfo.visitStartDate + '~' + groupInfo.visitEndDate }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ groupInfo.visitDays + '天/' + groupInfo.visitPNumber + '人' }}
             </div>
             <div class="VisitSchedule-content-table">
-                <div v-for="(item,index) in tablearr" :key="index" class="VisitSchedule-content-ul">
-                    <div class="content-ul-title">{{item.date}}</div>
-                    <div v-for="(items,index) in item.chiList" :key="index" class="VisitSchedule-content-li">
+                <div v-for="(item, index) in tablearr" :key="index" class="VisitSchedule-content-ul">
+                    <div class="content-ul-title">{{ item.date }}</div>
+                    <div v-for="(items, index) in item.chiList" :key="index" class="VisitSchedule-content-li">
                         <div class="VisitSchedule-content-time">
-                            <el-time-picker
-                                is-range
-                                format='HH:mm'
-                                value-format='HH:mm'
-                                v-model="items.timeInterval"
-                                :default-value="value1"
-                                range-separator="至"
-                                start-placeholder="开始时间"
-                                end-placeholder="结束时间"
+                            <el-time-picker is-range format='HH:mm' value-format='HH:mm' v-model="items.timeInterval"
+                                :default-value="value1" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
                                 placeholder="选择时间范围">
                             </el-time-picker>
                         </div>
                         <div class="VisitSchedule-content-remark">
-                            <el-input
-                                type="text"
-                                :rows="2"
-                                placeholder="请输入内容"
-                                v-model="items.details">
+                            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="items.details">
                             </el-input>
                         </div>
                     </div>
@@ -53,25 +43,25 @@
 </template>
 <script>
 export default {
-    data () {
+    data() {
         return {
-            diid:'',
-            groupList:[],
-            tablearr:[],
-            userId:'',
+            diid: '',
+            groupList: [],
+            tablearr: [],
+            userId: '',
             value1: ['', ''],
-            textarea:'',
-            ss:[0,0],
-            groupInfo:{},
-            fullscreenLoading:false,
+            textarea: '',
+            ss: [0, 0],
+            groupInfo: {},
+            fullscreenLoading: false,
         }
     },
-    methods:{
+    methods: {
         //报批行程初始化
         ApprovalJourneyInit() {
-            this.groupInfo={};
-            this.tablearr=[];
-            this.fullscreenLoading=true;
+            this.groupInfo = {};
+            this.tablearr = [];
+            this.fullscreenLoading = true;
 
             var url = "/api/Groups/ApprovalJourneyInit"
             var that = this
@@ -81,33 +71,33 @@ export default {
                 headers: {
                     Authorization: 'Bearer '
                 },
-                data:{
-                    diid:that.diid==''?-1:that.diid,
-                    userId:that.userId,
+                data: {
+                    diid: that.diid == '' ? -1 : that.diid,
+                    userId: that.userId,
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    that.groupList=res.data.data.groupList;
-                    if(that.diid==''){
-                        that.diid=that.groupList[0].id;
+                    that.groupList = res.data.data.groupList;
+                    if (that.diid == '') {
+                        that.diid = that.groupList[0].id;
                     }
-                    that.tablearr=res.data.data.content;
-                    for(let i=0;i<that.tablearr.length;i++){
-                        for(let a=0;a<that.tablearr[i].chiList.length;a++){
-                            if(that.tablearr[i].chiList[a].timeInterval.length==1){
-                                that.tablearr[i].chiList[a].timeInterval=that.value1;
+                    that.tablearr = res.data.data.content;
+                    for (let i = 0; i < that.tablearr.length; i++) {
+                        for (let a = 0; a < that.tablearr[i].chiList.length; a++) {
+                            if (that.tablearr[i].chiList[a].timeInterval.length == 1) {
+                                that.tablearr[i].chiList[a].timeInterval = that.value1;
                             }
                         }
                     }
-                    that.groupInfo=res.data.data.groupInfo;
-                    that.fullscreenLoading=false;
-                }else{
+                    that.groupInfo = res.data.data.groupInfo;
+                    that.fullscreenLoading = false;
+                } else {
                     that.$message({
-                        message:res.data.msg,
-                        duration:1000,
-                        type:"error"
+                        message: res.data.msg,
+                        duration: 1000,
+                        type: "error"
                     });
-                    that.fullscreenLoading=false;
+                    that.fullscreenLoading = false;
                 }
             }).catch(function (error) {
                 that.$message.error('请联系信息部！');
@@ -123,9 +113,9 @@ export default {
                 headers: {
                     Authorization: 'Bearer '
                 },
-                data:{
-                    userId:that.userId,
-                    arr:that.tablearr
+                data: {
+                    userId: that.userId,
+                    arr: that.tablearr
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
@@ -134,11 +124,11 @@ export default {
                         type: 'success'
                     });
                     that.ApprovalJourneyInit();
-                }else{
+                } else {
                     that.$message({
-                        message:res.data.msg,
-                        duration:1000,
-                        type:"error"
+                        message: res.data.msg,
+                        duration: 1000,
+                        type: "error"
                     });
                 }
             }).catch(function (error) {
@@ -155,9 +145,9 @@ export default {
                 headers: {
                     Authorization: 'Bearer '
                 },
-                data:{
-                    diid:that.diid,
-                    userId:that.userId,
+                data: {
+                    diid: that.diid,
+                    userId: that.userId,
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
@@ -166,11 +156,11 @@ export default {
                         type: 'success'
                     });
                     that.ApprovalJourneyInit();
-                }else{
+                } else {
                     that.$message({
-                        message:res.data.msg,
-                        duration:1000,
-                        type:"error"
+                        message: res.data.msg,
+                        duration: 1000,
+                        type: "error"
                     });
                 }
             }).catch(function (error) {
@@ -187,9 +177,9 @@ export default {
                 headers: {
                     Authorization: 'Bearer '
                 },
-                data:{
-                    diid:that.diid,
-                    userid:that.userId
+                data: {
+                    diid: that.diid,
+                    userid: that.userId
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
@@ -197,12 +187,12 @@ export default {
                         message: res.data.msg,
                         type: 'success'
                     });
-                    that.tablearr=res.data.data;
-                }else{
+                    that.tablearr = res.data.data;
+                } else {
                     that.$message({
-                        message:res.data.msg,
-                        duration:1000,
-                        type:"error"
+                        message: res.data.msg,
+                        duration: 1000,
+                        type: "error"
                     });
                 }
             }).catch(function (error) {
@@ -219,8 +209,8 @@ export default {
                 headers: {
                     Authorization: 'Bearer '
                 },
-                data:{
-                    diid:that.diid,
+                data: {
+                    diid: that.diid,
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
@@ -229,11 +219,11 @@ export default {
                         type: 'success'
                     });
                     window.open(res.data.data)
-                }else{
+                } else {
                     that.$message({
-                        message:res.data.msg,
-                        duration:1000,
-                        type:"error"
+                        message: res.data.msg,
+                        duration: 1000,
+                        type: "error"
                     });
                 }
             }).catch(function (error) {
@@ -241,64 +231,75 @@ export default {
             });
         },
     },
-    mounted(){
+    mounted() {
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
         this.ApprovalJourneyInit();
     }
 }
 </script>
 <style>
-.VisitSchedule-all{
+.VisitSchedule-all {
     background-color: #fff;
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     min-height: 830px;
 }
-.VisitSchedule-search-head{
+
+.VisitSchedule-search-head {
     display: flex;
     justify-content: space-between;
 }
-.VisitSchedule-search-head .el-select{
+
+.VisitSchedule-search-head .el-select {
     width: 100%;
 }
-.VisitSchedule-content-table{
+
+.VisitSchedule-content-table {
     padding: 10px 0;
     border: 1px solid #DCDFE6;
 }
-.VisitSchedule-content-li{
+
+.VisitSchedule-content-li {
     border-top: 1px solid #DCDFE6;
     display: flex;
     align-items: center;
 }
-.VisitSchedule-content-time{
+
+.VisitSchedule-content-time {
     padding: 10px;
     width: 25%;
 }
-.VisitSchedule-content-remark{
+
+.VisitSchedule-content-remark {
     width: 75%;
     padding: 10px;
 }
-.VisitSchedule-content-time .el-range-editor.el-input__inner{
+
+.VisitSchedule-content-time .el-range-editor.el-input__inner {
     width: 100%;
 }
-.content-ul-title{
+
+.content-ul-title {
     padding: 10px;
 }
-.VisitSchedule-content-ul .VisitSchedule-content-li:last-child{
-    border-bottom:1px solid #DCDFE6 ;
+
+.VisitSchedule-content-ul .VisitSchedule-content-li:last-child {
+    border-bottom: 1px solid #DCDFE6;
 }
-.VisitSchedule-content-title{
+
+.VisitSchedule-content-title {
     text-align: center;
     margin-bottom: 10px;
     color: #555;
     font-size: 17px;
     font-weight: 600;
 }
-.VisitSchedule-content-info{
+
+.VisitSchedule-content-info {
     text-align: center;
     color: #555;
-    font-size:15px ;
+    font-size: 15px;
     margin-bottom: 20px;
 }
 </style>