UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww'

Browse Source
prod
wangwei 2 years ago
parent 471cbc3b50 b9f5e5c20a
commit 0b9caeb230
12 changed files with 98 additions and 24 deletions
Show Stats Download Patch File Download Diff File

10
src/views/thirdSys/busType/index.vue
Unescape Escape View File

@ -142,6 +142,7 @@ export default {
page: 1,
limit: 20,
},
mainThirdSys:'',
addDialogVisible: false,
modifyDialogVisible: false,
list: [],
@ -174,7 +175,7 @@ export default {
path: "",
});
this.filterQuery = {
thirdSys: "thirdId",
thirdSys: this.mainThirdSys,
name: null,
enable: null,
page: 1,
@ -211,7 +212,12 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.getThirdSysDetail();
})
.catch(() => {

10
src/views/thirdSys/corps/thrCorpSelect.vue
Unescape Escape View File

@ -105,6 +105,7 @@ export default {
limit: 20,
isDownThrSys: null,
},
mainThirdSys:'',
total: 0,
list: [],
thirdSys: [],
@ -127,7 +128,7 @@ export default {
thrCorpEntities: [],
unitId: null,
name: null,
thirdSys: null,
thirdSys: this.mainThirdSys,
page: 1,
limit: 20,
isDownThrSys: null,
@ -167,7 +168,12 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.uploadData.thirdSys = this.filterQuery.thirdSys;
this.getThirdSysDetail();
this.selectSysParam();

10
src/views/thirdSys/corps/thrCorps.vue
Unescape Escape View File

@ -92,6 +92,7 @@ export default {
page: 1,
limit: 20,
},
mainThirdSys:'',
total: 0,
list: [],
thirdSys: [],
@ -113,7 +114,7 @@ export default {
this.filterQuery = {
unitId: null,
name: null,
thirdSys: null,
thirdSys: this.mainThirdSys,
page: 1,
limit: 20,
};
@ -210,7 +211,12 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.uploadData.thirdSys = this.filterQuery.thirdSys;
this.getThirdSysDetail();
this.selectSysParam();

10
src/views/thirdSys/corps/thrCorpsImport.vue
Unescape Escape View File

@ -138,6 +138,7 @@ export default {
limit: 20,
thirdSysFk: null,
},
mainThirdSys:'',
udiImportDetailVisible: false,
thrCorpSelectVisible: false,
checked: false,
@ -179,7 +180,7 @@ export default {
status: null,
page: 1,
limit: 20,
thirdSysFk: null,
thirdSysFk: this.mainThirdSys,
};
this.getList();
},
@ -265,7 +266,12 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSysFk = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
this.getList();
this.getThirdSysDetail();

9
src/views/thirdSys/inv/index.vue
Unescape Escape View File

@ -315,6 +315,7 @@ export default {
parentId: null,
thirdSysFk: null,
},
mainThirdSys:'',
mergeList: [],
subList: [],
subData: {},
@ -409,7 +410,7 @@ export default {
status: "",
page:1,
limit:20,
thirdSysFk: null
thirdSysFk: this.mainThirdSys
};
this.getList();
},
@ -649,6 +650,12 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.query.thirdSysFk = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.getThirdSysDetail();
})
.catch(() => {

10
src/views/thirdSys/invProducts/thrInvProducts.vue
Unescape Escape View File

@ -124,6 +124,7 @@ export default {
limit: 100,
filterCount: null,
},
mainThirdSys:'',
total: 0,
list: [],
thirdSys: [],
@ -144,7 +145,7 @@ export default {
this.filterQuery = {
inventoryCode: null,
inventoryName: null,
thirdSys: null,
thirdSys: this.mainThirdSys,
spec: null,
registerCertNo: null,
manufactory: null,
@ -250,7 +251,12 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.uploadData.thirdSys = this.filterQuery.thirdSys;
this.getThirdSysDetail();
this.selectSysParam();

10
src/views/thirdSys/invProducts/thrInvProductsImport.vue
Unescape Escape View File

@ -185,6 +185,7 @@ export default {
limit: 20,
thirdSysFk: null,
},
mainThirdSys:'',
selectType: 0,
udiImportDetailVisible: false,
thrInvProductsSelectVisible: false,
@ -227,7 +228,7 @@ export default {
status: null,
page: 1,
limit: 20,
thirdSysFk: null,
thirdSysFk: this.mainThirdSys,
};
this.getList();
},
@ -311,7 +312,12 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSysFk = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
this.getList();
this.getThirdSysDetail();

10
src/views/thirdSys/invProducts/thrInvProductsSelect.vue
Unescape Escape View File

@ -136,6 +136,7 @@
limit: 100,
filterCount:null,
},
mainThirdSys:'',
total: 0,
list: [],
thirdSys: [],
@ -157,7 +158,7 @@
thrInvProductsEntities:[],
inventoryCode: null,
inventoryName: null,
thirdSys: null,
thirdSys: this.mainThirdSys,
spec: null,
registerCertNo: null,
manufactory: null,
@ -262,7 +263,12 @@
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.uploadData.thirdSys = this.filterQuery.thirdSys;
this.getThirdSysDetail();
this.selectSysParam();

10
src/views/thirdSys/order/thrOrderImport.vue
Unescape Escape View File

@ -138,6 +138,7 @@ export default {
limit: 20,
thirdSysFk: null,
},
mainThirdSys:'',
udiImportDetailVisible: false,
checked: false,
list: [],
@ -180,7 +181,7 @@ export default {
status: null,
page: 1,
limit: 20,
thirdSysFk: null,
thirdSysFk: this.mainThirdSys,
};
this.getList();
},
@ -262,7 +263,12 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSysFk = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
this.getList();
this.getThirdSysDetail();

12
src/views/thirdSys/product/thrProducts.vue
Unescape Escape View File

@ -143,6 +143,7 @@ export default {
page: 1,
limit: 20,
},
mainThirdSys:'',
total: 0,
thirdSys: [],
thirdSysDetail: null,
@ -190,12 +191,12 @@ export default {
registerNo: null,
manufactory: null,
name: "",
thirdSys: this.thirdSys[0].thirdId,
thirdSys: this.mainThirdSys,
page: 1,
limit: 20,
};
this.getList();
this.filterQuery.thirdSys ="";
},
hideSearch() {
this.showSearch = !this.showSearch;
@ -267,7 +268,12 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.uploadData.thirdSys = this.filterQuery.thirdSys;
this.getThirdSysDetail();
this.selectSysParam();

11
src/views/thirdSys/product/thrProductsImport.vue
Unescape Escape View File

@ -145,6 +145,7 @@ export default {
limit: 20,
thirdSysFk: null,
},
mainThirdSys:'',
udiImportDetailVisible: false,
thrProductsSelectVisible: false,
checked: false,
@ -186,7 +187,7 @@ export default {
status: null,
page: 1,
limit: 20,
thirdSysFk: null,
thirdSysFk: this.mainThirdSys,
};
this.getList();
},
@ -280,7 +281,13 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
this.filterQuery.thirdSysFk = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
this.getList();
this.getThirdSysDetail();

10
src/views/thirdSys/product/thrProductsSelect.vue
Unescape Escape View File

@ -143,6 +143,7 @@ export default {
limit: 10,
isDownThrSys: null,
},
mainThirdSys:'',
total: 0,
thirdSys: [],
thirdSysDetail: null,
@ -166,7 +167,7 @@ export default {
thrProductsEntities: [],
code: null,
name: "",
thirdSys: "",
thirdSys: this.mainThirdSys,
page: 1,
limit: 20,
};
@ -263,7 +264,12 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
}
this.uploadData.thirdSys = this.filterQuery.thirdSys;
this.getThirdSysDetail();
this.selectSysParam();

Write Preview
Loading…
Cancel
Save