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

退货单再次配货功能

Browse Source
test
anthonywj 2 years ago
parent 1c7810aaa5
commit 8a9a884374
4 changed files with 100 additions and 25 deletions
Show Stats Download Patch File Download Diff File

4
.env.production
Unescape Escape View File

@ -22,10 +22,10 @@ ENV = 'production'
# 刘恩典
# VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
# 漳州中医院
VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
# 平和
# VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'

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

@ -537,3 +537,13 @@ export function orderDetailAdd(params) {
data: params
});
}
export function copyOrder(params) {
return axios({
url: "/udiwms/inout/order/copyOrder",
method: "post",
data: params
});
}

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

@ -74,7 +74,7 @@
<el-col :span="11">
<el-form-item prop="action" label="单据类型:">
<el-select v-model="orderFormData.action" placeholder="请选择单据类型"
:disabled="corpOrderIdDisabled"
:disabled="corpOrderIdDisabled && orderFormData.action!=null"
style="width: 90%"
@change="actionChange">
<el-option
@ -957,7 +957,10 @@ export default {
this.refreshCodesPanel();
// //加载选择框候选数据
this.findInvListByUser();
this.initBusType();
if (this.orderFormData.action == null) {
this.getBusTypeByInv();
} else
this.initBusType();
this.findMethod(this.orderFormData.fromCorp);
this.findFromInvList();

104
src/views/inout/IoReturnedSearchOrder.vue
Unescape Escape View File

@ -141,7 +141,7 @@
border
@current-change="handleSelectionChange"
:default-sort="defaultSort"
@sort-change="handleSortChange" >
@sort-change="handleSortChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="退货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
@ -158,7 +158,7 @@
<el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']" >
:sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
@ -195,22 +195,30 @@
>打印
</el-button
>
<el-button
type="text"
size="small"
v-if="customerId == 110"
@click.native.stop="rollback(scope.row)"
>撤回
</el-button
>
<el-button
type="text"
size="small"
v-if="scope.row.status == 10"
@click.native.stop="reviewOrder(scope.row)"
>审核
@click.native.stop="repeatOrder(scope.row)"
>再次配货
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="customerId == 110"-->
<!-- @click.native.stop="rollback(scope.row)"-->
<!-- >撤回-->
<!-- </el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="scope.row.status == 10"-->
<!-- @click.native.stop="reviewOrder(scope.row)"-->
<!-- >审核-->
<!-- </el-button-->
<!-- >-->
<el-button
type="text"
size="small"
@ -510,11 +518,30 @@
></accept-order>
</el-dialog>
<el-dialog
title="编辑单据"
:visible.sync="addOrderVisible"
width="85%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addOrderVisible"
@close='closeDialog'
>
<addOrder
:closeDialog="closeDialog"
:orderQuery="returnData"
:viewType="viewType"
></addOrder>
</el-dialog>
</div>
</template>
<script>
import {
copyOrder,
deleteByOrderId,
getOrderList, rollUnReceivebackOrder
} from "../../api/inout/order";
@ -529,6 +556,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import addOrder from "./DialogCreateOrder";
const formJson = {
site_id: "",
@ -548,14 +576,14 @@ export default {
billNo: null,
mainAction: null,
action: null,
statusType: "supSearch",
vueType: "supReturned",
page: 1,
limit: 10,
startTime: null,
endTime: null,
startAduditTime: null,
endAduditTime: null,
status: 10,
// status: 10,
invCode: this.$store.getters.locInvCode,
},
@ -593,7 +621,7 @@ export default {
"11": "仓库盘点",
"12": "采购计划",
"13": "领用单据",
"14": "第三方系统单据","15":"采购订单"
"14": "第三方系统单据", "15": "采购订单"
},
deleteData: {
id: "",
@ -670,9 +698,14 @@ export default {
acceptQuery: null,
acceptOrderVisible: false,
showSup: false,
addOrderVisible: false,
returnData: null,
viewType: 3,
};
},
components: {AcceptOrder},
components: {AcceptOrder, addOrder},
methods: {
onReset() {
this.$router.push({
@ -683,15 +716,15 @@ export default {
billNo: null,
mainAction: null,
action: null,
statusType: "supSearch",
vueType: "supReturned",
page: 1,
limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
};
this.actDateRange=[];
this.auditDateRange=[];
this.actDateRange = [];
this.auditDateRange = [];
this.getList();
},
@ -775,6 +808,30 @@ export default {
this.loading = false;
});
},
repeatOrder(row) {
this.$confirm('此操作将创建新的送货单据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
copyOrder(row)
.then((response) => {
if (response.code == 20000) {
this.returnData = response.data;
this.addOrderVisible = true;
}
})
.catch(() => {
});
}).catch(() => {
// this.$message.info('回退失败');
});
},
getBusType() {
let query = {
// code: this.filterQuery.invCode,
@ -831,7 +888,7 @@ export default {
this.loading = true;
this.currentRow = {billNo: ""};
this.clearDetailList();
this.filterQuery.busType = 4; //退货出入库单据类型
// this.filterQuery.busType = 4; //退货出入库单据类型
getOrderList(this.filterQuery)
.then((response) => {
this.loading = false;
@ -1047,6 +1104,11 @@ export default {
};
return statusMap[status];
},
closeDialog() {
this.addOrderVisible = false;
},
}
,
mounted() {

Write Preview
Loading…
Cancel
Save