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

pad单证页面7.20

dev2
Panzihang 2023-07-20 17:16:08 +08:00
parent 57741a7cdd
commit b67436cb0b
19 changed files with 1271 additions and 831 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pages/shipWork/abnormal.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<view class="abnormal"> <view class="abnormal">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li v-for="(item,index) in infoList" :key="index" @click="add('look')"> <view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
<view class="title">类型：{{item.val1}}</view> <view class="title">类型：{{item.type}}</view>
<p>上传状态：{{item.val2}}</p> <p>上传状态：未上传</p>
<p>航次：{{item.val3}}</p> <p>航次：{{item.vvyName}}</p>
<p>贸易类型：{{item.val4}}</p> <p>贸易类型：{{item.importExportFlagName}}</p>
<p>进出口：{{item.val5}}</p> <p>进出口：{{item.tradeTypeName}}</p>
</li> </view>
</ul> </view>
<view class="addBtn" @click="add('add')">+ 新增</view> <view class="addBtn" @click="add('add')">+ 新增</view>
</view> </view>
</view> </view>
@ -19,29 +19,20 @@
export default { export default {
data() { data() {
return { return {
infoList: [{ shipInfo: {},
val1: "大风预警", infoList: []
val2: "待上传",
val3: "JK097085964",
val4: "内贸",
val5: "进口",
}, {
val1: "大风预警",
val2: "待上传",
val3: "JK097085964",
val4: "内贸",
val5: "进口",
}, {
val1: "大风预警",
val2: "待上传",
val3: "JK097085964",
val4: "内贸",
val5: "进口",
}, ]
} }
}, },
mounted() {
this.shipInfo = uni.getStorageSync('shipInfo')
this.infoList = uni.getStorageSync('addAbnormalArr')
},
methods: { methods: {
add(state) { add(state, item, index) {
if (state != 'add') {
uni.setStorageSync('abnormalRow', item);
uni.setStorageSync('abnormalRowIndex', index);
}
const obj = { const obj = {
state: state, state: state,
} }
@ -59,10 +50,10 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
padding: 20px 0; padding: 20px 0;
li { .li {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

173
pages/shipWork/abnormalAdd.vue
View File

@ -1,46 +1,46 @@
<template> <template>
<view class="abnormalAdd"> <view class="abnormalAdd">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li> <view class="li">
<p>船名：</p> <p>船名：</p>
<span>快乐号</span> <text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange" <uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>CK98796</span> <text v-else>{{vvyName}}</text>
</li> </view>
<li> <view class="li">
<p>进出口：</p> <p>进出口：</p>
<span>进口</span> <text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
</li> </view>
<li> <view class="li">
<p>贸易类型：</p> <p>贸易类型：</p>
<span>内贸</span> <text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>作业日期：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>作业日期：</p>
<uni-datetime-picker v-model="dateTime" type="date" :clear-icon="false" <uni-datetime-picker v-model="workTime" type="date" :clear-icon="false" @change="changeLog"
v-if="obj.state != 'look'" /> v-if="obj.state != 'look'" />
<span v-else>2020-04-21</span> <text v-else>{{workTime}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>类型：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>类型：</p>
<uni-easyinput v-if="obj.state != 'look'" v-model="typeValue" placeholder="请输入"></uni-easyinput> <uni-easyinput v-if="obj.state != 'look'" v-model="type" placeholder="请输入"></uni-easyinput>
<span v-else>类型类型</span> <text v-else>{{type}}</text>
</li> </view>
<li class="wLi"> <view class="li wLi">
<p><span class="required" v-if="obj.state != 'look'">*</span>描述：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>描述：</p>
<uni-easyinput type="textarea" autoHeight v-model="describe" placeholder="请输入任务描述(200字以内)" <uni-easyinput type="textarea" autoHeight v-model="remark" placeholder="请输入任务描述(200字以内)"
maxlength="200" v-if="obj.state != 'look'"></uni-easyinput> maxlength="200" v-if="obj.state != 'look'"></uni-easyinput>
<span v-else>描述描述描述</span> <text v-else>{{remark}}</text>
</li> </view>
</ul> </view>
<view class="btnList"> <view class="btnList">
<van-button type="default" @click="cancel">取消</van-button> <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 == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button> <van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
</view> </view>
@ -52,28 +52,26 @@
export default { export default {
data() { data() {
return { return {
shipInfo: {
voyageScheduleDataList: [{
spmName: "",
importExportFlagName: "",
tradeTypeName: ""
}]
},
obj: {}, obj: {},
abnormalRow: {},
abnormalRowIndex: 0,
// 航次下拉框 // 航次下拉框
hcValue: "", vvyId: "",
hcList: [{ vvyName: "",
value: 0, hcList: [],
text: "航次0"
},
{
value: 1,
text: "航次1"
},
{
value: 2,
text: "航次2"
},
],
// 日期 // 日期
dateTime: "", workTime: [''],
// 类型 // 类型
typeValue: "", type: "",
// 描述 // 描述
describe: "", remark: "",
} }
}, },
onLoad(options) { onLoad(options) {
@ -82,10 +80,46 @@
this.obj = JSON.parse(decodeURIComponent(options.params)) this.obj = JSON.parse(decodeURIComponent(options.params))
} }
}, },
mounted() {
if (this.obj.state == 'edit' || this.obj.state == 'look') {
this.getRow();
}
this.getShip()
},
methods: { methods: {
// 获取船只信息
getShip() {
this.shipInfo = uni.getStorageSync('shipInfo')
// 航次数据
this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
this.hcList.push({
text: v.vvyName,
value: v.vvyId
})
})
},
// 获取当前行信息
getRow() {
this.abnormalRow = uni.getStorageSync('abnormalRow');
this.abnormalRowIndex = uni.getStorageSync('abnormalRowIndex');
this.vvyId = this.abnormalRow.vvyId
this.vvyName = this.abnormalRow.vvyName
this.workTime = this.abnormalRow.workTime
this.type = this.abnormalRow.type
this.remark = this.abnormalRow.remark
},
// 航次下拉 // 航次下拉
hcChange(e) { hcChange(e) {
this.hcValue = e; this.vvyId = e;
this.hcList.forEach(v => {
if (v.value == e) {
this.vvyName = v.text
}
})
},
// 作业时间
changeLog(e) {
this.workTime = e
}, },
// 取消 // 取消
cancel() { cancel() {
@ -93,8 +127,41 @@
url: '/pages/shipWork/abnormal' url: '/pages/shipWork/abnormal'
}) })
}, },
// 删除
del() {
let addAbnormalArr = uni.getStorageSync('addAbnormalArr')
addAbnormalArr.splice(this.abnormalRowIndex, 1)
uni.setStorageSync('addAbnormalArr', addAbnormalArr);
uni.navigateTo({
url: '/pages/shipWork/abnormal'
})
},
// 保存 // 保存
save() { save() {
let addAbnormalArr = uni.getStorageSync('addAbnormalArr')
let addAbnormalObj = {
vvyId: this.vvyId,
vvyName: this.vvyName,
type: this.type,
remark: this.remark,
workTime: this.workTime,
tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
}
if (this.obj.state == "edit") {
addAbnormalArr[this.abnormalRowIndex] = addAbnormalObj;
uni.setStorageSync('addAbnormalArr', addAbnormalArr);
} else if (this.obj.state == "add") {
if (addAbnormalArr != "") {
addAbnormalArr.push(addAbnormalObj)
uni.setStorageSync('addAbnormalArr', addAbnormalArr);
} else {
addAbnormalArr = []
addAbnormalArr.push(addAbnormalObj)
uni.setStorageSync('addAbnormalArr', addAbnormalArr);
}
}
uni.navigateTo({ uni.navigateTo({
url: '/pages/shipWork/abnormal' url: '/pages/shipWork/abnormal'
}) })
@ -116,16 +183,16 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
.wLi { .wLi {
width: 100%; width: 100% !important;
} }
li { .li {
width: 44%; width: 44%;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

58
pages/shipWork/mafi.vue
View File

@ -1,16 +1,16 @@
<template> <template>
<view class="mafi"> <view class="mafi">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li v-for="(item,index) in infoList" :key="index" @click="add('look')"> <view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
<view class="title">{{item.val1}}</view> <view class="title">马菲板号：{{item.mafiBarcode}}</view>
<p>上传状态：{{item.val2}}</p> <p>上传状态：未上传</p>
<p>尺码：{{item.val3}}</p> <p>尺码：{{item.size}}</p>
<p>类型：{{item.val4}}</p> <p>类型：{{item.lxTextValue}}</p>
<p>装卸方式：{{item.val5}}</p> <p>装卸方式：{{item.loaderType}}</p>
<p>航次：{{item.val6}}</p> <p>航次：{{item.vvyName}}</p>
</li> </view>
</ul> </view>
<view class="addBtn" @click="add('add')">+ 新增</view> <view class="addBtn" @click="add('add')">+ 新增</view>
</view> </view>
</view> </view>
@ -20,32 +20,20 @@
export default { export default {
data() { data() {
return { return {
infoList: [{ shipInfo: {},
val1: "马菲板号", infoList: []
val2: "待上传",
val3: "尺码",
val4: "类型",
val5: "装卸方式",
val6: "JK9796966",
}, {
val1: "马菲板号",
val2: "待上传",
val3: "尺码",
val4: "类型",
val5: "装卸方式",
val6: "JK9796966",
}, {
val1: "马菲板号",
val2: "待上传",
val3: "尺码",
val4: "类型",
val5: "装卸方式",
val6: "JK9796966",
}]
} }
}, },
mounted() {
this.shipInfo = uni.getStorageSync('shipInfo')
this.infoList = uni.getStorageSync('addMafiArr')
},
methods: { methods: {
add(state) { add(state, item, index) {
if (state != 'add') {
uni.setStorageSync('mafiRow', item);
uni.setStorageSync('mafiRowIndex', index);
}
const obj = { const obj = {
state: state, state: state,
} }
@ -63,10 +51,10 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
padding: 20px 0; padding: 20px 0;
li { .li {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

242
pages/shipWork/mafiAdd.vue
View File

@ -1,57 +1,57 @@
<template> <template>
<view class="mafiAdd"> <view class="mafiAdd">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li> <view class="li">
<p>船名：</p> <p>船名：</p>
<span>快乐号</span> <text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange" <uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>CK98796</span> <text v-else>{{vvyName}}</text>
</li> </view>
<li> <view class="li">
<p>进出口：</p> <p>进出口：</p>
<span>进口</span> <text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
</li> </view>
<li> <view class="li">
<p>贸易类型：</p> <p>贸易类型：</p>
<span>内贸</span> <text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>作业日期：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>作业日期：</p>
<uni-datetime-picker v-model="workTime" type="date" :clear-icon="false" <uni-datetime-picker v-model="workTime" type="date" :clear-icon="false" @change="changeLog"
v-if="obj.state != 'look'" /> v-if="obj.state != 'look'" />
<span v-else>2020-04-21</span> <text v-else>{{workTime}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>马菲板号：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>马菲板号：</p>
<uni-easyinput v-if="obj.state != 'look'" v-model="vinCode" placeholder="请输入"></uni-easyinput> <uni-easyinput v-if="obj.state != 'look'" v-model="mafiBarcode" placeholder="请输入"></uni-easyinput>
<span v-else>马菲板号123123</span> <text v-else>{{mafiBarcode}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>尺码：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>尺码：</p>
<uni-number-box v-model="sizeNum" v-if="obj.state != 'look'" /> <uni-number-box v-model="size" v-if="obj.state != 'look'" />
<span v-else>10</span> <text v-else>{{size}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>类型：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>类型：</p>
<uni-data-select v-model="lxValue" :localdata="lxList" @change="lxChange" <uni-data-select v-model="lxValue" :localdata="lxList" @change="lxChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>类型1</span> <text v-else>{{lxTextValue}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>装卸类型：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>装卸类型：</p>
<uni-data-select v-model="zxValue" :localdata="zxList" @change="zxChange" <uni-data-select v-model="loaderTypeId" :localdata="zxList" @change="zxChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>装卸类型1</span> <text v-else>{{loaderType}}</text>
</li> </view>
</ul> </view>
<view class="btnList"> <view class="btnList">
<van-button type="default" @click="cancel">取消</van-button> <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 == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button> <van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
</view> </view>
@ -63,58 +63,42 @@
export default { export default {
data() { data() {
return { return {
shipInfo: {
voyageScheduleDataList: [{
spmName: "",
importExportFlagName: "",
tradeTypeName: ""
}]
},
obj: {}, obj: {},
mafiRow: {},
mafiRowIndex: 0,
// 航次下拉框 // 航次下拉框
hcValue: "", vvyId: "",
hcList: [{ vvyName: "",
value: 0, hcList: [],
text: "航次0"
},
{
value: 1,
text: "航次1"
},
{
value: 2,
text: "航次2"
},
],
// 作业时间 // 作业时间
workTime: "", workTime: [""],
// 马菲板号 // 马菲板号
vinCode: "", mafiBarcode: "",
// 尺码 // 尺码
sizeNum: 0, size: 0,
// 类型下拉框 // 类型下拉框
lxValue: "", lxValue: "",
lxTextValue: "",
lxList: [{ lxList: [{
value: 0, value: 0,
text: "类型0" text: "空板"
}, },
{ {
value: 1, value: 1,
text: "类型1" text: "重板"
},
{
value: 2,
text: "类型2"
}, },
], ],
// 装卸类型下拉框 // 装卸类型下拉框
zxValue: "", loaderTypeId: "",
zxList: [{ loaderType: "",
value: 0, zxList: [],
text: "装卸类型0"
},
{
value: 1,
text: "装卸类型1"
},
{
value: 2,
text: "装卸类型2"
},
],
} }
}, },
onLoad(options) { onLoad(options) {
@ -123,18 +107,75 @@
this.obj = JSON.parse(decodeURIComponent(options.params)) this.obj = JSON.parse(decodeURIComponent(options.params))
} }
}, },
mounted() {
if (this.obj.state == 'edit' || this.obj.state == 'look') {
this.getRow();
}
this.getShip()
},
methods: { 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
})
})
},
// 获取当前行信息
getRow() {
this.mafiRow = uni.getStorageSync('mafiRow');
this.mafiRowIndex = uni.getStorageSync('mafiRowIndex');
this.vvyId = this.mafiRow.vvyId
this.vvyName = this.mafiRow.vvyName
this.loaderTypeId = this.mafiRow.loaderTypeId
this.loaderType = this.mafiRow.loaderType
this.workTime = this.mafiRow.workTime
this.lxValue = this.mafiRow.lxValue
this.lxTextValue = this.mafiRow.lxTextValue
this.size = this.mafiRow.size
this.mafiBarcode = this.mafiRow.mafiBarcode
},
// 航次下拉 // 航次下拉
hcChange(e) { hcChange(e) {
this.hcValue = e; this.vvyId = e;
this.hcList.forEach(v => {
if (v.value == e) {
this.vvyName = v.text
}
})
}, },
// 类型下拉 // 类型下拉
lxChange(e) { lxChange(e) {
this.lxValue = e; this.lxValue = e;
this.lxList.forEach(v => {
if (v.value == e) {
this.lxTextValue = v.text
}
})
}, },
// 装卸类型下拉 // 装卸类型下拉
zxChange(e) { zxChange(e) {
this.zxValue = e; this.loaderTypeId = e;
this.zxList.forEach(v => {
if (v.value == e) {
this.loaderType = v.text
}
})
},
// 作业时间
changeLog(e) {
this.workTime = e
}, },
// 取消 // 取消
cancel() { cancel() {
@ -142,8 +183,45 @@
url: '/pages/shipWork/mafi' url: '/pages/shipWork/mafi'
}) })
}, },
// 删除
del() {
let addMafiArr = uni.getStorageSync('addMafiArr')
addMafiArr.splice(this.mafiRowIndex, 1)
uni.setStorageSync('addMafiArr', addMafiArr);
uni.navigateTo({
url: '/pages/shipWork/mafi'
})
},
// 保存 // 保存
save() { save() {
let addMafiArr = uni.getStorageSync('addMafiArr')
let addMafiObj = {
vvyId: this.vvyId,
vvyName: this.vvyName,
loaderTypeId: this.loaderTypeId,
loaderType: this.loaderType,
lxValue: this.lxValue,
lxTextValue: this.lxTextValue,
size: this.size,
mafiBarcode: this.mafiBarcode,
workTime: this.workTime,
tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
}
if (this.obj.state == "edit") {
addMafiArr[this.mafiRowIndex] = addMafiObj;
uni.setStorageSync('addMafiArr', addMafiArr);
} else if (this.obj.state == "add") {
if (addMafiArr != "") {
addMafiArr.push(addMafiObj)
uni.setStorageSync('addMafiArr', addMafiArr);
} else {
addMafiArr = []
addMafiArr.push(addMafiObj)
uni.setStorageSync('addMafiArr', addMafiArr);
}
}
uni.navigateTo({ uni.navigateTo({
url: '/pages/shipWork/mafi' url: '/pages/shipWork/mafi'
}) })
@ -165,12 +243,12 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
li { .li {
width: 44%; width: 44%;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

9
pages/shipWork/mixWork.vue
View File

@ -50,7 +50,8 @@
}, },
mounted() { mounted() {
this.tabsType = this.$route.query.infoType this.tabsType = this.$route.query.infoType
if (this.tabsType != 0 || this.tabsType != 1) { console.log(this.tabsType)
if (this.tabsType != 0 && this.tabsType != 1) {
this.tabsType = 0 this.tabsType = 0
this.tabsIndex = 0 this.tabsIndex = 0
} else { } else {
@ -71,8 +72,10 @@
} }
}, },
add(state, item, index) { add(state, item, index) {
uni.setStorageSync('peopleRow', item); if (state != 'add') {
uni.setStorageSync('peopleRowIndex', index); uni.setStorageSync('peopleRow', item);
uni.setStorageSync('peopleRowIndex', index);
}
let obj = { let obj = {
state: state state: state
} }

53
pages/shipWork/notice.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<view class="notice"> <view class="notice">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li v-for="(item,index) in infoList" :key="index" @click="add('look')"> <view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
<view class="title">航次：{{item.val1}}</view> <view class="title">航次：{{item.vvyName}}</view>
<p>状态：{{item.val2}}</p> <p>状态：未上传</p>
<p>进出口：{{item.val3}}</p> <p>进出口：{{item.importExportFlagName}}</p>
<p>贸易类型：{{item.val4}}</p> <p>贸易类型：{{item.tradeTypeName}}</p>
<p>作业日期：{{item.val5}}</p> <p>作业日期：{{item.workDate}}</p>
</li> </view>
</ul> </view>
<view class="addBtn" @click="add('add')">+ 新增</view> <view class="addBtn" @click="add('add')">+ 新增</view>
</view> </view>
</view> </view>
@ -19,29 +19,20 @@
export default { export default {
data() { data() {
return { return {
infoList: [{ shipInfo: {},
val1: "CK124324", infoList: []
val2: "待上传",
val3: "进口",
val4: "内贸",
val5: "05/30",
}, {
val1: "CK124324",
val2: "待上传",
val3: "进口",
val4: "内贸",
val5: "05/30",
}, {
val1: "CK124324",
val2: "待上传",
val3: "进口",
val4: "内贸",
val5: "05/30",
}]
} }
}, },
mounted() {
this.shipInfo = uni.getStorageSync('shipInfo')
this.infoList = uni.getStorageSync('addNoticeArr')
},
methods: { methods: {
add(state) { add(state, item, index) {
if (state != 'add') {
uni.setStorageSync('noticeRow', item);
uni.setStorageSync('noticeRowIndex', index);
}
const obj = { const obj = {
state: state, state: state,
} }
@ -59,10 +50,10 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
padding: 20px 0; padding: 20px 0;
li { .li {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

144
pages/shipWork/noticeAdd.vue
View File

@ -1,36 +1,35 @@
<template> <template>
<view class="noticeAdd"> <view class="noticeAdd">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li> <view class="li">
<p>船名：</p> <p>船名：</p>
<span>快乐号</span> <text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange" <uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>CK98796</span> <text v-else>{{vvyName}}</text>
</li> </view>
<li> <view class="li">
<p>进出口：</p> <p>进出口：</p>
<span>进口</span> <text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
</li> </view>
<li> <view class="li">
<p>贸易类型：</p> <p>贸易类型：</p>
<span>内贸</span> <text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>作业日期：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>作业日期：</p>
<uni-datetime-picker v-model="workTime" type="date" :clear-icon="false" <uni-datetime-picker v-model="workDate" type="date" :clear-icon="false" @change="changeLog"
v-if="obj.state != 'look'" /> v-if="obj.state != 'look'" />
<span v-else>2020-04-21</span> <text v-else>{{workDate}}</text>
</li> </view>
</view>
</ul>
<view class="btnList"> <view class="btnList">
<van-button type="default" @click="cancel">取消</van-button> <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 == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button> <van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
</view> </view>
@ -42,24 +41,22 @@
export default { export default {
data() { data() {
return { return {
shipInfo: {
voyageScheduleDataList: [{
spmName: "",
importExportFlagName: "",
tradeTypeName: ""
}]
},
obj: {}, obj: {},
noticeRow: {},
noticeRowIndex: 0,
// 航次下拉框 // 航次下拉框
hcValue: "", vvyId: "",
hcList: [{ vvyName: "",
value: 0, hcList: [],
text: "航次0"
},
{
value: 1,
text: "航次1"
},
{
value: 2,
text: "航次2"
},
],
// 作业时间 // 作业时间
workTime: "", workDate: [''],
} }
}, },
onLoad(options) { onLoad(options) {
@ -68,10 +65,44 @@
this.obj = JSON.parse(decodeURIComponent(options.params)) this.obj = JSON.parse(decodeURIComponent(options.params))
} }
}, },
mounted() {
if (this.obj.state == 'edit' || this.obj.state == 'look') {
this.getRow();
}
this.getShip()
},
methods: { methods: {
// 获取船只信息
getShip() {
this.shipInfo = uni.getStorageSync('shipInfo')
// 航次数据
this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
this.hcList.push({
text: v.vvyName,
value: v.vvyId
})
})
},
// 获取当前行信息
getRow() {
this.noticeRow = uni.getStorageSync('noticeRow');
this.noticeRowIndex = uni.getStorageSync('noticeRowIndex');
this.vvyId = this.noticeRow.vvyId
this.vvyName = this.noticeRow.vvyName
this.workDate = (this.noticeRow.workDate[0] ? this.noticeRow.workDate : '')
},
// 航次下拉 // 航次下拉
hcChange(e) { hcChange(e) {
this.hcValue = e; this.vvyId = e;
this.hcList.forEach(v => {
if (v.value == e) {
this.vvyName = v.text
}
})
},
// 作业时间
changeLog(e) {
this.workDate = e
}, },
// 取消 // 取消
cancel() { cancel() {
@ -79,8 +110,39 @@
url: '/pages/shipWork/notice' url: '/pages/shipWork/notice'
}) })
}, },
// 删除
del() {
let addNoticeArr = uni.getStorageSync('addNoticeArr')
addNoticeArr.splice(this.noticeRowIndex, 1)
uni.setStorageSync('addNoticeArr', addNoticeArr);
uni.navigateTo({
url: '/pages/shipWork/notice'
})
},
// 保存 // 保存
save() { save() {
let addNoticeArr = uni.getStorageSync('addNoticeArr')
let addNoticeObj = {
vvyId: this.vvyId,
vvyName: this.vvyName,
workDate: this.workDate,
tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
}
if (this.obj.state == "edit") {
addNoticeArr[this.noticeRowIndex] = addNoticeObj;
uni.setStorageSync('addNoticeArr', addNoticeArr);
} else if (this.obj.state == "add") {
if (addNoticeArr != "") {
addNoticeArr.push(addNoticeObj)
uni.setStorageSync('addNoticeArr', addNoticeArr);
} else {
addNoticeArr = []
addNoticeArr.push(addNoticeObj)
uni.setStorageSync('addNoticeArr', addNoticeArr);
}
}
uni.navigateTo({ uni.navigateTo({
url: '/pages/shipWork/notice' url: '/pages/shipWork/notice'
}) })
@ -102,12 +164,12 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
li { .li {
width: 44%; width: 44%;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

57
pages/shipWork/opinion.vue
View File

@ -1,16 +1,18 @@
<template> <template>
<view class="opinion"> <view class="opinion">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li v-for="(item,index) in infoList" :key="index" @click="add('look')"> <view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
<view class="title">航次：{{item.val1}}</view> <view class="title">航次：{{item.vvyName}}</view>
<p>状态：{{item.val2}}</p> <p>状态：未上传</p>
<p>进出口：{{item.val3}}</p> <p>进出口：{{item.importExportFlagName}}</p>
<p>贸易类型：{{item.val4}}</p> <p>贸易类型：{{item.tradeTypeName}}</p>
<p>作业日期：{{item.val5}}</p> <p>作业日期：{{item.workTime}}</p>
</li> </view>
</ul> </view>
<view class="addBtn" @click="add('add')">+ 新增</view> <view>
<view class="addBtn" @click="add('add')">+ 新增</view>
</view>
</view> </view>
</view> </view>
</template> </template>
@ -19,29 +21,20 @@
export default { export default {
data() { data() {
return { return {
infoList: [{ shipInfo: {},
val1: "CK124324", infoList: []
val2: "待上传",
val3: "进口",
val4: "内贸",
val5: "05/30",
}, {
val1: "CK124324",
val2: "待上传",
val3: "进口",
val4: "内贸",
val5: "05/30",
}, {
val1: "CK124324",
val2: "待上传",
val3: "进口",
val4: "内贸",
val5: "05/30",
}]
} }
}, },
mounted() {
this.shipInfo = uni.getStorageSync('shipInfo')
this.infoList = uni.getStorageSync('addOpinionArr')
},
methods: { methods: {
add(state) { add(state, item, index) {
if (state != 'add') {
uni.setStorageSync('opinionRow', item);
uni.setStorageSync('opinionRowIndex', index);
}
const obj = { const obj = {
state: state, state: state,
} }
@ -59,10 +52,10 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
padding: 20px 0; padding: 20px 0;
li { .li {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

262
pages/shipWork/opinionAdd.vue
View File

@ -1,58 +1,57 @@
<template> <template>
<view class="opinionAdd"> <view class="opinionAdd">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li> <view class="li">
<p>船名：</p> <p>船名：</p>
<span>快乐号</span> <text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange" <uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>CK98796</span> <text v-else>{{vvyName}}</text>
</li> </view>
<li> <view class="li">
<p>进出口：</p> <p>进出口：</p>
<span>进口</span> <text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
</li> </view>
<li> <view class="li">
<p>贸易类型：</p> <p>贸易类型：</p>
<span>内贸</span> <text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>泊位：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>泊位：</p>
<uni-data-select v-model="bwValue" :localdata="bwList" @change="bwChange" <uni-data-select v-model="bthId" :localdata="bwList" @change="bwChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>1泊位</span> <text v-else>{{bthIdName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>装卸类型：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>装卸类型：</p>
<uni-data-select v-model="zxValue" :localdata="zxList" @change="zxChange" <uni-data-select v-model="loaderTypeId" :localdata="zxList" @change="zxChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>装卸类型1</span> <text v-else>{{loaderType}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>车辆数量：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>车辆数量：</p>
<uni-number-box v-model="carNum" v-if="obj.state != 'look'" /> <uni-number-box v-model="vehicleSize" v-if="obj.state != 'look'" />
<span v-else>100</span> <text v-else>{{vehicleSize}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>备件数量：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>备件数量：</p>
<uni-number-box v-model="partsNum" v-if="obj.state != 'look'" /> <uni-number-box v-model="sparePart" v-if="obj.state != 'look'" />
<span v-else>100</span> <text v-else>{{sparePart}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>作业日期：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>作业日期：</p>
<uni-datetime-picker v-model="workTime" type="date" :clear-icon="false" <uni-datetime-picker v-model="workTime" type="date" :clear-icon="false" @change="changeLog"
v-if="obj.state != 'look'" /> v-if="obj.state != 'look'" />
<span v-else>2020-04-21</span> <text v-else>{{workTime}}</text>
</li> </view>
</view>
</ul>
<view class="btnList"> <view class="btnList">
<van-button type="default" @click="cancel">取消</van-button> <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 == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button> <van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
</view> </view>
@ -64,58 +63,34 @@
export default { export default {
data() { data() {
return { return {
shipInfo: {
voyageScheduleDataList: [{
spmName: "",
importExportFlagName: "",
tradeTypeName: ""
}]
},
obj: {}, obj: {},
opinionRow: {},
opinionRowIndex: 0,
// 航次下拉框 // 航次下拉框
hcValue: "", vvyId: "",
hcList: [{ vvyName: "",
value: 0, hcList: [],
text: "航次0"
},
{
value: 1,
text: "航次1"
},
{
value: 2,
text: "航次2"
},
],
// 泊位下拉框 // 泊位下拉框
bwValue: "", bthId: "",
bwList: [{ bthIdName: "",
value: 0, bwList: [],
text: "泊位0"
},
{
value: 1,
text: "泊位1"
},
{
value: 2,
text: "泊位2"
},
],
// 装卸类型下拉框 // 装卸类型下拉框
zxValue: "", loaderTypeId: "",
zxList: [{ loaderType: "",
value: 0, zxList: [],
text: "装卸类型0"
},
{
value: 1,
text: "装卸类型1"
},
{
value: 2,
text: "装卸类型2"
},
],
// 车辆数量 // 车辆数量
carNum: 0, vehicleSize: 0,
// 备件数量 // 备件数量
partsNum: 0, sparePart: 0,
// 作业时间 // 作业时间
workTime: "", workTime: [''],
} }
}, },
onLoad(options) { onLoad(options) {
@ -124,18 +99,82 @@
this.obj = JSON.parse(decodeURIComponent(options.params)) this.obj = JSON.parse(decodeURIComponent(options.params))
} }
}, },
mounted() {
if (this.obj.state == 'edit' || this.obj.state == 'look') {
this.getRow();
}
this.getShip()
},
methods: { 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.pubBerthesManageRespList.forEach((v, index) => {
this.bwList.push({
text: v.bthBthnm,
value: v.bthId
})
})
},
// 获取当前行信息
getRow() {
this.opinionRow = uni.getStorageSync('opinionRow');
this.opinionRowIndex = uni.getStorageSync('opinionRowIndex');
this.vvyId = this.opinionRow.vvyId
this.vvyName = this.opinionRow.vvyName
this.bthId = this.opinionRow.bthId
this.bthIdName = this.opinionRow.bthIdName
this.loaderTypeId = this.opinionRow.loaderTypeId
this.loaderType = this.opinionRow.loaderType
this.vehicleSize = this.opinionRow.vehicleSize
this.sparePart = this.opinionRow.sparePart
this.workTime = this.opinionRow.workTime
},
// 航次下拉 // 航次下拉
hcChange(e) { hcChange(e) {
this.hcValue = e; this.vvyId = e;
this.hcList.forEach(v => {
if (v.value == e) {
this.vvyName = v.text
}
})
}, },
// 泊位下拉 // 泊位下拉
bwChange(e) { bwChange(e) {
this.bwValue = e; this.bthId = e;
this.bwList.forEach(v => {
if (v.value == e) {
this.bthIdName = v.text
}
})
}, },
// 装卸类型下拉 // 装卸类型下拉
zxChange(e) { zxChange(e) {
this.zxValue = e; this.loaderTypeId = e;
this.zxList.forEach(v => {
if (v.value == e) {
this.loaderType = v.text
}
})
},
// 作业时间
changeLog(e) {
this.workTime = e
}, },
// 取消 // 取消
cancel() { cancel() {
@ -143,8 +182,45 @@
url: '/pages/shipWork/opinion' url: '/pages/shipWork/opinion'
}) })
}, },
// 删除
del() {
let addOpinionArr = uni.getStorageSync('addOpinionArr')
addOpinionArr.splice(this.opinionRowIndex, 1)
uni.setStorageSync('addOpinionArr', addOpinionArr);
uni.navigateTo({
url: '/pages/shipWork/opinion'
})
},
// 保存 // 保存
save() { save() {
let addOpinionArr = uni.getStorageSync('addOpinionArr')
let addOpinionObj = {
vvyId: this.vvyId,
vvyName: this.vvyName,
bthId: this.bthId,
bthIdName: this.bthIdName,
loaderTypeId: this.loaderTypeId,
loaderType: this.loaderType,
vehicleSize: this.vehicleSize,
sparePart: this.sparePart,
workTime: this.workTime,
tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
}
if (this.obj.state == "edit") {
addOpinionArr[this.opinionRowIndex] = addOpinionObj;
uni.setStorageSync('addOpinionArr', addOpinionArr);
} else if (this.obj.state == "add") {
if (addOpinionArr != "") {
addOpinionArr.push(addOpinionObj)
uni.setStorageSync('addOpinionArr', addOpinionArr);
} else {
addOpinionArr = []
addOpinionArr.push(addOpinionObj)
uni.setStorageSync('addOpinionArr', addOpinionArr);
}
}
uni.navigateTo({ uni.navigateTo({
url: '/pages/shipWork/opinion' url: '/pages/shipWork/opinion'
}) })
@ -166,12 +242,12 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
li { .li {
width: 44%; width: 44%;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

53
pages/shipWork/patrol.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<view class="patrol"> <view class="patrol">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li v-for="(item,index) in infoList" :key="index" @click="add('look')"> <view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
<view class="title">类型：{{item.val1}}</view> <view class="title">类型：{{item.type}}</view>
<p>上传状态：{{item.val2}}</p> <p>上传状态：未上传</p>
<p>航次：{{item.val3}}</p> <p>航次：{{item.vvyName}}</p>
<p>贸易类型：{{item.val4}}</p> <p>贸易类型：{{item.tradeTypeName}}</p>
<p>进出口：{{item.val5}}</p> <p>进出口：{{item.importExportFlagName}}</p>
</li> </view>
</ul> </view>
<view class="addBtn" @click="add('add')">+ 新增</view> <view class="addBtn" @click="add('add')">+ 新增</view>
</view> </view>
</view> </view>
@ -19,29 +19,20 @@
export default { export default {
data() { data() {
return { return {
infoList: [{ shipInfo: {},
val1: "大风预警", infoList: []
val2: "上传成功",
val3: "JK097085964",
val4: "内贸",
val5: "进口",
}, {
val1: "大风预警",
val2: "待上传",
val3: "JK097085964",
val4: "内贸",
val5: "进口",
}, {
val1: "大风预警",
val2: "待上传",
val3: "JK097085964",
val4: "内贸",
val5: "进口",
}, ]
} }
}, },
mounted() {
this.shipInfo = uni.getStorageSync('shipInfo')
this.infoList = uni.getStorageSync('addPatrolArr')
},
methods: { methods: {
add(state) { add(state, item, index) {
if (state != 'add') {
uni.setStorageSync('patrolRow', item);
uni.setStorageSync('patrolRowIndex', index);
}
const obj = { const obj = {
state: state, state: state,
} }
@ -59,10 +50,10 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
padding: 20px 0; padding: 20px 0;
li { .li {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

185
pages/shipWork/patrolAdd.vue
View File

@ -1,51 +1,54 @@
<template> <template>
<view class="patrolAdd"> <view class="patrolAdd">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li> <view class="li">
<p>船名：</p> <p>船名：</p>
<span>快乐号</span> <text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange" <uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>CK98796</span> <text v-else>{{vvyName}}</text>
</li> </view>
<li> <view class="li">
<p>进出口：</p> <p>进出口：</p>
<span>进口</span> <text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
</li> </view>
<li> <view class="li">
<p>贸易类型：</p> <p>贸易类型：</p>
<span>内贸</span> <text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>类型：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>类型：</p>
<uni-easyinput v-if="obj.state != 'look'" v-model="typeValue" placeholder="请输入"></uni-easyinput> <uni-easyinput v-if="obj.state != 'look'" v-model="type" placeholder="请输入"></uni-easyinput>
<span v-else>类型类型</span> <text v-else>{{type}}</text>
</li> </view>
<li class="tpLi"> <view class="li tpLi">
<p><span class="required" v-if="obj.state != 'look'">*</span>图片上传：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>图片上传：</p>
<template v-if="obj.state != 'look'"> <template v-if="obj.state != 'look'">
<view class="picture"> <view class="picture">
<uni-file-picker limit="9" title="最多选择9张图片"></uni-file-picker> <uni-file-picker limit="9" v-model="imageValue" fileMediatype="image" @select="select"
title="最多选择9张图片"></uni-file-picker>
</view> </view>
</template> </template>
<view class="pictureLook" v-else> <view class="pictureLook" v-else>
<img src="../../static/images/testImg.jpg"> <view v-for="(item,index) in imageValue" :key="index">
<image :src="item">
</view>
</view> </view>
</li> </view>
<li class="wLi"> <view class="li wLi">
<p><span class="required" v-if="obj.state != 'look'">*</span>描述：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>描述：</p>
<uni-easyinput type="textarea" autoHeight v-model="describe" placeholder="请输入任务描述(200字以内)" <uni-easyinput type="textarea" autoHeight v-model="remark" placeholder="请输入任务描述(200字以内)"
maxlength="200" v-if="obj.state != 'look'"></uni-easyinput> maxlength="200" v-if="obj.state != 'look'"></uni-easyinput>
<span v-else>描述描述描述</span> <text v-else>{{remark}}</text>
</li> </view>
</ul> </view>
<view class="btnList"> <view class="btnList">
<van-button type="default" @click="cancel">取消</van-button> <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 == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button> <van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
</view> </view>
@ -57,26 +60,26 @@
export default { export default {
data() { data() {
return { return {
shipInfo: {
voyageScheduleDataList: [{
spmName: "",
importExportFlagName: "",
tradeTypeName: ""
}]
},
obj: {}, obj: {},
patrolRow: {},
patrolRowIndex: {},
// 航次下拉框 // 航次下拉框
hcValue: "", vvyId: "",
hcList: [{ vvyName: "",
value: 0, hcList: [],
text: "航次0"
},
{
value: 1,
text: "航次1"
},
{
value: 2,
text: "航次2"
},
],
// 类型 // 类型
typeValue: "", type: "",
// 图片
imageValue: [],
// 描述 // 描述
describe: "", remark: "",
} }
}, },
onLoad(options) { onLoad(options) {
@ -84,12 +87,47 @@
// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象 // 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
this.obj = JSON.parse(decodeURIComponent(options.params)) 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: { methods: {
// 获取船只信息
getShip() {
this.shipInfo = uni.getStorageSync('shipInfo')
// 航次数据
this.shipInfo.voyageScheduleDataList.forEach((v, index) => {
this.hcList.push({
text: v.vvyName,
value: v.vvyId
})
})
},
// 获取当前行信息
getRow() {
this.patrolRow = uni.getStorageSync('patrolRow');
this.patrolRowIndex = uni.getStorageSync('patrolRowIndex');
this.vvyId = this.patrolRow.vvyId
this.vvyName = this.patrolRow.vvyName
this.type = this.patrolRow.type
this.remark = this.patrolRow.remark
this.imageValue = this.patrolRow.imageValue
},
// 航次下拉 // 航次下拉
hcChange(e) { hcChange(e) {
this.hcValue = e; this.vvyId = e;
this.hcList.forEach(v => {
if (v.value == e) {
this.vvyName = v.text
}
})
},
// 图片上传
select(e) {
console.log(e)
}, },
// 取消 // 取消
cancel() { cancel() {
@ -97,8 +135,41 @@
url: '/pages/shipWork/patrol' url: '/pages/shipWork/patrol'
}) })
}, },
// 删除
del() {
let addPatrolArr = uni.getStorageSync('addPatrolArr')
addPatrolArr.splice(this.patrolRowIndex, 1)
uni.setStorageSync('addPatrolArr', addPatrolArr);
uni.navigateTo({
url: '/pages/shipWork/patrol'
})
},
// 保存 // 保存
save() { save() {
let addPatrolArr = uni.getStorageSync('addPatrolArr')
let addPatrolObj = {
vvyId: this.vvyId,
vvyName: this.vvyName,
type: this.type,
remark: this.remark,
imageValue: this.imageValue,
tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
}
if (this.obj.state == "edit") {
addPatrolArr[this.patrolRowIndex] = addPatrolObj;
uni.setStorageSync('addPatrolArr', addPatrolArr);
} else if (this.obj.state == "add") {
if (addPatrolArr != "") {
addPatrolArr.push(addPatrolObj)
uni.setStorageSync('addPatrolArr', addPatrolArr);
} else {
addPatrolArr = []
addPatrolArr.push(addPatrolObj)
uni.setStorageSync('addPatrolArr', addPatrolArr);
}
}
uni.navigateTo({ uni.navigateTo({
url: '/pages/shipWork/patrol' url: '/pages/shipWork/patrol'
}) })
@ -120,25 +191,25 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
.wLi { .wLi {
width: 100%; width: 100% !important;
} }
.tpLi { .tpLi {
width: 100%; width: 100% !important;
display: block; display: block !important;
p { p {
text-align: left; text-align: left !important;
} }
} }
li { .li {
width: 44%; width: 44%;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
@ -188,7 +259,7 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
img { image {
width: 120px; width: 120px;
height: 120px; height: 120px;
margin: 10px; margin: 10px;

23
pages/shipWork/shiftAdd.vue
View File

@ -234,19 +234,7 @@
// 翻仓信息 // 翻仓信息
// 翻仓类型下拉 // 翻仓类型下拉
fcList: [{ fcList: [],
value: "0",
text: "翻仓类型0"
},
{
value: "1",
text: "翻仓类型1"
},
{
value: "2",
text: "翻仓类型2"
},
],
fcUlList: [{ fcUlList: [{
fcValue: "", fcValue: "",
fcTextValue: "", fcTextValue: "",
@ -286,10 +274,10 @@
} }
}, },
mounted() { mounted() {
this.getShip()
if (this.obj.state == 'edit') { if (this.obj.state == 'edit') {
this.editData(); this.editData();
} }
this.getShip()
}, },
methods: { methods: {
// 获取船只信息 // 获取船只信息
@ -331,10 +319,11 @@
}) })
}) })
// 翻仓类型 // 翻仓类型
this.shipInfo.retallyMessageRespList.forEach((v, index) => { this.shipInfo.turnoverTypeList.forEach((v, index) => {
this.fcList.push({ this.fcList.push({
text: v.retallyTypeName, text: v.ptrDesc,
value: v.retallyType value: v.ptrCode
}) })
}) })
}, },

2
pages/shipWork/shiftDetails.vue
View File

@ -137,7 +137,7 @@
</custom-tabs> </custom-tabs>
<view class="btnList"> <view class="btnList">
<van-button type="default" @click="cancel">取消</van-button> <van-button type="default" @click="cancel">取消</van-button>
<van-button type="default" @click="del">删除</van-button> <van-button type="danger" @click="del">删除</van-button>
<van-button type="info" @click="edit('edit')">编辑</van-button> <van-button type="info" @click="edit('edit')">编辑</van-button>
</view> </view>
</view> </view>

54
pages/shipWork/supply.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<view class="supply"> <view class="supply">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li v-for="(item,index) in infoList" :key="index" @click="add('look')"> <view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
<view class="title">类型：{{item.val1}}</view> <view class="title">类型：{{item.supplyType}}</view>
<p>状态：{{item.val2}}</p> <p>状态：未上传</p>
<p>航次：{{item.val3}}</p> <p>航次：{{item.vvyName}}</p>
<p>进出口：{{item.val4}}</p> <p>进出口：{{item.importExportFlagName}}</p>
<p>贸易类型：{{item.val5}}</p> <p>贸易类型：{{item.tradeTypeName}}</p>
</li> </view>
</ul> </view>
<view class="addBtn" @click="add('add')">+ 新增</view> <view class="addBtn" @click="add('add')">+ 新增</view>
</view> </view>
</view> </view>
@ -19,29 +19,21 @@
export default { export default {
data() { data() {
return { return {
infoList: [{ shipInfo: {},
val1: "供水", infoList: []
val2: "待上传",
val3: "JK9868548",
val4: "进口",
val5: "外贸",
}, {
val1: "供水",
val2: "待上传",
val3: "JK9868548",
val4: "进口",
val5: "外贸",
}, {
val1: "供水",
val2: "待上传",
val3: "JK9868548",
val4: "进口",
val5: "外贸",
}, ]
} }
}, },
mounted() {
this.shipInfo = uni.getStorageSync('shipInfo')
this.infoList = uni.getStorageSync('addSupplyArr')
console.log(this.infoList)
},
methods: { methods: {
add(state) { add(state, item, index) {
if (state != 'add') {
uni.setStorageSync('supplyRow', item);
uni.setStorageSync('supplyRowIndex', index);
}
const obj = { const obj = {
state: state, state: state,
} }
@ -59,10 +51,10 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
padding: 20px 0; padding: 20px 0;
li { .li {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

249
pages/shipWork/supplyAdd.vue
View File

@ -1,52 +1,52 @@
<template> <template>
<view class="supplyAdd"> <view class="supplyAdd">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li> <view class="li">
<p>船名：</p> <p>船名：</p>
<span>快乐号</span> <text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange" <uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>CK98796</span> <text v-else>{{vvyName}}</text>
</li> </view>
<li> <view class="li">
<p>进出口：</p> <p>进出口：</p>
<span>进口</span> <text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
</li> </view>
<li> <view class="li">
<p>贸易类型：</p> <p>贸易类型：</p>
<span>内贸</span> <text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>泊位：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>泊位：</p>
<uni-data-select v-model="bwValue" :localdata="bwList" @change="bwChange" <uni-data-select v-model="bthId" :localdata="bwList" @change="bwChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>1泊位</span> <text v-else>{{bthIdName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>供给类型：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>供给类型：</p>
<uni-data-select v-model="gjValue" :localdata="gjList" @change="gjChange" <uni-data-select v-model="supplyTypeId" :localdata="gjList" @change="gjChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>供给类型1</span> <text v-else>{{supplyType}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>供给量：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>供给量：</p>
<uni-number-box v-model="gjNum" v-if="obj.state != 'look'" /> <uni-number-box v-model="supplyAmount" v-if="obj.state != 'look'" />
<span v-else>10</span> <text v-else>{{supplyAmount}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>日期：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>日期：</p>
<uni-datetime-picker v-model="dateTime" type="date" :clear-icon="false" <uni-datetime-picker v-model="supplyDate" type="date" :clear-icon="false" @change="changeLog"
v-if="obj.state != 'look'" /> v-if="obj.state != 'look'" />
<span v-else>2020-04-21</span> <text v-else>{{supplyDate}}</text>
</li> </view>
</ul> </view>
<view class="btnList"> <view class="btnList">
<van-button type="default" @click="cancel">取消</van-button> <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 == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button> <van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
</view> </view>
@ -58,57 +58,31 @@
export default { export default {
data() { data() {
return { return {
shipInfo: {
voyageScheduleDataList: [{
spmName: "",
importExportFlagName: "",
tradeTypeName: ""
}]
},
obj: {}, obj: {},
supplyRow: {},
supplyRowIndex: 0,
// 航次下拉框 // 航次下拉框
hcValue: "", vvyId: "",
hcList: [{ vvyName: "",
value: 0, hcList: [],
text: "航次0"
},
{
value: 1,
text: "航次1"
},
{
value: 2,
text: "航次2"
},
],
// 船舶净吨
zlShip: 100,
// 泊位下拉框 // 泊位下拉框
bwValue: "", bthId: "",
bwList: [{ bthIdName: "",
value: 0, bwList: [],
text: "泊位0"
},
{
value: 1,
text: "泊位1"
},
{
value: 2,
text: "泊位2"
},
],
// 供给类型 // 供给类型
gjValue: "", supplyTypeId: "",
gjList: [{ supplyType: "",
value: 0, gjList: [],
text: "供给类型0" supplyAmount: 0,
},
{
value: 1,
text: "供给类型1"
},
{
value: 2,
text: "供给类型2"
},
],
gjNum: 10,
// 日期 // 日期
dateTime: "", supplyDate: [""],
} }
}, },
onLoad(options) { onLoad(options) {
@ -117,18 +91,78 @@
this.obj = JSON.parse(decodeURIComponent(options.params)) this.obj = JSON.parse(decodeURIComponent(options.params))
} }
}, },
mounted() {
if (this.obj.state == "edit" || this.obj.state == "look") {
this.getRow()
}
this.getShip()
},
methods: { 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
})
})
this.shipInfo.supplyTypeList.forEach((v, index) => {
this.gjList.push({
text: v.ptrDesc,
value: v.ptrCode
})
})
},
// 获取当前行信息
getRow() {
this.supplyRow = uni.getStorageSync('supplyRow');
this.supplyRowIndex = uni.getStorageSync('supplyRowIndex');
this.vvyId = this.supplyRow.vvyId
this.vvyName = this.supplyRow.vvyName
this.bthId = this.supplyRow.bthId
this.bthIdName = this.supplyRow.bthIdName
this.supplyTypeId = this.supplyRow.sssId
this.supplyType = this.supplyRow.supplyType
this.supplyAmount = this.supplyRow.supplyAmount
this.supplyDate = (this.supplyRow.supplyDate[0] ? this.supplyRow.supplyDate : '')
},
// 航次下拉 // 航次下拉
hcChange(e) { hcChange(e) {
this.hcValue = e; this.vvyId = e;
this.hcList.forEach(v => {
if (v.value == e) {
this.vvyName = v.text
}
})
}, },
// 泊位下拉 // 泊位下拉
bwChange(e) { bwChange(e) {
this.bwValue = e; this.bthId = e;
this.bwList.forEach(v => {
if (v.value == e) {
this.bthIdName = v.text
}
})
}, },
// 攻击类型下拉 // 供给类型下拉
gjChange(e) { gjChange(e) {
this.bwValue = e; this.supplyTypeId = e;
this.gjList.forEach(v => {
if (v.value == e) {
this.supplyType = v.text
}
})
},
// 日期选择
changeLog(e) {
this.attachTime = e.slice(0, e.length - 3)
}, },
// 取消 // 取消
cancel() { cancel() {
@ -136,8 +170,45 @@
url: '/pages/shipWork/supply' url: '/pages/shipWork/supply'
}) })
}, },
// 删除
del() {
let addSupplyArr = uni.getStorageSync('addSupplyArr')
addSupplyArr.splice(this.supplyRowIndex, 1)
uni.setStorageSync('addSupplyArr', addSupplyArr);
uni.navigateTo({
url: '/pages/shipWork/supply'
})
},
// 保存 // 保存
save() { save() {
let addSupplyArr = uni.getStorageSync('addSupplyArr')
let addSupplyObj = {
vvyId: this.vvyId,
vvyName: this.vvyName,
bthId: this.bthId,
bthIdName: this.bthIdName,
sssId: this.supplyTypeId,
supplyType: this.supplyType,
supplyAmount: this.supplyAmount,
supplyDate: this.supplyDate,
tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
}
if (this.obj.state == "edit") {
addSupplyArr[this.supplyRowIndex] = addSupplyObj;
uni.setStorageSync('addSupplyArr', addSupplyArr);
} else if (this.obj.state == "add") {
if (addSupplyArr != "") {
addSupplyArr.push(addSupplyObj)
uni.setStorageSync('addSupplyArr', addSupplyArr);
} else {
addSupplyArr = []
addSupplyArr.push(addSupplyObj)
uni.setStorageSync('addSupplyArr', addSupplyArr);
}
}
uni.navigateTo({ uni.navigateTo({
url: '/pages/shipWork/supply' url: '/pages/shipWork/supply'
}) })
@ -159,12 +230,12 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
li { .li {
width: 44%; width: 44%;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

91
pages/shipWork/untieAdd.vue
View File

@ -13,9 +13,9 @@
</view> </view>
<view class="li"> <view class="li">
<p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange" <uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<text v-else>{{hcTextValue}}</text> <text v-else>{{vvyName}}</text>
</view> </view>
<view class="li"> <view class="li">
<p>进出口：</p> <p>进出口：</p>
@ -27,29 +27,29 @@
</view> </view>
<view class="li"> <view class="li">
<p><text class="required" v-if="obj.state != 'look'">*</text>泊位：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>泊位：</p>
<uni-data-select v-model="bwValue" :localdata="bwList" @change="bwChange" <uni-data-select v-model="bthId" :localdata="bwList" @change="bwChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<text v-else>{{bwTextValue}}</text> <text v-else>{{bthIdName}}</text>
</view> </view>
<view class="li"> <view class="li">
<p><text class="required" v-if="obj.state != 'look'">*</text>系缆时间：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>系缆时间：</p>
<uni-datetime-picker v-model="xlTime" @change="changeLog1" v-if="obj.state != 'look'" /> <uni-datetime-picker v-model="attachTime" @change="changeLog1" v-if="obj.state != 'look'" />
<text v-else>{{xlTime}}</text> <text v-else>{{attachTime}}</text>
</view> </view>
<view class="li"> <view class="li">
<p>解缆时间：</p> <p>解缆时间：</p>
<uni-datetime-picker v-model="jlTime" @change="changeLog2" v-if="obj.state != 'look'" /> <uni-datetime-picker v-model="unmoorTime" @change="changeLog2" v-if="obj.state != 'look'" />
<text v-else>{{jlTime}}</text> <text v-else>{{unmoorTime}}</text>
</view> </view>
<view class="li"> <view class="li">
<p>移泊时间：</p> <p>移泊时间：</p>
<uni-datetime-picker v-model="ybTime" @change="changeLog3" v-if="obj.state != 'look'" /> <uni-datetime-picker v-model="shiftingBerthTime" @change="changeLog3" v-if="obj.state != 'look'" />
<text v-else>{{ybTime}}</text> <text v-else>{{shiftingBerthTime}}</text>
</view> </view>
<view class="li"> <view class="li">
<p>停泊时间：</p> <p>停泊时间：</p>
<uni-datetime-picker v-model="tbTime" @change="changeLog4" v-if="obj.state != 'look'" /> <uni-datetime-picker v-model="noProductBerthTime" @change="changeLog4" v-if="obj.state != 'look'" />
<text v-else>{{tbTime}}</text> <text v-else>{{noProductBerthTime}}</text>
</view> </view>
</view> </view>
<view class="btnList"> <view class="btnList">
@ -77,30 +77,29 @@
untieRow: {}, untieRow: {},
untieRowIndex: 0, untieRowIndex: 0,
// 航次下拉框 // 航次下拉框
hcValue: "", vvyId: "",
hcTextValue: "", vvyName: "",
hcList: [], hcList: [],
// 船舶净吨 // 船舶净吨
zlShip: 0, zlShip: 0,
// 泊位下拉框 // 泊位下拉框
bwValue: "", bthId: "",
bwTextValue: "", bthIdName: "",
bwList: [], bwList: [],
// 系缆时间 // 系缆时间
xlTime: [''], attachTime: [''],
// 解缆时间 // 解缆时间
jlTime: [''], unmoorTime: [''],
// 移泊时间 // 移泊时间
ybTime: [''], shiftingBerthTime: [''],
// 停泊时间 // 停泊时间
tbTime: [''], noProductBerthTime: [''],
} }
}, },
onLoad(options) { onLoad(options) {
if ('params' in options) { if ('params' in options) {
// 获取传递的对象参数，使用decodeURIComponent解码，并转为对象 // 获取传递的对象参数，使用decodeURIComponent解码，并转为对象
this.obj = JSON.parse(decodeURIComponent(options.params)) this.obj = JSON.parse(decodeURIComponent(options.params))
console.log(this.obj)
} }
}, },
mounted() { mounted() {
@ -130,51 +129,49 @@
getRow() { getRow() {
this.untieRow = uni.getStorageSync('untieRow'); this.untieRow = uni.getStorageSync('untieRow');
this.untieRowIndex = uni.getStorageSync('untieRowIndex'); this.untieRowIndex = uni.getStorageSync('untieRowIndex');
console.log(this.untieRow) this.vvyId = this.untieRow.vvyId
console.log(this.untieRowIndex) this.vvyName = this.untieRow.vvyName
this.hcValue = this.untieRow.vvyId
this.hcTextValue = this.untieRow.vvyName
this.zlShip = this.untieRow.zlShip this.zlShip = this.untieRow.zlShip
this.bwValue = this.untieRow.bthId this.bthId = this.untieRow.bthId
this.bwTextValue = this.untieRow.bthIdName this.bthIdName = this.untieRow.bthIdName
this.xlTime = this.untieRow.xlTime this.attachTime = (this.untieRow.attachTime[0] ? this.untieRow.attachTime : '')
this.jlTime = this.untieRow.jlTime this.unmoorTime = (this.untieRow.unmoorTime[0] ? this.untieRow.unmoorTime : '')
this.ybTime = this.untieRow.ybTime this.shiftingBerthTime = (this.untieRow.shiftingBerthTime[0] ? this.untieRow.shiftingBerthTime : '')
this.tbTime = this.untieRow.tbTime this.noProductBerthTime = (this.untieRow.noProductBerthTime[0] ? this.untieRow.noProductBerthTime : '')
}, },
// 航次下拉 // 航次下拉
hcChange(e) { hcChange(e) {
this.hcValue = e; this.vvyId = e;
this.hcList.forEach(v => { this.hcList.forEach(v => {
if (v.value == e) { if (v.value == e) {
this.hcTextValue = v.text this.vvyName = v.text
} }
}) })
}, },
// 泊位下拉 // 泊位下拉
bwChange(e) { bwChange(e) {
this.bwValue = e; this.bthId = e;
this.bwList.forEach(v => { this.bwList.forEach(v => {
if (v.value == e) { if (v.value == e) {
this.bwTextValue = v.text this.bthIdName = v.text
} }
}) })
}, },
// 系缆时间 // 系缆时间
changeLog1(e) { changeLog1(e) {
this.xlTime = e.slice(0, e.length - 3) this.attachTime = e.slice(0, e.length - 3)
}, },
// 解缆时间 // 解缆时间
changeLog2(e) { changeLog2(e) {
this.jlTime = e.slice(0, e.length - 3) this.unmoorTime = e.slice(0, e.length - 3)
}, },
// 移泊时间 // 移泊时间
changeLog3(e) { changeLog3(e) {
this.ybTime = e.slice(0, e.length - 3) this.shiftingBerthTime = e.slice(0, e.length - 3)
}, },
// 停泊时间 // 停泊时间
changeLog4(e) { changeLog4(e) {
this.tbTime = e.slice(0, e.length - 3) this.noProductBerthTime = e.slice(0, e.length - 3)
}, },
// 取消 // 取消
cancel() { cancel() {
@ -196,17 +193,17 @@
let addUntieArr = uni.getStorageSync('addUntieArr') let addUntieArr = uni.getStorageSync('addUntieArr')
let addUntieObj = { let addUntieObj = {
zlShip: this.zlShip, zlShip: this.zlShip,
vvyId: this.hcValue, vvyId: this.vvyId,
vvyName: this.hcTextValue, vvyName: this.vvyName,
bthId: this.bwValue, bthId: this.bthId,
bthIdName: this.bwTextValue, bthIdName: this.bthIdName,
tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName, tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName, importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
spmName: this.shipInfo.voyageScheduleDataList[0].spmName, spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
xlTime: this.xlTime, attachTime: this.attachTime,
jlTime: this.jlTime, unmoorTime: this.unmoorTime,
ybTime: this.ybTime, shiftingBerthTime: this.shiftingBerthTime,
tbTime: this.tbTime noProductBerthTime: this.noProductBerthTime
} }
if (this.obj.state == "edit") { if (this.obj.state == "edit") {

12
pages/shipWork/untieCord.vue
View File

@ -3,12 +3,12 @@
<view class="container"> <view class="container">
<view class="ul"> <view class="ul">
<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)"> <view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
<view class="title">航次：{{item.spmName}}</view> <view class="title">航次：{{item.vvyName}}</view>
<p>状态：未上传</p> <p>状态：未上传</p>
<p>进出口：{{item.importExportFlagName}}</p> <p>进出口：{{item.importExportFlagName}}</p>
<p>贸易类型：{{item.tradeTypeName}}</p> <p>贸易类型：{{item.tradeTypeName}}</p>
<p>泊位：{{item.bthIdName}}</p> <p>泊位：{{item.bthIdName}}</p>
<p>系缆时间：{{item.xlTime}}</p> <p>系缆时间：{{item.attachTime}}</p>
</view> </view>
</view> </view>
<view class="addBtn" @click="add('add')">+ 新增</view> <view class="addBtn" @click="add('add')">+ 新增</view>
@ -27,13 +27,13 @@
mounted() { mounted() {
this.shipInfo = uni.getStorageSync('shipInfo') this.shipInfo = uni.getStorageSync('shipInfo')
this.infoList = uni.getStorageSync('addUntieArr') this.infoList = uni.getStorageSync('addUntieArr')
console.log(this.shipInfo)
console.log(this.infoList)
}, },
methods: { methods: {
add(state, item, index) { add(state, item, index) {
uni.setStorageSync('untieRow', item); if (state != 'add') {
uni.setStorageSync('untieRowIndex', index); uni.setStorageSync('untieRow', item);
uni.setStorageSync('untieRowIndex', index);
}
const obj = { const obj = {
state: state, state: state,
} }

53
pages/shipWork/workAssign.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<view class="workAssign"> <view class="workAssign">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li v-for="(item,index) in infoList" :key="index" @click="add('look')"> <view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
<view class="title">航次：{{item.val1}}</view> <view class="title">航次：{{item.vvyName}}</view>
<p>状态：{{item.val2}}</p> <p>状态：未上传</p>
<p>进出口：{{item.val3}}</p> <p>进出口：{{item.importExportFlagName}}</p>
<p>贸易类型：{{item.val4}}</p> <p>贸易类型：{{item.tradeTypeName}}</p>
<p>作业时间：{{item.val5}}</p> <p>作业时间：{{item.startTime}} - {{item.endTime}}</p>
</li> </view>
</ul> </view>
<view class="addBtn" @click="add('add')">+ 新增</view> <view class="addBtn" @click="add('add')">+ 新增</view>
</view> </view>
</view> </view>
@ -19,29 +19,20 @@
export default { export default {
data() { data() {
return { return {
infoList: [{ shipInfo: {},
val1: "CK124324", infoList: []
val2: "待上传",
val3: "进口",
val4: "内贸",
val5: "05/30 8:00",
}, {
val1: "CK124324",
val2: "待上传",
val3: "进口",
val4: "内贸",
val5: "05/30 8:00",
}, {
val1: "CK124324",
val2: "待上传",
val3: "进口",
val4: "内贸",
val5: "05/30 8:00",
}]
} }
}, },
mounted() {
this.shipInfo = uni.getStorageSync('shipInfo')
this.infoList = uni.getStorageSync('addAssignArr')
},
methods: { methods: {
add(state) { add(state, item, index) {
if (state != 'add') {
uni.setStorageSync('assignRow', item);
uni.setStorageSync('assignRowIndex', index);
}
const obj = { const obj = {
state: state, state: state,
} }
@ -59,10 +50,10 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
padding: 20px 0; padding: 20px 0;
li { .li {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

329
pages/shipWork/workAssignAdd.vue
View File

@ -1,69 +1,68 @@
<template> <template>
<view class="workAssignAdd"> <view class="workAssignAdd">
<view class="container"> <view class="container">
<ul> <view class="ul">
<li> <view class="li">
<p>船名：</p> <p>船名：</p>
<span>快乐号</span> <text>{{shipInfo.voyageScheduleDataList[0].spmName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>航次：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>航次：</p>
<uni-data-select v-model="hcValue" :localdata="hcList" @change="hcChange" <uni-data-select v-model="vvyId" :localdata="hcList" @change="hcChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>CK98796</span> <text v-else>{{vvyName}}</text>
</li> </view>
<li> <view class="li">
<p>进出口：</p> <p>进出口：</p>
<span>进口</span> <text>{{shipInfo.voyageScheduleDataList[0].importExportFlagName}}</text>
</li> </view>
<li> <view class="li">
<p>贸易类型：</p> <p>贸易类型：</p>
<span>内贸</span> <text>{{shipInfo.voyageScheduleDataList[0].tradeTypeName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>泊位：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>泊位：</p>
<uni-data-select v-model="bwValue" :localdata="bwList" @change="bwChange" <uni-data-select v-model="bthId" :localdata="bwList" @change="bwChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>1泊位</span> <text v-else>{{bthIdName}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>工班：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>工班：</p>
<uni-data-select v-model="gbValue" :localdata="gbList" @change="gbChange" <uni-data-select v-model="pwcTypeId" :localdata="gbList" @change="gbChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>工班1</span> <text v-else>{{pwcType}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>人数：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>人数：</p>
<uni-number-box v-model="peopleNum" v-if="obj.state != 'look'" /> <uni-number-box v-model="personNumber" v-if="obj.state != 'look'" />
<span v-else>100</span> <text v-else>{{personNumber}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>装卸类型：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>装卸类型：</p>
<uni-data-select v-model="zxValue" :localdata="zxList" @change="zxChange" <uni-data-select v-model="loaderTypeId" :localdata="zxList" @change="zxChange"
v-if="obj.state != 'look'"></uni-data-select> v-if="obj.state != 'look'"></uni-data-select>
<span v-else>装卸类型1</span> <text v-else>{{loaderType}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>车辆数量：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>车辆数量：</p>
<uni-number-box v-model="carNum" v-if="obj.state != 'look'" /> <uni-number-box v-model="vehicleSize" v-if="obj.state != 'look'" />
<span v-else>100</span> <text v-else>{{vehicleSize}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>备件数量：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>备件数量：</p>
<uni-number-box v-model="partsNum" v-if="obj.state != 'look'" /> <uni-number-box v-model="sparePart" v-if="obj.state != 'look'" />
<span v-else>100</span> <text v-else>{{sparePart}}</text>
</li> </view>
<li> <view class="li">
<p><span class="required" v-if="obj.state != 'look'">*</span>作业时间：</p> <p><text class="required" v-if="obj.state != 'look'">*</text>作业时间：</p>
<uni-datetime-picker v-model="workTime" type="datetimerange" rangeSeparator="-" @change="changeLog" <uni-datetime-picker v-model="workTime" type="datetimerange" rangeSeparator="-" @change="changeLog"
v-if="obj.state != 'look'" /> v-if="obj.state != 'look'" />
<span v-else>2020-04-21 00:00 - 2020-04-21 00:00</span> <text v-else>{{startTime}} - {{endTime}}</text>
</li> </view>
</view>
</ul>
<view class="btnList"> <view class="btnList">
<van-button type="default" @click="cancel">取消</van-button> <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 == 'add' || obj.state == 'edit'" @click="save">保存</van-button>
<van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button> <van-button type="info" v-if="obj.state == 'look'" @click="toGo('edit')">编辑</van-button>
</view> </view>
@ -75,77 +74,42 @@
export default { export default {
data() { data() {
return { return {
shipInfo: {
voyageScheduleDataList: [{
spmName: "",
importExportFlagName: "",
tradeTypeName: ""
}]
},
obj: {}, obj: {},
assignRow: {},
assignRowIndex: {},
// 航次下拉框 // 航次下拉框
hcValue: "", vvyId: "",
hcList: [{ vvyName: "",
value: 0, hcList: [],
text: "航次0"
},
{
value: 1,
text: "航次1"
},
{
value: 2,
text: "航次2"
},
],
// 船舶净吨
zlShip: 100,
// 泊位下拉框 // 泊位下拉框
bwValue: "", bthId: "",
bwList: [{ bthIdName: "",
value: 0, bwList: [],
text: "泊位0"
},
{
value: 1,
text: "泊位1"
},
{
value: 2,
text: "泊位2"
},
],
// 工班下拉框 // 工班下拉框
gbValue: "", pwcTypeId: "",
gbList: [{ pwcType: "",
value: 0, gbList: [],
text: "工班0"
},
{
value: 1,
text: "工班1"
},
{
value: 2,
text: "工班2"
},
],
// 人数 // 人数
peopleNum: 0, personNumber: 0,
// 装卸类型下拉框 // 装卸类型下拉框
zxValue: "", loaderTypeId: "",
zxList: [{ loaderType: "",
value: 0, zxList: [],
text: "装卸类型0"
},
{
value: 1,
text: "装卸类型1"
},
{
value: 2,
text: "装卸类型2"
},
],
// 车辆数量 // 车辆数量
carNum: 0, vehicleSize: 0,
// 备件数量 // 备件数量
partsNum: 0, sparePart: 0,
// 作业时间 // 作业时间
workTime: "", workTime: ['', ''],
startTime: "",
endTime: "",
} }
}, },
onLoad(options) { onLoad(options) {
@ -154,22 +118,105 @@
this.obj = JSON.parse(decodeURIComponent(options.params)) this.obj = JSON.parse(decodeURIComponent(options.params))
} }
}, },
mounted() {
if (this.obj.state == 'edit' || this.obj.state == 'look') {
this.getRow();
}
this.getShip()
},
methods: { 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.pubBerthesManageRespList.forEach((v, index) => {
this.bwList.push({
text: v.bthBthnm,
value: v.bthId
})
})
},
// 获取当前行信息
getRow() {
this.assignRow = uni.getStorageSync('assignRow');
this.assignRowIndex = uni.getStorageSync('assignRowIndex');
this.vvyId = this.assignRow.vvyId
this.vvyName = this.assignRow.vvyName
this.bthId = this.assignRow.bthId
this.bthIdName = this.assignRow.bthIdName
this.pwcTypeId = this.assignRow.pwcTypeId
this.pwcType = this.assignRow.pwcType
this.personNumber = this.assignRow.personNumber
this.loaderTypeId = this.assignRow.loaderTypeId
this.loaderType = this.assignRow.loaderType
this.vehicleSize = this.assignRow.vehicleSize
this.sparePart = this.assignRow.sparePart
this.workTime = this.assignRow.workTime
this.startTime = this.assignRow.startTime
this.endTime = this.assignRow.endTime
},
// 航次下拉 // 航次下拉
hcChange(e) { hcChange(e) {
this.hcValue = e; this.vvyId = e;
this.hcList.forEach(v => {
if (v.value == e) {
this.vvyName = v.text
}
})
}, },
// 泊位下拉 // 泊位下拉
bwChange(e) { bwChange(e) {
this.bwValue = e; this.bthId = e;
this.bwList.forEach(v => {
if (v.value == e) {
this.bthIdName = v.text
}
})
}, },
// 工班下拉 // 工班下拉
gbChange(e) { gbChange(e) {
this.gbValue = e; this.pwcTypeId = e;
this.gbList.forEach(v => {
if (v.value == e) {
this.pwcType = v.text
}
})
}, },
// 装卸类型下拉 // 装卸类型下拉
zxChange(e) { zxChange(e) {
this.zxValue = e; this.loaderTypeId = e;
this.zxList.forEach(v => {
if (v.value == e) {
this.loaderType = v.text
}
})
},
// 作业时间
changeLog(e) {
this.workTime = e
this.startTime = this.workTime[0].slice(0, this.workTime[0].length - 3)
this.endTime = this.workTime[1].slice(0, this.workTime[1].length - 3)
}, },
// 取消 // 取消
cancel() { cancel() {
@ -177,8 +224,50 @@
url: '/pages/shipWork/workAssign' url: '/pages/shipWork/workAssign'
}) })
}, },
// 删除
del() {
let addAssignArr = uni.getStorageSync('addAssignArr')
addAssignArr.splice(this.assignRowIndex, 1)
uni.setStorageSync('addAssignArr', addAssignArr);
uni.navigateTo({
url: '/pages/shipWork/workAssign'
})
},
// 保存 // 保存
save() { save() {
let addAssignArr = uni.getStorageSync('addAssignArr')
let addAssignObj = {
vvyId: this.vvyId,
vvyName: this.vvyName,
bthId: this.bthId,
bthIdName: this.bthIdName,
pwcTypeId: this.pwcTypeId,
pwcType: this.pwcType,
personNumber: this.personNumber,
loaderTypeId: this.loaderTypeId,
loaderType: this.loaderType,
vehicleSize: this.vehicleSize,
sparePart: this.sparePart,
workTime: this.workTime,
startTime: this.startTime,
endTime: this.endTime,
tradeTypeName: this.shipInfo.voyageScheduleDataList[0].tradeTypeName,
importExportFlagName: this.shipInfo.voyageScheduleDataList[0].importExportFlagName,
spmName: this.shipInfo.voyageScheduleDataList[0].spmName,
}
if (this.obj.state == "edit") {
addAssignArr[this.assignRowIndex] = addAssignObj;
uni.setStorageSync('addAssignArr', addAssignArr);
} else if (this.obj.state == "add") {
if (addAssignArr != "") {
addAssignArr.push(addAssignObj)
uni.setStorageSync('addAssignArr', addAssignArr);
} else {
addAssignArr = []
addAssignArr.push(addAssignObj)
uni.setStorageSync('addAssignArr', addAssignArr);
}
}
uni.navigateTo({ uni.navigateTo({
url: '/pages/shipWork/workAssign' url: '/pages/shipWork/workAssign'
}) })
@ -200,12 +289,12 @@
.container { .container {
padding: 30px 20px; padding: 30px 20px;
ul { .ul {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
li { .li {
width: 44%; width: 44%;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;