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

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

@@ -1147,7 +1147,12 @@
         console.log(" this.assessmentBeforeDislysis.pathway_formation_time", moment(new Date()).format('YYYY-MM-DD'))
         console.log("hhahhahahah",assessment)
         if(assessment!=null){
-          this.assessmentBeforeDislysis.pathway_formation_time =  this.getTimeOne(assessment.pathway_formation_time)
+          if(assessment.pathway_formation_time >0){
+            this.assessmentBeforeDislysis.pathway_formation_time =  this.getTimeOne(assessment.pathway_formation_time)
+          }else{
+            this.assessmentBeforeDislysis.pathway_formation_time = ""
+          }
+         
           if(assessment.whether_unobstructed >0){
             this.assessmentBeforeDislysis.whether_unobstructed = assessment.whether_unobstructed.toString()
           } 

src/xt_pages/role/admin.vue

@@ -177,6 +177,14 @@
           style="float:left"
           @click="toEnd">结束签署</el-button> -->
            
+
+        
+         <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toSendInformaton">发送短信验证码</el-button>  -->
        
           
      </div>
@@ -257,10 +265,16 @@
           <template slot-scope="scope">
            
              
-            <!-- <span>
+           <!-- <span>
               <el-button type="primary" size="small" @click="toRenZhen(scope.row.user_id,scope.row.user_name)">
                     <span>CA个人认证</span>
               </el-button>
+            </span> -->
+
+            <!-- <span>
+              <el-button type="primary" size="small" @click="toQianShu(scope.row.user_id,scope.row.user_name)">
+                    <span>创建签署人用户</span>
+              </el-button>
             </span>
 
             <span>
@@ -271,7 +285,7 @@
 
             <span>
               <el-button type="primary" size="small" @click="toShouQuan(scope.row.user_id,scope.row.user_name)">
-                    <span>授权用户企业印章</span>
+                    <span>创建企业印章</span>
               </el-button>
             </span> -->
             <el-tooltip
@@ -470,7 +484,8 @@
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent,saveEnterprise,getEnterPriseById,getMobileCode,savePersionEnterPrise,getPerseEnterPriseById,CreatePersionSeal,CreateNewEnterPrise,toTestThrity,toEndEnterPrise,getEnterPriseDetail} from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent,saveEnterprise,getEnterPriseById,getMobileCode,savePersionEnterPrise,getPerseEnterPriseById,CreatePersionSeal,CreateNewEnterPrise,toTestThrity,toEndEnterPrise,getEnterPriseDetail
+  ,CreateQianshuUserName,toSendInformaton,CreateSKDSendInformation} from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -1015,6 +1030,24 @@ export default {
       })
     },
    
+    toQianShu(){
+      CreateQianshuUserName().then(response=>{
+         if(response.data.state==1){
+          var sign =  response.data.data.sign
+          var userId =  response.data.data.userId
+         }
+      }) 
+    },
+
+    toSendInformaton(){
+      CreateSKDSendInformation().then(response=>{
+        if(response.data.state==1){
+          var information =  response.data.data.information
+
+          var orderId = response.data.data.orderId
+        }
+      })
+    }
   },
   watch: {
     should_update_admins(should_change) {

src/xt_pages/user/Sitemap.vue

@@ -896,7 +896,7 @@ export default{
       console.log("wowowowow",file)
       this.fileList.shift()
       this.fileList.push({
-        img_url: this.qiniuDomain + res.url + '?imageView2/2/w/500/h/500/q/90',
+        img_url: this.qiniuDomain + res.url + '?imageView2/2/w/2000/h/2000/q/90',
         desc: '',
         id: 0
       })

src/xt_pages/user/inspection.vue

@@ -633,7 +633,7 @@ export default {
       console.log("RESPOWOWOWOWO",res)
       console.log("wowowowow",file)
       this.form.imgs.push({
-        img_url: this.qiniuDomain + res.url + '?imageView2/2/w/500/h/500/q/90',
+        img_url: this.qiniuDomain + res.url + '?imageView2/2/w/2000/h/2000/q/90',
         desc: '',
         id: 0
       })

src/xt_pages/user/inspectionCheck.vue

@@ -508,7 +508,7 @@ export default {
     },
     handleAvatarSuccess(res, file) {
       this.form.imgs.push({
-        img_url: this.qiniuDomain + res.url + '?imageView2/2/w/500/h/500/q/90',
+        img_url: this.qiniuDomain + res.url + '?imageView2/2/w/2000/h/2000/q/90',
         desc: '',
         id: 0
       })

src/xt_pages/workforce/Patientshift.vue

@@ -57,25 +57,10 @@
                 <td style="text-align: center;">{{ getZoneName(ite.partition_id) }}</td>
                 <td>
                   <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" @dblclick="db_click($event,it)">
-                    <!-- <template v-if="ite.partition_id==it.zone_id">
-                      <div v-for="(item2) in item.list" style="background:#14bacd ;" >
-                          <template >
-                            <div v-if="it.id==item2.bed_id" style="display: inline-block;">
-                              <div>
-                                <span>{{ item2.name }}({{ getmode(item2.mode_id) }})</span><br>
-                                <div v-if="hidder" >
-                                  <span style="font-size: 14px;color: rgb(19, 241, 175);margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
-                                  <span style="font-size: 14px;color:orange;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
-                                  <span style="font-size: 13px;color:rgb(102, 13, 161);margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
-                                </div> 
-                              </div>
-                            </div>
-                          </template> 
-                        </div>
-                    </template>   @drop="drop($event)" @dragstart.self="curInfoDragStart($event)"  @dragover="allowDrop"-->
-                    <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais"  style="" draggable="true" > 
-                      <div class="huanzhekuai" >
-                        <div v-for="(item2) in item.list" @drop="drop($event,item2)" @dragstart.self="curInfoDragStart($event,item2)"  @dragover="allowDrop">
+                    <!-- <template> -->
+                    <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais"  style="" @drop="drop($event,item)" draggable="true"   @dragover="allowDrop"> 
+                      <div class="huanzhekuai">
+                        <div v-for="(item2) in item.list"  draggable="true" @dragstart.self="curInfoDragStart($event,item2)">
                           <template >
                             <div v-if="it.id==item2.bed_id" style="display: inline-block;">
                               <div>
@@ -90,6 +75,19 @@
                           </template> 
                         </div>
                       </div> 
+                                        
+                      <!-- <div v-if="ite.partition_id==it.partition_id" style="max-height: 110px; margin-top: 10px;margin-bottom: 5px;background: rgb(74 197 235);" >
+                        <span>{{ it.name }}({{ getmode(it.mode_id) }})</span><br>
+                        <div v-if="value" >
+                          <span style="font-size: 14px;color: rgb(12, 185, 50);margin-bottom: 5px;">{{it.order.DeviceNumber.zone.name}}-{{it.order.DeviceNumber.number}}</span><br>
+                          <span style="font-size: 14px;color:orange;margin-bottom: 5px;">{{getBloodAccess(it.order.blood_access_id)}}</span><br>
+                          <span style="font-size: 13px;color:rgb(102, 13, 161);margin-bottom: 5px;">{{it.order.schedule_remark}}</span>
+                        </div> 
+                      </div> -->
+                      <!-- <div  
+                      style="display: inline-block;width: 125px;text-align: center;position: absolute;">
+                      {{ it.number }}
+                    </div> -->
                     </div>
                     <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
                       {{ it.number }}
@@ -241,6 +239,7 @@ import { GetAllZone, getSchedualPrintList } from '@/api/dialysis'
 import { parseTime } from '@/utils'
 import { uParseTime } from '@/utils/tools'
 import { getDataConfig } from '@/utils/data'
+import {CreateScheduleTwo} from '@/api/schedule'
 import {CoverSch,ExchangeSch,} from "@/api/schedule_template/sch_template";
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import print from 'print-js'
@@ -257,7 +256,6 @@ export default {
       tipDialogVisible:false,
       tipDialogVisibleTwo:false,
       tipDialogVisibleThree:false,
-      centerDialogVisible:false,
       hidder: false,
       td_1_width: '8%',
       td_3_width: '90%',
@@ -265,19 +263,22 @@ export default {
       classes:1,
       bingqu:0,
       fenqu_dialog:0,
-      chuangwei:null,
+      chuangwei:519,
       options:[],
+      centerDialogVisible:false,
       cur_drag_info:{
         id:'',
         name:'',
         quhao:'',
-       chaung:'',
+        chaung:'',
+        patient_id:'',
       },
       currentData:{
         currentData_id:'',
         currentData_name:'',
         currentData_quhao:'',
         currentData_chaung:'',
+        patient_id:'',
       },
       schedulArr: [
         { value: 1, label: "上午" },
@@ -639,15 +640,63 @@ export default {
    
     drop(e,val){
       this.allowDrop(e)
-      console.log('3333',this.currentData);
+      
       console.log('6666',val);
-      this.currentData={
-        currentData_id:val.id,
-        currentData_name:val.name,
-        currentData_quhao:val.order.DeviceNumber.zone.name,
-        currentData_chaung:val.order.DeviceNumber.number,
-      },
-      this.tipDialogVisible=true
+      console.log('7777',this.numberlist);
+      const inntext= e.target.innerText.split('(')[0]
+      console.log('3333',inntext);
+      for(let i=0;i<val.list.length;i++){
+        if(inntext == val.list[i].name){
+          this.tipDialogVisible=true
+          this.currentData={
+            currentData_id:val.list[i].id,
+            currentData_name:val.list[i].name,
+            currentData_quhao:val.list[i].order.DeviceNumber.zone.name,
+            currentData_chaung:val.list[i].order.DeviceNumber.number,
+            patient_id:val.list[i].patient_id
+          }
+        }
+      }
+      if(e.target.innerText == ''){
+        this.currentData={
+          currentData_id:0,
+          currentData_name:this.cur_drag_info.name,
+          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.currentData_id);
+        this.setScheduleTwo(this.cur_drag_info.id)
+        // var params={
+        //   patient_id:this.currentData.patient_id,
+        //   id_two:this.currentData.currentData_id
+        // }
+        // CreateScheduleTwo(this.currentData.patient_id,this.currentData.currentData_id).then((response)=>{
+        //   if (response.data.state == 0) {
+        //     this.$message.error(response.data.msg);
+        //   } else {
+        //     var schedule = response.data.data.schedule;
+            
+        //     this.getlist()
+        //   }
+        // })
+        // this.CreateScheduleTwo(this.currentData.patient_id,this.currentData,this.currentData.currentData_id)
+      }
+      
+      // for(let i=0;i<this.numberlist.length;i++){
+      //   for(let j=0;j<val.list.length;j++){
+      //     if(this.numberlist[i].id==val.list[y].bed_id){
+
+      //     }
+      //   }
+      // }
+      // this.currentData={
+      //   currentData_id:val.id,
+      //   currentData_name:val.name,
+      //   currentData_quhao:val.order.DeviceNumber.zone.name,
+      //   currentData_chaung:val.order.DeviceNumber.number,
+      // },
+     
       // this.currentData={
       //   currentData_id:this.cur_drag_info.id,
       //   currentData_name:this.cur_drag_info.name,
@@ -701,15 +750,31 @@ export default {
         }
       });
     },
+    // 交换空白
+    setScheduleTwo(id_two){
+      this.CreateScheduleTwo(this.currentData.patient_id, this.currentData,id_two);
+    },
+    async CreateScheduleTwo(id, data,id_two) {
+      let response =await CreateScheduleTwo(id, data,id_two)
+
+      if (response.data.state == 0) {
+        this.$message.error(response.data.msg);
+      } else {
+        var schedule = response.data.data.schedule;
+        this.getlist()
+      }
+    },
+    // 需要拖动的
     curInfoDragStart(e,val){
       this.cur_drag_info={
         id:val.id,
         name:val.name,
         quhao:val.order.DeviceNumber.zone.name,
-       chaung:val.order.DeviceNumber.number,
+        chaung:val.order.DeviceNumber.number,
+        patient_id:val.patient_id,
       
       }
-      console.log('4444',e);
+      console.log('4444',val);
       console.log('5555',this.cur_drag_info);
     },
      // 选中日期
@@ -776,7 +841,6 @@ export default {
           var numberlist=response.data.data.numberList
           this.numberlist= numberlist
           this.subzone = numberlist
-          this.chuangwei=numberlist[0].id
           if (list != null && list.length > 0) {
             const dataInfo = {}
             list.forEach((item, index) => {
@@ -959,6 +1023,19 @@ export default {
           this.fenqu_dialog=e
         }
       }
+      // if(this.fenqu_dialog==0){
+      //   this.chuangwei=519
+      // }else if(this.fenqu_dialog==375){
+      //   this.chuangwei=519
+      // }else if(this.fenqu_dialog==376){
+      //   this.chuangwei=520
+      // }else if(this.fenqu_dialog==384){
+      //   this.chuangwei=556
+      // }else if(this.fenqu_dialog==424){
+      //   this.chuangwei=672
+      // }else if(this.fenqu_dialog==425){
+      //   this.chuangwei=521
+      // }
       var params = {
         schedule_date: this.date,
         schedule_type: this.classes,
@@ -976,7 +1053,6 @@ export default {
           var numberlist=response.data.data.numberList
           console.log('00000',this.list);
           this.subzone=[]
-          // 选择的分区的床位
           for(let i=0;i<numberlist.length;i++){
             if(this.fenqu_dialog==0){
               this.subzone = numberlist
@@ -1019,8 +1095,34 @@ export default {
             }
             
           }
+          // this.numberlist= numberlist
         }
       })
+      // console.log('77777',this.chuangwei);
+      // for(let i=0;i<list.length;i++){
+      //   if(this.chuangwei==list[i].bed_id){
+      //     this.genghuan.name=list[i].name
+      //     this.genghuan.mode_id=list[i].mode_id
+      //     this.genghuan.genghuan_fenqu=list[i].order.DeviceNumber.zone.name
+      //     this.genghuan.genghuan_chuang = list[i].order.DeviceNumber.number
+      //     this.genghuan.g_boolen_id =list[i].order.blood_access_id
+      //     this.genghuan.genghuan_remark = list[i].order.schedule_remark
+      //     console.log('99999',this.genghuan);
+      //     console.log('000000',list[i].bed_id);
+      //     return this.genghuan
+      //   }else{
+      //     console.log('eeeeee');
+      //     this.genghuan.name=''
+      //     this.genghuan.mode_id=''
+      //     this.genghuan.genghuan_fenqu=''
+      //     this.genghuan.genghuan_chuang = ''
+      //     this.genghuan.g_boolen_id = ''
+      //     this.genghuan.genghuan_remark =''
+      //     // return this.genghuan
+      //     // console.log('qqqqqq',this.list[i].bed_id);
+      //   }
+        
+      // }
     },
     // 双击弹窗床位
     dialogchuangwei(e){