From b79a73bc02d7fc547d4765daf20c81c6c1172bd5 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Wed, 19 Jun 2024 09:30:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 12 +- .env.development | 12 +- package-lock.json | 212 ++++++++++++- src/api/modular/main/TaskmanageList.js | 2 +- .../BookingCustomerLedger/detail/index.vue | 4 +- .../detail/components/autoView.vue | 18 +- src/views/main/BookingLedger/detail/index.vue | 3 +- .../list/components/inputView.vue | 7 + src/views/main/BookingLedger/list/index.vue | 1 + .../BookingLedger/list/modules/formLabel.vue | 9 +- src/views/main/CabinInventory/index.vue | 10 +- src/views/main/CabinManagement/index.vue | 120 +++++++- .../main/CommondbCodeIssueTypeList/index.vue | 21 +- src/views/main/CommondbCtnlist/index.vue | 19 ++ src/views/main/CommondbFrtlist/index.vue | 19 ++ src/views/main/CommondbPackage/index.vue | 19 ++ src/views/main/CommondbPortlist/index.vue | 19 ++ src/views/main/CommondbPortloadlist/index.vue | 19 ++ src/views/main/CommondbService/index.vue | 19 ++ src/views/main/CommondbYardlist/index.vue | 19 ++ .../main/Taskmanage/BcFileDetail/Editing.vue | 39 ++- .../main/Taskmanage/TaskmanageList/index.vue | 291 +++++------------- .../TaskmanageList/modules/initData.js | 26 +- src/views/main/ruleTemp/detail.vue | 171 ++-------- 24 files changed, 687 insertions(+), 404 deletions(-) diff --git a/.env b/.env index 33e92d4..ce55dd7 100644 --- a/.env +++ b/.env @@ -2,8 +2,8 @@ NODE_ENV=production VUE_APP_PREVIEW=true # VUE_APP_TYPE = 'customer' # VUE_APP_TYPE = 'hechuan' -# VUE_APP_TYPE = 'yunyingduan' -VUE_APP_TYPE = 'gangjie' +VUE_APP_TYPE = 'yunyingduan' +# VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy # 和川大简云正式 @@ -23,13 +23,13 @@ VUE_APP_TYPE = 'gangjie' # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814 # 港捷 -VUE_APP_API_BASE_URL=http://118.190.144.189:5001 -VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001 +# VUE_APP_API_BASE_URL=http://118.190.144.189:5001 +# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001 # 客户端正式 # VUE_APP_API_BASE_URL=http://118.190.144.189:6001 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001 # 运营端正式 -# VUE_APP_API_BASE_URL=http://118.190.144.189:6002 -# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 \ No newline at end of file +VUE_APP_API_BASE_URL=http://118.190.144.189:6002 +VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 \ No newline at end of file diff --git a/.env.development b/.env.development index cf7bf3e..78c2215 100644 --- a/.env.development +++ b/.env.development @@ -1,14 +1,14 @@ NODE_ENV=development VUE_APP_PREVIEW=true -# VUE_APP_TYPE = 'customer' -VUE_APP_TYPE = 'hechuan' +VUE_APP_TYPE = 'customer' +# VUE_APP_TYPE = 'hechuan' # VUE_APP_TYPE = 'yunyingduan' # VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan # 和川大简云正式 -VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api -VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 +# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api +# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 # 和川大简云测试 # VUE_APP_API_BASE_URL=http://60.209.125.238:35100 @@ -34,5 +34,5 @@ VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 # 客户端正式 -# VUE_APP_API_BASE_URL=http://118.190.144.189:6001 -# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001 \ No newline at end of file +VUE_APP_API_BASE_URL=http://118.190.144.189:6001 +VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2866da7..46179f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6389,6 +6389,16 @@ } } }, + "define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "requires": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + } + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz", @@ -6991,6 +7001,43 @@ } } }, + "es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "requires": { + "get-intrinsic": "^1.2.4" + }, + "dependencies": { + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + }, + "get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "requires": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + } + }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + } + } + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz", @@ -8541,6 +8588,38 @@ "delegate": "^3.1.2" } }, + "gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "requires": { + "get-intrinsic": "^1.1.3" + }, + "dependencies": { + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + }, + "get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "requires": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + } + }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + } + } + }, "graceful-fs": { "version": "4.2.4", "resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.4.tgz", @@ -8612,6 +8691,19 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, + "has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "requires": { + "es-define-property": "^1.0.0" + } + }, + "has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==" + }, "has-symbols": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.1.tgz", @@ -8700,6 +8792,21 @@ "minimalistic-assert": "^1.0.1" } }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "requires": { + "function-bind": "^1.1.2" + }, + "dependencies": { + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + } + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz", @@ -14470,9 +14577,12 @@ "dev": true }, "qs": { - "version": "6.5.2", - "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz?cache=0&sync_timestamp=1610598174727&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.5.2.tgz", - "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=" + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz", + "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==", + "requires": { + "side-channel": "^1.0.6" + } }, "query-string": { "version": "4.3.4", @@ -14888,6 +14998,13 @@ "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" + }, + "dependencies": { + "qs": { + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==" + } } }, "request-promise-core": { @@ -15455,6 +15572,43 @@ "resolved": "https://registry.npm.taobao.org/set-blocking/download/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, + "set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "requires": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "dependencies": { + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + }, + "get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "requires": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + } + }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + } + } + }, "set-value": { "version": "2.0.1", "resolved": "https://registry.npm.taobao.org/set-value/download/set-value-2.0.1.tgz", @@ -15552,6 +15706,58 @@ "integrity": "sha1-1rkYHBpI05cyTISHHvvPxz/AZUs=", "dev": true }, + "side-channel": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "requires": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "dependencies": { + "call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "requires": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + } + }, + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + }, + "get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "requires": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + } + }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + }, + "object-inspect": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==" + } + } + }, "sigmund": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/sigmund/download/sigmund-1.0.1.tgz", diff --git a/src/api/modular/main/TaskmanageList.js b/src/api/modular/main/TaskmanageList.js index 514a9a9..6c0973a 100644 --- a/src/api/modular/main/TaskmanageList.js +++ b/src/api/modular/main/TaskmanageList.js @@ -318,7 +318,7 @@ export function DownloadFile(parameter) { url: '/TaskManageBC/DownloadFile', method: 'get', params: parameter, - responseType: 'arraybuffer' + responseType: 'blob' }) } export function TransferTask(parameter) { diff --git a/src/views/main/BookingCustomerLedger/detail/index.vue b/src/views/main/BookingCustomerLedger/detail/index.vue index 80047b6..a395426 100644 --- a/src/views/main/BookingCustomerLedger/detail/index.vue +++ b/src/views/main/BookingCustomerLedger/detail/index.vue @@ -825,8 +825,8 @@ :labelCol="{ span: 2 }" :wrapperCol="{ span: 22 }" has-feedback - prop="czRemark"> - + prop="soremark"> + diff --git a/src/views/main/BookingLedger/detail/components/autoView.vue b/src/views/main/BookingLedger/detail/components/autoView.vue index 9f5a7de..771921c 100644 --- a/src/views/main/BookingLedger/detail/components/autoView.vue +++ b/src/views/main/BookingLedger/detail/components/autoView.vue @@ -218,7 +218,6 @@ export default { } else { this.dataSourceList = data } - console.log(this.dataSourceList) }) }, handleChangeFirst(e) { @@ -239,7 +238,22 @@ export default { // this.dataSourceList = this.bookingInitData[`${this.type}InitList`] // return false // } - this.handleChange(e) + // this.handleChange(e) + this.inLoading = true + Object.keys(this.searchQuery).map((item, index) => { + if (['Title', 'KeyWord', 'SearchValue', 'name', 'keyword', 'queryItem', 'Name'].includes(item)) { + this.searchQuery[item] = '' + } + }) + this.dataSourceList = [] + this.getFromSelectData(this.emnuCompleteApi(this.searchApi), this.searchQuery).then(data => { + this.inLoading = false + if (data.rows) { + this.dataSourceList = data.rows + } else { + this.dataSourceList = data + } + }) }, getSelectBlur(e) { console.log(e) diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 2f27e5f..de700ac 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -1518,9 +1518,10 @@ export default { this.$refs.cargoInfo.$refs.cargoFrom.validate(valid => { cargoFrom = valid }) + console.log(this.bookingDetails) if (!this.bookingDetails.contractno) { + console.log(this.bookingDetails.contractno) this.$message.error('保存失败，运费协议号未填写') - console.log(this.bookingDetails) return false } if (!basicFrom && mailingFrom && cargoFrom) { diff --git a/src/views/main/BookingLedger/list/components/inputView.vue b/src/views/main/BookingLedger/list/components/inputView.vue index 4369cbe..3c5dffc 100644 --- a/src/views/main/BookingLedger/list/components/inputView.vue +++ b/src/views/main/BookingLedger/list/components/inputView.vue @@ -9,6 +9,7 @@ :disabled="ishd" :placeholder="placeholder" @blur="inputBlur" + @keyup.enter="pressEnter" @change="inputChange" /> @@ -59,6 +60,12 @@ export default { value: this.value }) }, + pressEnter(){ + this.$emit('handlePressEnter', { + type: this.type, + value: this.value + }) + }, inputChange(e) { if (e.type === 'click' && !this.value) { this.$emit('getInputChange', { diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 9248403..942a5ea 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -25,6 +25,7 @@ :formIndex="findex" @change="formChange" @pressEnter="pressEnterFun" + @handlePressEnter="pressEnterFun" @getCompleteList="getCompleteListFun" @selectFirst="getSelectFirst" > diff --git a/src/views/main/BookingLedger/list/modules/formLabel.vue b/src/views/main/BookingLedger/list/modules/formLabel.vue index 22b1963..fc5761d 100644 --- a/src/views/main/BookingLedger/list/modules/formLabel.vue +++ b/src/views/main/BookingLedger/list/modules/formLabel.vue @@ -1,7 +1,7 @@