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 @@
-
+
{{ item.label }}
型号:
- {{item2.bvdName}}
+ {{item2.model}}
@@ -790,7 +790,7 @@
this.getBrand() // 获取品牌
this.getBvm() // 获取车型
this.getRoleId() // 获取角色ID
- this.initAsk() // 获取装船要求
+ // this.initAsk() // 获取装船要求
this.getStatistics() // 获取统计数据
this.getJobProgress() //获取卸船进度数据
},
@@ -828,6 +828,8 @@
this.fzlFlag = true
},
refresh() {
+ this.itemList = []
+ this.current = 1
if (this.tabsValue == 0 || this.tabsValue == 1) {
this.domesticTrade()
}
@@ -1253,6 +1255,7 @@
},
// 点击装船要求
ask(type) {
+ this.initAsk() // 获取装船要求
this.$refs.popup2.open(type)
},
// 装船要求确认
@@ -2516,7 +2519,14 @@
/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;
padding: 14px 0;
@@ -2545,7 +2555,8 @@
}
.popupBox2 {
- width: 500px;
+ width: 80vw;
+ height: 38vh;
}
// 右侧抽屉筛选
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b90c6db..cda4502 100644
--- a/pages/index/index.vue
+++ b/pages/index/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/index/instruct.vue b/pages/index/instruct.vue
index 65317ce..8661f2a 100644
--- a/pages/index/instruct.vue
+++ b/pages/index/instruct.vue
@@ -204,7 +204,7 @@
型号:
- {{item2.bvdName}}
+ {{item2.model}}
@@ -287,7 +287,7 @@
-
+
{{ item.label }}
型号:
- {{item2.bvdName}}
+ {{item2.model}}
@@ -470,7 +470,7 @@
-
+
{{ item.label }}
型号:
- {{item2.bvdName}}
+ {{item2.model}}
@@ -680,7 +680,7 @@
- {{item.tierHeight}}m
+ {{ itex }}
@@ -1096,7 +1096,7 @@
this.getBrand() // 获取品牌
this.getBvm() // 获取车型
this.getRoleId() // 获取角色ID
- this.initAsk() // 获取装船要求
+ // this.initAsk() // 获取装船要求
this.getStatistics() // 获取统计数据
this.getPotList()
this.getImgInfo()
@@ -1146,6 +1146,8 @@
},
// 刷新
refresh() {
+ this.itemList = []
+ this.current = 1
if (this.tabsValue == 1 || this.tabsValue == 2) {
this.loadOtherOrder()
} else if (this.tabsValue == 0) {
@@ -1279,9 +1281,7 @@
},
method: 'GET', //请求方式,必须为大写
success: (res) => {
- // this.itemList.push(...res.data.data.records)
- this.itemList = []
- this.itemList = res.data.data.records
+ this.itemList.push(...res.data.data.records)
if (res.data.data.records.length == 10) {
this.current++
this.loadSumOrder()
@@ -1459,7 +1459,8 @@
method: 'POST', //请求方式,必须为大写
success: (res) => {
this.$refs.popup.close()
- if (res.status == 200) {
+ console.log('res',res);
+ if (res.data.status == 200 || res.data.data) {
this.itemList = []
this.current = 1
this.delValue = true
@@ -1653,6 +1654,7 @@
},
// 点击装船要求
ask(type) {
+ this.initAsk() // 获取装船要求
this.$refs.popup2.open(type)
},
// 装船要求确认
@@ -2818,6 +2820,7 @@
/deep/.uni-table-td {
padding-left: 15px;
+ font-size: 16px;
}
}
}
@@ -3065,6 +3068,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;
@@ -3094,7 +3104,8 @@
}
.popupBox2 {
- width: 500px;
+ width: 80vw;
+ height: 38vh;
}
// 右侧抽屉筛选
diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue
index 7211961..2c0b556 100644
--- a/pages/shipWork/index.vue
+++ b/pages/shipWork/index.vue
@@ -245,7 +245,7 @@
},
dropTable() {
console.log('删除表');
- let sql = 'DROP TABLE shipOption;'
+ let sql = 'DROP TABLE workMessageRespInfoList'
this.executeSql(sql)
},
dropData() {
@@ -541,6 +541,44 @@
ptrEnDesc:''
})
})
+ // 机械类型
+ this.downloadData.pmtType.forEach(v => {
+ this.optionData.push({
+ dictionariesName: "pmtType",
+ ptrCode: v.ptrCode,
+ ptrDesc: v.ptrDesc,
+ ptrEnDesc:v.ptrEnDesc
+ })
+ })
+ // 超长类型
+ this.downloadData.pubTypeLengthType.forEach(v => {
+ this.optionData.push({
+ dictionariesName: "pubTypeLengthType",
+ ptrCode: v.ptrCode,
+ ptrDesc: v.ptrDesc,
+ ptrEnDesc:v.ptrEnDesc
+ })
+ })
+ // 港区类型
+ this.downloadData.portDetail.forEach(v => {
+ this.optionData.push({
+ dictionariesName: "portDetail",
+ ptrCode: v.ptrCode,
+ ptrDesc: v.ptrDesc,
+ ptrEnDesc:v.ptrEnDesc
+ })
+ })
+ // 提单号数据
+ this.downloadData.mnfBlByVvyId.forEach(item => {
+ item.mnfBls.forEach(v => {
+ this.optionData.push({
+ dictionariesName: "mnfBlByVvyId",
+ ptrCode: '',
+ ptrDesc: v,
+ ptrEnDesc:''
+ })
+ })
+ })
// 存下拉到数据库
this.xlData(item.vtpId)
@@ -576,8 +614,8 @@
if (v.workMessageDetailRespDTOS.length > 0) {
v.workMessageDetailRespDTOS.forEach(v2 => {
let sql2 = `insert into workMessageRespInfoList values('${v2.wkdId}','${this.vtpId}','${v2.wkmId}','${v2.carType}',
- '${v2.carTypeName}','${v2.goodsNumber}','${v2.loadingType}','${v2.loadingTypeName}','${v2.remark}',
- '${webStatus}','${v.createTime}')`
+ '${v2.carTypeName}','${v2.goodsNumber}','${v2.loadingType}','${v2.loadingTypeName}','${v2.remark}','${v2.mnfBl}',
+ '${v2.weight}','${v2.volume}','${v2.lengthType}','${v2.pmtType}','${webStatus}','${v.createTime}')`
this.executeSql(sql2)
})
}
@@ -1008,7 +1046,6 @@
})
} else if (tableName == "messageRespList") {
that.messageRespList = value
- console.log(value)
} else if (tableName == "workMessageRespList") {
that.workMessageRespList = value
that.workMessageRespList.forEach(v => {
diff --git a/pages/shipWork/mixSign.vue b/pages/shipWork/mixSign.vue
index 716dfc1..34a14c4 100644
--- a/pages/shipWork/mixSign.vue
+++ b/pages/shipWork/mixSign.vue
@@ -57,7 +57,7 @@
textFilter }}-{{ RYSJ[0].maxEndTime | textFilter }}
- Berthed at Haitong:
+ Berthed at {{ portInfo }}:
+
+ 提单号:
+
+
+
+ 重量:
+
+
+
+ 体积:
+
+
+
+ 超长类型:
+
+
+
+ 使用机械:
+
+
+
备注:
+
+ 提单号:
+
+
+
+ 重量:
+
+
+
+ 体积:
+
+
+
+ 超长类型:
+
+
+
+ 使用机械:
+
+
+
备注:
{
+ if (v.dictionariesName == 'mnfBlByVvyId') {
+ this.mnfBlList.push({
+ text: v.ptrDesc,
+ value: v.ptrDesc
+ })
+ } else if(v.dictionariesName == 'pubTypeLengthType') {
+ this.lengthTypeList.push({
+ text: v.ptrDesc,
+ value: v.ptrCode
+ })
+ } else if(v.dictionariesName == 'pmtType') {
+ this.pmtTypeList.push({
+ text: v.ptrDesc,
+ value: v.ptrCode
+ })
+ }
+ })
},
//状态为编辑获取数据
editData() {
@@ -791,6 +870,11 @@
loadingType: "",
loadingTypeName: "",
remark: "",
+ mnfBl:'',
+ weight:'',
+ volume:'',
+ lengthType:'',
+ pmtType:''
}],
}
this.addItem(item)
@@ -807,6 +891,11 @@
loadingType: "",
loadingTypeName: "",
remark: "",
+ mnfBl:'',
+ weight:'',
+ volume:'',
+ lengthType:'',
+ pmtType:''
})
uni.showToast({
icon: 'none',
@@ -821,6 +910,11 @@
loadingType: "",
loadingTypeName: "",
remark: "",
+ mnfBl:'',
+ weight:'',
+ volume:'',
+ lengthType:'',
+ pmtType:''
})
uni.showToast({
icon: 'none',
@@ -1232,6 +1326,7 @@
},
// 工班信息删除
delGb(item, index) {
+ console.log('item',item);
this.leftUlList1.splice(index, 1)
if (item.webId != null) {
this.shiftDelList.push(item.webId)
@@ -1579,7 +1674,8 @@
let sql2 =
`UPDATE workMessageRespInfoList SET carType = '${this.ulList1[i].ulList2[j].carType}',carTypeName = '${this.ulList1[i].ulList2[j].carTypeName}',
goodsNumber = '${this.ulList1[i].ulList2[j].goodsNumber}', loadingType = '${this.ulList1[i].ulList2[j].loadingType}',
- loadingTypeName = '${this.ulList1[i].ulList2[j].loadingTypeName}', remark = '${this.ulList1[i].ulList2[j].remark}',
+ loadingTypeName = '${this.ulList1[i].ulList2[j].loadingTypeName}', remark = '${this.ulList1[i].ulList2[j].remark}', mnfBl = '${this.ulList1[i].ulList2[j].mnfBl}',
+ weight = '${this.ulList1[i].ulList2[j].weight}', volume = '${this.ulList1[i].ulList2[j].volume}', lengthType = '${this.ulList1[i].ulList2[j].lengthType}', pmtType = '${this.ulList1[i].ulList2[j].pmtType}',
webStatus = '${webStatus}', webDate = '${webDate}' WHERE webId = '${this.ulList1[i].ulList2[j].webId}';`
this.executeSql(sql2)
} else {
@@ -1588,7 +1684,8 @@
let sql2 =
`insert into workMessageRespInfoList values('${webId2}','${this.vtpId}','${this.ulList1[i].webId}','${this.ulList1[i].ulList2[j].carType}',
'${this.ulList1[i].ulList2[j].carTypeName}','${this.ulList1[i].ulList2[j].goodsNumber}','${this.ulList1[i].ulList2[j].loadingType}',
- '${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${webStatus}','${webDate}')`
+ '${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${this.ulList1[i].ulList2[j].mnfBl}','${this.ulList1[i].ulList2[j].weight}',
+ '${this.ulList1[i].ulList2[j].volume}','${this.ulList1[i].ulList2[j].lengthType}','${this.ulList1[i].ulList2[j].pmtType}','${webStatus}','${webDate}')`
this.executeSql(sql2)
}
}
@@ -1607,7 +1704,8 @@
let sql2 =
`UPDATE workMessageRespInfoList SET carType = '${this.ulList1[i].ulList2[j].carType}',carTypeName = '${this.ulList1[i].ulList2[j].carTypeName}',
goodsNumber = '${this.ulList1[i].ulList2[j].goodsNumber}', loadingType = '${this.ulList1[i].ulList2[j].loadingType}',
- loadingTypeName = '${this.ulList1[i].ulList2[j].loadingTypeName}', remark = '${this.ulList1[i].ulList2[j].remark}',
+ loadingTypeName = '${this.ulList1[i].ulList2[j].loadingTypeName}', remark = '${this.ulList1[i].ulList2[j].remark}', mnfBl = '${this.ulList1[i].ulList2[j].mnfBl}',
+ weight = '${this.ulList1[i].ulList2[j].weight}', volume = '${this.ulList1[i].ulList2[j].volume}', lengthType = '${this.ulList1[i].ulList2[j].lengthType}', pmtType = '${this.ulList1[i].ulList2[j].pmtType}',
webStatus = '${webStatus}', webDate = '${webDate}' WHERE webId = '${this.ulList1[i].ulList2[j].webId}';`
this.executeSql(sql2)
} else {
@@ -1616,7 +1714,8 @@
let sql2 =
`insert into workMessageRespInfoList values('${webId2}','${this.vtpId}','${webId}','${this.ulList1[i].ulList2[j].carType}',
'${this.ulList1[i].ulList2[j].carTypeName}','${this.ulList1[i].ulList2[j].goodsNumber}','${this.ulList1[i].ulList2[j].loadingType}',
- '${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${webStatus}','${webDate}')`
+ '${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${this.ulList1[i].ulList2[j].mnfBl}','${this.ulList1[i].ulList2[j].weight}',
+ '${this.ulList1[i].ulList2[j].volume}','${this.ulList1[i].ulList2[j].lengthType}','${this.ulList1[i].ulList2[j].pmtType}','${webStatus}','${webDate}')`
this.executeSql(sql2)
}
}
@@ -1712,7 +1811,8 @@
let sql2 =
`insert into workMessageRespInfoList values('${webId2}','${this.vtpId}','${webId}','${this.ulList1[i].ulList2[j].carType}',
'${this.ulList1[i].ulList2[j].carTypeName}','${this.ulList1[i].ulList2[j].goodsNumber}','${this.ulList1[i].ulList2[j].loadingType}',
- '${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${webStatus}','${webDate}')`
+ '${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${this.ulList1[i].ulList2[j].mnfBl}','${this.ulList1[i].ulList2[j].weight}',
+ '${this.ulList1[i].ulList2[j].volume}','${this.ulList1[i].ulList2[j].lengthType}','${this.ulList1[i].ulList2[j].pmtType}','${webStatus}','${webDate}')`
this.executeSql(sql2)
}
}