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

条码完整性,同步修改

Browse Source
master
anthonywj 3 years ago
parent 451dd0040d
commit aed5f3c44a
12 changed files with 403 additions and 395 deletions
Show Stats Download Patch File Download Diff File

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

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

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

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

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

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

8
src/views/thrsys/SysUdimsConfig.vue
Unescape Escape View File

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

27
src/views/thrsys/thrOrderNew.vue
Unescape Escape View File

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

22
src/views/userManage/admin/authRole.vue
Unescape Escape View File

@ -7,13 +7,13 @@
<el-form-item class="query-form-item">
<el-input v-model="query.name" placeholder="角色名称"></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.status" placeholder="状态">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="禁用" value="0"></el-option>-->
<!-- <el-option label="正常" value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.status" placeholder="状态">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="禁用" value="0"></el-option>-->
<!-- <el-option label="正常" value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button-group>
@ -99,7 +99,7 @@
</el-card>
<!--授权界面-->
<el-dialog
title="授权"
:title="authTitle"
:close-on-click-modal="false"
:close-on-press-escape="false"
:visible.sync="authFormVisible"
@ -277,6 +277,8 @@ export default {
role_id: "",
auth_rules: []
},
authTitle: "授权",
authDefaultCheckedKeys: [],
index: 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.auth_rules = [];
this.authList = [];

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

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

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

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

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

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

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

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

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

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

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

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

Write Preview
Loading…
Cancel
Save