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

src/router/index.js

@@ -174,7 +174,6 @@ var _asy_router_map = [
 
   otherManagement,
   qcd,
-
   device,
   org,
   data_upload,

src/router/modules/dialysis.js

@@ -56,15 +56,15 @@ export default {
         noCache: true
       }
     },
-    {
-      path: '/dialysis/patientDoctorAdvice',
-      component: () => import('@/xt_pages/dialysis/patientDoctorAdvice'),
-      name: '医嘱统计',
-      meta: {
-        title: '医嘱统计',
-        noCache: true
-      }
-    },
+    // {
+    //   path: '/dialysis/patientDoctorAdvice',
+    //   component: () => import('@/xt_pages/dialysis/patientDoctorAdvice'),
+    //   name: '医嘱统计',
+    //   meta: {
+    //     title: '医嘱统计',
+    //     noCache: true
+    //   }
+    // },
     {
       path: '/dialysis/longDoctorAdvice',
       component: () => import('@/xt_pages/dialysis/longDoctorAdvice'),

src/xt_pages/DepositManagement/DepositSearch.vue

@@ -133,6 +133,7 @@ export default {
         if (res.data.state == 1){
           this.total = res.data.data.total;
           this.tableData = res.data.data.list;
+          console.log('ccccc',this.tableData);
         }
       })
     },
@@ -147,7 +148,6 @@ export default {
         console.log("this.users",this.users)
       })
     },
-
     // 查询操作
     search() {
       this.keyword = this.tmp_keyword

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -24,7 +24,7 @@
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>
           <!-- <PrintTen v-if="org_id == 10375 ||org_id == 0 " :paramsObj="invoiceParams"></PrintTen> -->
-          <printtwelve :paramsObj="invoiceParams"  v-if="org_id == 10480 "></printtwelve>
+          <printtwelve :paramsObj="invoiceParams"  v-if="org_id == 10480"></printtwelve>
         </div>
     </div>
 
@@ -69,9 +69,9 @@
   import PrintEight from "./invoiceTemplate/printEight";
   import PrintNight from "./invoiceTemplate/PrintNight";
   import PrintTen from './invoiceTemplate/printTen.vue'
-  import PrintEleven from './invoiceTemplate/printEleven.vue'
-  import printtwelve from './invoiceTemplate/printtwelve.vue'
-  import printthirteen from './invoiceTemplate/printthirteen.vue'
+  import PrintEleven from './invoiceTemplate/printEleven'
+  import printtwelve from './invoiceTemplate/printtwelve'
+  import printthirteen from './invoiceTemplate/printthirteen'
   export default {
     name: "invoicePrint",
     components: {

src/xt_pages/outpatientCharges/invoiceTemplate/printthirteen.vue

@@ -85,7 +85,7 @@
         </div>
         <div style="flex: 1;border-left: 1px solid black; padding: 5px 0;">￥：{{ list.medfee_sumamt }}</div>
       </div>
-      <div style="border:1px solid black;border-top: none;height: 80px;">
+      <div style="border:1px solid black;border-top: none;min-height: 80px;">
         <div style="padding: 5px 0; position: relative;">
           <div v-if="index == pageArr.length - 1">
             <div style="display:flex;">

src/xt_pages/outpatientCharges/invoiceTemplate/printtwelve.vue

@@ -80,9 +80,9 @@
         <div :style="{position: 'absolute',top:(80 + (index * 450))  + 'px',left:'30px'}">
           {{paramsObj.name}}
         </div>
-        <!-- <div :style="{position: 'absolute',top:(80 + (index * 450))  + 'px',left:'200px'}">
+        <div :style="{position: 'absolute',top:(80 + (index * 450))  + 'px',left:'200px'}">
           {{list.order.fa_piao_number}}
-        </div> -->
+        </div>
       </div>
 
       <div style="display: flex;">

src/xt_pages/outpatientDoctorStation/checkTemplate/printThree.vue

@@ -65,12 +65,6 @@
               : ""
           }}
         </div>
-        <!-- <div style="margin-bottom:20px;padding:0 10px;">体格检查：
-                    <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
-                    <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
-                    <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
-                    <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
-                </div> -->
         <div style="margin-bottom: 20px; padding: 0 10px">
           临床诊断：{{ getDiagnosis(advicePrint[0].info.diagnosis) }}
         </div>
@@ -105,7 +99,7 @@
           </div>
         </div>
       </div>
-   
+
     </div>
     </div>
 
@@ -220,7 +214,7 @@ export default {
       getPrescriptionPrint(params).then((response) => {
         if (response.data.state == 1) {
           var advicePrint = response.data.data.advicePrint;
-          // console.log("adviceprint9999", advicePrint);
+          console.log("adviceprint9999", advicePrint);
           this.advicePrint = advicePrint;
           this.prescriptions = advicePrint;
           // console.log("处方222222", this.prescriptions);

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -16,8 +16,8 @@
         <!-- 此下条为本地开发下页面 -->
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
         <!-- org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0 -->
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 0 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printThree v-if=" org_id == 10375 || org_id==0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printThree v-if=" org_id == 10375 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
         <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
       </div>
   </div>

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -356,6 +356,7 @@
                     :total="total"
             >
             </el-pagination>
+            <!-- 挂号历史详情 -->
             <el-dialog
                     title="挂号历史详情"
                     :visible.sync="dialogVisible"

src/xt_pages/user/evaluationtool/Glasgow.vue

@@ -358,12 +358,17 @@ export default {
       this.dele_id=row.id
     },
     Glas_dele(){
-      this.append=false
-      this.Glas_gzdayin=false
-      this.Glasadd_show=true
-      this.Glas_baoxiao=false
-      this.cancel_num=0
-      this.dele_dialogVisible=true
+      if(this.dele_id !=''){
+        this.append=false
+        this.Glas_gzdayin=false
+        this.Glasadd_show=true
+        this.Glas_baoxiao=false
+        this.cancel_num=0
+        this.dele_dialogVisible=true
+      }else{
+        this.$message('请选择需要删除的记录')
+      }
+
     },
     deleclick(){
       for(let i=0;i<this.history_Glasgow.length;i++){

src/xt_pages/user/evaluationtool/Muscleforce.vue

@@ -338,11 +338,16 @@ export default {
       this.dele_id=row.id
     },
     muscle_dele(){
-      this.muscle_gsdayin=false
-      this.baocun_quxiao = false
-      this.append=false
-      this.muscle_pinggu=null
-      this.dele_dialogVisible=true
+      if(this.dele_id !=''){
+        this.muscle_gsdayin=false
+        this.baocun_quxiao = false
+        this.append=false
+        this.muscle_pinggu=null
+        this.dele_dialogVisible=true
+      }else{
+        this.$message('请选择需要删除的记录')
+      }
+
     },
     deleclick(){
       for(let i=0;i<this.history_muscle.length;i++){

src/xt_pages/user/evaluationtool/OHpressuresore.vue

@@ -328,11 +328,6 @@ export default {
         }else{
           checkboxs[i].checked = false
         }
-        // if(checkboxs[i].checked == true){
-        //   if(ball==checkboxs[i].value){
-        //     checkboxs[i].checked=false
-        //   }
-        // }
       }
     },
     bingligu(e){
@@ -416,14 +411,20 @@ export default {
       this.baocun_open=1
       this.cancel_num=1
     },
+    // 选择需要删除的记录
     dele_click(row, column, event){
       this.dele_id=row.id
     },
     //删除
     dele_OH(){
-      this.zsgy_open=0
-      this.append=false
-      this.dele_dialogVisible=true
+      if(this.dele_id !=''){
+        this.zsgy_open=0
+        this.append=false
+        this.dele_dialogVisible=true
+      }else{
+        this.$message('请选择需要删除的记录')
+      }
+
     },
     deleclick(){
       for(let i=0;i<this.history_OH.length;i++){

src/xt_pages/user/evaluationtool/hemodialysis.vue

@@ -1388,12 +1388,16 @@ export default {
       this.dele_dialogVisible=false
     },
     hemod_dele(){
-      this.append=false
-      this.gsdayin=false
-      this.baocunqx=false
-      this.hemodadd_show=true
-      this.cancel_num=0
-      this.dele_dialogVisible=true
+      if(this.dele_id !=''){
+        this.append=false
+        this.gsdayin=false
+        this.baocunqx=false
+        this.hemodadd_show=true
+        this.cancel_num=0
+        this.dele_dialogVisible=true
+      }else{
+        this.$message('请选择需要删除的记录')
+      }
     },
     hemod_click(row,column, event){
       this.dele_id=row.id

src/xt_pages/user/evaluationtool/pediatricFallAssessment.vue

@@ -3,152 +3,151 @@
   <div class="patient-container">
       <patient-sidebar :id="patient_id" defaultActive="5-2"></patient-sidebar>
       <div>
-          <div class="patient-app-container advice-container app-container">
-              <div class='content_top' style="width: 100%;margin-bottom: 20px;">
-                  <div style="font-size: 20px;">小儿高危跌倒坠床评估表</div>
-                  <div>
-                      <el-button @click="childerHistory">历史评分</el-button>
-                      <el-button @click="dialogVisible=true">告知书</el-button>
-                  </div>
-              </div>
-
-              <div>
-                <table class="table" id="table" border="1" style="width: 100%;">
-                  <thead>
-                    <tr>
-                    <th style="width:10%;">项目</th>
-                    <th style="width: 22.4%;">4分</th>
-                    <th style="width: 22.4%;">3分</th>
-                    <th style="width: 22.4%;">2分</th>
-                    <th style="width: 22.4%;">1分</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr class="bg_color">
-                      <td class="start">年龄</td>
-                      <td v-for="(item,index) in age" :key="index">
-                        <div class="jiange">
-                          <label><input name="ball" class="checked1" type="checkbox" :value="item.value" @click="ageChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td style="border-right: none;">
-                        <div class="bing">性别</div>
-                      </td>
-                      <td colspan="2" style="border-left: none;"></td>
-                      <td v-for="(item,index) in sex" :key="index">
-                        <div class="jiange">
-                          <label><input name="ball" class="checked2" type="checkbox" :value="item.value" @click="sexChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="bg_color">
-                      <td class="start">诊断</td>
-                      <td v-for="(item,index) in diagnosis" :key="index">
-                        <div class="jiange">
-                          <label><input name="ball" class="checked3" type="checkbox" :value="item.value" @click="diagnosischange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                        </div>
-                      </td>
-
-                    </tr>
-                    <tr>
-                      <td style="border-right: none;">
-                          <div class="bing">认知障碍</div>
-                      </td>
-                      <td style="border-left: none;"></td>
-                      <td v-for="(item,index) in cognize" :key="index">
-                        <div class="jiange">
-                          <label><input name="ball" class="checked4" type="checkbox" :value="item.value" @click="cognizeChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                        </div>
-                      </td>
+        <div class="patient-app-container advice-container app-container">
+          <div class='content_top' style="width: 100%;margin-bottom: 20px;">
+            <div style="font-size: 20px;">小儿高危跌倒坠床评估表</div>
+            <div>
+              <el-button @click="childerHistory">历史评分</el-button>
+              <el-button @click="dialogVisible=true">告知书</el-button>
+            </div>
+          </div>
 
-                    </tr>
-                    <tr class="bg_color">
-                      <td class="start">环境因素</td>
-                      <td v-for="(item,index) in environment" :key="index">
-                        <div class="jiange">
-                          <label><input name="ball" class="checked5" type="checkbox" :value="item.value" @click="environChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                        </div>
-                      </td>
+          <div>
+            <table class="table" id="table" border="1" style="width: 100%;">
+              <thead>
+                <tr>
+                <th style="width:10%;">项目</th>
+                <th style="width: 22.4%;">4分</th>
+                <th style="width: 22.4%;">3分</th>
+                <th style="width: 22.4%;">2分</th>
+                <th style="width: 22.4%;">1分</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr class="bg_color">
+                  <td class="start">年龄</td>
+                  <td v-for="(item,index) in age" :key="index">
+                    <div class="jiange">
+                      <label><input name="ball" class="checked1" type="checkbox" :value="item.value" @click="ageChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td style="border-right: none;">
+                    <div class="bing">性别</div>
+                  </td>
+                  <td colspan="2" style="border-left: none;"></td>
+                  <td v-for="(item,index) in sex" :key="index">
+                    <div class="jiange">
+                      <label><input name="ball" class="checked2" type="checkbox" :value="item.value" @click="sexChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                    </div>
+                  </td>
+                </tr>
+                <tr class="bg_color">
+                  <td class="start">诊断</td>
+                  <td v-for="(item,index) in diagnosis" :key="index">
+                    <div class="jiange">
+                      <label><input name="ball" class="checked3" type="checkbox" :value="item.value" @click="diagnosischange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                    </div>
+                  </td>
 
-                    </tr>
-                    <tr>
-                      <td style="border-right: none;">
-                          <div class="bing">药物使用</div>
-                      </td>
-                      <td style="border-left: none;"></td>
-                      <td v-for="(item,index) in medicine" :key="index">
-                        <div class="jiange">
-                          <label><input name="ball" class="checked6" type="checkbox" :value="item.value" @click="medicineChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                        </div>
-                      </td>
+                </tr>
+                <tr>
+                  <td style="border-right: none;">
+                      <div class="bing">认知障碍</div>
+                  </td>
+                  <td style="border-left: none;"></td>
+                  <td v-for="(item,index) in cognize" :key="index">
+                    <div class="jiange">
+                      <label><input name="ball" class="checked4" type="checkbox" :value="item.value" @click="cognizeChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                    </div>
+                  </td>
 
-                    </tr>
-                    <tr class="bg_color">
-                    <td colspan="5" style="height: 30px;"></td>
+                </tr>
+                <tr class="bg_color">
+                  <td class="start">环境因素</td>
+                  <td v-for="(item,index) in environment" :key="index">
+                    <div class="jiange">
+                      <label><input name="ball" class="checked5" type="checkbox" :value="item.value" @click="environChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                    </div>
+                  </td>
 
-                    </tr>
-                    <tr>
-                    <td colspan="5">
-                      <div class="content_top" >
-                        <div>
-                            <div class="bottoms">
-                            <span>总分:</span>
-                            <el-input v-model="pedia_Totalpoints" style="width: 100px;"></el-input>分
-                            </div>
+                </tr>
+                <tr>
+                  <td style="border-right: none;">
+                      <div class="bing">药物使用</div>
+                  </td>
+                  <td style="border-left: none;"></td>
+                  <td v-for="(item,index) in medicine" :key="index">
+                    <div class="jiange">
+                      <label><input name="ball" class="checked6" type="checkbox" :value="item.value" @click="medicineChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                    </div>
+                  </td>
 
-                            <div class="bottoms">
-                                <span>评估日期:</span>
-                                <el-date-picker
-                                    v-model="value1"
-                                    type="date"
-                                    placeholder="选择日期"
-                                    :clearable="false"
-                                    style="width: 150px;">
-                                </el-date-picker>
-                            </div>
+                </tr>
+                <tr class="bg_color">
+                <td colspan="5" style="height: 30px;"></td>
 
-                            <div class="bottoms">
-                                <span>评估人:</span>
-                                <el-select v-model="value" placeholder="请选择" >
-                                    <el-option
-                                    v-for="item in options"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                    style="width:150px;">
-                                    </el-option>
-                                </el-select>
-                            </div>
+                </tr>
+                <tr>
+                <td colspan="5">
+                  <div class="content_top" >
+                    <div>
+                        <div class="bottoms">
+                        <span>总分:</span>
+                        <el-input v-model="pedia_Totalpoints" style="width: 100px;"></el-input>分
+                        </div>
 
+                        <div class="bottoms">
+                            <span>评估日期:</span>
+                            <el-date-picker
+                                v-model="value1"
+                                type="date"
+                                placeholder="选择日期"
+                                :clearable="false"
+                                style="width: 150px;">
+                            </el-date-picker>
                         </div>
-                        <div style="margin:5px 10px;">
-                          <el-button type="primary">确认</el-button>
+
+                        <div class="bottoms">
+                            <span>评估人:</span>
+                            <el-select v-model="value" placeholder="请选择" >
+                                <el-option
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                                style="width:150px;">
+                                </el-option>
+                            </el-select>
                         </div>
-                      </div>
-                    </td>
-                    </tr>
-                  </tbody>
-                </table>
 
-              </div>
+                    </div>
+                    <div style="margin:5px 10px;">
+                      <el-button type="primary">确认</el-button>
+                    </div>
+                  </div>
+                </td>
+                </tr>
+              </tbody>
+            </table>
 
           </div>
+
+        </div>
       </div>
       <div>
-          <el-dialog
-              title="内容详情"
-              :visible.sync="dialogVisible"
-              width="50%"
+        <el-dialog
+            title="内容详情"
+            :visible.sync="dialogVisible"
+            width="50%"
 
-              class="status_change">
-              <div>
-                  <Falloutbedprint></Falloutbedprint>
-              </div>
-
-          </el-dialog>
+            class="status_change">
+            <div>
+                <Falloutbedprint></Falloutbedprint>
+            </div>
 
+        </el-dialog>
       </div>
   </div>
 </template>
@@ -206,11 +205,11 @@ export default {
      for(let i=0;i<checkboxs.length;i++){
       if(val==checkboxs[i].value){
         this.agevalue = val
-        checkboxs[i].value
         checkboxs[i].checked=true
       }else{
         checkboxs[i].checked = false
       }
+
      }
     },
     sexChange(e,val){
@@ -219,9 +218,7 @@ export default {
         if(val==checkboxs[i].value ){
           console.log('vvvv',val,'bbbb',e.target.checked);
           this.sexvalue = val
-
           checkboxs[i].checked=true
-
         }else{
           checkboxs[i].checked = false
         }

src/xt_pages/user/evaluationtool/pruritusAssessment.vue

@@ -33,7 +33,7 @@
                     </label>
                     <!-- quan_change -->
                     <label @change="handleCheckedCitiesChange">
-                      <input type="checkbox" class="check" name="ball" value="全身" />&nbsp;全身
+                      <input type="checkbox" class="checkbox" name="ball" value="全身" />&nbsp;全身
                     </label>
                   </div>
                 </td>
@@ -149,107 +149,45 @@ export default {
       options:[],
       value:'',
       value1:'',
+      num:0
     }
   },
   methods:{
     handleCheckedCitiesChange(e){
       const ball = e.target.value
-      // const checkboxs=document.getElementsByClassName('checkbox1')
+      // var num = null
+      const checkboxs=document.getElementsByClassName('checkbox')
       const checkbox2=document.getElementsByClassName('check')
-      // if(checkboxs[0].checked==true){
-      //   // if(e.target.value == '全身'){
-      //     this.checked_points = 3
-      //   // }else{
-      //   //   var checked =1
-      //   //   this.checked_points = this.checked_points + checked
-      //   // }
-      // }else{
-      //   // if(e.target.value == '全身'){
-      //     this.checked_points = 0
-      //   // }else{
-      //   //   var checked =1
-      //   //   this.checked_points = this.checked_points - checked
-      //   // }
-      // }
-      // for(let i=0;i<checkbox2.length;i++){
-      //   if(ball=='全身'){
-      //     if(ball==checkbox2[i].value){
-      //       console.log('1111',this.checked_points);
-      //       checkbox2[i].checked=true
-      //       this.checked_points = 3
-      //     }else{
-      //       console.log('2222',this.checked_points);
-      //       checkbox2[i].checked=false
-      //     }
-      //   }else{
-      //     if(checkbox2[i].value=='全身'){
-      //       console.log('3333',this.checked_points);
-      //       this.checked_points=0
-      //       checkbox2[i].checked=false
-      //     }else{
-      //       if(checkbox2[i].value==ball){
-      //         console.log('4444',this.checked_points);
-      //         var checked =1
-      //         e.target.checked=true
-      //         this.checked_points = this.checked_points + checked
-      //         // return this.checked_points
-      //       }
 
-      //     }
-
-      //   }
-      //   // if(checkboxs[0].checked==true){
-      //   //   this.checked_points = 3
-      //   //   checkbox2[i].checked=false
-      //   // }else{
-      //   //   if(ball==checkbox2[i].value){
-      //   //     console.log('2222',checkbox2[1].value);
-      //   //     checkboxs[0].checked=false
-      //   //     checkbox2[i].checked=true
-      //   //     var checked =1
-      //   //     this.checked_points = this.checked_points + checked
-      //   //   }
-      //   // }
-      // }
-      // console.log('1111111',ball)
-      // for(let i=0;i<checkbox2.length;i++){
-      //   if(ball=='全身'){
-      //     checkboxs[0].checked=true
-      //     checkbox2[i].checked=false
-      //     this.checked_points = 3
-      //   }else{
-      //     var checked =1
-      //     checkboxs[0].checked=false
-      //     e.target.checked=true
-      //     this.checked_points = this.checked_points + checked
-      //   }
-      // }
-
-      // if(ball=='全身'){
-      //   checkboxs[0].checked=true
-      // }else{
-      //   checkboxs[0].checked=false
-      // }
-
-      if(e.target.checked==true){
-        if(e.target.value == '全身'){
+      for(let i=0;i<checkbox2.length;i++){
+        if(ball=='全身'){
+          checkboxs[0].checked=true
+          checkbox2[i].checked=false
           this.checked_points = 3
+          this.num=0
         }else{
-          // if(this.checked_points<3){
-            var checked =1
-            this.checked_points = this.checked_points + checked
-          // }else{
-          //   this.checked_points = 3
-          // }
-        }
-      }else{
-        if(e.target.value == '全身'){
-          this.checked_points = 0
-        }else{
-          var checked =1
-          this.checked_points = this.checked_points - checked
+          if(ball==checkbox2[i].value){
+            // 得分归0
+            if(checkboxs[0].checked==true&&ball!='全身'){
+              this.checked_points = 0
+            }
+            console.log('cccc',this.num);
+            // 选择非全身时不能超过3个
+            if(this.num<3){
+              var checked =1
+              this.num++
+              this.checked_points = this.checked_points + checked
+              checkbox2[i].checked =true
+              checkboxs[0].checked =false//取消全身的选中
+              return this.num
+            }else{
+              checkbox2[i].checked =false//选择超过3个时无法选中
+              checkboxs[0].checked =false//取消全身的选中
+            }
+          }
         }
       }
+      return this.checked_points
     },
     quan_change(e){
       const ball=e.target.value

src/xt_pages/workforce/Patientshift.vue

@@ -74,9 +74,9 @@
                 <td>
                   <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" >
                     <div v-if="hidder_chuang==true ? getkongchuang(it,item.list)>0 : ' '"><!--'background':getcolors(item)>0?'bisque':'#30b8e394'  'background':item2.mode_id==2||item2.mode_id==3?'bisque':'#30b8e394'-->
-                      <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" 
-                      :style="{'height':!hidder ? '110px': '45px','overflow': 'auto'}" 
-                      @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event,item)" draggable="true"   @dragover="allowDrop"> 
+                      <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais"
+                      :style="{'height':!hidder ? '110px': '45px','overflow': 'auto'}"
+                      @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event,item)" draggable="true"   @dragover="allowDrop">
                         <div class="huanzhekuai">
                           <div v-for="(item2) in item.list" style="width: 100%;">
                             <template>
@@ -87,13 +87,13 @@
                                     <span style="font-size: 15px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
                                     <span style="font-size: 15px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
                                     <span style="font-size: 14px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
-                                  </span> 
+                                  </span>
                                 </div>
                               </div>
-                            </template> 
+                            </template>
                           </div>
-                        </div> 
-                                          
+                        </div>
+
                       </div>
                       <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
                         {{ it.number }}
@@ -104,9 +104,9 @@
               </tr>
             </tbody>
           </table>
-          
+
         </div>
-       
+
         <!-- 双击弹窗 -->
         <el-dialog
           title="提示"
@@ -146,11 +146,11 @@
                         {{ huanzhe.zeng_fenqu }}-{{ huanzhe.zeng_chuang }}
                       </span><br>
                       <span style="font-size: 15px;margin-bottom: 5px;">{{getBloodAccess(huanzhe.boolen_id)}}</span><br>
-                      <span style="font-size: 14px;margin-bottom: 5px;">{{huanzhe.schedule_remark}}</span> 
+                      <span style="font-size: 14px;margin-bottom: 5px;">{{huanzhe.schedule_remark}}</span>
                     </div>
                      <div style="margin-left: 13px;">{{getZoneName(xian_fenqu.zone_id)}}-{{xian_fenqu.number}}</div>
                   </div>
-                  
+
                   <div>
                     <div style="margin: 10px 30px 10px 10px;background: rgb(74 197 235);height: 110px;width: 125px;text-align: center;">
                       <span >{{genghuan.name}}</span><span v-if="genghuan.mode_id !=''">({{genghuan.mode_id}})</span><br>
@@ -164,7 +164,7 @@
                     <div style="margin-left: 13px;">{{getZoneName(g_xian_fenqu.zone_id)}}-{{g_xian_fenqu.number}}</div>
                   </div>
                 </div>
-               
+
               </div>
             </div>
           </div>
@@ -294,7 +294,7 @@
               inactive-text="OFF">
             </el-switch>
           </div>
-         
+
         </div>
         <div class="table_panel"  v-for="(item, index) in tableData" :key="index">
           <table class="table">
@@ -310,9 +310,9 @@
                 <td>
                   <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" >
                     <div v-if="hidder_chuang==true ? getkongchuang(it,item.list)>0 : ' '">
-                      <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" 
-                      :style="{'height':!hidder ? '110px': '45px','overflow': 'auto'}" 
-                      @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event)" draggable="true"   @dragover="allowDrop"> 
+                      <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais"
+                      :style="{'height':!hidder ? '110px': '45px','overflow': 'auto'}"
+                      @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event)" draggable="true"   @dragover="allowDrop">
                         <div class="huanzhekuai">
                           <div v-for="(item2) in item.list" :key="item2.bed_id"   draggable="true" >
                             <template >
@@ -323,13 +323,13 @@
                                     <span style="font-size: 15px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
                                     <span style="font-size: 15px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
                                     <span style="font-size: 14px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
-                                  </span> 
+                                  </span>
                                 </div>
                               </div>
-                            </template> 
+                            </template>
                           </div>
-                        </div> 
-                                          
+                        </div>
+
                       </div>
                       <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
                         {{ it.number }}
@@ -340,7 +340,7 @@
               </tr>
             </tbody>
           </table>
-          
+
         </div>
     </div>
   </div>
@@ -425,7 +425,7 @@ export default {
         { value: 3, label: "晚上" }
       ],
       zones:[],
-     
+
       total: [],
       list: [],
       loading: false,
@@ -501,7 +501,7 @@ export default {
       }
       return arr
     },
-    
+
     drop(e,val,value){
       this.allowDrop(e)
       var bedid = ''
@@ -535,7 +535,7 @@ export default {
           zonename = this.partitionArr[y].name
         }
       }
-      
+
       if(e.target.innerText == ''){
         this.schedule={
           schedule_date:this.date,
@@ -559,7 +559,6 @@ export default {
           currentData_quhao:this.cur_drag_info.quhao,
           currentData_chaung:this.cur_drag_info.chaung,
           patient_id:this.cur_drag_info.patient_id,
-
         }
         console.log('8888',this.currentData);
         this.setScheduleTwo(this.cur_drag_info.id)
@@ -572,7 +571,7 @@ export default {
         //     this.$message.error(response.data.msg);
         //   } else {
         //     var schedule = response.data.data.schedule;
-            
+
         //     this.getlist()
         //   }
         // })
@@ -613,7 +612,7 @@ export default {
               listl[i].name = this.cur_drag_info.name
               listl[i].new_name=this.cur_drag_info.name
               listl[i].partition_id =this.cur_drag_info.partition_id
-              
+
               listl[i].mode_id = this.cur_drag_info.mode_id
               listl[i].patient_id = this.cur_drag_info.patient_id
               listl[i].schedule_date=this.cur_drag_info.schedule_date
@@ -628,91 +627,6 @@ export default {
             }
           }
           return this.list
-          // this.getlist()
-          // for(let i=0;i<this.list.length;i++){
-          //   if(this.currentData.bed_id==this.list[i].bed_id){
-          //     this.list[i].patient_id=this.cur_drag_info.patient_id
-          //     this.list[i].id= response.data.new_sch.id
-          //     // console.log('3333',this.list);
-          //     // listl.splice(i,1)
-          //   }
-          // }
-          // console.log('6666',this.list);
-          // return this.list
-          // 
-          // for(let i=0;i<listl.length;i++){
-          //   if(this.currentData.bed_id==listl[i].bed_id){
-          //     listl[i].patient_id= this.cur_drag_info.patient_id
-          //     console.log('bbbb',this.currentData);
-          //   }
-          //   if(this.cur_drag_info.bed_id==listl[i].bed_id){
-          //    listl.splice(i,1)
-          //     console.log('bbbb',listl);
-          //   }
-          // }
-
-          // for(let i=0;i<listl.length;i++){
-          //   if(this.cur_drag_info.name== listl[i].name){
-          //     listl[i].bed_id = ''
-              
-          //   }
-          //   if(this.currentData.currentData_name== listl[i].name){
-          //     listl[i].bed_id = this.currentData.bed_id
-          //     listl[i].id = response.data.data.new_sch.id
-          //     console.log('nnnn',listl[i],this.cur_drag_info.bed_id);
-          //   }
-          // }
-
-          // for(let i=0;i<listl.length;i++){
-          //   if(this.currentData.bed_id== listl[i].bed_id){
-          //     // listl.splice(i,1)
-          //     listl[i].id=response.data.data.new_sch.id
-          //     // listl[i].bed_id = this.currentData.bed_id
-          //     listl[i].name = this.cur_drag_info.name
-          //     listl[i].new_name=this.cur_drag_info.name
-          //     listl[i].partition_id =this.cur_drag_info.partition_id
-              
-          //     listl[i].mode_id = this.cur_drag_info.mode_id
-          //     listl[i].patient_id = this.cur_drag_info.patient_id
-          //     listl[i].schedule_date=this.cur_drag_info.schedule_date
-          //     listl[i].schedule_type =this.cur_drag_info.schedule_type
-
-          //     listl[i].schedule_week = this.cur_drag_info.schedule_week
-          //     listl[i].order.DeviceNumber.number = this.cur_drag_info.chaung
-          //     listl[i].order.DeviceNumber.zone.name=this.cur_drag_info.quhao
-          //     listl[i].order.schedule_remark=this.cur_drag_info.schedule_remark
-          //     listl[i].order.blood_access_id=this.cur_drag_info.blood_access_id
-          //     // listl.splice(i,1)
-          //     console.log('vvvv',listl[i]);
-          //     // return listl
-          //   }
-          //   console.log('cur_drag_info.bed_id',this.cur_drag_info.bed_id);
-          //   if(this.cur_drag_info.bed_id== listl[i].bed_id){
-          //     this.list.splice(i,1)
-          //     // listl[i].name=''
-          //     // listl[i].bed_id=''
-          //     // listl[i].new_name=''
-          //     // listl[i].mode_id=''
-          //     // listl[i].patient_id=''
-          //     // listl[i].order.DeviceNumber.number = ''
-          //     // listl[i].order.DeviceNumber.zone.name= ''
-          //     // listl[i].order.schedule_remark=''
-          //     // listl[i].order.blood_access_id=''
-          //     listl.splice(i,1)
-          //     console.log('this.list',listl[i],this.list);
-          //     // return listl
-          //   }
-          //   // if(this.cur_drag_info.patient_id== listl[i].patient_id){
-          //   //   // listl[i].bed_id = this.currentData.bed_id
-          //   //   this.lsit=listl.splice(i,1)
-          //   //   console.log('nnnn',listl,this.currentData.bed_id);
-          //   //   return this.list
-          //   // }
-           
-          // }
-          // console.log('pppp',this.list);
-          // return this.list
-          // this.getlist();
         }
       });
     },
@@ -734,11 +648,11 @@ export default {
           this.$message.success("交换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleThree = false
-          
+
           const listl=this.list
           for(let i=0;i<listl.length;i++){
             if(this.cur_drag_info.patient_id== listl[i].patient_id){
-              listl[i].bed_id = this.currentData.bed_id 
+              listl[i].bed_id = this.currentData.bed_id
               console.log('mmmm',listl,this.currentData);
             }
             if(this.currentData.patient_id== listl[i].patient_id){
@@ -748,7 +662,7 @@ export default {
           // this.getlist();
         }
       });
-      
+
     },
     // 交换空白
     setScheduleTwo(id_two){
@@ -769,7 +683,7 @@ export default {
         const listl=this.list
         for(let i=0;i<listl.length;i++){
           if(schedule.patient_id== listl[i].patient_id){
-            listl[i].bed_id = schedule.bed_id 
+            listl[i].bed_id = schedule.bed_id
             listl[i].id = schedule.id
             console.log('mmmm',listl[i].id);
             // console.log('kkkk',this.currentData);
@@ -799,7 +713,7 @@ export default {
           }
         }
       }
-     
+
       // console.log('bbbb',e.target.innerText);
       // console.log('4444',val);
       console.log('5555',this.cur_drag_info);
@@ -871,7 +785,7 @@ export default {
           for(let i=0;i<list.length;i++){
            const new_name = 'new_name'
            list[i][new_name]=this.nameSplit(list[i].name)
-           
+
           }
           // console.log('9999',list);
           if (list != null && list.length > 0) {
@@ -884,7 +798,7 @@ export default {
                   schedule_date: item.schedule_date,
                   zones: [],
                   list:[],
-                  
+
                 }
               }
             })
@@ -915,7 +829,7 @@ export default {
         }
       })
     },
-    
+
     getTimeOne(val) {
       if (val == '') {
         return ''
@@ -923,7 +837,7 @@ export default {
         return uParseTime(val, '{y}-{m}-{d}')
       }
     },
-   
+
     // getPatientName(schedule_type, partition_id) {
     //   var str = ''
     //   var arr = []
@@ -997,7 +911,7 @@ export default {
       return name
     },
     getZonePatient(partition_id,schedule_type){
-       
+
        var arr = []
        if(this.list!=null && this.list.length >0){
          for(let i=0;i<this.list.length;i++){
@@ -1006,13 +920,13 @@ export default {
             }
          }
        }
- 
+
        if(arr.length >0){
           return arr.length
        }else{
          return ""
        }
- 
+
     },
     // 双击打开弹窗
     db_click(e,val){
@@ -1037,7 +951,7 @@ export default {
             this.huanzhe.bed_id = this.list[i].bed_id
             // return this.huanzhe
             console.log('kkkk',this.huanzhe);
-          }     
+          }
           // 双击弹窗的右侧第二个默认数据
           if(this.chuangwei==this.list[i].bed_id){
             console.log('xxxxx',this.chuangwei);
@@ -1070,7 +984,7 @@ export default {
       }else{
         this.centerDialogVisible=false
       }
-      
+
     },
     // 双击弹窗分区
     dialogfenqu(e){
@@ -1108,7 +1022,7 @@ export default {
               obj.number=numberlist[i].number
               obj.zone_id=numberlist[i].zone_id
               this.subzone.push(obj)
-              this.chuangwei = this.subzone[0].id 
+              this.chuangwei = this.subzone[0].id
               this.g_xian_fenqu=this.subzone[0]
             }
           }
@@ -1137,7 +1051,7 @@ export default {
               // return this.genghuan
               // console.log('qqqqqq',this.list[i].bed_id);
             }
-            
+
           }
         }
       })
@@ -1181,7 +1095,7 @@ export default {
           this.genghuan.genghuan_remark =''
           this.genghuan.bed_id = ''
           this.genghuan.patient_id = ''
-          
+
         }
       }
       // 更换的床位置
@@ -1218,7 +1132,7 @@ export default {
                 const listl=this.list
                 for(let i=0;i<listl.length;i++){
                   if(this.huanzhe.name== listl[i].name){
-                    listl[i].bed_id = this.chuangwei 
+                    listl[i].bed_id = this.chuangwei
                     console.log('mmmm',listl,this.currentData);
                   }
                   if(this.genghuan.name== listl[i].name){
@@ -1329,7 +1243,7 @@ export default {
             // line-height: 110px;
             background: #30b8e366;
            }
-           
+
           }
         }
       }
@@ -1392,7 +1306,7 @@ export default {
             // line-height: 110px;
             background: #30b8e394;
            }
-           
+
           }
         }
       }

src/xt_pages/workforce/appointment.vue

@@ -127,52 +127,102 @@
                     @event2="changeSchedule"  @event3="changeWeekDay" v-show="showtableOne">
         </table-data>
       </div>
+      <!-- 编辑 -->
        <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
                         :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
                          title="" @event1="changePartition"
                          @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
-        <div class="position">
-          <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
-          <div>
-            <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs">
-          <el-tab-pane name="lastWeek">
-            <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
-          </el-tab-pane>
-          <el-tab-pane name="thisWeek">
-            <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
-          </el-tab-pane>
-          <el-tab-pane name="nextWeek">
-            <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
-          </el-tab-pane>
-          <el-tab-pane name="nextTwoWeek">
-            <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
-          </el-tab-pane>
-        </el-tabs>
+          <div class="position">
+            <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
+            <div>
+              <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="historyclick">
+                <!-- <el-tab-pane name="beforeWeek">
+                  <span slot="label"><i class="el-icon-date"></i> 上上周 ({{ theWeek.historyWeek }})</span>
+                </el-tab-pane> -->
+                <el-tab-pane name="lastWeek">
+                  <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
+                </el-tab-pane>
+                <el-tab-pane name="thisWeek">
+                  <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
+                </el-tab-pane>
+                <el-tab-pane name="nextWeek">
+                  <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
+                </el-tab-pane>
+                <el-tab-pane name="nextTwoWeek">
+                  <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
+                </el-tab-pane>
+              </el-tabs>
+            </div>
+            <div style="display:flex;align-items:center">
+              <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
+              <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
+              <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
+                导出排班
+              </el-button>
+              <el-button
+                  @click="generateLog()"
+                  class="filter-item"
+                  type="primary"
+                  v-if="is_edit"
+                  size="small"
+              >下载日志
+              </el-button>
+              <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
+              </el-button>
+              <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
+              <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
+              <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
+              <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
+            </div>
           </div>
-        <div style="display:flex;align-items:center">
-          <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
-          <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel>
-          <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
-            导出排班
-          </el-button>
-          <el-button
-              @click="generateLog()"
-              class="filter-item"
-              type="primary"
-              v-if="is_edit"
-              size="small"
-          >下载日志
-          </el-button>
-          <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
-          </el-button>
-          <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
-          <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
-          <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
-          <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
-        </div>
-      </div>
-        </edit-table-data>
 
+        </edit-table-data>
+        <!-- 编辑上上周 -->
+        <!-- <beforeweekTable ref="beforeweeks" v-show="beforeshow" :week-time="activeName" :partitions-prop="partitions"
+                  :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone" @event3="changeWeekDay">
+          <div class="position">
+            <div>
+              <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="historyclick">
+                <el-tab-pane name="beforeWeek">
+                  <span slot="label"><i class="el-icon-date"></i> 上上周 ({{ theWeek.historyWeek }})</span>
+                </el-tab-pane>
+                <el-tab-pane name="lastWeek">
+                  <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
+                </el-tab-pane>
+                <el-tab-pane name="thisWeek">
+                  <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
+                </el-tab-pane>
+                <el-tab-pane name="nextWeek">
+                  <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
+                </el-tab-pane>
+                <el-tab-pane name="nextTwoWeek">
+                  <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
+                </el-tab-pane>
+              </el-tabs>
+            </div>
+            <div style="display:flex;align-items:center">
+              <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
+              <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
+                导出排班
+              </el-button>
+              <el-button
+                  @click="generateLog()"
+                  class="filter-item"
+                  type="primary"
+                  v-if="is_edit"
+                  size="small"
+              >下载日志
+              </el-button>
+              <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
+              </el-button>
+              <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
+              <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
+              <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
+              <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
+            </div>
+          </div>
+        </beforeweekTable> -->
+        <!-- 历史 -->
         <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" :partitions-prop="partitions"
                   :schedule-zone-row-prop="scheduleZoneRow"
                   :schedule-zone-prop="scheduleZone" title="" >
@@ -228,6 +278,8 @@ import {generateLog} from '@/api/config'
 import {uParseTime} from '@/utils/tools'
 import EditTableData from "./components/editTableData";
 import HistoryWeekTable from './components/historyWeekTable'
+import beforeweekTable from './components/beforeweekTable'
+
 export default {
   name: 'appointment',
   data() {
@@ -277,6 +329,7 @@ export default {
       isExistRepeatVisible: false,
       exportVisible: false,
       exportLogVisible: false,
+      beforeshow:false,//编辑页面的上上周
       // 周期
       theWeek: {
         historyWeek:0,
@@ -325,7 +378,8 @@ export default {
     tableData,
     BreadCrumb,
     UploadExcel,
-    HistoryWeekTable
+    HistoryWeekTable,
+    beforeweekTable
   },
   methods: {
     handleClick(e,tab){
@@ -342,6 +396,22 @@ export default {
       }
 
     },
+    // 打开编辑上上周
+    // historyclick(e){
+    //   console.log('vvvvwwww',e);
+    //   if(e.name=='beforeWeek'){
+    //     console.log('gggggwerwe');
+    //     this.beforeshow=true
+    //     this.schedulingTableVisible=false
+    //     this.$nextTick(function() {//, this.days,this.zones
+    //       this.$refs.beforeweeks.setEditData(this.patientList, this.$store.getters.treatment_mode, this.days,this.zones)
+    //     })
+    //   }else{
+    //     this.beforeshow=false
+    //     this.schedulingTableVisible=true
+    //   }
+    // },
+   
     dragstart(event, item) {
       // console.log('start的索引',item.moveIndex)
       // 开始移动的时候将移动的索引值+图片的url存储下来
@@ -769,8 +839,8 @@ export default {
           })
 
           const filename = '排班模版'
-         
-          
+
+
           excel.export_json_to_excel({
             multiHeader,
             header,
@@ -917,7 +987,7 @@ export default {
 
     },
     printScheduleActionOne:function(){
-       
+
       var start_time = this.$refs.tableDataZero.start_time
 
       var end_time =  this.$refs.tableDataZero.end_time
@@ -928,7 +998,7 @@ export default {
 
       var week_date = []
 
-    
+
       this.$router.push({path:'/scheduleTablePrintThree?partition_id='+partition_id+"&weekTime="+nextTwoWeek+"&week_date="+week_date+"&start_time="+start_time+"&end_time="+end_time})
     },
     isShow() {
@@ -2041,7 +2111,7 @@ export default {
           break
       }
 
-    }, 
+    },
     getDateByResultsStr(key) {
 
       switch (key) {
@@ -2965,6 +3035,7 @@ export default {
     },
     outisedit(){
       this.is_edit=false
+      this.beforeshow=false
       this.schedulingTableVisible=false
     },
     copySchedule() {

src/xt_pages/workforce/components/editTableData.vue

@@ -1757,6 +1757,7 @@
   </div>
 </template>
 
+
 <script>
 import { uParseTime } from "@/utils/tools";
 import print from "print-js";
@@ -1934,6 +1935,7 @@ export default {
       patientList: [],
       all_patients: [],
       systemDate:'',
+
       mode_select: [
         {
           value: "1",
@@ -2105,7 +2107,9 @@ export default {
       },
       cellflag: 0,
       schedulesGroup:[],
-      numberList:[]
+      numberList:[],
+      newschedules:[],
+      newArr:[]
     };
   },
 
@@ -2169,6 +2173,7 @@ export default {
     },
   },
   methods: {
+
     changeSch(row) {
       let params = {
         zone_id: row.zone_id,
@@ -3238,7 +3243,6 @@ export default {
               id : row[key].schedule_id,
               contagions: row[key].patient_contagions,
             }
-            console.log('4444444',row[key].schedule_id);
           }else{
             this.cur_drag_obj = 3
             this.cur_drag_info={
@@ -3332,14 +3336,12 @@ export default {
           this.$message.error(response.data.msg);
           this.tipDialogVisibleTwo = false
         } else {
-          console.log('11111111111',response.data);
           this.$message.success("替换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleTwo = false
           this.getSchedules();
         }
       });
-
     },
     // 交换位置
     changeSchTwo(){
@@ -3355,7 +3357,6 @@ export default {
             this.$message.error(response.data.msg);
             this.tipDialogVisibleThree = false
           } else {
-            console.log('22222222',response.data);
             this.$message.success("交换成功");
             this.tipDialogVisible = false
             this.tipDialogVisibleThree = false
@@ -3386,7 +3387,6 @@ export default {
             id : row[key].schedule_id,
             partition_type : row.zone_type,
           }
-          console.log('ffffffffffff',this.currentData);
           // let nowDate = new Date();
           // let date = {
           //       year: nowDate.getFullYear(),
@@ -3396,8 +3396,8 @@ export default {
           //   let Month=date.month<10 ? '0'+ date.month :  date.month
           //   let Dateday= date.date<10 ? '0'+date.date : date.date
           //   this.systemDate = date.year + '-'+ Month + '-'+ Dateday;
-          console.log('this.currentData的数据',row[key].patient_id);
-          console.log('this.cur_drag_info的数据',key);
+          // console.log('this.currentData的数据',this.currentData);
+          // console.log('this.cur_drag_info的数据',this.cur_drag_info);
           // console.log('123453545',this.systemDate);
           // 当表格有数据
           if ( row[key].mode_id > 0 || row[key].patient_id > 0) {
@@ -3419,17 +3419,15 @@ export default {
              if(this.cur_drag_obj == 2){
               if(this.cur_drag_info.schedule_date == this.currentData.schedule_date){ //同一天
                 if(row[key].patient_id == 0) { //空床位
-                      const that = this;
-                      //接口提交排班数据
-                      that.currentData.mode_id = that.cur_drag_info.mode_id
-                      that.currentData.id = 0
-                      that.currentData.patient_id = that.cur_drag_info.patient_id
-                      that.currentData.patient = that.cur_drag_info.patient_name
-                       that.currentData.contagions = that.cur_drag_info.contagions
-                        console.log("中国hshshshshhs",that.cur_drag_info.id)
-
-
-                        that.setScheduleTwo(this.cur_drag_info.id);
+                          const that = this;
+                          //接口提交排班数据
+                          that.currentData.mode_id = that.cur_drag_info.mode_id
+                          that.currentData.id = 0
+                          that.currentData.patient_id = that.cur_drag_info.patient_id
+                          that.currentData.patient = that.cur_drag_info.patient_name
+                          that.currentData.contagions = that.cur_drag_info.contagions
+                          console.log("中国hshshshshhs",that.cur_drag_info.contagions)
+                          that.setScheduleTwo(this.cur_drag_info.id);
                 }
               }else{ // 非同一天
                 if(row[key].patient_id == 0) { //空床位
@@ -3834,18 +3832,6 @@ export default {
       }
       return "";
     },
-    // 单元格的 style 的回调方法
-    // cellstyle({ row, column, rowIndex, columnIndex }){
-    //   // 分区蓝线
-    //   for(let i=0;i<this.subzone.length;i++){
-    //     const subslice=this.subzone[i].jihaos.slice(-1)
-    //     // console.log('这是row',subslice);
-    //     if(row.zone_id==subslice[0].zone_id && row.jihao_id == subslice[0].id ){
-    //       // console.log('33333333333');
-    //       return 'border-top: 1px solid aqua;'
-    //     }
-    //   }
-    // },
     // 单元格的患者名称的回调方法
     patientClass({row,column, rowIndex,columnIndex}){
       if(this.cur_info.patient_id == row.id){
@@ -4578,12 +4564,10 @@ export default {
         this.currentData.contagions = row.contagions;
       }
     },
-
+    // 数据源
     getSchedules() {
       var partionStr = this.partition_id;
-      console.log('66665555',partionStr);
       var arr = this.zoneIdList.join(",");
-      console.log('ccccccc',this.zoneIdList);
       var str = "";
       if (partionStr == 0) {
         str = arr;
@@ -4591,7 +4575,6 @@ export default {
       if (partionStr != 0) {
         str = partionStr.join(",");
       }
-      console.log('qqqqqqq',str);
       const params = {
         weekTime: this.theType,
         patitionid: str,
@@ -4601,10 +4584,11 @@ export default {
       getSchedulesOne(params).then((response) => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
-          console.log('999990000',response.data.data);
+        
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
+          this.newschedules= theSchedules
           var schedulesGroup = response.data.data.schedulesGroup
           this.schedulesGroup = schedulesGroup
           var that = this;
@@ -4812,86 +4796,8 @@ export default {
         }
       });
     },
-  //  调整机号
-    // changeScheduleActon(formName) {
-    //   this.changing_bed = true;
-    //   ChangeSchedule(this.currentData.id, this.changeSchedule)
-    //       .then((response) => {
-    //         if (response.data.state == 0) {
-    //           this.$message.error(response.data.msg);
-    //         } else {
-    //           this.$message({
-    //             type: "success",
-    //             message: "修改成功!",
-    //           });
-    //           var that = this;
-    //           var schedule = response.data.data.schedule;
-
-    //           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: that.currentData.patient,
-    //                   patient_contagions: that.currentData.contagions,
-    //                   dialysis_machine_name: schedule.dialysis_machine_name,
-
-    //                   mode_name:
-    //                       typeof that.modeOptions[schedule.mode_id] === "undefined"
-    //                           ? ""
-    //                           : that.modeOptions[schedule.mode_id].name,
-    //                 };
-
-    //                 that.scheduleZone[index].total += 1;
-    //               }
-    //             }
-    //             if (
-    //                 zone.zone_id == that.currentData.partition_id &&
-    //                 zone.jihao_id == that.currentData.bed_id
-    //             ) {
-    //               var weekPath = that.weekPath(
-    //                   that.currentData.schedule_week,
-    //                   that.currentData.schedule_type
-    //               );
-    //               if (weekPath.length == 2) {
-    //                 var weekPathKey = weekPath[0] + "_" + weekPath[1];
-    //                 that.scheduleZone[index][weekPathKey] = {
-    //                   schedule_id: 0,
-    //                   mode_id: 0,
-    //                   patient_id: 0,
-    //                   patient: "",
-    //                   dialysis_machine_name: "",
-
-    //                   mode_name: "",
-    //                   patient_contagions: [],
-    //                 };
-
-    //                 that.scheduleZone[index].total -= 1;
-    //               }
-    //             }
-    //           });
-    //           this.$refs[formName].resetFields();
-    //           this.jhDialogVisible = false;
-    //         }
-    //         this.changing_bed = false;
-    //       })
-    //       .catch((err) => {
-    //         this.$message.error(err);
-    //         this.changing_bed = false;
-    //       });
-    // },
-    // 排班成功接口
 
+    // 排班成功接口
     async CreateSchedule(id, data) {
       this.creating_schedule = true;
       let response =await CreateSchedule(id, data)
@@ -5064,44 +4970,6 @@ export default {
 
     },
 
-    // submitTiaoZJH(formName) {
-    //   this.$refs[formName].validate((valid) => {
-    //     if (valid) {
-    //       var weekPath = this.weekPath(
-    //           this.changeSchedule.schedule_week,
-    //           this.changeSchedule.schedule_type
-    //       );
-    //       if (weekPath.length != 2) {
-    //         this.$message.error("数据异常");
-    //         return false;
-    //       }
-
-    //       this.changeSchedule.bed_id = this.device_id;
-    //       for (let i = 0; i < this.origin_device_numbers.length; i++) {
-    //         if (this.origin_device_numbers[i].id == this.device_id) {
-    //           this.changeSchedule.partition_id =
-    //               this.origin_device_numbers[i].zone_id;
-    //         }
-    //       }
-
-    //       this.changeSchedule.change_action = "change_device";
-    //       this.changeScheduleActon(formName);
-
-    //       this.changeSchedule.spartition_type = this.scheduleZone[index].zone_type
-    //       var weekPathKey = weekPath[0] + '_' + weekPath[1]
-    //       for (var index in this.scheduleZone) {
-    //         if (this.scheduleZone[index].jihao_id == this.changeSchedule.bed_id) {
-    //           if (this.scheduleZone[index][weekPathKey].mode_id > 0) {
-    //             this.$message.error('选中的区域已经存在排班，不能再排班！')
-    //             return false
-    //           }
-    //           break
-    //         }
-    //       }
-    //     }
-    //   })
-    // },
-
     //  双击弹窗确认按钮
     submitMode(formName) {
       console.log("wowowoowow",this.changeSchedule)
@@ -5152,59 +5020,6 @@ export default {
 
     },
 
-    // submitTiaoZMS(formName) {
-    //   this.$refs[formName].validate((valid) => {
-    //     if (valid) {
-    //       this.changing_mode = true;
-    //       this.changeSchedule.change_action = "change_mode";
-    //       ChangeSchedule(this.currentData.id, this.changeSchedule)
-    //           .then((response) => {
-    //             if (response.data.state == 0) {
-    //               this.$message.error(response.data.msg);
-    //             } else {
-    //               this.$message({
-    //                 type: "success",
-    //                 message: "修改成功!",
-    //               });
-    //               var that = this;
-    //               var schedule = response.data.data.schedule;
-    //               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
-    //                         ].dialysis_machine_name = schedule.dialysis_machine_name;
-    //                     that.scheduleZone[index][weekPathKey].mode_id =
-    //                         schedule.mode_id;
-    //                     that.scheduleZone[index][weekPathKey].mode_name =
-    //                         typeof that.modeOptions[schedule.mode_id] ===
-    //                         "undefined"
-    //                             ? ""
-    //                             : that.modeOptions[schedule.mode_id].name;
-    //                   }
-    //                 }
-    //               });
-    //               this.$refs[formName].resetFields();
-    //               this.msDialogVisible = false;
-    //             }
-    //             this.changing_mode = false;
-    //           })
-    //           .catch((err) => {
-    //             this.$message.error(err);
-    //             this.changing_mode = false;
-    //           });
-    //     }
-    //   });
-    // },
-
     changePartition(value) {
       this.current_devices = this.zone_device_map[value];
       this.device_id = this.current_devices[0].id;
@@ -5671,6 +5486,7 @@ export default {
       }
       return [w, n];
     },
+    // 左侧搜索
     search: function () {
       if (this.keywords.length == 0) {
         this.patientList = this.all_patients;
@@ -5695,57 +5511,7 @@ export default {
         }
       }
     },
-    // 取消排班
-    // changeMachineNumber: function (index, row) {
-    //   this.currentData.schedule_type = row.schedule_type;
-    //   this.currentData.bed_id = row.bed_id;
-    //   this.currentData.partition_id = row.partition_id;
-    //   this.currentData.schedule_week = row.schedule_week;
-
-    //   switch (row.schedule_type) {
-    //     case 1:
-    //       this.currentData.type_name = "上午";
-    //       break;
-    //     case 2:
-    //       this.currentData.type_name = "下午";
-    //       break;
-    //     case 3:
-    //       this.currentData.type_name = "晚上";
-    //       break;
-    //   }
-
-    //   this.currentData.zone_name = row.zone.name;
-    //   this.currentData.bed_name = row.number.number;
-    //   this.currentData.partition_type = row.zone.type;
-
-    //   this.currentData.mode_id = row.mode_id;
-    //   this.currentData.patient_id = row.patient_id;
-    //   this.currentData.patient = row.patient;
-    //   this.currentData.contagions = row.patient_contagions;
-
-    //   this.currentData.id = row.id;
-    //   this.changeSchedule = {
-    //     mode_id: row.mode_id,
-    //     schedule_type: row.schedule_type,
-    //     partition_id: row.partition_id,
-    //     bed_id: row.bed_id,
-    //     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;
-    //   } else {
-    //     this.jihaos = [];
-    //   }
-
-    //   this.searchTableVisible = false;
-    //   this.jhDialogVisible = true;
-    // },
+ 
     getDialysisDate: function (row) {
       let week = "";
       switch (row.schedule_week) {

src/xt_pages/workforce/components/historyWeekTable.vue

@@ -6,7 +6,7 @@
             v-model="weekTime"
             type="week"
             format="第 WW 周"
-            placeholder="选择周"  
+            placeholder="选择周"
             :picker-options="{'firstDayOfWeek': 1}"
             @change="changeWeek"
             :clearable="false"
@@ -15,8 +15,6 @@
         </el-date-picker>
     </div>
     <!--   -->
-    
-
     <div class="center-tab">
       <el-table
         :row-style="{ color: '#303133' }"
@@ -34,7 +32,7 @@
         show-summary
         :row-class-name="tableRowClassName"
         :cell-class-name="cellClass"
-        
+
         sum-text="总数"
         :height="tableContainHeight"
         ref="table"
@@ -47,7 +45,7 @@
           width="50"
           align="center"
           fixed
-          
+
         ></el-table-column><!--style="border-bottom: 1px solid aqua;"-->
         <el-table-column
           prop="cut"
@@ -55,7 +53,7 @@
           align="center"
           min-width="40"
           fixed
-         
+
         ></el-table-column>
         <el-table-column
           :label="' 周一(' + weekTitle[0] + ')'"
@@ -916,8 +914,8 @@ export default {
         // console.log(columnIndex,row.zone_type);
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
-      // if(columnIndex==1 ){  
-      //   return 'border_bott ' 
+      // if(columnIndex==1 ){
+      //   return 'border_bott '
       // }
       // if(columnIndex==0){
       //   return 'border_left'
@@ -947,13 +945,13 @@ export default {
     //       // console.log('33333333333');
     //       return 'border-top: 1px solid aqua;'
     //     }
-    //   } 
+    //   }
     // },
     changeSearchContagion(id) {
       this.patientQuery.contagion = id;
       this.getSchedulePatients();
     },
-   
+
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];
@@ -1658,7 +1656,7 @@ export default {
         }
       });
     },
-    
+
     CreateSchedule(id, data) {
       this.creating_schedule = true;
       CreateSchedule(id, data)
@@ -1763,7 +1761,7 @@ export default {
         this.dialogTableVisible = true;
       }
     },
-    
+
     submitTiaoZMS(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -2206,7 +2204,7 @@ export default {
         }
       });
     },
-   
+
     getDialysisDate: function (row) {
       let week = "";
       switch (row.schedule_week) {
@@ -2255,7 +2253,7 @@ export default {
 
       return type_name;
     },
-   
+
     tableRowClassName({ row, rowIndex }) {
       if (row.zone_type == 1) {
         return 'table-row-new-class schedule-table-row'
@@ -2289,7 +2287,7 @@ export default {
       this.schedule_type = val
 
       this.getSchedules()
-     
+
     },
     changeWeekDay(val) {
       this.$emit('event3', val)
@@ -2320,7 +2318,7 @@ export default {
         // this.getSchedules()
         // this.source_scheduleZone=[]
       // })
-      
+
     },
     // 选择周次
     start(){
@@ -2369,16 +2367,16 @@ export default {
         patitionid: str,
         schedule_type: this.schedule_type,
       }
-     console.log("params232323232",params)
+    //  console.log("params232323232",params)
       getSchedulesOne(params).then(response => {
         // console.log('getSchedulesOne',response.data.data);
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
           this.weekTitle = []
-          console.log("first_day23333333333333",this.start_time)
+          // console.log("first_day23333333333333",this.start_time)
           var first = this.getTimestamp(this.start_time)
           var first_day =  this.getTime(first, "{y}-{m}-{d}")
-          console.log("first_day23333333333333",first_day)
+          // console.log("first_day23333333333333",first_day)
           this.weekTitle.push(first_day)
 
           var second = this.getTimestamp(this.start_time) + 86400
@@ -2753,7 +2751,7 @@ textarea{
   .switch{
     margin-left: 10px;
   }
-  
+
 }
 
 #table_data ::-webkit-scrollbar {