diff --git a/src/views/inout/stat/IoStatDaySearch.vue b/src/views/inout/stat/IoStatDaySearch.vue
index 871f5fa4..9119522c 100644
--- a/src/views/inout/stat/IoStatDaySearch.vue
+++ b/src/views/inout/stat/IoStatDaySearch.vue
@@ -112,29 +112,29 @@
row-key="id"
>
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/src/views/inout/stat/IoStatMonthSearch.vue b/src/views/inout/stat/IoStatMonthSearch.vue
index 3c4d0126..5e993611 100644
--- a/src/views/inout/stat/IoStatMonthSearch.vue
+++ b/src/views/inout/stat/IoStatMonthSearch.vue
@@ -108,21 +108,31 @@
row-key="id"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ :value="item.code">
{{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
显示/隐藏搜索栏
重置
- 查询
-
-
+
+
-
-
-
-
- {{ fromTypeMap[scope.row.orderFromType] }}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
- {{ scope.row.createTime }}
+ {{ scope.row.originReCount - scope.row.reCount }}
-
+
+
+
+
+
+
- 删除
-
+
+ {{ statusMap[scope.row.status] }}
+
+
+
+
+
+
+
+
+
+
+ v-show="codeTotal>0"
+ :total="codeTotal"
+ :page.sync="codeQuery.page"
+ :limit.sync="codeQuery.limit"
+ @pagination="getCodeDetailList"
+ />
-
-
-
-
- 预验收库存详情
-
-
-
-
-
-
-
-
-
-
-
-
- 重置
-
- 查询
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -110,24 +122,26 @@
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
{
this.loading = false;
if (res.code === 20000) {
@@ -360,6 +384,10 @@ export default {
};
},
created() {
+ let supId = this.$store.getters.customerId;
+ if (supId == "110") {
+ this.showSup = true;
+ }
this.findMethod();
this.getInvList();
this.getList();
diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue
index 204c1fa6..db7d874f 100644
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -3,17 +3,16 @@
- 产品名称
+ 物资名称
{{ inputQuery.cpmctymc }}
- 产品标识
+ DI/物资编码
{{ inputQuery.nameCode }}
-
批次号
@@ -41,14 +40,13 @@
-
+
-
-
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -134,37 +134,41 @@
-
-
-
-
-
-
-
- {{ statusMap[scope.row.status] }}
-
-
-
+
+
+
+
+
+
- {{ ignoreStatusMap[scope.row.ignoreStatus] }}
+
+ {{
+ statusMap[scope.row.status]
+ }}
+
+
+
+
+
+
- {{ typeMap[scope.row.type] }}
+ {{ typeMap[scope.row.type] }}
-
+
-
+
-
-
-
+
+
+
确认
- 忽略
-
+
+
+
+
+
+
+
@@ -192,6 +196,77 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
- let params = {
- id: row.id,
- handleMsg: value
- };
- confirmMsg(params).then((res) => {
- if (res.code === 20000) {
- this.$message.success("已确认");
- this.getList();
- } else {
- this.$message.error(res.message);
- }
- })
- }).catch(() => {
- });
+ this.rowData = row;
+ let typeName = this.typeMap[row.type];
+ this.rowData.typeName = typeName;
+ this.handleMsg = null;
+ this.confirmMsgVisible = true;
},
ignoreMsg(row) {
this.ignoreVisible = true;
@@ -421,6 +487,39 @@ export default {
this.currentId = null;
})
},
+ closeConfirmDialog() {
+ this.confirmMsgVisible = false;
+ this.rowData = {}
+ },
+ updateHandleMsg() {
+ let params = {
+ id: this.rowData.id,
+ handleMsg: this.handleMsg
+ };
+ confirmMsg(params).then((res) => {
+ if (res.code === 20000) {
+ this.rowData = {};
+ this.handleMsg = null;
+ this.confirmMsgVisible = false;
+ this.$message.success("已确认");
+ } else {
+ this.$message.error(res.message);
+ }
+ }).catch((error) => {
+ this.rowData = {};
+ this.handleMsg = null;
+ this.confirmMsgVisible = false;
+ this.$message.error(error.message);
+ })
+ },
+
+ statusFilterType(status) {
+ const statusMap = {
+ 1: "warning",
+ 2: "success",
+ };
+ return statusMap[status];
+ },
},
created() {
this.getInvList();