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

src/api/role/admin.js

@@ -283,3 +283,21 @@ export function UploadPrintOrder(data){
     data:data,
   })
 }
+
+export function CreateQianshuUserName(data){
+  
+  return request({
+    url:"/api/device/createqianshuusername",
+    method:"Post",
+    data:data,
+  })
+}
+
+export function CreateSKDSendInformation(data){
+  
+  return request({
+    url:"/api/device/createskdsendinformation",
+    method:"Post",
+    data:data,
+  })
+}

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2898,7 +2898,7 @@ export default {
     },
   },
   created() {
-    console.log("hhahahhahahahah=======",this.org_template_info.template_id)
+    // console.log("hhahahhahahahah=======",this.org_template_info.template_id)
     console.log("this.$store.getters.xt_user.org.id",this.$store.getters.xt_user.org.id)
     var schedule_type_selected = this.$store.getters.schedule_type_selected;
     var zone_selected = this.$store.getters.zone_selected;

src/xt_pages/outpatientCharges/invoiceTemplate/printThree.vue

@@ -104,8 +104,9 @@
             </span>
             <span style="position: absolute;top:250px;left:610px">{{ totalPrice.toFixed(2) }}</span>
         </div> -->
-        <div style="position: absolute;top:300px;left:80px">合计大写 {{ zhongwen }}</div>
-        <div style="position: absolute;top:300px;left:300px">合计小写 {{ list.psn_cash_money }}</div>
+<!--        <div style="position: absolute;top:300px;left:80px">{{ zhongwen }}</div>-->
+      <div style="position: absolute;top:300px;left:80px">总金额 {{ list.order.medfee_sumamt }}</div>
+        <div style="position: absolute;top:300px;left:300px">个人自费 {{ list.psn_cash_money }}</div>
         <div>
             <!-- <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div> -->
             <div style="position: absolute;top:340px;left:120px">{{ paramsObj.chargeName }}</div>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -967,7 +967,6 @@
     </el-dialog>
 
   </div>
-
 </template>
 
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2002,6 +2002,10 @@ export default {
         }
       }
 
+      if(this.org_id == 0 || this.org_id == 10375){
+        this.state1 = 607
+      }
+
       if (info.id > 0) {
         this.doctorValue = info.doctor_id
         this.departmentValue = info.departments
@@ -2120,6 +2124,11 @@ export default {
         }
       }
 
+      if(this.org_id == 0 || this.org_id == 10375){
+        this.state1 = 607
+      }
+
+
       if (this.departmentValue == '' || this.departmentValue == 0) {
         if (department.length > 0) {
           this.departmentValue = department[0].id
@@ -2221,6 +2230,11 @@ export default {
         }
       }
 
+      if(this.org_id == 0 || this.org_id == 10375){
+        this.state1 = 607
+      }
+
+
       if (this.departmentValue == '' || this.departmentValue == 0) {
         if (this.department.length > 0) {
           this.departmentValue = this.department[0].id

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -44,7 +44,7 @@
             </div>
             <div style="margin-bottom: 10px" v-if="org_id != 10188">
               <!-- 电话：{{ item.patient.phone }} -->
-              开方日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+              开方日期：{{ getTime(item.pre_time) ? getTime(item.pre_time) : "" }}
             </div>
             <div style="margin-bottom: 10px" v-else>
               日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
@@ -59,7 +59,7 @@
             <div class="Rp">Rp:</div>
             <div
               class="drugsBox"
-              v-for="(it, index) in item.advices" :key="index" 
+              v-for="(it, index) in item.advices" :key="index"
               :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
             >
             <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  :style="{'page-break-after':index==yi&&item.advices.length>3? 'always':'auto'}"-->
@@ -88,7 +88,7 @@
                     </div>
                     <div style="margin-bottom: 10px" v-if="org_id != 10188">
                       <!-- 电话：{{ item.patient.phone }} -->
-                      开方日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+                      开方日期：{{ getTime(item.pre_time) ? getTime(item.pre_time) : "" }}
                     </div>
                     <div style="margin-bottom: 10px" v-else>
                       日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
@@ -126,7 +126,7 @@
                       </div>
                     </template>
                   </div>
-                  
+
                   <div style="margin-left: 70px">
                     用法：
                     <span v-if="(item.arr.length>0 && item.arr[0][0].groupno!=it.groupno)||item.arr.length==0">{{ it.single_dose }}{{ it.single_dose_unit }}</span>
@@ -175,10 +175,10 @@
                           : 0
                       }}元
                     </p>
-                    
+
                   </div>
                   <div class="actionBar" style="margin-bottom: 10px;">
-                    <p style="width:300px;">大额处方患者意见： 
+                    <p style="width:300px;">大额处方患者意见：
                       <el-radio v-model="radio" label="1">同意</el-radio>
                       <el-radio v-model="radio" label="2">不同意</el-radio>
                     </p>
@@ -225,7 +225,7 @@
                 >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
               </div>
             </div>
-            
+
             <div
               class="drugsBox"
               v-for="(it, i) in item.additionalcharge"
@@ -239,7 +239,7 @@
             </div>
             <div style="text-align: center">(以下空白)</div>
           </div>
-        
+
           <!-- <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
             <p v-if="org_id == 10217 || org_id == 0">
               医师：
@@ -272,7 +272,7 @@
             <p style="text-align: right;">医师：{{ item.doctor ? item.doctor : "" }}</p>
           </div>
           <!-- <div style="display: flex;justify-content: space-around;border-bottom: 2px solid #000;">
-            <p style="width:300px;">大额处方患者意见： 
+            <p style="width:300px;">大额处方患者意见：
               <el-radio v-model="radio" label="1">同意</el-radio>
               <el-radio v-model="radio" label="2">不同意</el-radio>
             </p>
@@ -293,24 +293,24 @@
             <p>
               金额：{{
                 getTotalOne(item.id).toFixed(2)
-                  ? getTotalOne(item.id).toFixed(2) 
+                  ? getTotalOne(item.id).toFixed(2)
                   : 0
               }}元
             </p>
-            
+
           </div>
           <div class="actionBar">
-            <p style="width:300px;">大额处方患者意见： 
+            <p style="width:300px;">大额处方患者意见：
               <el-radio v-model="radio" label="1">同意</el-radio>
               <el-radio v-model="radio" label="2">不同意</el-radio>
             </p>
-            
+
             <p>收费员：</p>
           </div>
           <div>
             <p >患者签名：</p>
           </div>
-          
+
       </div>
     </div>
   </div>
@@ -445,7 +445,7 @@ export default{
           var arr = new Array()
           var advicess = new Array()
           var advicess=advicePrint[i].advices
-          
+
          for(let j=0;j<advicess.length;j++){
             for(let x=j+1;x<advicess.length;x++){
               if(advicess[j].groupno == advicess[x].groupno){
@@ -453,17 +453,17 @@ export default{
               }
             }
           }
-         
+
          this.advicePrint[i]["arr"]    = arr
         //  for(let y=0;y<this.advicePrint[i].arr.length;y++){
         //   console.log('6666666',this.advicePrint[i].arr[y]);
         //  }
-          
-         
+
+
         }
           console.log('4444444',this.advicePrint);
         //  console.log('55555555',this.arr);
-         
+
           console.log(this.doctorList_1, "医生列表");
           if (this.doctorList_1.length > 0) {
             var operatorsLen = this.doctorList_1.length;
@@ -633,7 +633,7 @@ export default{
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     this.org_id = xtuser.org.id;
-    
+
     // for(let j=0;j<this.advicess.length;j++){
     //   console.log('44444444');
     //   for(let x=j+1;x<this.advicess.length;x++){
@@ -644,9 +644,9 @@ export default{
     // }
     // console.log('777777777',this.arr[0].advice_name);
     // return this.arr
-    
+
   },
-  
+
   watch: {
     ids: function (val) {
       this.ids = val;
@@ -678,7 +678,7 @@ export default{
   margin-top: 10px;
   line-height: 24px;
   padding: 0 10px;
-  
+
 }
 .infoTitle p {
   width: 200px;

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -174,10 +174,10 @@
                     <p>HDF+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                     <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
-                  <span v-if="item.mode_id == 'HFHD+HP'">
-                      <p>HFHD+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                  <!-- <span v-if="item.mode_id == 'HFHD+HD'">
+                      <p>HFHD+HD:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
-                  </span>
+                  </span> -->
                    <span v-if="item.mode_id == '腹水回输'">
                       <p>腹水回输:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
@@ -1032,6 +1032,18 @@ export default {
             if(modedate[i].mode_id == 28){
               modedate[i].mode_id = "CVVHDF"
             }
+            if(modedate[i].mode_id == 29){
+              modedate[i].mode_id = "PE"
+            }
+            if(modedate[i].mode_id == 30){
+              modedate[i].mode_id = "血浆胆红素吸附+HP"
+            }
+            if(modedate[i].mode_id == 31){
+              modedate[i].mode_id = "HPD"
+            }
+            if(modedate[i].mode_id == 32){
+              modedate[i].mode_id = "HDP"
+            }
             this.modetype = modedate
 
             // this.modesData.xAxis.push(modedate[i].mode_id)

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
       })