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

src/xt_pages/outpatientDoctorStation/checkPrint.vue

@@ -13,9 +13,9 @@
       </template> -->
 <!--  && this.$store.getters.xt_user.org_id != 0  -->
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-if="this.$store.getters.xt_user.org_id != 10402 && this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 0" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
+        <printOne v-if="this.$store.getters.xt_user.org_id != 10402 && this.$store.getters.xt_user.org_id != 10375 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
         <printTwo v-if="this.$store.getters.xt_user.org_id == 10402 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
-        <printThree v-if="this.$store.getters.xt_user.org_id == 10375 || this.$store.getters.xt_user.org_id == 0 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printThree>
+        <printThree v-if="this.$store.getters.xt_user.org_id == 10375 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printThree>
         <!--      <print-two></print-two>-->
       </div>
 

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -112,7 +112,6 @@
           </div>
           <div>
             医生签字：
-
             <img
               v-if="setAdminUserES(advicePrint[0].creator)"
               style="height: 30px"

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -79,7 +79,29 @@
             </div>
 
             <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
-                <div style="width: 300px;">开单医生：{{item.doctor?item.doctor:''}}</div>
+                <!-- <div style="width: 300px;">开单医生：{{item.doctor?item.doctor:''}}</div> -->
+                <div style="width: 300px;" v-if="org_id==10088 ||org_id==0">
+                  开单医生：
+                  <span
+                    style="width: 100px; display: inline-block"
+                    v-if="item.creator == ''"
+                  >
+                    {{ item.doctor ? item.doctor : "" }}
+                  </span>
+                    <span
+                    style="width: 100px; display: inline-block"
+                    v-else-if="doc_name != ''"
+                  >
+                    {{ doc_name }}
+                  </span>
+                  <img
+                    style="height: 30px"
+                    :src="setAdminUserES(item.creator,item.doctor)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
+                </div>
                 <div style="width: 300px;">签章：</div>
                 <div style="width: 300px;">费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
             </div>
@@ -252,10 +274,23 @@
 
           ],
         hisPatient: {},
-        diagnoses: []
+        diagnoses: [],
+        org_id:''
       }
     },
     methods: {
+      // 电子签名
+      setAdminUserES(id,name) {
+        if (id == 0) {
+          return "";
+        }
+        if (id in this.operatorMaps) {
+          return this.operatorMaps[id].url;
+        } else {
+          this.doc_name = name
+          return "";
+        }
+      },
       getAge(patient){
         var thisLen = patient.id_card_no.length
         var birth = ''
@@ -432,7 +467,7 @@
       this.getPrescriptionPrint()
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
-
+      this.org_id = this.$store.getters.xt_user.org_id
     },
     watch: {
       patient_id: function(val) {

src/xt_pages/stock/drugs/inventory.vue

@@ -336,6 +336,7 @@ export default {
                   //  }else{
                   //    list[i].type = 6
                   //   }
+                   list[i].type = 6
                    for(let j=0;j<this.manufacturerList.length;j++){
                      if(list[i].manufacturer == this.manufacturerList[j].id){
                         list[i].manufacturer_name = this.manufacturerList[j].manufacturer_name

src/xt_pages/stock/drugs/newDrugInventory.vue

@@ -809,7 +809,7 @@ export default {
                 list[i].last_stock_min_number = ""
                 list[i].min_number = list[i].XtBaseDrug.min_number
                 list[i].manufacturer_name  = ""
-                // list[i].type = 4
+                list[i].type = 6
                 list[i].last_stock_max_number = list[i].stock_max_number
                 list[i].last_stock_min_number = list[i].stock_min_number
                 for(let j=0;j<this.manufacturerList.length;j++){

src/xt_pages/stock/inventory.vue

@@ -461,6 +461,7 @@ export default {
               // }else{
               //   list[i].type = 6
               // }
+              list[i].type =6
               
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
@@ -485,7 +486,7 @@ export default {
                   price:item.price,
                   number:item.number,
                   expiry_date:item.expiry_date,
-                  type:0,
+                  type:6,
                   last_stock_count:0,
                 }
               }

src/xt_pages/stock/newInventory.vue

@@ -446,7 +446,7 @@ export default {
           this.manufacturerList = response.data.data.manufacturerList
           loading.close()
           for(let i=0;i<list.length;i++){
-              // list[i].type = 4
+              list[i].type = 6
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
               list[i].manufacturer_name = ""

src/xt_pages/stock/stockFlow.vue

@@ -96,12 +96,12 @@
              {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
-
+<!-- 
         <el-table-column prop="drug_name" label="出库日期" align="center">
            <template slot-scope="scope">
              {{getTime(scope.row.system_time)}}
            </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="drug_name" label="仓库名称"  align="center">
            <template slot-scope="scope">
              <span>{{getHouseName(scope.row.storehouse_id)}}</span>