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

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

@@ -170,19 +170,19 @@
       @close="resetDialog"
       :modal-append-to-body="false"
     >
-      <!--<div class="txsj">-->
-        <!--<el-button-->
-          <!--round-->
-          <!--@click="openLast(1)"-->
-        <!--&gt;上一方-->
-        <!--</el-button>-->
-
-        <!--<el-button-->
-          <!--round-->
-          <!--@click="openNext(2)"-->
-        <!--&gt;下一方-->
-        <!--</el-button>-->
-      <!--</div>-->
+      <div class="txsj">
+        <el-button
+          round
+          @click="openLast(1)"
+        >上一方
+        </el-button>
+
+        <el-button
+          round
+          @click="openNext(2)"
+        >下一方
+        </el-button>
+      </div>
 
       <div class="txsj" v-show="showAdvicePanel">
         <el-button
@@ -2189,8 +2189,7 @@
           }
         })
 
-      }
-      ,
+      },
       getDialysisScheduleDetail() {
         getDialysisScheduleDetail(this.patientid, this.record_date).then(response => {
           if (response.data.state == 1) {
@@ -2204,6 +2203,8 @@
         if (val == 1) {
           this.isLastOrNextVisible = true
           this.isVisibility = false
+          this.request_record_date = this.record_date
+
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
@@ -2222,12 +2223,12 @@
           this.GetLastOrNextDoctorAdvice(params)
 
         }
-      }
-      ,
+      },
       openNext(val) {
         if (val == 2) {
           this.isLastOrNextVisible = true
           this.isVisibility = false
+          this.request_record_date = this.record_date
 
           let params = {
             patient_id: this.patientid,

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

@@ -43,15 +43,40 @@
       </el-form-item>
     </el-form>
 
-    <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">
-    <el-form-item label="核对时间 : ">
+    <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="120px">
+      <el-form-item label="第一次核对时间:">
+        <el-time-picker
+          v-model="first_check_time"
+          format='HH:mm'
+          value-format="HH:mm"
+          placeholder="请输入核对时间">
+        </el-time-picker>
+      </el-form-item>
+
+      <el-form-item label="第一次核对人">
+        <el-select v-model="doubleReview.creater" placeholder="请选择核对人">
+          <el-option v-for="(admin, index) in admin_users" :key="index" :value="admin.id"
+                     :label="admin.name"></el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item label="第二次核对时间:">
         <el-time-picker
-          v-model="time"
+          v-model="check_time"
           format='HH:mm'
           value-format="HH:mm"
           placeholder="请输入核对时间">
         </el-time-picker>
       </el-form-item>
+
+      <el-form-item label="第二次核对人">
+        <el-select v-model="doubleReview.modifier" placeholder="请选择核对人">
+          <el-option v-for="(admin, index) in admin_users" :key="index" :value="admin.id"
+                     :label="admin.name"></el-option>
+        </el-select>
+      </el-form-item>
+
     </el-form>
 
 
@@ -63,7 +88,7 @@
 
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
-      <el-button :disabled="this.doubleReview.creater == 0 || this.doubleReview.modifier == 0 ? false : true " type="primary" @click="handleComfirm">保 存</el-button>
+      <el-button type="primary" @click="handleComfirm">保 存</el-button>
     </div>
   </el-dialog>
 
@@ -73,14 +98,18 @@
 <script>
   import { postDoubleCheck } from '@/api/dialysis'
   import { uParseTime } from '@/utils/tools'
+  import { parseTime } from '@/utils'
 
   export default {
     name: 'doubleCheckDialog',
     data() {
       return {
         isVisibility: false,
-        time:'',
+        time: '',
         isClose: false,
+        check_time: 0,
+        first_check_time: 0,
+
         doubleReview: {
           dialysis_item_check: '1',
           dialysis_parameter_check: '1',
@@ -104,11 +133,29 @@
       }
     }, methods: {
       show() {
+
         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}'
+          ).split(' ')[1]
 
+          this.check_time = uParseTime(
+            this.double_check.check_time,
+            '{y}-{m}-{d}  {h}:{i}'
+          ).split(' ')[1]
+
+        } else {
+          var nowDate = new Date()
+          var nowHours = nowDate.getHours()
+          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)
 
 
+        }
       },
       hide() {
         this.isVisibility = false
@@ -122,11 +169,34 @@
           this.$message.error('没有选择患者')
           return
         }
+        var first_check_time = this.record_date + ' ' + this.first_check_time
+        var check_time = this.record_date + ' ' + this.check_time
+
+        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('第一次核对时间不能大于或者等于第二次核对时间')
+          return
+        }
+
+        if (this.doubleReview.creater == this.doubleReview.modifier) {
+          this.$message.error('第一次核对人不能与第二次核对人相同')
+          return
+        }
 
         let ParamsQuery = this.doubleReview
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
-        ParamsQuery['check_time'] = this.record_date +" "+ this.time
+        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
+
+        console.log(ParamsQuery)
 
         postDoubleCheck(ParamsQuery).then(response => {
           if (response.data.state == 0) {
@@ -140,13 +210,22 @@
               duration: 2000
             })
 
-            this.doubleReview.creater = response.data.data.doubleCheck.creater;
+            this.doubleReview.creater = response.data.data.doubleCheck.creater
             this.doubleReview.check_time =
-              response.data.data.doubleCheck.check_time;
+              response.data.data.doubleCheck.check_time
             this.doubleReview.first_check_time =
-              response.data.data.doubleCheck.first_check_time;
-            this.doubleReview.modifier = response.data.data.doubleCheck.modifier;
+              response.data.data.doubleCheck.first_check_time
+            this.doubleReview.modifier = response.data.data.doubleCheck.modifier
 
+            this.first_check_time = uParseTime(
+              this.doubleReview.first_check_time,
+              '{y}-{m}-{d}  {h}:{i}'
+            ).split(' ')[1]
+
+            this.check_time = uParseTime(
+              this.doubleReview.check_time,
+              '{y}-{m}-{d}  {h}:{i}'
+            ).split(' ')[1]
 
             let doublecheck_resp = response.data.data.doubleCheck
             var doubleCheck = this.double_check
@@ -167,97 +246,97 @@
           if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
             let time = uParseTime(
               this.doubleReview.first_check_time,
-              "{y}-{m}-{d}  {h}:{i}"
-            );
+              '{y}-{m}-{d}  {h}:{i}'
+            )
             if (this.doubleReview.creater <= 0) {
-              return "";
+              return ''
             }
 
-            var desc = "";
+            var desc = ''
             if (
               this.admin_users == null ||
-              typeof this.admin_users.length == "undefined"
+              typeof this.admin_users.length == 'undefined'
             ) {
-              return "";
+              return ''
             }
 
-            var leng = this.admin_users.length;
+            var leng = this.admin_users.length
             if (leng == 0) {
-              return "";
+              return ''
             }
 
             for (let index = 0; index < leng; index++) {
               if (this.admin_users[index].id == this.doubleReview.creater) {
-                let name = this.admin_users[index].name;
-                desc = "首次核对人员:" + name + " 首次核对时间:" + time;
+                let name = this.admin_users[index].name
+                desc = '首次核对人员:' + name + ' 首次核对时间:' + time
 
-                break;
+                break
               }
             }
-            return desc;
+            return desc
           } else {
             let time = uParseTime(
               this.doubleReview.check_time,
-              "{y}-{m}-{d}  {h}:{i}"
-            );
+              '{y}-{m}-{d}  {h}:{i}'
+            )
             if (this.doubleReview.modifier <= 0) {
-              return "";
+              return ''
             }
 
-            var desc = "";
+            var desc = ''
             if (
               this.admin_users == null ||
-              typeof this.admin_users.length == "undefined"
+              typeof this.admin_users.length == 'undefined'
             ) {
-              return "";
+              return ''
             }
 
-            var leng = this.admin_users.length;
+            var leng = this.admin_users.length
             if (leng == 0) {
-              return "";
+              return ''
             }
 
             for (let index = 0; index < leng; index++) {
               if (this.admin_users[index].id == this.doubleReview.modifier) {
-                let name = this.admin_users[index].name;
-                desc = "首次核对人员:" + name + " 首次核对时间:" + time;
+                let name = this.admin_users[index].name
+                desc = '首次核对人员:' + name + ' 首次核对时间:' + time
 
-                break;
+                break
               }
             }
-            return desc;
+            return desc
           }
         } else {
           let time = uParseTime(
             this.doubleReview.first_check_time,
-            "{y}-{m}-{d}  {h}:{i}"
-          );
+            '{y}-{m}-{d}  {h}:{i}'
+          )
           if (this.doubleReview.creater <= 0) {
-            return "";
+            return ''
           }
 
-          var desc = "";
+          var desc = ''
           if (
             this.admin_users == null ||
-            typeof this.admin_users.length == "undefined"
+            typeof this.admin_users.length == 'undefined'
           ) {
-            return "";
+            return ''
           }
 
-          var leng = this.admin_users.length;
+          var leng = this.admin_users.length
           if (leng == 0) {
-            return "";
+            return ''
           }
 
           for (let index = 0; index < leng; index++) {
             if (this.admin_users[index].id == this.doubleReview.creater) {
-              let name = this.admin_users[index].name;
-              desc = "首次核对人员:" + name + " 首次核对时间:" + time;
+              let name = this.admin_users[index].name
+              desc = '首次核对人员:' + name + ' 首次核对时间:' + time
 
-              break;
+              break
             }
           }
-          return desc;
+          return desc
         }
       },
       getScondCheckDesc: function() {
@@ -268,87 +347,87 @@
           if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
             let time = uParseTime(
               this.doubleReview.check_time,
-              "{y}-{m}-{d} {h}:{i}"
-            );
+              '{y}-{m}-{d} {h}:{i}'
+            )
             if (this.doubleReview.modifier <= 0) {
-              return "";
+              return ''
             }
-            var desc = "";
+            var desc = ''
             if (
               this.admin_users == null ||
-              typeof this.admin_users.length == "undefined"
+              typeof this.admin_users.length == 'undefined'
             ) {
-              return desc;
+              return desc
             }
-            var leng = this.admin_users.length;
+            var leng = this.admin_users.length
             if (leng == 0) {
-              return desc;
+              return desc
             }
             for (let index = 0; index < leng; index++) {
               if (this.admin_users[index].id == this.doubleReview.modifier) {
-                let name = this.admin_users[index].name;
-                desc = "第二次核对人员:" + name + " 第二次核对时间:" + time;
-                break;
+                let name = this.admin_users[index].name
+                desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
+                break
               }
             }
-            return desc;
+            return desc
           } else {
             let time = uParseTime(
               this.doubleReview.first_check_time,
-              "{y}-{m}-{d} {h}:{i}"
-            );
+              '{y}-{m}-{d} {h}:{i}'
+            )
             if (this.doubleReview.creater <= 0) {
-              return "";
+              return ''
             }
-            var desc = "";
+            var desc = ''
             if (
               this.admin_users == null ||
-              typeof this.admin_users.length == "undefined"
+              typeof this.admin_users.length == 'undefined'
             ) {
-              return desc;
+              return desc
             }
-            var leng = this.admin_users.length;
+            var leng = this.admin_users.length
             if (leng == 0) {
-              return desc;
+              return desc
             }
             for (let index = 0; index < leng; index++) {
               if (this.admin_users[index].id == this.doubleReview.creater) {
-                let name = this.admin_users[index].name;
-                desc = "第二次核对人员:" + name + " 第二次核对时间:" + time;
-                break;
+                let name = this.admin_users[index].name
+                desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
+                break
               }
             }
-            return desc;
+            return desc
           }
         } else {
           let time = uParseTime(
             this.doubleReview.check_time,
-            "{y}-{m}-{d} {h}:{i}"
-          );
+            '{y}-{m}-{d} {h}:{i}'
+          )
           if (this.doubleReview.modifier <= 0) {
-            return "";
+            return ''
           }
-          var desc = "";
+          var desc = ''
           if (
             this.admin_users == null ||
-            typeof this.admin_users.length == "undefined"
+            typeof this.admin_users.length == 'undefined'
           ) {
-            return desc;
+            return desc
           }
-          var leng = this.admin_users.length;
+          var leng = this.admin_users.length
           if (leng == 0) {
-            return desc;
+            return desc
           }
           for (let index = 0; index < leng; index++) {
             if (this.admin_users[index].id == this.doubleReview.modifier) {
-              let name = this.admin_users[index].name;
-              desc = "第二次核对人员:" + name + " 第二次核对时间:" + time;
-              break;
+              let name = this.admin_users[index].name
+              desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
+              break
             }
           }
-          return desc;
+          return desc
         }
-      },
+      }
     },
 
     props: {
@@ -386,19 +465,27 @@
           this.doubleReview.updated_time = this.double_check['updated_time']
           this.doubleReview.modifier = this.double_check['modifier']
 
+          this.doubleReview.dialysis_item_desc = this.double_check['dialysis_item_desc']
+          this.doubleReview.dialysis_parameter_desc = this.double_check['dialysis_parameter_desc']
+          this.doubleReview.vascular_access_desc = this.double_check['vascular_access_desc']
+          this.doubleReview.pipeline_connection_desc = this.double_check['pipeline_connection_desc']
 
-          this.doubleReview.dialysis_item_desc = this.double_check['dialysis_item_desc'];
-          this.doubleReview.dialysis_parameter_desc = this.double_check['dialysis_parameter_desc'];
-          this.doubleReview.vascular_access_desc = this.double_check['vascular_access_desc'];
-          this.doubleReview.pipeline_connection_desc = this.double_check['pipeline_connection_desc'];
-
-
-          this.doubleReview.created_time =this.double_check['created_time']
-          this.doubleReview.creater =this.double_check['creater']
+          this.doubleReview.created_time = this.double_check['created_time']
+          this.doubleReview.creater = this.double_check['creater']
           this.doubleReview.updated_time = this.double_check['updated_time']
           this.doubleReview.modifier = this.double_check['modifier']
           this.doubleReview.check_time = this.double_check['check_time']
-          this.doubleReview.first_check_time =  this.double_check['first_check_time']
+          this.doubleReview.first_check_time = this.double_check['first_check_time']
+
+          this.first_check_time = uParseTime(
+            this.doubleReview.first_check_time,
+            '{y}-{m}-{d}  {h}:{i}'
+          ).split(' ')[1]
+
+          this.check_time = uParseTime(
+            this.doubleReview.check_time,
+            '{y}-{m}-{d}  {h}:{i}'
+          ).split(' ')[1]
 
         } else {
           this.dialysis_item_check = '1'
@@ -406,10 +493,20 @@
           this.vascular_access_verification = '1'
           this.pipeline_connection_check = '1'
 
-          this.doubleReview.dialysis_item_desc = "";
-          this.doubleReview.dialysis_parameter_desc = "";
-          this.doubleReview.vascular_access_desc = "";
-          this.doubleReview.pipeline_connection_desc = "";
+          this.doubleReview.dialysis_item_desc = ''
+          this.doubleReview.dialysis_parameter_desc = ''
+          this.doubleReview.vascular_access_desc = ''
+          this.doubleReview.pipeline_connection_desc = ''
+
+          var nowDate = new Date()
+          var nowYear = nowDate.getFullYear()
+          var nowMonth = nowDate.getMonth() + 1
+          var nowDay = nowDate.getDate()
+          var nowHours = nowDate.getHours()
+          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)
+
         }
       }
 
@@ -424,8 +521,8 @@
       var nowDay = nowDate.getDate()
       var nowHours = nowDate.getHours()
       var nowMinutes = nowDate.getMinutes()
-      var time =  (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
-      this.time = time
+      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)
 
     }
 

src/xt_pages/dialysis/details/doubleCheck.vue

@@ -41,7 +41,7 @@
         </li>
         <li>
           <label>第一次核对时间 : </label>
-          <span class="content">{{getCreateTime(record.created_time,record.creater)}}</span>
+          <span class="content">{{getCreateTime(record.first_check_time,record.creater)}}</span>
         </li>
       </ul>
       <ul>
@@ -51,14 +51,14 @@
         </li>
       </ul>
       <ul>
-      
+
         <li>
           <label>第二次核对人员 : </label>
           <span class="content">{{ getModifierName(record.modifier) }}</span>
         </li>
         <li>
           <label>第二次核对时间 : </label>
-          <span class="content">{{ getUpdateTime(record.updated_time,record.modifier) }}</span>
+          <span class="content">{{ getUpdateTime(record.check_time,record.modifier) }}</span>
         </li>
       </ul>
     </div>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyThree.vue

@@ -736,20 +736,15 @@
                     </td>
                     <td width="10">ml</td>
                     <td width="160">
-                        <!-- <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('封管肝素') > -1 : false" showValue="封管肝素"></label-box>&nbsp;
-                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('尿激酶') > -1 : false" showValue="尿激酶"></label-box>&nbsp; -->
-
-                          <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('封管肝素')>-1?true:false" showValue="封管肝素"></label-box>&nbsp;
-                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('尿激酶')>-1?true:false" showValue="尿激酶"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('封管肝素') > -1 : false" showValue="封管肝素"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('尿激酶') > -1 : false" showValue="尿激酶"></label-box>&nbsp;
                     </td>
                     <td>
-                        <!-- <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false" showValue="其他"></label-box>&nbsp; -->
-                          <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('特殊')>-1?true:false" showValue="其他"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false" showValue="其他"></label-box>&nbsp;
                     </td>
                     <td width="80">
                       <div class="under-line">
-                        <!-- &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false">{{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}</span> -->
-                        &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('特殊')>-1">{{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}</span>
+                        &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false">{{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}</span>
                       </div>
                     </td>
                     <td></td>
@@ -836,19 +831,19 @@
                         <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false):false" showValue="Ⅲ级"></label-box>&nbsp;
                       </td>
                       <td width="30">A管:</td>
-                      <td width="220">
-                        <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="0级"></label-box>&nbsp;
-                        <label-box :isChecked="afterdialysis.intravenous_tube == 2 ? true : false" showValue="Ⅰ级"></label-box>&nbsp;
-                        <label-box :isChecked="afterdialysis.intravenous_tube == 3 ? true : false" showValue="Ⅱ级"></label-box>&nbsp;
-                        <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="Ⅲ级"></label-box>&nbsp;
-                      </td>
-                      <td width="30">V管:</td>
                       <td width="220">
                         <label-box :isChecked="afterdialysis.arterial_tube == 1 ? true : false" showValue="0级"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.arterial_tube == 2 ? true : false" showValue="Ⅰ级"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.arterial_tube == 3 ? true : false" showValue="Ⅱ级"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.arterial_tube == 4 ? true : false" showValue="Ⅲ级"></label-box>&nbsp;
                       </td>
+                      <td width="30">V管:</td>
+                      <td width="220">
+                        <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="0级"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.intravenous_tube == 2 ? true : false" showValue="Ⅰ级"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.intravenous_tube == 3 ? true : false" showValue="Ⅱ级"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="Ⅲ级"></label-box>&nbsp;
+                      </td>
                       <td></td>
                   </tr>
                 </tbody>

src/xt_pages/workforce/appointment.vue

@@ -406,7 +406,7 @@
             '区号',
             '机号'
           ]
-          const multiHeader = [['区号', '机号', '周一', '', '', '周二', '', '', '周三', '', '', '周四', '', '', '周五', '', '', '周六', '', '', '周日', '', '', '周一', '', '', '周二', '', '', '周三', '', '', '周四', '', '', '周五', '', '', '周六', '', '', '周日', '', '', '周一', '', '', '周二', '', '', '周三', '', '', '周四', '', '', '周五', '', '', '周六', '', '', '周日', '', '']]
+          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']
           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']
@@ -492,93 +492,85 @@
         }
         return isShow
       }, handleSuccess({ results, header }) {
+        console.log(header)
+        console.log(results)
+
+
         let headers = []
         for (let key in results[0]) {
           headers.push(key)
         }
-        console.log(headers)
         if (results.length > 0) {
-
-
           var isHas_1 = headers.includes('区号')
           var isHas_2 = headers.includes('机号')
-          var isHas_3 = headers.includes('周一')
+          var isHas_3 = headers.includes('周一'+"("+this.days[0]+")")
           var isHas_4 = headers.includes('')
           var isHas_5 = headers.includes('_1')
-          var isHas_6 = headers.includes('周二')
+          var isHas_6 = headers.includes('周二'+"("+this.days[1]+")")
           var isHas_7 = headers.includes('_2')
           var isHas_8 = headers.includes('_3')
-          var isHas_9 = headers.includes('周三')
+          var isHas_9 = headers.includes('周三'+"("+this.days[2]+")")
           var isHas_10 = headers.includes('_4')
           var isHas_11 = headers.includes('_5')
-          var isHas_12 = headers.includes('周四')
+          var isHas_12 = headers.includes('周四'+"("+this.days[3]+")")
           var isHas_13 = headers.includes('_6')
           var isHas_14 = headers.includes('_7')
-          var isHas_15 = headers.includes('周五')
+          var isHas_15 = headers.includes('周五'+"("+this.days[4]+")")
           var isHas_16 = headers.includes('_8')
-          console.log(isHas_1)
 
           var isHas_17 = headers.includes('_9')
-          console.log(isHas_1)
 
-          var isHas_18 = headers.includes('周六')
-          console.log(isHas_1)
+          var isHas_18 = headers.includes('周六'+"("+this.days[5]+")")
 
           var isHas_19 = headers.includes('_10')
-          console.log(isHas_1)
 
           var isHas_20 = headers.includes('_11')
-          console.log(isHas_1)
 
-          var isHas_21 = headers.includes('周日')
-          console.log(isHas_1)
+          var isHas_21 = headers.includes('周日'+"("+this.days[6]+")")
 
           var isHas_22 = headers.includes('_12')
-          console.log(isHas_1)
-
           var isHas_23 = headers.includes('_13')
-          console.log(isHas_1)
 
-          var isHas_24 = headers.includes('周一_1')
+          var isHas_24 = headers.includes('周一'+"("+this.days[7]+")")
           var isHas_25 = headers.includes('_14')
           var isHas_26 = headers.includes('_15')
-          var isHas_27 = headers.includes('周二_1')
+          var isHas_27 = headers.includes('周二'+"("+this.days[8]+")")
           var isHas_28 = headers.includes('_16')
           var isHas_29 = headers.includes('_17')
-          var isHas_30 = headers.includes('周三_1')
+          var isHas_30 = headers.includes('周三'+"("+this.days[9]+")")
           var isHas_31 = headers.includes('_18')
           var isHas_32 = headers.includes('_19')
-          var isHas_33 = headers.includes('周四_1')
+          var isHas_33 = headers.includes('周四'+"("+this.days[10]+")")
           var isHas_34 = headers.includes('_20')
           var isHas_35 = headers.includes('_21')
-          var isHas_36 = headers.includes('周五_1')
+          var isHas_36 = headers.includes('周五'+"("+this.days[11]+")")
           var isHas_37 = headers.includes('_22')
           var isHas_38 = headers.includes('_23')
-          var isHas_39 = headers.includes('周六_1')
+          var isHas_39 = headers.includes('周六'+"("+this.days[12]+")")
           var isHas_40 = headers.includes('_24')
           var isHas_41 = headers.includes('_25')
-          var isHas_42 = headers.includes('周日_1')
+          var isHas_42 = headers.includes('周日'+"("+this.days[13]+")")
           var isHas_43 = headers.includes('_26')
           var isHas_44 = headers.includes('_27')
-          var isHas_45 = headers.includes('周一_2')
+          var isHas_45 = headers.includes('周一'+"("+this.days[14]+")")
           var isHas_46 = headers.includes('_28')
           var isHas_47 = headers.includes('_29')
-          var isHas_48 = headers.includes('周二_2')
+          var isHas_48 = headers.includes('周二'+"("+this.days[15]+")")
           var isHas_49 = headers.includes('_30')
           var isHas_50 = headers.includes('_31')
-          var isHas_51 = headers.includes('周三_2')
+          var isHas_51 = headers.includes('周三'+"("+this.days[16]+")")
           var isHas_52 = headers.includes('_32')
           var isHas_53 = headers.includes('_33')
-          var isHas_54 = headers.includes('周四_2')
+          var isHas_54 = headers.includes('周四'+"("+this.days[17]+")")
           var isHas_55 = headers.includes('_34')
           var isHas_56 = headers.includes('_35')
-          var isHas_57 = headers.includes('周五_2')
+          var isHas_57 = headers.includes('周五'+"("+this.days[18]+")")
           var isHas_58 = headers.includes('_36')
           var isHas_59 = headers.includes('_37')
-          var isHas_60 = headers.includes('周六_2')
+          var isHas_60 = headers.includes('周六'+"("+this.days[19]+")")
           var isHas_61 = headers.includes('_38')
           var isHas_62 = headers.includes('_39')
-          var isHas_63 = headers.includes('周日_2')
+          var isHas_63 = headers.includes('周日'+"("+this.days[20]+")")
           var isHas_64 = headers.includes('_40')
           var isHas_65 = headers.includes('_41')
 
@@ -595,12 +587,10 @@
             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("1111111")
             this.dialogVisible = true
             return
           }
         } else {
-          console.log("2222222222")
 
           this.dialogVisible = true
           return
@@ -802,9 +792,9 @@
           return
         } else {
           if (is_exist_repeat) {
-            this.isExistRepeatVisible = true
-            return
-          } else {
+          //   this.isExistRepeatVisible = true
+          //   return
+          // } else {
             // this.exportVisible = true
 
             this.$alert('您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
@@ -850,14 +840,14 @@
       getWeekByResultsStr(key) {
 
         switch (key) {
-          case '周一':
+          case '周一'+"("+this.days[0]+")":
             return '1'
             break
-          case  '周一_1':
+          case  '周一'+"("+this.days[7]+")":
             return '1'
             break
 
-          case   '周一_2':
+          case   '周一'+"("+this.days[14]+")":
             return '1'
             break
 
@@ -885,13 +875,13 @@
             return '1'
             break
 
-          case '周二' :
+          case '周二'+"("+this.days[1]+")" :
             return '2'
             break
-          case '周二_1':
+          case '周二'+"("+this.days[8]+")":
             return '2'
             break
-          case '周二_2' :
+          case '周二'+"("+this.days[15]+")" :
             return '2'
             break
 
@@ -919,13 +909,13 @@
             return '2'
             break
 
-          case '周三':
+          case '周三'+"("+this.days[2]+")":
             return '3'
             break
-          case '周三_1':
+          case '周三'+"("+this.days[9]+")":
             return '3'
             break
-          case  '周三_2':
+          case  '周三'+"("+this.days[16]+")":
             return '3'
             break
           case  '_4' :
@@ -947,14 +937,14 @@
             return '3'
             break
 
-          case '周四':
+          case '周四'+"("+this.days[3]+")":
             return '4'
             break
 
-          case '周四_1' :
+          case '周四'+"("+this.days[10]+")" :
             return '4'
             break
-          case'周四_2' :
+          case'周四'+"("+this.days[17]+")" :
             return '4'
             break
           case  '_6' :
@@ -977,14 +967,14 @@
             return '4'
             break
 
-          case '周五' :
+          case '周五'+"("+this.days[4]+")" :
             return '5'
             break
 
-          case  '周五_1':
+          case  '周五'+"("+this.days[11]+")":
             return '5'
             break
-          case  '周五_2' :
+          case  '周五'+"("+this.days[18]+")" :
             return '5'
             break
           case '_8':
@@ -1005,13 +995,13 @@
           case  '_37':
             return '5'
             break
-          case '周六':
+          case '周六'+"("+this.days[5]+")":
             return '6'
             break
-          case  '周六_1':
+          case  '周六'+"("+this.days[12]+")":
             return '6'
             break
-          case  '周六_2' :
+          case  '周六'+"("+this.days[19]+")":
             return '6'
             break
           case  '_10' :
@@ -1033,13 +1023,13 @@
             return '6'
             break
 
-          case '周日':
+          case '周日' +"("+this.days[6]+")":
             return '7'
             break
-          case  '周日_1' :
+          case  '周日'+"("+this.days[13]+")":
             return '7'
             break
-          case '周日_2' :
+          case '周日'+"("+this.days[20]+")":
             return '7'
             break
           case '_12' :
@@ -1068,7 +1058,7 @@
 
       }, getRow(key) {
         switch (key) {
-          case '周一' : //本周一
+          case '周一'+"("+this.days[0]+")" : //本周一
 
             return 'C'
             break
@@ -1081,7 +1071,7 @@
             return 'E'
             break
 
-          case '周一_1': //下周一
+          case '周一'+"("+this.days[7]+")": //下周一
 
             return 'X'
 
@@ -1096,7 +1086,7 @@
             return 'Z'
             break
 
-          case '周一_2' : //下下周一
+          case '周一'+"("+this.days[14]+")" : //下下周一
 
             return 'AS'
             break
@@ -1111,7 +1101,7 @@
             return 'AU'
             break
 
-          case '周二' : //本周二
+          case '周二'+"("+this.days[1]+")" : //本周二
             return 'F'
             break
 
@@ -1123,7 +1113,7 @@
             return 'H'
             break
 
-          case '周二_1'://下周二
+          case '周二'+"("+this.days[8]+")"://下周二
             return 'AA'
 
             break
@@ -1138,7 +1128,7 @@
 
             break
 
-          case '周二_2' ://下下周二
+          case '周二'+"("+this.days[15]+")"://下下周二
             return 'AV'
 
             break
@@ -1152,7 +1142,7 @@
             return 'AX'
             break
 
-          case '周三' : //本周三
+          case '周三' +"("+this.days[2]+")": //本周三
             return 'I'
 
             break
@@ -1165,7 +1155,7 @@
             return 'K'
             break
 
-          case '周三_1': //下周三
+          case '周三'+"("+this.days[9]+")": //下周三
             return 'AD'
 
             break
@@ -1180,7 +1170,7 @@
 
             break
 
-          case '周三_2' : //下下周三
+          case '周三'+"("+this.days[16]+")" : //下下周三
             return 'AY'
 
             break
@@ -1195,7 +1185,7 @@
 
             break
 
-          case '周四':
+          case '周四'+"("+this.days[3]+")":
             return 'L'
 
             break
@@ -1210,7 +1200,7 @@
 
             break
 
-          case '周四_1':
+          case '周四'+"("+this.days[10]+")":
             return 'AG'
 
             break
@@ -1226,7 +1216,7 @@
 
             break
 
-          case '周四_2' :
+          case '周四'+"("+this.days[17]+")":
 
             return 'BB'
 
@@ -1243,7 +1233,7 @@
             return 'BD'
 
             break
-          case '周五':
+          case '周五'+"("+this.days[4]+")":
             return 'O'
 
             break
@@ -1256,7 +1246,7 @@
           case  '_9':
             return 'Q'
             break
-          case '周五_1' :
+          case '周五'+"("+this.days[11]+")":
             return 'AJ'
             break
 
@@ -1269,7 +1259,7 @@
             return 'AL'
 
             break
-          case '周五_2' :
+          case '周五'+"("+this.days[18]+")":
             return 'BE'
 
             break
@@ -1284,7 +1274,7 @@
 
             break
 
-          case '周六' :
+          case '周六' +"("+this.days[5]+")" :
             return 'R'
 
             break
@@ -1298,7 +1288,7 @@
             return 'T'
 
             break
-          case '周六_1' :
+          case '周六'+"("+this.days[12]+")":
             return 'AM'
 
             break
@@ -1313,7 +1303,7 @@
 
             break
 
-          case '周六_2' :
+          case '周六'+"("+this.days[19]+")":
             return 'BH'
 
             break
@@ -1327,7 +1317,7 @@
             return 'BJ'
 
             break
-          case '周日' :
+          case '周日'+"("+this.days[6]+")" :
             return 'U'
 
             break
@@ -1341,7 +1331,7 @@
             return 'W'
 
             break
-          case '周日_1' :
+          case '周日'+"("+this.days[13]+")":
             return 'AP'
 
             break
@@ -1355,7 +1345,7 @@
             return 'AR'
 
             break
-          case '周日_2':
+          case '周日'+"("+this.days[20]+")":
             return 'BK'
 
             break
@@ -1373,7 +1363,7 @@
       }, getDateByResultsStr(key) {
 
         switch (key) {
-          case '周一' : //本周一
+          case '周一'+"("+this.days[0]+")" : //本周一
 
             return this.days[0]
             break
@@ -1387,7 +1377,7 @@
             return this.days[0]
             break
 
-          case '周一_1': //下周一
+          case '周一'+"("+this.days[7]+")": //下周一
             return this.days[7]
 
             break
@@ -1404,7 +1394,7 @@
 
             break
 
-          case '周一_2' : //下下周一
+          case '周一'+"("+this.days[14]+")": //下下周一
 
             return this.days[14]
 
@@ -1422,7 +1412,7 @@
 
             break
 
-          case '周二' : //本周二
+          case '周二'+"("+this.days[1]+")": //本周二
             return this.days[1]
 
             break
@@ -1437,7 +1427,7 @@
 
             break
 
-          case '周二_1'://下周二
+          case '周二'+"("+this.days[8]+")"://下周二
             return this.days[8]
 
             break
@@ -1452,7 +1442,7 @@
 
             break
 
-          case '周二_2' ://下下周二
+          case '周二'+"("+this.days[15]+")"://下下周二
             return this.days[15]
 
             break
@@ -1467,7 +1457,7 @@
 
             break
 
-          case '周三' : //本周三
+          case '周三'+"("+this.days[2]+")" : //本周三
             return this.days[2]
 
             break
@@ -1482,7 +1472,7 @@
 
             break
 
-          case '周三_1': //下周三
+          case '周三'+"("+this.days[9]+")": //下周三
             return this.days[9]
 
             break
@@ -1497,7 +1487,7 @@
 
             break
 
-          case '周三_2' : //下下周三
+          case '周三'+"("+this.days[16]+")": //下下周三
             return this.days[16]
 
             break
@@ -1512,7 +1502,7 @@
 
             break
 
-          case '周四':
+          case '周四'+"("+this.days[3]+")":
             return this.days[3]
 
             break
@@ -1527,7 +1517,7 @@
 
             break
 
-          case '周四_1':
+          case '周四'+"("+this.days[10]+")":
 
             return this.days[10]
 
@@ -1545,7 +1535,7 @@
 
             break
 
-          case '周四_2' :
+          case '周四'+"("+this.days[17]+")":
 
             return this.days[17]
 
@@ -1562,7 +1552,7 @@
             return this.days[17]
 
             break
-          case '周五':
+          case '周五'+"("+this.days[4]+")":
             return this.days[4]
 
             break
@@ -1576,7 +1566,7 @@
             return this.days[4]
 
             break
-          case '周五_1' :
+          case '周五'+"("+this.days[11]+")" :
             return this.days[11]
 
             break
@@ -1590,7 +1580,7 @@
             return this.days[11]
 
             break
-          case '周五_2' :
+          case '周五'+"("+this.days[18]+")":
             return this.days[18]
 
             break
@@ -1605,7 +1595,7 @@
 
             break
 
-          case '周六' :
+          case '周六'+"("+this.days[5]+")":
             return this.days[5]
 
             break
@@ -1619,7 +1609,7 @@
             return this.days[5]
 
             break
-          case '周六_1' :
+          case '周六'+"("+this.days[12]+")":
             return this.days[12]
 
             break
@@ -1634,7 +1624,7 @@
 
             break
 
-          case '周六_2' :
+          case '周六'+"("+this.days[19]+")":
             return this.days[19]
 
             break
@@ -1648,7 +1638,7 @@
             return this.days[19]
 
             break
-          case '周日' :
+          case '周日'+"("+this.days[6]+")" :
             return this.days[6]
 
             break
@@ -1661,7 +1651,7 @@
           case  '_13':
             return this.days[6]
             break
-          case '周日_1' :
+          case '周日'+"("+this.days[13]+")":
             return this.days[13]
 
             break
@@ -1675,7 +1665,7 @@
             return this.days[13]
 
             break
-          case '周日_2':
+          case '周日'+"("+this.days[20]+")":
             return this.days[20]
 
             break