Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

src/api/schedule.js

@@ -30,6 +30,14 @@ export function getSchedulesOne(params) {
   })
 }
 
+export function getSchedulesTwo(params) {
+  return request({
+    url: '/api/schedule/scheduletwo',
+    method: 'get',
+    params: params
+  })
+}
+
 export function getSchedulePatients(params) {
   return request({
     url: '/api/schedule/patients',

src/router/modules/workforce.js

@@ -67,6 +67,7 @@ export default {
       noCache: true
     }
   },
+
   {
     path: '/workforce/template',
     component: () => import('@/xt_pages/workforce/template'),
@@ -154,6 +155,17 @@ export default {
       title: 'scheduleTablePrintOne',
       noCache: true
     }
+  },
+  {
+    path: '/scheduleTablePrintTwo',
+    component: () => import('@/xt_pages/workforce/scheduleTablePrintTwo'),
+    name: 'scheduleTablePrintTwo',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'scheduleTablePrintTwo',
+      noCache: true
+    }
   }
   ]
 }

src/xt_pages/data/printTemplate/schedulePrint.vue

@@ -80,6 +80,31 @@
         <el-radio v-model="radio" label="3" @change="change">模版三</el-radio
         >
         </el-col>
+
+      
+
+       <el-col
+        :span="6"
+        style="margin-left: 100px;margin-right: 100px;text-align: center"
+        >
+        <div
+          @click="imgClick('https://kuyi.shengws.com/tempSchedule2.jpg')"
+        >
+            <el-tooltip
+            class="item"
+            effect="dark"
+            content="点击查看大图"
+            placement="top-start"
+            :hide-after="2000"
+            >
+            <el-image
+                style="width: 200px; height: 200px"
+                :src="require('@/assets/home/222.jpg')"
+            ></el-image>
+            </el-tooltip>
+        </div>
+        <el-radio v-model="radio" label="4" @change="change">模版四</el-radio>
+        </el-col>
     </el-row>
    
       <el-image-viewer

src/xt_pages/dialysis/allSummaryDialog_print.vue

@@ -16,7 +16,7 @@
                     </div>
                     <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
                         <p>统计时间：{{start_time}}-{{end_time}}</p>
-                        <p>印单日期：{{print_date}}</p>
+                        <p>打印单日期：{{print_date}}</p>
                     </div>
                     <div class="table_panel">
                         <table class="table">

src/xt_pages/dialysis/allSummary_print.vue

@@ -15,7 +15,7 @@
                         <span class="main_title">汇总统计表</span>
                     </div>
                     <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
-                        <p>印单日期：{{print_date}}</p>
+                        <p>打印单日期：{{print_date}}</p>
                     </div>
                     <div class="table_panel">
                         <table class="table">

src/xt_pages/dialysis/consumables_print.vue

@@ -16,7 +16,7 @@
                     </div>
                     <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
                         <p>统计时间:{{query.start_time}} - {{query.end_time}}</p>
-                        <p>印单日期:{{print_time}}</p>
+                        <p>打印单日期:{{print_time}}</p>
                     </div>
                     <div class="table_panel">
                         <table class="table">

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

@@ -290,7 +290,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-if="template_id != 6 && org_id!=10223"
+          v-if="template_id != 6 && org_id!=10223 && org_id!=10445"
           prop="checker"
           min-width="30px"
           align="center"
@@ -300,8 +300,6 @@
             <span>
               {{getXuserName(scope.row.checker)}}
             </span>
-
-
           </template>
         </el-table-column>
       </el-table>

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

@@ -271,7 +271,7 @@
                     </el-col>
 
                     <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item
                                     v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id!=9990'
@@ -328,6 +328,7 @@
                             </el-form-item>
                           </div>
                         </div>
+
                         <div v-else>
                             <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'首剂(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -2239,7 +2240,7 @@
             }
            }else if(this.$store.getters.xt_user.org.id == 9671 ||this.$store.getters.xt_user.org.id == 10340){
               if (schedual.schedule_type == 1) {
-              this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'
+              this.start_time = year + '-' + month + '-' + day + ' ' + '6:30'
             } else if (schedual.schedule_type == 2) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
             } else if (schedual.schedule_type == 3) {

src/xt_pages/dialysis/dialysisDrugs_print.vue

@@ -16,7 +16,7 @@
                     </div>
                     <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
                         <p>统计时间：{{start_time}}-{{end_time}}</p>
-                        <p>印单日期：{{print_time}}</p>
+                        <p>打印单日期：{{print_time}}</p>
                     </div>
                     <div class="table_panel">
                         <table class="table">

src/xt_pages/dialysis/dialysisParameters_print.vue

@@ -15,7 +15,7 @@
                         <span class="main_title">透析参数打印单</span>
                     </div>
                     <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
-                        <p>印单日期：{{nowDate}}</p>
+                        <p>打印单日期：{{nowDate}}</p>
                     </div>
                     <div class="table_panel">
                       <table class="table">

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -9,7 +9,7 @@
       </el-form-item>
 
       <el-form-item
-        
+
         label="总计："
         prop="name"
         :validate-event="is_Name"
@@ -39,7 +39,7 @@
       </el-form-item>
 
       <el-form-item
-       
+
         label="自费："
         prop="age"
         :validate-event="is_Name"
@@ -55,7 +55,7 @@
       </el-form-item>
 
       <el-form-item
-       
+
         label="个账支出："
         prop="age"
         :validate-event="is_Name"
@@ -88,7 +88,7 @@
     <el-form-item label="支付方式：" style="width:100%;">
          <el-radio-group v-model="form.pay_way">
           <el-radio :label="item.value" :value="item.value" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
-           <el-button type="primary" v-if="form.pay_way == 4" @click="reading()">读卡</el-button>
+           <el-button type="primary" v-if="form.pay_way == 4 || form.pay_way == 6" @click="reading()">读卡</el-button>
 
          </el-radio-group>
       </el-form-item>
@@ -229,6 +229,8 @@
           // {value: 3, label: '微信'},
           // {value: 4, label: '支付宝'},
           { value: 4, label: '医保卡' },
+          { value: 6, label: '电子凭证' },
+
 
         ],
         total: "",
@@ -276,11 +278,17 @@
       methods: {
         reading() {
           var that = this
+
+          let id_card_type = 1
+          if (this.form.pay_way == 6){
+            id_card_type = 4
+          }
           let params = {
-            'id_card_type': 1,
+            'id_card_type': id_card_type,
             'admin_user_id': this.$store.getters.xt_user.user.id,
             'certificates':1,
           }
+          
           axios.get('http://127.0.0.1:9532/zh/api/readcard', {
             params: params
           })
@@ -489,6 +497,6 @@ border: 1px solid #66b1ff;
   .el-input__inner{
     font-weight: bolder;
   }
-  
+
 }
 </style>

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2556,62 +2556,65 @@ export default {
                   }
 
 
-              // var project_arr = []
-              // //耗材
-              // for(let i=0;i<this.prescriptions.length;i++){
-              //   if(this.prescriptions[i].id == 0){
-              //     for(let j=0;j<this.prescriptions[i].project.length;j++){
-              //        if(this.prescriptions[i].project[j].type == 3){
-              //          project_arr.push(this.prescriptions[i].project[j])
-              //        }
-                    
-              //     }
-              //   }
-              // }
+              if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 9679){
+                  var project_arr = []
+                    //耗材
+                    for(let i=0;i<this.prescriptions.length;i++){
+                      if(this.prescriptions[i].id == 0){
+                        for(let j=0;j<this.prescriptions[i].project.length;j++){
+                          if(this.prescriptions[i].project[j].type == 3){
+                            project_arr.push(this.prescriptions[i].project[j])
+                          }
+                          
+                        }
+                      }
+                    }
 
-              // if(project_arr.length > 0){
-              //     let objInfo = {};
-              //     project_arr.forEach((item, index) => {
-              //     let { project_id } = item.project_id;
-              //     if (!objInfo[project_id]) {
-              //         objInfo[project_id] = {
-              //           project_id:item.project_id,
-              //           child: [],
-              //           sum_count:item.good_info.sum_count,
-              //           out_count:0,
-              //           str:item.good_info.good_name +" "+ item.good_info.specification_name,
-              //           is_user:item.good_info.is_user,
-              //         };
-              //       }
-              //     });
-              //     let newProjectArr = Object.values(objInfo);
+                    if(project_arr.length > 0){
+                        let objInfo = {};
+                        project_arr.forEach((item, index) => {
+                        let { project_id } = item.project_id;
+                        if (!objInfo[project_id]) {
+                            objInfo[project_id] = {
+                              project_id:item.project_id,
+                              child: [],
+                              sum_count:item.good_info.sum_count,
+                              out_count:0,
+                              str:item.good_info.good_name +" "+ item.good_info.specification_name,
+                              is_user:item.good_info.is_user,
+                            };
+                          }
+                        });
+                        let newProjectArr = Object.values(objInfo);
 
 
-              //     for(let i=0;i<project_arr.length;i++){
-              //       for(let j=0;j<newProjectArr.length;j++){
-              //         if(project_arr[i].project_id == newProjectArr[j].project_id){
-              //           newProjectArr[j].child.push(project_arr[i])
-              //         }
-              //       }
-              //     }
-                 
-                  
-              //     for(let i=0;i<newProjectArr.length;i++){
-              //       for(let j=0;j<newProjectArr[i].child.length;j++){
-              //          newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
-              //       }
-              //     }
-              //     console.log("河滨232332newArr",newProjectArr)
-              //     for(let i=0;i<newProjectArr.length;i++){
-              //        if(newProjectArr[i].out_count > newProjectArr[i].sum_count){
-              //             this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
-              //             isLoading = false
-              //             this.$emit('editKeepLoad', false)
-              //             return 
-              //        } 
-              //     }
+                        for(let i=0;i<project_arr.length;i++){
+                          for(let j=0;j<newProjectArr.length;j++){
+                            if(project_arr[i].project_id == newProjectArr[j].project_id){
+                              newProjectArr[j].child.push(project_arr[i])
+                            }
+                          }
+                        }
+                      
+                        
+                        for(let i=0;i<newProjectArr.length;i++){
+                          for(let j=0;j<newProjectArr[i].child.length;j++){
+                            newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
+                          }
+                        }
+                        console.log("河滨232332newArr",newProjectArr)
+                        for(let i=0;i<newProjectArr.length;i++){
+                          if(newProjectArr[i].out_count > newProjectArr[i].sum_count){
+                                this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
+                                isLoading = false
+                                this.$emit('editKeepLoad', false)
+                                return 
+                          } 
+                        }
 
-              //    }  
+                      }  
+                    }
+           
                 }
                 createHisPrescription(data, params).then(response => {
                   if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2561,63 +2561,66 @@
                     }
                   }
                 }
+               
+               if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 9679){
+                  var project_arr = []
+                  //耗材
+                  for(let i=0;i<this.prescriptions.length;i++){
+                    if(this.prescriptions[i].id == 0){
+                      for(let j=0;j<this.prescriptions[i].project.length;j++){
+                        if(this.prescriptions[i].project[j].type ==3){
+                          project_arr.push(this.prescriptions[i].project[j])
+                        }
+                        
+                      }
+                    }
+                  }
 
-              // var project_arr = []
-              // //耗材
-              // for(let i=0;i<this.prescriptions.length;i++){
-              //   if(this.prescriptions[i].id == 0){
-              //     for(let j=0;j<this.prescriptions[i].project.length;j++){
-              //        if(this.prescriptions[i].project[j].type ==3){
-              //          project_arr.push(this.prescriptions[i].project[j])
-              //        }
-                     
-              //     }
-              //   }
-              // }
-
-              // if(project_arr.length > 0){
-              //     let objInfo = {};
-              //     project_arr.forEach((item, index) => {
-              //     let { project_id } = item.project_id;
-              //     if (!objInfo[project_id]) {
-              //         objInfo[project_id] = {
-              //           project_id:item.project_id,
-              //           child: [],
-              //           sum_count:item.good_info.sum_count,
-              //           out_count:0,
-              //           str:item.good_info.good_name +" "+ item.good_info.specification_name,
-              //           is_user:item.good_info.is_user,
-              //         };
-              //       }
-              //     });
-              //     let newProjectArr = Object.values(objInfo);
+                  if(project_arr.length > 0){
+                      let objInfo = {};
+                      project_arr.forEach((item, index) => {
+                      let { project_id } = item.project_id;
+                      if (!objInfo[project_id]) {
+                          objInfo[project_id] = {
+                            project_id:item.project_id,
+                            child: [],
+                            sum_count:item.good_info.sum_count,
+                            out_count:0,
+                            str:item.good_info.good_name +" "+ item.good_info.specification_name,
+                            is_user:item.good_info.is_user,
+                          };
+                        }
+                      });
+                      let newProjectArr = Object.values(objInfo);
 
 
-              //     for(let i=0;i<project_arr.length;i++){
-              //       for(let j=0;j<newProjectArr.length;j++){
-              //         if(project_arr[i].project_id == newProjectArr[j].project_id){
-              //           newProjectArr[j].child.push(project_arr[i])
-              //         }
-              //       }
-              //     }
-                 
-                  
-              //     for(let i=0;i<newProjectArr.length;i++){
-              //       for(let j=0;j<newProjectArr[i].child.length;j++){
-              //          newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
-              //       }
-              //     }
-              //     console.log("河滨232332newArr",newProjectArr)
-              //     for(let i=0;i<newProjectArr.length;i++){
-              //        if(newProjectArr[i].out_count > newProjectArr[i].sum_count){
-              //             this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
-              //             isLoading = false
-              //             this.$emit('editKeepLoad', false)
-              //             return 
-              //        } 
-              //     }
-                  
-              //   }
+                      for(let i=0;i<project_arr.length;i++){
+                        for(let j=0;j<newProjectArr.length;j++){
+                          if(project_arr[i].project_id == newProjectArr[j].project_id){
+                            newProjectArr[j].child.push(project_arr[i])
+                          }
+                        }
+                      }
+                    
+                      
+                      for(let i=0;i<newProjectArr.length;i++){
+                        for(let j=0;j<newProjectArr[i].child.length;j++){
+                          newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
+                        }
+                      }
+                      console.log("河滨232332newArr",newProjectArr)
+                      for(let i=0;i<newProjectArr.length;i++){
+                        if(newProjectArr[i].out_count > newProjectArr[i].sum_count){
+                              this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
+                              isLoading = false
+                              this.$emit('editKeepLoad', false)
+                              return 
+                        } 
+                      }
+                      
+                    }
+               }
+           
                 createHisPrescription(data, params).then(response => {
                   if (response.data.state == 1) {
                     this.$emit('change', this.patientInfo.id)

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -47,12 +47,17 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="地址">
                     <template slot-scope="scope">
-                        {{scope.row.home_address}}
+                        {{scope.row.homel__address}}
                     </template>
                 </el-table-column>
+              <el-table-column align="center" prop="name" width="160" label="鉴定定点医药机构编码">
+                <template slot-scope="scope">
+                  <el-input v-model="hospital_code"></el-input>
+                </template>
+              </el-table-column>
                 <el-table-column align="center" prop="name" width="160" label="鉴定定点医药机构">
                     <template slot-scope="scope">
-                        {{$store.getters.xt_user.org.org_name}}
+                       <el-input v-model="hospital_name"></el-input>
                     </template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="医生">
@@ -225,6 +230,8 @@
         start_date:'',
         end_date:"",
         check_date:"",
+        hospital_code:"",
+        hospital_name:"",
         datas: [
           {
             id: 0,
@@ -558,6 +565,9 @@
           return
         }
 
+
+
+
         let params = {
           record_type: 0,
           patient_id: this.currentObject.id,
@@ -569,7 +579,9 @@
           sick_id: this.currentObject.record.sick_type,
           doctor_id: this.currentObject.record.doctor_id,
           department_id:this.currentObject.record.department_id,
-          admin_user_id: this.$store.getters.xt_user.user.id
+          admin_user_id: this.$store.getters.xt_user.user.id,
+          hospital_name:this.hospital_name,
+          hospital_code: this.hospital_code,
         };
 
         var that = this;

src/xt_pages/stock/detail/print.vue

@@ -186,7 +186,7 @@
       },
       getDateTwo(){
         var ptime = Math.round(new Date().getTime() / 1000)
-        return "印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
       },
       getTime(value, temp) {
         if (value == 0) {

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -214,7 +214,7 @@
                     @change="changeUnit(scope.row,scope.$index)"
                   >
                     <el-option
-                      v-for="(option, index) in unitList"
+                      v-for="(option, index) in scope.row.unitList"
                       :key="index"
                       :label="option.name"
                       :value="option.name"
@@ -913,6 +913,13 @@ export default {
                 }
                 list[i].last_price = list[i].price
                 list[i].warehousing_count = list[i].warehousing_count.toString()
+                list[i].unitList = []
+                var obj = {id:1,name:""}
+                obj.name = list[i].drug.max_unit
+                var objOne = {id:2,name:""}
+                objOne.name = list[i].drug.min_unit
+                list[i].unitList.push(obj)
+                list[i].unitList.push(objOne)
               }
               this.recordInfo.recordData = []
               this.recordInfo.recordData = list
@@ -1036,7 +1043,15 @@ export default {
           } else {
             this.recordInfo.recordData[i].dealer = val.dealer;
           }
+          this.recordInfo.recordData[i].unitList = []
+          var obj = {id:1,name:""}
+          var objOne= {id:2,name:""}
+          obj.name = val.max_unit
+          objOne.name = val.min_unit
+          this.recordInfo.recordData[i].unitList.push(obj)
+          this.recordInfo.recordData[i].unitList.push(objOne)
         }
+
       }
     },
     toCheck(){
@@ -1147,7 +1162,8 @@ export default {
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
 
-    this.unitList = getDataConfig("hemodialysis", "units");
+    // this.unitList = getDataConfig("hemodialysis", "units");
+    // console.log("hhahdhhafd",this.unitList)
   },
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -198,7 +198,7 @@
                    <!-- {{scope.row.max_unit}} -->
                    <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px"  :disabled="disabled">
                     <el-option
-                      v-for="(option, index) in unitList"
+                      v-for="(option, index) in scope.row.unitList"
                       :key="index"
                       :label="option.name"
                       :value="option.name"
@@ -762,6 +762,14 @@ export default {
                 }
                 list[i].last_price = list[i].price
                 list[i].warehousing_count = list[i].warehousing_count.toString()
+                list[i].unitList = []
+                var obj = {id:1,name:""}
+                obj.name = list[i].drug.max_unit
+                var objOne = {id:2,name:""}
+                objOne.name = list[i].drug.min_unit
+                list[i].unitList.push(obj)
+                list[i].unitList.push(objOne)
+
               }
               this.recordInfo.recordData = []
               this.recordInfo.recordData = list
@@ -826,6 +834,15 @@ export default {
            if(response.data.data.info[i].dealer == 0){
                response.data.data.info[i].dealer = ""
             }
+           
+            response.data.data.info[i].unitList = []
+            var obj = {id:1,name:""}
+            var objOne = {id:2,name:""}
+            obj.name = response.data.data.info[i].drug.max_unit
+            objOne.name = response.data.data.info[i].drug.min_unit
+            response.data.data.info[i].unitList.push(obj)
+            response.data.data.info[i].unitList.push(objOne)
+            
 
             this.recordInfo.recordData.push(response.data.data.info[i]);
 
@@ -840,6 +857,8 @@ export default {
                  response.data.data.info[i].dealer = dealerList[z].dealer_name
                }
             }
+
+          
           }
           this.warehouse = response.data.data.warehousing;
           this.storehouse_id = response.data.data.warehousing.storehouse_id
@@ -927,6 +946,14 @@ export default {
                this.recordInfo.recordData[i].dealer =  val.dealer
              }
 
+            this.recordInfo.recordData[i].unitList = []
+            var obj = {id:1,name:""}
+            var objOne= {id:2,name:""}
+            obj.name = val.max_unit
+            objOne.name = val.min_unit
+            this.recordInfo.recordData[i].unitList.push(obj)
+            this.recordInfo.recordData[i].unitList.push(objOne)
+
            }
         }
       },
@@ -992,7 +1019,7 @@ export default {
     const order_id = this.$route.query.id;
     this.GetOrderDetail(order_id);
     this.is_check = parseInt(this.$route.query.is_check)
-    this.unitList =  getDataConfig('hemodialysis','units')
+    // this.unitList =  getDataConfig('hemodialysis','units')
     if( parseInt(this.$route.query.supply_warehouse_id)>0){
       this.disabled = true
     }

src/xt_pages/workforce/appointment.vue

@@ -126,13 +126,13 @@
       <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
                   :schedule-zone-row-prop="scheduleZoneRow"
                   :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                  @event2="changeSchedule" v-if="!is_edit">
+                  @event2="changeSchedule" v-if="!is_edit" @event3="changeWeekDay">
       </table-data>
 
       <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
                        :schedule-zone-row-prop="scheduleZoneRow"
                        :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                       @event2="changeSchedule" v-if="is_edit"></edit-table-data>
+                       @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay"></edit-table-data>
 
 
       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
@@ -266,7 +266,8 @@ export default {
       nowYear: new Date().getFullYear(),
       schedule_week: 0,
       newDay: [],
-      templateObj: {}
+      templateObj: {},
+      week_date:""
     }
   },
   components: {
@@ -278,12 +279,12 @@ export default {
   },
   methods: {
     dragstart(event, item) {
-      console.log('start的索引',item.moveIndex)
+      // console.log('start的索引',item.moveIndex)
       // 开始移动的时候将移动的索引值+图片的url存储下来
 
     },
     dragend(event,item) {
-      console.log('dragend',item)
+      // console.log('dragend',item)
 
     },
     getAllZones(){
@@ -639,13 +640,13 @@ export default {
           })
 
         }
-        console.log("111111111")
-        console.log(that.scheduleZone)
+        // console.log("111111111")
+        // console.log(that.scheduleZone)
       })
     },changeSch(val){
-      console.log(this.partitions)
-      console.log(this.scheduleZoneRow)
-      console.log(this.scheduleZone)
+      // console.log(this.partitions)
+      // console.log(this.scheduleZoneRow)
+      // console.log(this.scheduleZone)
 
 
 
@@ -839,10 +840,14 @@ export default {
         this.$router.push({path: '/workforce/schedule/print', query: {date: date}})
       }
       if (this.templateObj.template_id == 2) {
-        this.$router.push({path: '/scheduleTablePrint?partition_id=' + this.partition_id + "&weekTime=" + this.activeName})
+        this.$router.push({path: '/scheduleTablePrint?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date})
       }
       if (this.templateObj.template_id == 3) {
-        this.$router.push({path: '/scheduleTablePrintOne?partition_id=' + this.partition_id + "&weekTime=" + this.activeName})
+        this.$router.push({path: '/scheduleTablePrintOne?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date})
+      }
+
+      if(this.templateObj.template_id == 4){
+        this.$router.push({path: '/scheduleTablePrintTwo?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date})
       }
 
     },
@@ -2814,6 +2819,13 @@ export default {
       this.getWeekPanels()
     },
 
+    changeWeekDay(val){
+      console.log("Val2332322323wo",val)
+      var str = val.join(",")
+      console.log("stor233233223",str)
+      this.week_date = str
+    },
+
     changeWeek(val) {
 
       this.start_time = ""

src/xt_pages/workforce/components/editTableData.vue

@@ -100,6 +100,7 @@
         <span>日期：</span>
         <el-select v-model="week_type" style="margin-bottom: 15px;" placeholder="请选择" multiple>
           <el-option
+              @change="changeWeekDay"
               v-for="(item, index) in week_zhongwens"
               :key="index"
               :label="item"
@@ -4863,6 +4864,9 @@ export default {
       this.schedule_type = val;
       this.getSchedules();
     },
+    changeWeekDay(val){
+     this.$emit("event3", val);
+    }
   },
   components: {
     ScheduleItem,

src/xt_pages/workforce/components/tableData.vue

@@ -24,6 +24,7 @@
             v-model="week_type"
             placeholder="请选择"
             multiple
+           @change="changeWeekDay"
         >
           <el-option
               v-for="(item,index) in weeks"
@@ -2570,6 +2571,9 @@ export default {
      this.schedule_type = val
      this.getSchedules()
     },
+    changeWeekDay(val){
+      this.$emit('event3', val)
+    }
   },
   components: {
     ScheduleItem

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -177,7 +177,7 @@
 
 
 <script>
-import {getSchedulesOne,getWeekPanelsOne,getPatientSheduleCount,getAllZones} from "@/api/schedule";
+import {getSchedulesTwo,getWeekPanelsOne,getPatientSheduleCount,getAllZones} from "@/api/schedule";
 import print from 'print-js'
 export default {
     props:{
@@ -205,13 +205,55 @@ export default {
            total:0,
            zones:[],
            zoneIdList:[],
-           strArr:""
+           strArr:"",
+           week_date:"",
         }
     },
     created(){
         this.getAllZones()
         this.modeOptions = this.$store.getters.treatment_mode;
         this.partition_id = this.$route.query.partition_id   
+        var newList = []
+        var arr =  this.$route.query.week_date
+      
+        if(arr!=""){
+          var newArr = arr.split(",")
+         
+          if(newArr!=null&&newArr.length > 0){
+             for(let i=0;i<newArr.length;i++){
+               if(newArr[i] == "周一"){
+                  newList.push(1)
+               }
+              if(newArr[i] == "周二"){
+                  newList.push(2)
+               }
+              if(newArr[i] == "周三"){
+                  newList.push(3)
+               }
+               if(newArr[i] == "周四"){
+                  newList.push(4)
+               }
+               if(newArr[i] == "周五"){
+                  newList.push(5)
+               }
+              if(newArr[i] == "周六"){
+                  newList.push(6)
+               }
+               if(newArr[i] == "周日"){
+                  newList.push(7)
+               }
+             }
+
+            this.week_date = newList.join(",")
+          }
+        
+        }else{
+             newList = [1,2,3,4,5,6,7]
+            
+            this.week_date = newList.join(",")
+            
+        }
+        
     },
     methods:{
          getAllZones(){
@@ -242,6 +284,8 @@ export default {
                 if(partionStr != 0){
                     str = partionStr
                 }
+
+            
             getWeekPanelsOne(1,str).then(response => {
                 if (response.data.state == 0) {
                     return false
@@ -267,6 +311,7 @@ export default {
                             zone_type: partition.type,
                             cut: jihao.number,
                             jihao_id: jihao.id,
+                            sort:jihao.sort,
                             Mon_M: {
                                 schedule_id: 0,
                                 mode_id: 0,
@@ -447,12 +492,15 @@ export default {
             if(partionStr != 0){
                 str = partionStr
             }
+            console.log("week_day=",this.week_date)
             const params = {
                 weekTime:theType,
                 patitionid:str,
                 schedule_type:this.schedule_type,
+                week_date:this.week_date,
             }
-            getSchedulesOne(params).then(response => {
+            console.log("param23232323wo",params)
+            getSchedulesTwo(params).then(response => {
                 if (response.data.state == 1) {
                     this.weekTitle = response.data.data.weekTitle;
                     this.weekDays = response.data.data.days;
@@ -625,7 +673,7 @@ export default {
                         }
                        
                     });
-                    var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1"},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"jihao_id":"","total":"","zone_id":"","zone_type":""}]
+                    var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1"},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"jihao_id":"","total":"","zone_id":"","zone_type":"","sort":""}]
                      
                      
                      for(let i=0;i<newArr.length;i++){
@@ -764,7 +812,15 @@ export default {
                        }
                      }
                     console.log("newArr222222222",newArr)
+                    
                     that.scheduleZone.push(...newArr)
+                   
+                    for(let i=0;i<that.scheduleZone.length;i++){
+                      if(that.scheduleZone[i].area == "总数"){
+                         that.scheduleZone[i].sort = 999999
+                      }
+                    }
+                    that.scheduleZone.sort(this.compare('sort'))
                     console.log('总数据77777777777',that.scheduleZone)
                     
                 } else {
@@ -843,7 +899,14 @@ export default {
                   this.total = total
                }
            }) 
-        }
+        },
+        compare (property) {
+            return function (a, b) {
+                var value1 = a[property]
+                var value2 = b[property]
+                return value1 - value2
+            }
+        },
     }
 }
 </script>

src/xt_pages/workforce/scheduleTablePrintOne.vue

@@ -200,7 +200,7 @@
 
 
 <script>
-import {getSchedulesOne,getWeekPanelsOne,getPatientSheduleCount,getAllZones,getSolutionSchedule} from "@/api/schedule";
+import {getSchedulesTwo,getWeekPanelsOne,getPatientSheduleCount,getAllZones,getSolutionSchedule} from "@/api/schedule";
 import print from 'print-js'
 export default {
     props:{
@@ -229,13 +229,54 @@ export default {
            zones:[],
            zoneIdList:[],
            strArr:"",
-           solutionList:[]
+           solutionList:[],
+           week_date:"",
         }
     },
     created(){
         this.getAllZones()
         this.modeOptions = this.$store.getters.treatment_mode;
         this.partition_id = this.$route.query.partition_id
+        var newList = []
+        var arr =  this.$route.query.week_date
+      
+        if(arr!=""){
+          var newArr = arr.split(",")
+         
+          if(newArr!=null&&newArr.length > 0){
+             for(let i=0;i<newArr.length;i++){
+               if(newArr[i] == "周一"){
+                  newList.push(1)
+               }
+              if(newArr[i] == "周二"){
+                  newList.push(2)
+               }
+              if(newArr[i] == "周三"){
+                  newList.push(3)
+               }
+               if(newArr[i] == "周四"){
+                  newList.push(4)
+               }
+               if(newArr[i] == "周五"){
+                  newList.push(5)
+               }
+              if(newArr[i] == "周六"){
+                  newList.push(6)
+               }
+               if(newArr[i] == "周日"){
+                  newList.push(7)
+               }
+             }
+
+            this.week_date = newList.join(",")
+          }
+        
+        }else{
+             newList = [1,2,3,4,5,6,7]
+            
+            this.week_date = newList.join(",")
+            
+        }
         // this.getSolutionSchedule()
     },
     methods:{
@@ -549,10 +590,12 @@ export default {
                 weekTime:theType,
                 patitionid:str,
                 schedule_type:this.schedule_type,
+                week_date:this.week_date,
             }
-            getSchedulesOne(params).then(response => {
+            getSchedulesTwo(params).then(response => {
                 if (response.data.state == 1) {
                     this.weekTitle = response.data.data.weekTitle;
+                   
                     this.weekDays = response.data.data.days;
                     this.toDay = response.data.data.today;
                     var theSchedules = response.data.data.schdules;
@@ -784,7 +827,7 @@ export default {
                         }
 
                     });
-                    var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1",type:0},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"jihao_id":"","total":"","zone_id":"","zone_type":""}]
+                    var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1",type:0},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"jihao_id":"","total":"","zone_id":"","zone_type":"",sort:""}]
 
 
                      for(let i=0;i<newArr.length;i++){
@@ -924,6 +967,12 @@ export default {
                      }
                     console.log("newArr222222222",newArr)
                     that.scheduleZone.push(...newArr)
+                    for(let i=0;i<that.scheduleZone.length;i++){
+                      if(that.scheduleZone[i].area == "总数"){
+                         that.scheduleZone[i].sort = 999999
+                      }
+                    }
+                    that.scheduleZone.sort(this.compare('sort'))
                     console.log('总数据77777777777',that.scheduleZone)
                 } else {
                     this.$message.error("网络错误");
@@ -1133,7 +1182,14 @@ export default {
           }else{
             return diazers
           }
-        }
+        },
+        compare (property) {
+            return function (a, b) {
+                var value1 = a[property]
+                var value2 = b[property]
+                return value1 - value2
+            }
+        },
     }
 }
 </script>