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

业务单据功能界面修改，单据类型修改

Browse Source
master
anthonywj 3 years ago
parent 1b07355857
commit 4308e3c464
16 changed files with 474 additions and 374 deletions
Show Stats Download Patch File Download Diff File

22
src/router/index.js
Unescape Escape View File

@ -755,7 +755,7 @@ export const asyncRouterMap = [
name: "库存统计", name: "库存统计",
icon: "", icon: "",
meta: { meta: {
authRule: ["inv/invProducts"] authRule: ["inv/invStatistics"]
} }
}, },
{ {
@ -1002,16 +1002,16 @@ export const asyncRouterMap = [
authRule: ["spInv/spInvProducts"] authRule: ["spInv/spInvProducts"]
} }
}, },
{ // {
path: "spInvProducts", // path: "spInvProducts",
component: supInvProducts, // component: supInvProducts,
name: "库存统计", // name: "库存统计",
icon: "", // icon: "",
hidden: false, // hidden: false,
meta: { // meta: {
authRule: ["spInv/spInvProducts"] // authRule: ["spInv/spInvProducts"]
} // }
}, // },
{ {
path: "spInvPreProducts", path: "spInvPreProducts",
component: supInvPreProducts, component: supInvPreProducts,

9
src/views/basic/BussinessType.vue
Unescape Escape View File

@ -241,6 +241,10 @@ export default {
this.$message.error("本地单据不能为空！"); this.$message.error("本地单据不能为空！");
return; return;
} }
if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) {
this.$message.error("出入库类型不能为空！");
return;
}
insertBussinessType(this.inputQuery) insertBussinessType(this.inputQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
@ -258,6 +262,11 @@ export default {
this.$message.error("本地单据不能为空！"); this.$message.error("本地单据不能为空！");
return; return;
} }
if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) {
this.$message.error("出入库类型不能为空！");
return;
}
updateBussinessType(this.inputQuery) updateBussinessType(this.inputQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

2
src/views/basic/BussinessTypeLocl.vue
Unescape Escape View File

@ -40,7 +40,7 @@
<span>{{ enableMap[scope.row.enable] }}</span> <span>{{ enableMap[scope.row.enable] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否预入库" prop="advanceType" fixed> <el-table-column label="是否寄售" prop="advanceType" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ enableMap[scope.row.advanceType] }}</span> <span>{{ enableMap[scope.row.advanceType] }}</span>
</template> </template>

13
src/views/basic/BussinessTypeModify.vue
Unescape Escape View File

@ -37,7 +37,7 @@
<span>出入库类型:&nbsp;</span> <span>出入库类型:&nbsp;</span>
</div> </div>
<el-select v-model="inputQuery.mainAction" placeholder="出入库类型"> <el-select v-model="inputQuery.mainAction" placeholder="出入库类型" @change="getOrderType">
<el-option label="入库" value="WareHouseIn"></el-option> <el-option label="入库" value="WareHouseIn"></el-option>
<el-option label="出库" value="WareHouseOut"></el-option> <el-option label="出库" value="WareHouseOut"></el-option>
</el-select> </el-select>
@ -138,7 +138,9 @@
<div class="itemTag"> <div class="itemTag">
<span>补单单据类型:&nbsp;</span> <span>补单单据类型:&nbsp;</span>
</div> </div>
<el-select :disabled="inputQuery.orderTypeEnable" v-model="inputQuery.supplementOrderType" <el-select :disabled="inputQuery.corpType !=1"
v-model="inputQuery.supplementOrderType"
clearable
placeholder="单据类型"> placeholder="单据类型">
<el-option <el-option
v-for="item in orderTypeList" v-for="item in orderTypeList"
@ -373,7 +375,7 @@ export default {
getOrderType() { getOrderType() {
this.orderTypeList = []; this.orderTypeList = [];
let query = { let query = {
id: this.inputQuery.id mainAction: this.inputQuery.mainAction
}; };
getCandidateBussinessType(query).then((response) => { getCandidateBussinessType(query).then((response) => {
this.orderTypeList = response.data || []; this.orderTypeList = response.data || [];
@ -399,9 +401,12 @@ export default {
}, },
created() { created() {
if (this.inputQuery.mainAction != null && this.inputQuery.mainAction != "") {
this.getOrderType();
}
this.getList(); this.getList();
this.getStorage(); this.getStorage();
this.getOrderType();
}, },
}; };
</script> </script>

2
src/views/warehouse/stockDeliveryOrder.vue
Unescape Escape View File

@ -38,7 +38,7 @@
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="250"></el-table-column> <el-table-column label="单据号" prop="billNo" width="250"></el-table-column>
<el-table-column label="供应商名称" prop="corpName" width="250"></el-table-column> <el-table-column label="往来单位" prop="corpName" width="250"></el-table-column>
<el-table-column label="单据日期" prop="billdate" width="100"></el-table-column> <el-table-column label="单据日期" prop="billdate" width="100"></el-table-column>
<el-table-column label="单据状态" width="100"> <el-table-column label="单据状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">

5
src/views/warehouse/stockOrder.vue
Unescape Escape View File

@ -68,7 +68,7 @@
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商名称" prop="corpName" show-overflow-tooltip></el-table-column> <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
<el-table-column label="单据来源" prop="sourceType" width="150"> <el-table-column label="单据来源" prop="sourceType" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ sourceMap[scope.row.sourceType] }}</span> <span>{{ sourceMap[scope.row.sourceType] }}</span>
@ -348,6 +348,9 @@ export default {
data() { data() {
return { return {
query: { query: {
billType:null,
corpName:null,
locStorageCode:null,
billNo: "", billNo: "",
status: "3", status: "3",
page: 1, page: 1,

2
src/views/warehouse/stockOrderDelSearch.vue
Unescape Escape View File

@ -54,7 +54,7 @@
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商名称" prop="corpName" show-overflow-tooltip></el-table-column> <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
<el-table-column label="单据来源" prop="sourceType" width="150"> <el-table-column label="单据来源" prop="sourceType" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ sourceMap[scope.row.sourceType] }}</span> <span>{{ sourceMap[scope.row.sourceType] }}</span>

31
src/views/warehouse/stockOrderEditor.vue
Unescape Escape View File

@ -9,7 +9,33 @@
> >
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.billNo" placeholder="单据号"></el-input> <el-input v-model="query.billNo" placeholder="单据号" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
<el-option
v-for="item in busTypes"
:key="item.localName"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span> <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
@ -476,6 +502,9 @@ export default {
data() { data() {
return { return {
query: { query: {
billType:null,
corpName:null,
locStorageCode:null,
billNo: "", billNo: "",
status: "2", status: "2",
startTime: "", startTime: "",

2
src/views/warehouse/stockOrderError.vue
Unescape Escape View File

@ -27,7 +27,7 @@
@row-click="getStockOrderDetailList"> @row-click="getStockOrderDetailList">
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="250"></el-table-column> <el-table-column label="单据号" prop="billNo" width="250"></el-table-column>
<el-table-column label="供应商名称" prop="corpName" width="250"></el-table-column> <el-table-column label="往来单位" prop="corpName" width="250"></el-table-column>
<el-table-column label="单据日期" prop="billdate" width="100"></el-table-column> <el-table-column label="单据日期" prop="billdate" width="100"></el-table-column>
<el-table-column label="单据状态" width="100"> <el-table-column label="单据状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">

2
src/views/warehouse/stockOrderInCode.vue
Unescape Escape View File

@ -46,7 +46,7 @@
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column> <el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="供应商名称" prop="corpName"></el-table-column> <el-table-column label="往来单位" prop="corpName"></el-table-column>
<el-table-column label="单据来源" prop="sourceType" width="150"> <el-table-column label="单据来源" prop="sourceType" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ sourceMap[scope.row.sourceType] }}</span> <span>{{ sourceMap[scope.row.sourceType] }}</span>

33
src/views/warehouse/stockOrderNew.vue
Unescape Escape View File

@ -9,7 +9,33 @@
> >
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.billNo" placeholder="单据号"></el-input> <el-input v-model="query.billNo" placeholder="单据号" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
<el-option
v-for="item in busTypes"
:key="item.localName"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span> <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
@ -47,7 +73,7 @@
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商名称" prop="corpName" show-overflow-tooltip></el-table-column> <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
<el-table-column label="单据来源" prop="sourceType" width="150"> <el-table-column label="单据来源" prop="sourceType" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ sourceMap[scope.row.sourceType] }}</span> <span>{{ sourceMap[scope.row.sourceType] }}</span>
@ -430,6 +456,9 @@ export default {
data() { data() {
return { return {
query: { query: {
billType:null,
corpName:null,
locStorageCode:null,
billNo: "", billNo: "",
status: "1", status: "1",
page: 1, page: 1,

19
src/views/warehouse/stockOrderNewDistribution.vue
Unescape Escape View File

@ -552,30 +552,27 @@ export default {
this.$message.warning('未添加产品'); this.$message.warning('未添加产品');
return; return;
} }
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
if (!this.$isBlank(this.codeArray[i].productDate && this.codeArray[i].productDate.length != 6)) { if (!this.$isBlank(this.codeArray[i].productDate) && this.codeArray[i].productDate.length != 6) {
return this.$message.error('生产日期格式错误'); return this.$message.error('生产日期格式错误');
} }
if (!this.$isBlank(this.codeArray[i].expireDate && this.codeArray[i].expireDate.length != 6)) { if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
return this.$message.error('失效日期格式错误'); return this.$message.error('失效日期格式错误');
} }
} }
if (status === '3') { if (status === '3') {
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
return this.$message.error('单据数量不能为0');
}
if (this.$isBlank(this.codeArray[i].batchNo)) { if (this.$isBlank(this.codeArray[i].batchNo)) {
return this.$message.error('批次号不能为空'); return this.$message.error('批次号不能为空');
} }
if (this.$isBlank(this.codeArray[i].productDate)) { if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
return this.$message.error('生产日期不能为空'); return this.$message.error('生产日期与失效日期不能全部为空');
}
if (this.$isBlank(this.codeArray[i].expireDate)) {
return this.$message.error('失效日期不能为空');
} }
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count === '0') {
return this.$message.error('单据数量不能小于0');
}
} }
} }

7
src/views/warehouse/stockOrderNewSelectProduct.vue
Unescape Escape View File

@ -263,12 +263,11 @@ export default {
return; return;
} }
let ids = []; let ids = [];
selection.forEach((obj, index) => { selection.forEach((obj, index) => {
console.log("obj:===" + obj + "==" + obj.relIdFk)
let data = { let data = {
relId: obj.relIdFk, relId: obj.rlId,
batchNo: obj.batchNo,
productDate: obj.productionDate,
expireDate: obj.expireDate,
} }
ids.push(data); ids.push(data);
}); });

2
src/views/warehouse/stockOrderPrint.vue
Unescape Escape View File

@ -37,7 +37,7 @@
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column> <el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="供应商名称" prop="corpName"></el-table-column> <el-table-column label="往来单位" prop="corpName"></el-table-column>
<el-table-column label="单据日期" prop="billdate"></el-table-column> <el-table-column label="单据日期" prop="billdate"></el-table-column>
<el-table-column label="单据状态"> <el-table-column label="单据状态">
<template slot-scope="scope"> <template slot-scope="scope">

2
src/views/warehouse/stockOrderSearch.vue
Unescape Escape View File

@ -54,7 +54,7 @@
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商名称" prop="corpName" show-overflow-tooltip></el-table-column> <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
<el-table-column label="单据来源" prop="sourceType" width="150" show-overflow-tooltip> <el-table-column label="单据来源" prop="sourceType" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ sourceMap[scope.row.sourceType] }}</span> <span>{{ sourceMap[scope.row.sourceType] }}</span>

31
src/views/warehouse/stockOrderWaitCheck.vue
Unescape Escape View File

@ -12,6 +12,32 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.billNo" placeholder="单据号"></el-input> <el-input v-model="query.billNo" placeholder="单据号"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
<el-option
v-for="item in busTypes"
:key="item.localName"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span> <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
<el-date-picker <el-date-picker
@ -46,7 +72,7 @@
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商名称" prop="corpName" show-overflow-tooltip></el-table-column> <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
<el-table-column label="单据来源" prop="sourceType" width="150"> <el-table-column label="单据来源" prop="sourceType" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ sourceMap[scope.row.sourceType] }}</span> <span>{{ sourceMap[scope.row.sourceType] }}</span>
@ -321,6 +347,9 @@ export default {
data() { data() {
return { return {
query: { query: {
billType:null,
corpName:null,
locStorageCode:null,
billNo: "", billNo: "",
status: "3", status: "3",
page: 1, page: 1,

Write Preview
Loading…
Cancel
Save