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

src/router/modules/dialysis.js

@@ -350,6 +350,18 @@ export default {
       is_menu: false,
       noCache: true
     },
+    // 透析记录2
+    {
+      path: '/dialysis/details/indexs',
+      component: () => import('@/xt_pages/dialysis/details/indexs'),
+      name: 'details',
+      meta: {
+        title: 'details'
+      },
+      hidden: true,
+      is_menu: false,
+      noCache: true
+    },
 
     {
       path: '/dialysis/print/batch',

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -80,64 +80,68 @@
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
-          <div v-if="this.radio == 1">
+          <div v-if="this.radio == 1&&this.activeName=='first'">
             <el-button
               size="small"
               v-loading="isloading"
               :disabled="isdisabled"
-              @click="open(1)"
+              @click="open(1,0)"
               type="primary">上传明细
             </el-button>
           </div>
-
           <div v-if="this.radio == 2">
             <el-button
               size="small"
-              @click="open(2)"
+              @click="open(2,0)"
               type="primary">撤销明细
             </el-button>
           </div>
-
         </div>
 
         <div class="mainCenter" v-loading="loading">
           <el-tabs class="settlementTabs" v-model="activeName" @tab-click="handleClick">
-            <!--            <el-tab-pane label="日结" name="first">-->
-            <!--              <div style="display:flex;height:100%;">-->
-            <!--                <div class="centerLeft">-->
-            <!--                  <div class="tabsBox">-->
-            <!--                    &lt;!&ndash;<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>&ndash;&gt;-->
-            <!--                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"-->
-            <!--                             @tab-click="tabclickEvent">-->
-            <!--                      <el-tab-pane-->
-            <!--                        v-for="(item, index) in prescriptions"-->
-            <!--                        :key="index"-->
-            <!--                        :label="item.name"-->
-            <!--                        :name="item.name"-->
-            <!--                      >-->
-            <!--                      </el-tab-pane>-->
-
-            <!--                      <charge-prescription-table ref="prescription_tables"-->
-            <!--                                                 :manufacturers="manufacturers"-->
-            <!--                                                 :prescription="curPrescriptions"></charge-prescription-table>-->
-            <!--                    </el-tabs>-->
-
-            <!--                  </div>-->
-            <!--                  <div class="costBox">-->
-            <!--                    <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>-->
-            <!--                    <span v-if="this.radio == 2&&this.hisPatientInfo.balance_accounts_type != 2">处方总价：<span style="color:red;">{{-->
-            <!--                        all_total + '元' + ' = 全自费总金额:' + fulamt_ownpay_amt + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'-->
-            <!--                      }}</span></span>-->
-            <!--                    <span v-if="this.radio == 2&&this.hisPatientInfo.balance_accounts_type == 2">处方总价：<span style="color:red;">{{-->
-            <!--                        all_total + '元' + ' = 全自费总金额:' + all_total + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'-->
-            <!--                      }}</span></span>-->
-            <!--                    <span v-if="this.radio == 1">处方总价：<span style="color:red;">{{ all_total }}元</span></span>-->
-
-            <!--                  </div>-->
-            <!--                </div>-->
-
-            <!--              </div>-->
-            <!--            </el-tab-pane>-->
+            <el-tab-pane label="日结" name="second">
+              <div style="display:flex;height:100%;">
+                <div class="centerLeft">
+                  <div class="tabsBox">
+                    <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
+                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
+                             @tab-click="tabclickEvent">
+                      <el-tab-pane
+                        v-for="(item, index) in prescriptions"
+                        :key="index"
+                        :label="item.name"
+                        :name="item.name"
+                      >
+                        <el-button type="primary"  v-loading="isloading"
+                                     :disabled="isdisabled"  @click="open(1,item.id)">上传处方费用</el-button>
+
+
+                      </el-tab-pane>
+
+                      <charge-month-prescription-table v-if="this.radio == 1"
+                                                       :prescription="curPrescriptions"></charge-month-prescription-table>
+
+                    </el-tabs>
+
+                  </div>
+                  <div class="costBox">
+                    <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>
+                    <span v-if="this.radio == 2&&this.hisPatientInfo.balance_accounts_type != 2">处方总价：<span
+                      style="color:red;">{{
+                        all_total + '元' + ' = 全自费总金额:' + fulamt_ownpay_amt + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'
+                      }}</span></span>
+                    <span v-if="this.radio == 2&&this.hisPatientInfo.balance_accounts_type == 2">处方总价：<span
+                      style="color:red;">{{
+                        all_total + '元' + ' = 全自费总金额:' + all_total + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'
+                      }}</span></span>
+                    <span v-if="this.radio == 1">处方总价：<span style="color:red;">{{ all_total }}元</span></span>
+
+                  </div>
+                </div>
+
+              </div>
+            </el-tab-pane>
             <el-tab-pane label="月结" name="first">
               <div style="display:flex;height:100%;">
                 <div class="centerLeft">
@@ -156,7 +160,9 @@
                       <div class="RP">
                         Rp
                         <div v-if="radio == 2">
-                          <span>处方日期：{{ getTimes(zuobiao_info.start_time) }}~{{ getTimes(zuobiao_info.end_time) }}</span>
+                          <span>处方日期：{{ getTimes(zuobiao_info.start_time) }}~{{
+                              getTimes(zuobiao_info.end_time)
+                            }}</span>
                         </div>
                         <div v-if="radio == 2">
                           <span>医嘱单id：{{ zuobiao_info.cbm01 }}</span>
@@ -197,17 +203,17 @@
                             :value="item.value">
                           </el-option>
                         </el-select>
-                          <label>
-                            疾病类型：
-                          </label>
-                          <el-select filterable  v-model="sick_type" placeholder="请选择疾病类型">
-                            <el-option
-                              v-for="(item,index) in sick"
-                              :key="index"
-                              :label="item.class_name"
-                              :value="item.id">
-                            </el-option>
-                          </el-select>
+                        <label>
+                          疾病类型：
+                        </label>
+                        <el-select filterable v-model="sick_type" placeholder="请选择疾病类型">
+                          <el-option
+                            v-for="(item,index) in sick"
+                            :key="index"
+                            :label="item.class_name"
+                            :value="item.id">
+                          </el-option>
+                        </el-select>
 
                       </div>
 
@@ -263,8 +269,8 @@ export default {
   },
   data() {
     return {
-      isloading:false,
-      isdisabled:false,
+      isloading: false,
+      isdisabled: false,
       register: [
         { value: 11, label: '普通门诊' },
         // { value: 12, label: '门诊挂号' },
@@ -335,7 +341,7 @@ export default {
       tabIndex: 1,
 
       hisPatientInfo: {},
-      prescription_info:{},
+      prescription_info: {},
       loadingtwo: false,
       upload_list: [],
       patientTableData: [{}],
@@ -675,12 +681,12 @@ export default {
     }, formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]))
     },
-    open(index) {
+    open(index,id) {
       if (index == 2) {
         var that = this
         let obj3 = {
           id: this.zuobiao_info.id,
-          admin_user_id: this.$store.getters.xt_user.user.id,
+          admin_user_id: this.$store.getters.xt_user.user.id
         }
         axios.get('http://127.0.0.1:9532' + '/nmg/coordinate/settleAccount/cancel', {
           params: obj3
@@ -717,11 +723,11 @@ export default {
         this.isdisabled = true
         var that = this
         if (this.hisPatientInfo.id == 0) {
-          this.$message.error("请选择需要记账的患者")
+          this.$message.error('请选择需要记账的患者')
           return
         }
-        if (this.sick_type == 0 || this.sick_type == "") {
-          this.$message.error("请选择疾病类型")
+        if (this.sick_type == 0 || this.sick_type == '') {
+          this.$message.error('请选择疾病类型')
           return
         }
 
@@ -731,12 +737,18 @@ export default {
           record_date: this.record_date,
           admin_user_id: this.$store.getters.xt_user.user.id,
           org_id: this.$store.getters.xt_user.org_id,
-          sick_type:this.sick_type,
+          sick_type: this.sick_type,
+          settle_type: this.activeName,
+          p_id:id,
+        }
+        if (this.activeName == "first"){
+          obj['settle_accounts_type'] = 2
+        }else{
+          obj['settle_accounts_type'] = 1
         }
         obj['start_time'] = this.other_start_time
         obj['end_time'] = this.other_end_time
-        obj['settle_accounts_type'] = 2
-        axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/settleAccount', {
+        axios.get('http://127.0.0.1:9532' + '/nmg/coordinate/settleAccount', {
           params: obj
         })
           .then(function(response) {
@@ -758,7 +770,6 @@ export default {
                 }).catch(() => {
                 })
 
-
               } else {
                 that.isloading = false
                 that.isdisabled = false
@@ -862,13 +873,13 @@ export default {
             case 1:
               this.all_table_data = response.data.data.list
               this.patientTableData = response.data.data.list
-              if (this.hisPatientInfo&&this.hisPatientInfo.id > 0){
-                for(let i = 0; i < this.patientTableData.length;i++){
-                  if(this.hisPatientInfo.id == this.patientTableData[i].id){
+              if (this.hisPatientInfo && this.hisPatientInfo.id > 0) {
+                for (let i = 0; i < this.patientTableData.length; i++) {
+                  if (this.hisPatientInfo.id == this.patientTableData[i].id) {
                     this.$refs.tab.setCurrentRow(this.patientTableData[i])
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
                 this.getPatientInformation(this.patientTableData[0].id)
               }
@@ -878,15 +889,15 @@ export default {
               this.patientTableData = response.data.data.list_two
               this.upload_list = response.data.data.upload_list
               this.all_upload_list = response.data.data.upload_list
-              if (this.hisPatientInfo && this.hisPatientInfo.id > 0){
-                for(let i = 0; i < this.upload_list.length;i++){
-                  if(this.hisPatientInfo.id == this.upload_list[i].his_patient.id){
+              if (this.hisPatientInfo && this.hisPatientInfo.id > 0) {
+                for (let i = 0; i < this.upload_list.length; i++) {
+                  if (this.hisPatientInfo.id == this.upload_list[i].his_patient.id) {
                     this.$refs.tab.setCurrentRow(this.upload_list[i])
                     this.getPatientInformation(this.upload_list[0].his_patient.id)
 
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.upload_list[0])
                 this.getPatientInformation(this.upload_list[0].his_patient.id)
               }
@@ -1088,8 +1099,8 @@ export default {
           this.loading = false
           this.prescription_info = response.data.data.prescription_info
           this.sick_type = this.prescription_info.sick_type
-          if(this.sick_type == 0){
-            this.sick_type = ""
+          if (this.sick_type == 0) {
+            this.sick_type = ''
           }
           console.log(this.sick_type)
           this.hisPatientInfo = response.data.data.patient
@@ -1242,8 +1253,8 @@ export default {
           this.hisPatientInfo = response.data.data.patient
           this.prescription_info = response.data.data.prescription_info
           this.sick_type = this.prescription_info.sick_type
-          if(this.sick_type == 0){
-            this.sick_type = ""
+          if (this.sick_type == 0) {
+            this.sick_type = ''
           }
           console.log(this.sick_type)
           this.setMonthPrescription(response.data.data.month_prescriptions)

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -10,7 +10,7 @@
         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 "><!--&& org_id != 10188 && org_id != 0-->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 0"><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 && org_id != 0 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
@@ -20,7 +20,7 @@
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
           <!-- <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive> -->
-          <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen>
+          <!-- <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen> -->
 <!--         <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>
@@ -52,11 +52,11 @@
       </div>
     </div> -->
 
-    <!-- <div class="app-container" style="padding-top:30px;" v-if="org_id == 10188 || org_id == 0 ">
+    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id == 0 ">
       <div class='dialysisPage'>
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
       </div>
-    </div> -->
+    </div>
     <!-- <div class="app-container" style="padding-top:40px;" v-if="org_id == 0">
       <div class='dialysisPage'>
         <printthirteen :paramsObj="invoiceParams"></printthirteen>

src/xt_pages/outpatientCharges/invoiceTemplate/printthirteen.vue

@@ -1,7 +1,7 @@
 
 <template>
   <div id='invoice-print'>
-    <div v-for='(i,index) in pageArr.length' :key="index" style="width: 80%;margin: 0 auto;font-size: 16px;">
+    <div v-for='(i,index) in pageArr.length' :key="index" style="width: 90%;margin: 0 auto;font-size: 17px;">
       <div style="text-align: center;width: 100%;font-size: 20px; font-weight: bolder;">盐城响水燕舞血液透析中心收据</div>
       <div style="display: flex; margin: 15px 0 5px 0;">
         <div style="flex: 1.1;">业务流水号:{{ list.order_number }}</div>
@@ -10,13 +10,16 @@
        
       </div>
       <div style="display: flex;">
-        <div style="flex:1;">医生：{{ doctor_info.user_name }}</div>
-        <div style="flex: 1;">医生编码：{{ doctor_info.doctor_number }}</div>
+        <!-- <div style="flex:1;">医生：{{ doctor_info.user_name }}</div>
+        <div style="flex: 1;">医生编码：{{ doctor_info.doctor_number }}</div> -->
         <div style="flex: 1;">No.{{list.order.fa_piao_number}}</div>
       </div>
       <div style="display: flex;border: 1px solid black;padding: 5px 0;">
         <div style="flex: 1;">姓名：{{ paramsObj.name }}</div>
-        <div style="flex: 1;">性别：</div>
+        <div style="flex: 1;">性别：
+          <span v-if="list.gender == 1">男</span>
+          <span v-if="list.gender == 2">女</span>
+        </div>
         <div style="flex: 1;">医保类型：</div>
         <div style="flex: 1;">社会保障号码：</div>
 
@@ -117,8 +120,13 @@
         </div>
       </div>
       <div style="display: flex;">
-        <div style="flex: 1;">收款单位（章）：{{ org_name }}</div>
-        <div style="flex: 1;">收费员：{{ paramsObj.chargeName }}</div>
+        <div style="flex:1;">医生：{{ doctor_info.user_name }}</div>
+        <div style="flex: 1;">医生编码：{{ doctor_info.doctor_number }}</div>
+        <!-- <div style="flex: 1;">No.{{list.order.fa_piao_number}}</div> -->
+      </div>
+      <div style="display: flex;">
+        <div style="flex: 1.5;">收款单位（章）：{{ org_name }}</div>
+        <div style="flex: 0.7;">收费员：{{ paramsObj.chargeName }}</div>
         <div style="flex: 1;">
           <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
           年

src/xt_pages/outpatientDoctorStation/components/dialysishistory.vue

@@ -300,10 +300,14 @@ export default{
 
     },
     rowclick(event){
-      this.patient_id = event.patient_id
-      this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
-      this.drawer =true
-      this.dialysisShow =true
+      this.$router.push({
+        path: "/dialysis/details/indexs",
+        query: { patient_id: event.patient_id, date: event.dialysis_date }
+      });
+      // this.patient_id = event.patient_id
+      // this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
+      // this.drawer =true
+      // this.dialysisShow =true
     },
     clickCurrent(){
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -111,7 +111,7 @@
             <el-tab-pane label="透析记录" name="透析记录">
             </el-tab-pane>
             <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
-            <!-- <el-tab-pane label="透析历史" name="透析历史"></el-tab-pane> -->
+            <el-tab-pane label="透析历史" name="透析历史"></el-tab-pane>
 
           </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
@@ -191,7 +191,7 @@
         <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'
                         :dialysisShow="dialysisShow"></dialysis-index>
 
-        <!-- <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid'></dialysishistory> -->
+        <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid'></dialysishistory>
       </div>
 
     </div>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -9,13 +9,13 @@
         :prescription_id="prescription_id"></printOne>
 
         <print-ten-one
-          v-if="org_id == 10188 || org_id == 10217 || org_id == 0" v-bind:childResponse="childResponse"
+          v-if="org_id == 10188 || org_id == 10217 " 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"
         ></print-ten-one>
 
-        <prinSeven v-if="org_id == 10375 "
+        <prinSeven v-if="org_id == 10375 || org_id == 0"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -140,9 +140,14 @@
                   </div>
                   <!-- v-if="arr.length>0 && arr[0][0].groupno==it.groupno" 'border-right':arr.length>0 && arr[0][0].groupno==it.groupno ? '1px solid black' :'none',-->
                 </div>
-                <div style="display: inline-block;position: absolute;left:80%;bottom:0px;margin-left: 10px;" >
+                <div style="display: inline-block;position: absolute;left:80%;margin-left: 10px;" >
                   ×&nbsp;{{ it.prescribing_number}}
                 </div>
+                <template v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
+                  <div style="display: inline-block;position: absolute;left:80%;bottom:20px;margin-left: 10px;" >
+                    ×&nbsp;{{ item.arr[0][0].prescribing_number}}
+                  </div>
+                </template>
                 <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 10px;" v-if="(item.arr.length>0&&item.arr[0][0].groupno!=it.groupno) || item.arr.length==0">
                   &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
                 </div>

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -22,6 +22,14 @@
               style="width: 100%"
               alt=""
           /></span>
+
+          <span v-if="org_id == 10537">
+            <img
+              src="https://kuyi.shengws.com/xuwenshou.jpg"
+              style="width: 100%"
+              alt=""
+            /></span>
+
           <div class="printTitle">
             处方笺
             <span
@@ -247,6 +255,13 @@
               style="width: 100%"
               alt=""
           /></span>
+
+          <span v-if="org_id == 10537">
+            <img
+              src="https://kuyi.shengws.com/xuwenwei.jpg"
+              style="width: 100%"
+              alt=""
+            /></span>
           <!-- <div class="doctorBox">
               <p>医师：{{item.doctor?item.doctor:""}}</p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>

src/xt_pages/user/dialysisRecord.vue

@@ -418,7 +418,7 @@
           </div> -->
 
 
-          <dialysisIndextwo :record_date="dialysis_date" :patientid='patient_id' :dialysisShow="dialysisShow" :dialysis_date="dialysis_date"></dialysisIndextwo>
+          <!-- <dialysisIndextwo :record_date="dialysis_date" :patientid='patient_id' :dialysisShow="dialysisShow" :dialysis_date="dialysis_date"></dialysisIndextwo> -->
         </div>
 
       </el-drawer>
@@ -432,7 +432,6 @@ import {getDialysisScheduleDetail,getLongAdviceTwo} from '@/api/dialysis_record'
 import { uParseTime } from "@/utils/tools";
 import { parseTime } from '@/utils'
 import { fetchAllDoctorAndNurse } from "@/api/doctor";
-import dialysisIndextwo from '../outpatientDoctorStation/components/dialysisIndextwo'
 import print from "print-js";
 
 export default {
@@ -478,7 +477,6 @@ export default {
   },
   components: {
     PatientSidebar,
-    dialysisIndextwo
   },
   methods: {
     getTime(record){
@@ -682,24 +680,25 @@ export default {
       }, 1);
     },
     clickCurrent(val) {
-      
+
       this.patient_id = val.patient_id
       this.dialysis_date = val.dialysis_date
     },
     rowclick(val){
+      // console.log('kkkkkkk',val.dialysis_date);
       this.$router.push({
-        path: "/dialysis/details",
+        path: "/dialysis/details/indexs",
         query: { patient_id: val.patient_id, date: val.dialysis_date }
       });
       // console.log('kkkkkkk',event);
-      // this.patient_id = event.patient_id
-      // this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
+      // this.patient_id = val.patient_id
+      // this.dialysis_date = parseTime(val.dialysis_date, '{y}-{m}-{d}')
       // this.drawer =true
       // this.dialysisShow =true
     },
     exportList(){
       import('@/vendor/Export2Excel').then(excel => {
-       
+
          if(this.recordData!=null && this.recordData.length > 0){
           for(let i=0;i<this.recordData.length;i++){
             this.recordData[i].dialysis_date_one = this.getTimeOne(this.recordData[i].dialysis_date)

src/xt_pages/workforce/components/editTableData.vue

@@ -148,6 +148,10 @@
             color: '#606266',
             // border: '1px solid aqua',
           }"
+            v-loading="loading"
+            element-loading-text="拼命加载中"
+            element-loading-spinner="el-icon-loading"
+            element-loading-background="rgba(0, 0, 0, 0.8)"
             :fit="true"
             :data="scheduleZone"
             @cell-click="clickThis"
@@ -511,7 +515,7 @@
                         scope.row
                       )
                     "
-                    
+
                   ></schedule-item>
                 </div>
               </template>
@@ -1916,6 +1920,7 @@ export default {
       modename_value:true,//关闭透析模式开关
       Dialysis_patient:'',
       cur_date:"",
+      loading:false,//加载
       dataloading:false,
       current_patient_data:[],
       week_zhongwens: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
@@ -4793,7 +4798,6 @@ export default {
               mode_name: "",
               patient_id: 0,
               dialysis_machine_name: "",
-
               patient: "",
             };
             that.scheduleZone[index].Sat_N = {
@@ -4912,11 +4916,11 @@ export default {
             }
           }
         });
-        // this.closePatientPanel();
       }
       this.creating_schedule = false;
     },
     async CreateScheduleTwo(id, data,id_two) {
+      this.loading =true
       this.creating_schedule = true;
       let response =await CreateScheduleTwo(id, data,id_two)
 
@@ -4927,38 +4931,73 @@ export default {
         var schedule = response.data.data.schedule;
         this.creating_schedule=false;
         this.dialogTableVisible=false
-        this.getSchedules()
-        // this.scheduleZone.forEach(function (zone, index) {
-        //   if (
-        //     zone.zone_id == schedule.partition_id &&
-        //     zone.jihao_id == schedule.bed_id
-        //   ) {
-        //     var weekPath = that.weekPath(
-        //       schedule.schedule_week,
-        //       schedule.schedule_type
-        //     );
-        //     if (weekPath.length == 2) {
-        //       var weekPathKey = weekPath[0] + "_" + weekPath[1];
-        //       that.scheduleZone[index][weekPathKey] = {
-        //         schedule_id: schedule.id,
-        //         mode_id: schedule.mode_id,
-        //         patient_id: schedule.patient_id,
-        //         patient: schedule.patient,
-        //         dialysis_machine_name: schedule.dialysis_machine_name,
-        //
-        //         patient_contagions: that.currentData.contagions,
-        //         mode_name:
-        //           typeof that.modeOptions[schedule.mode_id] === "undefined"
-        //             ? ""
-        //             : that.modeOptions[schedule.mode_id].name,
-        //       };
-        //       that.scheduleZone[index].total += 1;
-        //     }
-        //   }
-        // });
+        // this.getSchedules()
+        console.log('cccccc',this.cur_drag_info);
+         const curdrag = this.cur_drag_info
+        if(curdrag.bed_id!=''){
+
+          this.scheduleZone.forEach(function (zone, index) {
+            if (
+              zone.zone_id == schedule.partition_id &&
+              zone.jihao_id == schedule.bed_id
+            ) {
+              // console.log('111111',zone.zone_id,zone.jihao_id);
+              var weekPath = that.weekPath(
+                schedule.schedule_week,
+                schedule.schedule_type
+              );
+              console.log('22222',weekPath);
+              if (weekPath.length == 2) {
+                var weekPathKey = weekPath[0] + "_" + weekPath[1];
+                that.scheduleZone[index][weekPathKey] = {
+                  schedule_id: schedule.id,
+                  mode_id: schedule.mode_id,
+                  patient_id: schedule.patient_id,
+                  patient: schedule.patient,
+                  dialysis_machine_name: schedule.dialysis_machine_name,
+                  patient_contagions: that.currentData.contagions,
+                  mode_name:
+                    typeof that.modeOptions[schedule.mode_id] === "undefined"
+                      ? ""
+                      : that.modeOptions[schedule.mode_id].name,
+                };
+                // console.log('3333',that.scheduleZone[index][weekPathKey]);
+                that.scheduleZone[index].total += 1;
+              }
+            }
+
+            if(zone.zone_id == curdrag.partition_id &&
+                zone.jihao_id == curdrag.bed_id
+              ){
+                // console.log('aaaaaa',curdrag);
+                var weekPath = that.weekPath(
+                  curdrag.schedule_week,
+                  curdrag.schedule_type
+                );
+                console.log('aaaaaa',weekPath);
+                if(weekPath.length == 2){
+                  var weekPathKey = weekPath[0] + "_" + weekPath[1];
+                  that.scheduleZone[index][weekPathKey] ={
+                    schedule_id: '',
+                    mode_id: '',
+                    patient_id: '',
+                    patient: '',
+                    dialysis_machine_name: '',
+                    patient_contagions: '',
+                    mode_name:''
+                  };
+                  that.scheduleZone[index].total += 1;
+                  }
+              }
+          });
+        }else{
+          this.getSchedules()
+        }
+        // return that.scheduleZone()
         // this.closePatientPanel();
       }
       this.creating_schedule = false;
+      this.loading=false
     },
     // 单击选中患者
     clickThis(row, column, cell, event) {