Merge remote-tracking branch 'origin/master'

src/views/inventory/InvSupProuducts.vue

@@ -141,8 +141,15 @@
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip
                          width="120"></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" width="80" fixed="right">
+        <el-table-column label="操作" width="180" fixed="right">
           <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="invRemindSet(scope.row)"
+            >添加预警设置
+            </el-button
+            >
             <el-button
               type="text"
               size="small"
@@ -176,6 +183,21 @@
       ></invProductsDetail>
     </el-dialog>
 
+    <el-dialog
+      title="添加库存预警设置"
+      :visible.sync="addInvRemindSetDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="60%"
+      v-if="addInvRemindSetDialogVisible"
+    >
+      <addInvRemindSetDialog
+        :invId="invId"
+        :closeDialog="closeRemindSetDialog"
+      ></addInvRemindSetDialog>
+    </el-dialog>
+
+
   </div>
 </template>
 
@@ -185,6 +207,7 @@ import {getInvProduct, deleteInvProduct, getProduct} from "@/api/inventory/invPo
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {isBlank} from "@/utils/strUtil";
 import invProductsDetail from "@/views/inventory/InvProductsDetail.vue";
+import addInvRemindSetDialog from "@/views/inventory/addInvRemindSetDialog.vue";
 
 export default {
   name: "InvProducts",
@@ -227,7 +250,9 @@ export default {
         supId: null,
         deptCode: null,
         invCode: null
-      }
+      },
+      addInvRemindSetDialogVisible: false,
+      invId: null
     };
   },
   methods: {
@@ -363,10 +388,19 @@ export default {
       }).catch((error) => {
         this.$message.error(error.message);
       });
-    }
+    },
+    invRemindSet(row) {
+      this.invId = row.id;
+      this.addInvRemindSetDialogVisible = true;
+    },
+    closeRemindSetDialog() {
+      this.invId = null;
+      this.addInvRemindSetDialogVisible = false;
+    },
   },
   components: {
-    invProductsDetail
+    invProductsDetail,
+    addInvRemindSetDialog
   },
   mounted() {
     document.body.ondrop = function (event) {

src/views/system/user/authUser.vue

@@ -177,6 +177,7 @@
                   reserve-keyword
                   placeholder="请选择"
                   :loading="loading"
+                  @change="change"
                 >
                   <el-option
                     v-for="item in fromWarehouseOptions"
@@ -377,6 +378,9 @@ export default {
       this.query.page = 1;
       this.getList();
     },
+    change(){
+      this.$forceUpdate();
+    },
     findInv(val) {
       // 获取仓库列表
       selectInvById(val)