@@ -1314,7 +1345,7 @@ export default {
// this.inputQuery.actionType = null
// }
- // // 联动修改允许手动输入客户信息 有bug允许手动输入一直为false
+ // 联动修改允许手动输入客户信息值
// if (this.inputQuery.corpType != 1 || this.inputQuery.mainAction != "WarehouseOut") {
// this.inputQuery.genUnit = false;
// }
diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index 1601c3ab..9cee0051 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -1,16 +1,16 @@
-
+
-
+
-
+
-
+
-
-
+
@@ -99,9 +100,10 @@
-
+
- 审核
@@ -162,9 +164,10 @@ export default {
page: 1,
limit: 10,
corpName: null,
- invCode:'',
+ invCode: '',
type: 2,
editStatus: 2,
+ targetInvCode: null,
},
statusMap: {
1: "草稿",
@@ -172,12 +175,12 @@ export default {
3: "已审核",
4: "已拒绝"
},
- idQuery:null,
- newSpDistributionVisible:false,
+ idQuery: null,
+ newSpDistributionVisible: false,
total: 0,
thirdSys: [],
- invList:[],
- corpList:[],
+ invList: [],
+ corpList: [],
thirdSysDetail: null,
busTypes: [],
originTypes: [],
@@ -188,7 +191,7 @@ export default {
uploadData: {
thirdSys: "thirdId",
},
- invCodebe:null,
+ invCodebe: null,
loading: false,
actDateRange: [],
pickerOptions: {
@@ -240,7 +243,7 @@ export default {
page: 1,
limit: 10,
corpName: null,
- invCode: this.invCodebe,
+ targetInvCode: this.invCodebe,
type: 2,
editStatus: 2,
};
@@ -252,7 +255,7 @@ export default {
this.filterQuery.page = 1;
this.getList();
},
- closeDialog(){
+ closeDialog() {
this.newSpDistributionVisible = false;
this.getList();
},
@@ -274,7 +277,7 @@ export default {
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
- this.detailList=[]
+ this.detailList = []
} else {
this.$message.error(response.message);
}
@@ -287,7 +290,7 @@ export default {
});
},
handleDetail(row) {
- var query={};
+ var query = {};
query.orderIdFk = row.billNo;
getOrderDetail(query) //查找该单号下的所有条码
.then((response) => {
@@ -302,14 +305,14 @@ export default {
this.getList();
},
auditDialog(row) {
- this.idQuery=row;
+ this.idQuery = row;
this.newSpDistributionVisible = true;
},
- finCorpList(val){
- let query ={
- name : val,
- page : 1,
- limit : 10,
+ finCorpList(val) {
+ let query = {
+ name: val,
+ page: 1,
+ limit: 10,
}
filterSubAll(query)
.then((response) => {
@@ -330,9 +333,9 @@ export default {
findInvByUser(query)
.then((response) => {
this.invList = response.data || [];
- if(this.invList.length>0){
- this.filterQuery.invCode=this.invList[0].code
- this.invCodebe=this.filterQuery.invCode
+ if (this.invList.length > 0) {
+ this.filterQuery.targetInvCode = this.invList[0].code
+ this.invCodebe = this.filterQuery.targetInvCode
}
this.getList();
})
@@ -346,7 +349,7 @@ export default {
mounted() {
},
created() {
- this.finCurInv();
+ this.finCurInv();
},
};
diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index bf3b0816..59379303 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -245,6 +245,13 @@
+
+
+
+
+
+
+
@@ -747,6 +754,7 @@ export default {
busChangeConfig: null,
udiCodeLost: null,
udiCodeRel: null,
+ orderInvoice: null,
},
checkedBusTypes: [],
checkedToInBusTypes: [],