1.修改货位功能

src/views/inventory/InvSpaceManage.vue

@@ -22,7 +22,6 @@
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column label="货位号" prop="code"></el-table-column>
       <el-table-column label="货位名称" prop="name"></el-table-column>
-      <el-table-column label="货位分类" prop="type"></el-table-column>
       <!--        <el-table-column label="所属仓库" prop="invStorageName" width="200"-->
       <!--                         show-overflow-tooltip></el-table-column>-->
       <!--        <el-table-column label="所属分库" prop="invSubStorageName"-->
@@ -68,10 +67,24 @@
       v-if="modifySpaceVisible"
     >
       <el-form :model="formData" :rules="rules" ref="formData" label-width="80px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="code" label="仓库编码">
+              <el-input v-model="formData.invWarehouseCode" disabled auto-complete="off" style="width: 90%"
+                         ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="name" label="仓库名称">
+              <el-input v-model="formData.invName" disabled auto-complete="off" style="width: 90%"
+                        ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="11">
             <el-form-item prop="code" label="货位编码">
-              <el-input v-model="formData.code" auto-complete="off" style="width: 90%"
+              <el-input v-model="formData.code" disabled auto-complete="off" style="width: 90%"
                         placeholder="请输入货位编码" clearable></el-input>
             </el-form-item>
           </el-col>
@@ -83,12 +96,6 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="11">
-            <el-form-item prop="remark" label="货位分类">
-              <el-input v-model="formData.type" auto-complete="off" style="width: 90%"
-                        placeholder="请输入货位分类" clearable></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="11">
             <el-form-item prop="status" label="启用状态">
               <el-radio v-model="formData.status" :label="1">启用</el-radio>
@@ -171,13 +178,11 @@ export default {
         type: null,
         invStorageCode: this.invInfo.invStorageCode,
         invWarehouseCode: this.invInfo.invWarehouseCode,
+        invName: this.invInfo.invName,
         status: 1,
         remark: null
       },
       rules: {
-        code: [
-          {required: true, message: "请输入货位编码", trigger: "blur"}
-        ],
         name: [
           {required: true, message: "请输入货位名称", trigger: "blur"}
         ],
@@ -291,6 +296,7 @@ export default {
         type: null,
         invStorageCode: this.invInfo.invStorageCode,
         invWarehouseCode: this.invInfo.invWarehouseCode,
+        invName: this.invInfo.invName,
         status: 1,
         remark: null
       }

src/views/remind/supCertRemindMsg.vue

@@ -23,21 +23,20 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+          <!--          <el-col :span="6">-->
-          <el-col :span="6">
+          <!--            <el-form-item class="query-form-item" label="忽略状态:">-->
-            <el-form-item class="query-form-item" label="忽略状态:">
+          <!--              <el-select v-model="filterQuery.ignoreStatus"-->
-              <el-select v-model="filterQuery.ignoreStatus"
+          <!--                         placeholder="请选择消息忽略状态"-->
-                         placeholder="请选择消息忽略状态"
+          <!--                         clearable-->
-                         clearable
+          <!--                         style="width: 90%"-->
-                         style="width: 90%"
+          <!--              >-->
-              >
+          <!--                <el-option label="不忽略" :value="0"></el-option>-->
-                <el-option label="不忽略" :value="0"></el-option>
+          <!--                <el-option label="忽略7天" :value="1"></el-option>-->
-                <el-option label="忽略7天" :value="1"></el-option>
+          <!--                <el-option label="忽略15天" :value="2"></el-option>-->
-                <el-option label="忽略15天" :value="2"></el-option>
+          <!--                <el-option label="忽略30天" :value="3"></el-option>-->
-                <el-option label="忽略30天" :value="3"></el-option>
+          <!--              </el-select>-->
-              </el-select>
+          <!--            </el-form-item>-->
-            </el-form-item>
+          <!--          </el-col>-->
-          </el-col>
 
           <el-col :span="6">
             <el-form-item class="query-form-item" label="预警类型:">
@@ -68,16 +67,13 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column :label="msgName" prop="name" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column :label="msgName" prop="name" width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column label="证书名称" prop="certName" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="证书名称" prop="certName" width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生效期" prop="vailDate" width="120"></el-table-column>
+        <el-table-column label="有效期" prop="vailDate" width="120"></el-table-column>
         <el-table-column label="失效期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column label="消息状态" prop="status" width="100">
+        <el-table-column label="消息状态" prop="status" width="120">
           <template slot-scope="scope">
-            <el-tag :type="statusFilterType(scope.row.status)">{{
+            <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
-                statusMap[scope.row.status]
-              }}
-            </el-tag>
           </template>
         </el-table-column>
         <!--        <el-table-column label="忽略预警" prop="ignoreStatus" width="100">-->
@@ -85,13 +81,15 @@
         <!--            <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column label="预警类型" prop="type" width="150">
+
+        <el-table-column label="预警次数" prop="remindCount" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="预警类型" prop="type" width="120">
           <template slot-scope="scope">
-            <el-tag type="danger">{{ typeMap[scope.row.type] }}</el-tag>
+            <el-tag>{{ typeMap[scope.row.type] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="预警内容" prop="msg" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="预警内容" prop="msg" show-overflow-tooltip width="250"></el-table-column>
-        <el-table-column label="处理方式" prop="handleMsg" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="处理结果" prop="handleMsg" show-overflow-tooltip width="200"></el-table-column>
         <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -139,6 +137,68 @@
         <el-button type="warning" size="medium" style="margin-right: 20px;" @click="ignore(3)">忽略30天</el-button>
       </el-row>
     </el-dialog>
+
+
+    <el-dialog
+      v-if="confirmVisible"
+      title="预警消息处理"
+      :visible.sync="confirmVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="65%"
+      top="5vh"
+    >
+      <el-form :model="confirmQuery" label-width="100px" style="margin-bottom: -15px">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" :label="msgName">
+              <el-input v-model="confirmQuery.name" style="width: 90%" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="证书名称:">
+              <el-input v-model="confirmQuery.certName" style="width: 90%" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="预警次数:">
+              <el-input v-model="confirmQuery.remindCount" style="width: 90%" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="预警类型:">
+              <el-select v-model="confirmQuery.type" style="width: 90%" placeholder="预警类型" disabled>
+                <el-option label="配送企业资质预警" :value="1"></el-option>
+                <el-option label="生产企业资质预警" :value="2"></el-option>
+                <el-option label="产品资质预警" :value="3"></el-option>
+              </el-select>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-form-item label="预警详情:" prop="msg">
+            <el-input v-model="confirmQuery.msg" auto-complete="off" type="textarea" disabled autosize></el-input>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="处理方式:" prop="handleMsg">
+            <el-input v-model="confirmQuery.handleMsg" auto-complete="off" type="textarea" autosize></el-input>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="closeDialog">取消</el-button>
+        <el-button type="primary" @click.native="postConfirm()"
+        >提交
+        </el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -183,8 +243,10 @@ export default {
       msgNameMap: {
         1: "配送企业名称",
         2: "生产企业名称",
-        3: "产品名称"
+        3: "物资名称"
-      }
+      },
+      confirmVisible: false,
+      confirmQuery: {},
     };
   },
   methods: {
@@ -229,26 +291,28 @@ export default {
           this.total = 0;
         });
     },
+
+
     confirmMsg(row) {
-      this.$prompt('请输入处理方式', '提示', {
+      this.confirmVisible = true;
-        confirmButtonText: '确定',
+      this.confirmQuery = row;
-        cancelButtonText: '取消',
+    },
-      }).then(({value}) => {
+    postConfirm() {
-        let params = {
+      confirmMsg(this.confirmQuery).then((res) => {
-          id: row.id,
+        if (res.code === 20000) {
-          handleMsg: value
+          this.confirmVisible = false;
-        };
+          this.$message.success("已确认");
-        confirmMsg(params).then((res) => {
+          this.getList();
-          if (res.code === 20000) {
+        } else {
-            this.$message.success("已确认");
+          this.$message.error(res.message);
-            this.getList();
+        }
-          } else {
+      })
-            this.$message.error(res.message);
+    },
-          }
+
-        })
+    closeDialog() {
-      }).catch(() => {
+      this.confirmVisible = false;
-      });
     },
+
     ignoreMsg(row) {
       this.ignoreVisible = true;
       this.currentId = row.id;
@@ -273,13 +337,7 @@ export default {
     },
     typeChange(val) {
       this.msgName = this.msgNameMap[val];
-    },
+    }
-    statusFilterType(status) {
-      const statusMap = {
-        1: "warning",
-        2: "success",
-      };
-    },
   },
   created() {
     // 加载表格数据

src/views/system/dept/invWarehouse.vue

@@ -481,6 +481,7 @@ export default {
       currentInvInfo: {
         invStorageCode: null,
         invWarehouseCode: null,
+        invName: null
       },
       sysList: [],
       sysSubList: [],
@@ -505,7 +506,8 @@ export default {
 
       this.currentInvInfo = {
         invStorageCode: null,
-        invWarehouseCode: null
+        invWarehouseCode: null,
+        invName: null
       };
     },
     onResetintent(){
@@ -836,6 +838,7 @@ export default {
       this.currentInvInfo = {
         invStorageCode: row.parentId,
         invWarehouseCode: row.code,
+        invName: row.name,
         flag: row.id,
         page: 1
       };