diff --git a/.env.production b/.env.production index bfdbe4e0..4d77837e 100644 --- a/.env.production +++ b/.env.production @@ -4,7 +4,7 @@ VUE_APP_TITLE = UDI管理系统 # 生产环境配置 ENV = 'production' # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/' -VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_WMS_MC/' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/src/api/basic/busOriginType.js b/src/api/basic/busOriginType.js index d99fc36d..fc7fdd2c 100644 --- a/src/api/basic/busOriginType.js +++ b/src/api/basic/busOriginType.js @@ -1,4 +1,4 @@ -import axios from "../../utils/request"; +import axios from "@/utils/request"; export function getOriginBusType(query) { return axios({ diff --git a/src/api/basic/busType.js b/src/api/basic/busType.js index 62d2149d..72704968 100644 --- a/src/api/basic/busType.js +++ b/src/api/basic/busType.js @@ -1,4 +1,4 @@ -import axios from "../../utils/request"; +import axios from "@/utils/request"; export function getBusTypeList(params) { return axios({ diff --git a/src/api/basic/busTypeChange.js b/src/api/basic/busTypeChange.js index 0ab63dc3..681a45f7 100644 --- a/src/api/basic/busTypeChange.js +++ b/src/api/basic/busTypeChange.js @@ -1,4 +1,4 @@ -import axios from "../../utils/request"; +import axios from "@/utils/request"; export function getBusTypeChangeList(params) { return axios({ diff --git a/src/api/basic/busTypePre.js b/src/api/basic/busTypePre.js index 8d5dfe96..f26181d2 100644 --- a/src/api/basic/busTypePre.js +++ b/src/api/basic/busTypePre.js @@ -1,4 +1,4 @@ -import axios from "../../utils/request"; +import axios from "@/utils/request"; export function getBusTypePreResList(params) { return axios({ diff --git a/src/api/basic/bussinessType.js b/src/api/basic/bussinessType.js index 525f28c4..a2e7431a 100644 --- a/src/api/basic/bussinessType.js +++ b/src/api/basic/bussinessType.js @@ -1,4 +1,4 @@ -import axios from "../../utils/request"; +import axios from "@/utils/request"; export function getBussinessType(query) { return axios({ diff --git a/src/api/inout/acceptOrder.js b/src/api/inout/acceptOrder.js index e4ffc885..750d0416 100644 --- a/src/api/inout/acceptOrder.js +++ b/src/api/inout/acceptOrder.js @@ -26,3 +26,12 @@ export function acceptAddCode(query) { data: query }); } + +export function getAcceptStatus(query) { + return axios({ + url: "/udiwms/stock/order/accept/getStatus", + method: "get", + params: query + }); +} + diff --git a/src/api/inout/code.js b/src/api/inout/code.js index bc637415..aa5167fa 100644 --- a/src/api/inout/code.js +++ b/src/api/inout/code.js @@ -16,6 +16,23 @@ export function tabCode(query) { }); } +export function getCodeLost(query) { + return axios({ + url: "/warehouse/inout/getCodeLost", + method: "post", + data: query + }); +} + +export function updateCodeLost(query) { + return axios({ + url: "/warehouse/inout/updateCodeLost", + method: "post", + data: query + }); +} + + export function findByCode(query) { return axios( diff --git a/src/api/inout/order.js b/src/api/inout/order.js index 8163470c..fc6656f7 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -58,6 +58,14 @@ export function saveOrderWeb(query) { }); } +export function filterInvoice(params) { + return axios({ + url: "/udiwms/inout/order/filterInvoice", + method: "get", + params: params + }); +} + export function orderListError(query) { return axios({ @@ -423,6 +431,15 @@ export function updateStatus(query) { }); } +export function thirdUpdateStatus(query) { + return axios({ + url: "/spms/inout/order/third/updateStatus", + method: "post", + data: query + }); +} + + export function filterOrderTrace(params) { return axios({ url: "/udiwms/inout/order/filterOrderTrace", diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js index 79953cc4..7b8795b5 100644 --- a/src/api/inout/orderDetailBiz.js +++ b/src/api/inout/orderDetailBiz.js @@ -8,6 +8,40 @@ export function getBizDetailList(params) { }); } +export function filterListInvoice(params) { + return axios({ + url: "/udiwms/inout/bizDetail/filterListInvoice", + method: "get", + params: params + }); +} + +export function deleteById(params) { + return axios({ + url: "/udiwms/inout/biz/deleteById", + method: "get", + params: params + }); +} + +export function updateById(data) { + return axios({ + url: "/udiwms/inout/biz/updateById", + method: "post", + data: data + }); +} + +export function insertInvoice(params) { + return axios({ + url: "/udiwms/inout/biz/insertInvoice", + method: "post", + data: params + }); +} + + + export function getCheckDetailList(params) { return axios({ url: "/udiwms/inout/wditCheck/filterList", diff --git a/src/api/inout/orderDetailResult.js b/src/api/inout/orderDetailResult.js index 1c84516b..244896f9 100644 --- a/src/api/inout/orderDetailResult.js +++ b/src/api/inout/orderDetailResult.js @@ -7,3 +7,11 @@ export function getResultDetailList(params) { params: params }); } + +export function getResultOrderList(params) { + return axios({ + url: "/udiwms/inout/resultDetail/filterOrderList", + method: "get", + params: params + }); +} diff --git a/src/views/basic/busType/busTypeAdvancedSettings.vue b/src/views/basic/busType/busTypeAdvancedSettings.vue index ed12ed7b..1fcee1f5 100644 --- a/src/views/basic/busType/busTypeAdvancedSettings.vue +++ b/src/views/basic/busType/busTypeAdvancedSettings.vue @@ -2,877 +2,952 @@
- - - - 启用单据类型 - - - - - 启用 - 不启用 - - - - - 是否启用此单据类型 - - - - - 允许手动输入客户信息 - - - - - 允许 - 不允许 - - - - - 允许客户在做单时手动输入客户信息 - - - - - 允许科室多次使用出库 - - - - - 允许 - 不允许 - - - - - 允许产品多次使用使用出库 - - - - - 手持终端提交单据至自助平台 - - - - - 启用 - 不启用 - - - - - 手持终端提交单据至自助平台 - - - - - 允许验收自助平台单据 - - - - - 允许 - 不允许 - - - - - 允许验收自助平台单据 - - - - - 寄售类型单据 - - - - - 启用 - 不启用 - - - - - 设置此单据是否为寄售单据类型 - - - - - 预验收 - - - - - 启用 - 不启用 - - - - - 设置此单据类型为预验收单据类型 - - - - - 允许供应商使用 - - - - - 允许 - 不允许 - - - - - 是否允许供应商使用此单据类型 - - - - - - 预验收是否带回 - - - - - 启用 - 不启用 - - - - - 预验收是否带回 - - +
+ + + 单据设置 + + +
+ +
+ + + 参数 + + + + 设置 + + + + 参数设置说明 + + + +
+ + + + 启用单据类型 + + + + + + + + + + + 是否启用此单据类型 + + + + + + + 允许手动输入客户信息 + + + + + + + + + + + 允许客户在做单时手动输入客户信息 + + + + + + + 允许科室多次使用出库 + + + + + + + + + + + 允许产品多次使用使用出库 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 预验收是否带回 + + + + + + + + + + + 预验收是否带回 + + + + +
+ + + 单据默认选项 + + +
+ + + +
+ + + 参数 + + + + 设置 + + + + 参数设置说明 + + + +
+ + + 出库时必须校验预验收库存 + + + + + + + + + + + 出库时必须校验预验收库存 + + - - - - - 出库时必须校验预验收库存 - - - - - 启用 - 不启用 - - - - - 出库时必须校验预验收库存 - - - - - 是否只允许有库存产品出库 - - - - - 启用 - 不启用 - - - - - 设置是否只允许有库存产品出库 - - - - - 采集UDI码时进行三期校验 - - - - - 启用 - 不启用 - - - - - 采集UDI码时进行三期校验 - - - - - 校验产品是否可配送 - - - - - 启用 - 不启用 - - - - - 校验产品是否可配送 - - - - - 校验是否集采产品 - - - - - - - + + + + 是否只允许有库存产品出库 + + + + + + - - - - 校验是否集采产品 - - + + + + 设置是否只允许有库存产品出库 + + + + + + 采集UDI码时进行三期校验 + + + + + + + + + + + 采集UDI码时进行三期校验 + + - - - - - 需要校验的单据来源类型(一次复核) - - - - - 启用 - 不启用 - - - - - 需要校验的单据来源类型(一次复核) - - - - - web端新增单据 - - - - - 启用 - 不启用 - - - - - web端新增单据 - - - - - 手持终端未校验单据 - - - - - 启用 - 不启用 - - - - - 手持终端未校验单据 - - - - - 手持终端已校验单据 - - - - - 启用 - 不启用 - - - - - 手持终端已校验单据 - - - - - 是否校验UDIMS平台单据 - - - - - 启用 - 不启用 - - - - - 是否校验UDIMS平台单据 - - - - - UDI扫码通 - - - - - 启用 - 不启用 - - - - - UDI扫码通 - - - - - 校验产品是否可配送 - - - - - 启用 - 不启用 - - - - - 自助平台同步 - - - - - 自动补单 - - - - - 启用 - 不启用 - - - - - 自动补单 - - - - - 平衡补单 - - - - - 启用 - 不启用 - - - - - 平衡补单 - - - - - 手动补单 - - - - - 启用 - 不启用 - - - - - 手动补单 - - - - 手动补单 - - + + + 校验产品是否可配送 + + + + + + + + + + + 校验产品是否可配送 + + - - - - 需要单据复核的单据来源类型(二次复核) - - - - - 启用 - 不启用 - - - - - 需要单据复核的单据来源类型(二次复核) - - - - - web端新增单据 - - - - - 启用 - 不启用 - - - - - web端新增单据 - - - - - 手持终端未校验单据 - - - - - 启用 - 不启用 - - - - - 手持终端未校验单据 - - - - - 手持终端已校验单据 - - - - - 启用 - 不启用 - - - - - 手持终端已校验单据 - - - - - 校验产品是否可配送 - - - - - 启用 - 不启用 - - - - - 是否校验UDIMS平台单据 - - - - - UDI扫码通 - - - - - 启用 - 不启用 - - - - - UDI扫码通 - - - - - 校验产品是否可配送 - - - - - 启用 - 不启用 - - - - - 自助平台同步 - - - - - 自动补单 - - - - - 启用 - 不启用 - - - - - 自动补单 - - - - - 平衡补单 - - - - - 启用 - 不启用 - - - - - 平衡补单 - - - - - 手动补单 - - - - - 启用 - 不启用 - - - - - 手动补单 - - + + + + 校验是否集采产品 + + + + + + + + + + + + 校验是否集采产品 + + + +
+ + +
+ + + + 单据是否必须手动校验业务单，请指定单据的来源类型(校验业务单) + + + +
+ + +
+ + + 参数 + + + + 设置 + + + + 参数设置说明 + + + +
+ + + + + + + + + + + + + + + + + + + + + web端新增单据 + + + + + + + + + + + web端新增单据 + + + + + + + 手持终端未校验单据 + + + + + + + + + + + 手持终端未校验单据 + + + + + + + 手持终端已校验单据 + + + + + + + + + + + 手持终端已校验单据 + + + + + + + 是否校验UDIMS平台单据 + + + + + + + + + + + 是否校验UDIMS平台单据 + + + + + + + UDI扫码通 + + + + + + + + + + + UDI扫码通 + + + + + + + 自助平台同步 + + + + + + + + + + + 自助平台同步 + + + + + + 缺量补单 + + + + + + + + + + + 缺量补单 + + + + + + + 平衡补单 + + + + + + + + + + + 平衡补单 + + + + + + 手动补单 + + + + + + + + + + + 手动补单 + + + +
+
+ + +
+ + + + 单据是否必须手动确认出入库(送/收货)，请指定单据的来源类型(一次审核) + + + +
+ +
+ + + 参数 + + + + 设置 + + + + 参数设置说明 + + + +
+ + + web端新增单据 + + + + + + + + + + + web端新增单据 + + + + + + + 手持终端未校验单据 + + + + + + + + + + + 手持终端未校验单据 + + + + + + + 手持终端已校验单据 + + + + + + + + + + + 手持终端已校验单据 + + + + + + + 校验产品是否可配送 + + + + + + + + + + + 是否校验UDIMS平台单据 + + + + + + + UDI扫码通 + + + + + + + + + + + UDI扫码通 + + + + + + + 校验产品是否可配送 + + + + + + + + + + + 校验产品是否可配送 + + + + + + + 缺量补单 + + + + + + + + + + + 缺量补单 + + + + + + + 平衡补单 + + + + + + + + + + + 平衡补单 + + + + + + + 手动补单 + + + + + + + + + + + 手动补单 + + + +
+
+ + +
+ + + + 单据是否必须手动审核，请指定单据的来源类型(二次审核) + + + +
+ + +
+ + + 参数 + + + + 设置 + + + + 参数设置说明 + + + +
+ + + + + + + + + + + + + + + + + + + + + + web端新增单据 + + + + + + + + + + + web端新增单据 + + + + + + + 手持终端未校验单据 + + + + + + + + + + + 手持终端未校验单据 + + + + + + + 手持终端已校验单据 + + + + + + + + + + + 手持终端已校验单据 + + + + + + + 校验产品是否可配送 + + + + + + + + + + + 是否校验UDIMS平台单据 + + + + + + + UDI扫码通 + + + + + + + + + + + UDI扫码通 + + + + + + + 校验产品是否可配送 + + + + + + + + + + + 校验产品是否可配送 + + + + + + + 缺量补单 + + + + + + + + + + + 缺量补单 + + + + + + + 平衡补单 + + + + + + + + + + + 平衡补单 + + + + + + + 手动补单 + + + + + + + + + + + 手动补单 + + + +
@@ -903,4 +978,28 @@ export default { margin-bottom: 12px; } +.el-divider { + margin: 6px 0px 8px 0px; + background: 0 0; + border-top: 1px solid #E6EBF5; +} + +.spanTitle { + font-size: 15px; + font-weight: bold; + color: #000000 +} + +.spanHeader { + font-size: 14px; + font-weight: bold; + color: #3d3b3b +} + + +.sptext { + font-size: 13px; + font-weight: normal; +} + diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index f503f47a..74f3346f 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -60,12 +60,17 @@ {{ enableMap[scope.row.enable] }} - + - + + + + @@ -123,7 +128,7 @@ v-if="modifyDialogVisible" > -
+
提交 @@ -218,9 +223,27 @@ export default { originAction: null, checkBalance: null, secCheckBalance: null, - preInBack:null, - vailDispatch:null, - vailGroupBuy:null, + preInBack: true, + vailDispatch: null, + vailGroupBuy: null, + inStock: false, + actionType: 0, + fillCodeRel: false, + + thrCheckEnable: null, + thrCheckWebNew: null, + thrCheckPdaUn: null, + thrCheckPdaEd: null, + thrCheckUdims: null, + thrCheckPc: null, + thrCheckSp: null, + thrCheckChange: null, + thrCheckBalance: null, + thrCheckCopy: null, + checkVailDate:true, //校验近效期 + checkExpire:true, //校验过期 + checkCertExpire:true, //校验证书过期 + }, enableMap: { true: "是", @@ -288,18 +311,32 @@ export default { }, onAddSubmit() { + //默认初始化 + this.inputQuery.corpType = 2; if (isBlank(this.inputQuery.name)) { this.$message.error("单据类型名称不能为空！"); return; } - if (this.$isBlank(this.inputQuery.corpType)) { - this.$message.error("往来信息类型不能为空！"); - return; - } if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) { this.$message.error("出入库类型不能为空！"); return; } + if (isBlank(this.inputQuery.name)) { + this.$message.error("单据类型名称不能为空！"); + return; + } + // if (isBlank(this.inputQuery.actionType)) { + // this.$message.error("请选择单据类型！"); + // return; + // } + if (isBlank(this.inputQuery.inStock)) { + this.$message.error("请选择是否更改库存！"); + return; + } + // if (isBlank(this.inputQuery.busType)) { + // this.$message.error("请选择特定页面！"); + // return; + // } insertBusType(this.inputQuery) .then((response) => { if (response.code == 20000) { @@ -316,14 +353,32 @@ export default { }, onModifySubmit() { - if (this.inputQuery.name == "" || this.inputQuery.name == null) { - this.$message.error("单据类型不能为空！"); + + if (isBlank(this.inputQuery.name)) { + this.$message.error("单据类型名称不能为空！"); return; } if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) { this.$message.error("出入库类型不能为空！"); return; } + if (isBlank(this.inputQuery.name)) { + this.$message.error("单据类型名称不能为空！"); + return; + } + // if (isBlank(this.inputQuery.actionType)) { + // this.$message.error("请选择单据类型！"); + // return; + // } + if (isBlank(this.inputQuery.inStock)) { + this.$message.error("请选择是否更改库存！"); + return; + } + // if (isBlank(this.inputQuery.busType)) { + // this.$message.error("请选择特定页面！"); + // return; + // } + updateBusType(this.inputQuery) .then((response) => { if (response.code == 20000) { @@ -412,9 +467,26 @@ export default { advanceType: null, preIn: null, originAction: null, - preInBack:null, - vailDispatch:null, - vailGroupBuy:null, + preInBack: true, + vailDispatch: null, + vailGroupBuy: null, + inStock: false, + actionType: 0, + fillCodeRel: false, + thrCheckEnable: null, + thrCheckWebNew: null, + thrCheckPdaUn: null, + thrCheckPdaEd: null, + thrCheckUdims: null, + thrCheckPc: null, + thrCheckSp: null, + thrCheckChange: null, + thrCheckBalance: null, + thrCheckCopy: null, + + checkVailDate:true, //校验近效期 + checkExpire:true, //校验过期 + checkCertExpire:true, //校验证书过期 } this.addDialogVisible = true; }, diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index ae867cd2..3f15795d 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -1,20 +1,20 @@ diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue index a7517f49..cb5fc6c9 100644 --- a/src/views/basic/business/stockOrder.vue +++ b/src/views/basic/business/stockOrder.vue @@ -1,183 +1,183 @@ diff --git a/src/views/basic/business/stockOrderDistribution.vue b/src/views/basic/business/stockOrderDistribution.vue index efed7f88..52ca1f3a 100644 --- a/src/views/basic/business/stockOrderDistribution.vue +++ b/src/views/basic/business/stockOrderDistribution.vue @@ -79,7 +79,7 @@ - + diff --git a/src/views/basic/business/stockOrderQRCodeDetail.vue b/src/views/basic/business/stockOrderQRCodeDetail.vue index 3c0f1d3d..924d8695 100644 --- a/src/views/basic/business/stockOrderQRCodeDetail.vue +++ b/src/views/basic/business/stockOrderQRCodeDetail.vue @@ -24,7 +24,7 @@ - + diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index dcd9b9d7..1e187225 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -15,7 +15,7 @@ size="mini" type="primary" @click.native="submit()" - >提交订单 + >立即提交 @@ -44,39 +44,41 @@ - - + + @change="actionChange"> + :value="item.action"> {{ item.name }} - {{ - item.code - }} + - - + + :disabled="corpOrderIdDisabled" @change="changeInv" filterable> + :value="item.code"> {{ item.name }} + {{ + item.warehouseName + }} + @@ -161,7 +163,7 @@ - + + + @@ -327,7 +331,7 @@ export default { isScan: true, scanText: "扫码录入：", corpOrderIdDisabled: false, - + isSupVesion: false, loading: false, index: null, formLoading: false, @@ -449,8 +453,9 @@ export default { this.bizShow = false; if (this.curAction.corpType == 0 || this.curAction.corpType == 2 || (this.curAction.corpType == 1 && !this.curAction.genUnit)) { //1.切换往来单位 - this.orderFormData.fromCorp = null; - this.findMethod(); + this.orderFormData.fromCorp = null; + this.findMethod(); + } else if (this.curAction.corpType == 3) { //2. 切换往来仓库 this.orderFormData.fromInvCode = null; @@ -791,31 +796,30 @@ export default { event.preventDefault(); event.stopPropagation(); }; - if (this.viewType !== 1) { - var that = this; - var inputer = document.getElementById("inputer"); - window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点 - sc.onInput = function (text) { - if (text.includes("delete")) { - that.codeFormData.code = ""; - that.sictomText = ""; - that.originCode = ""; - return; - } - if (that.sitcomScan) { - let tempTxt = text; - let str = tempTxt.replace(/[\r]/g, ""); - that.sictomText = that.sictomText + str; - that.codeFormData.code = that.sictomText; - } else { - - that.codeFormData.code = text; - } - }; - inputer.focus(); - } + var that = this; + var inputer = document.getElementById("inputer"); + window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点 + sc.onInput = function (text) { + if (text.includes("delete")) { + that.codeFormData.code = ""; + that.sictomText = ""; + that.originCode = ""; + return; + } + if (that.sitcomScan) { + let tempTxt = text; + let str = tempTxt.replace(/[\r]/g, ""); + that.sictomText = that.sictomText + str; + that.codeFormData.code = that.sictomText; + } else { + + that.codeFormData.code = text; + } + }; + inputer.focus(); }, created() { + //页面初始化 this.codeFormData.code = ''; diff --git a/src/views/inout/DialogReviewOrder.vue b/src/views/inout/DialogReviewOrder.vue index 8b53b8d5..5e829228 100644 --- a/src/views/inout/DialogReviewOrder.vue +++ b/src/views/inout/DialogReviewOrder.vue @@ -5,14 +5,14 @@ 完成验收 + @click.native="checkFinish()" + >完成审核 重新验收 + >重新审核 @@ -42,7 +42,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -61,7 +61,7 @@ - + - - + + - + + - - + + + + @@ -121,8 +124,8 @@ + + diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue index d8bc808b..60354392 100644 --- a/src/views/inout/IoAuditedOrder.vue +++ b/src/views/inout/IoAuditedOrder.vue @@ -87,7 +87,7 @@
- @@ -122,7 +122,7 @@ - +