批量打印

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -265,7 +265,7 @@
                       <td width="100">BP<br />mmHg</td>
                       <td width="60">静脉压/动脉压<br />mmHg</td>
                       <td width="80">血流量<br />ml/min</td>
-                      <td width="90">超滤量累计L</td>
+                      <td width="90">超滤量累计 <span v-if="orgid == 9555">ml</span><span v-else>L</span></td>
                       <td width="80">钠浓度<br />mmol/L</td>
                       <td width="240">病情特殊情况处理<br />及专科护理措施记录</td>
                       <td width="100">护士签名</td>
@@ -402,7 +402,7 @@
                       <td width="100">BP<br />mmHg</td>
                       <td width="70">静脉压/动脉压<br />mmHg</td>
                       <td width="80">血流量<br />ml/min</td>
-                      <td width="90">超滤量累计L</td>
+                      <td width="90">超滤量累计 <span v-if="orgid == 9555">ml</span><span v-else>L</span> </td>
                       <td width="80">钠浓度<br />mmol/L</td>
                       <td width="240">病情特殊情况处理<br />及专科护理措施记录</td>
                       <td width="100">护士签名</td>
@@ -961,7 +961,8 @@
                   <div class="under_line" style="width: 70px;" v-else>
                     {{ "/" }}
                   </div>
-                  L
+                  <span v-if="orgid == 9555">ml</span>
+                  <span v-else>L</span>
                 </div>
                 <div class="inline_block">
                   &emsp;实际超滤量：
@@ -971,7 +972,8 @@
                   <div class="under_line" style="width: 70px;" v-else>
                     {{ "/" }}
                   </div>
-                  L
+                  <span v-if="orgid == 9555">ml</span>
+                  <span v-else>L</span>
                 </div>
                 <div class="inline_block">
                   透后体重：

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -22,7 +22,7 @@
           style="width: 100%">
           <el-table-column
             align="center"
-            label="商品类型">
+            label="耗材类型">
             <template slot-scope="scope">
               <!-- <span>{{getGoodTypeName(scope.row)}}</span> -->
               <span>{{scope.row.type_name}}</span>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -109,7 +109,7 @@
         >
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
-              <span>商品类型</span>
+              <span>耗材类型</span>
             </template>
 
             <template slot-scope="scope">
@@ -141,6 +141,22 @@
               </el-form-item>
             </template>
           </el-table-column>
+          
+          <el-table-column min-width="35" align="center">
+             <template slot="header" slot-scope="scope">
+              <span>单位<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.good_unit" style="width:160px;" placeholder="请选择">
+                 <el-option
+                   v-for="(item,index) in propForm.goodUnit"
+                   :key="index"
+                   :label="item.name"
+                   :value="item.id">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
 
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
@@ -192,7 +208,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" min-width="20">
+          <el-table-column label="操作" align="center" min-width="20" width="150">
             <template slot-scope="scope">
               <el-tooltip
                 class="item"
@@ -303,7 +319,7 @@ export default {
             this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
             this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
             this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
-
+            this.recordInfo.recordData[this.currentIndex].good_unit = val.selectedGoodInfo[i].good_unit
           } else {
             const tempForm = {}
             tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
@@ -311,6 +327,7 @@ export default {
             tempForm['count'] = ''
             tempForm['price'] = val.selectedGoodInfo[i].buy_price.toString()
             tempForm['remark'] = ''
+            tempForm['good_unit'] = ''
             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
         }
@@ -611,7 +628,7 @@ export default {
     tempObj["return_count"] = 0;
     tempObj["price"] = "";
     tempObj["remark"] = "";
-
+    tempObj["good_unit"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;