bug修改

fengcang
anthonyywj2 3 years ago
parent fcb6588515
commit c3ce5cca1b

@ -1,334 +1,357 @@
<template>
<div>
<el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.name"
style="width: 250px"
placeholder="单据类型名称"
></el-input>
</el-form-item>
<el-form-item>
<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="search" @click="search"></el-button>
<el-button type="primary" icon="search" @click="handleAddClick"
:disabled="!configParms.entrustAction"
>新增
</el-button
>
</el-button-group>
<div>
<el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.name"
style="width: 250px"
placeholder="单据类型名称"
></el-input>
</el-form-item>
<el-form-item>
<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="search" @click="search"></el-button>
<el-button type="primary" icon="search" @click="handleAddClick"
:disabled="!configParms.entrustAction"
>新增
</el-button
>
</el-button-group>
</el-form-item>
</el-form>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" width="60" fixed></el-table-column>
<el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
<el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
<el-table-column label="当前分库" prop="invWarehouseName" fixed></el-table-column>
<el-table-column label="委托验收仓库" prop="entrustInvName" fixed></el-table-column>
<el-table-column label="委托验收分库" prop="entrustSubInvName" fixed></el-table-column>
<el-table-column label="委托验收人" prop="employeeName" fixed>
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="handleModifyClick(scope.row)"
:disabled="!configParms.entrustAction"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row)"
:disabled="!configParms.entrustAction"
>删除
</el-button
>
</template>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" width="60" fixed></el-table-column>
<el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
<el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
<el-table-column label="当前分库" prop="invWarehouseName" fixed></el-table-column>
<el-table-column label="委托验收仓库" prop="entrustInvName" fixed></el-table-column>
<el-table-column label="委托验收分库" prop="entrustSubInvName" fixed></el-table-column>
<el-table-column label="委托验收人" prop="employeeName" fixed>
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="handleModifyClick(scope.row)"
:disabled="!configParms.entrustAction"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row)"
:disabled="!configParms.entrustAction"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
</el-table-column>
</el-table>
<el-dialog
title="新增委托验收"
:visible.sync="addDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addDialogVisible"
>
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onAddSubmit"
>提交
</el-button
>
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消
</el-button
>
</div>
</el-dialog>
<el-dialog
title="新增委托验收"
:visible.sync="addDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addDialogVisible"
>
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onAddSubmit"
>提交
</el-button
>
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消
</el-button
>
</div>
</el-dialog>
<el-dialog
title="编辑委托验收"
:visible.sync="modifyDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="modifyDialogVisible"
>
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit"
>提交
</el-button
>
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消
</el-button
>
</div>
</el-dialog>
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
:current-page="filterQuery.page"
></el-pagination>
</el-card>
</div>
<el-dialog
title="编辑委托验收"
:visible.sync="modifyDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="modifyDialogVisible"
>
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit"
>提交
</el-button
>
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消
</el-button
>
</div>
</el-dialog>
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
:current-page="filterQuery.page"
></el-pagination>
</el-card>
</div>
</template>
<script>
import {
getEntrustRece,
deleteEntrustRece,
updateEntrustRece,
insertEntrustRece,
getEntrustRece,
deleteEntrustRece,
updateEntrustRece,
insertEntrustRece,
} from "../../api/basic/EntrustRece";
import modifyDialog from "./BasicEntrutsReceModify";
import {findConfig} from "@/api/thrsys/spsSyncStatus";
export default {
data() {
return {
filterQuery: {
name: "",
page: 1,
limit: 20,
},
loading: false,
addDialogVisible: false,
modifyDialogVisible: false,
list: [],
inputQuery: {
action: "",
name: "",
entrustInv: "",
entrustUser: "",
entrustAction: null,
finishRece: false,
curInv: "",
entrustSubInv: "",
invWarehouseCode: "",
},
enableMap: {
true: "是",
false: "否",
},
mainActionMap: {
WareHouseIn: "入库",
WareHouseOut: "出库"
},
fileList: [],
total: 0,
multipleSelection: [],
uploadFileUrl: null,
headers: {},
configParms: {},
};
},
data() {
return {
filterQuery: {
name: "",
page: 1,
limit: 20,
},
loading: false,
addDialogVisible: false,
modifyDialogVisible: false,
list: [],
inputQuery: {
action: "",
name: "",
entrustInv: "",
entrustUser: "",
entrustAction: null,
finishRece: false,
curInv: "",
entrustSubInv: "",
invWarehouseCode: "",
},
enableMap: {
true: "是",
false: "否",
},
mainActionMap: {
WareHouseIn: "入库",
WareHouseOut: "出库"
},
fileList: [],
total: 0,
multipleSelection: [],
uploadFileUrl: null,
headers: {},
configParms: {},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
name: "",
page: 1,
limit: 20,
};
this.getList();
},
cancelDialog() {
this.modifyDialogVisible = false;
this.addDialogVisible = false;
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
search() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getEntrustRece(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;
});
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
name: "",
page: 1,
limit: 20,
};
this.getList();
},
cancelDialog() {
this.modifyDialogVisible = false;
this.addDialogVisible = false;
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
search() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getEntrustRece(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;
});
},
onAddSubmit() {
if (this.$isBlank(this.inputQuery.action)) {
this.$message.error("单据类型不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.curInv)) {
this.$message.error("请输入委托仓库!");
return;
}
if (this.$isBlank(this.inputQuery.entrustInv)) {
this.$message.error("请输入接受委托仓库!");
return;
}
if (this.$isBlank(this.inputQuery.entrustUser)) {
this.$message.error("请输入接受委托人!");
return;
}
onAddSubmit() {
if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
this.$message.error("当前分库不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.entrustSubInv)) {
this.$message.error("请输入接受委托分库!");
return;
}
if (this.$isBlank(this.inputQuery.action)) {
this.$message.error("单据类型不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.curInv)) {
this.$message.error("请输入委托仓库!");
return;
}
if (this.$isBlank(this.inputQuery.entrustInv)) {
this.$message.error("请输入接受委托仓库!");
return;
}
if (this.$isBlank(this.inputQuery.entrustUser)) {
this.$message.error("请输入接受委托人!");
return;
}
insertEntrustRece(this.inputQuery)
.then((response) => {
this.loading = false;
this.cancelDialog();
this.getList();
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
},
if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
this.$message.error("当前分库不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.entrustSubInv)) {
this.$message.error("请输入接受委托分库!");
return;
}
onModifySubmit() {
if (this.$isBlank(this.inputQuery.action)) {
this.$message.error("单据类型不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.curInv)) {
this.$message.error("请输入委托仓库!");
return;
}
if (this.$isBlank(this.inputQuery.entrustInv)) {
this.$message.error("请输入接受委托仓库!");
return;
}
if (this.$isBlank(this.inputQuery.entrustInv)) {
this.$message.error("请输入接受委托人!");
return;
}
insertEntrustRece(this.inputQuery)
.then((response) => {
this.loading = false;
this.cancelDialog();
this.getList();
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
},
if (this.$isBlank(this.inputQuery.entrustAction)) {
this.$message.error("请输入生成单据类型!");
return;
}
handleAddClick() {
this.inputQuery = {enable: true, expireTip: true};
this.addDialogVisible = true;
},
insertEntrustRece(this.inputQuery)
.then((response) => {
if (response.code == 20000) {
this.loading = false;
this.cancelDialog();
this.getList();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
},
handleModifyClick(row) {
this.inputQuery = row;
this.modifyDialogVisible = true;
},
onModifySubmit() {
if (this.$isBlank(this.inputQuery.action)) {
this.$message.error("单据类型不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.curInv)) {
this.$message.error("请输入委托仓库!");
return;
}
if (this.$isBlank(this.inputQuery.entrustInv)) {
this.$message.error("请输入接受委托仓库!");
return;
}
if (this.$isBlank(this.inputQuery.entrustUser)) {
this.$message.error("请输入接受委托人!");
return;
}
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该委托验收信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
},
if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
this.$message.error("当前分库不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.entrustSubInv)) {
this.$message.error("请输入接受委托分库!");
return;
}
deleteOrders(data) {
this.loading = true;
let tquery = {
id: data.id + "",
};
deleteEntrustRece(tquery)
.then((response) => {
this.getList();
if (response.code == 20000) {
this.$message({
type: "success",
message: "删除成功!",
});
} else {
this.$message.error(response.message);
if (this.$isBlank(this.inputQuery.entrustAction)) {
this.$message.error("请输入生成单据类型!");
return;
}
updateEntrustRece(this.inputQuery)
.then((response) => {
this.loading = false;
this.cancelDialog();
this.getList();
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
},
handleAddClick() {
this.inputQuery = {enable: true, expireTip: true};
this.addDialogVisible = true;
},
handleModifyClick(row) {
this.inputQuery = row;
this.modifyDialogVisible = true;
},
})
.catch(() => {
});
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该委托验收信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
},
deleteOrders(data) {
this.loading = true;
let tquery = {
id: data.id + "",
};
deleteEntrustRece(tquery)
.then((response) => {
this.getList();
if (response.code == 20000) {
this.$message({
type: "success",
message: "删除成功!",
});
} else {
this.$message.error(response.message);
}
})
.catch(() => {
});
},
getSyncConfig() {
findConfig()
.then((response) => {
if (response.code == 20000) {
this.configParms = response.data;
}
})
.catch(() => {
});
},
},
getSyncConfig() {
findConfig()
.then((response) => {
if (response.code == 20000) {
this.configParms = response.data;
}
})
.catch(() => {
});
components: {
modifyDialog,
},
mounted() {
},
created() {
this.getList();
},
},
components: {
modifyDialog,
},
mounted() {
},
created() {
this.getList();
},
};
</script>

@ -324,7 +324,7 @@
</el-dialog>
<el-dialog
title="码详情"
title="内部码详情"
:visible.sync="qrcodeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

@ -507,9 +507,9 @@ export default {
// return this.$message.error('');
// }
// }
if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
return this.$message.error('生产日期与失效日期不能全部为空');
}
// if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
// return this.$message.error('');
// }
if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount < 1) {
return this.$message.error('配货数量不能小于0');
}

@ -895,9 +895,9 @@ export default {
// return this.$message.error('');
// }
// }
if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
return this.$message.error('生产日期与失效日期不能全部为空');
}
// if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
// return this.$message.error('');
// }
uploadStockOrderDetail(tQuery).then((response) => {
this.detailLoading = false;
if (response.code === 20000) {

@ -565,9 +565,9 @@ export default {
// return this.$message.error('');
// }
// }
if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
return this.$message.error('生产日期与失效日期不能全部为空');
}
// if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
// return this.$message.error('');
// }
// if (this.$isBlank(this.codeArray[i].expireDate)) {
// return this.$message.error('');
// }
@ -759,7 +759,6 @@ export default {
selectProductFunction(event) {
if (event == null) {
// this.$refs.inputRef.focus();
} else {
event.target.select();
}
@ -790,12 +789,14 @@ export default {
if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
this.invQueryData = {
locStorageCode: this.formData.locStorageCode,
invWarehouseCode: this.formData.invWarehouseCode,
};
this.selectInvProductVisible = true;
} else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
this.invQueryData = {
locStorageCode: this.formData.corpId,
invWarehouseCode: this.formData.fromSubInvCode,
};
this.selectInvProductVisible = true;
} else {

@ -63,23 +63,10 @@
</el-row>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350" ref="multipleTable">
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- width="55">-->
<!-- </el-table-column>-->
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="码" prop="udiCode"></el-table-column>
<!--<el-table-column label="订单数量">-->
<!--<template slot-scope="scope">-->
<!--<span>{{ scope.row.count }}</span>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="实际数量">-->
<!--<template slot-scope="scope">-->
<!--<span>{{ scope.row.reCount }}</span>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="内部码" prop="udiCode"></el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<span>{{ statusMap[scope.row.printStatus] }}</span>
@ -95,17 +82,6 @@
<span>{{ scope.row.updateTime }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="操作" fixed="right" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native="printStockOrderDetailPDF(scope.row)"-->
<!-- >打印-->
<!-- </el-button-->
<!-- >-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<div class="block">
@ -123,8 +99,13 @@
</template>
<script>
import {stockOrderDetail, submitStockOrder, submitStockOrderError, uploadStockOrderDetailCount} from "../../api/inout/stockOrder";
import {stockQRCodeText,filterPrint} from "../../api/inout/stockQRCode";
import {
stockOrderDetail,
submitStockOrder,
submitStockOrderError,
uploadStockOrderDetailCount
} from "../../api/inout/stockOrder";
import {stockQRCodeText, filterPrint} from "../../api/inout/stockQRCode";
import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import draggable from "vuedraggable";
@ -150,7 +131,7 @@ export default {
return {
code: "",
query: {
sOrderId:null,
sOrderId: null,
orderIdFk: "",
page: 1,
limit: 10,
@ -265,7 +246,7 @@ export default {
if (row.count <= 0) {
return this.$message.error('数量错误');
}
let tQuery = { queryId: row.id, }
let tQuery = {queryId: row.id,}
this.loading = true;
inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
if (response.code === 20000) {
@ -332,8 +313,6 @@ export default {
this.codeArray = [];
if (this.$isNotBlank(this.idQuery.id)) {
this.formData = this.idQuery.formData;
// this.query.orderIdFk = this.idQuery.id;
// this.getStockOrderDetailList();
this.query.sOrderId = this.idQuery.id;
this.getStockQRCodeTextList();
}

@ -1161,7 +1161,7 @@ export default {
this.codeArray = [];
this.getBusType();
this.getStorage(this.formData.action);
this.findSubInvByInv();
if (this.$isNotBlank(this.idQuery.id)) {
this.formData.actDate = new Date(this.idQuery.actDate);
this.formData.corpOrderId = this.idQuery.corpOrderId;
@ -1203,6 +1203,9 @@ export default {
}
this.findSubInvByInv(this.formData.locStorageCode);
}
,
}

@ -241,7 +241,7 @@
></el-pagination>
<el-dialog
title="新增订单"
title="据编辑"
:visible.sync="addOrderVisible"
width="75%"
:close-on-click-modal="false"
@ -570,10 +570,7 @@ export default {
}
},
addOrders(row) {
console.log(row)
this.idQuery.id = '';
this.idQuery.actDate = '';
this.idQuery.corpOrderId = '';
this.idQuery = row;
this.idQuery.billType = row.action;
if (row.id !== null && row.id !== undefined && row.id !== '') {
this.idQuery.id = row.id;

@ -80,7 +80,7 @@
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="onSubmit"></el-button>
<el-button type="primary" icon="search" @click="exportOrders"></el-button>
<!-- <el-button type="primary" icon="search" @click="exportOrders"></el-button>-->
</el-button-group>
</el-form-item>
</el-row>

@ -73,7 +73,7 @@
<el-form-item style="margin-right: 50px; margin-left: auto">
<el-button-group>
<el-button type="primary" icon="search" @click="mergesOrders"></el-button>
<el-button type="primary" icon="search" @click="addOrders"></el-button>
<el-button type="primary" icon="search" @click="addOrders"></el-button>
<el-button type="primary" icon="search" @click="errOrders"></el-button>
</el-button-group>
@ -82,7 +82,7 @@
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%"
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
@ -220,7 +220,7 @@
</el-dialog>
<el-dialog
title="新增单"
title="新增"
:visible.sync="addOrderVisible"
width="75%" append-to-body
:close-on-click-modal="false"
@ -540,17 +540,17 @@ export default {
let unit = repeatData[0].fromCorp;
let action = repeatData[0].action;
let orderList = [];
repeatData.forEach((obj, index) => {
if (unit !== obj.fromCorp) {
this.$message.warning("往来单位不一致!");
for (let index in repeatData) {
if (action !== repeatData[index].action) {
this.$message.warning("业务类型不一致!");
return;
}
if (action !== obj.action) {
this.$message.warning("业务类型不一致!");
if (unit !== repeatData[index].fromCorp) {
this.$message.warning("往来单位不一致!");
return;
}
orderList.push(obj.id);
});
orderList.push(repeatData[index].id);
}
let tquery = {
orderList: orderList,
type: 2,

@ -118,7 +118,8 @@
<el-dialog
title="选择供应商"
:visible.sync="dialogTableVisible"
v-if="dialogTableVisible"
v-if="dialogTableVisible" :close-on-click-modal="false"
:close-on-press-escape="false"
width="70%"
append-to-body
>
@ -132,7 +133,8 @@
title="绑定产品ID"
:visible.sync="selectRlVisible"
width="80%"
v-if="selectRlVisible"
v-if="selectRlVisible" :close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
>
<selectRlDialog
@ -145,7 +147,8 @@
<el-dialog
:title="editTitle"
:visible.sync="editCodeVisible"
:visible.sync="editCodeVisible" :close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body width="70%"
v-if="editCodeVisible"
>
@ -203,7 +206,7 @@ export default {
};
},
components: {
draggable, DialogSelectUnit, selectRlDialog,editCodeDialog
draggable, DialogSelectUnit, selectRlDialog, editCodeDialog
},
methods: {
handleSelectionChange(val) {

@ -479,9 +479,9 @@ export default {
if (this.$isBlank(this.codeArray[i].batchNo)) {
return this.$message.error('批次号不能为空');
}
if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
return this.$message.error('生产日期与失效日期不能全部为空');
}
// if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
// return this.$message.error('');
// }
// if (this.$isBlank(this.codeArray[i].expireDate)) {
// return this.$message.error('');
// }

Loading…
Cancel
Save