From 5c2e8cd2a5b8ce689fe7554e6b7aafd8206a298e Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 14 Dec 2022 17:44:45 +0800 Subject: [PATCH 01/21] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 4 ++-- src/views/inventory/addDeviceCollectOrder.vue | 22 +++++++++++++++++++ src/views/inventory/deviceCollectOrderNew.vue | 3 ++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 21fe13e..34ae01c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1565,7 +1565,7 @@ export const asyncRouterMap = [ { path: "deviceMAOrderNew", component: deviceMAOrderNew, - name: "新增设备养护", + name: "资产管理", icon: "", meta: { authRule: ["deviceMA/orderNew"] @@ -1574,7 +1574,7 @@ export const asyncRouterMap = [ { path: "deviceMAOrderCompleted", component: deviceMAOrderCompleted, - name: "设备养护查询", + name: "养护记录", icon: "", meta: { authRule: ["deviceMA/orderCompleted"] diff --git a/src/views/inventory/addDeviceCollectOrder.vue b/src/views/inventory/addDeviceCollectOrder.vue index 818d1e0..c23191a 100644 --- a/src/views/inventory/addDeviceCollectOrder.vue +++ b/src/views/inventory/addDeviceCollectOrder.vue @@ -60,6 +60,28 @@ + + +
+ 领用人： +
+ + + + + + {{ item.name }} + {{ item.code }} + + + + diff --git a/src/views/inventory/deviceCollectOrderNew.vue b/src/views/inventory/deviceCollectOrderNew.vue index 63afe13..feaa910 100644 --- a/src/views/inventory/deviceCollectOrderNew.vue +++ b/src/views/inventory/deviceCollectOrderNew.vue @@ -44,7 +44,8 @@ - + + From 4bcd4fe31fd61cc3e0b57614a285d19f09f5a1b9 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 16 Dec 2022 15:42:35 +0800 Subject: [PATCH 03/21] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=85=BB=E6=8A=A4=E5=8A=9F=E8=83=BD=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inventory/deviceCollectOrder.js | 8 + src/api/inventory/deviceMAOrder.js | 18 ++- src/router/index.js | 5 +- src/views/inventory/addDeviceMAOrder.vue | 4 +- src/views/inventory/assetManage.vue | 170 +++++++++++++++++++ src/views/inventory/deviceMAOrderDialog.vue | 171 ++++++++++++++++++++ 6 files changed, 371 insertions(+), 5 deletions(-) create mode 100644 src/views/inventory/assetManage.vue create mode 100644 src/views/inventory/deviceMAOrderDialog.vue diff --git a/src/api/inventory/deviceCollectOrder.js b/src/api/inventory/deviceCollectOrder.js index cc46e90..db9df86 100644 --- a/src/api/inventory/deviceCollectOrder.js +++ b/src/api/inventory/deviceCollectOrder.js @@ -88,3 +88,11 @@ export function deleteCollectOrderDetail(data) { }); } +export function filterDetail(params) { + return axios({ + url: "/device/MA/order/detail/filterMAOrderDetail", + method: "get", + params: params + }); +} + diff --git a/src/api/inventory/deviceMAOrder.js b/src/api/inventory/deviceMAOrder.js index f48bed3..99214fd 100644 --- a/src/api/inventory/deviceMAOrder.js +++ b/src/api/inventory/deviceMAOrder.js @@ -8,7 +8,7 @@ export function getDeviceMAOrderList(params) { }); } -export function addDeviceMAOrder(data) { +export function addMAOrder(data) { return axios({ url: "/device/MA/order/addMAOrder", method: "post", @@ -63,3 +63,19 @@ export function deleteDeviceMAOrderDetail(data) { data: data }); } + +export function deviceList(params) { + return axios({ + url: "/device/collect/order/detail/deviceList", + method: "get", + params: params + }); +} + +export function addDeviceMAOrder(data) { + return axios({ + url: "/device/MA/order/addDeviceMAOrder", + method: "post", + data: data + }); +} diff --git a/src/router/index.js b/src/router/index.js index 34ae01c..8366e4c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -124,6 +124,7 @@ import deviceCollectOrderAudit from "@/views/inventory/deviceCollectOrderAudit.v import deviceCollectOrderCompleted from "@/views/inventory/deviceCollectOrderCompleted.vue"; import deviceMAOrderNew from "@/views/inventory/deviceMAOrderNew.vue"; import deviceMAOrderCompleted from "@/views/inventory/deviceMAOrderCompleted.vue"; +import assetManage from "@/views/inventory/assetManage.vue"; //库存 import invProducts from "../views/inventory/InvProducts.vue"; @@ -1563,8 +1564,8 @@ export const asyncRouterMap = [ }, children: [ { - path: "deviceMAOrderNew", - component: deviceMAOrderNew, + path: "assetManage", + component: assetManage, name: "资产管理", icon: "", meta: { diff --git a/src/views/inventory/addDeviceMAOrder.vue b/src/views/inventory/addDeviceMAOrder.vue index 4e22ecb..41ce712 100644 --- a/src/views/inventory/addDeviceMAOrder.vue +++ b/src/views/inventory/addDeviceMAOrder.vue @@ -225,7 +225,7 @@ + + diff --git a/src/views/inventory/deviceMAOrderDialog.vue b/src/views/inventory/deviceMAOrderDialog.vue new file mode 100644 index 0000000..6cb6f36 --- /dev/null +++ b/src/views/inventory/deviceMAOrderDialog.vue @@ -0,0 +1,171 @@ + + + + From 30ea52acc11d33c6a663cff1631cd3052ea485c0 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 16 Dec 2022 17:32:22 +0800 Subject: [PATCH 04/21] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inventory/InvPreInProducts.js | 8 ++++++++ src/views/inout/IOAddOrder.vue | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/api/inventory/InvPreInProducts.js b/src/api/inventory/InvPreInProducts.js index 6de1c9f..593dae9 100644 --- a/src/api/inventory/InvPreInProducts.js +++ b/src/api/inventory/InvPreInProducts.js @@ -34,3 +34,11 @@ export function statDetailProducts(query) { }); } +export function clearAllProducts(data) { + return axios({ + url: "/spms/prein/inv/products/clearAll", + method: "post", + data: data + }); +} + diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index 7a572d1..164b7a2 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -786,10 +786,13 @@ export default { customClass: 'messageIndex' }); } else { - this.$message({ - type: 'error', - message: "提交失败！" + this.editTitle, - customClass: 'messageIndex' + this.$alert(response.message, '提示', { + confirmButtonText: '确定', + type: 'warning', + closeOnClickModal: true, + callback: action => { + this.$refs.inputRef.focus(); + } }); } } From bd925d0e97f7719256618ee40691e759a51351d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 19 Dec 2022 09:26:27 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/stockOrderEditor.vue | 5 +- .../business/stockOrderNewDistribution.vue | 3 ++ .../business/stockOrderNewSelectProduct.vue | 5 +- src/views/inout/IOAddOrder.vue | 53 +++++-------------- src/views/inout/IOCheckErrorOrder.vue | 4 +- src/views/purchase/supCertificationAdd.vue | 25 +++++---- .../purchase/supManufacturerEditDialog.vue | 25 +++------ src/views/thrsys/thrOrderNew.vue | 1 - 8 files changed, 47 insertions(+), 74 deletions(-) diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index 0835e01..83625ed 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -645,8 +645,11 @@ export default { this.query.startTime = null; this.query.endTime = null; } - + this.query.page=1 this.getList(); + //清空详情数据 + this.detailQuery.page=1 + this.detailTotal=0 if (this.query.status === "202") { this.haveDistributionVisible = true; } else { diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index b765be6..f23d5e6 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -744,11 +744,13 @@ export default { this.thisData.stockOrderLists = this.codeArray; this.thisData.formData = this.formData; let item = this.getActionItem(this.formData.billType); + if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) { this.invQueryData = { locStorageCode: this.formData.locStorageCode, invWarehouseCode: this.formData.invWarehouseCode, }; + debugger if (!isBlank(this.formData.unitIdFk) && this.formData.unitIdFk === this.formData.corpId) { this.invQueryData.corpId = this.formData.corpId; } @@ -761,6 +763,7 @@ export default { }; this.selectInvProductVisible = true; } else { + this.invQueryData.corpId = this.formData.corpId; this.selectProductVisible = true; } return; diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue index 39093a9..4e25c75 100644 --- a/src/views/business/stockOrderNewSelectProduct.vue +++ b/src/views/business/stockOrderNewSelectProduct.vue @@ -307,9 +307,12 @@ export default { getList() { this.loading = true; this.listQuery.customerId = store.getters.customerId; - if( this.data.companyName!=undefined && this.data.companyName!=null ){ + if(this.data!=undefined && this.data.companyName!=undefined && this.data.companyName!=null ){ this.listQuery.companyName = this.data.companyName; } + if(this.data.formData!=undefined && this.data.formData.corpName!=undefined && this.data.formData.corpName!=null ){ + this.listQuery.companyName = this.data.formData.corpName; + } if (this.filterType != null && this.filterType === 2) { filterAllProduct(this.listQuery) diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index 7a572d1..fe214f4 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -136,7 +136,7 @@ > { - this.fromStorageOptions = response.data || []; - }) - .catch(() => { - }); - } - , findSubStorageMethod() { + this.formData.invStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId + this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId this.getBusType(); let cQuery = { code: this.formData.invWarehouseCode, @@ -988,7 +976,11 @@ export default { }); } , - + getFormCorp(){ + this.formData.subInvCode= this.fromSubStorageOptions.find(item => item.code == this.formData.fromSubInvCode).parentId + this.formData.fromCorp=this.fromSubStorageOptions.find(item => item.code == this.formData.fromSubInvCode).warehouseName + this.formData.fromCorpId=this.fromSubStorageOptions.find(item => item.code == this.formData.fromSubInvCode).code + }, findSubInvByInv(invCode) { this.subInvList = []; @@ -998,9 +990,9 @@ export default { filterSubByInv(query) .then((response) => { this.subInvList = response.data || []; - if (this.subInvList != null && this.subInvList.length == 1) { - this.formData.invWarehouseCode = this.subInvList[0].code; + if (this.subInvList != null) { this.getBusType(); + this.findSubStorageMethod(); } }) .catch(() => { @@ -1022,16 +1014,6 @@ export default { this.fromDeptOptions = []; }); }, - getStorage(event) { - this.storageList = []; - filterAllByUser() - .then((response) => { - this.storageList = response.data || []; - }) - .catch(() => { - }); - } - , getActionName(action) { for (let i = 0; i < this.busTypes.length; i++) { if (this.busTypes[i].action === action) { @@ -1178,7 +1160,7 @@ export default { this.formData.actDate = new Date(); this.codeArray = []; - this.getStorage(this.formData.action); + if (this.$isNotBlank(this.idQuery.id)) { this.formData.actDate = new Date(this.idQuery.actDate); @@ -1213,17 +1195,10 @@ export default { // this.getCodeList(); } this.formData.invWarehouseCode = this.$store.getters.locSubInvCode; + this.formData.invStorageCode=this.$store.getters.locInvCode; this.formData.locStorageCode = this.$store.getters.locInvCode; - - if (this.$isNotBlank(this.formData.locStorageCode)) { - this.findStorageMethod(); - } } this.findSubInvByInv(this.formData.locStorageCode); - this.findSubStorageMethod(); - if(this.formData.invWarehouseCode!=null){ - this.getBusType(); - } //查询是否启用多级仓库，判断是否启用部门 selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { if (res.code === 20000) { diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 69c2e8a..17dd55c 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -306,13 +306,13 @@ diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue index fe5af6c..a93c003 100644 --- a/src/views/purchase/supCertificationAdd.vue +++ b/src/views/purchase/supCertificationAdd.vue @@ -457,17 +457,20 @@ export default { /**---------------------------配送产品资质----------------------*/ onReset2() { - this.registrationQuery = { - customerId: null, - manufacturerIdFk: null, - recordProductName: "", - recordCode: "", - recordPeopleName: "", - auditStatus: null, - page: 1, - limit: 20 - }; - this.getRegistrationList(); + //判断有没有选择配送企业 + if(this.currentManufacturer!=null){ + this.registrationQuery = { + customerId: this.registrationQuery.customerId, + manufacturerIdFk: this.registrationQuery.manufacturerIdFk, + recordProductName: "", + recordCode: "", + recordPeopleName: "", + auditStatus: null, + page: 1, + limit: 20 + }; + this.getRegistrationList(); + } }, onSubmit2() { if(this.currentManufacturer==null){ diff --git a/src/views/purchase/supManufacturerEditDialog.vue b/src/views/purchase/supManufacturerEditDialog.vue index eb3e968..f4728b6 100644 --- a/src/views/purchase/supManufacturerEditDialog.vue +++ b/src/views/purchase/supManufacturerEditDialog.vue @@ -469,16 +469,16 @@ export default { 3: "变更未审核", 6: "未审核", }, + statusFlag: { + 0: "有效", + 1: "失效", + }, editTye: 1, formName: 1, formMap: { 1: "新增生产企业资质证书", 2: "编辑生产企业资质证书", }, - formMap: { - 1: "新增生产企业资质证书", - 2: "编辑生产企业资质证书", - }, manufacturerId: null, customerId: null, selectCertVisible: false, @@ -512,21 +512,8 @@ export default { }, methods: { onModifySubmit(type) { - - //判断本企业产品是否是通过审核的 - let query = { - customerId: this.$store.getters.customerId - } - getCompany(query) - .then((response) => { - if(response.data.auditStatus!=1){ - this.$message.error("本企业信息还未通过审核!"); - return; - }else{ - this.addOrModifyCompany(type); - }}).catch(() => { - - }); + + this.addOrModifyCompany(type); }, addOrModifyCompany (type){ this.$refs["inputQuery"].validate(valid => { diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue index eff776d..51057cd 100644 --- a/src/views/thrsys/thrOrderNew.vue +++ b/src/views/thrsys/thrOrderNew.vue @@ -479,7 +479,6 @@ export default { this.findSubStorageMethod(); }, subStorageChange(item) { - this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId this.formData.corpId=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).code this.formData.corpName=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).warehouseName From 4eac7d5b295ea7b45702c075ad4b1ab14c3bd93a Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 19 Dec 2022 11:22:12 +0800 Subject: [PATCH 06/21] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=B0=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth/platform.js | 91 ---- src/router/index.js | 33 -- src/views/userManage/bindPlatform.vue | 684 -------------------------- src/views/userManage/platform.vue | 293 ----------- 4 files changed, 1101 deletions(-) delete mode 100644 src/api/auth/platform.js delete mode 100644 src/views/userManage/bindPlatform.vue delete mode 100644 src/views/userManage/platform.vue diff --git a/src/api/auth/platform.js b/src/api/auth/platform.js deleted file mode 100644 index 855c154..0000000 --- a/src/api/auth/platform.js +++ /dev/null @@ -1,91 +0,0 @@ -import axios from "../../utils/axios"; - -export function getPlatform(query) { - return axios({ - url: "/udiwms/platform/list", - method: "get", - params: query - }); -} - -export function updatePlatform(data) { - return axios({ - url: "/udiwms/platform/update", - method: "post", - data: data - }); -} - -export function deletePlatform(data) { - return axios({ - url: "/udiwms/platform/remove", - method: "post", - data: data - }); -} - -export function linkPlatform(query) { - return axios({ - url: "/udiwms/platform/link", - method: "post", - data: query - }); -} - -//查询往来单位和自助平台关联数据 -export function getLinkPlatformList(query) { - return axios({ - url: "/udiwms/platform/getLinkPlatformList", - method: "get", - params: query - }); -} - -//解绑往来单位字典和自助平台 -export function unbindPlatform(query) { - return axios({ - url: "/udiwms/platform/unbind", - method: "post", - params: query - }); -} - -export function getTargetActions(query) { - return axios({ - url: "/udiwms/platform/getTargetActions", - method: "get", - params: query - }); -} - -export function getTargetInv(query) { - return axios({ - url: "/udiwms/platform/getTargetInv", - method: "get", - params: query - }); -} - -export function getTargetSubInv(query) { - return axios({ - url: "/udiwms/platform/getTargetSubInv", - method: "get", - params: query - }); -} - -export function testPlatformConnection(query) { - return axios({ - url: "/udiwms/platform/testPlatformConnection", - method: "get", - params: query - }) -} - -export function testUserInfo(data) { - return axios({ - url: "/udiwms/platform/testUserInfo", - method: "post", - data: data - }); -} diff --git a/src/router/index.js b/src/router/index.js index 8366e4c..425af8e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -178,9 +178,6 @@ import purPlan from "../views/purchase/purPlan"; import purPlanAudit from "../views/purchase/purPlanAudit"; import purPlanSearch from "../views/purchase/purPlanSearch"; -import platform from "../views/userManage/platform"; -import bindPlatform from "@/views/userManage/bindPlatform"; - // Vue.use(VueRouter); @@ -481,36 +478,6 @@ export const asyncRouterMap = [ } }, ] - }, - { - path: "/platformManage", - component: Empty, - name: "医院客户管理", - redirect: "/platformManage/platform", - icon: "", - meta: { - authRule: ["platformManage"] - }, - children: [ - { - path: "platform", - component: platform, - name: "医院自助平台", - icon: "", - meta: { - authRule: ["userManage/platform"] - } - }, - { - path: "bindPlatform", - component: bindPlatform, - name: "医院客户", - icon: "", - meta: { - authRule: ["userManage/bindPlatform"] - } - } - ] } // { diff --git a/src/views/userManage/bindPlatform.vue b/src/views/userManage/bindPlatform.vue deleted file mode 100644 index 3359e82..0000000 --- a/src/views/userManage/bindPlatform.vue +++ /dev/null @@ -1,684 +0,0 @@ - - - - - diff --git a/src/views/userManage/platform.vue b/src/views/userManage/platform.vue deleted file mode 100644 index 7a47fd9..0000000 --- a/src/views/userManage/platform.vue +++ /dev/null @@ -1,293 +0,0 @@ - - - From e43bd51f04b2a538833180ed27cc40abb1050bd5 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 19 Dec 2022 15:56:49 +0800 Subject: [PATCH 07/21] =?UTF-8?q?1.=E4=B8=8B=E8=BD=BD=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E7=AB=8B=E5=8D=B3=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/thrsys/spsSyncDownload.js | 8 ++++++++ src/views/thrsys/SysUdimsDownloadData.vue | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/src/api/thrsys/spsSyncDownload.js b/src/api/thrsys/spsSyncDownload.js index d0dfd1a..e78d379 100644 --- a/src/api/thrsys/spsSyncDownload.js +++ b/src/api/thrsys/spsSyncDownload.js @@ -24,3 +24,11 @@ export function findConfig(query) { params: query }); } + +export function downloadNow(params) { + return axios({ + url: "", + method: "get", + params: params + }); +} diff --git a/src/views/thrsys/SysUdimsDownloadData.vue b/src/views/thrsys/SysUdimsDownloadData.vue index 0fe8673..8ae7de2 100644 --- a/src/views/thrsys/SysUdimsDownloadData.vue +++ b/src/views/thrsys/SysUdimsDownloadData.vue @@ -23,6 +23,15 @@ 查询 + + + + 立即下载基础信息 + 立即下载单据类型 + 立即下载扫码单据 + 立即下载国家库信息 + + @@ -128,6 +137,7 @@ import {filterLog, deleteLog, findConfig, updateConfig} from "../../api/thrsys/spsSyncDownload"; import store from "@/store"; import ShowText from "../other/showText"; + import {downloadNow} from "../../api/thrsys/spsSyncDownload"; export default { data() { @@ -339,6 +349,19 @@ this.syncInfo = item.remark; } }) + }, + downloadNow(type) { + //立即下载数据 + let params = {type: type}; + downloadNow(params).then((res) => { + if (res.code === 20000) { + this.$message.success("同步任务创建成功，稍后请刷新查看下载日志！"); + } else { + this.$message.error(res.message); + } + }).catch((error) => { + this.$message.error(error.message); + }) } }, From 011a30345ce0637cf23088c31ca922aaf096c7d0 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 19 Dec 2022 17:41:07 +0800 Subject: [PATCH 08/21] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/BusTypeChangeModify.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/basic/BusTypeChangeModify.vue b/src/views/basic/BusTypeChangeModify.vue index c12ec1b..fbd9afd 100644 --- a/src/views/basic/BusTypeChangeModify.vue +++ b/src/views/basic/BusTypeChangeModify.vue @@ -134,7 +134,7 @@ style="width: 80%" size="small" splaceholder="请输入内容" - v-model="inputQuery.remark" + v-model="inputQuery.intro" > From ed011531b95849ab4d487f35dccae41cdc0cea96 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 19 Dec 2022 17:48:52 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/BusTypeChange.vue | 2 +- src/views/basic/invWarehouse.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/basic/BusTypeChange.vue b/src/views/basic/BusTypeChange.vue index 5447e92..f3f37c6 100644 --- a/src/views/basic/BusTypeChange.vue +++ b/src/views/basic/BusTypeChange.vue @@ -4,7 +4,7 @@ diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index f854f3f..b7f0a21 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -565,7 +565,7 @@ + :disabled="mutiInvMode"> From 635bdbead7982656a84cb89e2ad33648b70015af Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 20 Dec 2022 10:18:39 +0800 Subject: [PATCH 10/21] =?UTF-8?q?1.=E8=A1=A5=E5=85=85=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BC=BA=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/thrsys/spsSyncDownload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/thrsys/spsSyncDownload.js b/src/api/thrsys/spsSyncDownload.js index e78d379..f42d13e 100644 --- a/src/api/thrsys/spsSyncDownload.js +++ b/src/api/thrsys/spsSyncDownload.js @@ -27,7 +27,7 @@ export function findConfig(query) { export function downloadNow(params) { return axios({ - url: "", + url: "/spsync/download/now", method: "get", params: params }); From 7723268dcf082066e8b52dfea668390f5013f7f0 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 20 Dec 2022 10:37:20 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E8=A1=A5=E5=8D=95=E5=8E=BB=E6=8E=89=E4=B9=8B=E5=89=8D=E7=BC=BA?= =?UTF-8?q?=E9=87=8F=E8=A1=A5=E5=8D=95=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.json | 8 ++-- src/views/basic/BussinessTypeLoclModify.vue | 42 ++++++++++----------- src/views/thrsys/ThrInvWarehouse.vue | 1 - 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/public/config.json b/public/config.json index 01d136d..7c7e6b4 100644 --- a/public/config.json +++ b/public/config.json @@ -1,7 +1,7 @@ { - "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", - "BASE_URL":"http://192.168.0.109:9991", - "SERVER_IP": "http://192.168.0.109:9991/", - "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/", + "UDI_SYNC_SERVER_IP": "http://127.0.0.1:9995/", + "BASE_URL":"http://127.0.0.1:9992", + "SERVER_IP": "http://127.0.0.1:9992/", + "WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/", "hosp_name": "平和县医院" } diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue index de00395..30b7901 100644 --- a/src/views/basic/BussinessTypeLoclModify.vue +++ b/src/views/basic/BussinessTypeLoclModify.vue @@ -147,7 +147,7 @@ --> -
+ @@ -158,26 +158,26 @@ - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue index 187db0a..3717f8a 100644 --- a/src/views/business/stockOrderSearch.vue +++ b/src/views/business/stockOrderSearch.vue @@ -27,21 +27,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -1120,7 +1122,7 @@ export default { created() { this.isReceAble = true; - this.getStorage(); + this.getSubInvList(); this.getBusType(); let end = new Date(); let start = new Date(); diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue index f093336..d9cee37 100644 --- a/src/views/business/stockOrderWaitCheck.vue +++ b/src/views/business/stockOrderWaitCheck.vue @@ -27,21 +27,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -884,7 +886,7 @@ export default { }, created() { // 加载表格数据 - this.getStorage(); + this.getSubInvList(); this.getBusType(); let end = new Date(); let start = new Date(); diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 17dd55c..e1fc87c 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -33,21 +33,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -1162,7 +1164,7 @@ export default { }, created() { - this.getStorage(); + this.getSubInvList(); this.getBusType(); let query = this.$route.query; this.query = Object.assign(this.query, query); diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index dd464b4..960859f 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -33,21 +33,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -914,7 +916,7 @@ export default { }, created() { - this.getStorage(); + this.getSubInvList(); this.getBusType(); let query = this.$route.query; this.query = Object.assign(this.query, query); diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue index a9865ea..3aace20 100644 --- a/src/views/inout/IOFinishOrder.vue +++ b/src/views/inout/IOFinishOrder.vue @@ -1,397 +1,397 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + + + + + + + + + + + + + + + + {{ errorDetail }} + 关 闭 - - + + @@ -979,10 +981,10 @@ export default { diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index 2f48659..c09665e 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -28,21 +28,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - @@ -682,11 +682,13 @@ export default { getSubInvList() { let query = { - pcode: this.filterQuery.locStorageCode + // pcode: this.filterQuery.locStorageCode + filter: 3, }; filterSubByInv(query) .then((response) => { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -720,7 +722,7 @@ export default { }; }, created() { - this.getStorage(); + this.getSubInvList(); this.getBusType(); let query = this.$route.query; this.filterQuery = Object.assign(this.filterQuery, query); diff --git a/src/views/login/index.vue b/src/views/login/index.vue index bf37bf9..3b371d0 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,11 +1,8 @@