From 062bb4500a6f74a38b8b5fe819bdb002cca9ea7a Mon Sep 17 00:00:00 2001 From: 13208366016 <47278630@qq.com> Date: Tue, 7 Nov 2023 23:06:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/views/index.js | 24 +- .../driverArtery/basicdataDriverArtery.vue | 2 +- src/views/distribution/signfor/devtmp.vue | 1739 ++++++++ .../signfor/distributionSignforedt.vue | 3934 ++++++++++------- .../signfor/distributionSignforedtTD.vue | 2299 ---------- vite.config.js | 4 +- 6 files changed, 4001 insertions(+), 4001 deletions(-) create mode 100644 src/views/distribution/signfor/devtmp.vue delete mode 100644 src/views/distribution/signfor/distributionSignforedtTD.vue diff --git a/src/router/views/index.js b/src/router/views/index.js index d7908df4..8cd8afd6 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1047,18 +1047,18 @@ export default [ // }, // ], // }, - // { - // path: '/distribution/signfor/devtmp', - // component: Layout, - // redirect: '/distribution/signfor/devtmp', - // children: [ - // { - // path: '/distribution/signfor/devtmp', - // name: '签收明细重构', - // component: () => import('@/views/distribution/signfor/devtmp.vue'), - // }, - // ], - // }, + { + path: '/distribution/signfor/devtmp', + component: Layout, + redirect: '/distribution/signfor/devtmp', + children: [ + { + path: '/distribution/signfor/devtmp', + name: '签收明细重构', + component: () => import('@/views/distribution/signfor/devtmp.vue'), + }, + ], + }, // { // path: 'basicdata/goodsShelf/basicdataGoodsShelfView', // component: Layout, diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index 8869fdb9..98310414 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -639,7 +639,7 @@ export default { console.log(row.bindVehicles); } - if (Array.isArray(row.bindVehicles)) { + if (Array.isArray(row.warehouseId)) { row.warehouseId = row.warehouseId.join(',');//仓库处理 console.log(row.warehouseId); } diff --git a/src/views/distribution/signfor/devtmp.vue b/src/views/distribution/signfor/devtmp.vue new file mode 100644 index 00000000..b825295c --- /dev/null +++ b/src/views/distribution/signfor/devtmp.vue @@ -0,0 +1,1739 @@ + + + + + diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue index b825295c..5197092d 100644 --- a/src/views/distribution/signfor/distributionSignforedt.vue +++ b/src/views/distribution/signfor/distributionSignforedt.vue @@ -1,1739 +1,2299 @@ - - diff --git a/src/views/distribution/signfor/distributionSignforedtTD.vue b/src/views/distribution/signfor/distributionSignforedtTD.vue deleted file mode 100644 index 5197092d..00000000 --- a/src/views/distribution/signfor/distributionSignforedtTD.vue +++ /dev/null @@ -1,2299 +0,0 @@ - - - - - diff --git a/vite.config.js b/vite.config.js index c74cba5a..f84500a1 100644 --- a/vite.config.js +++ b/vite.config.js @@ -20,8 +20,8 @@ export default ({ mode, command }) => { // target: 'http://192.168.10.101:8888', // target: 'http://192.168.10.75:8777', // tjj - // target: 'http://192.168.10.29:13000', - target: 'http://test.api.huitongys.com', + target: 'http://192.168.10.29:13000', + // target: 'http://test.api.huitongys.com', // target: 'http://h5uapi.huitongys.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''),