Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/schedule.js

@@ -305,5 +305,12 @@ export function CreateScheduleTwo(id, schedule,id_two) {
 }
 
 
-
-
+export function ChangeScheduleTen(id,schedule){
+  
+  console.log('schedule', schedule)
+  return request({
+    url: '/api/schedule/changeschedule?id=' + id,
+    method: 'Put',
+    data: schedule
+  })
+}

src/router/index.js

@@ -9,6 +9,7 @@ import dialysis from './modules/dialysis'
 import patient from './modules/patient'
 import qcd from './modules/qcd'
 import Dialysisanalysis from './modules/Dialysisanalysis'
+import DialysisIndex from './modules/dialysisIndex'
 import stock from './modules/stock'
 import weight_sign from './modules/weight_sign'
 import workforce from './modules/workforce'
@@ -204,6 +205,7 @@ var _asy_router_map = [
   basicConfig,
   supply,
   Dialysisanalysis,// 新菜单6.1
+  DialysisIndex,
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/views/layout/Layout.vue

@@ -134,7 +134,7 @@ export default {
   created(){
     let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","DepositManagement","hisTool",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
     let bingli = ['User','createPatient'];
-    let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control'];
+    let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index'];
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','inventoryTransfer','wareHouseManage','otherManagement'];
     let caigou = ['supplyManage','supplyList'];
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];

src/views/layout/components/Sidebar/index.vue

@@ -120,7 +120,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '透析管理'){
-          let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','Dialysisanalysis'];
+          let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','Dialysisanalysis'];
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -29,7 +29,8 @@
       </li>
       <li>
         <label>年龄:</label>
-        <span>{{ getNewAge(patient)}}</span>
+        <span v-if="getNewAge(patient)>150">{{patient.age}}</span>
+        <span v-if="getNewAge(patient)<150">{{ getNewAge(patient)}}</span>
       </li>
       <li>
         <label>透析号 : </label>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -21,292 +21,187 @@
         >
           {{ orgname }}处方笺
         </div>
-        <div >
-          <div class="infoTitle">
-            <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
-            <p>
-              性别：
-              <span v-if="item.patient.gender == 1">男</span>
-              <span v-if="item.patient.gender == 2">女</span>
-            </p>
-            <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+        <!--<div class="printTitle">{{orgname}}处方笺</div>-->
+        <div class="infoTitle">
+          <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
+          <p>
+            性别：
+            <span v-if="item.patient.gender == 1">男</span>
+            <span v-if="item.patient.gender == 2">女</span>
+          </p>
+          <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+        </div>
+        <div class="infoMain">
+          <div style="margin-bottom: 10px">
+            门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
           </div>
-          <div class="infoMain">
-            <div style="margin-bottom: 10px">
-              门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
-            </div>
-            <div style="margin-bottom: 10px">
-              科室：{{ item.info ? getDepart(item.info.departments) : "" }}
-            </div>
-            <div style="margin-bottom: 10px">
-              医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
-            </div>
-            <div style="margin-bottom: 10px" v-if="org_id != 10188">
-              电话：{{ item.patient.phone }}
-            </div>
-            <div style="margin-bottom: 10px" v-else>
-              日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
-            </div>
-            <div>地址：{{ item.patient.home_address }}</div>
-            <div style="display: flex; width: 50%">
-              临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
-            </div>
+          <div style="margin-bottom: 10px">
+            科室：{{ item.info ? getDepart(item.info.departments) : "" }}
+          </div>
+          <div style="margin-bottom: 10px">
+            医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
+          </div>
+          <div style="margin-bottom: 10px" v-if="org_id != 10188">
+            电话：{{ item.patient.phone }}
+          </div>
+          <div style="margin-bottom: 10px" v-else>
+            日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+          </div>
+          <div>地址：{{ item.patient.home_address }}</div>
+          <div style="display: flex; width: 50%">
+            临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
           </div>
         </div>
-          <div class="prescriptionBox" >
-            <div class="Rp">Rp:</div>
-            <div
-              class="drugsBox"
-              v-for="(it, index) in item.advices" :key="index" 
-              :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
-            >
-            <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  :style="{'page-break-after':index==yi&&item.advices.length>3? 'always':'auto'}"-->
-              <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
-              <template v-if="index==yi+1&&item.advices.length>5">
-                <div style="margin: 20px 0px;">
-                  <div class="infoTitle">
-                    <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
-                    <p>
-                      性别：
-                      <span v-if="item.patient.gender == 1">男</span>
-                      <span v-if="item.patient.gender == 2">女</span>
-                    </p>
-                    <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
-                  </div>
-                  <div class="infoMain">
-                    <div style="margin-bottom: 10px">
-                      门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
-                    </div>
-                    <div style="margin-bottom: 10px">
-                      科室：{{ item.info ? getDepart(item.info.departments) : "" }}
-                    </div>
-                    <div style="margin-bottom: 10px">
-                      医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
-                    </div>
-                    <div style="margin-bottom: 10px" v-if="org_id != 10188">
-                      电话：{{ item.patient.phone }}
-                    </div>
-                    <div style="margin-bottom: 10px" v-else>
-                      日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
-                    </div>
-                    <div>地址：{{ item.patient.home_address }}</div>
-                    <div style="display: flex; width: 50%">
-                      临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
-                    </div>
-                  </div>
-                </div>
-              </template>
-              <div style="position: relative;">
-                <div class="drugsOne" >
-                  <span style="font-weight: bold" >
-                    {{ index + 1 + "." }}
-                  </span>
-                  {{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;
-                  <span v-if="it.drug.min_unit != it.drug.dose_unit">
-                    {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/
-                    {{it.drug.max_unit}}
-                  </span>&nbsp;
-                 
-                  <div style="margin-left: 70px">
-                    <span >用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
-                    >&nbsp;&nbsp;<span
-                      >{{ it.execution_frequency }}&nbsp;{{
-                        it.delivery_way
-                      }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
-                  </div>
-                  
-                </div>
-                <div style="display: inline-block;position: absolute;left:85%;top:10px;margin-left: 10px;">
-                  ×&nbsp;{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
-                </div>
-              </div>
-              <template v-if="index==yi&&item.advices.length>5">
-                <div style="margin: 20px 0px;">
-                  <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
-                    <p v-if="org_id == 10217 || org_id == 0">
-                      医师：
-                      <span
-                        style="width: 100px; display: inline-block"
-                        v-if="item.creator == ''"
-                      >
-                        {{ item.doctor }}
-                      </span>
-                      <span
-                        style="width: 100px; display: inline-block"
-                        v-else-if="doc_name != ''"
-                      >
-                        {{ doc_name }}
-                      </span>
-                      <img
-                        style="height: 50px;"
-                        :src="setAdminUserES(item.creator,item.doctor)"
-                        alt=""
-                        srcset=""
-
-                      />
-                    </p>
-                    <p v-else>
-                      医师： {{ item.doctor ? item.doctor : "" }}
-                    </p>
-                    <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
-                  </div>
-
-                  <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">
-                    <p>医师：{{ item.doctor ? item.doctor : "" }}</p>
-                  </div>
-                  <div class="actionBar" v-if="org_id != 10188 && org_id != 0">
-                    
-                    <p>审核：</p>
-                    <p>配对：</p>
-                    <p>核对：</p>
-                    <p>发药：</p>
-                    <p>
-                      药费：{{
-                        getTotalOne(item.id).toFixed(2)
-                          ? getTotalOne(item.id).toFixed(2)
-                          : 0
-                      }}元
-                    </p>
-                    <!--            <p>药费：466.2元</p>-->
-                  </div>
-                  <div class="actionBar" v-else>
-                    <p >审核、调配：</p>
-                    <p >核对、发药：</p>
-                    <p >
-                      药费：{{
-                        getTotalOne(item.id).toFixed(2)
-                          ? getTotalOne(item.id).toFixed(2)
-                          : 0
-                      }}元
-                    </p>
-                    <!--            <p>药费：551.2元</p>-->
-                    <!--            <p>药费：466.2元</p>-->
-                  </div>
-                </div>
-              </template>
+        <div class="prescriptionBox" >
+          <div class="Rp">Rp:</div>
+          <div
+            class="drugsBox"
+            v-for="(it, index) in item.advices"
+            :key="index"
+            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
+          >
+          <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  'page-break-after':item.advices.length>=3&& item.advices[2]?'always':'auto'-->
+            <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+            <div class="drugsOne">
+              <span style="font-weight: bold">{{ index + 1 + "." }}</span
+              >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
+                v-if="it.drug.min_unit != it.drug.dose_unit"
+                >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
+              >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
+                it.drug.max_unit
+              }}&nbsp;×&nbsp; {{ it.prescribing_number
+              }}{{ it.prescribing_number_unit }}
             </div>
+            <div style="margin-left: 100px">
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+              >&nbsp;&nbsp;<span
+                >{{ it.execution_frequency }}&nbsp;{{
+                  it.delivery_way
+                }}&nbsp;</span
+              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            </div>
+          </div>
 
-            <div
-              class="drugsBox"
-              v-for="(it, i) in item.additionalcharge"
-              :key="i"
-            >
-              <div class="drugsOne">
-                {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{
-                  it.count
-                }}次
-              </div>
+          <div
+            class="drugsBox"
+            v-for="(it, i) in item.additionalcharge"
+            :key="i"
+          >
+            <div class="drugsOne">
+              {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{
+                it.count
+              }}次
             </div>
+          </div>
 
-            <div
-              class="drugsBox"
-              v-for="(it, index) in item.project"
-              :key="index"
-            >
-              <div class="drugsOne">
-                <span style="font-weight: bold">{{ index + 1 + "." }}</span
-                >{{
-                  it.type == 2
+          <div
+            class="drugsBox"
+            v-for="(it, index) in item.project"
+            :key="index"
+          >
+            <div class="drugsOne">
+              <span style="font-weight: bold">{{ index + 1 + "." }}</span
+              >{{
+                it.type == 2
+                  ? getProjectName(it.project_id)
                     ? getProjectName(it.project_id)
-                      ? getProjectName(it.project_id)
-                      : ""
-                    : it.good_info.good_name
-                }}&nbsp;&nbsp;{{ it.single_dose
-                }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count }}{{ unit }}
-              </div>
-              <div style="margin-left: 100px">
-                <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
-                >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span
-                >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
-              </div>
+                    : ""
+                  : it.good_info.good_name
+              }}&nbsp;&nbsp;{{ it.single_dose
+              }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count }}{{ unit }}
             </div>
-            
-            <div
-              class="drugsBox"
-              v-for="(it, i) in item.additionalcharge"
-              :key="i"
-            >
-              <div class="drugsOne">
-                {{ it.project_id ? it.project_id : "" }}:&nbsp;{{
-                  it.price.toFixed(2)
-                }}元/{{ it.count }}次
-              </div>
+            <div style="margin-left: 100px">
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+              >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span
+              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
             </div>
-            <div style="text-align: center">(以下空白)</div>
           </div>
-        
-          <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
-            <p v-if="org_id == 10217 || org_id == 0">
-              医师：
-              <span
-                style="width: 100px; display: inline-block"
-                v-if="item.creator == ''"
-              >
-                {{ item.doctor }}
-              </span>
-              <span
-                style="width: 100px; display: inline-block"
-                v-else-if="doc_name != ''"
-              >
-                {{ doc_name }}
-              </span>
-              <img
-                style="height: 50px;"
-                :src="setAdminUserES(item.creator,item.doctor)"
-                alt=""
-                srcset=""
-
-              />
-            </p>
-            <p v-else>
-              医师： {{ item.doctor ? item.doctor : "" }}
-            </p>
-            <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
+          
+          <div
+            class="drugsBox"
+            v-for="(it, i) in item.additionalcharge"
+            :key="i"
+          >
+            <div class="drugsOne">
+              {{ it.project_id ? it.project_id : "" }}:&nbsp;{{
+                it.price.toFixed(2)
+              }}元/{{ it.count }}次
+            </div>
           </div>
+          <div style="text-align: center">(以下空白)</div>
+        </div>
+        <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
+          <p v-if="org_id == 10217 || org_id == 0">
+            医师：
+            <span
+              style="width: 100px; display: inline-block"
+              v-if="item.creator == ''"
+            >
+              {{ item.doctor }}
+            </span>
+            <span
+              style="width: 100px; display: inline-block"
+              v-else-if="doc_name != ''"
+            >
+              {{ doc_name }}
+            </span>
+            <img
+              style="height: 50px;"
+              :src="setAdminUserES(item.creator,item.doctor)"
+              alt=""
+              srcset=""
 
-          <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">
-            <p>医师：{{ item.doctor ? item.doctor : "" }}</p>
-          </div>
-          <!-- <div class="doctorBoxtwo" v-if="org_id == 10188 || org_id == 0">
-            <p >审核、调配：</p>
-            <p >核对、发药：</p>
-            <p style="margin-right: 43px">药师：</p>
-          </div> -->
+            />
+          </p>
+          <p v-else>
+            医师： {{ item.doctor ? item.doctor : "" }}
+          </p>
+          <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
+        </div>
 
-          <div class="actionBar" v-if="org_id != 10188 && org_id != 0">
-            <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
-                  <p>配对：</p>
-                  <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
-                  <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
-                  <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
+        <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">
+          <p>医师：{{ item.doctor ? item.doctor : "" }}</p>
+        </div>
+        <!-- <div class="doctorBoxtwo" v-if="org_id == 10188 || org_id == 0">
+          <p >审核、调配：</p>
+          <p >核对、发药：</p>
+          <p style="margin-right: 43px">药师：</p>
+        </div> -->
 
-            <p>审核：</p>
-            <p>配对：</p>
-            <p>核对：</p>
-            <p>发药：</p>
-            <p>
-              药费：{{
-                getTotalOne(item.id).toFixed(2)
-                  ? getTotalOne(item.id).toFixed(2)
-                  : 0
-              }}元
-            </p>
-            <!--            <p>药费：466.2元</p>-->
-          </div>
-          <div class="actionBar" v-else>
-            <p >审核、调配：</p>
-            <p >核对、发药：</p>
-            <p >
-              药费：{{
-                getTotalOne(item.id).toFixed(2)
-                  ? getTotalOne(item.id).toFixed(2)
-                  : 0
-              }}元
-            </p>
-            <!--            <p>药费：551.2元</p>-->
-            <!--            <p>药费：466.2元</p>-->
-          </div>
-        <!-- </div> -->
+        <div class="actionBar" v-if="org_id != 10188 && org_id != 0">
+          <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+                 <p>配对：</p>
+                 <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+                 <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
+                 <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
+
+          <p>审核：</p>
+          <p>配对：</p>
+          <p>核对：</p>
+          <p>发药：</p>
+          <p>
+            药费：{{
+              getTotalOne(item.id).toFixed(2)
+                ? getTotalOne(item.id).toFixed(2)
+                : 0
+            }}元
+          </p>
+          <!--            <p>药费：466.2元</p>-->
+        </div>
+        <div class="actionBar" v-else>
+          <p >审核、调配：</p>
+          <p >核对、发药：</p>
+          <p >
+            药费：{{
+              getTotalOne(item.id).toFixed(2)
+                ? getTotalOne(item.id).toFixed(2)
+                : 0
+            }}元
+          </p>
+          <!--            <p>药费：551.2元</p>-->
+          <!--            <p>药费：466.2元</p>-->
+        </div>
+        <!-- <div style="page-break-after: always"></div> -->
       </div>
     </div>
   </div>
@@ -332,10 +227,6 @@ export default{
       doctorList: [],
       advicePrint: {},
       yi:4,
-      arr:[],
-      arrs:{},
-      advicess:[],
-      page:sessionStorage.getItem('dayin'),
       patient: {},
       tableData: [],
       prescriptionInfo: [],
@@ -437,21 +328,6 @@ export default{
           this.prescriptions = advicePrint;
 
           this.doctorList_1 = response.data.data.eles;
-        //  for(let i=0;i<this.advicePrint.length;i++){
-        //   this.advicess=advicePrint[i].advices
-        //  }
-        //  for(let j=0;j<this.advicess.length;j++){
-        //     for(let x=j+1;x<this.advicess.length;x++){
-        //       if(this.advicess[j].groupno == this.advicess[x].groupno){
-        //         this.arr.push(this.advicess.splice(x,1))
-        //         // this.arrs=this.advicess.splice(x,1)
-        //       }
-        //     }
-        //   }
-        // this.merge(this.advicess)
-          // console.log('4444444',this.arrs);
-        //  console.log('55555555',this.arr);
-        //  console.log('6666666',this.advicess);
           console.log(this.doctorList_1, "医生列表");
           if (this.doctorList_1.length > 0) {
             var operatorsLen = this.doctorList_1.length;
@@ -584,26 +460,6 @@ export default{
       }
       return name;
     },
-    merge(arrA){
-      var len=arrA.lenfth
-      // for(let j=0;j<this.advicess.length;j++){
-      //   for(let x=j+1;x<this.advicess.length;x++){
-      //     if(this.advicess[j].groupno == this.advicess[x].groupno){
-      //       // this.arr.push(this.advicess.splice(x,1))
-      //       this.arrs=this.advicess.splice(x,1)
-      //     }
-      //   }
-      // }
-      for(let j=0;j<len;j++){
-        for(let x=j+1;x<len;x++){
-          if(arrA[j].groupno == arrA[x].groupno){
-            this.arr.push(arrA.splice(x,1))
-          }
-        }
-      }
-      console.log('777777777',this.arr);
-      return this.arr
-    }
   },
   created() {
     this.getAllDoctorList();
@@ -613,20 +469,7 @@ export default{
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     this.org_id = xtuser.org.id;
-    
-    // for(let j=0;j<this.advicess.length;j++){
-    //   console.log('44444444');
-    //   for(let x=j+1;x<this.advicess.length;x++){
-    //     if(this.advicess[j].groupno == this.advicess[x].groupno){
-    //       this.arr.push(this.advicess.splice(x,1))
-    //     }
-    //   }
-    // }
-    // console.log('777777777',this.arr[0].advice_name);
-    // return this.arr
-    
   },
-  
   watch: {
     ids: function (val) {
       this.ids = val;
@@ -683,14 +526,12 @@ export default{
 .drugsBox {
   padding-left: 40px;
   margin-bottom: 10px;
-  position: relative;
 }
 .drugsBox div {
   line-height: 20px;
 }
 .drugsOne {
   line-height: 24px;
-  display: inline-block;
 }
 .drugsOne span {
   margin-right: 20px;

src/xt_pages/workforce/components/editTableData.vue

@@ -1339,6 +1339,8 @@
           >
           </el-option>
         </el-select>
+
+       
       </div>
       <span slot="footer" class="dialog-footer" style="text-align: center">
         <el-button
@@ -1362,7 +1364,7 @@
 
     <!-- 双击弹窗 -->
     <el-dialog
-        title="调整模式"
+        title="调整模式99999"
         :visible.sync="msDialogVisible"
         width="500px"
         v-loading="changing_mode"
@@ -1376,12 +1378,12 @@
             :rules="changeRules"
         >
           <el-form-item label="" prop="mode_id">
+            <span>透析模式:</span>
             <el-select
                 v-model="changeSchedule.mode_id"
                 placeholder="请选择"
                 style="width: 100%"
             >
-            <!-- @change="changeSchedulemodeid" -->
               <el-option
                   :disabled="item.id == currentData.mode_id"
                   v-for="item in modeOptions"
@@ -1392,6 +1394,59 @@
               </el-option>
             </el-select>
           </el-form-item>
+          
+          <el-form-item>
+            <span>透析班次:</span>
+            <el-select
+                v-model="changeSchedule.schedule_type"
+                placeholder="请选择"
+                style="width: 100%"
+                @change="changeScheduleType"
+            >
+              <el-option
+                  v-for="item in scheduleType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        
+          <el-form-item>
+            <span>透析分区:</span>
+            <el-select
+              v-model="changeSchedule.partition_id"
+              placeholder="请选择"
+              style="width: 100%"
+              @change="changePartition"
+              >
+              <el-option
+                  v-for="(item, index) in zone_names"
+                  :key="index"
+                  :label="item"
+                  :value="item"
+              >
+              </el-option>
+              </el-select>
+          </el-form-item>
+
+          <el-form-item>
+            <span>透析床位:</span>
+            <el-select
+                v-model="device_id"
+                placeholder="请选择"
+                style="width: 100%"
+            >
+              <el-option
+                  v-for="item in current_devices"
+                  :key="item.id"
+                  :label="item.number"
+                  :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -1719,6 +1774,7 @@ import {
   getUrgentScheduleInitData,
   getWeekPanelsOne,
   getAllZones,
+  ChangeScheduleTen
 } from "@/api/schedule";
 import ScheduleItem from "./ScheduleItem";
 
@@ -4951,6 +5007,20 @@ export default {
           this.tiaoZhengType = 1;
           this.msDialogVisible=true
         }
+        console.log("ROW22O2O2OWOOW",row)
+        console.log("CHANGESHCUEL2O2O2O",this.changeSchedule)
+        console.log("WOOWOWOWOWOW",this.zones)
+        this.changeSchedule.mode_id = row[column.property].mode_id
+        var zone_names = ""
+        for(let i=0;i<this.zones.length;i++){
+          if(row.zone_id == this.zones[i].id){
+           zone_names = this.zones[i].name
+          }
+        }
+        this.changeSchedule.partition_id = zone_names
+        this.changeSchedule.schedule_type = week[1];
+        this.changeSchedule.bed_id = row.jihao_id;
+        this.changeSchedule.schedule_week = week[0];
       }
 
     },
@@ -4995,8 +5065,10 @@ export default {
 
     //  双击弹窗确认按钮
     submitMode(formName) {
+      console.log("wowowoowow",this.changeSchedule)
       this.changing_mode = true;
       this.changeSchedule.change_action = "change_mode";
+
       ChangeSchedule(this.currentData.id, this.changeSchedule)
           .then((response) => {
             if (response.data.state == 0) {
@@ -5698,6 +5770,7 @@ export default {
             this.zoneIdList.push(zones[i].id);
           }
           this.zones.push(...zones);
+          console.log("zoneswoowowow",this.zones)
           var strArr = this.zoneIdList.join(",");
 
           this.strArr = strArr;

src/xt_pages/workforce/components/tableData.vue

@@ -542,6 +542,11 @@
               >
               </el-option>
             </el-select>
+
+
+           
+
+
           </el-form-item>
         </el-form>
       </div>
@@ -1010,7 +1015,7 @@ export default {
     this.modeOptions = this.$store.getters.treatment_mode;
 
     this.partitions = this.partitionsProp;
-
+    console.log("分区oowowoow",this.partitions)
 
     var contagions = this.$store.getters.contagions;
     if (contagions.length > 0) {
@@ -2649,8 +2654,7 @@ export default {
     submitMode(formName) {
       this.changing_mode = true;
       this.changeSchedule.change_action = "change_mode";
-      ChangeSchedule(this.currentData.id, this.changeSchedule)
-        .then(response => {
+      ChangeSchedule(this.currentData.id, this.changeSchedule).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
           } else {