From 62c351d1f1d1a604f2788a1b51b92899e99e52c3 Mon Sep 17 00:00:00 2001
From: Panzihang <819652404@qq.com>
Date: Mon, 13 Nov 2023 10:11:34 +0800
Subject: [PATCH] 11.13
---
components/head-info/head-info.vue | 5 +-
manifest.json | 3 +-
pages.json | 6 +
pages/discharge/index.vue | 59 +-
pages/discharge/instruct.vue | 723 ++++++++-------
pages/discharge/instructDetails.vue | 2 +
pages/index/index.vue | 60 +-
pages/index/instruct.vue | 849 ++++++++----------
pages/index/instructDetails.vue | 2 +
pages/login/index.vue | 6 +-
pages/quality/details.vue | 363 ++++----
pages/quality/edit.vue | 52 +-
pages/quality/index.vue | 189 ++--
pages/quality/sign.vue | 15 +-
pages/quality/zsEdit.vue | 143 +--
pages/receipt/index.vue | 8 +-
pages/receipt/sign.vue | 8 +-
pages/shipWork/index.vue | 23 +-
pages/shipWork/mixSign.vue | 5 +-
pages/shipWork/shiftAdd.vue | 40 +-
pages/shipWork/sign.vue | 6 +-
pages/shipWork/untieAdd.vue | 3 -
static/images/cjhIcon.png | Bin 0 -> 1382 bytes
static/images/cpIcon.png | Bin 0 -> 1416 bytes
static/images/editBtn.png | Bin 0 -> 1433 bytes
static/images/zs2.jpg | Bin 0 -> 66658 bytes
static/images/zsIcon.png | Bin 0 -> 1331 bytes
static/images/zxIcon.png | Bin 0 -> 1567 bytes
uni_modules/jp-signature.rar | Bin 0 -> 32427 bytes
uni_modules/jp-signature/changelog.md | 6 +
.../jp-signature-popup/jp-signature-popup.vue | 448 +++++++++
.../components/jp-signature/context.js | 118 +++
.../components/jp-signature/jp-signature.vue | 475 ++++++++++
.../components/jp-signature/props.js | 59 ++
.../components/jp-signature/render.js | 140 +++
.../components/jp-signature/signature.js | 1 +
.../components/jp-signature/utils.js | 161 ++++
.../jp-signature/hybrid/html/index.html | 151 ++++
.../jp-signature/hybrid/html/signature.js | 1 +
.../hybrid/html/uni.webview.1.5.3.js | 1 +
uni_modules/jp-signature/package.json | 77 ++
.../jp-signature/pages/index/index.vue | 34 +
uni_modules/jp-signature/readme.md | 129 +++
43 files changed, 3190 insertions(+), 1181 deletions(-)
create mode 100644 static/images/cjhIcon.png
create mode 100644 static/images/cpIcon.png
create mode 100644 static/images/editBtn.png
create mode 100644 static/images/zs2.jpg
create mode 100644 static/images/zsIcon.png
create mode 100644 static/images/zxIcon.png
create mode 100644 uni_modules/jp-signature.rar
create mode 100644 uni_modules/jp-signature/changelog.md
create mode 100644 uni_modules/jp-signature/components/jp-signature-popup/jp-signature-popup.vue
create mode 100644 uni_modules/jp-signature/components/jp-signature/context.js
create mode 100644 uni_modules/jp-signature/components/jp-signature/jp-signature.vue
create mode 100644 uni_modules/jp-signature/components/jp-signature/props.js
create mode 100644 uni_modules/jp-signature/components/jp-signature/render.js
create mode 100644 uni_modules/jp-signature/components/jp-signature/signature.js
create mode 100644 uni_modules/jp-signature/components/jp-signature/utils.js
create mode 100644 uni_modules/jp-signature/hybrid/html/index.html
create mode 100644 uni_modules/jp-signature/hybrid/html/signature.js
create mode 100644 uni_modules/jp-signature/hybrid/html/uni.webview.1.5.3.js
create mode 100644 uni_modules/jp-signature/package.json
create mode 100644 uni_modules/jp-signature/pages/index/index.vue
create mode 100644 uni_modules/jp-signature/readme.md
diff --git a/components/head-info/head-info.vue b/components/head-info/head-info.vue
index bf91c36..61cee82 100644
--- a/components/head-info/head-info.vue
+++ b/components/head-info/head-info.vue
@@ -406,7 +406,10 @@
border-radius: 1px;
display: flex;
justify-content: space-between;
- position: relative;
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: 999;
.infoLeft {
display: flex;
diff --git a/manifest.json b/manifest.json
index f8285f3..69957ab 100644
--- a/manifest.json
+++ b/manifest.json
@@ -19,7 +19,8 @@
},
/* 模块配置 */
"modules" : {
- "SQLite" : {}
+ "SQLite" : {},
+ "Camera" : {}
},
/* 应用发布信息 */
"distribute" : {
diff --git a/pages.json b/pages.json
index 38e8f8d..59fa77e 100644
--- a/pages.json
+++ b/pages.json
@@ -261,6 +261,12 @@
"navigationBarTitleText": "质损详情"
}
},
+ {
+ "path": "pages/quality/zsEdit",
+ "style": {
+ "navigationBarTitleText": "绘制残损图"
+ }
+ },
{
"path": "pages/quality/sign",
"style": {
diff --git a/pages/discharge/index.vue b/pages/discharge/index.vue
index 87e5cce..3a1b213 100644
--- a/pages/discharge/index.vue
+++ b/pages/discharge/index.vue
@@ -9,7 +9,8 @@
placeholder="请选择贸易类型" v-model="tradeName" @select="tradeSelect">
+ placeholder="请选择船名/航次" v-model="vvyShip" @select="shipSelect"
+ @input="shipInput">
@@ -52,10 +53,10 @@
-
+
@@ -86,6 +87,7 @@
vvyId: "",
shipId: "",
shipName: '',
+ shipValue: "",
shipList: [],
// 分页
@@ -102,6 +104,10 @@
this.loginObj = uni.getStorageSync('loginObj')
this.getShip()
},
+ onReachBottom() {
+ this.current++
+ this.initData()
+ },
onBackPress(options) {
// 触发返回就会调用此方法,这里实现的是禁用物理返回,顶部导航栏的自定义返回 uni.navigateBack 仍可使用
if (options.from == 'backbutton') {
@@ -134,6 +140,11 @@
this.vvyId = e.vvyId
this.vvyShip = e.vvyShip
},
+ // 选择船输入框
+ shipInput(e) {
+ this.shipValue = e
+ this.getShip()
+ },
// 获取船舶
getShip() {
if (this.tradeName == '外贸') {
@@ -145,7 +156,7 @@
let key = ""
let spmId = ""
uni.request({
- url: `${this.$local}/api/shipInstructions/queryByKey?ieType=${ieType}&key=${ieType}&pamId=${this.portObj.portId}&spmId=${spmId}&tradeType=${this.tradeType}`,
+ url: `${this.$local}/api/shipInstructions/queryByKey?ieType=${ieType}&key=${this.shipValue}&pamId=${this.portObj.portId}&spmId=${spmId}&tradeType=${this.tradeType}`,
header: {
'Content-Type': 'application/json', //自定义请求头信息
'Authorization': `Bearer ${this.loginObj.access_token}`
@@ -182,7 +193,7 @@
method: 'GET', //请求方式,必须为大写
success: (res) => {
this.total = res.data.data.total
- this.itemList = res.data.data.records
+ this.itemList.push(...res.data.data.records)
}
})
},
@@ -206,18 +217,22 @@
\ No newline at end of file
diff --git a/pages/discharge/instruct.vue b/pages/discharge/instruct.vue
index 0960159..0cdfed0 100644
--- a/pages/discharge/instruct.vue
+++ b/pages/discharge/instruct.vue
@@ -2,24 +2,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
@@ -104,6 +117,10 @@
备件数量:
{{item.sparePartsCount}}
+
+ 总指令发送人:
+ {{item.totalSendUser}}
+
@@ -115,12 +132,6 @@
{{item.totalSendTime}}
-
-
- 总指令发送人:
- {{item.totalSendUser}}
-
-
展开
@@ -174,18 +185,21 @@
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
@@ -225,251 +239,119 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 品牌:{{item.brdName}}
-
-
-
- 卸船进度
-
-
-
- {{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
+
+
+
+
+
+
+
+
+
-
-
-
- 车辆数量:
- {{item.vehicleCount}}
-
-
- 备件数量:
- {{item.sparePartsCount}}
-
-
-
-
- 负责人:
- {{item.responsiblePerson}}
-
-
- 发送时间:
- {{item.totalSendTime}}
-
-
-
-
- 分指令发送人:
- {{item.totalSendUser}}
-
-
-
-
- 指令下发
-
-
-
- 展开
-
-
- 收起
+
+
+
+ 品牌:{{item.brdName}}
-
-
-
-
-
- {{item2.mnfBl}}
-
-
-
-
- 中转港:
- {{item2.transitPortName}}
-
-
- 品牌:
- {{item2.brdName}}
-
-
- 车型:
- {{item2.goodsTypeName}}
-
-
- 型号:
- {{item2.bvdName}}
-
-
-
-
+
+ 卸船进度
+
+
+
+ {{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%
+
+
+ {{item.branchPlanStatusDesc}}
+
+
+ {{item.branchPlanStatusDesc}}
+
+
+ {{item.branchPlanStatusDesc}}
+
+
+ {{item.branchPlanStatusDesc}}
+
+
+
+
+
+ 车辆数量:
+ {{item.vehicleCount}}
+
+
+ 备件数量:
+ {{item.sparePartsCount}}
+
+
+ 分指令发送人:
+ {{item.totalSendUser}}
+
+
+
+
+ 负责人:
+ {{item.responsiblePerson}}
+
+
+ 发送时间:
+ {{item.totalSendTime}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 品牌:{{item.brdName}}
-
-
-
- 卸船进度
-
-
-
- {{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
-
-
-
-
- 车辆数量:
- {{item.vehicleCount}}
-
-
- 备件数量:
- {{item.sparePartsCount}}
-
-
-
-
- 负责人:
- {{item.responsiblePerson}}
-
-
- 发送时间:
- {{item.totalSendTime}}
-
-
-
-
- 分指令发送人:
- {{item.totalSendUser}}
-
-
-
-
- 暂停
-
- 重新发送
-
-
-
- 展开
-
-
- 收起
-
-
-
-
-
-
-
- {{item2.mnfBl}}
-
-
-
-
- 中转港:
- {{item2.transitPortName}}
-
-
- 品牌:
- {{item2.brdName}}
-
-
- 车型:
- {{item2.goodsTypeName}}
-
-
- 型号:
- {{item2.bvdName}}
-
-
-
-
-
+
+ 指令下发
+
+ 展开
+
+
+ 收起
+
-
-
-
-
-
+
+
+
+
+
+ {{item2.mnfBl}}
+
+
+
+
+ 中转港:
+ {{item2.transitPortName}}
+
+
+ 品牌:
+ {{item2.brdName}}
+
+
+ 车型:
+ {{item2.goodsTypeName}}
+
+
+ 型号:
+ {{item2.bvdName}}
+
+
+
+
+
+
+
+
+
+
+
@@ -489,9 +371,6 @@
placeholder="车型" v-model="bvmName" @select="bvmSelect">
-
-
-
@@ -762,13 +641,13 @@
-
-
+
@@ -86,6 +87,7 @@
vvyId: "",
shipId: "",
shipName: '',
+ shipValue: "",
shipList: [],
// 分页
@@ -97,6 +99,10 @@
portObj: {}
}
},
+ onReachBottom() {
+ this.current++
+ this.initData()
+ },
onLoad() {
this.portObj = uni.getStorageSync('portObj')
this.loginObj = uni.getStorageSync('loginObj')
@@ -134,6 +140,11 @@
this.vvyId = e.vvyId
this.vvyShip = e.vvyShip
},
+ // 选择船输入框
+ shipInput(e) {
+ this.shipValue = e
+ this.getShip()
+ },
// 获取船舶
getShip() {
if (this.tradeName == '外贸') {
@@ -145,13 +156,14 @@
let key = ""
let spmId = ""
uni.request({
- url: `${this.$local}/api/shipInstructions/queryByKey?ieType=${ieType}&key=${ieType}&pamId=${this.portObj.portId}&spmId=${spmId}&tradeType=${this.tradeType}`,
+ url: `${this.$local}/api/shipInstructions/queryByKey?ieType=${ieType}&key=${this.shipValue}&pamId=${this.portObj.portId}&spmId=${spmId}&tradeType=${this.tradeType}`,
header: {
'Content-Type': 'application/json', //自定义请求头信息
'Authorization': `Bearer ${this.loginObj.access_token}`
},
method: 'GET', //请求方式,必须为大写
success: (res) => {
+ console.log(res)
if (res.data.status == "200") {
this.shipList = res.data.data
this.shipList.forEach(v => {
@@ -185,7 +197,7 @@
success: (res) => {
console.log(res)
this.total = res.data.data.total
- this.itemList = res.data.data.records
+ this.itemList.push(...res.data.data.records)
}
})
},
@@ -214,18 +226,22 @@
\ No newline at end of file
diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue
index cab60c5..4305fd6 100644
--- a/pages/index/instruct.vue
+++ b/pages/index/instruct.vue
@@ -1,27 +1,41 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
@@ -62,113 +76,116 @@
-
-
-
-
-
-
-
-
- 船舱层数:{{item.shipDeck}}层{{item.cabinNo}}舱
-
-
-
- 装船进度
-
-
-
- {{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%
-
-
- {{item.totalPlanStatusDesc}}
-
-
- {{item.totalPlanStatusDesc}}
-
-
- {{item.totalPlanStatusDesc}}
-
-
- {{item.totalPlanStatusDesc}}
-
-
-
-
-
- 数量:
- {{item.totalCount}}
-
-
- 港口:
- {{item.potName}}
-
-
-
-
- 负责人:
- {{item.responsiblePerson}}
-
-
- 发送时间:
- {{item.totalSendTime}}
-
-
-
-
- 总指令发送人:
- {{item.totalSendUser}}
-
-
-
-
- 展开
-
-
- 收起
-
-
-
-
-
-
-
- {{item2.mnfBl}}
-
-
-
-
- 中转港:
- {{item2.transitPortName}}
-
-
- 品牌:
- {{item2.brdName}}
-
-
- 车型:
- {{item2.goodsTypeName}}
-
-
- 型号:
- {{item2.bvdName}}
-
+
+
+
+
+
+
+
+
+
+ 船舱层数:{{item.shipDeck}}层{{item.cabinNo}}舱
-
+
+ 装船进度
+
+
+
+ {{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%
+
+
+ {{item.totalPlanStatusDesc}}
+
+
+ {{item.totalPlanStatusDesc}}
+
+
+ {{item.totalPlanStatusDesc}}
+
+
+ {{item.totalPlanStatusDesc}}
+
+
+
+
+
+ 数量:
+ {{item.totalCount}}
+
+
+ 港口:
+ {{item.potName}}
+
+
+ 发送人:
+ {{item.totalSendUser}}
+
+
+
+
+ 负责人:
+ {{item.responsiblePerson}}
+
+
+ 发送时间:
+ {{item.totalSendTime}}
+
+
+
+
+ 展开
+
+
+ 收起
+
+
+
+
+
+
+
+ {{item2.mnfBl}}
+
+
+
+
+ 中转港:
+ {{item2.transitPortName}}
+
+
+ 品牌:
+ {{item2.brdName}}
+
+
+ 车型:
+ {{item2.goodsTypeName}}
+
+
+ 型号:
+ {{item2.bvdName}}
+
+
+
+
+
+
-
+
@@ -176,20 +193,24 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -229,255 +250,125 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 船舱层数:{{item.shipDeck}}层{{item.cabinNo}}舱
-
-
-
- 装船进度
-
-
-
- {{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
+
+
+
+
+
+
+
+
+
-
-
-
- 数量:
- {{item.totalCount}}
-
-
- 港口:
- {{item.potName}}
-
-
-
-
- 负责人:
- {{item.responsiblePerson}}
-
-
- 发送时间:
- {{item.totalSendTime}}
-
-
-
-
- 分指令发送人:
- {{item.branchSendUser}}
-
-
-
-
- 指令下发
-
-
-
- 展开
-
-
- 收起
+
+
+
+ 船舱层数:{{item.shipDeck}}层{{item.cabinNo}}舱
-
-
-
-
-
- {{item2.mnfBl}}
-
-
-
-
- 中转港:
- {{item2.transitPortName}}
-
-
- 品牌:
- {{item2.brdName}}
-
-
- 车型:
- {{item2.goodsTypeName}}
-
-
- 型号:
- {{item2.bvdName}}
-
-
-
-
+
+ 装船进度
+
+
+
+ {{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%
+
+
+ {{item.branchPlanStatusDesc}}
+
+
+ {{item.branchPlanStatusDesc}}
+
+
+ {{item.branchPlanStatusDesc}}
+
+
+ {{item.branchPlanStatusDesc}}
+
+
+
+
+
+ 数量:
+ {{item.totalCount}}
+
+
+ 港口:
+ {{item.potName}}
+
+
+
+
+ 负责人:
+ {{item.responsiblePerson}}
+
+
+ 发送时间:
+ {{item.totalSendTime}}
+
+
+
+
+ 分指令发送人:
+ {{item.branchSendUser}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 船舱层数:{{item.shipDeck}}层{{item.cabinNo}}舱
-
-
-
- 装船进度
-
-
-
- {{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
-
- {{item.branchPlanStatusDesc}}
-
-
-
-
-
- 数量:
- {{item.totalCount}}
-
-
- 港口:
- {{item.potName}}
-
-
-
-
- 负责人:
- {{item.responsiblePerson}}
-
-
- 发送时间:
- {{item.totalSendTime}}
-
-
-
-
- 分指令发送人:
- {{item.branchSendUser}}
-
-
-
-
- 暂停
-
- 重新发送
-
-
-
- 展开
-
-
- 收起
-
-
-
-
-
-
-
- {{item2.mnfBl}}
-
-
-
-
- 中转港:
- {{item2.transitPortName}}
-
-
- 品牌:
- {{item2.brdName}}
-
-
- 车型:
- {{item2.goodsTypeName}}
-
-
- 型号:
- {{item2.bvdName}}
-
-
-
-
-
+
+ 指令下发
+
+ 展开
+
+
+ 收起
+
-
-
-
-
-
-
+
+
+
+
+
+ {{item2.mnfBl}}
+
+
+
+
+ 中转港:
+ {{item2.transitPortName}}
+
+
+ 品牌:
+ {{item2.brdName}}
+
+
+ 车型:
+ {{item2.goodsTypeName}}
+
+
+ 型号:
+ {{item2.bvdName}}
+
+
+
+
+
+
+
+
+
+
+
+
@@ -485,19 +376,22 @@
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
@@ -602,29 +496,19 @@
-
+
-
-
-
-
-
-
-
-
+
PORT OF DESTINATION
@@ -878,13 +762,13 @@
-