1

src/store/modules/globalConfig.js

@@ -509,6 +509,21 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
+      },
+      21: {
+        id: 21,
+        name: 'HD+',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
       }
     },
     anticoagulants_confit: { // 抗凝剂

src/xt_pages/data/components/consumables.vue

@@ -115,9 +115,9 @@
           {{ getGoodKind(scope.row.good_kind) }}
         </template>
       </el-table-column>
-      <el-table-column label="耗材编码" width="140" align="center">
+      <el-table-column label="耗材编号" width="140" align="center">
         <template slot-scope="scope">
-          {{ scope.row.good_code }}
+          {{ scope.row.good_number }}
         </template>
       </el-table-column>
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -10,7 +10,7 @@
           <span class="content">{{ dialysis_mode }}</span>
         </li>
 
-        <li v-if="isShow('置换量')">
+        <li v-if="isShow('置换量') && (dialysis_mode == 'HDF' || dialysis_mode == 'HF' || dialysis_mode =='HDF+HP')">
           <label>置换量 : </label>
           <span class="content">{{
             replacement_total != "0" ? replacement_total : ""

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

@@ -211,6 +211,7 @@
       changeSchedualType: function(schedual_type) {
         let ParamsQuery = {}
         ParamsQuery['schedual_type'] = schedual_type
+        ParamsQuery['record_date'] = this.$route.query.date
         GetSchedualNumber(ParamsQuery).then(response => {
           if (response.data.state == 0) {
             return false
@@ -230,6 +231,10 @@
       GetSchedualNumber: function() {
         let ParamsQuery = {}
         ParamsQuery['schedual_type'] = this.schedual_type
+        ParamsQuery['record_date'] = this.$route.query.date
+        console.log("列表33333333333333333333",ParamsQuery)
+        // console.log("路由",this.$route.query.date)
+       
         GetSchedualNumber(ParamsQuery).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)

src/xt_pages/stock/config/goodInfo.vue

@@ -541,7 +541,7 @@
           //修改
           val['id'] = this.goodInfo.editGoodId
           val['good_code'] = this.goodInfo.good_code
-
+          console.log("val2222",val)
           modifyGoodInfo(val).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -42,7 +42,7 @@
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
                                     <td style="line-height:18px;">{{ item.remark }}</td>
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
-                                    <td style="line-height:18px;">{{ getManufacturer(item.manufacturer) }}</td>
+                                    <td style="line-height:18px;">{{ getManufacturer(item.good_id) }}</td>
                                     <td style="line-height:18px;"><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
                                     <td style="line-height:18px;">{{item.price}}</td>
                                     <td style="line-height:18px;">{{item.warehousing_count}}</td> 
@@ -149,6 +149,18 @@ export default {
             this.dealer = response.data.data.dealer;
             this.goodInfo = response.data.data.goodInfo;
             this.goodType = response.data.data.goodType;
+           
+           for(let i=0;i<this.goodInfo.length;i++){
+               this.goodInfo[i].manufacturer_name = ""
+            }
+            for(let i=0;i<this.goodInfo.length;i++){
+               for(let j=0;j<this.manufacturer.length;j++){
+                  if(this.goodInfo[i].manufacturer == this.manufacturer[j].id){
+                     this.goodInfo[i].manufacturer_name = this.manufacturer[j].manufacturer_name
+                  }
+               } 
+            }
+             console.log("商品信息",this.goodInfo)
             }
         });
         },
@@ -247,14 +259,23 @@ export default {
         }
         return ""
       },
-      getManufacturer(id){
-        let name = ''
-        this.manufacturer.map(item => {
-          if(item.id == id){
-            name = item.manufacturer_name
-          }
-        })
-        return name
+      // getManufacturer(id){
+      //   let name = ''
+      //   this.manufacturer.map(item => {
+      //     if(item.id == id){
+      //       name = item.manufacturer_name
+      //     }
+      //   })
+      //   return name
+      // },
+     getManufacturer(id){
+         let name = ""
+         for(let i=0;i<this.goodInfo.length;i++){
+             if(id == this.goodInfo[i].id){
+                name  =this.goodInfo[i].manufacturer_name
+             }
+         }
+         return name
       },
       fetchAllAdminUsers() {
         fetchAllAdminUsers().then(response => {