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

src/router/modules/dialysis.js

@@ -38,59 +38,59 @@ export default {
         noCache: true
       }
     },
-    {
-      path: '/dialysis/consumableDrugs',
-      component: () => import('@/xt_pages/dialysis/consumableDrugs'),
-      name: '耗材药品',
-      meta: {
-        title: '耗材药品',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/consumableDrugs_print',
-      component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'consumableDrugs_print',
-      meta: {
-        title: 'consumableDrugs_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/dialysisDrugs_print',
-      component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'dialysisDrugs_print',
-      meta: {
-        title: 'dialysisDrugs_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/dialysisParameters_print',
-      component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'dialysisParameters_print',
-      meta: {
-        title: 'dialysisParameters_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/allSummary_print',
-      component: () => import('@/xt_pages/dialysis/allSummary_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'allSummary_print',
-      meta: {
-        title: 'allSummary_print',
-        noCache: true
-      }
-    },
+    // {
+    //   path: '/dialysis/consumableDrugs',
+    //   component: () => import('@/xt_pages/dialysis/consumableDrugs'),
+    //   name: '耗材药品',
+    //   meta: {
+    //     title: '耗材药品',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/dialysis/consumableDrugs_print',
+    //   component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'consumableDrugs_print',
+    //   meta: {
+    //     title: 'consumableDrugs_print',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/dialysis/dialysisDrugs_print',
+    //   component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'dialysisDrugs_print',
+    //   meta: {
+    //     title: 'dialysisDrugs_print',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/dialysis/dialysisParameters_print',
+    //   component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'dialysisParameters_print',
+    //   meta: {
+    //     title: 'dialysisParameters_print',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/dialysis/allSummary_print',
+    //   component: () => import('@/xt_pages/dialysis/allSummary_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'allSummary_print',
+    //   meta: {
+    //     title: 'allSummary_print',
+    //     noCache: true
+    //   }
+    // },
     {
       path: '/dialysis/record/:id',
       component: () => import('@/xt_pages/dialysis/dialysisPage'),

src/xt_pages/dialysis/details/dialog/doubleCheckDialog.vue

@@ -133,19 +133,23 @@
       }
     }, methods: {
       show() {
+        console.log(this.double_check)
 
         this.isVisibility = true
         if (this.double_check.id > 0) {
 
           this.first_check_time = uParseTime(
             this.double_check.first_check_time,
-            '{y}-{m}-{d}  {h}:{i}'
+            '{y}-{m}-{d} {h}:{i}'
           ).split(' ')[1]
 
           this.check_time = uParseTime(
             this.double_check.check_time,
-            '{y}-{m}-{d}  {h}:{i}'
+            '{y}-{m}-{d} {h}:{i}'
           ).split(' ')[1]
+          console.log( this.first_check_time )
+          console.log( this.check_time )
+
 
         } else {
           var nowDate = new Date()
@@ -153,7 +157,8 @@
           var nowMinutes = nowDate.getMinutes()
           this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
           this.first_check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
-
+          console.log( this.first_check_time )
+          console.log( this.check_time )
 
         }
       },
@@ -175,8 +180,8 @@
         var first_time = new Date(first_check_time).getTime()
         var second_time = new Date(check_time).getTime()
 
-        this.doubleReview.creater = 400
-        this.doubleReview.modifier = 448
+
+
 
         if (first_time >= second_time) {
           this.$message.error('第一次核对时间不能大于或者等于第二次核对时间')
@@ -193,10 +198,9 @@
         ParamsQuery['record_date'] = this.record_date
         ParamsQuery['check_time'] = this.record_date + ' ' + this.check_time
         ParamsQuery['first_check_time'] = this.record_date + ' ' + this.first_check_time
-        ParamsQuery['creater'] = 400
-        ParamsQuery['modifier'] = 448
+        ParamsQuery['creater'] = this.doubleReview.creater
+        ParamsQuery['modifier'] = this.doubleReview.modifier
 
-        console.log(ParamsQuery)
 
         postDoubleCheck(ParamsQuery).then(response => {
           if (response.data.state == 0) {

src/xt_pages/workforce/appointment.vue

@@ -502,77 +502,209 @@
         }
         if (results.length > 0) {
           var isHas_1 = headers.includes('区号')
+          console.log("1"+isHas_1)
           var isHas_2 = headers.includes('机号')
+          console.log("2"+isHas_2)
+
+
           var isHas_3 = headers.includes('周一'+"("+this.days[0]+")")
+          console.log("3"+isHas_3)
+
+
           var isHas_4 = headers.includes('')
+          console.log("4"+isHas_4)
+
+
           var isHas_5 = headers.includes('_1')
+          console.log("5"+isHas_5)
+
           var isHas_6 = headers.includes('周二'+"("+this.days[1]+")")
+          console.log("6"+isHas_6)
+
           var isHas_7 = headers.includes('_2')
+          console.log("7"+isHas_7)
+
           var isHas_8 = headers.includes('_3')
+          console.log("8"+isHas_8)
+
           var isHas_9 = headers.includes('周三'+"("+this.days[2]+")")
+          console.log("9"+isHas_9)
+
           var isHas_10 = headers.includes('_4')
+          console.log("10"+isHas_10)
+
           var isHas_11 = headers.includes('_5')
+          console.log("11"+isHas_11)
+
           var isHas_12 = headers.includes('周四'+"("+this.days[3]+")")
+          console.log("12"+isHas_12)
+
           var isHas_13 = headers.includes('_6')
+          console.log("13"+isHas_13)
+
           var isHas_14 = headers.includes('_7')
+          console.log("14"+isHas_14)
+
           var isHas_15 = headers.includes('周五'+"("+this.days[4]+")")
+          console.log("15"+isHas_15)
+
           var isHas_16 = headers.includes('_8')
+          console.log("16"+isHas_16)
+
 
           var isHas_17 = headers.includes('_9')
+          console.log("17"+isHas_17)
+
 
           var isHas_18 = headers.includes('周六'+"("+this.days[5]+")")
+          console.log("18"+isHas_18)
+
 
           var isHas_19 = headers.includes('_10')
+          console.log("19"+isHas_19)
+
 
           var isHas_20 = headers.includes('_11')
+          console.log("20"+isHas_20)
+
 
           var isHas_21 = headers.includes('周日'+"("+this.days[6]+")")
+          console.log("21"+isHas_21)
 
           var isHas_22 = headers.includes('_12')
+          console.log("22"+isHas_22)
+
           var isHas_23 = headers.includes('_13')
+          console.log("23"+isHas_23)
+
 
           var isHas_24 = headers.includes('周一'+"("+this.days[7]+")")
+          console.log("24"+isHas_24)
+
           var isHas_25 = headers.includes('_14')
+          console.log("25"+isHas_25)
+
           var isHas_26 = headers.includes('_15')
+          console.log("26"+isHas_26)
+
           var isHas_27 = headers.includes('周二'+"("+this.days[8]+")")
+          console.log("27"+isHas_27)
+
           var isHas_28 = headers.includes('_16')
+          console.log("28"+isHas_28)
+
           var isHas_29 = headers.includes('_17')
+          console.log("29"+isHas_29)
+
           var isHas_30 = headers.includes('周三'+"("+this.days[9]+")")
+          console.log("30"+isHas_30)
+
           var isHas_31 = headers.includes('_18')
+          console.log("31"+isHas_31)
+
           var isHas_32 = headers.includes('_19')
+          console.log("32"+isHas_32)
+
           var isHas_33 = headers.includes('周四'+"("+this.days[10]+")")
+          console.log("33"+isHas_33)
+
           var isHas_34 = headers.includes('_20')
+          console.log("34"+isHas_34)
+
           var isHas_35 = headers.includes('_21')
+          console.log("35"+isHas_35)
+
           var isHas_36 = headers.includes('周五'+"("+this.days[11]+")")
+          console.log("36"+isHas_36)
+
           var isHas_37 = headers.includes('_22')
+          console.log("37"+isHas_37)
+
           var isHas_38 = headers.includes('_23')
+          console.log("38"+isHas_38)
+
           var isHas_39 = headers.includes('周六'+"("+this.days[12]+")")
+          console.log("39"+isHas_39)
+
           var isHas_40 = headers.includes('_24')
+          console.log("40"+isHas_40)
+
           var isHas_41 = headers.includes('_25')
+          console.log("41"+isHas_41)
+
           var isHas_42 = headers.includes('周日'+"("+this.days[13]+")")
+          console.log("42"+isHas_42)
+
           var isHas_43 = headers.includes('_26')
+          console.log("43"+isHas_43)
+
           var isHas_44 = headers.includes('_27')
+          console.log("44"+isHas_44)
+
           var isHas_45 = headers.includes('周一'+"("+this.days[14]+")")
+          console.log("45"+isHas_45)
+
           var isHas_46 = headers.includes('_28')
+          console.log("46"+isHas_46)
+
           var isHas_47 = headers.includes('_29')
+          console.log("47"+isHas_47)
+
           var isHas_48 = headers.includes('周二'+"("+this.days[15]+")")
+          console.log("48"+isHas_48)
+
           var isHas_49 = headers.includes('_30')
+          console.log("49"+isHas_49)
+
           var isHas_50 = headers.includes('_31')
+          console.log("50"+isHas_50)
+
           var isHas_51 = headers.includes('周三'+"("+this.days[16]+")")
+          console.log("51"+isHas_51)
+
           var isHas_52 = headers.includes('_32')
+          console.log("52"+isHas_52)
+
           var isHas_53 = headers.includes('_33')
+          console.log("53"+isHas_53)
+
           var isHas_54 = headers.includes('周四'+"("+this.days[17]+")")
+          console.log("54"+isHas_54)
+
           var isHas_55 = headers.includes('_34')
+          console.log("55"+isHas_55)
+
           var isHas_56 = headers.includes('_35')
+          console.log("56"+isHas_56)
+
           var isHas_57 = headers.includes('周五'+"("+this.days[18]+")")
+          console.log("57"+isHas_57)
+
           var isHas_58 = headers.includes('_36')
+          console.log("58"+isHas_58)
+
           var isHas_59 = headers.includes('_37')
+          console.log("59"+isHas_59)
+
+
           var isHas_60 = headers.includes('周六'+"("+this.days[19]+")")
+          console.log("60"+isHas_60)
+
           var isHas_61 = headers.includes('_38')
+          console.log("61"+isHas_61)
+
           var isHas_62 = headers.includes('_39')
+          console.log("62"+isHas_62)
+
           var isHas_63 = headers.includes('周日'+"("+this.days[20]+")")
+          console.log("63"+isHas_63)
+
           var isHas_64 = headers.includes('_40')
+          console.log("64"+isHas_64)
+
           var isHas_65 = headers.includes('_41')
+          console.log("65"+isHas_65)
+
 
           if (!(isHas_1 && isHas_2 && isHas_3 && isHas_4 && isHas_5 &&
             isHas_6 && isHas_7 && isHas_8 && isHas_9 && isHas_10 &&
@@ -587,10 +719,14 @@
             isHas_51 && isHas_52 && isHas_53 && isHas_54 && isHas_55 &&
             isHas_56 && isHas_57 && isHas_58 && isHas_59 && isHas_60 &&
             isHas_61 && isHas_62 && isHas_63 && isHas_64 && isHas_65)) {
+
+            console.log("222222222")
+
             this.dialogVisible = true
             return
           }
         } else {
+          console.log("11111111")
 
           this.dialogVisible = true
           return
@@ -647,9 +783,15 @@
         }
 
 
+        console.log("number:")
+        console.log(total_device_number)
+        console.log("23121212:")
+        console.log(deviceNumber)
+
 
         for (let i = 0; i < deviceNumber.length; i++) {
           if (!total_device_number.includes(deviceNumber[i])) {
+            console.log("number:11111")
             is_device_number = false
           }
         }
@@ -711,6 +853,8 @@
 
         }
 
+        console.log(datas)
+
 
         let date_arr = []
         //校验文档是否规范
@@ -721,6 +865,8 @@
 
           if (datas[i].device_number_name == undefined) {
             console.log(datas[i].name)
+            console.log("number:222222")
+
             is_device_number = false
 
           }
@@ -786,16 +932,20 @@
           }
         }
 
+        console.log(is_system_zone)
+        console.log(is_device_number)
+        console.log(headers.length)
+
 
         if (headers.length > 65 || !is_system_zone || !is_device_number) {
           this.dialogVisible = true
           return
         } else {
           if (is_exist_repeat) {
-          //   this.isExistRepeatVisible = true
-          //   return
-          // } else {
-            // this.exportVisible = true
+            this.isExistRepeatVisible = true
+            return
+          } else {
+            this.exportVisible = true
 
             this.$alert('您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
               confirmButtonText: '确定',