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

2级bug修复

Browse Source
fencang
anthonywj 3 years ago
parent 39b37e9fb5
commit 5655e6a1aa
11 changed files with 91 additions and 75 deletions
Show Stats Download Patch File Download Diff File

2
src/role.js
Unescape Escape View File

@ -112,7 +112,7 @@ router.beforeEach((to, from, next) => {
}) })
.catch(() => { .catch(() => {
store.dispatch("fedLogout").then(() => { store.dispatch("fedLogout").then(() => {
Message.error("验证失败,请重新登录"); Message.error("登录失效,请重新登录");
let redirect = to.fullPath; let redirect = to.fullPath;
store.dispatch("loginOut").then(() => { store.dispatch("loginOut").then(() => {
next({ next({

2
src/utils/axios.js
Unescape Escape View File

@ -46,7 +46,7 @@ service.interceptors.response.use(
if (data.code) { if (data.code) {
if (data.code === 2) { if (data.code === 2) {
store.dispatch("fedLogout").then(() => { store.dispatch("fedLogout").then(() => {
Message.error("验证失败,请重新登录"); Message.error("登录失效,请重新登录");
router.push({ router.push({
path: "/login", path: "/login",
query: { redirect: router.currentRoute.fullPath } // 从哪个页面跳转过来 query: { redirect: router.currentRoute.fullPath } // 从哪个页面跳转过来

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

@ -393,7 +393,7 @@ export default {
methods: { methods: {
getThirdSysDetail() { getThirdSysDetail() {
let query = { let query = {
id: this.editQuery.id, id: this.editQuery.rlId,
}; };
thirdSysDetail(query) thirdSysDetail(query)

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

@ -110,25 +110,30 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="产品ID"
prop="productId"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column <el-table-column
label="产品名称" label="产品名称"
prop="productName" prop="productName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column
label="规格型号"
prop="spec"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column <el-table-column
label="批号" label="批号"
prop="batchNo" prop="batchNo"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="规格型号" label="生产日期"
prop="spec" prop="productDate"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column> <el-table-column label="单据数量" prop="count"></el-table-column>

18
src/views/warehouse/DialogSelectUnit.vue
Unescape Escape View File

@ -91,15 +91,15 @@ export default {
}, },
methods: { methods: {
getUnitList() { getUnitList() {
this.loading = true; // this.loading = true;
getBasicUnitMaintains(this.unitquery) // getBasicUnitMaintains(this.unitquery)
.then((response) => { // .then((response) => {
this.loading = false; // this.loading = false;
this.unitlist = response.data.page.list || []; // this.unitlist = response.data.page.list || [];
}) // })
.catch(() => { // .catch(() => {
this.loading = false; // this.loading = false;
}); // });
}, },
getUnitListByCode(row) { getUnitListByCode(row) {
let query = { let query = {

1
src/views/warehouse/addHosOrder.vue
Unescape Escape View File

@ -591,6 +591,7 @@ export default {
closeCodeDialog() { closeCodeDialog() {
this.editCodeVisible = false; this.editCodeVisible = false;
this.editOriginCodeVisible = false; this.editOriginCodeVisible = false;
this.getCodeList();
}, },
editCode(row) { editCode(row) {
this.codeDetail = row; this.codeDetail = row;

1
src/views/warehouse/errorCode.vue
Unescape Escape View File

@ -245,6 +245,7 @@ export default {
}, },
closeCodeDialog() { closeCodeDialog() {
this.editCodeVisible = false; this.editCodeVisible = false;
this.getCodeList();
}, },
deleteDialog() { deleteDialog() {
this.$confirm("是否删除所选条码?", "提示", { this.$confirm("是否删除所选条码?", "提示", {

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

@ -560,17 +560,9 @@ export default {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
return this.$message.error('单据数量不能为0'); return this.$message.error('单据数量不能为0');
} }
// if (this.$isBlank(this.codeArray[i].batchNo)) {
// if (!this.codeArray[i].allowNoBatch) {
// return this.$message.error('批次号不能为空');
// }
// }
if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { 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('失效日期不能为空');
// }
} }
@ -580,14 +572,6 @@ export default {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
return this.$message.error('单据数量不能为0'); return this.$message.error('单据数量不能为0');
} }
// if (!this.$isBlank(this.codeArray[i].productDate && this.codeArray[i].productDate.length != 6)) {
// return this.$message.error('生产日期格式错误');
// }
// if (!this.$isBlank(this.codeArray[i].expireDate && this.codeArray[i].expireDate.length != 6)) {
// return this.$message.error('失效日期不能为空');
// }
} }
} }
@ -704,15 +688,12 @@ export default {
this.loading = true; this.loading = true;
let tQuery = this.formData; let tQuery = this.formData;
tQuery.status = status; tQuery.status = status;
// if (!this.orderEditor) {
tQuery.subErpOrders = this.codeArray; tQuery.subErpOrders = this.codeArray;
if (status == '3') { if (status == '3') {
tQuery.subErpOrders.forEach((obj) => { tQuery.subErpOrders.forEach((obj) => {
obj.reCount = obj.count; obj.reCount = obj.count;
}); });
} }
insertStockOrderWeb(tQuery) insertStockOrderWeb(tQuery)
.then(response => { .then(response => {
this.loading = false; this.loading = false;

69
src/views/warehouse/stockOrderEditDistribution.vue
Unescape Escape View File

@ -135,6 +135,24 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: -10px;">
<el-col :span="3">
<div class="ao-text">
<span></span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="type" style="margin-right: 20px;"
v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
<el-checkbox v-model="formData.noInvOut">允许无库存出库
</el-checkbox>
</el-form-item>
</el-col>
</el-row>
</el-card> </el-card>
<el-card> <el-card>
@ -263,33 +281,9 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <div class="block" v-if="orderEditor">-->
<!-- <el-pagination-->
<!-- @current-change="handleCurrentChange"-->
<!-- layout="prev, pager, next"-->
<!-- :page-size="query.limit"-->
<!-- :total="total">-->
<!-- </el-pagination>-->
<!-- </div>-->
</el-card> </el-card>
</el-form> </el-form>
<!-- <el-dialog-->
<!-- title="产品录入"-->
<!-- :visible.sync="selectProductVisible"-->
<!-- width="85%"-->
<!-- v-if="selectProductVisible"-->
<!-- :append-to-body='true'-->
<!-- :close-on-click-modal="false"-->
<!-- :close-on-press-escape="false"-->
<!-- >-->
<!-- <stockOrderNewSelectProduct-->
<!-- :closeDialog="closeDialogC2"-->
<!-- :data="thisData"-->
<!-- ></stockOrderNewSelectProduct>-->
<!-- </el-dialog>-->
<el-dialog <el-dialog
title="产品录入" title="产品录入"
@ -373,7 +367,21 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
}, },
formData: {}, formData: {
noInvOut: false,
locStorageCode: null,
invWarehouseCode: null,
fromSubInvCode: null,
billNo: null,
billdate: "",
customerId: store.getters.customerId,
billType: "",
type: null,
corpName: "",
corpId: "",
},
formRules: { formRules: {
corpName: [ corpName: [
{required: true, message: "请输入供应商", trigger: "blur"} {required: true, message: "请输入供应商", trigger: "blur"}
@ -1052,13 +1060,16 @@ export default {
this.invChange(); this.invChange();
} else { } else {
this.formData = { this.formData = {
billNo: null,
billdate: "", billdate: "",
corpName: store.getters.companyName,
customerId: store.getters.customerId, customerId: store.getters.customerId,
// billType: "deliveryNote",
billType: "", billType: "",
type: "1", type: "2",
// type: "", corpName: "",
corpId: "",
noInvOut: "",
locStorageCode: store.getters.locInvCode,
invWarehouseCode: store.getters.locSubInvCode,
}; };
this.iCount = 0; this.iCount = 0;
this.orderEditor = false; this.orderEditor = false;

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

@ -109,11 +109,6 @@
</el-table-column> </el-table-column>
<el-table-column label="当前分库" prop="subInvName" width="120"> <el-table-column label="当前分库" prop="subInvName" width="120">
</el-table-column> </el-table-column>
<!-- <el-table-column label="采购类别" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.type | typeFilterName }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -193,7 +188,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
title="编辑" :title="formMap[formName]"
:visible.sync="newDistributionVisible" :visible.sync="newDistributionVisible"
width="80%" width="80%"
v-if="newDistributionVisible" v-if="newDistributionVisible"
@ -209,7 +204,7 @@
></stockOrderNewDistribution> ></stockOrderNewDistribution>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="编辑" :title="formMap[formName]"
:visible.sync="newSpDistributionVisible" :visible.sync="newSpDistributionVisible"
width="80%" width="80%"
v-if="newSpDistributionVisible" v-if="newSpDistributionVisible"
@ -568,6 +563,15 @@ export default {
}, },
], ],
}, },
formMap: {
add: "新增业务单据",
edit: "编辑业务单据"
},
formName: null,
} }
}, },
methods: { methods: {
@ -655,6 +659,9 @@ export default {
if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) { if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
this.idQuery.id = row.id; this.idQuery.id = row.id;
this.idQuery.formData = row; this.idQuery.formData = row;
this.formName = "edit";
} else {
this.formName = "add";
} }
if (store.getters.customerId == 110) { if (store.getters.customerId == 110) {
this.newSpDistributionVisible = true; this.newSpDistributionVisible = true;

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

@ -563,6 +563,16 @@ export default {
// this.$refs.inputRef.focus(); // this.$refs.inputRef.focus();
} else event.target.select(); } else event.target.select();
if (this.$isBlank(event)) { if (this.$isBlank(event)) {
if (this.$isBlank(this.formData.billType)) {
this.$message.error("单据类型不能为空！")
return;
}
if (this.$isBlank(this.formData.locStorageCode) || this.$isBlank(this.formData.invWarehouseCode)) {
this.$message.error("当前仓库和当前分库不能为空！");
return;
}
this.code = ""; this.code = "";
this.$refs.multipleTable.setCurrentRow(); this.$refs.multipleTable.setCurrentRow();
this.currentRow = {}; this.currentRow = {};

Write Preview
Loading…
Cancel
Save