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

package.json

@@ -56,7 +56,7 @@
     "jszip": "3.1.5",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
-    "node-sass": "^7.0.1",
+    "node-sass": "4.14.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "print-js": "^1.0.50",

src/api/his/his_export.js

@@ -7,3 +7,12 @@ export function handleData10106(params) {
     params: params
   })
 }
+
+export function handleData10318(params) {
+  return request({
+    url: '/handleData10318',
+    method: 'get',
+    params: params
+  })
+}
+

src/api/schedule_template/sch_template.js

@@ -166,5 +166,21 @@ export function getTemplateSmartDevices(params) {
   })
 }
 
+export function CoverSch(params) {
+  return request({
+    url: '/api/sch/coversch',
+    method: 'get',
+    params: params,
+  })
+}
+
+export function ExchangeSch(params) {
+  return request({
+    url: '/api/sch/exchange',
+    method: 'get',
+    params: params,
+  })
+}
+
 
 

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -28,9 +28,11 @@
           :paramsObj="invoiceParams"
         ></printTwo>
         <printThree
-          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 || org_id == 0"
+          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 "
           :paramsObj="invoiceParams"
         ></printThree>
+<!--        <print-night v-if="org_id == 10210 || org_id == 0"-->
+<!--                  :paramsObj="invoiceParams"></print-night>-->
       </div>
     </div>
   </div>
@@ -40,9 +42,11 @@
 import printOne from "./invoiceTemplate/printOne";
 import printTwo from "./invoiceTemplate/printTwo";
 import printThree from "./invoiceTemplate/printThree";
+// import PrintNight from "./invoiceTemplate/printNight";
 export default {
   name: "invoicePrint",
   components: {
+    PrintNight,
     printOne,
     printTwo,
     printThree,

src/xt_pages/outpatientCharges/summary.vue

@@ -109,6 +109,7 @@
           </el-button
           >
           <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
+          <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_two">报表下载3</el-button>
 
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
           <!--          >报表下载2-->
@@ -118,7 +119,7 @@
           <!--                    <el-button size="small" type="primary" @click="export_detail_three">报表下载2</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-          <!--          <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
+<!--                    <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
 
@@ -355,7 +356,7 @@ import {jsGetAge, uParseTime} from "@/utils/tools";
 
 import {getHisDataFive, getHisDataSix, getHisDataThree, getHisDataTwo,getAllOrders} from "../../api/his/his";
 
-import {handleData10106} from "../../api/his/his_export";
+import {handleData10106,handleData10318} from "../../api/his/his_export";
 
 export default {
   name: "OutpatientChargesSummary",
@@ -1220,7 +1221,7 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              "周期": "2022年第三季度",
+              "周期": "2022年第四季度",
               "类别": "门诊",
               "医保目录编码": list[i].code,
               "医保目录名称": list[i].name,
@@ -1631,7 +1632,107 @@ export default {
       });
 
     },
+    export_detail_ten_two(){
+      let params = {
+        start_time:this.start_time,
+        end_time:this.end_time
+      };
+      handleData10318(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          let list = [];
+          for (let i = 0; i < response.data.data.order.length; i++) {
+            let order = response.data.data.order[i];
+
+
+            let obj = {
+              姓名: order.patient.name,
+              身份证: order.patient.id_card_no,
+              西药费:0,
+              化验费:0,
+              检查费:0,
+              治疗费:0,
+              材料费:0,
+              中成药费:0,
+              备注: "就诊日期:" + this.getTimes(order.settle_accounts_date) + " 医保报销: "+order.fund_pay_sumamt + " 现金:"+order.psn_cash_pay,
+            }
+            let xiyaoPrice = 0
+            let huaYanPrice = 0
+            let jianChaPrice = 0
+            let zhiLiaoPrice = 0
+            let cailiaoPrice = 0
+            let zhongchengyaoPrice = 0
+
+              for (let b = 0; b < order.info.length; b++) {
+                if(order.info[b].med_chrgitm_type ==  '09'){
+                  xiyaoPrice = xiyaoPrice + order.info[b].det_item_fee_sumamt
+                }
+                if(order.info[b].med_chrgitm_type ==  '04'){
+                  huaYanPrice = huaYanPrice + order.info[b].det_item_fee_sumamt
+                }
+                if(order.info[b].med_chrgitm_type ==  '03'){
+                  jianChaPrice = jianChaPrice + order.info[b].det_item_fee_sumamt
+                }
+                if(order.info[b].med_chrgitm_type ==  '05'){
+                  zhiLiaoPrice = zhiLiaoPrice + order.info[b].det_item_fee_sumamt
+                }
+                if(order.info[b].med_chrgitm_type ==  '08'){
+                  cailiaoPrice = cailiaoPrice + order.info[b].det_item_fee_sumamt
+                }
+                if(order.info[b].med_chrgitm_type ==  '11'){
+                  zhongchengyaoPrice = zhongchengyaoPrice + order.info[b].det_item_fee_sumamt
+                }
+              }
+            obj.西药费 = xiyaoPrice
+            obj.化验费 = huaYanPrice
+            obj.检查费 = jianChaPrice
+            obj.治疗费 = zhiLiaoPrice
+            obj.材料费 = cailiaoPrice
+            obj.中成药费 = zhongchengyaoPrice
+
+
+            list.push(obj)
+          }
+
+          import("@/vendor/Export2Excel").then((excel) => {
+            const tHeader = [
+              "姓名",
+              "身份证",
+              "西药费",
+              "化验费",
+              "检查费",
+              "治疗费",
+              "材料费",
+              "中成药费",
+              "备注",
+            ];
+            const filterVal = [
+              "姓名",
+              "身份证",
+              "西药费",
+              "化验费",
+              "检查费",
+              "治疗费",
+              "材料费",
+              "中成药费",
+              "备注",
+            ];
+            const data = this.formatJson(filterVal, list);
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: "消费明细",
+            });
+          });
+
+
+        }
+      });
 
+
+    },
     GetGoodName(id) {
       switch (id) {
         case 254:
@@ -1817,11 +1918,54 @@ export default {
               }
             }
 
+            let insuplc_admdvs_name = ""
+            if (order.his_patient.insuplc_admdvs == "440703"){
+              insuplc_admdvs_name = "蓬江区"
+
+
+            } else if (order.his_patient.insuplc_admdvs == "440704"){
+
+              insuplc_admdvs_name = "蓬江区"
+
+
+            } else if (order.his_patient.insuplc_admdvs == "440705"){
+
+              insuplc_admdvs_name = "蓬江区"
+
+
+            }else if (order.his_patient.insuplc_admdvs == "440781"){
+
+              insuplc_admdvs_name = "蓬江区"
+
+
+            }else if (order.his_patient.insuplc_admdvs == "440783"){
+
+              insuplc_admdvs_name = "蓬江区"
+
+
+            }else if (order.his_patient.insuplc_admdvs == "440784"){
+
+
+
+            }else if (order.his_patient.insuplc_admdvs == "440785"){
+
+
+
+            }else if (order.his_patient.insuplc_admdvs == "440799"){
+
+
+
+            }
+
+
+
             let obj = {
               就诊号: order.mdtrt_id,
               患者姓名: name,
               开处时间: time,
               险种类型: insutypeName,
+              参保所属医保区划: order.his_patient.insuplc_admdvs,
+              属地名称: order.his_patient.insuplc_admdvs,
               应收金额: order.medfee_sumamt,
               实收金额: order.medfee_sumamt,
               医保统筹金额: order.hifp_pay,

src/xt_pages/outpatientDoctorStation/print.vue

@@ -18,7 +18,7 @@
 9675:测试
  -->
     <div class="dialysisPage" style="padding-top: 40px">
-      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 0">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243">
 
         <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
 

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -127,9 +127,8 @@
           <div style="text-align: center">(以下空白)</div>
         </div>
         <div class="doctorBox" v-if="org_id != 10188">
-          <p>
+          <p v-if="org_id == 10217 || org_id == 0">
             医师：
-            <!-- {{ item.doctor ? item.doctor : "" }} -->
             <span
               style="width: 100px; display: inline-block"
               v-if="item.creator == ''"
@@ -143,13 +142,16 @@
               {{ doc_name }}
             </span>
             <img
-              style="height: 30px"
+              style="height: 50px;"
               :src="setAdminUserES(item.creator,item.doctor)"
               alt=""
               srcset=""
-              v-else
+
             />
           </p>
+          <p v-else>
+            医师： {{ item.doctor ? item.doctor : "" }}
+          </p>
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
         </div>
         <div class="doctorBox" v-else>
@@ -234,6 +236,11 @@ export default {
   methods: {
     // 电子签名
     setAdminUserES(id,name) {
+      console.log(id)
+      console.log(name)
+      console.log(this.operatorMaps)
+
+
       if (id == 0) {
         return "";
       }

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -50,16 +50,16 @@
                         {{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">
-                       <el-input v-model="hospital_name"></el-input>
-                    </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">-->
+<!--                       <el-input v-model="hospital_name"></el-input>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
                 <el-table-column align="center" prop="name" label="医生">
                     <template slot-scope="scope">
                         <el-select v-model="scope.row.record.doctor_id" placeholder="请选择"
@@ -148,6 +148,12 @@
                         </el-select>
                     </el-form-item>
 
+                  <el-form-item label="鉴定医院名称" >
+                    <el-input v-model="hospital_name"></el-input>-->
+                  </el-form-item>
+                  <el-form-item label="鉴定医院机构编码" >
+                    <el-input v-model="hospital_code"></el-input>-->
+                  </el-form-item>
                   <el-form-item label="医院鉴定日期" >
                     <el-date-picker
                         v-model="check_date"

src/xt_pages/workforce/appointment.vue

@@ -3038,8 +3038,8 @@ export default {
     }
     let newNum = 0
     for (let i = 0; i < this.weekList.length; i++) {
-      if (this.weekNum + i +2 <= 53) {
-        let num = this.weekNum + i +1
+      if (this.weekNum + i + 2 <= 53) {
+        let num = this.weekNum + i + 2
         let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + num + ')'
         this.typeOptions.push({value: i, label: str})
         let stt = this.weekList[i][0] + "~" + this.weekList[i][6]

src/xt_pages/workforce/components/tableData.vue

@@ -102,7 +102,7 @@
         </el-table-column>
         <el-table-column label="班次" width="80">
           <template slot-scope="scope">
-            {{ getSchedulesType(scope.row.schedule_type) }}
+            {{ getSchedulesType(scope.row.schedule_type,scope.row) }}
           </template>
         </el-table-column>
         <el-table-column label="机号" width="80">
@@ -651,10 +651,10 @@
               @change="changePartition"
             >
               <el-option
-                v-for="(item, index) in zone_names"
+                v-for="(item, index) in zones"
                 :key="index"
-                :label="item"
-                :value="item"
+                :label="item.name"
+                :value="item.id"
               >
               </el-option>
             </el-select>
@@ -704,6 +704,10 @@ import {
   getWeekPanelsOne,
   getAllZones,
 } from "@/api/schedule";
+import {
+  getSmartDevices
+} from "@/api/schedule_template/sch_template";
+
 import ScheduleItem from "./ScheduleItem";
 const weekOptions = ['周一','周二','周三','周四','周五','周六','周日'];
 let rowNumber = 0;
@@ -1841,6 +1845,7 @@ export default {
       this.currentData.partition_type = row.zone_type;
 
 
+
       if (row[column.property].schedule_id > 0) {
         this.currentData.mode_id = row[column.property].mode_id;
         this.currentData.id = row[column.property].schedule_id;
@@ -1879,7 +1884,7 @@ export default {
               ].zone_id;
             }
           }
-
+          this.changeSchedule.partition_id = this.zone_name
           this.changeSchedule.change_action = "change_device";
           this.changeScheduleActon(formName);
 
@@ -2026,61 +2031,94 @@ export default {
     },
 
     changePartition(value) {
-      this.current_devices = this.zone_device_map[value];
-      this.device_id = this.current_devices[0].id;
+      let params = {
+        zone_id:  value,
+        sch_type: this.currentData.schedule_type,
+        schedule_date:  this.currentData.schedule_date,
+        patient_id: this.currentData.patient_id,
+      };
+      //进行网络请求，获取空排班机位
+      getSmartDevices(params).then((response) => {
+        if (response.data.state == 0) {
+          return false;
+        } else {
+          var devices = response.data.data.devices;
+          this.current_devices = [];
+          this.current_devices = devices;
+          this.device_id = devices[0].id
+        }
+      });
     },
     changeScheduleType(schedule_type) {
-      const params = {
-        type: schedule_type,
-        date: this.currentData.schedule_date
+      this.currentData.schedule_type = schedule_type
+      let params = {
+        zone_id:  this.currentData.partition_id,
+        sch_type: schedule_type,
+        schedule_date:  this.currentData.schedule_date,
+        patient_id: this.currentData.patient_id,
       };
-      getUrgentScheduleInitData(params)
-        .then(rs => {
-          if (rs.data.state == 1) {
-            this.origin_schedules = rs.data.data.schedules;
-            this.origin_device_numbers = rs.data.data.device_numbers;
-
-            var zone_device_map = {};
-            for (
-              let index = 0;
-              index < this.origin_device_numbers.length;
-              index++
-            ) {
-              const device_number = this.origin_device_numbers[index];
-              if (
-                zone_device_map[device_number.zone_name] == null ||
-                zone_device_map[device_number.zone_name] == undefined
-              ) {
-                zone_device_map[device_number.zone_name] = [];
-              }
-              zone_device_map[device_number.zone_name].push(device_number);
-            }
-            this.zone_device_map = zone_device_map;
-
-            this.zone_names = Object.keys(this.zone_device_map);
-            // console.log('8989898989898989',this.zone_names)
-
-            // console.log(this.current_devices);
-
-            if (this.zone_names.length > 0) {
-              this.zone_name = this.zone_names[0];
-              this.current_devices = this.zone_device_map[this.zone_name];
-              this.device_id = this.current_devices[0].id;
-            }
-
-
-            this.zone_device_options = [
-              { values: this.zone_names },
-              // { values: this.getDeviceNumberNames(this.current_devices) },
-              { values: this.current_devices }
-            ];
-
-          } else {
-          }
-        })
-        .catch(err => {
-          this.loading = false;
-        });
+      //进行网络请求，获取空排班机位
+      getSmartDevices(params).then((response) => {
+        if (response.data.state == 0) {
+          return false;
+        } else {
+          var devices = response.data.data.devices;
+          this.current_devices = [];
+          this.current_devices = devices;
+          this.device_id = ""
+        }
+      });
+      // const params = {
+      //   type: schedule_type,
+      //   date: this.currentData.schedule_date
+      // };
+      // getUrgentScheduleInitData(params)
+      //   .then(rs => {
+      //     if (rs.data.state == 1) {
+      //       this.origin_schedules = rs.data.data.schedules;
+      //       this.origin_device_numbers = rs.data.data.device_numbers;
+      //
+      //       var zone_device_map = {};
+      //       for (
+      //         let index = 0;
+      //         index < this.origin_device_numbers.length;
+      //         index++
+      //       ) {
+      //         const device_number = this.origin_device_numbers[index];
+      //         if (
+      //           zone_device_map[device_number.zone_name] == null ||
+      //           zone_device_map[device_number.zone_name] == undefined
+      //         ) {
+      //           zone_device_map[device_number.zone_name] = [];
+      //         }
+      //         zone_device_map[device_number.zone_name].push(device_number);
+      //       }
+      //       this.zone_device_map = zone_device_map;
+      //
+      //       this.zone_names = Object.keys(this.zone_device_map);
+      //       // console.log('8989898989898989',this.zone_names)
+      //
+      //       // console.log(this.current_devices);
+      //
+      //       if (this.zone_names.length > 0) {
+      //         this.zone_name = this.zone_names[0];
+      //         this.current_devices = this.zone_device_map[this.zone_name];
+      //         this.device_id = this.current_devices[0].id;
+      //       }
+      //
+      //
+      //       this.zone_device_options = [
+      //         { values: this.zone_names },
+      //         // { values: this.getDeviceNumberNames(this.current_devices) },
+      //         { values: this.current_devices }
+      //       ];
+      //
+      //     } else {
+      //     }
+      //   })
+      //   .catch(err => {
+      //     this.loading = false;
+      //   });
     },
     submitTiaoX() {
       // if (this.tiaoZhengType==1) {
@@ -2455,6 +2493,34 @@ export default {
       this.currentData.contagions = row.patient_contagions;
 
       this.currentData.id = row.id;
+      this.currentData.schedule_date = uParseTime(
+        row.schedule_date,
+        "{y}-{m}-{d}"
+      );
+
+
+      this.zone_name = row.partition_id;
+      this.device_id = row.bed_id;
+      // this.current_devices = this.partitions[row.partition_id].jihaos
+
+      let params = {
+        zone_id:  row.partition_id,
+        sch_type: row.schedule_type,
+        schedule_date:  this.currentData.schedule_date,
+        patient_id: this.currentData.patient_id,
+      };
+      //进行网络请求，获取空排班机位
+      getSmartDevices(params).then((response) => {
+        if (response.data.state == 0) {
+          return false;
+        } else {
+          var devices = response.data.data.devices;
+          this.current_devices = [];
+          this.current_devices = devices;
+          this.device_id = devices[0].id
+        }
+      });
+
       this.changeSchedule = {
         mode_id: row.mode_id,
         schedule_type: row.schedule_type,
@@ -2463,10 +2529,6 @@ export default {
         schedule_week: row.schedule_week,
         partition_type: ""
       };
-      this.currentData.schedule_date = uParseTime(
-        row.schedule_date,
-        "{y}-{m}-{d}"
-      );
 
       if (typeof this.partitions[row.partition_id].jihaos !== "undefined") {
         this.jihaos = this.partitions[row.partition_id].jihaos;
@@ -2508,7 +2570,7 @@ export default {
 
       return week + "(" + uParseTime(row.schedule_date, "{y}-{m}-{d}") + ")";
     },
-    getSchedulesType: function(type) {
+    getSchedulesType: function(type,row) {
       let type_name = "";
       switch (type) {
         case 1:
@@ -2522,6 +2584,7 @@ export default {
           type_name = "晚上";
           break;
       }
+
       return type_name;
     },
     changeMode: function(index, row) {

src/xt_pages/workforce/components/template_table.vue

@@ -923,8 +923,10 @@ import {
   getTemplateScheduleSearchResult,
   updateSchedules,
   updateEditSchedules,
-  getTemplateSmartDevices
+  getTemplateSmartDevices,
+  getSmartDevices
 } from "@/api/schedule_template/sch_template";
+
 import TemplateTableItem from "./template_table_item";
 import ScheduleSelectorDialog from "./template_schedule_selector_dialog";
 import { PostSearchSmartSchTemplatePatient } from "../../../api/schedule_template/sch_template";
@@ -1583,9 +1585,8 @@ export default {
           }
 
           this.editableTabs = data;
-          this.current_patient_data = data;
-          this.current_all_schtemplate = this.editableTabs;
-          this.current_all_schtemplate = this.deepClone(this.current_all_schtemplate)
+          this.current_patient_data = this.deepClone(data);
+          this.current_all_schtemplate = data
         } else {
         }
       });
@@ -1593,8 +1594,8 @@ export default {
 
       this.smartVisible = true;
     },
-    SetSmartSch(tempData) {
-        this.saveActionThree(tempData);
+    SetSmartSch(tempData,delData) {
+        this.saveActionThree(tempData,delData);
     },
     check(tempData) {
       let isJiXu = true;
@@ -1646,6 +1647,7 @@ export default {
     batchSetSch() {
       this.smartSaveLoading = true;
       var tempData = [];
+      var delData = [];
       for (let b = 0; b < this.editableTabs.length; b++) {
         for (let c = 0; c < this.editableTabs[b].tableWeekArrage.length; c++) {
           let obj = {
@@ -1665,6 +1667,36 @@ export default {
         }
       }
 
+      for (let b = 0; b < this.current_patient_data.length; b++) {
+        for (let c = 0; c < this.current_patient_data[b].tableWeekArrage.length; c++) {
+          let obj = {
+            time_type: this.current_patient_data[b].tableWeekArrage[c].time_type,
+            jihao_id: this.current_patient_data[b].tableWeekArrage[c].device_number_id,
+            schedule_week: this.getWeekByzhongwen(
+              this.current_patient_data[b].tableWeekArrage[c].week
+            ),
+            mode_id: this.current_patient_data[b].tableWeekArrage[c].treat_mode,
+            sch_id: this.current_patient_data[b].tableWeekArrage[c].id,
+            zone_id: this.current_patient_data[b].tableWeekArrage[c].zone_id,
+            t_id: this.current_patient_data[b].name,
+            title:this.current_patient_data[b].title,
+            patient_id: this.cur_smart_patient_id,
+          };
+          delData.push(obj);
+        }
+      }
+      console.log(tempData)
+      console.log(delData)
+
+      for (let i = 0; i < delData.length; i++) {
+        for (let  b = 0; b < tempData.length; b++) {
+          if(delData[i].sch_id == tempData[b].sch_id){
+            delData.splice(i,1)
+          }
+        }
+      }
+
+      console.log(delData)
       for (let i = 0; i < tempData.length; i++) {
         if (tempData[i].jihao_id == "" || tempData[i].zone_id == "") {
           this.$message.error("分区或者床位不能空");
@@ -1673,9 +1705,8 @@ export default {
           return;
         }
       }
-
       this.isEdit = true
-      this.$emit("saveData", tempData);
+      this.$emit("saveData", tempData,delData);
     },changeJihao(){
 
       this.$forceUpdate()
@@ -1928,7 +1959,21 @@ export default {
 
       }
 
+    },    deepClone(source) {
+      if (!source && typeof source !== 'object') {
+        throw new Error('error arguments', 'shallowClone')
+      }
+      const targetObj = source.constructor === Array ? [] : {}
+      Object.keys(source).forEach((keys) => {
+        if (source[keys] && typeof source[keys] === 'object') {
+          targetObj[keys] = this.deepClone(source[keys])
+        } else {
+          targetObj[keys] = source[keys]
+        }
+      })
+      return targetObj
     },
+
     handleSelect(val) {
       for (let i = 0; i < this.editableTabs.length; i++) {
         this.editableTabs[i].tableWeekArrage = [];
@@ -2008,9 +2053,8 @@ export default {
           }
 
           this.editableTabs = data;
-          this.current_patient_data = data;
-          this.current_all_schtemplate = this.editableTabs;
-          this.current_all_schtemplate = this.deepClone(this.current_all_schtemplate)
+          this.current_patient_data = this.deepClone(data);
+          this.current_all_schtemplate = data
         } else {
         }
       });
@@ -2134,11 +2178,11 @@ export default {
       this.cur_info.patient_name = row.name;
       this.cur_info.patient_id = row.id;
     },
-    dragstartTwo(event, item) {
-      console.log("start的索引", item.moveIndex);
+    dragstartTwo(event) {
+      console.log("start的索引");
     },
     dragendTwo(event) {
-      console.log("dragend", event);
+      console.log("dragend");
     },
     drag(e, day, index, name) {
       //开始
@@ -2896,9 +2940,10 @@ export default {
         });
       }
     },
-    saveActionThree: function (val) {
+    saveActionThree: function (val,delData) {
       updateEditSchedules(
         JSON.stringify(val),
+        JSON.stringify(delData),
       ).then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {

src/xt_pages/workforce/schedulePrint.vue

@@ -8,7 +8,7 @@
        <label class="title"> <span class="name">日期查询</span> : </label>
        <el-date-picker
         @change="changeTime"
-        format="yyyy-MM-dd" 
+        format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
         v-model="listQuery.schedule_date"
         type="date"
@@ -62,8 +62,9 @@
             size="small"
             @click="searchPatientAction"
           >搜索</el-button>
+        <el-button style="float:right;" type="primary" @click="printAction">打印</el-button>
 
-        <el-button type="primary" size="small" style="margin-right" @click="toPrint">打印</el-button>
+<!--        <el-button type="primary" size="small" style="margin-right" @click="toPrint">打印</el-button>-->
       </div>
 
       <el-table
@@ -76,7 +77,7 @@
         :data="tableData"
         style="width: 100%"
       >
-    
+
      <el-table-column label="排班日期" align="center" width="120">
         <template slot-scope="scope">
           {{getTimeOne(scope.row.schedule_date)}}
@@ -88,9 +89,9 @@
           <span style="color: #579ef8;width:100%;display:block;">{{ scope.row.name }}</span>
         </template>
        </el-table-column>
-      
+
        <el-table-column label="透析模式" align="center" width="100">
-       
+
           <template slot-scope="scope">
             <span v-if="scope.row.mode_id == 1">HD</span>
             <span v-if="scope.row.mode_id == 2">HDF</span>
@@ -115,7 +116,7 @@
             <span v-if="scope.row.mode_id == 21">HD+</span>
             <span v-if="scope.row.mode_id == 22">血浆胆红素吸附+HDF</span>
             <span v-if="scope.row.mode_id == 23">血浆胆红素吸附</span>
-            <span v-if="scope.row.mode_id == 24">I-HDF</span> 
+            <span v-if="scope.row.mode_id == 24">I-HDF</span>
             <span v-if="scope.row.mode_id == 25">HD高通</span>
             <span v-if="scope.row.mode_id == 26">CVVH</span>
             <span v-if="scope.row.mode_id == 27">CVVHD</span>
@@ -139,18 +140,18 @@
         <el-table-column  label="分区" align="center">
            <template slot-scope="scope">
             <span>
-               {{getZoneName(scope.row.partition_id)}} 
+               {{getZoneName(scope.row.partition_id)}}
             </span>
           </template>
         </el-table-column>
         <el-table-column  label="机号" align="center">
          <template slot-scope="scope">
             <span>
-               {{getNumberName(scope.row.bed_id)}} 
+               {{getNumberName(scope.row.bed_id)}}
             </span>
           </template>
         </el-table-column>
-       
+
       </el-table>
 
       <el-pagination
@@ -273,7 +274,7 @@ export default {
            this.tableData = list
            this.total = response.data.data.total
          }
-      
+
       });
     },
     getValue: function(val) {
@@ -299,7 +300,7 @@ export default {
     },
     changeSearchMode: function() {
      this.getlist();
-      
+
     },
     searchPatientAction: function() {
       this.listQuery.page = 1
@@ -335,7 +336,7 @@ export default {
             name = this.partitionArr[i].name
           }
         }
-       
+
 
         return name
       },

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -1,6 +1,8 @@
 <template>
     <div>
-        <el-button type="primary" @click="printAction">打印</el-button>
+      <el-button style="float:right;" type="primary" @click="printAction">打印</el-button>
+
+<!--      <el-button type="primary" @click="printAction">打印</el-button>-->
         <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0">
             <tr>
                 <td rowspan="2">分区</td>
@@ -90,7 +92,7 @@
                         <div v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:50px;"> 
+                <td style="min-width:50px;">
                     <span v-if="item.Wed_N.patient_id">
                         <div>{{ item.Wed_N.patient }}</div>
                         <div v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</div>
@@ -212,13 +214,13 @@ export default {
     created(){
         this.getAllZones()
         this.modeOptions = this.$store.getters.treatment_mode;
-        this.partition_id = this.$route.query.partition_id   
+        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] == "周一"){
@@ -246,14 +248,14 @@ export default {
 
             this.week_date = newList.join(",")
           }
-        
+
         }else{
              newList = [1,2,3,4,5,6,7]
-            
+
             this.week_date = newList.join(",")
-            
+
         }
-        
+
     },
     methods:{
          getAllZones(){
@@ -265,7 +267,7 @@ export default {
                 }
                 this.zones.push(...zones)
                 var strArr =  this.zoneIdList.join(",")
-                
+
                 this.strArr = strArr
                 this.getWeekPanels()
                 //统计患者排班数量
@@ -285,7 +287,7 @@ export default {
                     str = partionStr
                 }
 
-            
+
             getWeekPanelsOne(1,str).then(response => {
                 if (response.data.state == 0) {
                     return false
@@ -508,7 +510,7 @@ export default {
                     var theSchedules = response.data.data.schdules;
                     var that = this;
                     that.scheduleZone.forEach(function(zone, index) {
-                        
+
                         that.scheduleZone[index].Mon_M = {
                             mode_id: 0,
                             mode_name: "",
@@ -636,7 +638,7 @@ export default {
                             patient: ""
                         };
                         that.scheduleZone[index].total = 0;
-                        
+
                         if (response.data.data.schdules.length > 0) {
                             theSchedules.forEach(function(schedule, sindex) {
 
@@ -664,70 +666,70 @@ export default {
                                             : that.modeOptions[schedule.mode_id].name
                                         };
                                         that.scheduleZone[index].total += 1;
-                                        
+
                                     }
-                                    
+
                                 }
-                                
+
                             });
                         }
-                       
+
                     });
                     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++){
                        for(let j=0;j<this.scheduleCountList.length;j++){
                             newArr[i].cut = this.total
                          //礼拜一上午
                           if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Mon_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
                         //礼拜一下午
                          if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 2){
-                           
+
                               newArr[i].Mon_A.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜一晚上
                          if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Mon_N.patient = this.scheduleCountList[j].Count
-                          } 
-                         
+                          }
+
                         //礼拜二上午
                          if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Tue_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
                          //礼拜二下午
                          if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Tue_A.patient = this.scheduleCountList[j].Count
-                          } 
-                        
+                          }
+
                          //礼拜二晚上
                          if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Tue_N.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜三上午
                          if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Wed_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜三下午
                          if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Wed_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜三晚上
                          if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Wed_N.patient = this.scheduleCountList[j].Count
                           }
 
@@ -735,76 +737,76 @@ export default {
 
                         //礼拜四上午
                          if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Thurs_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜四下午
                          if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Thurs_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜四晚上
                          if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Thurs_N.patient = this.scheduleCountList[j].Count
                           }
 
 
                         //礼拜五上午
                          if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Fri_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜五下午
                          if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Fri_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜五晚上
                          if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Fri_N.patient = this.scheduleCountList[j].Count
                           }
 
 
                         //礼拜六上午
                          if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Sat_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜六下午
                          if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Sat_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜六晚上
                          if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Sat_N.patient = this.scheduleCountList[j].Count
                           }
-                         
+
 
                           //礼拜日上午
                          if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Sun_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜日下午
                          if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Sun_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜日晚上
                          if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Sun_N.patient = this.scheduleCountList[j].Count
                           }
 
@@ -812,9 +814,9 @@ 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
@@ -822,7 +824,7 @@ export default {
                     }
                     that.scheduleZone.sort(this.compare('sort'))
                     console.log('总数据77777777777',that.scheduleZone)
-                    
+
                 } else {
                     this.$message.error("网络错误");
                     return false;
@@ -892,13 +894,13 @@ export default {
                if(response.data.state == 1){
                   var list = response.data.data.list
                   console.log("list22222",list)
-                  
+
                   this.scheduleCountList = list
                   var total = response.data.data.total
                   console.log("totalw222",total)
                   this.total = total
                }
-           }) 
+           })
         },
         compare (property) {
             return function (a, b) {
@@ -917,4 +919,4 @@ td{
     text-align: center;
     padding: 5px;
 }
-</style>
+</style>

src/xt_pages/workforce/scheduleTablePrintOne.vue

@@ -1,6 +1,8 @@
 <template>
     <div>
-        <el-button type="primary" @click="printAction">打印</el-button>
+      <el-button style="float:right;" type="primary" @click="printAction">打印</el-button>
+
+<!--      <el-button type="primary" @click="printAction">打印</el-button>-->
         <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0">
             <tr>
                 <td rowspan="2">分区</td>
@@ -239,10 +241,10 @@ export default {
         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] == "周一"){
@@ -270,12 +272,12 @@ export default {
 
             this.week_date = newList.join(",")
           }
-        
+
         }else{
              newList = [1,2,3,4,5,6,7]
-            
+
             this.week_date = newList.join(",")
-            
+
         }
         // this.getSolutionSchedule()
     },
@@ -595,7 +597,7 @@ export default {
             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;

src/xt_pages/workforce/scheduleTablePrintTwo.vue

@@ -1,6 +1,7 @@
 <template>
     <div>
-        <el-button type="primary" @click="printAction">打印</el-button>
+
+        <el-button style="float:right;" type="primary" @click="printAction">打印</el-button>
         <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0">
             <tr>
                 <td rowspan="2">分区</td>
@@ -247,10 +248,10 @@ export default {
         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] == "周一"){
@@ -285,7 +286,7 @@ export default {
 
             this.week_date = newList.join(",")
           }
-        
+
         }else{
              newList = [1,2,3,4,5,6,7]
             this.first_day = 1
@@ -296,7 +297,7 @@ export default {
             this.six_day = 6
             this.seven_day = 7
             this.week_date = newList.join(",")
-            
+
         }
         // this.getSolutionSchedule()
     },

src/xt_pages/workforce/schedule_print.vue

@@ -276,20 +276,24 @@
 
           this.total = resp.data.total
           var schedules = resp.data.schedules
-          console.log("scheudle_date",schedules)
+          console.log(schedules)
+
           for (let index = 0; index < schedules.length; index++) {
-            const schedule = schedules[index]
-            if (schedule.patient == null || schedule.zone == null) {
-              continue
-            }
+            console.log(index)
 
+            const schedule = schedules[index]
+            // if (schedule.patient == null || schedule.zone == null) {
+            //   continue
+            // }
+            console.log("schedule")
+            console.log(schedule)
             var weekday = schedule.schedule_week
             var time_type = schedule.schedule_type
-
+            console.log(weekday)
             var main_collection = this.schedules[weekday - 1]
+            console.log(main_collection)
 
             var time_type_schedules
-            var other_time_type_schedules
 
             if (time_type == 1) {
               time_type_schedules = main_collection.all.am
@@ -299,23 +303,25 @@
               time_type_schedules = main_collection.all.evening
             }
 
-
             var zone_schedules = time_type_schedules[schedule.zone.name] ? time_type_schedules[schedule.zone.name] : []
-
             zone_schedules.push(schedule)
+            console.log("zone_schedules")
+
+            console.log(zone_schedules)
 
             time_type_schedules[schedule.zone.name] = zone_schedules
+            // console.log(time_type_schedules)
+            console.log("1111111")
 
 
             if (schedule.mode.id == 2) { // HDF
               main_collection.hdf.push(schedule)
 
-
             } else if (schedule.mode.id == 3) { // HD+HF
+
               main_collection.hd_hp.push(schedule)
             }
-         
-           console.log("scheudle_date",main_collection)
+
           }
 
 
@@ -325,6 +331,9 @@
       }).catch(err => {
         this.$message.error(err)
       })
+      console.log("1111111")
+      console.log("this.schedules")
+      console.log(this.schedules)
     },
     methods: {
       getPatientNum(week,type){
@@ -355,7 +364,7 @@
         var names = []
         for (let index = 0; index < schedules.length; index++) {
           const schedule = schedules[index]
-          console.log(schedule)
+          // console.log(schedule)
 
           names.push(schedule.patient.name)
         }
@@ -364,7 +373,7 @@
           obj[next] ? '' : obj[next] = true && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-        console.log('names',names)
+        // console.log('names',names)
         return names.join('、')
       },
       patient_other_names: function(schedules) {
@@ -375,9 +384,9 @@
         var names = []
         for (let index = 0; index < schedules.length; index++) {
           const schedule = schedules[index]
-          console.log(schedule)
-
-          names.push(schedule.patient.name)
+          // console.log(schedule)
+          //
+          // names.push(schedule.patient.name)
 
           if(schedule.schedule_type == 1){
             am.push(schedule.patient.name)

src/xt_pages/workforce/template.vue

@@ -3188,13 +3188,13 @@ export default {
       })
 
 
-    },saveData(val){
+    },saveData(val,del_data){
       var tempDataOne = []
       for(let i = 0; i < val.length; i++){
           tempDataOne.push(val[i])
       }
       if(tempDataOne.length > 0){
-        this.$refs.table.SetSmartSch(tempDataOne)
+        this.$refs.table.SetSmartSch(tempDataOne,del_data)
       }
     },
     getWeekPanels(val) {