新分支

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -389,7 +389,7 @@
                       style="padding-left:5px;border-left:1px solid #000;padding-left:5px"
                     >
                       医师签名：
-                      <span
+                      <!-- <span
                           v-if="
                         setAdminUserES(
                         record.prescription,
@@ -409,7 +409,41 @@
                           srcset=""
                           v-else
                           style="height: 30px;"
-                        />
+                        /> -->
+                        <span
+                            v-if="
+                              !record.advices ||
+                                typeof record.advices[0] == 'undefined' ||
+                                typeof record.advices[0][0] == 'undefined'
+                            "
+                          ></span>
+                          <span
+                            v-else-if="
+                              setAdminUserES(
+                                record.advices[0][0],
+                                'advice_doctor'
+                              ) == ''
+                            "
+                            >{{
+                              getAdminUser(
+                                record.advices[0][0],
+                                "advice_doctor"
+                              )
+                            }}</span
+                          >
+                          <img
+                            :src="
+                              setAdminUserES(
+                                record.advices[0][0],
+                                'advice_doctor'
+                              )
+                            "
+                            alt=""
+                            srcset=""
+                            v-else
+                             style="height: 30px;"
+                          />
+                    </span>
                     </td>
                   </tr>
                   <tr style="text-align:left">

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -42,12 +42,12 @@
 
        
       </div>
-      <!-- <div class="filter-container">
+      <div class="filter-container">
       <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
        <el-button type="primary" @click="toSeachOne">搜索</el-button>
 
        
-      </div> -->
+      </div>
       <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询:</span>

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -341,7 +341,7 @@
                 "
               >
                 医师签名：
-                <span v-if="setAdminUserES(prescription.creater) == ''">
+                <!-- <span v-if="setAdminUserES(prescription.creater) == ''">
                   {{ getAdminUser(prescription.creater) }}
                 </span>
                 <img
@@ -350,7 +350,18 @@
                   alt
                   srcset
                   v-else
-                />
+                /> -->
+                <span
+                style="display: inline-block; width: 100px; text-align: left"
+              >
+                &nbsp;
+                <span v-if="doctorForm.url === ''">{{
+                  doctorForm.doctor
+                }}</span>
+                <span v-if="doctorForm.url !== ''">
+                  <img class="es-img" :src="doctorForm.url" />
+                </span>
+              </span>
               </td>
             </tr>
             <tr style="text-align: left">

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -600,13 +600,13 @@ export default {
         for(let i=0;i<this.tablePrint.length;i++){
            if(this.org_id == 9919 || this.org_id == 9671){
              this.tablePrint[i].min_price = this.tablePrint[i].price
-             this.tablePrint[i].count_one = parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))/this.tablePrint[i].min_number)
+             this.tablePrint[i].count = parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))/this.tablePrint[i].min_number)
              this.tablePrint[i].total_price =  ((parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))/this.tablePrint[i].min_number))*this.tablePrint[i].price).toFixed(2)
              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
              this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)/this.tablePrint[i].min_number
             
            }else{
-              this.tablePrint[i].count_one = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
+              this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
               this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
               this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
               this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
@@ -619,7 +619,7 @@ export default {
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号','生产厂商','进销商', '单位','数量','单价','总价','出库时间','备注']
        if(this.org_id == 9919){
-        const filterVal = ['index','drug_name', 'unit', 'manufacturer_name','dealer_name','max_unit','count_one','min_price','total_price','ctime','remark']
+        const filterVal = ['index','drug_name', 'unit', 'manufacturer_name','dealer_name','max_unit','count','min_price','total_price','ctime','remark']
            
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tablePrint.length;i++){