diff --git a/.env.production b/.env.production index 8dd33959..f54ba371 100644 --- a/.env.production +++ b/.env.production @@ -34,12 +34,10 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' # 漳州中医院 -VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/' # 片仔癀诊断 # VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/' -# 协调平台测试（片仔癀诊断） -# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' # 应用访问路径 例如使用前缀 /admin/ diff --git a/src/api/inout/order.js b/src/api/inout/order.js index fe9f8131..e92cc7d4 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -562,3 +562,30 @@ export function orderChange(query) { }); } + +export function rollbackWaitcheck(params) { + return axios({ + url: "/udiwms/inout/order/waitCheck/rollback", + method: "get", + params: params + }); +} + + +export function submitCodeResult(query) { + return axios({ + url: "/warehouse/inout/codeResult/submitOrderWeb", + method: "post", + data: query + }); +} + +export function submitCheckResult(query) { + return axios({ + url: "/warehouse/inout/codeCheck/submitOrderWeb", + method: "post", + data: query + }); +} + + diff --git a/src/api/inout/orderDetailCode.js b/src/api/inout/orderDetailCode.js index 332e1e82..895b8d42 100644 --- a/src/api/inout/orderDetailCode.js +++ b/src/api/inout/orderDetailCode.js @@ -9,6 +9,15 @@ export function getDetailCodes(query) { }); } + +export function getCheckDetailCodes(query) { + return axios({ + url: "/admin/warehouse/inout/findCheckCode", + method: "get", + params: query + }); +} + //获取业务明细 export function getDetailBizs(query) { return axios({ diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 79d7bedf..336d9d70 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -552,10 +552,10 @@ - - - - + + + + @@ -575,10 +575,10 @@ - - - - + + + + @@ -598,10 +598,10 @@ - - - - + + + + @@ -621,10 +621,10 @@ - - - - + + + + @@ -644,10 +644,10 @@ - - - - + + + + @@ -667,10 +667,10 @@ - - - - + + + + @@ -689,10 +689,10 @@ - - - - + + + + @@ -712,10 +712,10 @@ - - - - + + + + @@ -734,11 +734,10 @@ - - - - - + + + + diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 02243d94..90f717a3 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -8,39 +8,56 @@ label-width="110px" style="margin-bottom: -15px" > - - 选入预验收库单 - - 草稿保存 - - 立即提交 - - 待配货提交 - - - 完成验收 - - - 完成验收 - - - + + + 选入预验收库单 + + 草稿保存 + + 立即提交 + + + 校验结果提交 + + 扫码结果提交 + + + 撤回单据 + + + + + + + + + + + + + + + + + + + + + + @@ -69,7 +86,6 @@ - + + + - - - + + {{ checkTip }} + + 取消 + + + + 校验结果提交 + 扫码结果提交 + + + @@ -518,7 +556,7 @@ import { submitOrderWeb, saveOrderWeb, updateCodeBindSup, - enterCodeWeb, submitAllocateBiz, + enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, } from "../../api/inout/order"; import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse"; import {parseTime} from "../../utils/coTools"; @@ -526,6 +564,7 @@ import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"; import editCodeDialog from "./DialogEditCode"; import DialogCreateOrderSelect from "./DialogCreateOrderSelect"; +import checkResultPanel from "./PanelCreateOrderCheckDetail"; import codesPanel from "./PanelCreateOrderCodes"; import codeDetailPanel from "./PanelCreateOrderCodeDetail"; import bizDetailPanel from "./PanelCreateOrderBizDetail"; @@ -553,7 +592,7 @@ export default { required: true, }, viewType: { - //1、新增业务单据页面，2.新增扫码单据页面，3、正常单据处理页面,4.带配货页面,5:有三期验收,6:无三期验收 + //1、新增业务单据页面，2.新增扫码单据页面，3、正常单据处理页面,4.待配货页面,5:有三期验收,6:无三期验收；7.待校验页面 type: Object, required: true, }, @@ -612,6 +651,7 @@ export default { fromOptions: [], isCodeAlive: true, bizShow: true, + isCheckResultAlive: true, isBizDetailAlive: true, isCodeDetailAlive: true, editCodeVisible: false, @@ -662,7 +702,7 @@ export default { editTitle: "编辑条码", fromDeptOptions: [], enableDept: false, - + viewCheckVisible: false, viewBizVisible: false, viewCodeVisible: false, viewCodeDetailVisible: false, @@ -672,10 +712,13 @@ export default { preSpaceShow: false, //寄售，预验收仓库界面 spaceCodeList: [], + checkTipDialogVisible: false, + checkTip: null, }; }, components: { codesPanel, + checkResultPanel, codeDetailPanel, bizDetailPanel, editCodeDialog, @@ -1195,18 +1238,85 @@ export default { this.isCodeAlive = false; this.isBizDetailAlive = false; this.isCodeDetailAlive = false; + this.$nextTick(() => { //重新加载组件 this.isCodeAlive = true; this.isBizDetailAlive = true; this.isCodeDetailAlive = true; + }); + + //选择性刷新 + if (this.isCheckResultAlive) { + this.isCheckResultAlive = false; + this.$nextTick(() => { + //重新加载组件 + this.isCheckResultAlive = true; + }); + } }, refreshOrder(orderQuery) { this.orderFormData = orderQuery; }, + //撤回单据 + revokeBill() { + this.$confirm("是否确定撤回单据至草稿状态?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + let query = {billNo: this.orderFormData.billNo}; + + rollbackWaitcheck(query) + .then((response) => { + if (response.code == 20000) { + this.$message.success("撤回成功！"); + this.closeDialog(); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + }); + }) + .catch(() => { + }); + }, + + + submitCheckDialog() { + this.checkTipDialogVisible = true; + }, + + //待校验以扫码结果为准 + submitCodeResult(query) { + submitCodeResult(query).then((response) => { + if (response.code === 20000) { + this.$message.success("提交成功"); + this.closeDialog(); + } else { + this.$message.error(response.message); + } + }); + }, + + //待校验以正确结果为准 + submitCheckResult(query) { + submitCheckResult(query).then((response) => { + if (response.code === 20000) { + this.$message.success("提交成功"); + this.closeDialog(); + } else { + this.$message.error(response.message); + } + }); + }, + + submit(val) { if (this.$isBlank(this.orderFormData.action)) { this.$message.warning("单据类型不能为空！"); @@ -1230,13 +1340,10 @@ export default { return; } } - - let tQuery = Object.assign( JSON.parse(JSON.stringify(this.orderFormData)) ); tQuery.orderId = this.orderFormData.billNo; - console.log(this.curAction) if (this.viewType == 2) { //扫码单据立即提交 submitCodes(tQuery).then((response) => { if (response.code === 20000) { @@ -1268,7 +1375,33 @@ export default { this.$message.error(response.message); } }); - } else { //校验后提交 + } else if (this.viewType == 7) { //待校验提交 + if (val == 1) { + this.$confirm("此操作将以校验的正确结果重新生成业务单并提交，是否继续？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.submitCheckResult(tQuery); + }) + .catch(() => { + }); + + } else { + this.$confirm("此操作将以扫码结果重新生成业务单并提交，是否继续？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.submitCodeResult(tQuery); + }) + .catch(() => { + }); + + } + } else { //配货拣货后后提交 submitOrderWeb(tQuery).then((response) => { if (response.code === 20000) { this.$message.success("提交成功"); @@ -1278,7 +1411,6 @@ export default { } }); } - }, saveOrder() { let tQuery = Object.assign( @@ -1452,6 +1584,10 @@ export default { this.viewCodeDetailVisible = true; } else if (this.viewType == 1) { this.viewBizVisible = true; + } else if (this.viewType == 7) { + this.viewCheckVisible = true; + this.viewCodeVisible = true; + this.viewCodeDetailVisible = true; } else { this.viewCodeVisible = true; this.viewCodeDetailVisible = true; diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue index 31ee6622..7f20ecfb 100644 --- a/src/views/inout/InvoiceRegByFp.vue +++ b/src/views/inout/InvoiceRegByFp.vue @@ -346,7 +346,7 @@ + diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue index a3f20751..140c1bdb 100644 --- a/src/views/inout/IoCreateOrder.vue +++ b/src/views/inout/IoCreateOrder.vue @@ -188,14 +188,14 @@ >删除 - 校验提交 - + + + + + + + + diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue index d8eed1f9..3af121df 100644 --- a/src/views/inout/IoCreateScanOrder.vue +++ b/src/views/inout/IoCreateScanOrder.vue @@ -104,11 +104,12 @@ 新增单据 + 异常扫码单 @@ -157,14 +158,14 @@ >删除 - 提交校验 - + + + + + + + + @@ -184,6 +185,19 @@ :viewType="viewType" > + + + +
+ + + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + + +
+ + 显示/隐藏搜索栏 + 重置 + + 查询 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue index 68af47cd..2f099afc 100644 --- a/src/views/inout/IoDealOrder.vue +++ b/src/views/inout/IoDealOrder.vue @@ -128,7 +128,7 @@ {{ scope.row.createTime }} - + @@ -167,13 +167,13 @@ >删除 - 校验提交 - + + + + + + + @@ -373,6 +373,7 @@ export default { startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, + vueType: "waitDeal", }, viewType: 3, checkStatus: { @@ -417,6 +418,7 @@ export default { "12": "采购计划", "13": "领用单据", "14": "第三方系统单据", + "15": "采购计划转单", }, deleteData: { billNo: "", @@ -491,6 +493,7 @@ export default { limit: 10, startTime: null, endTime: null, + vueType: "waitDeal", invCode: this.$store.getters.locInvCode, }; this.actDateRange = []; @@ -526,7 +529,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, - vueType: "supDelivery", + vueType: "waitDeal", }; getLocalJoinByUser(query) .then((response) => { @@ -671,6 +674,9 @@ export default { if (!row.checkSuccess) { rowBackground.color = '#f60303'; } + if (row.count != row.scanCount) { + rowBackground.color = '#f60303'; + } return rowBackground; }, diff --git a/src/views/inout/PanelCreateOrderCheckDetail.vue b/src/views/inout/PanelCreateOrderCheckDetail.vue new file mode 100644 index 00000000..163d7b17 --- /dev/null +++ b/src/views/inout/PanelCreateOrderCheckDetail.vue @@ -0,0 +1,416 @@ + + + + + + + diff --git a/src/views/inout/PanelCreateOrderCodes.vue b/src/views/inout/PanelCreateOrderCodes.vue index 3492962d..00510b12 100644 --- a/src/views/inout/PanelCreateOrderCodes.vue +++ b/src/views/inout/PanelCreateOrderCodes.vue @@ -15,6 +15,18 @@ width="280" show-overflow-tooltip > + + + + +
+ +
+ + 红色:多余条码 + +
+ + + 黄色:包含多余条码 + + +
+ + + +
@@ -166,6 +197,7 @@ import selectRlDialog from "./DialogSelectRl"; import DialogSelectUnit from "./DialogSelectUnit"; import editCodeDialog from "./DialogEditCode"; import {parseTime} from "@/utils/coTools"; +import {getCheckDetailCodes} from "@/api/inout/orderDetailCode"; export default { name: "IoAddCodeDetail", @@ -189,6 +221,10 @@ export default { editTitle: { type: Object, required: true, + }, + viewType: { + type: Object, + required: true, } }, @@ -214,22 +250,41 @@ export default { getCodeList() { this.loading = true; this.query.orderId = this.idQuery.billNo; - errorCodeList(this.query) //查找该单号下的所有条码 - .then((response) => { - this.codeArray = response.data.list || []; - this.total = response.data.total || 0; - for (let i = 0; i < this.codeArray.length; i++) { - this.codeArray[i].fromType = this.formData.fromType; - this.codeArray[i].billType = this.formData.billType; - } - this.tableSelection(); - this.loading = false; - }) - .catch(() => { - this.loading = false; - this.list = []; - this.total = 0; - }); + + if (this.viewType == 7) { + //展示带校验条码 + getCheckDetailCodes(this.query) //查找该单号下的所有条码 + .then((response) => { + this.codeArray = response.data.list || []; + this.total = response.data.total || 0; + this.loading = false; + }) + .catch(() => { + this.loading = false; + this.detailList = []; + this.total = 0; + }); + + } else { + errorCodeList(this.query) //查找该单号下的所有条码 + .then((response) => { + this.codeArray = response.data.list || []; + this.total = response.data.total || 0; + for (let i = 0; i < this.codeArray.length; i++) { + this.codeArray[i].fromType = this.formData.fromType; + this.codeArray[i].billType = this.formData.billType; + } + this.tableSelection(); + this.loading = false; + }) + .catch(() => { + this.loading = false; + this.list = []; + this.total = 0; + }); + } + + }, deleteCode(index, row) { @@ -277,6 +332,11 @@ export default { if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) { rowBackground.color = '#f60303'; } + if (row.checkStatus == 2) { + rowBackground.color = '#F7BB29'; + } else if (row.checkStatus == 1) { + rowBackground.color = '#FC4A45'; + } return rowBackground; }, diff --git a/src/views/inout/muti/ioOrderMutiEditDialog.vue b/src/views/inout/muti/ioOrderMutiEditDialog.vue index 95732523..99b8af44 100644 --- a/src/views/inout/muti/ioOrderMutiEditDialog.vue +++ b/src/views/inout/muti/ioOrderMutiEditDialog.vue @@ -10,7 +10,7 @@ + :disabled="detailList.length>0 || this.formName==2" placeholder="请输入UDI" clearable> @@ -220,6 +220,7 @@ export default { this.pId = response.data; filterMutiList({id: this.pId}).then((response) => { if (response.code == 20000) { + this.showFlg=true; this.inputQuery.cpmctymc = response.data.data.cpmctymc this.inputQuery.ggxh = response.data.data.ggxh this.inputQuery.totalCount = response.data.data.totalCount @@ -257,7 +258,8 @@ export default { this.inputQuery.useCount = response.data.data.useCount this.$refs.fromCorpInputRef.focus(); this.checkType=null; - this.showFlg=false; + this.showFlg=true; + this.formName=2 this.enterKeyup(); } else { this.$refs.markInputRef.focus(); @@ -427,6 +429,7 @@ export default { this.inputQuery.useCount = response.data.useCount this.pId = response.data.id; this.showFlg=true; + this.formName=2 this.$refs.fromCorpInputRef.focus(); this.selectMutiDetailList() } else { diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue index 77b9831a..39fe4a5b 100644 --- a/src/views/purchase/product/supProductEditDialog.vue +++ b/src/views/purchase/product/supProductEditDialog.vue @@ -551,7 +551,13 @@ export default { } } if(val==3){ - this.$confirm( "已审核通过，是否需要重新提交变更", { + let msg =null; + if(this.inputQuery.auditStatus == 1 || this.inputQuery.auditStatus == 4){ + msg = "已审核通过，是否需要重新提交变更"; + }else if(this.inputQuery.auditStatus == 2){ + msg = "审核拒绝，是否需要重新提交变更"; + } + this.$confirm( msg, { confirmButtonText: "确定", type: "warning", showCancelButton: false,