条码完整性,同步修改

master
anthonywj 3 years ago
parent 451dd0040d
commit aed5f3c44a

@ -396,15 +396,6 @@ export const asyncRouterMap = [
} }
}, },
{
path: "BasicEntrutsRece",
name: "委托验收",
component: BasicEntrutsRece,
meta: {
authRule: ["basic/BasicEntrutsRece"]
}
},
// { // {
// path: "systemPDFTemplate", // path: "systemPDFTemplate",
// component: systemPDFTemplate, // component: systemPDFTemplate,
@ -805,6 +796,14 @@ export const asyncRouterMap = [
authRule: ["stock/additionalOrder"] authRule: ["stock/additionalOrder"]
} }
}, },
{
path: "BasicEntrutsRece",
name: "委托验收",
component: BasicEntrutsRece,
meta: {
authRule: ["basic/BasicEntrutsRece"]
}
},
{ {
path: "stockOrderDelSearch", path: "stockOrderDelSearch",

@ -270,13 +270,13 @@
<el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px"> <el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.checkChange" :disabled="!inputQuery.checkEnable"> <el-checkbox v-model="inputQuery.checkChange" :disabled="!inputQuery.checkEnable">
</el-checkbox> </el-checkbox>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.checkBalacne" :disabled="!inputQuery.checkEnable"> <el-checkbox v-model="inputQuery.checkBalacne" :disabled="!inputQuery.checkEnable">
</el-checkbox> </el-checkbox>
</div> </div>
</el-col> </el-col>
@ -335,13 +335,13 @@
<el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px"> <el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.secCheckChange" :disabled="!inputQuery.secCheckEnable"> <el-checkbox v-model="inputQuery.secCheckChange" :disabled="!inputQuery.secCheckEnable">
</el-checkbox> </el-checkbox>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.secCheckBalacne" :disabled="!inputQuery.secCheckEnable"> <el-checkbox v-model="inputQuery.secCheckBalacne" :disabled="!inputQuery.secCheckEnable">
</el-checkbox> </el-checkbox>
</div> </div>
</el-col> </el-col>

@ -225,7 +225,10 @@ export default {
onAddSubmit() { onAddSubmit() {
if (this.$isBlank(this.inputQuery.action)) {
this.$message.error("单据类型代码不能为空!");
return;
}
insertBussinessType(this.inputQuery) insertBussinessType(this.inputQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
@ -239,6 +242,10 @@ export default {
}, },
onModifySubmit() { onModifySubmit() {
if (this.$isBlank(this.inputQuery.action)) {
this.$message.error("单据类型代码不能为空!");
return;
}
updateBussinessType(this.inputQuery) updateBussinessType(this.inputQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

@ -29,6 +29,10 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions>
<el-descriptions class="margin-top" title="同步至UDI管理系统基础数据" :column="1" :size="100" style="margin-top: 40px"
border>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
单据类型 单据类型
@ -37,7 +41,6 @@
<el-checkbox v-model="configQuery.typeScan"></el-checkbox> <el-checkbox v-model="configQuery.typeScan"></el-checkbox>
<el-checkbox v-model="configQuery.typeThird"></el-checkbox> <el-checkbox v-model="configQuery.typeThird"></el-checkbox>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
基础信息 基础信息
@ -67,7 +70,8 @@
</el-descriptions> </el-descriptions>
<el-descriptions class="margin-top" title="" :column="1" :size="100" style="margin-top: 30px" border> <el-descriptions class="margin-top" title="同步至UDI管理系统单据" :column="1" :size="100" style="margin-top: 30px"
border>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
单据(单据状态) 单据(单据状态)

@ -617,23 +617,26 @@ export default {
this.thisData.formData.thirdSysFk = this.curAction.thirdSys; this.thisData.formData.thirdSysFk = this.curAction.thirdSys;
this.thisData.billType = this.curAction.localAction; this.thisData.billType = this.curAction.localAction;
// this.thisData.formData.billType = this.curAction.localAction;
if (this.curAction.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
this.invQueryData = { this.invQueryData = {
locStorageCode: this.formData.locStorageCode, locStorageCode: this.formData.locStorageCode,
}; };
this.selectInvProductVisible = true; this.selectInvProductVisible = true;
} else if (this.curAction.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
this.invQueryData = { // this.thisData.formData.billType = this.curAction.localAction;
locStorageCode: this.formData.corpId, // if (this.curAction.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
//
}; // } else if (this.curAction.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
console.log("his.invQueryData " + this.invQueryData.locStorageCode); //
this.selectInvProductVisible = true; // this.invQueryData = {
} else { // locStorageCode: this.formData.corpId,
this.selectProductVisible = true; //
} // };
// console.log("his.invQueryData " + this.invQueryData.locStorageCode);
// this.selectInvProductVisible = true;
// } else {
// this.selectProductVisible = true;
// }
return; return;

@ -99,7 +99,7 @@
</el-card> </el-card>
<!--授权界面--> <!--授权界面-->
<el-dialog <el-dialog
title="授权" :title="authTitle"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:visible.sync="authFormVisible" :visible.sync="authFormVisible"
@ -277,6 +277,8 @@ export default {
role_id: "", role_id: "",
auth_rules: [] auth_rules: []
}, },
authTitle: "授权",
authDefaultCheckedKeys: [], authDefaultCheckedKeys: [],
index: null, index: null,
formName: null, formName: null,
@ -341,7 +343,9 @@ export default {
}); });
}, },
// //
handleAuth(roleId) { handleAuth(row) {
this.authFormData.role_id = row.id;
this.authTitle = "授权角色<" + row.name + ">";
this.authFormData.role_id = roleId; this.authFormData.role_id = roleId;
this.authFormData.auth_rules = []; this.authFormData.auth_rules = [];
this.authList = []; this.authList = [];

@ -994,7 +994,7 @@ export default {
if (text.includes("delete")) { if (text.includes("delete")) {
that.formData.code = ""; that.formData.code = "";
that.sictomText = ""; that.sictomText = "";
this.originCode = ""; that.originCode = "";
return; return;
} }
if (that.sitcomScan) { if (that.sitcomScan) {

@ -818,7 +818,7 @@ export default {
if (text.includes("delete")) { if (text.includes("delete")) {
that.formData.code = ""; that.formData.code = "";
that.sictomText = ""; that.sictomText = "";
this.originCode = ""; that.originCode = "";
return; return;
} }
if (that.sitcomScan) { if (that.sitcomScan) {

@ -643,11 +643,11 @@ 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.$isBlank(this.codeArray[i].batchNo)) {
if (!this.codeArray[i].allowNoBatch) { // if (!this.codeArray[i].allowNoBatch) {
return this.$message.error('批次号不能为空'); // 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('生产日期与失效日期不能全部为空');
} }

@ -10,15 +10,6 @@
:loading="loading" :loading="loading"
>保存 >保存
</el-button> </el-button>
<!--&gt;-->
<!--<el-button-->
<!--type="primary"-->
<!--@click.native="saveOrder('2')"-->
<!--:loading="loading"-->
<!--&gt;未配货提交-->
<!--</el-button-->
<!--&gt;-->
<el-button <el-button
type="primary" type="primary"
@click.native="saveOrder('3')" @click.native="saveOrder('3')"
@ -575,11 +566,11 @@ export default {
this.submitFunction(status); this.submitFunction(status);
} else { } else {
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
if (this.$isBlank(this.codeArray[i].batchNo)) { // if (this.$isBlank(this.codeArray[i].batchNo)) {
if (!this.codeArray[i].allowNoBatch) { // if (!this.codeArray[i].allowNoBatch) {
return this.$message.error('批次号不能为空'); // 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('生产日期与失效日期不能全部为空');
} }
@ -935,36 +926,36 @@ export default {
}); });
} }
}, },
saveCodeArray(index, row) { // saveCodeArray(index, row) {
if (this.$isBlank(row.batchNo)) { // if (this.$isBlank(row.batchNo)) {
return this.$message.error('批次号不能为空'); // return this.$message.error('');
} // }
if (this.$isBlank(row.productDate)) { // if (this.$isBlank(row.productDate)) {
return this.$message.error('生产日期不能为空'); // return this.$message.error('');
} // }
if (this.$isBlank(row.expireDate)) { // if (this.$isBlank(row.expireDate)) {
return this.$message.error('失效日期不能为空'); // return this.$message.error('');
} // }
//
this.$refs.multipleTable.setCurrentRow(); // this.$refs.multipleTable.setCurrentRow();
this.currentRow = {}; // this.currentRow = {};
this.selectedIndex = ""; // this.selectedIndex = "";
this.iCount = 0; // this.iCount = 0;
//
this.detailLoading = true; // this.detailLoading = true;
// row.count = row.reCount; // // row.count = row.reCount;
let tQuery = row; // let tQuery = row;
uploadStockOrderDetail(tQuery).then((response) => { // uploadStockOrderDetail(tQuery).then((response) => {
this.detailLoading = false; // this.detailLoading = false;
if (response.code === 20000) { // if (response.code === 20000) {
this.$message.success("修改完成"); // this.$message.success("");
this.getStockOrderDetailList(); // this.getStockOrderDetailList();
this.$refs.inputRef.focus(); // this.$refs.inputRef.focus();
} else { // } else {
this.$message.error(response.message); // this.$message.error(response.message);
} // }
}); // });
}, // },
deleteCodeArray(index, row) { deleteCodeArray(index, row) {
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", { this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",

@ -871,11 +871,11 @@ export default {
return; return;
} }
} }
if (this.$isBlank(tQuery.batchNo)) { // if (this.$isBlank(tQuery.batchNo)) {
if (!tQuery.allowNoBatch) { // if (!tQuery.allowNoBatch) {
return this.$message.error('批次号不能为空'); // return this.$message.error('');
} // }
} // }
if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) { if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
return this.$message.error('生产日期与失效日期不能全部为空'); return this.$message.error('生产日期与失效日期不能全部为空');
} }

@ -569,11 +569,11 @@ 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.$isBlank(this.codeArray[i].batchNo)) {
if (!this.codeArray[i].allowNoBatch) { // if (!this.codeArray[i].allowNoBatch) {
return this.$message.error('批次号不能为空'); // 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('生产日期与失效日期不能全部为空');
} }

Loading…
Cancel
Save