数据

src/api/stock.js

@@ -922,3 +922,11 @@ export function getInventoryDetailPrintList(params) {
     params: params
   })
 }
+
+export function getGoodWarehouseList(params) {
+  return request({
+    url: '/api/stock/getgoodwarehouselist',
+    method: 'Get',
+    params: params
+  })
+}

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

@@ -440,6 +440,67 @@
            </template>
           </el-table-column>
 
+           <el-table-column
+            prop="heparin"
+            align="center"
+            label="累计血容量"
+            width="140"
+            v-if="isShow('累计血容量')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.accumulated_blood_volume}}
+           </template>
+          </el-table-column>
+
+           <el-table-column
+            prop="heparin"
+            align="center"
+            label="血温监测"
+            width="140"
+            v-if="isShow('血温监测')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.blood_temperature}}
+           </template>
+          </el-table-column>
+
+           <el-table-column
+            prop="heparin"
+            align="center"
+            label="尿素监测"
+            width="140"
+            v-if="isShow('尿素监测')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.urea_monitoring}}
+           </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="血浓量"
+            width="140"
+            v-if="isShow('血浓量')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.blood_thickness}}
+           </template>
+          </el-table-column>
+
+         <el-table-column
+            prop="heparin"
+            align="center"
+            label="血压监测"
+            width="140"
+            v-if="isShow('血压监测')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.blood_monitor}}
+           </template>
+          </el-table-column>
+
+
 
            <el-table-column
             prop="heparin"
@@ -714,7 +775,35 @@
             </el-form-item>
          </el-col>
 
+          <el-col :span="8" v-if=" isShow('累计血容量')">
+            <el-form-item label="累计血容量：">
+              <el-input v-model="form.accumulated_blood_volume"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if=" isShow('血温监测')">
+            <el-form-item label="血温监测">
+              <el-input v-model="form.blood_temperature"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if=" isShow('尿素监测')">
+            <el-form-item label="尿素监测">
+              <el-input v-model="form.urea_monitoring"></el-input>
+            </el-form-item>
+          </el-col>
 
+          <el-col :span="8" v-if=" isShow('血浓量')">
+            <el-form-item label="血浓量">
+              <el-input v-model="form.blood_thickness"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if=" isShow('血压监测')">
+            <el-form-item label="血压监测">
+              <el-input v-model="form.blood_monitor"></el-input>
+            </el-form-item>
+          </el-col>
 
           <!-- </el-row>
 
@@ -907,7 +996,12 @@ export default {
         monitor_anticoagulant:'',
         monitor_anticoagulant_value:"",
         blood_pressure_monitoring_site:"",
-        complication:""
+        complication:"",
+        accumulated_blood_volume:"",
+        blood_temperature:"",
+        urea_monitoring:"",
+        blood_thickness:"",
+        blood_monitor:"",
       },
 
       table_current_row: null,
@@ -1126,7 +1220,11 @@ export default {
         this.form.conductivity = resp.monitor.conductivity?resp.monitor.conductivity:'';
         this.form.monitor_anticoagulant = resp.monitor.monitor_anticoagulant?resp.monitor.monitor_anticoagulant:"";
         this.form.monitor_anticoagulant_value = resp.monitor.monitor_anticoagulant_value?resp.monitor.monitor_anticoagulant_value:""
-
+        this.form.accumulated_blood_volume  = resp.monitor.accumulated_blood_volume?resp.monitor.accumulated_blood_volume:""
+        this.form.blood_temperature = resp.monitor.blood_temperature?resp.monitor.blood_temperature:""
+        this.form.urea_monitoring = resp.monitor.urea_monitoring?resp.monitor.urea_monitoring:""
+        this.form.blood_thickness = resp.monitor.blood_thickness?resp.monitor.blood_thickness:""
+        this.form.blood_monitor = resp.monitor.blood_monitor?resp.monitor.blood_monitor:""
       })
     },
 
@@ -1152,6 +1250,7 @@ export default {
       // console.log("tableCurrentRowChange", currentRow)
     },
     setEditMonitor: function(monitor) {
+      console.log("monitor23223322332",monitor)
       if (monitor == null || monitor == undefined) {
         this.form.id = 0;
         // this.form.operate_date = parseInt((new Date()).getTime() / 1000)
@@ -1190,6 +1289,11 @@ export default {
         this.form.blood_sugar = '';
         this.form.monitor_anticoagulant = '';
         this.form.monitor_anticoagulant_value = ''
+        this.form.accumulated_blood_volume  = ""
+        this.form.blood_temperature = ""
+        this.form.urea_monitoring = ""
+        this.form.blood_thickness = ""
+        this.form.blood_monitor = ""
       } else {
         (this.form.id = monitor.id),
         // this.form.operate_date = monitor.operate_date
@@ -1227,6 +1331,11 @@ export default {
         this.form.blood_sugar = monitor.blood_sugar?monitor.blood_sugar:'';
         this.form.monitor_anticoagulant = monitor.monitor_anticoagulant?monitor.monitor_anticoagulant:'';
         this.form.monitor_anticoagulant_value = monitor.monitor_anticoagulant_value?monitor.monitor_anticoagulant_value:"";
+        this.form.accumulated_blood_volume  = monitor.accumulated_blood_volume?monitor.accumulated_blood_volume:""
+        this.form.blood_temperature = monitor.blood_temperature?monitor.blood_temperature:""
+        this.form.urea_monitoring = monitor.urea_monitoring?monitor.urea_monitoring:""
+        this.form.blood_thickness = monitor.blood_thickness?monitor.blood_thickness:""
+        this.form.blood_monitor = monitor.blood_monitor?monitor.blood_monitor:""
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();
@@ -1269,6 +1378,11 @@ export default {
       this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value;
       this.form.blood_pressure_monitoring_site = parseInt(this.form.blood_pressure_monitoring_site);
       this.form.complication = parseInt(this.form.complication);
+      this.form.blood_temperature = parseFloat(this.form.blood_temperature) == NaN ? 0 : parseFloat(this.form.blood_temperature);
+      this.form.accumulated_blood_volume = parseFloat(this.form.accumulated_blood_volume) == NaN ? 0 : parseFloat(this.form.accumulated_blood_volume);
+      this.form.urea_monitoring = parseFloat(this.form.urea_monitoring) == NaN ? 0 : parseFloat(this.form.urea_monitoring);
+      this.form.blood_thickness = parseFloat(this.form.blood_thickness) == NaN ? 0 : parseFloat(this.form.blood_thickness);
+      this.form.blood_monitor = parseFloat(this.form.blood_monitor) == NaN ? 0 : parseFloat(this.form.blood_monitor);
       let mode = '1';
       if (this.form.id > 0) {
         mode = '2';
@@ -1329,6 +1443,11 @@ export default {
             this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value;
             this.form.blood_pressure_monitoring_site = this.form.blood_pressure_monitoring_site;
             this.form.complication = this.form.complication;
+            this.form.blood_temperature = parseFloat(this.form.blood_temperature) == NaN ? 0 : parseFloat(this.form.blood_temperature);
+            this.form.accumulated_blood_volume = parseFloat(this.form.accumulated_blood_volume) == NaN ? 0 : parseFloat(this.form.accumulated_blood_volume);
+            this.form.urea_monitoring = parseFloat(this.form.urea_monitoring) == NaN ? 0 : parseFloat(this.form.urea_monitoring);
+            this.form.blood_thickness = parseFloat(this.form.blood_thickness) == NaN ? 0 : parseFloat(this.form.blood_thickness);
+            this.form.blood_monitor = parseFloat(this.form.blood_monitor) == NaN ? 0 : parseFloat(this.form.blood_monitor);
             this.$message.error(resp.msg)
           }
         }

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -31,6 +31,11 @@
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
+          <th v-if="isShow('累计血容量')" width="92px">累计血容量</th>
+          <th v-if="isShow('血温监测')" width="92px">血温监测</th>
+          <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
+          <th v-if="isShow('血浓量')" width="92px">血浓量</th>
+          <th v-if="isShow('血压监测')" width="92px">血压监测</th>
           <!-- <th v-if="isShow('血压监测部位')" width="92px">血压监测部位</th>
           <th v-if="isShow('并发症')" width="92px">并发症</th> -->
           <th v-if="isShow('KT/V') && org_id == 9987" width="92px">KT/V</th>
@@ -74,6 +79,11 @@
           </td>
           <!-- <th v-if="isShow('血压监测部位')">{{getBloodPressure(monitor.blood_pressure_monitoring_site)}}</th>
           <th v-if="isShow('并发症')">{{getComplication(monitor.complication)}}</th> -->
+          <th v-if="isShow('累计血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
+          <th v-if="isShow('血温监测')" width="92px">{{monitor.blood_temperature ? monitor.blood_temperature : ""}}</th>
+          <th v-if="isShow('尿素监测')" width="92px">{{monitor.urea_monitoring ? monitor.urea_monitoring : ""}}</th>
+          <th v-if="isShow('血浓量')" width="92px">{{monitor.blood_thickness ? monitor.blood_thickness : ""}}</th>
+          <th v-if="isShow('血压监测')" width="92px">{{monitor.blood_monitor ? monitor.blood_monitor : ""}}</th>
           <td v-if="isShow('KT/V') && org_id == 9987">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>

src/xt_pages/stock/stockDamaged.vue

@@ -130,6 +130,16 @@
             <el-form-item label="规格">
                 <el-input v-model="form.specification_name"></el-input>
             </el-form-item>
+            <el-form-item label="批号">
+                 <el-select v-model="form.number" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.number"
+                    :value="item.number">
+                  </el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item label="单位">
                 <el-input v-model="form.warehousing_unit"></el-input>
             </el-form-item>
@@ -165,37 +175,37 @@
             </el-form-item>
         </el-form>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column prop="date" label="耗材ID" width="100">
+            <el-table-column prop="date" label="耗材ID" width="100" align="center">
                <template  slot-scope="scope">
                  {{scope.row.good_id}}
                </template>
             </el-table-column>
-            <el-table-column prop="date" label="耗材名称" width="100">
+            <el-table-column prop="date" label="耗材名称" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.good_name}}
                </template>
             </el-table-column>
-            <el-table-column  prop="name" label="规格" width="100">
+            <el-table-column  prop="name" label="规格" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.specification_name}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="单位" width="100">
+            <el-table-column prop="name" label="单位" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.warehousing_unit}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="报损数量" width="100">
+            <el-table-column prop="name" label="报损数量" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.count}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="原进货价" width="100">
+            <el-table-column prop="name" label="原进货价" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.buy_price}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="原零售价" width="100">
+            <el-table-column prop="name" label="原零售价" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.packing_price}}
                </template>
@@ -205,22 +215,22 @@
                 {{scope.row.new_price}}
                </template>
             </el-table-column> -->
-            <el-table-column prop="name" label="生产厂商" width="100">
+            <el-table-column prop="name" label="生产厂商" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.manufacturer}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="产地" width="100">
+            <el-table-column prop="name" label="产地" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.good_origin_place}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="批准文号" width="100">
+            <el-table-column prop="name" label="批准文号" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.license_number}}
                </template>
             </el-table-column>
-            <el-table-column  prop="name" label="备注" width="100">
+            <el-table-column  prop="name" label="备注" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.remark}}
                </template>
@@ -364,7 +374,7 @@
 <script>
 import BreadCrumb from "../components/bread-crumb";
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage,getStockDamageDetail,modifyPrice,deleteStockDamage} from "@/api/stock"
+import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage,getStockDamageDetail,modifyPrice,deleteStockDamage,getStockBatchNumber,getGoodWarehouseList} from "@/api/stock"
 export default {
     name: "stockModifyPrice",
     components:{
@@ -401,6 +411,9 @@ export default {
                 good_origin_place:"",
                 report_count:"",
                 total:"",
+                number:"",
+                expiry_date:"",
+                product_date:"",
             },
             currentIndex: 0,
             manufacturerList:[],
@@ -420,6 +433,7 @@ export default {
             editPriceDialogVisible:false,
             modifyPriceDialogVisible:false,
             id:0,
+            numberList:[]
         }
     },
     methods:{
@@ -484,7 +498,9 @@ export default {
          })
         },
         handleSelect(val){
-          console.log("val23232323",val)
+          //获取当前耗材的批号
+          this.getStockBatchNumber(val.good_id)
+          this.getGoodWarehouseList(val.good_id)
           this.form.id = val.id
           this.form.good_id = val.good_id,
           this.form.good_name = val.good_name
@@ -499,6 +515,8 @@ export default {
           this.form.warehousing_unit = val.packing_unit  
           this.form.total = val.total
           this.form.new_price = val.new_price
+          this.form.expiry_date = val.expiry_date
+          this.form.product_date = val.product_date
       },
       addStock(){
         var obj = {
@@ -506,19 +524,37 @@ export default {
           good_name:this.form.good_name,
           specification_name:this.form.specification_name,
           warehousing_unit:this.form.warehousing_unit,
-          count:parseInt(this.form.count),
+          count:this.form.count,
           buy_price:this.form.buy_price.toString(),
           packing_price:this.form.packing_price.toString(),
           manufacturer:this.form.manufacturer,
           good_origin_place:this.form.good_origin_place,
           license_number:this.form.license_number,
           remark:this.form.remark,
-          // new_price:this.form.new_price.toString(),
           warehousing_order:this.form.warehousing_order,
           dealer:this.form.dealer,
           start_time:this.getTime(new Date()),
+          number:this.form.number,
+          warehousing_info_id:0,
+          product_date:val.product_date,
+          expiry_date:val.expiry_date,
         } 
         this.tableData.push(obj)
+        this.form.good_id = 0
+        this.form.good_name = ""
+        this.form.specification_name = ""
+        this.form.warehousing_unit = ""
+        this.form.count = ""
+        this.form.buy_price = ""
+        this.form.packing_price = ""
+        this.form.manufacturer = ""
+        this.form.good_origin_place = ""
+        this.form.license_number = ""
+        this.form.remark  = ""
+        this.form.warehousing_order = ""
+        this.form.dealer = ""
+        this.form.number = ""
+        this.form.good_id = ""
       },
       saveReportStock(){
          for(let i = 0;i<this.tableData.length;i++){
@@ -528,6 +564,19 @@ export default {
            if(this.tableData[i].dealer == 0){
               this.tableData[i].dealer = ""   
            }
+         }
+         console.log("比阿哥",this.tableData)
+         console.log("numberlist",this.numberList)
+         for(let i=0;i<this.tableData.length;i++){
+           this.tableData[i].count =  parseInt(this.tableData[i].count)
+           this.tableData[i].expiry_date = parseInt(this.tableData[i].expiry_date)
+           this.tableData[i].product_date = parseInt(this.tableData[i].product_date)
+           this.tableData[i].total = parseInt(this.tableData[i].total)
+           for(let j=0;j<this.numberList.length;j++){
+              if(this.tableData[i].number == this.numberList[j].number){
+                this.tableData[i].warehousing_info_id = this.numberList[j].id
+              }
+           }
          }
           var params = {
             tableData:this.tableData,
@@ -550,6 +599,7 @@ export default {
             this.form.buy_price = ""
             this.form.warehousing_unit = ""
             this.form.total = ""
+            this.form.number = ""
            
            }
         })
@@ -593,18 +643,12 @@ export default {
        }
      },
     changePrice(val){
-       console.log("val23232322323",val)
-      
        var arr = []
-      
        for(let i=0;i<val.length;i++){
          arr.push(val[i].id)
        }
       var str = arr.join(",")
-    
-      console.log("str",str)
-      this.ids = str
-     
+      this.ids = str 
      },
      SaveCheckedDamage(){
          var params = {
@@ -681,7 +725,6 @@ export default {
        modifyPrice(params).then(response=>{
          if(response.data.state ==1){
            var adjust = response.data.data.adjust
-
            this.modifyPriceDialogVisible = false
            this.$message.success("保存成功")
            this.getlist()
@@ -742,6 +785,30 @@ export default {
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+     getStockBatchNumber(id){
+       var params = {
+         id:id
+       }
+      getStockBatchNumber(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("批号列表",list)
+          this.numberList = list
+        }
+      })
+     },
+     getGoodWarehouseList(id){
+       var params = {
+          id:id,
+       }
+      getGoodWarehouseList(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           this.form.total =  list.stock_count
+           console.log("list23232",list)
+         }
+      })
+     }
     },
     created(){
         // var nowDate = new Date();

src/xt_pages/stock/stockModifyPrice.vue

@@ -39,8 +39,8 @@
         <div>
             <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
             <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-            <el-button size="small" type="primary" @click="print">打印</el-button>
-            <el-button size="small" type="primary" @click="toExport">导出</el-button>
+            <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+            <el-button size="small" type="primary" @click="toExport">导出</el-button> -->
         </div>
       </div>
       <div>
@@ -67,11 +67,11 @@
                          {{scope.row.packing_unit}}
                       </template>
                     </el-table-column>
-                    <el-table-column label="调价数量" width="100" align="center">
+                    <!-- <el-table-column label="调价数量" width="100" align="center">
                       <template slot-scope="scope">
                        {{scope.row.count}}
                       </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="原进货价" width="100" align="center">
                       <template slot-scope="scope">
                        {{scope.row.buy_price}}
@@ -142,80 +142,6 @@
                   :total="total">
                </el-pagination>
             </div>
-                <!-- <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-                    <el-table-column
-                    fixed="left"
-                    prop="date"
-                    label="药品ID"
-                    width="80">
-                    </el-table-column>
-                    <el-table-column
-                    prop="date"
-                    label="药品名称"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="规格"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="生产厂家"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="批准文书"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="经销商"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="数量"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="原零价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="现零价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="进货价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="零售总价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="批号"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="生产日期"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="有效日期"
-                    width="100">
-                    </el-table-column>
-                </el-table> -->
-         
         </div>
     </div>
     <el-dialog
@@ -248,9 +174,9 @@
             <el-form-item label="现价格">
                 <el-input v-model="form.new_price"></el-input>
             </el-form-item>
-            <el-form-item label="调价数量">
-                <el-input v-model="form.count"></el-input>
-            </el-form-item>
+            <!-- <el-form-item label="调价数量">
+                <el-input v-model="form.count" type="number"></el-input>
+            </el-form-item> -->
             <el-form-item label="备注" style="width:66%;">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
@@ -279,11 +205,11 @@
                {{scope.row.warehousing_unit}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="调价数量" width="100" align="center">
+            <!-- <el-table-column prop="name" label="调价数量" width="100" align="center">
               <template slot-scope="scope">
                 {{scope.row.count}}
               </template> 
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="name" label="原进货价" width="100" align="center">
                <template slot-scope="scope">
                 {{scope.row.buy_price}}
@@ -370,7 +296,7 @@
                 </el-form-item>
              </el-col> 
             </el-row>
-            <el-row>
+            <!-- <el-row>
              <el-col>
                <el-form-item label="调价数量：">
                     <el-input v-model="form.count"  style="width:200px"></el-input>
@@ -381,7 +307,7 @@
                     </div>
                 </el-form-item>
               </el-col>  
-            </el-row>
+            </el-row> -->
           </el-form>
         </span>
         <span slot="footer" class="dialog-footer">
@@ -435,19 +361,44 @@
 
 
     <el-dialog
-        title="耗材调价核对"
+        title="耗材调价编辑"
         :visible.sync="modifyDialogVisible"
         width="30%"
         >
         <span>
           <el-form :model="form">
-            <el-row>
-              <el-col>
-                <el-form-item label="现价格">
-                  <el-input v-model="form.new_price" style="width:100px"></el-input>
-                </el-form-item>  
-              </el-col>
-            </el-row>  
+         <el-row>
+               <el-col>
+                <el-form-item label="耗材名称:">
+                    <el-autocomplete
+                        class="checkSearch"
+                        popper-class="my-autocomplete"
+                        v-model="form.good_name"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="true"
+                        placeholder="请输入耗材名称"
+                        @select="handleSelect"
+                        @input="changeGoodName(scope.$index)"
+                        :disabled="true"
+                        style="width:160px;"
+                    >
+                        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                    </template>
+                    </el-autocomplete>
+                </el-form-item>
+               <el-form-item label="原价格：">
+                 <el-input v-model="form.packing_price" style="width:200px"></el-input>
+               </el-form-item>
+               <el-form-item label="现价格：">
+                    <el-input v-model="form.new_price" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="备注：">
+                    <el-input v-model="form.remark" style="width:200px"></el-input>
+                </el-form-item>
+             </el-col> 
+            </el-row>
           </el-form>  
         </span>
         <span slot="footer" class="dialog-footer">
@@ -578,8 +529,16 @@ export default {
           this.form.packing_price = val.packing_price
           this.form.warehousing_order = val.warehousing_order
           this.form.license_number = val.license_number
-          this.form.dealer = val.dealer
-          this.form.manufacturer = val.manufacturer
+          if(val.dealer == 0){
+            this.form.dealer = ""
+          }else{
+            this.form.dealer = val.dealer
+          }
+          if(this.form.manufacturer == 0){
+            this.form.manufacturer = ""
+          }else{
+            this.form.manufacturer = val.manufacturer
+          }
           this.form.specification_name = val.specification_name
           this.form.remark = val.remark
           this.form.buy_price = val.buy_price
@@ -666,7 +625,8 @@ export default {
            this.tableData[i].buy_price = this.tableData[i].buy_price.toString()
            this.tableData[i].packing_price = this.tableData[i].packing_price.toString()
            this.tableData[i].new_price = this.tableData[i].new_price.toString()
-           this.tableData[i].count =  parseInt(this.tableData[i].count)
+          //  this.tableData[i].count =  parseInt(this.tableData[i].count)
+            this.tableData[i].count = 0
            if(this.tableData[i].dealer == 0){
              this.tableData[i].dealer = ""
            }
@@ -677,6 +637,7 @@ export default {
          var params= {
            tableData:this.tableData,
          }
+      
       console.log("parasm222",params)
       saveAdjustPrice(params).then(response=>{
         if(response.data.state == 1){
@@ -684,6 +645,7 @@ export default {
           console.log("msg",msg)
           this.$message.success("保存成功!")
           this.dialogVisible = false
+          this.tableData = []
           this.getAllStockPrice()
         }
       })  
@@ -800,7 +762,16 @@ export default {
            var info =  response.data.data.detail
            console.log("info",info)
            this.id = info.id
-           this.form.new_price = info.new_price
+           this.good_id = info.good_id,
+           this.form.good_name = info.good_name
+           if(info.new_price == 0){
+            this.form.new_price = ""
+           }else{
+             this.form.new_price = info.new_price
+           }
+          
+           this.form.packing_price = info.packing_price
+           this.form.remark = info.remark
            this.modifyDialogVisible = true
          }
        })
@@ -808,7 +779,11 @@ export default {
      updateStockPrice(){
          var params = {
            new_price:this.form.new_price.toString(),
-           id:this.id
+           id:this.id,
+           packing_price:this.form.packing_price.toString(),
+           remark:this.form.remark,
+           good_id:this.form.good_id,
+           good_name:this.form.good_name,
          }
          console.log("params",params)
        updateStockPrice(params).then(response=>{