wsnet
/
pad-app
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改，新需求

dev3
wuwx 2024-06-11 17:19:31 +08:00
parent e5872f3c05
commit 87a31020b3
11 changed files with 271 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lx-progress-bar/lx-progress-bar.vue
View File

@ -36,7 +36,7 @@
class="bar-text"
:style="{ color: textColor, fontSize: textSize }"
>
{{ singleText }}
{{ total == 0 ? '100%' : singleText }}
</view>
</view>

2
manifest.json
View File

@ -2,7 +2,7 @@
"name" : "海通Pad",
"appid" : "__UNI__F864E80",
"description" : "",
"versionName" : "1.0.7",
"versionName" : "1.1.1",
"versionCode" : "100",
"transformPx" : false,
/* 5+App特有相关 */

116
pages/index/instruct.vue
View File

@ -3,19 +3,19 @@
<head-view :title="title"></head-view>
<view class="content2 contentFixed">
<view class="buttonlist">
<template v-if="tabsValue == 0">
<template v-if="tabsName == '总指令'">
<button class="button" type="default" @click="ask">装船要求</button>
<button class="button" type="default" @click="distribute('center','all')">指令下发</button>
</template>
<template v-if="tabsValue == 1">
<template v-if="tabsName == '分指令'">
<button class="button buttons" type="default" @click="ask">装船要求</button>
<button class="button" type="default" @click="distribute('center','solo')">指令下发</button>
</template>
<template v-if="tabsValue == 2 || tabsValue == 3 || tabsValue == 4">
<template v-if="tabsName == '班组长分指令' || tabsName == '配载图' || tabsName == '场位图'">
<button class="button" type="default" @click="ask">装船要求</button>
</template>
</view>
<template v-if="tabsValue == 0 || tabsValue == 1 || tabsValue == 2">
<template v-if="tabsName == '总指令' || tabsName == '分指令' || tabsName == '班组长分指令'">
<view class="refresh" @click="refresh">
<image src="../../static/images/refreshImg.png" mode=""></image>
<p>刷新</p>
@ -520,7 +520,7 @@
<o-empty v-else height="70vh" bg="#f5f6fa" />
</view>
</custom-tab-pane>
<custom-tab-pane :label="bzzName" name="c1_6" v-if="bzzIsShow">
<custom-tab-pane :label="bzzName" name="c1_3" v-if="bzzIsShow">
<view></view>
<view class="main">
<view class="form">
@ -712,7 +712,7 @@
<o-empty v-else height="70vh" bg="#f5f6fa" />
</view>
</custom-tab-pane>
<custom-tab-pane :label="pztName" name="c1_3" v-if="pztIsShow">
<custom-tab-pane :label="pztName" name="c1_4" v-if="pztIsShow">
<view></view>
<view class="main main2">
<view class="pzPot">
@ -849,7 +849,7 @@
</template>
</view>
</custom-tab-pane>
<custom-tab-pane :label="cwtName" name="c1_4" v-if="cwtIsShow">
<custom-tab-pane :label="cwtName" name="c1_5" v-if="cwtIsShow">
<view class="main" v-if="isCwnum == 0">
<view></view>
<view class="form form2">
@ -915,7 +915,7 @@
<view class="carUl">
<view class="carLi" v-for="(v,index2) in item.goodsInfoList"
:key="index2">
<zb-tooltip placement="bottom-start" color="white">
<!-- <zb-tooltip placement="bottom-start" color="white"> -->
<!-- <view slot="content">
<view class="tipBox">
<view class="li" v-for="(item2,idx) in v.carDetailList"
@ -934,7 +934,7 @@
</p>
<text>共{{v.amount}}辆({{v.lane}}车道)</text>
</view>
</zb-tooltip>
<!-- </zb-tooltip> -->
</view>
</view>
<!-- </template> -->
@ -961,7 +961,7 @@
<image src="../../static/images/leftJt.png" mode=""></image>
<text>返回</text>
</view>
<template v-if="tabsValue == 1">
<template v-if="tabsName == '分指令'">
<view class="drawerTitle">
发送状态
</view>
@ -1001,14 +1001,14 @@
</view>
<view class="popupInfo">
<text>负责人：</text>
<template v-if="tabsValue == 0">
<template v-if="tabsName == '总指令'">
<view style="border: 1px solid gray;">
<superwei-combox :candidates="directorList" :isJSON="true" keyName="text"
placeholder="请选择负责人" v-model="directorValue"
@select="directorChange"></superwei-combox>
</view>
</template>
<template v-if="tabsValue == 1">
<template v-if="tabsName == '分指令'">
<view style="border: 1px solid gray;">
<rudon-multiSelector welcome="请选择负责人" :is_using_slot="false" :is_using_icon="true"
:localdata="directorList" @change="directorChange2"
@ -1032,7 +1032,7 @@
<uni-easyinput type="textarea" v-model="askValue" placeholder="请输入内容..."
:disabled="askDisabled"></uni-easyinput>
<view class="popupBtn">
<view class="btnList" v-if="tabsValue == 0">
<view class="btnList" v-if="tabsName == '总指令'">
<button class="button" type="default" @click="zcCancel">取 消</button>
<button class="button" type="primary" @click="zcConfirm">提 交</button>
</view>
@ -1137,6 +1137,7 @@
title: "",
loginObj: {},
tabsValue: 0, // 0(总指令) 1(分指令)
tabsName:'',
shipInfo: {}, // 船只数据
// 港区信息
portObj: {},
@ -1297,34 +1298,29 @@
})
}
})
// this.getQueryCheckRecord(0) // 获取勾选
// if (this.tabsValue == 0) {
// this.loadSumOrder() // 总指令：分页查询
// this.askDisabled = false
// }
this.getPot() // 获取港口
this.getBrand() // 获取品牌
this.getBvm() // 获取车型
this.getRoleId() // 获取角色ID
// this.initAsk() // 获取装船要求
// this.getStatistics() // 获取统计数据
this.getPotList()
this.getImgInfo()
this.getGoodsInfo()
// this.getJobProgress() //获取卸船进度数据
// this.getCheckReaDots() //获取红点
// this.getTotalProgress() //获取装船总进度
},
mounted () {
this.getQueryCheckRecord(0) // 获取勾选
if (this.tabsValue == 0) {
this.tabsName = this.zzlName
if(!this.zzlName) this.tabsName = this.fzlName
if(!this.fzlName) this.tabsName = this.bzzName
if (this.tabsName == '总指令') {
this.loadSumOrder() // 总指令：分页查询
this.askDisabled = false
} else if(this.tabsName == '分指令' || this.tabsName == '班组长分指令') {
this.loadOtherOrder()
}
this.getStatistics() // 获取统计数据
this.getJobProgress() //获取卸船进度数据
this.getCheckReaDots() //获取红点
this.getTotalProgress() //获取装船总进度
this.getRoleId() // 获取角色ID
},
components: {
HeadView,
@ -1345,30 +1341,31 @@
this.itemList = []
this.sendValue = ''
this.tabsValue = e.value
this.tabsName = e.label
this.zTjActive = -1
this.shipDeck = ""
this.current = 1
this.zTjType = true
this.activeIndex = 0
this.jobProgressList = []
if (e.value == 1 || e.value == 2) {
if (e.label == '分指令' || e.label == '班组长分指令') {
this.loadOtherOrder()
this.askDisabled = true
this.getJobProgress() //获取卸船进度数据
} else if (e.value == 0) {
} else if (e.label == '总指令') {
this.loadSumOrder()
this.askDisabled = false
this.getJobProgress() //获取卸船进度数据
} else if (e.value == 3) {
} else if (e.label == '配载图') {
this.getPotList()
this.getImgInfo()
this.getGoodsInfo()
this.askDisabled = true
} else if (e.value == 4) {
} else if (e.label == '场位图') {
this.getDc()
this.askDisabled = true
}
if(e.value == 0 || e.value == 1) {
if(e.label == '总指令' || e.label == '分指令') {
this.getStatistics() // 获取统计列表
}
this.directorList = []
@ -1380,22 +1377,22 @@
refresh() {
this.itemList = []
this.current = 1
if (this.tabsValue == 1 || this.tabsValue == 2) {
if (this.tabsName == '分指令' || this.tabsName == '班组长分指令') {
this.loadOtherOrder()
} else if (this.tabsValue == 0) {
} else if (this.tabsName == '总指令') {
this.loadSumOrder()
}
this.getCheckReaDots()
},
// 点击搜索
search() {
if (this.tabsValue == 1 || this.tabsValue == 2) {
if (this.tabsName == '分指令' || this.tabsName == '班组长分指令') {
this.loadOtherOrder()
this.getStatistics()
} else if (this.tabsValue == 0) {
} else if (this.tabsName == '总指令') {
this.loadSumOrder()
this.getStatistics()
} else if (this.tabsValue == 4) {
} else if (this.tabsName == '场位图') {
this.getQy()
}
},
@ -1432,11 +1429,11 @@
confirm() {
this.itemList = []
this.current = 1
if (this.tabsValue == 0) {
if (this.tabsName == '总指令') {
this.loadSumOrder()
} else if (this.tabsValue == 1 || this.tabsValue == 2) {
} else if (this.tabsName == '分指令' || this.tabsName == '班组长分指令') {
this.loadOtherOrder()
} else if (this.tabsValue == 4) {
} else if (this.tabsName == '场位图') {
this.getQy()
}
this.jobActive = null
@ -1485,7 +1482,7 @@
target = "N_L"
}
let tabFlag = false
if(this.tabsValue == 1) {
if(this.tabsName == '分指令') {
tabFlag = true
}
uni.request({
@ -1544,7 +1541,7 @@
// 获取分指令列表
loadOtherOrder() {
let teamFlag = ""
if (this.tabsValue == 2) {
if (this.tabsName == '班组长分指令') {
teamFlag = true
this.sendValue = 1
}
@ -1617,7 +1614,7 @@
this.delValue = false
this.distributeType = a
this.$refs.popup.open(type)
if (a == 'again' || a == 'solo') {
if ((a == 'again' || a == 'solo') && item?.lwpId) {
this.fzzRow = item
this.checkList = []
this.checkList.push(item.lwpId)
@ -1628,9 +1625,9 @@
// 获取角色ID
getRoleId() {
let name = ""
if (this.tabsValue == 0) {
if (this.tabsName == '总指令') {
name = "dongLei"
} else if (this.tabsValue == 1) {
} else if (this.tabsName == '分指令') {
name = "shipmenter"
}
uni.request({
@ -1689,16 +1686,28 @@
}
})
},
QC(arr) {
for (let i = 0; i < arr.length; i++) {
for (let j = i + 1; j < arr.length; j++) {
if (arr[i] == arr[j]) {
arr.splice(j, 1);
j--;
}
}
}
return arr;
},
// 指令下发确认
zlConfirm() {
// console.log(this.directorTrue)
if (this.directorTrue.length > 0) {
let lwpIdList = []
if (this.tabsValue == 0) {
lwpIdList = this.zzlLwpIdList
} else if (this.tabsValue == 1) {
lwpIdList = this.checkList
if (this.tabsName == '总指令') {
lwpIdList = this.QC(this.zzlLwpIdList)
} else if (this.tabsName == '分指令') {
lwpIdList = this.QC(this.checkList)
}
// console.log('this.checkList',this.checkList);
// 外贸数据
let reqDTO = {
"loadUnloadRequirements": this.askValue,
@ -2059,6 +2068,7 @@
this.checkList.push(item.lwpId)
}
})
// console.log('this.checkList',this.checkList);
this.$forceUpdate()
},
// 配载图相关
@ -2231,7 +2241,7 @@
getQy() {
uni.request({
// url: `${this.$local}/api/yardGoods/monitor/region/statistics?vvyId=${this.shipInfo.vvyId}&pymId=${this.dcId}&displayFlag=1&brdId=${this.brdId}&bvmId=${this.bvmId}&potId=${this.potId}&mnfBl=${this.mnfBl}&size=1000`,
url: `${this.$local}/api/yardGoods/monitor/v2/region/list?vvyId=${this.shipInfo.vvyId}&pymId=${this.dcId}&displayFlag=1&brdId=${this.brdId}&bvmId=${this.bvmId}&potId=${this.potId}&mnfBl=${this.mnfBl}&size=1000`,
url: `${this.$local}/api/yardGoods/monitor/v2/region/list?vvyId=${this.shipInfo.vvyId}&pymId=${this.dcId}&pamId=${this.portObj.portId}&displayFlag=1&brdId=${this.brdId}&bvmId=${this.bvmId}&potId=${this.potId}&mnfBl=${this.mnfBl}&size=1000`,
header: {
'Content-Type': 'application/json', //自定义请求头信息
'Authorization': `Bearer ${this.loginObj.access_token}`
@ -2289,9 +2299,9 @@
// 获取装船进度数据
getJobProgress() {
let tabFlag = null
if(this.tabsValue == 1) {
if(this.tabsName == '分指令') {
tabFlag = 1
} else if(this.tabsValue == 2) {
} else if(this.tabsName == '班组长分指令') {
tabFlag = 2
}
uni.request({
@ -2379,9 +2389,9 @@
method: 'PUT', //请求方式，必须为大写
success: (res) => {
if(res.data.data) {
if(this.tabsValue == 0) {
if(this.tabsName == '总指令') {
this.loadSumOrder()
} else if(this.tabsValue == 1 || this.tabsValue == 2) {
} else if(this.tabsName == '分指令' || this.tabsName == '班组长分指令') {
this.loadOtherOrder()
}
}
@ -3601,7 +3611,7 @@
.popupBox2 {
width: 80vw;
height: 30vh;
height: 17vh;
}
// 右侧抽屉筛选

2
pages/monitor/index.vue
View File

@ -995,7 +995,7 @@
// 获取右侧区域数据
getQy() {
uni.request({
url: `${this.$local}/api/yardGoods/monitor/v2/region/list?spmId=${this.shipId}&vvyId=${this.vvyId}&pymId=${this.dcId}&displayFlag=0&brdId=${this.brdId}&potId=${this.potId}&vinCode=${this.vinCode}&workStatuss=${this.workId}&size=1000&trendPlansOrderRule=${this.trendPlansOrderRule}`,
url: `${this.$local}/api/yardGoods/monitor/v2/region/list?spmId=${this.shipId}&vvyId=${this.vvyId}&pymId=${this.dcId}&pamId=${this.portObj.portId}&displayFlag=0&brdId=${this.brdId}&potId=${this.potId}&vinCode=${this.vinCode}&workStatuss=${this.workId}&size=1000&trendPlansOrderRule=${this.trendPlansOrderRule}`,
// url: `${this.$local}/api/yardGoods/monitor/region/statistics?spmId=${this.shipId}&vvyId=${this.vvyId}&pymId=${this.dcId}&displayFlag=0&brdId=${this.brdId}&potId=${this.potId}&vinCode=${this.vinCode}&workStatuss=${this.workId}&size=1000`,
header: {
'Content-Type': 'application/json', //自定义请求头信息

201
pages/receipt/details.vue
View File

@ -14,29 +14,29 @@
<p class="bh">编号/N0:<text>QR-7.5.1-01-05-M</text></p>
<view class="infoList">
<view class="li">
<p class="liTitle">船名：</p>
<text>{{shipInfo.spmName}}</text>
<p class="liTitle">船名航次：</p>
<text>{{shipInfo.spmName}}/{{shipInfo.vvyName}}</text>
</view>
<view class="li">
<!-- <view class="li">
<p class="liTitle">航次：</p>
<text>{{shipInfo.vvyName}}</text>
</view> -->
<view class="li">
<p class="liTitle">贸易类型：</p>
<text>{{shipInfo.tradeType}}</text>
</view>
<view class="li">
<p class="liTitle">进出口：</p>
<text>{{shipInfo.importExportFlagName}}</text>
</view>
<view class="li">
<p class="liTitle">贸易类型：</p>
<text>{{shipInfo.tradeType}}</text>
</view>
<view class="li">
<p class="liTitle">完工时间：</p>
<text>{{shipInfo.actualFinishTime}}</text>
</view>
<view class="li">
<!-- <view class="li">
<p class="liTitle">工班：</p>
<text>{{shipInfo.gb}}</text>
</view>
</view> -->
</view>
</view>
<view class="listBox">
@ -45,8 +45,10 @@
<p>货物明细</p>
<view class="total">
<text>总计：</text>
<text>车辆数：{{totalObj.carAmount}}</text>
<text>备件数：{{totalObj.partAmount}}</text>
<!-- <text>车辆数：{{totalObj.carAmount}}</text>
<text>备件数：{{totalObj.partAmount}}</text> -->
<text>计划数：{{shipInfo.planAmount}} + {{shipInfo.planParts}}</text>
<text>实际数：{{shipInfo.actualAmount}} + {{shipInfo.actualParts}}</text>
</view>
</view>
<view class="table">
@ -63,17 +65,32 @@
{{item.mnfMk}}
</view>
<view class="li">
{{ item.carAmount }} + {{ item.partAmount }}
</view>
<view class="li">
{{ item.actualAmount }} + {{item.actualParts }}
</view>
<view class="li">
{{item.brdName}}
</view>
<template v-if="item.handoverRemark">
<view class="li">
{{item.carAmount}}
{{item.handoverRemark}}
<uni-icons type="compose" size="20" @click="openRemark(item)" v-show="shipInfo.handoverStatus != 2"></uni-icons>
</view>
</template>
<template v-else>
<view class="li">
{{item.partAmount}}
{{item.handoverNativeRemark}}
<uni-icons type="compose" size="20" @click="openRemark(item)" v-show="shipInfo.handoverStatus != 2"></uni-icons>
</view>
<view class="li" @click="toDetails(item)">
</template>
<view class="li">
{{item.damage}}
</view>
<!-- <view class="li" @click="toDetails(item)">
详情
</view>
</view> -->
</view>
</view>
</view>
@ -143,6 +160,21 @@
</view>
</view>
</uni-popup>
<uni-popup ref="popup2" type="dialog">
<view class="popupBox popupBox2">
<view class="popupTitle">
备注
</view>
<uni-easyinput type="textarea" v-model="askValue" placeholder="请输入内容..."
></uni-easyinput>
<view class="popupBtn">
<view class="btnList">
<button class="button" type="default" @click="zcCancel">取 消</button>
<button class="button" type="primary" @click="zcConfirm">确 认</button>
</view>
</view>
</view>
</uni-popup>
</view>
</view>
</template>
@ -156,8 +188,8 @@
portObj: {},
title: "",
shipInfo: {},
totalObj: {},
tableHead: ["提单号", "唛头", "品牌", "车辆数", "备件数", "原残具体情况"],
// totalObj: {},
tableHead: ["提单号", "唛头", "计划数","实际数","货名", "备注", "残损信息"],
tableData: [],
rowTableHead: ["序号", "车架号", "质损发生环节", "损伤情况"],
rowTableData: [],
@ -169,6 +201,9 @@
shipSignUrl: "",
vvyId: "",
askValue:"",
splId:'',
oldRemark:''
}
},
onLoad(options) {
@ -191,7 +226,6 @@
},
method: 'GET', //请求方式，必须为大写
success: (res) => {
console.log(res)
if (res.statusCode == 200) {
this.shipInfo = res.data.data.records[0]
this.title = `船名：${this.shipInfo.spmName} / 航次：${this.shipInfo.vvyName} 装卸货物交接计数单`
@ -212,8 +246,8 @@
method: 'GET', //请求方式，必须为大写
success: (res) => {
if (res.statusCode == 200) {
if(res.data.data.plan.records) this.tableData = res.data.data.plan.records
if(res.data.data.count) this.totalObj = res.data.data.count
if(res.data.data.plan) this.tableData = res.data.data.plan
// if(res.data.data.count) this.totalObj = res.data.data.count
}
}
})
@ -288,6 +322,45 @@
url: '/pages/receipt/sign?params=' + params
})
},
// 打开备注弹框
openRemark(e) {
if(e.handoverRemark) {
this.askValue = e.handoverRemark
} else {
this.askValue = e.handoverNativeRemark
}
this.oldRemark = e.handoverNativeRemark
this.splId = e.splId
this.$refs.popup2.open('center')
},
// 备注确认
zcConfirm() {
let obj = {
vvyId:this.shipInfo.vvyId,
splId:this.splId,
oldRemark:this.oldRemark,
remark:this.askValue
}
uni.request({
url: `${this.$local}/shp/iEDeliverySlipController/saveRemak`,
data: obj,
header: {
'Content-Type': 'application/json', //自定义请求头信息
'Authorization': `Bearer ${this.loginObj.access_token}`
},
method: 'POST', //请求方式，必须为大写
success: (res) => {
if (res.statusCode == 200) {
this.getInfo()
}
}
})
this.$refs.popup2.close()
},
// 备注取消
zcCancel() {
this.$refs.popup2.close()
},
},
}
</script>
@ -362,11 +435,11 @@
.infoList {
display: flex;
justify-content: space-around;
flex-wrap: wrap;
// flex-wrap: wrap;
font-size: 14px;
color: #23262E;
margin-top: 16px;
padding: 0 60px;
padding: 0 15px;
.li {
display: flex;
@ -545,6 +618,90 @@
height: 400px;
overflow: scroll;
}
.popupBox {
width: 400px;
background-color: #fff;
border-radius: 8px;
.popupTitle {
font-size: 20px;
font-weight: bold;
border-bottom: 1px solid #ccc;
padding: 5px 0;
text-align: center;
}
.popupInfo {
display: flex;
margin-top: 20px;
line-height: 35px;
margin-left: 20px;
/deep/.superwei-combox {
border: none;
padding: 0;
}
/deep/.componentW100 {
width: 300px;
}
/deep/.uni-icons {
margin-right: 12px;
}
}
/deep/.uni-easyinput {
// margin-top: 20px;
width: 460px;
margin-left: 20px;
}
/deep/.uni-select__input-placeholder {
text-align: left;
}
/deep/.uni-select__input-text {
text-align: left;
}
/deep/.is-textarea {
width: 57vw;
height: 10vh;
}
/deep/.uni-easyinput__content-textarea {
height: 10vh;
}
.popupBtn {
margin-top: 20px;
padding: 14px 0;
display: flex;
justify-content: center;
.btnList {
display: flex;
.button {
width: 125px;
height: 36px;
line-height: 36px;
margin-left: 15px;
border-radius: 4px;
}
.button:first-child {
background-color: #fff;
border: 1px solid #0067CF;
color: #0067CF;
}
}
}
}
.popupBox2 {
width: 60vw;
height: 17vh;
}
}
}
</style>

10
pages/shipWork/mixWork.vue
View File

@ -18,7 +18,7 @@
<text>航次：{{item.vvyName}}</text>
</view>
<view class="liInfo">
<p>贸易类型：<text>{{shipInfo.spmTradeName}}</text></p>
<p>贸易类型：<text>{{shipInfo[0].tradeTypeName}}</text></p>
<p>进出口：<text>{{item.importExportFlagName}}</text></p>
<p>作业组数：<text>{{item.workSuite}}</text></p>
<p>单船人数：<text>{{item.shipPerson}}</text></p>
@ -105,7 +105,7 @@
data() {
return {
title: "船只 - 杂项作业单",
shipInfo: {},
shipInfo: [],
vtpId: "",
tabsValue: 0,
// 人员信息列表
@ -124,7 +124,7 @@
this.vtpId = uni.getStorageSync('vtpId')
let title = uni.getStorageSync('shipWorkTitle')
this.title = `${title} / 杂项作业单 `
this.executeSql1('shipInfoTable')
this.executeSql1('voyageScheduleDataDetailRespDTOList')
if (this.tabsValue == 0) {
this.executeSql1('messageRespList')
} else {
@ -139,8 +139,8 @@
executeSql1(tableName) {
let sql = `select * from ${tableName} WHERE vtpId = '${this.vtpId}'`
sqlite.executeSqlCeshi(sql).then((value) => {
if (tableName == 'shipInfoTable') {
this.shipInfo = value[0]
if (tableName == 'voyageScheduleDataDetailRespDTOList') {
this.shipInfo = value
} else if (tableName == 'messageRespList') {
this.peopleInfo = value
} else if (tableName == 'workMessageRespList' && value.length > 0) {

10
pages/shipWork/notice.vue
View File

@ -14,7 +14,7 @@
</view>
<view class="liInfo">
<p>进出口：<text>{{item.importExportFlagName}}</text></p>
<p>贸易类型：<text>{{shipInfo.spmTradeName}}</text></p>
<p>贸易类型：<text>{{shipInfo[0].tradeTypeName}}</text></p>
<p>作业日期：<text>{{item.workDate}}</text></p>
</view>
</view>
@ -32,7 +32,7 @@
data() {
return {
title: "船名 - 船舶装卸通知书",
shipInfo: {},
shipInfo: [],
infoList: [],
vtpId: "",
}
@ -42,7 +42,7 @@
let title = uni.getStorageSync('shipWorkTitle')
this.title = `${title} / 船舶装卸通知书 `
this.executeSql1('shipmentLoadUnloadNoticeRespList')
this.executeSql1('shipInfoTable')
this.executeSql1('voyageScheduleDataDetailRespDTOList')
},
methods: {
// 查
@ -50,8 +50,8 @@
let sql = `select * from ${tableName} WHERE vtpId = '${this.vtpId}'`
sqlite.executeSqlCeshi(sql).then((value) => {
// 在resolve时执行的回调函数
if (tableName == 'shipInfoTable') {
this.shipInfo = value[0]
if (tableName == 'voyageScheduleDataDetailRespDTOList') {
this.shipInfo = value
} else {
this.infoList = value
}

10
pages/shipWork/supply.vue
View File

@ -15,7 +15,7 @@
<view class="liInfo">
<p>类型：<text>{{item.supplyType}}</text></p>
<p>进出口：<text>{{item.importExportFlagName}}</text></p>
<p>贸易类型：<text>{{shipInfo.spmTradeName}}</text></p>
<p>贸易类型：<text>{{shipInfo[0].tradeTypeName}}</text></p>
<p>日期：<text>{{item.supplyDate}}</text></p>
</view>
<view class="status didNot" v-if="item.status == 0 || item.status == 'null'">
@ -51,7 +51,7 @@
data() {
return {
title: "船只 - 供给",
shipInfo: {},
shipInfo: [],
infoList: [],
vtpId: "",
}
@ -61,7 +61,7 @@
let title = uni.getStorageSync('shipWorkTitle')
this.title = `${title} / 供给 `
this.executeSql1('shipmentShipSupplyRespList')
this.executeSql1('shipInfoTable')
this.executeSql1('voyageScheduleDataDetailRespDTOList')
},
methods: {
// 查
@ -69,8 +69,8 @@
let sql = `select * from ${tableName} WHERE vtpId = '${this.vtpId}'`
sqlite.executeSqlCeshi(sql).then((value) => {
// 在resolve时执行的回调函数
if (tableName == 'shipInfoTable') {
this.shipInfo = value[0]
if (tableName == 'voyageScheduleDataDetailRespDTOList') {
this.shipInfo = value
} else {
this.infoList = value
}

10
pages/shipWork/untieCord.vue
View File

@ -14,7 +14,7 @@
</view>
<view class="liInfo">
<p>进出口：<text>{{item.importExportFlagName}}</text></p>
<p>贸易类型：<text>{{shipInfo.spmTradeName}}</text></p>
<p>贸易类型：<text>{{shipInfo[0].tradeTypeName}}</text></p>
<p>泊位：<text>{{item.bthIdName}}</text></p>
<p>系缆时间：<text>{{item.attachTime}}</text></p>
</view>
@ -51,7 +51,7 @@
data() {
return {
title: "船只 - 系解缆",
shipInfo: {},
shipInfo: [],
infoList: [],
vtpId: "",
}
@ -60,8 +60,8 @@
this.vtpId = uni.getStorageSync('vtpId')
let title = uni.getStorageSync('shipWorkTitle')
this.title = `${title} / 系解缆 `
this.executeSql1('voyageScheduleDataDetailRespDTOList')
this.executeSql1('attachUnmoorRespList')
this.executeSql1('shipInfoTable')
},
methods: {
// 查
@ -69,8 +69,8 @@
let sql = `select * from ${tableName} WHERE vtpId = '${this.vtpId}'`
sqlite.executeSqlCeshi(sql).then((value) => {
// 在resolve时执行的回调函数
if (tableName == 'shipInfoTable') {
this.shipInfo = value[0]
if (tableName == 'voyageScheduleDataDetailRespDTOList') {
this.shipInfo = value
} else {
this.infoList = value
}

10
pages/shipWork/workAssign.vue
View File

@ -14,7 +14,7 @@
</view>
<view class="liInfo">
<p>进出口：<text>{{item.importExportFlagName}}</text></p>
<p>贸易类型：<text>{{shipInfo.spmTradeName}}</text></p>
<p>贸易类型：<text>{{shipInfo[0].tradeTypeName}}</text></p>
<p>作业时间：<text>{{item.startTime}} - {{item.endTime}}</text></p>
</view>
</view>
@ -32,7 +32,7 @@
data() {
return {
title: "船只 - 指导员作业布置",
shipInfo: {},
shipInfo: [],
infoList: [],
vtpId: "",
}
@ -42,7 +42,7 @@
let title = uni.getStorageSync('shipWorkTitle')
this.title = `${title} / 指导员作业布置 `
this.executeSql1('shipmentAdviserLayoutRespList')
this.executeSql1('shipInfoTable')
this.executeSql1('voyageScheduleDataDetailRespDTOList')
},
methods: {
// 查
@ -50,8 +50,8 @@
let sql = `select * from ${tableName} WHERE vtpId = '${this.vtpId}'`
sqlite.executeSqlCeshi(sql).then((value) => {
// 在resolve时执行的回调函数
if (tableName == 'shipInfoTable') {
this.shipInfo = value[0]
if (tableName == 'voyageScheduleDataDetailRespDTOList') {
this.shipInfo = value
} else {
this.infoList = value
}

2
uni_modules/custom-tabs/components/custom-tabs/custom-tabs.vue
View File

@ -2,7 +2,7 @@
<view :class="['tab',{'tab-fixed':fixed}]">
<scroll-view :class="['tab-bar',{'tab-bar-center':tabCenter}]" scroll-x="true" :scroll-into-view="scrollId" scroll-with-animation>
<view v-for="(item,index) in tabList" class="tab-bar-item" :class="{'active':tabIndex==index}" :id="`tab_${index}`" :style="[{'padding':`0 ${tabSpacing}rpx`},tabIndex==index?activeTextStyle:defaultTextStyle]" :key="index" @click="putChange(item.name,index);tabChange(index)">
<text :class="[(index == 0 && flag1) || (index == 1 && flag2) ? 'txt' :'']">{{item.label}}</text>
<text :class="[(item.label == '总指令' && flag1) || (item.label == '分指令' && flag2) ? 'txt' :'']">{{item.label}}</text>
<text class="active-line" v-if="tabIndex==index" :style="[activeLineStyle]"></text>
</view>
</scroll-view>