From 2c637fb0cf2321fb56278c2e172935c812a57cea Mon Sep 17 00:00:00 2001 From: wuwx <1960@qq.com> Date: Mon, 29 Apr 2024 17:03:52 +0800 Subject: [PATCH] =?UTF-8?q?'=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/createDataTable.js | 2 +- components/head-view/head-view.vue | 6 +- pages/discharge/index.vue | 4 +- pages/discharge/instruct.vue | 17 ++++- pages/index/domesticTrade.vue | 23 ++++-- pages/index/index.vue | 4 +- pages/index/instruct.vue | 35 +++++---- pages/shipWork/index.vue | 45 ++++++++++-- pages/shipWork/mixSign.vue | 11 ++- pages/shipWork/shiftAdd.vue | 112 +++++++++++++++++++++++++++-- 10 files changed, 218 insertions(+), 41 deletions(-) diff --git a/common/createDataTable.js b/common/createDataTable.js index c41630a..2e17f3f 100644 --- a/common/createDataTable.js +++ b/common/createDataTable.js @@ -92,7 +92,7 @@ module.exports = { // 创建工班信息详细 workMessageRespInfoList createWorkMessageRespInfoList() { let sql = - 'CREATE TABLE if not exists workMessageRespInfoList ("webId" text NOT NULL,"vtpId" text,"contactId" text,"carType" text,"carTypeName" text,"goodsNumber" text,"loadingType" text,"loadingTypeName" text,"remark" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' + 'CREATE TABLE if not exists workMessageRespInfoList ("webId" text NOT NULL,"vtpId" text,"contactId" text,"carType" text,"carTypeName" text,"goodsNumber" text,"loadingType" text,"loadingTypeName" text,"remark" text,"mnfBl" text,"weight" text,"volume" text,"lengthType" text,"pmtType" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' this.executeSql(sql) }, // 创建工班信息翻仓 retallyMessageRespList diff --git a/components/head-view/head-view.vue b/components/head-view/head-view.vue index f7523c2..0a93b5e 100644 --- a/components/head-view/head-view.vue +++ b/components/head-view/head-view.vue @@ -109,11 +109,11 @@ this.outVvyId = "" this.outVvyName = "" if (v.importExportFlagName == '出口') { - this.inVvyId = v.vvyId - this.inVvyName = v.vvyName - } else { this.outVvyId = v.vvyId this.outVvyName = v.vvyName + } else { + this.inVvyId = v.vvyId + this.inVvyName = v.vvyName } let obj = { inVvyId: this.inVvyId, diff --git a/pages/discharge/index.vue b/pages/discharge/index.vue index 3dda369..c1c9b11 100644 --- a/pages/discharge/index.vue +++ b/pages/discharge/index.vue @@ -146,7 +146,7 @@ dcList:[ { value: "0", - name: "待作业" + name: "未开始" }, { value: "1", @@ -157,7 +157,7 @@ name: "已完成" }, ], - vvyStatus:'待作业', + vvyStatus:'未开始', operationDate:'', startDate:'', endDate:'', diff --git a/pages/discharge/instruct.vue b/pages/discharge/instruct.vue index d902e03..8d58807 100644 --- a/pages/discharge/instruct.vue +++ b/pages/discharge/instruct.vue @@ -916,7 +916,7 @@ this.getBrand() // 获取品牌 this.getBvm() // 获取车型 this.getRoleId() // 获取角色ID - this.initAsk() // 获取装船要求 + // this.initAsk() // 获取装船要求 this.getStatistics() // 获取统计数据 this.getJobProgress() //获取卸船进度数据 @@ -967,6 +967,8 @@ }, // 刷新 refresh() { + this.itemList = [] + this.current = 1 if (this.tabsValue == 1 || this.tabsValue == 2) { this.loadOtherOrder() } else if (this.tabsValue == 0) { @@ -1114,7 +1116,7 @@ teamFlag = true } uni.request({ - url: `${this.$local}/api/unload/command/pageCommandForBranch?vvyId=${this.shipInfo.vvyId}&brdId=${this.brdId}&mnfBl=${this.mnfBl}&bvmId=${this.bvmId}&sendStatus=${this.sendValue}&size=${this.pageSize}¤t=${this.current}&tradeType=${this.tradeType}`, + url: `${this.$local}/api/unload/command/pageCommandForBranch?vvyId=${this.shipInfo.vvyId}&brdId=${this.brdId}&mnfBl=${this.mnfBl}&bvmId=${this.bvmId}&sendStatus=${this.sendValue}&size=${this.pageSize}¤t=${this.current}&tradeType=${this.tradeType}&teamFlag=${teamFlag}`, header: { 'Content-Type': 'application/json', //自定义请求头信息 'Authorization': `Bearer ${this.loginObj.access_token}` @@ -1431,6 +1433,7 @@ }, // 点击卸船要求 ask(type) { + this.initAsk() // 获取装船要求 this.$refs.popup2.open(type) }, // 卸船要求确认 @@ -2728,6 +2731,13 @@ /deep/.uni-select__input-text { text-align: left; } + /deep/.is-textarea { + width: 77vw; + height: 21vh; + } + /deep/.uni-easyinput__content-textarea { + height: 20vh; + } .popupBtn { margin-top: 20px; @@ -2757,7 +2767,8 @@ } .popupBox2 { - width: 500px; + width: 80vw; + height: 38vh; } // 右侧抽屉筛选 diff --git a/pages/index/domesticTrade.vue b/pages/index/domesticTrade.vue index 2ded570..c7c7d15 100644 --- a/pages/index/domesticTrade.vue +++ b/pages/index/domesticTrade.vue @@ -200,7 +200,7 @@ 型号： - {{item2.bvdName}} + {{item2.model}} @@ -283,7 +283,7 @@