Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  //BASE_API: '"http://localhost:9531"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-     host: 'xt.test.sgjyun.com',
+     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
     // host: 'xt.test.sgjyun.com',
-    // host: 'localhost',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/workforce/appointment.vue

@@ -415,7 +415,7 @@
                   total: 0
                 }
                 that.scheduleZone.push(thisPa)
-                
+
               })
             })
           }
@@ -458,10 +458,10 @@
 
             i++
           }
-         
+
           const data = this.formatJson(filterVal, list)
           // console.log("data",data)
-        
+
           const filename = '排班模版'
           excel.export_json_to_excel({
             multiHeader,
@@ -474,7 +474,7 @@
         })
       },
       export_fileTwo:function(){
-        
+
         import('@/vendor/Export2Excel').then(excel => {
           const filterVal = [
             '区号',
@@ -483,11 +483,11 @@
           const multiHeader = [['区号', '机号', '周一'+"("+this.days[0]+")" , '', '', '周二'+"("+this.days[1]+")", '', '', '周三'+"("+this.days[2]+")" , '', '', '周四'+"("+this.days[3]+")" , '', '', '周五'+"("+this.days[4]+")" , '', '', '周六'+"("+this.days[5]+")" , '', '', '周日'+"("+this.days[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
           const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
           const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
-      
+
           var data = []
          this.tableList.map(item=>{
            data.push(Object.values(item))
-           
+
          })
 
           const filename = '排班模版'
@@ -498,13 +498,13 @@
             data,
             filename
           })
-          
+
         })
       },
       formatJson(filterVal, jsonData) {
        return jsonData.map(v => filterVal.map(j => v[j]))
       },
-  
+
       //  formatJson(filterVal, jsonData) {
       //    console.log("jsonData",jsonData)
       //   return jsonData.map(v =>
@@ -550,7 +550,7 @@
         return isShow
       },
        handleSuccess({ results, header }) {
-     
+
         let headers = []
         for (let key in results[0]) {
           headers.push(key)
@@ -775,33 +775,30 @@
             isHas_56 && isHas_57 && isHas_58 && isHas_59 && isHas_60 &&
             isHas_61 && isHas_62 && isHas_63 && isHas_64 && isHas_65)) {
 
-           
+           console.log("sssssss")
 
             this.dialogVisible = true
             return
           }
         } else {
-          
+
+          console.log("ssssssszzzzzzz")
 
           this.dialogVisible = true
           return
         }
-
         let is_system_zone = true
         let is_device_number = true
         let zones = []
         let deviceNumber = []
-
         for (let i = 0; i < results.length; i++) {
-          if (results[i + 1]) {
+          if (results[i + 1] && results[i + 1]['区号'] != undefined) {
             zones.push(results[i + 1]['区号'])
           }
-          if (results[i + 1]) {
+          if (results[i + 1] && results[i + 1]['机号'] != undefined) {
             deviceNumber.push(results[i + 1]['机号'])
           }
-
         }
-
         const obj = {}
         zones = zones.reduce((cur, next) => {
           obj[next] ? '' : obj[next] = true && cur.push(next)
@@ -831,15 +828,17 @@
           }
         }
 
+         console.log(zones)
         for (let i = 0; i < zones.length; i++) {
+          console.log(zones[i])
+          console.log("err"+total_zones.includes(zones[i]))
+
           if (!total_zones.includes(zones[i])) {
             is_system_zone = false
           }
         }
-        
+
         console.log("totalzones",total_zones)
-        
-        
         console.log("number:")
         console.log("total",total_device_number)
         console.log("23121212:")
@@ -863,20 +862,20 @@
 
         let datas = []
         let failed_datas = []
-       
 
-       
+
+
 
         console.log("结果22222222222",results)
 
         for (let i = 0; i < results.length; i++) {
-          
+
           for (let key in results[i + 1]) {
             let tempObjTwo = { partition_name: '', device_number_name: '' }
 
             if (key != '区号' && key != '机号' && results[i+1][key]!="") {
               let obj = {}
-             
+
               obj['name'] = results[i + 1][key].replace(/\s/g, '')
               console.log("88888888",obj['name'])
               if (tempObj[key] == '上午') {
@@ -897,8 +896,8 @@
 
               console.log("objtwo000000000000000000000",tempObjTwo)
             }
-            
-           
+
+
             tempObjTwo['partition_name'] = results[i + 1]['区号']
             tempObjTwo['device_number_name'] = results[i + 1]['机号']
             tempObjTwo['index'] = i + 3
@@ -931,26 +930,35 @@
           }
 
           if (datas[i].device_number_name == undefined) {
+            console.log("err1"+datas[i].device_number_name)
+
             is_device_number = false
 
           }
 
           if (datas[i].partition_name == undefined) {
-            
+            console.log("err2"+datas[i].partition_name)
+
             is_system_zone = false
           }
 
           if (datas[i].schedule_date === '0') {
+            console.log("err23"+datas[i].schedule_date)
+
             is_system_zone = false
 
           }
 
           if (datas[i].schedule_week === '0') {
+            console.log("err234"+datas[i].schedule_week)
+
             is_system_zone = false
 
           }
 
           if (datas[i].schedule_type === 0) {
+            console.log("err2345"+datas[i].schedule_type)
+
             is_system_zone = false
 
           }
@@ -980,7 +988,7 @@
           obj[key] = value
           tempObjArr.push(obj)
         }
-        
+
         for (let i = 0; i < tempObjArr.length; i++) {
           for (let key in tempObjArr[i]) {
             let arr = tempObjArr[i][key]
@@ -989,7 +997,7 @@
               obj[next] ? '' : obj[next] = true && cur.push(next)
               return cur
             }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-            
+
             console.log("长度11111111111",tempObjArr[i][key].length)
             console.log("长度22222222222",arr.length)
             if (tempObjArr[i][key].length > arr.length) {    //比对原数组和去重后的原数组总数，不同的话则存在重复元素
@@ -1004,10 +1012,12 @@
 
 
         if (headers.length > 65 || !is_system_zone || !is_device_number) {
+          console.log("ssssssszzzzzzzqqqqqqqq")
+
           this.dialogVisible = true
           return
         } else {
-          
+
           if (is_exist_repeat) {
             this.isExistRepeatVisible = true
             return
@@ -1276,7 +1286,7 @@
 
         }
 
-      }, 
+      },
       getRow(key) {
         switch (key) {
           case '周一'+"("+this.days[0]+")" : //本周一
@@ -1913,15 +1923,15 @@
         let next_sunday = moment().add((7 - weekOfDay) + 7 * i, 'days').format('YYYY-MM-DD');//周日日期
         return next_sunday
        },
-       
+
       getNextWeekOne(i) {
         let weekOfDay = parseInt(moment().format('E'));//计算今天是这周第几天
         let next_monday = moment().add((7 - weekOfDay) + 7 * (i - 1) + 1, 'days').format('YYYY-MM-DD');//周一日期
-        
+
         return next_monday
        },
-       
-       
+
+
        getThreeWeekList(){
           var params ={
               start_time:this.start_time,
@@ -1934,11 +1944,11 @@
            if(response.data.state == 1){
              var partitions =  response.data.data.partitions
              console.log("数据22222",this.partitions)
-             
+
              const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
               var list = []
               let i = 0
-              
+
               for (let key  in partitions) {
                 var tempValue
                 var jihaos = partitions[key].jihaos
@@ -1955,11 +1965,11 @@
                 console.log("jihaos",jihaos)
                 for (let b = 0; b < jihaos.length; b++) {
                  var obj = {}
-               
+
                   obj['区号'] = partitions[key].name
                   obj['机号'] = jihaos[b].number.toString()
 
-                
+
                   obj['上午'] = ''
                   obj['下午'] = ''
                   obj['晚上'] = ''
@@ -1979,8 +1989,8 @@
                   obj['上午4'] = ''
                   obj['下午4'] = ''
                   obj['晚上4'] = ''
-                 
-                
+
+
                   obj['上午5'] = ''
                   obj['下午5'] = ''
                   obj['晚上5'] = ''
@@ -2008,8 +2018,8 @@
                   obj['上午11'] = ''
                   obj['下午11'] = ''
                   obj['晚上11'] = ''
-                 
-                
+
+
                   obj['上午12'] = ''
                   obj['下午12'] = ''
                   obj['晚上12'] = ''
@@ -2043,26 +2053,26 @@
                   obj['上午19'] = ''
                   obj['下午19'] = ''
                   obj['晚上19'] = ''
-                 
-                
+
+
                   obj['上午20'] = ''
                   obj['下午20'] = ''
                   obj['晚上20'] = ''
 
                   list.push(obj)
-                
+
                 }
                 i++
               }
-             
-             
+
+
                const start_time = moment().weekday(1).format('YYYY-MM-DD'); //本周一
                var start = this.getTimestamp(start_time)
                console.log("start",start)
               const end_time = moment().weekday(7).format('YYYY-MM-DD');
               var end = this.getTimestamp(end_time)
 
-              
+
               console.log("end",end)
               var scheduleList = response.data.data.list
               console.log("排班列表22222",scheduleList)
@@ -2096,11 +2106,11 @@
                  }
               }
               }
-            
+
             if(this.export_type == 1){
                 week = scheduleList
              }
-           
+
              if(week.length > 0){
               for(let i=0;i<list.length;i++){
                for(let j=0;j<week.length;j++){
@@ -2117,7 +2127,7 @@
                     if( week[j].schedule_week == 1 && week[j].schedule_type == 3){
                         list[i].晚上 = week[j].name
                     }
-                    
+
                    //周二上午
                     if( week[j].schedule_week == 2 && week[j].schedule_type == 1){
                         list[i].上午1 = week[j].name
@@ -2175,7 +2185,7 @@
                    if( week[j].schedule_week ==6 && week[j].schedule_type == 2){
                         list[i].下午5 = week[j].name
                     }
-                   //周六晚上 
+                   //周六晚上
                    if( week[j].schedule_week == 6 && week[j].schedule_type == 3){
                         list[i].晚上5 = week[j].name
                     }
@@ -2192,18 +2202,18 @@
                         list[i].晚上6 = week[j].name
                     }
                   }
-                
+
                }
              }
              }
-             
+
              console.log("list5555555555",list)
-             
+
              if(nextWeek.length > 0 ){
                for(let i=0;i<list.length;i++){
                 for(let j=0;j<nextWeek.length;j++){
                  if(list[i].机号 == nextWeek[j].number ){
-                  //周一   
+                  //周一
                    if( nextWeek[j].schedule_week ==1&& nextWeek[j].schedule_type == 1){
                         list[i].上午7 = nextWeek[j].name
                     }
@@ -2215,9 +2225,9 @@
                    if( nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3){
                         list[i].晚上7 = nextWeek[j].name
                     }
-                  
 
-                   //周二上午  
+
+                   //周二上午
                    if( nextWeek[j].schedule_week ==2&& nextWeek[j].schedule_type == 1){
                         list[i].上午8 = nextWeek[j].name
                     }
@@ -2230,7 +2240,7 @@
                         list[i].晚上8  = nextWeek[j].name
                     }
 
-                  //周三上午  
+                  //周三上午
                    if( nextWeek[j].schedule_week ==3&& nextWeek[j].schedule_type == 1){
                         list[i].上午9 = nextWeek[j].name
                     }
@@ -2243,7 +2253,7 @@
                         list[i].晚上9  = nextWeek[j].name
                     }
 
-                   //周四上午  
+                   //周四上午
                    if( nextWeek[j].schedule_week ==4&& nextWeek[j].schedule_type == 1){
                         list[i].上午10 = nextWeek[j].name
                     }
@@ -2255,8 +2265,8 @@
                    if( nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3){
                         list[i].晚上10  = nextWeek[j].name
                     }
-                    
-                    //周五上午  
+
+                    //周五上午
                    if( nextWeek[j].schedule_week ==5&& nextWeek[j].schedule_type == 1){
                         list[i].上午11 = nextWeek[j].name
                     }
@@ -2269,7 +2279,7 @@
                         list[i].晚上11  = nextWeek[j].name
                     }
 
-                  //周六上午  
+                  //周六上午
                    if( nextWeek[j].schedule_week ==6&& nextWeek[j].schedule_type == 1){
                         list[i].上午12 = nextWeek[j].name
                     }
@@ -2282,7 +2292,7 @@
                         list[i].晚上12  = nextWeek[j].name
                     }
 
-                  //周日上午  
+                  //周日上午
                    if( nextWeek[j].schedule_week ==6&& nextWeek[j].schedule_type == 1){
                         list[i].上午13 = nextWeek[j].name
                     }
@@ -2299,14 +2309,14 @@
                }
               }
              }
-              
+
              console.log("lastWeek",lastWeek)
 
-             if(lastWeek.length > 0 ){ 
+             if(lastWeek.length > 0 ){
                for(let i=0;i<list.length;i++){
                  for(let j=0;j<lastWeek.length;j++){
-                   if(list[i].机号 == lastWeek[j].number ){ 
-                     //周一   
+                   if(list[i].机号 == lastWeek[j].number ){
+                     //周一
                     if( lastWeek[j].schedule_week ==1&& lastWeek[j].schedule_type == 1){
                           list[i].上午14 = lastWeek[j].name
                       }
@@ -2345,7 +2355,7 @@
                           list[i].晚上16 = lastWeek[j].name
                      }
 
-                    
+
                      //周四
                     if( lastWeek[j].schedule_week ==4&& lastWeek[j].schedule_type == 1){
                           list[i].上午17 = lastWeek[j].name
@@ -2397,11 +2407,11 @@
                     if( lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3){
                           list[i].晚上20 = lastWeek[j].name
                      }
-                   }  
+                   }
 
                   }
                 }
-             } 
+             }
              this.tableList = list
            }
          })
@@ -2437,7 +2447,7 @@
       getTime(val) {
         return uParseTime(val, '{y}-{m}-{d}')
       },
-       
+
 
     },
     created() {