条码完整性,同步修改

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>

@ -1,125 +1,125 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
v-model="filterQuery.name" v-model="filterQuery.name"
placeholder="业务类型" placeholder="业务类型"
style="width: 400px" style="width: 400px"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange"> <el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange">
<el-option <el-option
v-for="item in thirdSys" v-for="item in thirdSys"
:key="item.value" :key="item.value"
:label="item.thirdName" :label="item.thirdName"
:value="item.thirdId"> :value="item.thirdId">
<span style="float: left">{{ item.thirdName }}</span> <span style="float: left">{{ item.thirdName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button-group style="margin-left: 10px;display:flex;"> <el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getList"></el-button> <el-button type="primary" icon="search" @click="getList"></el-button>
<el-button type="primary" icon="search" @click="handleAddClick" <el-button type="primary" icon="search" @click="handleAddClick"
>新增 >新增
</el-button </el-button
> >
<el-button type="primary" icon="search" @click="updateDownload"></el-button> <el-button type="primary" icon="search" @click="updateDownload"></el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="list" style="width: 100%"> <el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" width="55"></el-table-column> <el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="单据类型名称" prop="name"></el-table-column> <el-table-column label="单据类型名称" prop="name"></el-table-column>
<el-table-column label="单据类型代码" prop="action"></el-table-column> <el-table-column label="单据类型代码" prop="action"></el-table-column>
<el-table-column label="第三方系统" prop="thirdSys"></el-table-column> <el-table-column label="第三方系统" prop="thirdSys"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" width="100" fixed="right"> <el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="handleModifyClick(scope.row)" @click.native.stop="handleModifyClick(scope.row)"
>编辑 >编辑
</el-button </el-button
> >
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="handleDeleteClick(scope.row)" @click.native.stop="handleDeleteClick(scope.row)"
>删除 >删除
</el-button </el-button
> >
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog <el-dialog
title="新增第三方单据类型" title="新增第三方单据类型"
:visible.sync="addDialogVisible" :visible.sync="addDialogVisible"
width="70%" width="70%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="addDialogVisible" v-if="addDialogVisible"
> >
<modifyDialog :inputQuery="inputQuery"></modifyDialog> <modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center"> <div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onAddSubmit" <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
>提交 >提交
</el-button </el-button
> >
<el-button type="primary" size="small" icon="search" @click="cancelDialog" <el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消 >取消
</el-button </el-button
> >
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="编辑第三方单据类型" title="编辑第三方单据类型"
:visible.sync="modifyDialogVisible" :visible.sync="modifyDialogVisible"
width="70%" width="70%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="modifyDialogVisible" v-if="modifyDialogVisible"
> >
<modifyDialog :inputQuery="inputQuery"></modifyDialog> <modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center"> <div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit" <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
>提交 >提交
</el-button </el-button
> >
<el-button type="primary" size="small" icon="search" @click="cancelDialog" <el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消 >取消
</el-button </el-button
> >
</div> </div>
</el-dialog> </el-dialog>
<el-pagination <el-pagination
:page-size="filterQuery.limit" :page-size="filterQuery.limit"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
></el-pagination> ></el-pagination>
</el-card> </el-card>
</div> </div>
</template> </template>
<script> <script>
import { import {
getOriginBusType, getOriginBusType,
updateBussinessType, delBussinessType, updateBussinessType, delBussinessType,
insertBussinessType, downloadBussinessType insertBussinessType, downloadBussinessType
} from "../../api/basic/busOriginType"; } from "../../api/basic/busOriginType";
import modifyDialog from "./BussinessTypeThirdModify"; import modifyDialog from "./BussinessTypeThirdModify";
@ -127,216 +127,223 @@ import axios from "axios";
import {getBasicThirdSys} from "@/api/basic/basicThirdSys"; import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
export default { export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
name: "", name: "",
page: 1, page: 1,
limit: 20, limit: 20,
}, },
addDialogVisible: false, addDialogVisible: false,
modifyDialogVisible: false, modifyDialogVisible: false,
list: [], list: [],
inputQuery: { inputQuery: {
action: "", action: "",
name: "", name: "",
enable: "", enable: "",
remark: "", remark: "",
thirdSys: null, thirdSys: null,
thirdSysName: null, thirdSysName: null,
},
enableMap: {
true: "是",
false: "否",
},
thirdSys: [],
total: 0,
multipleSelection: [],
uploadFileUrl: null,
loading: false,
};
},
methods: { },
onReset() { enableMap: {
this.$router.push({ true: "是",
path: "", false: "否",
}); },
this.filterQuery = { thirdSys: [],
thirdSys: "thirdId", total: 0,
name: null, multipleSelection: [],
enable: null, uploadFileUrl: null,
page: 1, loading: false,
limit: 20, };
};
this.getList();
},
cancelDialog() {
this.modifyDialogVisible = false;
this.addDialogVisible = false;
}, },
getList() { methods: {
this.loading = true; onReset() {
getOriginBusType(this.filterQuery) this.$router.push({
.then((response) => { path: "",
this.loading = false; });
this.list = response.data.list || []; this.filterQuery = {
this.total = response.data.total || 0; thirdSys: "thirdId",
}) name: null,
.catch(() => { enable: null,
this.loading = false; page: 1,
this.list = []; limit: 20,
this.total = 0; };
});
},
getBasicThirdSys() {
let query = {
enabled: true,
};
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
})
.catch(() => {
this.loading = false;
this.list = [];
});
},
updateDownload() {
let query = {
thirdSys: this.filterQuery.thirdSys,
}
downloadBussinessType(query)
.then((response) => {
this.loading = false;
this.getList(); this.getList();
}) },
.catch(() => { cancelDialog() {
this.loading = false; this.modifyDialogVisible = false;
}); this.addDialogVisible = false;
}, },
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
onAddSubmit() { getList() {
this.loading = true;
getOriginBusType(this.filterQuery)
.then((response) => {
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
getBasicThirdSys() {
let query = {
enabled: true,
};
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
})
.catch(() => {
this.loading = false;
this.list = [];
});
},
updateDownload() {
let query = {
thirdSys: this.filterQuery.thirdSys,
}
downloadBussinessType(query)
.then((response) => {
this.loading = false;
this.getList();
})
.catch(() => {
this.loading = false;
});
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
onAddSubmit() {
insertBussinessType(this.inputQuery) if (this.$isBlank(this.inputQuery.action)) {
.then((response) => { this.$message.error("单据类型代码不能为空!");
this.loading = false; return;
this.cancelDialog(); }
this.getList(); insertBussinessType(this.inputQuery)
}) .then((response) => {
.catch(() => { this.loading = false;
this.loading = false; this.cancelDialog();
this.cancelDialog(); this.getList();
}); })
}, .catch(() => {
this.loading = false;
this.cancelDialog();
});
},
onModifySubmit() { onModifySubmit() {
updateBussinessType(this.inputQuery) if (this.$isBlank(this.inputQuery.action)) {
.then((response) => { this.$message.error("单据类型代码不能为空!");
this.loading = false; return;
this.cancelDialog(); }
this.getList(); updateBussinessType(this.inputQuery)
}) .then((response) => {
.catch(() => { this.loading = false;
this.loading = false; this.cancelDialog();
this.cancelDialog(); this.getList();
}); })
}, .catch(() => {
this.loading = false;
this.cancelDialog();
});
},
handleModifyClick(row) { handleModifyClick(row) {
this.inputQuery = { this.inputQuery = {
id: row.id, id: row.id,
remark: row.remark, remark: row.remark,
action: row.action, action: row.action,
name: row.name, name: row.name,
enable: row.enable, enable: row.enable,
thirdSys: row.thirdSys, thirdSys: row.thirdSys,
thirdSysName: row.thirdSysName thirdSysName: row.thirdSysName
}; };
this.modifyDialogVisible = true; this.modifyDialogVisible = true;
}, },
handleDeleteClick(row) { handleDeleteClick(row) {
this.deleteDialog(row.id) this.deleteDialog(row.id)
}, },
handleAddClick() {
this.inputQuery = {
action: "",
name: "",
enable: "",
remark: "",
thirdSys: null,
thirdSysName: null
};
this.addDialogVisible = true;
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该单据类型信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let query = {
id: rowId,
}
delBussinessType(query)
.then((response) => {
this.getList();
})
.catch(() => {
});
handleAddClick() {
this.inputQuery = {
action: "",
name: "",
enable: "",
remark: "",
thirdSys: null,
thirdSysName: null
};
this.addDialogVisible = true;
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该单据类型信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let query = {
id: rowId,
}
delBussinessType(query)
.then((response) => {
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
},
thirdSysChange() {
this.getList();
},
}) init() {
.catch(() => { axios.get("./config.json").then(res => {
}); //
let response = res.data.BASE_URL;
this.uploadFileUrl = response + "udiwms/busstiness/file/upload";
});
},
handleChange(response, files, fileList) {
console.log(response);
if (response.code != 20000) {
this.$message.error(response.message);
} else {
// console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
this.$message.success(response.data);
this.getList();
}
},
}, },
components: {
thirdSysChange() { modifyDialog,
this.getList();
}, },
mounted() {
init() {
axios.get("./config.json").then(res => {
//
let response = res.data.BASE_URL;
this.uploadFileUrl = response + "udiwms/busstiness/file/upload";
});
}, },
handleChange(response, files, fileList) { created() {
console.log(response); this.init();
if (response.code != 20000) { this.getBasicThirdSys();
this.$message.error(response.message);
} else {
// console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
this.$message.success(response.data);
this.getList(); this.getList();
}
},
},
components: {
modifyDialog,
},
mounted() {
},
created() {
this.init();
this.getBasicThirdSys();
this.getList();
}, },
}; };
</script> </script>

@ -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 = {
locStorageCode: this.formData.locStorageCode,
};
this.selectInvProductVisible = true;
} else if (this.curAction.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
this.invQueryData = { this.invQueryData = {
locStorageCode: this.formData.corpId, locStorageCode: this.formData.locStorageCode,
}; };
console.log("his.invQueryData " + this.invQueryData.locStorageCode);
this.selectInvProductVisible = true; 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; return;

@ -7,13 +7,13 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.name" placeholder="角色名称"></el-input> <el-input v-model="query.name" placeholder="角色名称"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">--> <!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.status" placeholder="状态">--> <!-- <el-select v-model="query.status" placeholder="状态">-->
<!-- <el-option label="全部" value=""></el-option>--> <!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="禁用" value="0"></el-option>--> <!-- <el-option label="禁用" value="0"></el-option>-->
<!-- <el-option label="正常" value="1"></el-option>--> <!-- <el-option label="正常" value="1"></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
@ -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