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

1.修复单据配货管理，编辑业务单据时间导致时分秒无法显示的问题

Browse Source 
2.修改判空方法
fencang
x_z 3 years ago
parent f85fe11718
commit a9ab66c0aa
8 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File

6
src/utils/strUtil.js
Unescape Escape View File

@ -1,7 +1,11 @@
//封装字符串相关的方法
export function isBlank(value) {
if (value === "" || value === null) {
return true;
}
value = value.trim();
if (value === "" || value === null || value === "string") {
if (value === "string" || value === "undefined") {
return true;
}
}

8
src/views/warehouse/DialogcChangeNewOrder.vue
Unescape Escape View File

@ -286,6 +286,14 @@ export default {
this.$message.error('当前往来单位不能为空');
return;
}
if (this.$isBlank(this.formData.invWarehouseCode)) {
this.$message.error("当前分库不能为空");
return;
}
if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromSubInvCode)) {
this.$message.error('往来单位分库不能为空');
return;
}
if (this.detailList.length == 0) {
this.$message.error("产品列表不能为空");
return;

3
src/views/warehouse/IONewOrder.vue
Unescape Escape View File

@ -640,14 +640,13 @@ export default {
orderId: "",
};
idQuery.orderId = data;
console.log(idQuery);
console.log(this.list);
commitOrder(idQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success(response.data);
for (let i = 0; i < this.list.length; i++) {
debugger
if (idQuery.orderId === this.list[i].id) {
this.list.splice(i, 1);
break;

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

@ -277,6 +277,7 @@
:visible.sync="editCodeVisible"
append-to-body width="70%"
v-if="editCodeVisible"
@close="getCodeList"
>
<editCodeDialog
editTye="2"
@ -476,6 +477,7 @@ export default {
closeCodeDialog() {
this.editCodeVisible = false;
this.editOriginCodeVisible = false;
this.getCodeList();
},
editCode(row) {
this.codeDetail = row;

20
src/views/warehouse/editCode.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template>
<div>
<el-form :model="codeDetail" :rules="formRules" ref="dataForm">
<el-form :model="editData" :rules="formRules" ref="dataForm">
<el-row :gutter="20">
<el-col :span="3">
<div class="ao-text">
@ -10,7 +10,7 @@
<el-col :span="16">
<el-form-item prop="code">
<el-input
v-model="codeDetail.code"
v-model="editData.code"
clearable
disabled
></el-input>
@ -25,7 +25,7 @@
</el-col>
<el-col :span="7">
<el-form-item prop="productDate">
<el-input v-model="codeDetail.produceDate" auto-complete="off"
<el-input v-model="editData.produceDate" auto-complete="off"
oninput="if(value.length>6)value=value.slice(0,6)"
type="number"
:disabled="false"></el-input>
@ -38,7 +38,7 @@
</el-col>
<el-col :span="7">
<el-form-item prop="expireDate">
<el-input v-model="codeDetail.expireDate" auto-complete="off"
<el-input v-model="editData.expireDate" auto-complete="off"
oninput="if(value.length>6)value=value.slice(0,6)"
type="number"
:disabled="false"></el-input>
@ -54,7 +54,7 @@
</el-col>
<el-col :span="7">
<el-form-item prop="batchNo">
<el-input v-model="codeDetail.batchNo" auto-complete="off" :disabled="false"></el-input>
<el-input v-model="editData.batchNo" auto-complete="off" :disabled="false"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
@ -64,7 +64,7 @@
</el-col>
<el-col :span="7">
<el-form-item prop="price">
<el-input v-model="codeDetail.serialNo" auto-complete="off"></el-input>
<el-input v-model="editData.serialNo" auto-complete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -108,17 +108,19 @@ export default {
type: Object,
required: true,
},
editData: null
},
methods: {
saveCode() {
if (this.editTye == 1) {
this.repeatAddCode();
} else {
saveCode(this.codeDetail)
saveCode(this.editData)
.then((response) => {
console.log(response)
if (response.code === 20000) {
this.$message.success("提交成功");
this.codeDetail = this.editData;
this.closeCodeDialog();
} else {
this.$message.error(response.message);
@ -132,7 +134,7 @@ export default {
this.closeCodeDialog();
},
findByCode() {
let query = {udiCode: this.codeDetail.code};
let query = {udiCode: this.editData.code};
findByCode(query)
.then((response) => {
if (response.code === 20000) {
@ -145,7 +147,7 @@ export default {
},
created() {
this.editData = JSON.parse(JSON.stringify(this.codeDetail));
},
}
</script>

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

@ -401,6 +401,7 @@ import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../ap
import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
import dialogInvProduct from "../inventory/DialogInvProduct"
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
export default {
name: "idQuery",
@ -1163,22 +1164,15 @@ export default {
}
},
actionChange(item) {
// console.log("item = " + item);
// if (item == '') {
// this.formData.locStorageCode == null;
// } else {
this.curAction = this.getActionItem(item);
if (this.curAction.storageCode != null)
this.formData.locStorageCode = this.curAction.storageCode;
this.formData.locStorageCode = this.curAction.storageCode;
this.locInChange(this.formData.locStorageCode);
this.findMethod();
// }
},
locInChange(item) {
console.log(item);
if (isBlank(item)) {
this.formData.invWarehouseCode = null;
}
this.formData.locStorageCode = item;
this.$forceUpdate();
this.getBusType(item);

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

@ -43,11 +43,11 @@
<!-- <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
<el-date-picker
v-model="formData.billdate"
type="date"
type="datetime"
placeholder="选择日期"
style="width: 100%"
:clearable="false"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>

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

@ -697,7 +697,6 @@ export default {
},
distributionForm(index, row) {
this.idQuery.id = '';
console.log("row = " + row.invWarehouseCode);
if (this.$isNotBlank(row.id)) {
this.idQuery.id = row.id;
this.idQuery.formData = row;

Write Preview
Loading…
Cancel
Save