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

Merge branch 'master' of http://116.204.71.86:3000/UDI/udiwms-vue-frame

Browse Source
prod
CTP 2 years ago
parent 43100c9245 e101bbf8b8
commit 316b65985f
11 changed files with 128 additions and 23 deletions
Show Stats Download Patch File Download Diff File

3
src/components/Pagination/index.vue
Unescape Escape View File

@ -96,7 +96,8 @@ export default {
handleCurrentChange(val) {
this.$emit('pagination', { page: val, limit: this.pageSize })
if (this.autoScroll) {
scrollTo(0, 800)
//分页向上滚动效果
// scrollTo(0, 800)
}
}
}

20
src/views/basic/busType/bussinessTypeModify.vue
Unescape Escape View File

@ -529,10 +529,10 @@
<el-select v-model="inputQuery.checkWebNew" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -551,7 +551,7 @@
<el-select v-model="inputQuery.checkPdaUn" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@ -573,7 +573,7 @@
<el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@ -595,7 +595,7 @@
<el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@ -617,7 +617,7 @@
<el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@ -639,7 +639,7 @@
<el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@ -660,7 +660,7 @@
<el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@ -682,7 +682,7 @@
<el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
placeholder="是否启用"
>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@ -703,7 +703,7 @@
<el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>

6
src/views/basic/product/UdiInfoSelectLocalUdi.vue
Unescape Escape View File

@ -558,15 +558,17 @@ export default {
let selectData = this.multipleUdiSelection;
let selected = null;
if (this.multipleUdiSelection.length == 0) {
this.$message.warning('请选入产品!');
if (this.relId != null) {
this.combineQuery.relId = this.relId;
this.combineQuery.keys.push(this.currentRow.uuid);
if (this.currentRow.check) {
selected = this.currentRow;
}
} else
} else{
this.$message.warning('请选入产品!');
return;
}
} else {
selectData.forEach((obj) => {

20
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -39,7 +39,7 @@
auto-complete="off"
style="width: 90%"
clearable
:disabled="corpOrderIdDisabled"
:disabled="true"
></el-input>
</el-form-item>
</el-col>
@ -643,6 +643,24 @@ export default {
this.$message.warning("请选择单据类型！");
return;
}
if(this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)){
if(this.$isBlank(this.orderFormData.fromCorp)){
this.$message.warning("请选择往来单位！");
return;
}
}
if(this.curAction.corpType == 3){
if(this.$isBlank(this.orderFormData.fromInvCode)){
this.$message.warning("请选择往来单位！");
return;
}
}
if(this.curAction.corpType === 1 && this.curAction.genUnit){
if(this.$isBlank(this.orderFormData.fromCorp)){
this.$message.warning("请选择往来单位！");
return;
}
}
if (this.$isBlank(this.orderFormData.corpOrderId)) {
let date = new Date();
this.orderFormData.corpOrderId =

2
src/views/inout/IoDealOrder.vue
Unescape Escape View File

@ -588,6 +588,8 @@ export default {
})
.then(() => {
this.deleteOrders(rowId);
this.currentRow=null;
this.bizDetailList=[];
})
.catch(() => {
});

24
src/views/inout/receive/receiveAdd.vue
Unescape Escape View File

@ -22,7 +22,13 @@
</el-col>
<el-col :span="8">
<el-form-item label="往来信息:">
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息" style="width: 100%;">
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
filterable
remote
reserve-keyword
:remote-method="finCorpList"
:loading="loading"
style="width: 100%;">
<el-option
v-for="item in corpList"
:key="item.code"
@ -74,7 +80,7 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
<el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
<el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">
新增单据
</el-button>
</el-button-group>
@ -381,12 +387,20 @@ export default {
.catch(() => {
});
},
finCorpList(){
filterSubAll({})
finCorpList(val){
let query ={
name : val,
page : 1,
limit : 10,
}
filterSubAll(query)
.then((response) => {
this.loading = false;
this.corpList = response.data || [];
})
.catch(() => {
this.loading = false;
this.corpList = [];
});
},
@ -399,7 +413,7 @@ export default {
created() {
this.finCurInv();
this.getBusType();
this.finCorpList();
// this.finCorpList();
},
};
</script>

35
src/views/inout/receive/receiveAudit.vue
Unescape Escape View File

@ -22,7 +22,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="往来信息:">
<el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来信息" clearable></el-input>
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
filterable
remote
reserve-keyword
:remote-method="finCorpList"
:loading="loading"
style="width: 100%;">
<el-option
v-for="item in corpList"
:key="item.code"
:label="item.name"
:value="item.code">
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
@ -135,7 +148,7 @@
import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
import auditDetail from "@/views/inout/receive/receiveAuditDetail"
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
export default {
data() {
@ -164,6 +177,7 @@ export default {
total: 0,
thirdSys: [],
invList:[],
corpList:[],
thirdSysDetail: null,
busTypes: [],
originTypes: [],
@ -291,6 +305,23 @@ export default {
this.idQuery=row;
this.newSpDistributionVisible = true;
},
finCorpList(val){
let query ={
name : val,
page : 1,
limit : 10,
}
filterSubAll(query)
.then((response) => {
this.loading = false;
this.corpList = response.data || [];
})
.catch(() => {
this.loading = false;
this.corpList = [];
});
},
finCurInv() {
this.invList = [];
let query = {

35
src/views/inout/receive/receiveSearch.vue
Unescape Escape View File

@ -22,7 +22,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="往来信息:">
<el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来信息" clearable></el-input>
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
filterable
remote
reserve-keyword
:remote-method="finCorpList"
:loading="loading"
style="width: 100%;">
<el-option
v-for="item in corpList"
:key="item.code"
:label="item.name"
:value="item.code">
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
@ -154,7 +167,7 @@
import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
import auditDetail from "@/views/inout/receive/receiveAuditDetail"
import {delReceive} from "@/api/thrsys/thrOrderReceive";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
export default {
data() {
@ -188,6 +201,7 @@ export default {
busTypes: [],
originTypes: [],
list: [],
corpList:[],
detailList: [],
uploadFileUrl: null,
fileList: [],
@ -369,6 +383,23 @@ export default {
this.filterQuery.page = val.page;
this.getList();
},
finCorpList(val){
let query ={
name : val,
page : 1,
limit : 10,
}
filterSubAll(query)
.then((response) => {
this.loading = false;
this.corpList = response.data || [];
})
.catch(() => {
this.loading = false;
this.corpList = [];
});
},
finCurInv() {
this.invList = [];
let query = {

1
src/views/purchase/purPlan/purPlan.vue
Unescape Escape View File

@ -272,6 +272,7 @@ export default {
} else {
this.newSpDistributionVisible = false
}
this.getList();
},
getId(id) {
if (this.formName == 'add' && id != null) {

2
src/views/purchase/purPlan/purPlanEditDialog.vue
Unescape Escape View File

@ -459,6 +459,8 @@ export default {
this.invCodeList = response.data || [];
if (this.invCodeList != null && this.invCodeList.length == 1) {
this.formData.invCode = this.invCodeList[0].code;
this.formData.deptCode = this.invCodeList[0].parentId;
}
})
.catch(() => {

3
src/views/system/dept/invWarehouse.vue
Unescape Escape View File

@ -559,6 +559,7 @@ export default {
if (formName === "edit") {
this.subData = JSON.parse(JSON.stringify(data));
this.subData.advanceType = this.subData.advanceType.toString();
this.query.advanceType=1;
if (this.subData.parentCode != null && this.subData.parentCode != "") {
this.isAdvanceTypeShow = true;
this.isShow = false;
@ -612,6 +613,7 @@ export default {
},
hideForm() { // 新增，编辑---取消
this.query.advanceType=null;
this.formVisible = false;
this.subFormVisible = false;
this.resetForm();
@ -628,6 +630,7 @@ export default {
}
},
forInvSubmit() { // 新增，编辑---提交
this.subData.advanceType=1;
this.$refs["dataForm"].validate(valid => {
if (valid) {
saveSubWarehouse(this.subData, this.formName).then((response) => {

Write Preview
Loading…
Cancel
Save