Merge branch 'wwz' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb

src/views/invoicing/consumable/information.vue

@@ -52,6 +52,7 @@
         </el-table-column>
         <!-- <el-table-column label="最近入库量" prop="lasterInStock" /> -->
         <el-table-column label="库存数量" prop="stockNumber" />
+        <el-table-column label="预警值" prop="conWarning" />
         <!-- <el-table-column label="单位耗材值" prop="surplusStock" /> -->
         <!-- <el-table-column label="排序" prop="sort" sortable /> -->
         <el-table-column label="更新时间" prop="updateTime">
@@ -105,6 +106,9 @@
         <el-form-item v-if="dialogtitle == '添加'">
           <el-button type="primary" @click="typedialogshow = true">去选择</el-button>
         </el-form-item>
+        <el-form-item label="预警值" prop="conWarning">
+          <el-input v-model="ruleForm.conWarning" placeholder="请输入预警值"></el-input>
+        </el-form-item>
         <!-- <el-form-item label="单位耗材值" prop="surplusStock">
           <el-input v-model="ruleForm.surplusStock" placeholder="请输入单位耗材值"></el-input>
         </el-form-item> -->
@@ -250,6 +254,7 @@ export default {
         conTypeId: '',
         // surplusStock: '',
         conUnit: '',
+        conWarning: '',
         shopId: localStorage.getItem('shopId'),
       },
       rules: {
@@ -264,7 +269,10 @@ export default {
         ],
         conUnit: [
           { required: true, message: '请输入单位', trigger: 'blur' }
-        ]
+        ],
+        conWarning: [{
+          required: true, message: '请输入单位', trigger: 'blur'
+        }]
       }
     }
   },
@@ -407,6 +415,7 @@ export default {
         this.ruleForm.conCode = item.conCode
         this.ruleForm.conName = item.conName
         // this.ruleForm.surplusStock = item.surplusStock
+        this.ruleForm.conWarning = item.conWarning
         this.ruleForm.conUnit = item.conUnit
         console.log(this.ruleForm, item)
       }
@@ -423,6 +432,7 @@ export default {
               conTypeId: this.ruleForm.conTypeId,
               // surplusStock: this.ruleForm.surplusStock,
               conUnit: this.ruleForm.conUnit,
+              conWarning: item.conWarning,
               shopId: this.ruleForm.shopId
             })
             this.dialogshow = false
@@ -432,6 +442,7 @@ export default {
               conName: this.ruleForm.conName,
               conTypeId: this.ruleForm.conTypeId,
               // surplusStock: this.ruleForm.surplusStock,
+              conWarning: item.conWarning,
               conUnit: this.ruleForm.conUnit,
               shopId: this.ruleForm.shopId
             })