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

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

@@ -490,7 +490,7 @@
                                 <td width="20">mg</td>
                                 <td width="10">)</td>
                                 <td width="100">
-                                    <label-box :isChecked="record.prescription.anticoagulant==6?true:record.prescription.anticoagulant==7?true:false" showValue='低分子肝素'></label-box> 
+                                    <label-box :isChecked="record.prescription.anticoagulant==3?true:false" showValue='低分子肝素'></label-box> 
                                 </td>
                                 
                                 <td width="10">(</td>

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

@@ -459,7 +459,7 @@
         <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShow('实际置换量')">
-          <el-form-item v-if="this.template_id == 20 || this.template_id == 21 || this.org_id ==10702 || this.org_id ==10702" label="实际置换量(ml): " :prop="isName('实际置换量')" :rules="isCheckmust('实际置换量')">
+          <el-form-item v-if="this.template_id == 20 || this.template_id == 21" label="实际置换量(ml): " :prop="isName('实际置换量')" :rules="isCheckmust('实际置换量')">
             <el-input v-model="form.actual_displacement"></el-input>
           </el-form-item>
           <el-form-item v-else label="实际置换量(L): " :prop="isName('实际置换量')" :rules="isCheckmust('实际置换量')">

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -576,7 +576,7 @@
                   <td width="20">mg</td>
                   <td width="10">)</td>
                   <td width="100">
-                      <label-box :isChecked="prescription.anticoagulant==6?true:prescription.anticoagulant==7?true:false" showValue='低分子肝素'></label-box> 
+                      <label-box :isChecked="prescription.anticoagulant==3?true:false" showValue='低分子肝素'></label-box> 
                   </td>
                   
                   <td width="10">(</td>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -356,9 +356,15 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="药品追溯码" width="150" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码"></el-input>
+            </template>
+          </el-table-column>
+
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark"></el-input>
+              <el-input v-model="scope.row.remark"  placeholder="请输入备注"></el-input>
             </template>
           </el-table-column>
 
@@ -706,6 +712,7 @@ export default {
       tempObj["last_price"] = "";
       tempObj["count_unit"] = "";
       tempObj["min_number"] = "";
+      tempObj["drug_code"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -919,6 +926,7 @@ export default {
                 list[i].last_price = list[i].price
                 list[i].warehousing_count = list[i].warehousing_count.toString()
                 list[i].unitList = []
+                list[i].drug_code = list[i].drug_code
                 var obj = {id:1,name:""}
                 obj.name = list[i].drug.max_unit
                 var objOne = {id:2,name:""}
@@ -1178,6 +1186,7 @@ export default {
     tempObj["number"] = "";
     tempObj["count_unit"] = "";
     tempObj["min_number"] = "";
+    tempObj["drug_code"] = ""
     this.recordInfo.recordData.push(tempObj);
 
     this.GetConfigInfo();

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -339,12 +339,20 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="药品追溯码" width="150" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码" :disabled="disabled"></el-input>
+            </template>
+          </el-table-column>
+
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark" :disabled="disabled"></el-input>
+              <el-input v-model="scope.row.remark"  placeholder="请输入备注" :disabled="disabled"></el-input>
             </template>
           </el-table-column>
 
+         
+
           <el-table-column
             label="操作"
             fixed="right"
@@ -618,6 +626,7 @@ export default {
       tempObj['retail_price'] = ""
       tempObj['drug_name'] = ""
       tempObj['manufacturer'] = ""
+      tempObj["drug_code"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -764,6 +773,8 @@ export default {
                 }
                 list[i].last_price = list[i].price
                 list[i].warehousing_count = list[i].warehousing_count.toString()
+
+                list[i].drug_code = list[i].drug_code
                 list[i].unitList = []
                 var obj = {id:1,name:""}
                 obj.name = list[i].drug.max_unit
@@ -829,6 +840,8 @@ export default {
 
             response.data.data.info[i].drug_type = response.data.data.info[i].drug.drug_type
 
+            response.data.data.info[i].drug_code = response.data.data.info[i].drug_code
+
            if(response.data.data.info[i].manufacturer == 0){
                response.data.data.info[i].manufacturer = ""
             }

src/xt_pages/stock/selfPreparedMedicine/warehouseInfo.vue

@@ -954,9 +954,9 @@ export default {
       },
       GetDrugTypeName(drug_type){
         var name = ""
-        console.log("drugTypeList---------------",this.drugTypeList)
+        // console.log("drugTypeList---------------",this.drugTypeList)
         for(let i=0;i<this.drugTypeList.length;i++){
-          if(drug_type == this.drugTypeList[i].value){
+          if(drug_type == this.drugTypeList[i].id){
              name = this.drugTypeList[i].name
           }
         }