diff --git a/.env.development b/.env.development index c36d00d3..eed92e7d 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统 ENV = 'development' # 开发环境 -VUE_APP_BASE_API = 'http://192.168.0.166:9991' +VUE_APP_BASE_API = 'http://127.0.0.1:9991' VUE_APP_SYNC_API ="http://127.0.0.1:10001" diff --git a/.env.production b/.env.production index 07fe03db..c0859db4 100644 --- a/.env.production +++ b/.env.production @@ -26,15 +26,14 @@ VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:83/UDI_WMS_MC/' # 文明东2 # VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/' -# 东旭 -# VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_WMS_MC/' 刘恩典 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/' # 平潭正式 # VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' -# 吴总测试服务器 +# 吴总测试服务器. + # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' # 漳州中医院 diff --git a/src/api/system/headSet.js b/src/api/system/headSet.js new file mode 100644 index 00000000..a53f88a3 --- /dev/null +++ b/src/api/system/headSet.js @@ -0,0 +1,10 @@ +import axios from '@/utils/request' + + +export function getHeadSet(query) { + return axios({ + url: "/udiwms/sys/table/head/find", + method: "get", + params: query + }); +} diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 693b770b..6e2e401e 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -206,7 +206,7 @@ >查询 - + 物资分类管理 选入预验收入库单 @@ -89,18 +89,18 @@ {{ item.name }} {{ @@ -114,18 +114,18 @@ {{ item.name }} @@ -136,9 +136,9 @@ {{ item.name }} {{ item.name }} {{ @@ -194,42 +194,42 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -238,17 +238,17 @@ @@ -259,17 +259,17 @@ {{ item.name }} {{ @@ -308,17 +308,17 @@ {{ item.name }} {{ @@ -359,17 +359,17 @@ {{ item.name }} {{ @@ -395,22 +395,22 @@ 添加 @@ -420,135 +420,135 @@ + title="提示" + :visible.sync="checkTipDialogVisible" + width="30%" + append-to-body + center> {{ checkTip }} 取消 @@ -751,20 +751,20 @@ export default { findInvListByUser() { this.curInvOptions = []; findInvByUser() - .then((response) => { - this.curInvOptions = response.data || []; - if ( - this.curInvOptions != null && - this.curInvOptions.length > 0 && - this.orderFormData.invWarehouseCode == null - ) { - //this.orderFormData.invCode = this.curInvOptions[0].code; - this.getBusTypeByInv(); - this.findCurSpaceList(this.orderFormData.invCode); - } - }) - .catch(() => { - }); + .then((response) => { + this.curInvOptions = response.data || []; + if ( + this.curInvOptions != null && + this.curInvOptions.length > 0 && + this.orderFormData.invWarehouseCode == null + ) { + //this.orderFormData.invCode = this.curInvOptions[0].code; + this.getBusTypeByInv(); + this.findCurSpaceList(this.orderFormData.invCode); + } + }) + .catch(() => { + }); }, //接收预验单传值 giveselectbox(val) { @@ -800,11 +800,11 @@ export default { code: this.orderFormData.invCode, }; findByInvUser(query) - .then((response) => { - this.busTypeOptions = response.data || []; - }) - .catch(() => { - }); + .then((response) => { + this.busTypeOptions = response.data || []; + }) + .catch(() => { + }); }, //关闭预选单弹框 closeDialogtwo() { @@ -816,40 +816,40 @@ export default { code: this.orderFormData.invCode, }; findByInvUser(query) - .then((response) => { - this.busTypeOptions = response.data || []; - this.curAction = this.getActionItem(this.orderFormData.action); - if (isBlank(this.curAction)) { - this.curAction = { - corpType: 0, - genUnit: false, - checkWebNew: null + .then((response) => { + this.busTypeOptions = response.data || []; + this.curAction = this.getActionItem(this.orderFormData.action); + if (isBlank(this.curAction)) { + this.curAction = { + corpType: 0, + genUnit: false, + checkWebNew: null + } } - } - if ( - (this.curAction.checkEnable && - (this.curAction.checkWebNew || - this.curAction.checkUdims || - this.curAction.checkCopy || - this.curAction.checkPdaEd || - this.curAction.checkPdaUn || - this.curAction.checkPc || - this.curAction.checkWebNew || - this.curAction.checkSp || - this.curAction.checkChange || - this.curAction.checkBalance)) || - this.viewType == 1 - ) { - this.bizShow = true; - } else this.bizShow = false; - }) - .catch(() => { - }); + if ( + (this.curAction.checkEnable && + (this.curAction.checkWebNew || + this.curAction.checkUdims || + this.curAction.checkCopy || + this.curAction.checkPdaEd || + this.curAction.checkPdaUn || + this.curAction.checkPc || + this.curAction.checkWebNew || + this.curAction.checkSp || + this.curAction.checkChange || + this.curAction.checkBalance)) || + this.viewType == 1 + ) { + this.bizShow = true; + } else this.bizShow = false; + }) + .catch(() => { + }); }, - delorderData(){ + delorderData() { //执行清空业务单据详情 let tQuery = Object.assign( - JSON.parse(JSON.stringify(this.orderFormData)) + JSON.parse(JSON.stringify(this.orderFormData)) ); tQuery.orderId = this.orderFormData.billNo; console.log(tQuery.orderId); @@ -864,7 +864,7 @@ export default { } }); const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails(); - console.log("66:"+codeDetailComponent); + console.log("66:" + codeDetailComponent); }, //获取往来单位候选列表 @@ -894,13 +894,13 @@ export default { } else return; getBasicUnitMaintains(cQuery) - .then((response) => { - this.loading = false; - this.fromOptions = response.data.list || []; - }) - .catch(() => { - this.loading = false; - }); + .then((response) => { + this.loading = false; + this.fromOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); }, //单据类型改变 actionChange(item) { @@ -916,10 +916,10 @@ export default { } if ( - this.curAction.corpType == 0 || - this.curAction.corpType == 2 || - this.curAction.corpType == 4 || - (this.curAction.corpType == 1 && !this.curAction.genUnit) + this.curAction.corpType == 0 || + this.curAction.corpType == 2 || + this.curAction.corpType == 4 || + (this.curAction.corpType == 1 && !this.curAction.genUnit) ) { //1.切换往来单位 this.orderFormData.fromCorp = null; @@ -981,14 +981,14 @@ export default { locInvCode: this.orderFormData.invCode, }; findByFrom(cQuery) - .then((response) => { - this.fromInvOptions = response.data || []; - if (val == 1) { - this.orderFormData.fromInvCode = this.fromInvOptions[0].code; - } - }) - .catch(() => { - }); + .then((response) => { + this.fromInvOptions = response.data || []; + if (val == 1) { + this.orderFormData.fromInvCode = this.fromInvOptions[0].code; + } + }) + .catch(() => { + }); }, //获取当前单据类型 @@ -1013,11 +1013,11 @@ export default { code: this.orderFormData.checkPreInInvCode, } filterSubAll(query) - .then((response) => { - this.curPreInInvOptions = response.data || []; - }) - .catch(() => { - }); + .then((response) => { + this.curPreInInvOptions = response.data || []; + }) + .catch(() => { + }); }, //获取预验收货位 @@ -1122,14 +1122,14 @@ export default { if (this.$isBlank(this.orderFormData.corpOrderId)) { let date = new Date(); this.orderFormData.corpOrderId = - parseTime(date, "{y}{m}{d}{h}{i}{s}") + - Math.ceil(Math.random() * 89 + 10); + parseTime(date, "{y}{m}{d}{h}{i}{s}") + + Math.ceil(Math.random() * 89 + 10); } this.codeFormData.code = this.codeFormData.code.trim(); if (this.$isBlank(this.codeFormData.code)) return; this.loading = true; let tQuery = Object.assign( - JSON.parse(JSON.stringify(this.orderFormData)) + JSON.parse(JSON.stringify(this.orderFormData)) ); tQuery.code = this.codeFormData.code; tQuery.orderType = this.viewType; @@ -1139,7 +1139,7 @@ export default { repeatAddCode(editData) { let tQuery = Object.assign( - JSON.parse(JSON.stringify(this.orderFormData)) + JSON.parse(JSON.stringify(this.orderFormData)) ); tQuery.code = this.codeFormData.code; tQuery.orderType = this.viewType; @@ -1204,34 +1204,34 @@ export default { cancelButtonText: "忽略", type: "error", }) - .then(() => { - tQuery.ignoreExpire = true; - this.addCodeSubmit(tQuery); - }) - .catch(() => { - }); + .then(() => { + tQuery.ignoreExpire = true; + this.addCodeSubmit(tQuery); + }) + .catch(() => { + }); } else if (response.code == 505) { this.$confirm(response.message, "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", }) - .then(() => { - tQuery.ignoreRecentExpire = true; - this.addCodeSubmit(tQuery); - }) - .catch(() => { - }); + .then(() => { + tQuery.ignoreRecentExpire = true; + this.addCodeSubmit(tQuery); + }) + .catch(() => { + }); } else if (response.code == 605) { this.$confirm(response.message, "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", }) - .then(() => { - }) - .catch(() => { - }); + .then(() => { + }) + .catch(() => { + }); return; } else if (response.code == 604) { this.$confirm(response.message, "提示", { @@ -1239,10 +1239,10 @@ export default { cancelButtonText: "取消", type: "warning", }) - .then(() => { - }) - .catch(() => { - }); + .then(() => { + }) + .catch(() => { + }); return; } else if (response.code == 507) { this.editOriginCodeVisible = true; @@ -1311,23 +1311,23 @@ export default { 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(() => { - }); + .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(() => { + }); }, @@ -1384,7 +1384,7 @@ export default { } } let tQuery = Object.assign( - JSON.parse(JSON.stringify(this.orderFormData)) + JSON.parse(JSON.stringify(this.orderFormData)) ); tQuery.orderId = this.orderFormData.billNo; console.log(tQuery.orderId); @@ -1426,11 +1426,11 @@ export default { cancelButtonText: "取消", type: "warning", }) - .then(() => { - this.submitCheckResult(tQuery); - }) - .catch(() => { - }); + .then(() => { + this.submitCheckResult(tQuery); + }) + .catch(() => { + }); } else { this.$confirm("此操作将以扫码结果重新生成业务单并提交，是否继续？", "提示", { @@ -1438,11 +1438,11 @@ export default { cancelButtonText: "取消", type: "warning", }) - .then(() => { - this.submitCodeResult(tQuery); - }) - .catch(() => { - }); + .then(() => { + this.submitCodeResult(tQuery); + }) + .catch(() => { + }); } } else { //配货拣货后后提交 @@ -1458,7 +1458,7 @@ export default { }, saveOrder() { let tQuery = Object.assign( - JSON.parse(JSON.stringify(this.orderFormData)) + JSON.parse(JSON.stringify(this.orderFormData)) ); tQuery.billNo = this.orderFormData.billNo; console.log("tQuery:"); @@ -1512,13 +1512,13 @@ export default { this.$confirm(response.message, "提示", { type: "warning", }) - .then(() => { - this.codeFormData.code = response.data; - this.addCode(); - }) - .catch(() => { - this.codeFormData.code = this.originCode; - }); + .then(() => { + this.codeFormData.code = response.data; + this.addCode(); + }) + .catch(() => { + this.codeFormData.code = this.originCode; + }); } else if (response.code == 508) { this.originCode = ""; this.codeFormData.code = "01" + response.data.nameCode; @@ -1661,12 +1661,12 @@ export default { this.corpOrderIdDisabled = false; let date = new Date(); this.orderFormData.createTime = parseTime( - date, - "{y}-{m}-{d} {h}:{i}:{s}" + date, + "{y}-{m}-{d} {h}:{i}:{s}" ); this.orderFormData.corpOrderId = - parseTime(date, "{y}{m}{d}{h}{i}{s}") + - Math.ceil(Math.random() * 89 + 10); + 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.findInvListByUser(); diff --git a/src/views/inout/IoAuditedOrderTest.vue b/src/views/inout/IoAuditedOrderTest.vue new file mode 100644 index 00000000..968ff7fb --- /dev/null +++ b/src/views/inout/IoAuditedOrderTest.vue @@ -0,0 +1,1262 @@ + + + + + diff --git a/src/views/inout/tableHeadSet.vue b/src/views/inout/tableHeadSet.vue new file mode 100644 index 00000000..f5b008a7 --- /dev/null +++ b/src/views/inout/tableHeadSet.vue @@ -0,0 +1,107 @@ + + + + diff --git a/src/views/inventory/DeptDeviceDetail.vue b/src/views/inventory/DeptDeviceDetail.vue index 4a041034..edb9557e 100644 --- a/src/views/inventory/DeptDeviceDetail.vue +++ b/src/views/inventory/DeptDeviceDetail.vue @@ -187,6 +187,12 @@ + + + + + + + + + + + +