|
|
|
@ -73,7 +73,7 @@
|
|
|
|
<el-form-item style="margin-right: 50px; margin-left: auto">
|
|
|
|
<el-form-item style="margin-right: 50px; margin-left: auto">
|
|
|
|
<el-button-group>
|
|
|
|
<el-button-group>
|
|
|
|
<el-button type="primary" icon="search" @click="mergesOrders">合并单据</el-button>
|
|
|
|
<el-button type="primary" icon="search" @click="mergesOrders">合并单据</el-button>
|
|
|
|
<el-button type="primary" icon="search" @click="addOrders">新增订单</el-button>
|
|
|
|
<el-button type="primary" icon="search" @click="addOrders">新增单据</el-button>
|
|
|
|
<el-button type="primary" icon="search" @click="errOrders">异常单据</el-button>
|
|
|
|
<el-button type="primary" icon="search" @click="errOrders">异常单据</el-button>
|
|
|
|
|
|
|
|
|
|
|
|
</el-button-group>
|
|
|
|
</el-button-group>
|
|
|
|
@ -82,7 +82,7 @@
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
</el-form>
|
|
|
|
</el-form>
|
|
|
|
|
|
|
|
|
|
|
|
<el-table v-loading="loading" :data="list" style="width: 100%"
|
|
|
|
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
|
|
|
|
@selection-change="handleSelectionChange">
|
|
|
|
@selection-change="handleSelectionChange">
|
|
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
|
|
<el-table-column label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column label="序号" type="index"></el-table-column>
|
|
|
|
@ -220,7 +220,7 @@
|
|
|
|
</el-dialog>
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
<el-dialog
|
|
|
|
title="新增订单"
|
|
|
|
title="新增单据"
|
|
|
|
:visible.sync="addOrderVisible"
|
|
|
|
:visible.sync="addOrderVisible"
|
|
|
|
width="75%" append-to-body
|
|
|
|
width="75%" append-to-body
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
@ -426,7 +426,7 @@ export default {
|
|
|
|
.then((response) => {
|
|
|
|
.then((response) => {
|
|
|
|
this.storageList = response.data || [];
|
|
|
|
this.storageList = response.data || [];
|
|
|
|
if (this.storageList.length > 0) {
|
|
|
|
if (this.storageList.length > 0) {
|
|
|
|
this.invChange();
|
|
|
|
this.getSubInvList();
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
@ -540,17 +540,17 @@ export default {
|
|
|
|
let unit = repeatData[0].fromCorp;
|
|
|
|
let unit = repeatData[0].fromCorp;
|
|
|
|
let action = repeatData[0].action;
|
|
|
|
let action = repeatData[0].action;
|
|
|
|
let orderList = [];
|
|
|
|
let orderList = [];
|
|
|
|
repeatData.forEach((obj, index) => {
|
|
|
|
for (let index in repeatData) {
|
|
|
|
if (unit !== obj.fromCorp) {
|
|
|
|
if (action !== repeatData[index].action) {
|
|
|
|
this.$message.warning("往来单位不一致！");
|
|
|
|
this.$message.warning("业务类型不一致！");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (action !== obj.action) {
|
|
|
|
if (unit !== repeatData[index].fromCorp) {
|
|
|
|
this.$message.warning("业务类型不一致！");
|
|
|
|
this.$message.warning("往来单位不一致！");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
orderList.push(obj.id);
|
|
|
|
orderList.push(repeatData[index].id);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
let tquery = {
|
|
|
|
let tquery = {
|
|
|
|
orderList: orderList,
|
|
|
|
orderList: orderList,
|
|
|
|
type: 2,
|
|
|
|
type: 2,
|
|
|
|
@ -668,6 +668,20 @@ export default {
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
getSubInvList() {
|
|
|
|
|
|
|
|
let query = {
|
|
|
|
|
|
|
|
pcode: this.filterQuery.locStorageCode
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
filterSubByInv(query)
|
|
|
|
|
|
|
|
.then((response) => {
|
|
|
|
|
|
|
|
this.subInvList = response.data || [];
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.catch(() => {
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
subInvChange() {
|
|
|
|
subInvChange() {
|
|
|
|
this.getBusType();
|
|
|
|
this.getBusType();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
