Merge remote-tracking branch 'origin/master'

src/views/inventory/addInvRemindSetDialog.vue

@@ -166,11 +166,6 @@ export default {
       getInfoByInvId({invId: this.invId}).then((res) => {
         if (res.code === 20000) {
           this.formData = res.data;
-          this.formData.lowStock = false;
-          this.formData.lackStock = false;
-          this.formData.overStock = false;
-          this.formData.expireDate = false;
-          this.formData.recentDate = false;
         } else {
           this.$message.error(res.meesage);
         }

src/views/supplier/products/supProductsAddDi.vue

@@ -69,7 +69,7 @@
         </el-table-column>
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">编辑</el-button>
             <el-button type="text" size="small" :disabled="scope.row.status ==2" @click="deleteProduct(scope.row.id)">
               删除
             </el-button>

src/views/system/param/helpSettings.vue

@@ -169,7 +169,7 @@
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      let queryParams= {
+      this.queryParams= {
           page: 1,
           limit: 10,
           menuName: "",