diff --git a/src/api/basic/busType.js b/src/api/basic/busType.js index b156622d..62d2149d 100644 --- a/src/api/basic/busType.js +++ b/src/api/basic/busType.js @@ -82,3 +82,21 @@ export function getBusTypeListByUser(params) { params: params }); } +export function filterUnUse(params) { + return axios({ + url: "/udiwms/localBusType/filterUnUse", + method: "get", + params: params + }); +} + + +export function findByInvUser(query) { + return axios({ + url: "/udiwms/busType/findByInvUser", + method: "get", + params: query + }); +} + + diff --git a/src/api/inout/acceptOrder.js b/src/api/inout/acceptOrder.js new file mode 100644 index 00000000..e4ffc885 --- /dev/null +++ b/src/api/inout/acceptOrder.js @@ -0,0 +1,28 @@ +import axios from '@/utils/request' + + +export function getAcceptOrder(query) { + return axios({ + url: "/udiwms/stock/order/accept/getOrder", + method: "get", + params: query + }); +} + + +export function acceptClear(query) { + return axios({ + url: "/udiwms/stock/order/acceptClear", + method: "post", + data: query + }); +} + + +export function acceptAddCode(query) { + return axios({ + url: "/udiwms/stock/order/accept/addCode", + method: "post", + data: query + }); +} diff --git a/src/api/inout/order.js b/src/api/inout/order.js index bfd89d07..3a5bfb90 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -393,3 +393,14 @@ export function getOrderList(params) { params: params }); } + + +export function updateStatus(query) { + + return axios({ + url: "/spms/inout/order/web/updateStatus", + method: "post", + data: query + }); +} + diff --git a/src/api/system/invSubWarehouse.js b/src/api/system/invSubWarehouse.js index e6c4f20b..e4c840d5 100644 --- a/src/api/system/invSubWarehouse.js +++ b/src/api/system/invSubWarehouse.js @@ -9,13 +9,6 @@ export function filterSubAll(query) { }); } -export function findByInvUser(query) { - return axios({ - url: "/udiwms/busType/findByInvUser", - method: "get", - params: query - }); -} //获取用户所有关联仓库 export function findInvByUser(query) { diff --git a/src/api/system/param/EntrustRece.js b/src/api/system/param/EntrustRece.js new file mode 100644 index 00000000..e42c1112 --- /dev/null +++ b/src/api/system/param/EntrustRece.js @@ -0,0 +1,44 @@ +import axios from '@/utils/request' + +export function getEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/filter", + method: "get", + params: query + }); +} + +export function deleteEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/delete", + method: "post", + data: query + }); +} + +export function updateEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/update", + method: "post", + data: query + }); +} + +export function insertEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/add", + method: "post", + data: query + }); +} + + +export function filterNoUseBusType(query) { + return axios({ + url: "/spms/entrust/rece/filterAllNoUse", + method: "get", + params: query + }); +} + + diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue index f09bcca8..53df4fb7 100644 --- a/src/views/inout/IoCheckSuccessOrder.vue +++ b/src/views/inout/IoCheckSuccessOrder.vue @@ -140,8 +140,8 @@ 校验单据 + @click.native.stop="reviewOrder(scope.row)" + >验收单据 @@ -444,6 +444,22 @@ + + + + + @@ -461,6 +477,7 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getResultDetailList} from "@/api/inout/orderDetailResult"; +import AcceptOrder from "@/views/inout/IoReviewOrder"; const formJson = { site_id: "", @@ -479,7 +496,7 @@ export default { mainAction: null, action: null, page: 1, - status: 10, + status: 6, limit: 10, startTime: null, endTime: null, @@ -493,6 +510,7 @@ export default { 3: "校验异常", 4: "校验成功", }, + list: [], storageList: [], subInvList: [], total: 0, @@ -579,9 +597,13 @@ export default { resultTotal: 0, resultDetailLoading: false, resultDetailList: [], + + + acceptQuery: null, + acceptOrderVisible: false, }; }, - components: {}, + components: {AcceptOrder}, methods: { onReset() { this.$router.push({ @@ -684,10 +706,9 @@ export default { }, //获取订单列表 getList() { + this.loading = true; - this.currentRow = null; - this.clearDetailList(); - getOrderList(this.filterQuery) + getDraft(this.filterQuery) .then((response) => { this.loading = false; if (response.code === 20000) { @@ -703,6 +724,27 @@ export default { this.list = []; this.total = 0; }); + + + // this.loading = true; + // this.currentRow = null; + // this.clearDetailList(); + // getOrderList(this.filterQuery) + // .then((response) => { + // this.loading = false; + // if (response.code === 20000) { + // this.list = response.data.list || []; + // this.total = response.data.total || 0; + // } else { + // this.$message.error(response.message); + // } + // }) + // .catch((error) => { + // this.$message.error(error.message) + // this.loading = false; + // this.list = []; + // this.total = 0; + // }); }, deleteOrders(data) { this.loading = true; @@ -887,6 +929,22 @@ export default { editResultDialog(row) { }, + + + //验收结束 + closeAcceptDialog() { + this.acceptOrderVisible = false; + }, + + //开始验收 + reviewOrder(row) { + this.acceptQuery = row; + this.acceptOrderVisible = true; + }, + + parentByFn: function (childValue) { + this.getList(); + }, }, filters: { statusFilterType(status) { diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue index 7b7dbe1f..43a205a2 100644 --- a/src/views/inout/IoCreateOrder.vue +++ b/src/views/inout/IoCreateOrder.vue @@ -179,7 +179,7 @@ - + @@ -266,35 +266,27 @@ import { errorCodeList, addOrderWeb, deleteCodesTempById, submitOrderWeb, saveOrderWeb, updateCodeBindSup, enterCodeWeb } from "../../api/inout/order"; -import {filterSubByInv, findByFrom, findByInvUser, findInvByUser} from "../../api/system/invSubWarehouse"; +import {findByFrom, findInvByUser} from "../../api/system/invSubWarehouse"; import draggable from "vuedraggable"; import {parseTime} from "../../utils/coTools"; import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain" -import {filterAllByLoc, filterAllByUser} from "@/api/system/invWarehouse"; -import {getLocalJoinByUser} from "../../api/basic/busType"; -// import DialogSelectUnit from "./DialogSelectUnit"; -// import selectRlDialog from "./DialogSelectRl"; -// import editCodeDialog from "./editCode"; import codesPanel from "./IoCreateOrderCodes" import codeDetailPanel from "./IoCreateOrderCodeDetail" import bizDetailPanel from "./IoCreateOrderBizDetail" import A from "../../plugins/KeyScaner" -import {isBlank} from "@/utils/strUtil"; -import {filterDepts} from "@/api/auth/authDept"; -import {selectSysParamByKey} from "@/api/param/systemParamConfig"; -import store from "@/store"; +import {findByInvUser} from "@/api/basic/busType"; export default { - name: "idQuery", + name: "ioCreateOrder", props: { closeDialog: { type: Function, required: true, }, - idQuery: { + orderQuery: { type: Object, required: true, }, @@ -332,6 +324,7 @@ export default { }, fromOptions: [], isCodeAlive: true, + bizShow: true, isBizDetailAlive: true, isCodeDetailAlive: true, @@ -377,15 +370,13 @@ export default { codesPanel, codeDetailPanel, bizDetailPanel }, methods: { - - //获取用户仓库列表 - findInvByUser() { + findInvListByUser() { this.curInvOptions = []; findInvByUser() - .then((response) => { + .then(response => { this.curInvOptions = response.data || []; - if (this.curInvOptions != null && this.curInvOptions.length > 0) { + if (this.curInvOptions != null && this.curInvOptions.length > 0 && this.orderFormData.invWarehouseCode == null) { this.orderFormData.invWarehouseCode = this.curInvOptions[0].code; this.getBusTypeByInv() } @@ -444,6 +435,10 @@ export default { //单据类型改变 actionChange(item) { this.curAction = this.getActionItem(item); + if (this.curAction.checkEnable && this.curAction.checkWebNew) { + this.bizShow = true; + } else + this.bizShow = false; if (this.curAction.corpType == 0 || this.curAction.corpType == 2 || (this.curAction.corpType == 1 && !this.curAction.genUnit)) { //1.切换往来单位 this.orderFormData.fromCorp = null; @@ -604,8 +599,8 @@ export default { }, - refreshOrder(idQuery) { - this.orderFormData = idQuery; + refreshOrder(orderQuery) { + this.orderFormData = orderQuery; }, @@ -648,7 +643,6 @@ export default { this.$refs["dataForm"].clearValidate(); // 刷新表单 this.$refs["dataForm"].resetFields(); - this.getList(); } }, enterKey(event) { @@ -819,13 +813,13 @@ export default { created() { this.codeFormData.code = ''; this.codeArray = []; - if (this.$isNotBlank(this.idQuery.billNo)) { + if (this.$isNotBlank(this.orderQuery.billNo)) { this.corpOrderIdDisabled = true; - this.orderFormData = this.idQuery; + this.orderFormData = this.orderQuery; this.actionEnable = true; this.refreshCodesPanel(); //选择框候选数据 - this.findInvByUser(); + this.findInvListByUser(); this.getBusTypeByInv(); this.findMethod(this.orderFormData.fromCorp); this.findFromInvList(); @@ -836,7 +830,7 @@ export default { this.orderFormData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10); this.orderFormData.deptCode = this.$store.getters.deptCode; this.orderFormData.invCode = this.$store.getters.locInvCode; - this.findInvByUser(); + this.findInvListByUser(); } diff --git a/src/views/inout/IoCreateOrderCodeDetail.vue b/src/views/inout/IoCreateOrderCodeDetail.vue index eb94fd3d..17e79880 100644 --- a/src/views/inout/IoCreateOrderCodeDetail.vue +++ b/src/views/inout/IoCreateOrderCodeDetail.vue @@ -29,7 +29,7 @@ :total="total" :page.sync="query.page" :limit.sync="query.limit" - @pagination="getList" + @pagination="getOrderDetails" /> diff --git a/src/views/inout/IoNewOrder.vue b/src/views/inout/IoNewOrder.vue index c0be754b..ed36141b 100644 --- a/src/views/inout/IoNewOrder.vue +++ b/src/views/inout/IoNewOrder.vue @@ -229,7 +229,7 @@ > +
+ + + + 完成验收 + + 重新验收 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 添加 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + diff --git a/src/views/inout/IoUnCheckedOrder.vue b/src/views/inout/IoUnCheckedOrder.vue index 0b6fb94b..8945514b 100644 --- a/src/views/inout/IoUnCheckedOrder.vue +++ b/src/views/inout/IoUnCheckedOrder.vue @@ -454,6 +454,7 @@ import { } from "../../api/inout/order"; import {getLocalJoinByUser} from "@/api/basic/busType"; import {getInvListByUser} from "@/api/system/invWarehouse"; +import {findInvByUser} from "@/api/system/invSubWarehouse"; import {filterSubByInv} from "@/api/system/invSubWarehouse"; import {isBlank} from "@/utils/strUtil"; import {selectSysParamByKey} from "@/api/param/systemParamConfig"; @@ -719,10 +720,10 @@ export default { .then((response) => { this.invList = response.data || []; console.log(this.invList) - this.getList(); + // this.getList(); }) .catch(() => { - }); + }) }, checkOrder(orderId) { }, diff --git a/src/views/system/param/BasicEntrutsRece.vue b/src/views/system/param/BasicEntrutsRece.vue new file mode 100644 index 00000000..8f4ca44c --- /dev/null +++ b/src/views/system/param/BasicEntrutsRece.vue @@ -0,0 +1,289 @@ + + diff --git a/src/views/system/param/BasicEntrutsReceModify.vue b/src/views/system/param/BasicEntrutsReceModify.vue new file mode 100644 index 00000000..32721df1 --- /dev/null +++ b/src/views/system/param/BasicEntrutsReceModify.vue @@ -0,0 +1,274 @@ + + + + +