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

1.调整养护功能货位联动

Browse Source 
2.修复单据备注编辑无法生效问题
zhairh
x_z 3 years ago
parent 1612e84f0f
commit 277e49d416
7 changed files with 79 additions and 39 deletions
Show Stats Download Patch File Download Diff File

8
src/api/inout/order.js
Unescape Escape View File

@ -368,3 +368,11 @@ export function uploadSpms(query) {
} }
); );
} }
export function updateOrderPrintRemark(data) {
return axios({
url: "/udiwms/inout/order/updateOrderPrintRemark",
method: "post",
data: data
});
}

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

@ -285,7 +285,7 @@
:closeDialog="closeDialog" :closeDialog="closeDialog"
:detailList="detailList" :detailList="detailList"
:billData="curRow" :billData="curRow"
:isShow="true"
></StockOrderEdit> ></StockOrderEdit>
</el-dialog> </el-dialog>

23
src/views/business/stockOrderUpdate.vue
Unescape Escape View File

@ -28,8 +28,10 @@
<el-card class="el-card"> <el-card class="el-card">
<el-row style="margin-bottom: 20px;"> <el-row style="margin-bottom: 20px;">
<el-button type="primary" @click="batchSetParams(null,'salesListNo')">批量设置销售清单</el-button> <el-button type="primary" @click="batchSetParams(null,'salesListNo')">批量设置销售清单</el-button>
<el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票</el-button> <el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票
<el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票</el-button> </el-button>
<el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票
</el-button>
</el-row> </el-row>
<el-table v-loading="detailLoading" <el-table v-loading="detailLoading"
@ -155,7 +157,7 @@
<script> <script>
import {stockOrderDetail, updateStockOrderDetail, findOrderByStockOrder} from "@/api/inout/stockOrder"; import {stockOrderDetail, updateStockOrderDetail, findOrderByStockOrder} from "@/api/inout/stockOrder";
import {updateOrder} from "@/api/inout/order"; import {updateOrderPrintRemark} from "@/api/inout/order";
export default { export default {
name: "stockOrderEdit", name: "stockOrderEdit",
@ -168,8 +170,8 @@ export default {
type: Object, type: Object,
required: true, required: true,
}, },
isShow:{ isShow: {
flag:true, flag: true,
} }
}, },
data() { data() {
@ -336,12 +338,14 @@ export default {
updateOrderRemark() { updateOrderRemark() {
let params = {
id: this.billData.orderIdFk,
updateOrder(this.orderQuery).then((response) => { printRemark: this.orderQuery.printRemark
}
updateOrderPrintRemark(params).then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("保存成功!"); this.$message.success("保存成功!");
this.getByStockOrder(); // this.getByStockOrder();
} }
}).catch(() => { }).catch(() => {
}) })
@ -349,6 +353,7 @@ export default {
}, },
created() { created() {
// this.getByStockOrder(); // this.getByStockOrder();
this.orderQuery.printRemark = this.billData.printRemark;
} }
} }
</script> </script>

1
src/views/inventory/addDeviceCollectOrder.vue
Unescape Escape View File

@ -391,7 +391,6 @@ export default {
this.getAllWarehouse(); this.getAllWarehouse();
this.warehouseChange(); this.warehouseChange();
} }
this.getList();
} }
}).catch((error) => { }).catch((error) => {
}); });

11
src/views/inventory/invMAOrderAudit.vue
Unescape Escape View File

@ -22,6 +22,7 @@
</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.invSpaceCode" placeholder="请选择当前货位" clearable="true" <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
:disabled="disableSpace"
size="mini"> size="mini">
<el-option <el-option
v-for="item in spaceCodeList" v-for="item in spaceCodeList"
@ -29,7 +30,7 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.invSubStorageName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -190,6 +191,7 @@ export default {
1: "未审核", 1: "未审核",
2: "已完成" 2: "已完成"
}, },
disableSpace: false,
}; };
}, },
methods: { methods: {
@ -205,6 +207,8 @@ export default {
page: 1, page: 1,
limit: 20 limit: 20
}; };
this.spaceCodeList = [];
this.disableSpace = true;
this.getList(); this.getList();
}, },
onSubmit() { onSubmit() {
@ -260,6 +264,10 @@ export default {
invWarehouseChange() { invWarehouseChange() {
this.filterQuery.invSpaceCode = null; this.filterQuery.invSpaceCode = null;
this.spaceCodeList = []; this.spaceCodeList = [];
if (isBlank(this.filterQuery.invWarehouseCode)) {
this.disableSpace = true;
} else {
this.disableSpace = false;
let params = { let params = {
invStorageCode: this.filterQuery.invStorageCode, invStorageCode: this.filterQuery.invStorageCode,
invWarehouseCode: this.filterQuery.invWarehouseCode, invWarehouseCode: this.filterQuery.invWarehouseCode,
@ -268,6 +276,7 @@ export default {
getSpaceCodeList(params).then((res) => { getSpaceCodeList(params).then((res) => {
this.spaceCodeList = res.data || []; this.spaceCodeList = res.data || [];
}) })
}
}, },
auditOrder(row) { auditOrder(row) {
this.$confirm('请选择审核意见', '提示', { this.$confirm('请选择审核意见', '提示', {

12
src/views/inventory/invMAOrderCompleted.vue
Unescape Escape View File

@ -22,6 +22,7 @@
</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.invSpaceCode" placeholder="请选择当前货位" clearable="true" <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
:disabled="disableSpace"
size="mini"> size="mini">
<el-option <el-option
v-for="item in spaceCodeList" v-for="item in spaceCodeList"
@ -29,7 +30,7 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.invSubStorageName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -166,6 +167,7 @@ export default {
1: "未审核", 1: "未审核",
2: "已完成" 2: "已完成"
}, },
disableSpace: false,
}; };
}, },
components: { components: {
@ -184,9 +186,12 @@ export default {
page: 1, page: 1,
limit: 20 limit: 20
}; };
this.spaceCodeList = [];
this.disableSpace = true;
this.getList(); this.getList();
}, },
onSubmit() { onSubmit() {
this.filterQuery.page = 1;
this.getList(); this.getList();
}, },
handleSizeChange(val) { handleSizeChange(val) {
@ -246,6 +251,10 @@ export default {
invWarehouseChange() { invWarehouseChange() {
this.filterQuery.invSpaceCode = null; this.filterQuery.invSpaceCode = null;
this.spaceCodeList = []; this.spaceCodeList = [];
if (isBlank(this.filterQuery.invWarehouseCode)) {
this.disableSpace = true;
} else {
this.disableSpace = false;
let params = { let params = {
invStorageCode: this.filterQuery.invStorageCode, invStorageCode: this.filterQuery.invStorageCode,
invWarehouseCode: this.filterQuery.invWarehouseCode, invWarehouseCode: this.filterQuery.invWarehouseCode,
@ -254,6 +263,7 @@ export default {
getSpaceCodeList(params).then((res) => { getSpaceCodeList(params).then((res) => {
this.spaceCodeList = res.data || []; this.spaceCodeList = res.data || [];
}) })
}
}, },
auditOrder(row) { auditOrder(row) {
this.$confirm('请选择审核意见', '提示', { this.$confirm('请选择审核意见', '提示', {

13
src/views/inventory/invMAOrderNew.vue
Unescape Escape View File

@ -22,6 +22,7 @@
</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.invSpaceCode" placeholder="请选择当前货位" clearable="true" <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
:disabled="disableSpace"
size="mini"> size="mini">
<el-option <el-option
v-for="item in spaceCodeList" v-for="item in spaceCodeList"
@ -29,7 +30,7 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.invSubStorageName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -154,7 +155,8 @@ export default {
add: "新增养护记录", add: "新增养护记录",
edit: "编辑养护记录" edit: "编辑养护记录"
}, },
maOrder: null maOrder: null,
disableSpace: false
}; };
}, },
components: { components: {
@ -173,6 +175,8 @@ export default {
page: 1, page: 1,
limit: 20, limit: 20,
}; };
this.spaceCodeList = [];
this.disableSpace = true;
this.getList(); this.getList();
}, },
onSubmit() { onSubmit() {
@ -212,6 +216,10 @@ export default {
invWarehouseChange() { invWarehouseChange() {
this.filterQuery.invSpaceCode = null; this.filterQuery.invSpaceCode = null;
this.spaceCodeList = []; this.spaceCodeList = [];
if (isBlank(this.filterQuery.invWarehouseCode)) {
this.disableSpace = true;
} else {
this.disableSpace = false;
let params = { let params = {
invStorageCode: this.filterQuery.invStorageCode, invStorageCode: this.filterQuery.invStorageCode,
invWarehouseCode: this.filterQuery.invWarehouseCode, invWarehouseCode: this.filterQuery.invWarehouseCode,
@ -220,6 +228,7 @@ export default {
getSpaceCodeList(params).then((res) => { getSpaceCodeList(params).then((res) => {
this.spaceCodeList = res.data || []; this.spaceCodeList = res.data || [];
}) })
}
}, },
closeDialog() { closeDialog() {
this.formVisible = false; this.formVisible = false;

Write Preview
Loading…
Cancel
Save