pad单证页面

dev2
Panzihang 2023-07-19 18:12:19 +08:00
parent 4a1903071b
commit 57741a7cdd
7 changed files with 561 additions and 387 deletions

12
App.vue
View File

@ -17,4 +17,16 @@
@import "style/css/main.css";
@import "style/css/flex-main.css";
@import "/style/iconfont.css";
/deep/.uni-select {
background-color: #fff;
}
/deep/.uni-date-x--border {
background-color: #fff;
}
/deep/.superwei-combox {
background-color: #fff;
}
</style>

View File

@ -6,7 +6,7 @@
@click="tabsClick(item,index)">{{item}}</view>
</view>
<!-- 人员信息列表 -->
<view class="ul" v-if="tabsType == 1">
<view class="ul" v-if="tabsType == 0">
<view class="li" v-for="(item,index) in peopleInfo" :key="index" @click="add('look',item,index)">
<view class="title">航次{{item.vvyName}}</view>
<p>贸易类型{{item.tradeTypeName}}</p>
@ -17,12 +17,12 @@
</view>
</view>
<!-- 工班信息列表 -->
<view class="ul" v-if="tabsType == 2">
<view class="li" v-for="(item,index) in shiftInfo" :key="index" @click="lookShift">
<view class="ul" v-if="tabsType == 1">
<view class="li" v-for="(item,index) in shiftInfo" :key="index" @click="lookShift(item,index)">
<view class="title">航次{{item.vvyName}}</view>
<view class="shift" v-for="(item2,index2) in item.workMessageDetailReqDTOS" :key="index2">
<p>{{item2.wkdId}}</p>
<span>作业时间{{item2.workTime}}</span>
<view class="shift" v-for="(item2,index2) in item.shiftList" :key="index2">
<p>{{item2.gbTextValue}}</p>
<span>作业开始时间{{item2.startTime}}</span>
</view>
<view class="state">状态未上传</view>
</view>
@ -39,38 +39,35 @@
return {
shipInfo: [],
tabsList: ["人员信息", "工班信息"],
tabsType: 1, // 1 2
tabsType: 0, // 0 1
tabsIndex: 0,
//
peopleInfo: [],
//
shiftInfo: [{
vvyName: "511I",
workMessageDetailReqDTOS: [{
wkdId: "一工班",
workTime: "2023/09/09 13:00:00"
}, {
wkdId: "二工班",
workTime: "2023/09/09 13:00:00"
}, {
wkdId: "三工班",
workTime: "2023/09/09 13:00:00"
}]
}, ]
shiftInfo: []
}
},
mounted() {
this.tabsType = this.$route.query.infoType
if (this.tabsType != 0 || this.tabsType != 1) {
this.tabsType = 0
this.tabsIndex = 0
} else {
this.tabsIndex = this.tabsType
}
this.peopleInfo = uni.getStorageSync('addPeopleArr')
this.shiftInfo = uni.getStorageSync('addShiftArr')
console.log(this.shiftInfo)
this.shipInfo = uni.getStorageSync('shipInfo')
this.peopleInfo = uni.getStorageSync('addPeopleArr');
},
methods: {
tabsClick(item, index) {
this.tabsIndex = index;
if (item == "人员信息") {
this.tabsType = 1;
this.tabsType = 0;
} else {
this.tabsType = 2;
this.tabsType = 1;
}
},
add(state, item, index) {
@ -80,7 +77,7 @@
state: state
}
const params = encodeURIComponent(JSON.stringify(obj));
if (this.tabsType == 1) {
if (this.tabsType == 0) {
uni.navigateTo({
url: `/pages/shipWork/peopleAdd?params=${params}`
})
@ -90,7 +87,9 @@
})
}
},
lookShift() {
lookShift(item, index) {
uni.setStorageSync('shiftRow', item);
uni.setStorageSync('shiftRowIndex', index);
uni.navigateTo({
url: `/pages/shipWork/shiftDetails`
})

View File

@ -112,7 +112,6 @@
}
},
mounted() {
if (this.obj.state == "edit" || this.obj.state == "look") {
this.getRow()
}
@ -139,7 +138,6 @@
getRow() {
this.peopleRow = uni.getStorageSync('peopleRow');
this.peopleRowIndex = uni.getStorageSync('peopleRowIndex');
if (this.obj.state == "edit") {
this.hcValue = this.peopleRow.vvyId
this.hcTextValue = this.peopleRow.vvyName
this.tqValue = this.peopleRow.weatherId
@ -151,7 +149,6 @@
this.datetime = [this.peopleRow.jobStartTime, this.peopleRow.jobEndTime]
this.startTime = this.peopleRow.jobStartTime
this.endTime = this.peopleRow.jobEndTime
}
},
//
hcChange(e) {
@ -197,7 +194,7 @@
//
cancel() {
uni.navigateTo({
url: '/pages/shipWork/mixWork'
url: '/pages/shipWork/mixWork?infoType=0'
})
},
//
@ -206,7 +203,7 @@
addPeopleArr.splice(this.peopleRowIndex, 1)
uni.setStorageSync('addPeopleArr', addPeopleArr);
uni.navigateTo({
url: '/pages/shipWork/mixWork'
url: '/pages/shipWork/mixWork?infoType=0'
})
},
//
@ -243,7 +240,7 @@
}
uni.navigateTo({
url: '/pages/shipWork/mixWork'
url: '/pages/shipWork/mixWork?infoType=0'
})
},
//

View File

@ -32,12 +32,12 @@
<view class="li">
<p class="liTitle"><text class="required">*</text>工班</p>
<uni-data-select v-model="item.gbValue" :localdata="gbList"
@change="gbChange"></uni-data-select>
@change="gbChange(item,index)"></uni-data-select>
</view>
<view class="li">
<p class="liTitle"><text class="required">*</text>作业时间 </p>
<uni-datetime-picker v-model="item.datetime" type="datetimerange" rangeSeparator="-"
@change="changeLog" />
@change="changeLog(item)" />
</view>
</view>
<view class="ulTop"><text @click="ulAdd2"></text><text @click="del"></text><van-icon
@ -46,7 +46,7 @@
<view class="li">
<p class="liTitle"><text class="required">*</text>车型</p>
<uni-data-select v-model="item.cxValue" :localdata="cxList"
@change="cxChange"></uni-data-select>
@change="cxChange(item,index)"></uni-data-select>
</view>
<view class="li">
<p><text class="required">*</text>数量</p>
@ -55,7 +55,7 @@
<view class="li">
<p class="liTitle"><text class="required">*</text>装卸方式</p>
<uni-data-select v-model="item.fsValue" :localdata="fsList"
@change="fsChange"></uni-data-select>
@change="fsChange(item,index)"></uni-data-select>
</view>
<view class="li widthLi">
<p class="liTitle">备注</p>
@ -73,7 +73,7 @@
<view class="li">
<p class="liTitle"><text class="required">*</text>翻仓类型</p>
<uni-data-select v-model="item.fcValue" :localdata="fcList"
@change="fcChange"></uni-data-select>
@change="fcChange(item,index)"></uni-data-select>
</view>
</view>
<view v-for="(item2,index2) in item.fcUlList2" :key="index2 + 'fc2'">
@ -82,20 +82,21 @@
<view class="ul ul2 fcUl2">
<view class="li">
<p class="liTitle"><text class="required">*</text>翻舱起点位置</p>
<uni-easyinput v-model="item2.qdValue" focus placeholder="请输入翻舱起点位置"></uni-easyinput>
<uni-easyinput v-model="item2.qdValue" placeholder="请输入翻舱起点位置"></uni-easyinput>
</view>
<view class="li">
<p class="liTitle"><text class="required">*</text>翻舱终点位置</p>
<uni-easyinput v-model="item2.zdValue" focus placeholder="请输入翻舱终点位置"></uni-easyinput>
<uni-easyinput v-model="item2.zdValue" placeholder="请输入翻舱终点位置"></uni-easyinput>
</view>
<view class="li">
<p class="liTitle"><text class="required">*</text>工班</p>
<uni-data-select v-model="item2.gbValue" :localdata="gbList"
@change="gbChange"></uni-data-select>
@change="fcgbChange(index,item2,index2)"></uni-data-select>
</view>
<view class="li">
<p class="liTitle"><text class="required">*</text>作业时间 </p>
<uni-datetime-picker v-model="item2.datetime" type="datetimerange" rangeSeparator="-" />
<uni-datetime-picker v-model="item2.datetime" type="datetimerange" rangeSeparator="-"
@change="changeLog(item2)" />
</view>
<view class="li">
<p class="liTitle"><text class="required">*</text>数量</p>
@ -125,11 +126,12 @@
</view>
<view class="li">
<p class="liTitle"><text class="required">*</text>普通工人</p>
<uni-number-box v-model="otherObj.ptWorker" />
<uni-number-box v-model="otherObj.ptworker" />
</view>
<view class="li">
<p class="liTitle"><text class="required">*</text>作业时间 </p>
<uni-datetime-picker v-model="otherObj.workTime" type="datetimerange" rangeSeparator="-" />
<uni-datetime-picker v-model="otherObj.datetime" type="datetimerange" rangeSeparator="-"
@change="changeLog(otherObj)" />
</view>
<view class="li">
<p class="liTitle"><text class="required">*</text>重量</p>
@ -165,7 +167,8 @@
</template>
<view class="btnList">
<van-button type="default" @click="cancel"></van-button>
<van-button type="info" @click="save"></van-button>
<van-button type="info" @click="back" v-if="active > 0"></van-button>
<van-button type="info" @click="save" v-if="active == 2"></van-button>
<van-button type="info" @click="next" v-if="active < 2"></van-button>
</view>
</view>
@ -184,6 +187,8 @@
}]
},
obj: {},
dataInfo: {},
shiftRowIndex: 0,
active: 0,
stepList: [{
title: '工班信息'
@ -207,79 +212,52 @@
zxList: [],
ulList1: [{
gbValue: "",
dataTime: ""
gbTextValue: "",
datetime: ['', ''],
startTime: "",
endTime: "",
}],
//
gbList: [{
value: "工班0",
text: "工班0"
},
{
value: "工班1",
text: "工班1"
},
{
value: "工班2",
text: "工班2"
},
],
gbList: [],
ulList2: [{
cxValue: "",
cxTextValue: "",
numValue: 0,
fsValue: "",
fsTextValue: "",
notes: "",
}],
//
cxList: [{
value: "车型0",
text: "车型0"
},
{
value: "车型1",
text: "车型1"
},
{
value: "车型2",
text: "车型2"
},
],
cxList: [],
//
fsList: [{
value: "装卸方式0",
text: "装卸方式0"
},
{
value: "装卸方式1",
text: "装卸方式1"
},
{
value: "装卸方式2",
text: "装卸方式2"
},
],
fsList: [],
//
//
fcList: [{
value: "翻仓类型0",
value: "0",
text: "翻仓类型0"
},
{
value: "翻仓类型1",
value: "1",
text: "翻仓类型1"
},
{
value: "翻仓类型2",
value: "2",
text: "翻仓类型2"
},
],
fcUlList: [{
fcValue: "",
fcTextValue: "",
fcUlList2: [{
qdValue: "",
zdValue: "",
gbValue: "",
dataTime: "",
gbTextValue: "",
datetime: ['', ''],
startTime: "",
endTime: "",
numValue: 0,
tjValue: 0,
zlValue: 0
@ -290,7 +268,9 @@
otherObj: {
jsWorker: 0,
ptworker: 0,
workTime: "",
datetime: ['', ''],
startTime: "",
endTime: "",
zlValue: 0,
tjValue: 0,
describe: "",
@ -307,23 +287,69 @@
},
mounted() {
this.getShip()
if (this.obj.state == 'edit') {
this.editData();
}
},
methods: {
//
getShip() {
this.shipInfo = uni.getStorageSync('shipInfo')
//
this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
this.hcList.push({
text: v.vvyName,
value: v.vvyId
})
})
//
this.shipInfo.handTypeList.forEach((v, index) => {
this.zxList.push({
text: v.ptrDesc,
value: v.ptrCode
})
})
//
this.shipInfo.shipmentBasicShiftList.forEach((v, index) => {
this.gbList.push({
text: v.pwcTypeDesc,
value: v.pwcId
})
})
//
this.shipInfo.shipmentVehicleModeList.forEach((v, index) => {
this.cxList.push({
text: v.bvmName,
value: v.bvmId
})
})
//
this.shipInfo.loadTypeList.forEach((v, index) => {
this.fsList.push({
text: v.ptrDesc,
value: v.ptrCode
})
})
//
this.shipInfo.retallyMessageRespList.forEach((v, index) => {
this.fcList.push({
text: v.retallyTypeName,
value: v.retallyType
})
})
},
//
editData() {
this.dataInfo = uni.getStorageSync('shiftRow')
this.shiftRowIndex = uni.getStorageSync('shiftRowIndex')
this.hcValue = this.dataInfo.vvyId
this.hcTextValue = this.dataInfo.vvyName
this.zxValue = this.dataInfo.zxId
this.zxTextValue = this.dataInfo.zxTextValue
this.ulList1 = this.dataInfo.shiftList
this.ulList2 = this.dataInfo.shiftList2
this.fcUlList = this.dataInfo.fcList
this.otherObj = this.dataInfo.otherList
},
//
//
@ -347,14 +373,26 @@
//
ulAdd1() {
this.ulList1.push({
datetime: ['', ''],
gbValue: "",
dataTime: ""
gbTextValue: ""
})
},
//
gbChange(e) {},
gbChange(item, index) {
this.ulList1[index].gbValue = item.gbValue
this.gbList.forEach(v => {
if (v.value == item.gbValue) {
item.gbTextValue = v.text
}
})
},
//
changeLog(e) {},
changeLog(item) {
item.startTime = item.datetime[0].slice(0, item.datetime[0].length - 3)
item.endTime = item.datetime[1].slice(0, item.datetime[1].length - 3)
},
//
ulAdd2() {
this.ulList2.push({
@ -368,28 +406,62 @@
this.ulList2.splice(0, 1)
},
//
cxChange(e) {},
cxChange(item, index) {
this.ulList2[index].cxValue = item.cxValue
this.cxList.forEach(v => {
if (v.value == item.cxValue) {
item.cxTextValue = v.text
}
})
},
//
numChange(val) {},
//
fsChange(e) {},
fsChange(item, index) {
this.ulList2[index].fsValue = item.fsValue
this.fsList.forEach(v => {
if (v.value == item.fsValue) {
item.fsTextValue = v.text
}
})
},
//
//
fcChange(e) {},
fcChange(item, index) {
this.fcUlList[index].fcValue = item.fcValue
this.fcList.forEach(v => {
if (v.value == item.fcValue) {
item.fcTextValue = v.text
}
})
},
//
fcgbChange(index, item2, index2) {
this.fcUlList[index].fcUlList2[index2].gbValue = item2.gbValue
this.gbList.forEach(v => {
if (v.value == item2.gbValue) {
item2.gbTextValue = v.text
}
})
},
// add
fcAdd() {
this.fcUlList.push({
fcValue: "",
fcTextValue: "",
fcUlList2: [{
qdValue: "",
zdValue: "",
gbValue: "",
dataTime: "",
numValue: 12,
tjValue: 12,
zlValue: 12
}]
gbTextValue: "",
datetime: ['', ''],
startTime: "",
endTime: "",
numValue: 0,
tjValue: 0,
zlValue: 0
}],
})
},
fcAdd2(index) {
@ -397,7 +469,10 @@
qdValue: "",
zdValue: "",
gbValue: "",
dataTime: "",
gbTextValue: "",
datetime: ['', ''],
startTime: "",
endTime: "",
numValue: 0,
tjValue: 0,
zlValue: 0
@ -411,15 +486,47 @@
//
cancel() {
uni.navigateTo({
url: '/pages/shipWork/mixWork'
url: '/pages/shipWork/mixWork?infoType=1'
})
},
//
save() {},
//
back() {
this.active = this.active - 1
},
//
next() {
this.active = this.active + 1
},
//
save() {
let addShiftArr = uni.getStorageSync('addShiftArr')
let addShiftObj = {
vvyName: this.hcTextValue,
vvyId: this.hcValue,
zxName: this.zxTextValue,
zxId: this.zxValue,
shiftList: this.ulList1,
shiftList2: this.ulList2,
fcList: this.fcUlList,
otherList: this.otherObj
}
if (this.obj.state == 'add') {
if (addShiftArr != "") {
addShiftArr.push(addShiftObj)
uni.setStorageSync('addShiftArr', addShiftArr);
} else {
addShiftArr = []
addShiftArr.push(addShiftObj)
uni.setStorageSync('addShiftArr', addShiftArr);
}
} else {
addShiftArr[this.shiftRowIndex] = addShiftObj;
uni.setStorageSync('addShiftArr', addShiftArr);
}
uni.navigateTo({
url: '/pages/shipWork/mixWork?infoType=1'
})
},
}
}
</script>

View File

@ -3,197 +3,142 @@
<view class="container">
<custom-tabs type="c1" :value="value" @change="changeIndex">
<custom-tab-pane label="工班信息" name="c1_1">
<ul>
<li>
<view></view>
<view class="ul">
<view class="li">
<p>船名</p>
<span>快乐号</span>
</li>
<li>
<text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
</view>
<view class="li">
<p>航次</p>
<span>JK97065578</span>
</li>
<li>
<text>{{shipInfo.voyageScheduleDataList[0].vvyName}}</text>
</view>
<view class="li">
<p>进出口</p>
<span>进口</span>
</li>
<li>
<text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
</view>
<view class="li">
<p>贸易类型</p>
<span>外贸</span>
</li>
<li>
<text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
</view>
<view class="li">
<p>装卸类型</p>
<span> 装货</span>
</li>
</ul>
<ul>
<li>
<text> {{dataInfo.zxName}}</text>
</view>
</view>
<view class="ul bUl" v-for="(item,index) in dataInfo.shiftList" :key="index + 'a'">
<view class="li">
<p>工班</p>
<span> 一工班</span>
</li>
<li>
<text> {{item.gbTextValue}}</text>
</view>
<view class="li">
<p>作业时间</p>
<span> 2023/06/06 12:00 - 023/06/06 13:00</span>
</li>
<li>
<text> {{item.startTime}} - {{item.endTime}}</text>
</view>
</view>
<view class="ul bUl" v-for="(item,index) in dataInfo.shiftList2" :key="index + 'b'">
<view class="li">
<p>车型</p>
<span>轿车</span>
</li>
<li>
<text>{{item.cxTextValue}}</text>
</view>
<view class="li">
<p>数量</p>
<span>100</span>
</li>
<li class="wLi">
<text>{{item.numValue}}</text>
</view>
<view class="li wLi">
<p>备注</p>
<span>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum
laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin
sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes,
nascetur ridiculus mus. Nam</span>
</li>
<li>
<p>车型</p>
<span>备件</span>
</li>
<li>
<p>数量</p>
<span>100</span>
</li>
<li class="wLi">
<p>备注</p>
<span>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum
laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin
sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes,
nascetur ridiculus mus. Nam</span>
</li>
</ul>
<ul>
<li>
<p>工班</p>
<span> 二工班</span>
</li>
<li>
<p>作业时间</p>
<span> 2023/06/06 12:00 - 023/06/06 13:00</span>
</li>
<li>
<p>车型</p>
<span>轿车</span>
</li>
<li>
<p>数量</p>
<span>100</span>
</li>
<li class="wLi">
<p>备注</p>
<span>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum
laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin
sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes,
nascetur ridiculus mus. Nam</span>
</li>
</ul>
<text>{{item.notes}}</text>
</view>
</view>
</custom-tab-pane>
<custom-tab-pane label="翻仓信息" name="c1_2">
<view class="fcInfo" v-for="(item,index) in fcList" :key="index + 'fc'">
<view class="fcInfo" v-for="(item,index) in dataInfo.fcList" :key="index + 'fc'">
<view class="fcBox">
<p>翻舱类型</p>
<span>舱内翻</span>
<text>{{item.fcTextValue}}</text>
</view>
<ul v-for="(item2,index2) in item.infoList" :key="index2 + 'info'">
<li>
<view class="ul" v-for="(item2,index2) in item.fcUlList2" :key="index2 + 'info'">
<view class="li">
<p>航次</p>
<span>JK97065578</span>
</li>
<li>
<text>{{shipInfo.voyageScheduleDataList[0].vvyName}}</text>
</view>
<view class="li">
<p>翻舱起点</p>
<span>D5H4</span>
</li>
<li>
<text>{{item2.qdValue}}</text>
</view>
<view class="li">
<p>翻舱终点</p>
<span>舱外</span>
</li>
<li>
<text>{{item2.zdValue}}</text>
</view>
<view class="li">
<p>作业时间</p>
<span>2023/06/06 12:00 - 023/06/06 13:00</span>
</li>
<li>
<p>车型</p>
<span>轿车</span>
</li>
<li>
<text>{{item2.startTime}} - {{item2.endTime}}</text>
</view>
<view class="li">
<p>数量</p>
<span>100</span>
</li>
<li>
<text>{{item2.numValue}}</text>
</view>
<view class="li">
<p>体积</p>
<span>30</span>
</li>
<li>
<text>{{item2.tjValue}}</text>
</view>
<view class="li">
<p>重量</p>
<span>50</span>
</li>
</ul>
<text>{{item2.zlValue}}</text>
</view>
</view>
</view>
</custom-tab-pane>
<custom-tab-pane label="其他信息" name="c1_3">
<view class="otherInfo">
<p class="title">辅助作业</p>
<ul>
<li>
<view class="ul">
<view class="li">
<p>技术工人</p>
<span>10</span>
</li>
<li>
<text>{{dataInfo.otherList.jsWorker}}</text>
</view>
<view class="li">
<p>普通工人</p>
<span>30</span>
</li>
<li>
<text>{{dataInfo.otherList.ptworker}}</text>
</view>
<view class="li">
<p>作业时间</p>
<span>2023/06/06 12:00 - 023/06/06 13:00</span>
</li>
<li>
<text>{{dataInfo.otherList.startTime}} - {{dataInfo.otherList.endTime}}</text>
</view>
<view class="li">
<p>重量</p>
<span>50</span>
</li>
<li>
<text>{{dataInfo.otherList.zlValue}}</text>
</view>
<view class="li">
<p>体积</p>
<span>30</span>
</li>
<li class="wLi">
<text>{{dataInfo.otherList.tjValue}}</text>
</view>
<view class="li wLi">
<p>描述</p>
<span>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum
laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin
sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient
montes,nascetur ridiculus mus. Nam</span>
</li>
</ul>
<text>{{dataInfo.otherList.describe}}</text>
</view>
</view>
<p class="title">待工作业</p>
<ul>
<li class="wLi">
<view class="ul">
<view class="li wLi">
<p>描述</p>
<span>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum
laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin
sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient
montes,nascetur ridiculus mus. Nam</span>
</li>
</ul>
<text>{{dataInfo.otherList.dgWork}}</text>
</view>
</view>
<p class="title">作业备注</p>
<ul>
<li class="wLi">
<view class="ul">
<view class="li wLi">
<p>描述</p>
<span>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum
laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin
sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient
montes,nascetur ridiculus mus. Nam</span>
</li>
</ul>
<text>{{dataInfo.otherList.notes}}</text>
</view>
</view>
</view>
</custom-tab-pane>
</custom-tabs>
<view class="btnList">
<van-button type="default" @click="cancel"></van-button>
<van-button type="default">删除</van-button>
<van-button type="info">编辑</van-button>
<van-button type="default" @click="del"></van-button>
<van-button type="info" @click="edit('edit')"></van-button>
</view>
</view>
</view>
@ -204,13 +149,24 @@
data() {
return {
value: 0,
fcList: [{
infoList: [{}, {}]
}, {
infoList: [{}]
shipInfo: {
voyageScheduleDataList: [{
spmName: "",
importExportFlagName: "",
tradeTypeName: ""
}]
},
dataInfo: {
otherList: {}
},
shiftRowIndex: 0,
}
},
mounted() {
this.shipInfo = uni.getStorageSync('shipInfo')
this.dataInfo = uni.getStorageSync('shiftRow')
this.shiftRowIndex = uni.getStorageSync('shiftRowIndex')
},
methods: {
changeIndex(e) {
// console.log(':', e)
@ -218,7 +174,26 @@
//
cancel() {
uni.navigateTo({
url: '/pages/shipWork/mixWork'
url: '/pages/shipWork/mixWork?infoType=1'
})
},
//
del() {
let addShiftArr = uni.getStorageSync('addShiftArr')
addShiftArr.splice(this.shiftRowIndex, 1)
uni.setStorageSync('addShiftArr', addShiftArr);
uni.navigateTo({
url: '/pages/shipWork/mixWork?infoType=1'
})
},
//
edit(state) {
this.obj = {
state: state
};
const params = encodeURIComponent(JSON.stringify(this.obj));
uni.navigateTo({
url: `/pages/shipWork/shiftAdd?params=${params}`
})
},
}
@ -242,11 +217,11 @@
font-size: 16px;
}
ul {
.ul {
border-bottom: 1px dashed #ccc;
}
ul:last-child {
.ul:last-child {
border: none;
}
}
@ -261,12 +236,18 @@
}
}
ul {
.ul[data-v-298cacec] {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
}
.ul {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
li {
.li {
width: 45%;
display: flex;
padding: 10px 20px;
@ -284,6 +265,10 @@
}
}
.bUl {
border-top: 1px solid #999;
}
.btnList {
display: flex;
justify-content: center;

View File

@ -1,64 +1,60 @@
<template>
<view class="untieAdd">
<view class="container">
<ul>
<li>
<view class="ul">
<view class="li">
<p>船名</p>
<span>快乐号</span>
</li>
<li>
<p><span class="required" v-if="obj.state != 'look'">*</span></p>
<text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
</view>
<view class="li">
<p><text class="required" v-if="obj.state != 'look'">*</text></p>
<uni-number-box v-model="zlShip" v-if="obj.state != 'look'" />
<span v-else>100</span>
</li>
<li>
<p><span class="required" v-if="obj.state != 'look'">*</span></p>
<text v-else>{{zlShip}}</text>
</view>
<view class="li">
<p><text class="required" v-if="obj.state != 'look'">*</text></p>
<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange"
v-if="obj.state != 'look'"></uni-data-select>
<span v-else>CK98796</span>
</li>
<li>
<text v-else>{{hcTextValue}}</text>
</view>
<view class="li">
<p>进出口</p>
<span>进口</span>
</li>
<li>
<text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
</view>
<view class="li">
<p>贸易类型</p>
<span>内贸</span>
</li>
<li>
<p><span class="required" v-if="obj.state != 'look'">*</span></p>
<text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
</view>
<view class="li">
<p><text class="required" v-if="obj.state != 'look'">*</text></p>
<uni-data-select v-model="bwValue" :localdata="bwList" @change="bwChange"
v-if="obj.state != 'look'"></uni-data-select>
<span v-else>1</span>
</li>
<li>
<p><span class="required" v-if="obj.state != 'look'">*</span></p>
<uni-datetime-picker v-model="xlTime" type="datetimerange" rangeSeparator="-" @change="changeLog"
v-if="obj.state != 'look'" />
<span v-else>2020-04-21 00:00 - 2020-04-21 00:00</span>
</li>
<li>
<text v-else>{{bwTextValue}}</text>
</view>
<view class="li">
<p><text class="required" v-if="obj.state != 'look'">*</text></p>
<uni-datetime-picker v-model="xlTime" @change="changeLog1" v-if="obj.state != 'look'" />
<text v-else>{{xlTime}}</text>
</view>
<view class="li">
<p>解缆时间</p>
<uni-datetime-picker v-model="jlTime" type="datetimerange" rangeSeparator="-" @change="changeLog"
v-if="obj.state != 'look'" />
<span v-else>2020-04-21 00:00 - 2020-04-21 00:00</span>
</li>
<li>
<uni-datetime-picker v-model="jlTime" @change="changeLog2" v-if="obj.state != 'look'" />
<text v-else>{{jlTime}}</text>
</view>
<view class="li">
<p>移泊时间</p>
<uni-datetime-picker v-model="ybTime" type="datetimerange" rangeSeparator="-" @change="changeLog"
v-if="obj.state != 'look'" />
<span v-else>2020-04-21 00:00 - 2020-04-21 00:00</span>
</li>
<li>
<uni-datetime-picker v-model="ybTime" @change="changeLog3" v-if="obj.state != 'look'" />
<text v-else>{{ybTime}}</text>
</view>
<view class="li">
<p>停泊时间</p>
<uni-datetime-picker v-model="tbTime" type="datetimerange" rangeSeparator="-" @change="changeLog"
v-if="obj.state != 'look'" />
<span v-else>2020-04-21 00:00 - 2020-04-21 00:00</span>
</li>
</ul>
<uni-datetime-picker v-model="tbTime" @change="changeLog4" v-if="obj.state != 'look'" />
<text v-else>{{tbTime}}</text>
</view>
</view>
<view class="btnList">
<van-button type="default" @click="cancel"></van-button>
<van-button type="default" v-if="obj.state == 'look'"></van-button>
<van-button type="danger" v-if="obj.state == 'look'" @click="del"></van-button>
<van-button type="info" v-if="obj.state == 'add' || obj.state == 'edit'" @click="save"></van-button>
<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')"></van-button>
</view>
@ -70,63 +66,115 @@
export default {
data() {
return {
shipInfo: {
voyageScheduleDataList: [{
spmName: "",
importExportFlagName: "",
tradeTypeName: ""
}]
},
obj: {},
untieRow: {},
untieRowIndex: 0,
//
hcValue: "",
hcList: [{
value: 0,
text: "航次0"
},
{
value: 1,
text: "航次1"
},
{
value: 2,
text: "航次2"
},
],
hcTextValue: "",
hcList: [],
//
zlShip: 100,
zlShip: 0,
//
bwValue: "",
bwList: [{
value: 0,
text: "泊位0"
},
{
value: 1,
text: "泊位1"
},
{
value: 2,
text: "泊位2"
},
],
bwTextValue: "",
bwList: [],
//
xlTime: "",
xlTime: [''],
//
jlTime: "",
jlTime: [''],
//
ybTime: "",
ybTime: [''],
//
tbTime: "",
tbTime: [''],
}
},
onLoad(options) {
if ('params' in options) {
// 使decodeURIComponent
this.obj = JSON.parse(decodeURIComponent(options.params))
console.log(this.obj)
}
},
mounted() {
if (this.obj.state == "edit" || this.obj.state == "look") {
this.getRow()
}
this.getShip()
},
methods: {
//
getShip() {
this.shipInfo = uni.getStorageSync('shipInfo')
this.shipInfo.pubBerthesManageRespList.forEach((v, index) => {
this.bwList.push({
text: v.bthBthnm,
value: v.bthId
})
})
this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
this.hcList.push({
text: v.vvyName,
value: v.vvyId
})
})
},
//
getRow() {
this.untieRow = uni.getStorageSync('untieRow');
this.untieRowIndex = uni.getStorageSync('untieRowIndex');
console.log(this.untieRow)
console.log(this.untieRowIndex)
this.hcValue = this.untieRow.vvyId
this.hcTextValue = this.untieRow.vvyName
this.zlShip = this.untieRow.zlShip
this.bwValue = this.untieRow.bthId
this.bwTextValue = this.untieRow.bthIdName
this.xlTime = this.untieRow.xlTime
this.jlTime = this.untieRow.jlTime
this.ybTime = this.untieRow.ybTime
this.tbTime = this.untieRow.tbTime
},
//
hcChange(e) {
this.hcValue = e;
this.hcList.forEach(v => {
if (v.value == e) {
this.hcTextValue = v.text
}
})
},
//
bwChange(e) {
this.bwValue = e;
this.bwList.forEach(v => {
if (v.value == e) {
this.bwTextValue = v.text
}
})
},
//
changeLog1(e) {
this.xlTime = e.slice(0, e.length - 3)
},
//
changeLog2(e) {
this.jlTime = e.slice(0, e.length - 3)
},
//
changeLog3(e) {
this.ybTime = e.slice(0, e.length - 3)
},
//
changeLog4(e) {
this.tbTime = e.slice(0, e.length - 3)
},
//
cancel() {
@ -134,8 +182,46 @@
url: '/pages/shipWork/untieCord'
})
},
//
del() {
let addUntieArr = uni.getStorageSync('addUntieArr')
addUntieArr.splice(this.untieRowIndex, 1)
uni.setStorageSync('addUntieArr', addUntieArr);
uni.navigateTo({
url: '/pages/shipWork/untieCord'
})
},
//
save() {
let addUntieArr = uni.getStorageSync('addUntieArr')
let addUntieObj = {
zlShip: this.zlShip,
vvyId: this.hcValue,
vvyName: this.hcTextValue,
bthId: this.bwValue,
bthIdName: this.bwTextValue,
tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
xlTime: this.xlTime,
jlTime: this.jlTime,
ybTime: this.ybTime,
tbTime: this.tbTime
}
if (this.obj.state == "edit") {
addUntieArr[this.untieRowIndex] = addUntieObj;
uni.setStorageSync('addUntieArr', addUntieArr);
} else if (this.obj.state == "add") {
if (addUntieArr != "") {
addUntieArr.push(addUntieObj)
uni.setStorageSync('addUntieArr', addUntieArr);
} else {
addUntieArr = []
addUntieArr.push(addUntieObj)
uni.setStorageSync('addUntieArr', addUntieArr);
}
}
uni.navigateTo({
url: '/pages/shipWork/untieCord'
})
@ -157,12 +243,12 @@
.container {
padding: 30px 20px;
ul {
.ul {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
li {
.li {
width: 44%;
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;

View File

@ -1,16 +1,16 @@
<template>
<view class="untieCord">
<view class="container">
<ul>
<li v-for="(item,index) in infoList" :key="index" @click="add('look')">
<view class="title">航次{{item.val1}}</view>
<p>状态{{item.val2}}</p>
<p>进出口{{item.val3}}</p>
<p>贸易类型{{item.val4}}</p>
<p>泊位{{item.val5}}</p>
<p>系缆时间{{item.val6}}</p>
</li>
</ul>
<view class="ul">
<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
<view class="title">航次{{item.spmName}}</view>
<p>状态未上传</p>
<p>进出口{{item.importExportFlagName}}</p>
<p>贸易类型{{item.tradeTypeName}}</p>
<p>泊位{{item.bthIdName}}</p>
<p>系缆时间{{item.xlTime}}</p>
</view>
</view>
<view class="addBtn" @click="add('add')">+ </view>
</view>
</view>
@ -20,32 +20,20 @@
export default {
data() {
return {
infoList: [{
val1: "JK9795799",
val2: "待上传",
val3: "进口",
val4: "外贸",
val5: "一泊位",
val6: "05/30 8:00",
}, {
val1: "JK9795799",
val2: "待上传",
val3: "进口",
val4: "外贸",
val5: "一泊位",
val6: "05/30 8:00",
}, {
val1: "JK9795799",
val2: "待上传",
val3: "进口",
val4: "外贸",
val5: "一泊位",
val6: "05/30 8:00",
}]
shipInfo: {},
infoList: []
}
},
mounted() {
this.shipInfo = uni.getStorageSync('shipInfo')
this.infoList = uni.getStorageSync('addUntieArr')
console.log(this.shipInfo)
console.log(this.infoList)
},
methods: {
add(state) {
add(state, item, index) {
uni.setStorageSync('untieRow', item);
uni.setStorageSync('untieRowIndex', index);
const obj = {
state: state,
}
@ -63,10 +51,10 @@
.container {
padding: 30px 20px;
ul {
.ul {
padding: 20px 0;
li {
.li {
display: flex;
justify-content: space-between;
border-bottom: 1px solid #ccc;