dev3
Panzihang 2024-01-26 18:02:31 +08:00
parent 7642e83daf
commit 0a400fd422
15 changed files with 193 additions and 70 deletions

View File

@ -16,7 +16,8 @@ export default {
* @description api请求基础路径
*/
// local: "http://192.168.61.133/tos", // VPN地址
local: "https://rtops4.haitongauto.com/tos", // 海通地址
local: "https://rtops4.haitongauto.com/tos", // 海通地址(测试版)
local2: "https://rtops.haitongauto.com/tos", // 海通地址(正式版)
imgSrc: "http://116.205.142.169/HtRtosResource/assets/",
mapkey: "FUFBZ-KBIWW-P63RR-RR4W3-BNV4H-T6BGX"
}

18
env.js 100644
View File

@ -0,0 +1,18 @@
import config, { local ,local2 } from '@/config/index.js'
import Vue from 'vue'
export function changeEnv () {
const {local ,local2} = config
if(Vue.prototype.$local == local) {
Vue.prototype.$local = local2
uni.showToast({
icon: 'none',
title: '切换到正式环境'
});
} else {
Vue.prototype.$local = local
uni.showToast({
icon: 'none',
title: '切换到测试环境'
});
}
}

View File

@ -3,6 +3,7 @@ import store from './store'
import config from '@/config';
const {
local,
local2,
mapkey,
imgSrc
} = config;

View File

@ -553,12 +553,22 @@
:key="index3" :style="getDynamicStyle(item3, item.shipSpace)">
<zb-tooltip placement="bottom-start" color="white"
:visible.sync="item3.isShow">
{{item3.stowageNo}} {{item3.potName}} {{item3.amount}}
<text style="margin-left: 5px;">{{item3.stowageNo}}</text>
<text style="margin-left: 5px;">{{item3.potName}}</text>
<text
v-if="item3.transitPortName != null && item3.transitPortName != ''">({{item3.transitPortName}})</text>
<text style="margin-left: 5px;">{{item3.amount}}</text>
<view slot="content">
<view class="tipBox">
<p style="color: #000;">
{{item3.stowageNo}} {{item3.potName}}
{{item3.amount}}
<text
style="margin-left: 5px;">{{item3.stowageNo}}</text>
<text
style="margin-left: 5px;">{{item3.potName}}</text>
<text
v-if="item3.transitPortName != null && item3.transitPortName != ''">({{item3.transitPortName}})</text>
<text style="margin-left: 5px;">
{{item3.amount}}</text>
</p>
</view>
</view>
@ -1684,6 +1694,7 @@
success: (res) => {
if (res.data.status == "200") {
this.goodsInfo = res.data.data
console.log(this.goodsInfo)
if (this.imgInfo.whetherNormal == "0") {
this.goodsInfo.reverse()
}

View File

@ -9,6 +9,9 @@
</view>
</view>
<view class="loginBox">
<view class="tabBox">
<view class="hjButton" @click="tabHj"></view>
</view>
<view class="loginTop">
<image src="../../static/images/theme/logo.png" mode="widthFix"></image>
</view>
@ -62,6 +65,9 @@
decrypt
} from "../../common/crypto.js"
import LotusLoading from "../../components/Winglau14-lotusLoading/Winglau14-LotusLoading.vue";
import {
changeEnv
} from '../../env.js'
export default {
data() {
return {
@ -85,20 +91,22 @@
lotusLoadingData: {
isShow: false //truefalse
},
pwdShow: false
pwdShow: false,
}
},
components: {
LotusLoading
},
onLoad() {
this.screenHeight = uni.getSystemInfoSync().windowHeight;
},
methods: {
//
iconC() {
this.pwdShow = !this.pwdShow
},
//
tabHj() {
changeEnv()
},
//
loginGo(type) {
this.lotusLoadingData.isShow = true
@ -264,7 +272,7 @@
position: absolute;
top: 117px;
text-align: center;
p {
font-size: 36px;
color: #FFFFFF;
@ -279,6 +287,27 @@
display: flex;
justify-content: center;
.tabBox {
position: absolute;
right: 10px;
top: 10px;
.hjButton {
width: 80px;
height: 30px;
line-height: 30px;
text-align: center;
background-color: #0067CF;
color: #fff;
}
text {
color: #23262E;
text-align: center;
}
}
.loginTop {
width: 172px;
height: 30px;

View File

@ -554,39 +554,41 @@
},
// type 1 2 3 4 5 6
initImg(fileName, type) {
uni.request({
url: `${this.$local}/api/file/url/?fileName=${fileName}`,
header: {
'Content-Type': 'application/json', //
'Authorization': `Bearer ${this.loginObj.access_token}`
},
method: 'GET', //
success: (res) => {
if (res.statusCode == 200) {
if (type == 1) {
this.bcPhoto2.push({
url: res.data
})
} else if (type == 2) {
this.bcLicense2.push({
url: res.data
})
} else if (type == 3) {
this.zsPhoto2.push({
url: res.data
})
} else if (type == 4) {
this.carPhoto2.push({
url: res.data
})
} else if (type == 5) {
this.signImg = res.data
} else if (type == 6) {
this.hzzsImg = res.data
if (fileName != "") {
uni.request({
url: `${this.$local}/api/file/url/?fileName=${fileName}`,
header: {
'Content-Type': 'application/json', //
'Authorization': `Bearer ${this.loginObj.access_token}`
},
method: 'GET', //
success: (res) => {
if (res.statusCode == 200) {
if (type == 1) {
this.bcPhoto2.push({
url: res.data
})
} else if (type == 2) {
this.bcLicense2.push({
url: res.data
})
} else if (type == 3) {
this.zsPhoto2.push({
url: res.data
})
} else if (type == 4) {
this.carPhoto2.push({
url: res.data
})
} else if (type == 5) {
this.signImg = res.data
} else if (type == 6) {
this.hzzsImg = res.data
}
}
}
}
})
})
}
},
//
radioChange(evt) {
@ -1401,6 +1403,7 @@
"ygqId": this.ygqId, // id
"vinCode": this.carValue, //
}
console.log(editReqDTO)
uni.request({
url: `${this.$local}/api/goodsQuality/edit`,
data: editReqDTO,

View File

@ -171,6 +171,7 @@
this.portObj = uni.getStorageSync('portObj')
uni.setStorageSync('signImg', "")
uni.setStorageSync('hzzsImg', "")
uni.setStorageSync('isSign', true)
this.initData()
this.getBrand()
this.getShip()

View File

@ -145,6 +145,7 @@
this.ctx.lineTo(point2.X, point2.Y);
this.ctx.stroke();
this.ctx.draw(true);
this.isSign = true
},
handleCancel() {
uni.navigateBack({

View File

@ -964,8 +964,9 @@
value.forEach(v => {
this.vtpList.push(v.vtpId)
})
} else if (tableName == 'shipOption') {} else if (tableName == "messageRespList") {
} else if (tableName == "messageRespList") {
that.messageRespList = value
console.log(value)
} else if (tableName == "workMessageRespList") {
that.workMessageRespList = value
that.workMessageRespList.forEach(v => {
@ -999,18 +1000,65 @@
})
} else if (tableName == "attachUnmoorRespList") {
that.attachUnmoorRespList = value
that.attachUnmoorRespList.forEach(v => {
if (v.attachTime == "null") {
that.$set(v, "attachTime", null)
}
if (v.unmoorTime == "null") {
that.$set(v, "unmoorTime", null)
}
if (v.shiftingBerthTime == "null") {
that.$set(v, "shiftingBerthTime", null)
}
if (v.noProductBerthStTime == "null") {
that.$set(v, "noProductBerthStTime", null)
}
if (v.noProductBerthEdTime == "null") {
that.$set(v, "noProductBerthEdTime", null)
}
})
} else if (tableName == "shipmentShipSupplyRespList") {
that.shipmentShipSupplyRespList = value
that.shipmentShipSupplyRespList.forEach(v => {
if (v.supplyDate == "null") {
that.$set(v, "supplyDate", null)
}
})
} else if (tableName == "shipmentAdviserLayoutRespList") {
that.shipmentAdviserLayoutRespList = value
that.shipmentAdviserLayoutRespList.forEach(v => {
if (v.workTime == "null") {
that.$set(v, "workTime", null)
}
})
} else if (tableName == "shipmentLoadUnloadNoticeRespList") {
that.shipmentLoadUnloadNoticeRespList = value
that.shipmentLoadUnloadNoticeRespList.forEach(v => {
if (v.workDate == "null") {
that.$set(v, "workDate", null)
}
})
} else if (tableName == "shipmentQualityConsultationRespList") {
that.shipmentQualityConsultationRespList = value
that.shipmentQualityConsultationRespList.forEach(v => {
if (v.operationDate == "null") {
that.$set(v, "operationDate", null)
}
})
} else if (tableName == "abnormalConditionRespList") {
that.abnormalConditionRespList = value
that.abnormalConditionRespList.forEach(v => {
if (v.operationDate == "null") {
that.$set(v, "operationDate", null)
}
})
} else if (tableName == "mafiListRespList") {
that.mafiListRespList = value
that.mafiListRespList.forEach(v => {
if (v.workDate == "null") {
that.$set(v, "workDate", null)
}
})
} else if (tableName == "workSignTable") {
that.workSignTable = value
} else if (tableName == 'evaluateTable') {

View File

@ -19,7 +19,7 @@
<p>装卸方式<text>{{item.loadType}}</text></p>
</view>
<view class="status didNot" v-if="item.status == 0 || item.status == 'null'">
<p>未提交审核</p>
<p>待提交</p>
</view>
<view class="status didNot" v-if="item.status == 1">
<p>待审核</p>

View File

@ -24,7 +24,7 @@
<p>单船人数<text>{{item.shipPerson}}</text></p>
</view>
<view class="status didNot" v-if="item.status == 0 || item.status == 'null'">
<p>未提交审核</p>
<p>待提交</p>
</view>
<view class="status didNot" v-if="item.status == 1">
<p>待审核</p>
@ -68,7 +68,7 @@
<text class="text">结束时间</text><text class="time">{{item2.workEndTime}}</text>
</view>
<view class="status didNot" v-if="item[0].status == 0 || item[0].status == 'null'">
<p>未提交审核</p>
<p>待提交</p>
</view>
<view class="status didNot" v-if="item[0].status == 1">
<p>待审核</p>
@ -145,6 +145,7 @@
.aId] = [item];
return res;
}, {}));
console.log(this.shiftInfo)
this.shiftInfo.forEach(v => {
v.forEach(i => {
this.$set(i, "shiftArr", [])

View File

@ -374,28 +374,36 @@
},
//
save() {
let date = new Date().getTime()
let pmeId = uuidv4()
let webStatus = 0
let webDate = api.getDate(date)
if (this.obj.state == "edit") {
let sql =
`UPDATE messageRespList SET bthId = '${this.bwValue}',bthIdName = '${this.bwTextValue}',
jobStartTime = '${this.startTime}',jobEndTime = '${this.endTime}',shipPerson = '${this.shipValue}',
vvyId = '${this.hcValue}',vvyName = '${this.hcTextValue}',weatherType = '${this.tqTextValue}',
weatherTypeDesc = '${this.tqTextValue}',workSuite = '${this.workValue}',webStatus = '${webStatus}',
importExportFlagName = '${this.importExportFlagName}',webDate = '${webDate}' WHERE pmeId = '${this.peopleRow.pmeId}';`
this.executeSql(sql)
} else if (this.obj.state == "add") {
let sql =
`insert into messageRespList values('${pmeId}','${this.vtpId}','${this.bwValue}','${this.bwTextValue}',
'${this.startTime}','${this.endTime}','${this.shipValue}','${this.hcValue}','${this.hcTextValue}','${this.tqTextValue}',
'${this.tqTextValue}','${this.workValue}','${this.importExportFlagName}','${0}','${webStatus}','${webDate}')`
this.executeSql(sql)
if (this.datetime[0] == "") {
uni.showModal({
title: '提示',
showCancel: false,
content: '请输入作业时间!'
})
} else {
let date = new Date().getTime()
let pmeId = uuidv4()
let webStatus = 0
let webDate = api.getDate(date)
if (this.obj.state == "edit") {
let sql =
`UPDATE messageRespList SET bthId = '${this.bwValue}',bthIdName = '${this.bwTextValue}',
jobStartTime = '${this.startTime}',jobEndTime = '${this.endTime}',shipPerson = '${this.shipValue}',
vvyId = '${this.hcValue}',vvyName = '${this.hcTextValue}',weatherType = '${this.tqTextValue}',
weatherTypeDesc = '${this.tqTextValue}',workSuite = '${this.workValue}',webStatus = '${webStatus}',
importExportFlagName = '${this.importExportFlagName}',webDate = '${webDate}' WHERE pmeId = '${this.peopleRow.pmeId}';`
this.executeSql(sql)
} else if (this.obj.state == "add") {
let sql =
`insert into messageRespList values('${pmeId}','${this.vtpId}','${this.bwValue}','${this.bwTextValue}',
'${this.startTime}','${this.endTime}','${this.shipValue}','${this.hcValue}','${this.hcTextValue}','${this.tqTextValue}',
'${this.tqTextValue}','${this.workValue}','${this.importExportFlagName}','${0}','${webStatus}','${webDate}')`
this.executeSql(sql)
}
uni.navigateTo({
url: '/pages/shipWork/mixWork'
})
}
uni.navigateTo({
url: '/pages/shipWork/mixWork'
})
},
//
toGo(state) {

View File

@ -13,13 +13,13 @@
<text>航次{{item.vvyName}}</text>
</view>
<view class="liInfo">
<p>类型<text>{{item.supplyTypeNm}}</text></p>
<p>类型<text>{{item.supplyType}}</text></p>
<p>进出口<text>{{item.importExportFlagName}}</text></p>
<p>贸易类型<text>{{shipInfo.spmTradeName}}</text></p>
<p>日期<text>{{item.supplyDate}}</text></p>
</view>
<view class="status didNot" v-if="item.status == 0 || item.status == 'null'">
<p>未提交审核</p>
<p>待提交</p>
</view>
<view class="status didNot" v-if="item.status == 1">
<p>待审核</p>

View File

@ -44,7 +44,7 @@
</view>
<view class="li">
<p>泊位/Berth:</p>
<p>{{tableInfo.bthIdName}}</p>
<p>{{tableInfo.stopBerthageName}}</p>
</view>
<view class="li">
<p>日期/Date:</p>
@ -126,9 +126,10 @@
// resolve
this.tabsList = []
this.tableInfo = value[tabsValue]
console.log(this.tableInfo)
value.forEach((v, index) => {
let obj = {
name: `${index + 1}`,
name: `${index + 1}`,
}
this.tabsList.push(obj)
})

View File

@ -19,7 +19,7 @@
<p>系缆时间<text>{{item.attachTime}}</text></p>
</view>
<view class="status didNot" v-if="item.status == 0 || item.status == 'null'">
<p>未提交审核</p>
<p>待提交</p>
</view>
<view class="status didNot" v-if="item.status == 1">
<p>待审核</p>