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

bug修改

Browse Source
fengcang
anthonyywj2 3 years ago
parent fcb6588515
commit c3ce5cca1b
12 changed files with 375 additions and 369 deletions
Show Stats Download Patch File Download Diff File

27
src/views/basic/BasicEntrutsRece.vue
Unescape Escape View File

@ -226,11 +226,20 @@ export default {
return; return;
} }
if (this.$isBlank(this.inputQuery.entrustAction)) {
this.$message.error("请输入生成单据类型！");
return;
}
insertEntrustRece(this.inputQuery) insertEntrustRece(this.inputQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) {
this.loading = false; this.loading = false;
this.cancelDialog(); this.cancelDialog();
this.getList(); this.getList();
} else {
this.$message.error(response.message);
}
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -251,11 +260,25 @@ export default {
this.$message.error("请输入接受委托仓库！"); this.$message.error("请输入接受委托仓库！");
return; return;
} }
if (this.$isBlank(this.inputQuery.entrustInv)) { if (this.$isBlank(this.inputQuery.entrustUser)) {
this.$message.error("请输入接受委托人！"); this.$message.error("请输入接受委托人！");
return; return;
} }
insertEntrustRece(this.inputQuery)
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.entrustAction)) {
this.$message.error("请输入生成单据类型！");
return;
}
updateEntrustRece(this.inputQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
this.cancelDialog(); this.cancelDialog();

2
src/views/business/stockOrder.vue
Unescape Escape View File

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

6
src/views/business/stockOrderEditDistribution.vue
Unescape Escape View File

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

6
src/views/business/stockOrderEditor.vue
Unescape Escape View File

@ -895,9 +895,9 @@ export default {
// 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('生产日期与失效日期不能全部为空');
} // }
uploadStockOrderDetail(tQuery).then((response) => { uploadStockOrderDetail(tQuery).then((response) => {
this.detailLoading = false; this.detailLoading = false;
if (response.code === 20000) { if (response.code === 20000) {

9
src/views/business/stockOrderNewDistribution.vue
Unescape Escape View File

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

39
src/views/business/stockOrderQRCodeDetail.vue
Unescape Escape View File

@ -63,23 +63,10 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350" ref="multipleTable"> <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
<!-- <el-table-column--> ref="multipleTable">
<!-- type="selection"-->
<!-- width="55">-->
<!-- </el-table-column>-->
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="码" prop="udiCode"></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="状态"> <el-table-column label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ statusMap[scope.row.printStatus] }}</span> <span>{{ statusMap[scope.row.printStatus] }}</span>
@ -95,17 +82,6 @@
<span>{{ scope.row.updateTime }}</span> <span>{{ scope.row.updateTime }}</span>
</template> </template>
</el-table-column> </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> </el-table>
<div class="block"> <div class="block">
@ -123,7 +99,12 @@
</template> </template>
<script> <script>
import {stockOrderDetail, submitStockOrder, submitStockOrderError, uploadStockOrderDetailCount} from "../../api/inout/stockOrder"; import {
stockOrderDetail,
submitStockOrder,
submitStockOrderError,
uploadStockOrderDetailCount
} from "../../api/inout/stockOrder";
import {stockQRCodeText, filterPrint} from "../../api/inout/stockQRCode"; import {stockQRCodeText, filterPrint} from "../../api/inout/stockQRCode";
import {getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalJoinBusType} from "../../api/basic/busLocalType";
@ -332,8 +313,6 @@ export default {
this.codeArray = []; this.codeArray = [];
if (this.$isNotBlank(this.idQuery.id)) { if (this.$isNotBlank(this.idQuery.id)) {
this.formData = this.idQuery.formData; this.formData = this.idQuery.formData;
// this.query.orderIdFk = this.idQuery.id;
// this.getStockOrderDetailList();
this.query.sOrderId = this.idQuery.id; this.query.sOrderId = this.idQuery.id;
this.getStockQRCodeTextList(); this.getStockQRCodeTextList();
} }

5
src/views/inout/IOAddOrder.vue
Unescape Escape View File

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

7
src/views/inout/IOAdditionalOrder.vue
Unescape Escape View File

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

2
src/views/inout/IOFinishOrder.vue
Unescape Escape View File

@ -80,7 +80,7 @@
<el-button-group> <el-button-group>
<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="onSubmit">查询</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-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>

20
src/views/inout/IONewOrder.vue
Unescape Escape View File

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

9
src/views/inout/errorCode.vue
Unescape Escape View File

@ -118,7 +118,8 @@
<el-dialog <el-dialog
title="选择供应商" title="选择供应商"
:visible.sync="dialogTableVisible" :visible.sync="dialogTableVisible"
v-if="dialogTableVisible" v-if="dialogTableVisible" :close-on-click-modal="false"
:close-on-press-escape="false"
width="70%" width="70%"
append-to-body append-to-body
> >
@ -132,7 +133,8 @@
title="绑定产品ID" title="绑定产品ID"
:visible.sync="selectRlVisible" :visible.sync="selectRlVisible"
width="80%" width="80%"
v-if="selectRlVisible" v-if="selectRlVisible" :close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body append-to-body
> >
<selectRlDialog <selectRlDialog
@ -145,7 +147,8 @@
<el-dialog <el-dialog
:title="editTitle" :title="editTitle"
:visible.sync="editCodeVisible" :visible.sync="editCodeVisible" :close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body width="70%" append-to-body width="70%"
v-if="editCodeVisible" v-if="editCodeVisible"
> >

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

@ -479,9 +479,9 @@ export default {
if (this.$isBlank(this.codeArray[i].batchNo)) { if (this.$isBlank(this.codeArray[i].batchNo)) {
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('生产日期与失效日期不能全部为空');
} // }
// if (this.$isBlank(this.codeArray[i].expireDate)) { // if (this.$isBlank(this.codeArray[i].expireDate)) {
// return this.$message.error('失效日期不能为空'); // return this.$message.error('失效日期不能为空');
// } // }

Write Preview
Loading…
Cancel
Save