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 5a0d441e83
commit d927096374
14 changed files with 702 additions and 653 deletions
Show Stats Download Patch File Download Diff File

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

@ -255,7 +255,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">

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

@ -165,6 +165,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.batchNo" <el-input size="small" v-model="scope.row.batchNo"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
ref='inputBatchNoRef' ref='inputBatchNoRef'
placeholder="请输入批次号" style="width: 80%"></el-input> placeholder="请输入批次号" style="width: 80%"></el-input>
</template> </template>

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

@ -369,7 +369,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
@ -456,6 +456,7 @@
<el-form-item prop="price"> <el-form-item prop="price">
<el-input v-model="detailFormData.price" <el-input v-model="detailFormData.price"
clearable clearable
type="number"
auto-complete="off" :disabled="false"></el-input> auto-complete="off" :disabled="false"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

3
src/views/business/stockOrderNew.vue
Unescape Escape View File

@ -363,7 +363,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" <el-input v-model="detailFormData.count" auto-complete="off"
clearable clearable type="number"
:disabled="false"></el-input> :disabled="false"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -443,6 +443,7 @@
<el-form-item prop="batchNo"> <el-form-item prop="batchNo">
<el-input v-model="detailFormData.price" <el-input v-model="detailFormData.price"
clearable clearable
type="number"
auto-complete="off" :disabled="false"></el-input> auto-complete="off" :disabled="false"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

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

@ -51,10 +51,11 @@
<!-- <el-input v-model="formData.billdate" auto-complete="off"></el-input>--> <!-- <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
<el-date-picker <el-date-picker
v-model="formData.billdate" v-model="formData.billdate"
type="date" type="datetime"
placeholder="选择日期" placeholder="选择日期"
style="width: 100%" style="width: 100%"
:clearable="false" :clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -69,7 +70,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="billType"> <el-form-item prop="billType">
<el-select v-model="formData.billType" placeholder="请选择业务类型" <el-select v-model="formData.billType" placeholder="请选择业务类型" :disabled="codeArray.length>0"
@change="actionChange"> @change="actionChange">
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
@ -95,7 +96,7 @@
v-model="formData.corpName" v-model="formData.corpName"
filterable filterable
remote remote
clearable="true" clearable="true" :disabled="codeArray.length>0"
reserve-keyword reserve-keyword
placeholder="请输入往来单位" placeholder="请输入往来单位"
:remote-method="findMethod" :remote-method="findMethod"
@ -117,7 +118,7 @@
<el-select <el-select
v-model="formData.corpName" v-model="formData.corpName"
filterable filterable
remote remote :disabled="codeArray.length>0"
clearable="true" clearable="true"
reserve-keyword reserve-keyword
placeholder="请输入仓库信息" placeholder="请输入仓库信息"
@ -138,6 +139,7 @@
</el-select> </el-select>
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true" <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
:disabled="codeArray.length>0"
> >
<el-option <el-option
v-for="item in fromSubStorageOptions" v-for="item in fromSubStorageOptions"
@ -151,7 +153,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" prop="fromCorp" <el-form-item class="query-form-item" prop="fromCorp" :disabled="codeArray.length>0"
v-if="curAction.corpType ==2 && curAction.genUnit"> v-if="curAction.corpType ==2 && curAction.genUnit">
<el-input v-model="formData.corpName" auto-complete="off" <el-input v-model="formData.corpName" auto-complete="off"
clearable clearable
@ -171,6 +173,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange" <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
:disabled="codeArray.length>0"
clearable> clearable>
<el-option <el-option
v-for="item in storageList" v-for="item in storageList"
@ -193,6 +196,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="invWarehouseCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
:disabled="codeArray.length>0"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -217,7 +221,8 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="type" style="margin-right: 20px;" <el-form-item prop="type" style="margin-right: 20px;"
v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)"> v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
<el-checkbox v-model="formData.noInvOut">允许无库存出库</el-checkbox> <el-checkbox v-model="formData.noInvOut" :disabled="codeArray.length>0">允许无库存出库
</el-checkbox>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -259,6 +264,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.batchNo" <el-input size="small" v-model="scope.row.batchNo"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
ref='inputBatchNoRef' ref='inputBatchNoRef'
placeholder="请输入批次号" style="width: 80%"></el-input> placeholder="请输入批次号" style="width: 80%"></el-input>
</template> </template>

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

@ -347,7 +347,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">

3
src/views/business/stockOrderWaitCheck.vue
Unescape Escape View File

@ -235,7 +235,8 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"
type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">

6
src/views/inout/DialogSelectErpOrder.vue
Unescape Escape View File

@ -135,8 +135,8 @@
prop="spec" prop="spec"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column label="单据数量" prop="reCount"></el-table-column> <el-table-column label="单据数量" prop="count"></el-table-column>
<el-table-column label="实际数量" prop="count"> <el-table-column label="实际数量" prop="reCount">
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
@ -290,7 +290,7 @@ export default {
importErps() { importErps() {
var selectData = this.multipleSelection; var selectData = this.multipleSelection;
this.postQuery.purchaseinResponses = [],
selectData.forEach((obj, index) => { selectData.forEach((obj, index) => {
this.postQuery.purchaseinResponses.push(obj); this.postQuery.purchaseinResponses.push(obj);
}); });

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

@ -291,6 +291,7 @@ export default {
locStorageCode: null, locStorageCode: null,
invWarehouseCode: null, invWarehouseCode: null,
id: "", id: "",
status: 5,
mainAction: null, mainAction: null,
action: null, action: null,
page: 1, page: 1,
@ -343,6 +344,7 @@ export default {
}, },
addType: "edit", addType: "edit",
deleteData: { deleteData: {
status: 5,
id: "", id: "",
}, },
erpCheckStatus: { erpCheckStatus: {
@ -447,11 +449,18 @@ export default {
this.deleteData.id = data; this.deleteData.id = data;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
if (response.code == 20000) {
this.getList(); this.getList();
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功！", message: "删除成功！",
}); });
} else if (response.code == 520) {
this.$message.error("补录单据列表已不存在该扫码单据！");
this.getList();
}
}) })
.catch(() => { .catch(() => {
}); });

8
src/views/inout/IOCheckWaitOrder.vue
Unescape Escape View File

@ -414,7 +414,7 @@ export default {
orderId: "", orderId: "",
}, },
deleteData: { deleteData: {
id: "", id: "", status: 2,
}, },
idQuery: { idQuery: {
id: "", id: "",
@ -700,12 +700,18 @@ export default {
this.deleteData.id = data; this.deleteData.id = data;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
if (response.code == 20000) {
this.getList(); this.getList();
this.refresgOrderDetail(); this.refresgOrderDetail();
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功！", message: "删除成功！",
}); });
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
}
}) })
.catch(() => { .catch(() => {
}); });

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

@ -299,6 +299,7 @@ export default {
mainAction: null, mainAction: null,
action: null, action: null,
page: 1, page: 1,
status: 3,
limit: 20, limit: 20,
locStorageCode: this.$store.getters.locInvCode, locStorageCode: this.$store.getters.locInvCode,
invWarehouseCode: this.$store.getters.locSubInvCode, invWarehouseCode: this.$store.getters.locSubInvCode,
@ -353,6 +354,7 @@ export default {
}, },
deleteData: { deleteData: {
id: "", id: "",
status: 3,
}, },
dialogTableVisible: false, dialogTableVisible: false,
formLoading: false, formLoading: false,
@ -473,11 +475,16 @@ export default {
this.deleteData.id = data; this.deleteData.id = data;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
if (response.code == 20000) {
this.getList(); this.getList();
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功！", message: "删除成功！",
}); });
} else if (response.code == 520) {
this.$message.error("异常扫码单据列表已不存在该扫码单据！");
this.getList();
}
}) })
.catch(() => { .catch(() => {
}); });

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

@ -359,6 +359,7 @@ export default {
}, },
deleteData: { deleteData: {
id: "", id: "",
status: 10,
}, },
dialogTableVisible: false, dialogTableVisible: false,
formLoading: false, formLoading: false,
@ -594,11 +595,18 @@ export default {
this.deleteData.id = data; this.deleteData.id = data;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
if (response.code == 20000) {
this.getList(); this.getList();
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功！", message: "删除成功！",
}); });
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
}
}) })
.catch(() => { .catch(() => {
}); });

8
src/views/inout/IOWaitOrder.vue
Unescape Escape View File

@ -265,6 +265,7 @@
}, },
deleteData: { deleteData: {
id: "", id: "",
status: 2
}, },
dialogTableVisible: false, dialogTableVisible: false,
formLoading: false, formLoading: false,
@ -362,11 +363,18 @@
this.deleteData.id = data; this.deleteData.id = data;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
if (response.code == 20000) {
this.getList(); this.getList();
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功！", message: "删除成功！",
}); });
} else if (response.code == 520) {
this.$message.error("等待校验单据列表已不存在该扫码单据！");
this.getList();
}
}) })
.catch(() => { .catch(() => {
}); });

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

@ -212,6 +212,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.batchNo" <el-input size="small" v-model="scope.row.batchNo"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
ref='inputBatchNoRef' ref='inputBatchNoRef'
placeholder="请输入批次号" style="width: 80%"></el-input> placeholder="请输入批次号" style="width: 80%"></el-input>
</template> </template>

Write Preview
Loading…
Cancel
Save