-
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -19,9 +19,36 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -38,21 +65,22 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -74,6 +102,7 @@ import {addDetail} from "@/api/inout/receiveOrder";
import {addBizProduct} from "@/api/inout/orderDetailCode";
import {getInvPreInProduct, getInvPreInProductStock} from "@/api/inventory/invPreInSearch";
import {getInvPreProduct, getInvPreProductStock} from "@/api/inventory/invPreProduct";
+import {finProductSet} from "@/api/param/systemParamConfig";
export default {
@@ -130,6 +159,7 @@ export default {
idQuery: null,
showSup: false,
fromOptions: [],
+ productRemarkSet: {},
};
},
components: {},
@@ -173,7 +203,7 @@ export default {
getList() {
this.loading = true;
//寄售
- if(this.invQueryData.advanceType==3){
+ if (this.invQueryData.advanceType == 3) {
getInvPreProductStock(this.filterQuery)
.then((response) => {
this.showSup = response.data.showSup;
@@ -186,8 +216,8 @@ export default {
this.list = [];
this.total = 0;
});
- //预验收
- }else if(this.invQueryData.advanceType==2){
+ //预验收
+ } else if (this.invQueryData.advanceType == 2) {
getInvPreInProductStock(this.filterQuery)
.then((response) => {
this.showSup = response.data.showSup;
@@ -201,7 +231,7 @@ export default {
this.total = 0;
});
- }else{
+ } else {
getInvProductStock(this.filterQuery)
.then((response) => {
this.showSup = response.data.showSup;
@@ -226,16 +256,16 @@ export default {
return;
}
var idster = [];
- if(this.codeArray != null || this.codeArray!=undefined ){
- if(this.codeArray.length>0){
- for(var i=0;i 0) {
+ for (var i = 0; i < this.codeArray.length; i++) {
idster.push(this.codeArray[i].relIdFk);
}
}
- if(idster.length>0){
- for(var i=0;i 0) {
+ for (var i = 0; i < idster.length; i++) {
+ for (var j = 0; j < selection.length; j++) {
+ if (idster[i] == selection[j].relIdFk) {
this.$message.error("该产品已录入！");
return
}
@@ -293,8 +323,14 @@ export default {
this.loading = false;
});
}
+ },
-
+ findBasicProductSet() {
+ finProductSet().then((response) => {
+ if (response.code == 20000) {
+ this.productRemarkSet = response.data;
+ }
+ });
},
},
filters: {
@@ -313,6 +349,7 @@ export default {
};
},
created() {
+ this.findBasicProductSet();
this.filterQuery.invCode = this.invQueryData.targetInvCode;
// 加载表格数据
this.getList();
diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index 3b3fec3f..1650efa6 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -6,48 +6,48 @@
v-show="showSearch"
label-width="100px">
-
+
-
+
-
-
-
-
- {{ item.originAction }}
- {{
- item.originName
- }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
@@ -112,13 +111,13 @@
-
-
+
+
-
+
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index e8eb5571..295c676e 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -175,7 +175,7 @@
>删除
-
+
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index 497e0726..b1f07c85 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -4,16 +4,16 @@
草稿保存
提交单据
@@ -29,13 +29,13 @@
@@ -50,10 +50,10 @@
:disabled="codeArray.length>0"
clearable>
+ v-for="item in invList"
+ :key="item.name"
+ :label="item.name"
+ :value="item.code">
@@ -62,14 +62,13 @@
+ v-for="item in fromOptions"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code">
@@ -107,10 +106,10 @@
产品录入
@@ -140,10 +139,12 @@
- 保存
- 编辑
@@ -178,7 +179,7 @@
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index 114c0040..a3fe5800 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -10,7 +10,7 @@
- {
this.invList = response.data || [];
// if (this.invList.length > 0) {
@@ -470,6 +471,7 @@ export default {
},
created() {
this.finCurInv();
+ this.getList();
},
};
diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue
index f0771822..e766246c 100644
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@@ -152,7 +152,8 @@ export default {
deptCode: null,
invCode: null,
page: 1,
- limit: 10
+ limit: 10,
+ price: null,
},
list: [],
total: 0,
@@ -167,8 +168,14 @@ export default {
});
this.invPreProductDetailQuery = {
code: null,
+ relId: null,
+ supId: null,
+ batchNo: null,
+ deptCode: null,
+ invCode: null,
page: 1,
- limit: 10
+ limit: 10,
+ price: null,
};
this.getList();
},
@@ -206,7 +213,7 @@ export default {
this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
- this.invProductDetailQuery.price = this.inputQuery.price;
+ this.invPreProductDetailQuery.price = this.inputQuery.price;
// this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
getInvPreInProductDetail(this.invPreProductDetailQuery).then((res) => {
diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue
index 7e7d199e..ed73aba7 100644
--- a/src/views/inventory/InvPreProductsDetail.vue
+++ b/src/views/inventory/InvPreProductsDetail.vue
@@ -153,6 +153,7 @@ export default {
invCode: null,
page: 1,
limit: 10,
+ price:null,
defaultSort: {prop: 'orderTime', order: 'desc'},
},
list: [],
@@ -167,8 +168,15 @@ export default {
});
this.invPreProductDetailQuery = {
code: null,
+ relId: null,
+ supId: null,
+ batchNo: null,
+ deptCode: null,
+ invCode: null,
page: 1,
- limit: 10
+ limit: 10,
+ price:null,
+ defaultSort: {prop: 'orderTime', order: 'desc'},
};
this.getList();
},
@@ -205,7 +213,7 @@ export default {
this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
- this.invProductDetailQuery.price = this.inputQuery.price;
+ this.invPreProductDetailQuery.price = this.inputQuery.price;
// this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
getInvPreProductDetail(this.invPreProductDetailQuery).then((res) => {
this.loading = false;
diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue
index 3b188e26..5a089fc8 100644
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -149,6 +149,7 @@ export default {
batchNo: null,
deptCode: null,
invCode: null,
+ price:null,
page: 1,
limit: 10
},
@@ -165,6 +166,12 @@ export default {
});
this.invProductDetailQuery = {
code: null,
+ relId: null,
+ supId: null,
+ batchNo: null,
+ deptCode: null,
+ invCode: null,
+ price:null,
page: 1,
limit: 10
};
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index f7089912..55f447ed 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -38,14 +38,14 @@
-
+
-
-
+
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 4d082a71..c5076ed1 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -80,7 +80,7 @@
-