Merge remote-tracking branch 'origin/master'

src/views/basic/product/product.vue

@@ -1973,6 +1973,12 @@ export default {
         isAdavence: row.isAdavence,
       };
       this.editFormat = JSON.parse(JSON.stringify(row));
+      if( this.editFormat.overStockNum == null){
+        this.editFormat.overStockNum = 0;
+      }
+      if( this.editFormat.lowStockNum == null){
+        this.editFormat.lowStockNum = 0;
+      }
       this.editDiDialogVisible = true;
     },
     closeDialog() {

src/views/supplier/company/basicCompanyproductEdit.vue

@@ -133,6 +133,20 @@
               <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+          <el-form-item
+            label="是否可集采:"
+            prop="spUse"
+            class="query-form-item"
+          >
+            <el-radio-group v-model="editQuery.groupBuy">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          </el-col>
+
+
         </el-row>
         <el-button-group style="display: flex">
           <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
@@ -238,6 +252,7 @@ export default {
         recentDateTime: this.editQuery.recentDateTime,
         isDateBy: this.editQuery.isDateBy,
         relSupId:this.editQuery.id,
+        groupBuy:this.editQuery.groupBuy,
       }
 
       updateById(data).then(res => {

src/views/system/dept/invWarehouse.vue

@@ -124,7 +124,7 @@
       <!--/>-->
       <!--仓库编辑对话框-->
       <el-dialog
-        :title="formMap[formName]"
+        :title="`${this.invWouse.name}`+formMap[formName]"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
         :visible.sync="subFormVisible"
@@ -460,8 +460,8 @@ export default {
         2: "预验收库",
       },
       formMap: {
-        add: "仓库信息-新增",
-        edit: "仓库信息-编辑",
+        add: "信息-新增",
+        edit: "信息-编辑",
       },
       invWouse: {},
       formName: null,

src/views/userManage/param/basicProductConfig.vue

@@ -184,6 +184,7 @@ export default {
             list: [],
             formLoading: false,
             systemList:[],
+            systemLists:[],
             total: 0,
             formData: formJson,
             formName: null,
@@ -256,7 +257,8 @@ export default {
         systemParamConfigList(this.systemQuery)
           .then((response) => {
             this.systemLoading = false;
-            this.systemList = response.data.list || [];
+            this.systemLists = response.data.list || [];
+            this.systemList = this.systemLists.filter(item => item.paramValue !=0);
             this.systemTotal = response.data.total || 0;
           })
           .catch(() => {