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

修改bug

dev3
wuwx 2024-04-09 14:20:21 +08:00
parent 35246b6010
commit 00abdecbdc
6 changed files with 97 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pages/shipWork/brandDetails.vue
View File

@ -366,7 +366,6 @@
confirm() {
this.$refs.showRight.close();
let arr = []
let flag = false
if (this.modelId == "" && this.modelName == "" && this.brdId == "" && this.brdName == "" && this.bvmId ==
"" && this.bvmName == "" && this.potId == "" && this.potName == "" && this.minTon == "" && this
.maxTon == "" && this.minWidth == "" && this.maxWidth == "" && this.minHeight == "" && this
@ -375,36 +374,41 @@
} else {
this.allList.forEach(v => {
if (this.modelName == v.model) {
flag = true
arr.push(v)
}
if (this.brdName == v.brdName) {
flag = true
arr.push(v)
}
if (this.bvmName == v.bvmName) {
flag = true
arr.push(v)
}
if (this.potName == v.potName) {
flag = true
arr.push(v)
}
if (this.minTon != "" && this.maxTon) {
if (this.minTon <= Number(v.weight) && this.maxTon >= Number(v.weight)) {
flag = true
arr.push(v)
}
}
if (this.minWidth != "" && this.maxWidth) {
if (this.minWidth <= Number(v.carWidth) && this.maxWidth >= Number(v.carWidth)) {
flag = true
arr.push(v)
}
}
if (this.minHeight != "" && this.maxHeight) {
if (this.minHeight <= Number(v.carHeight) && this.maxHeight >= Number(v.carHeight)) {
flag = true
arr.push(v)
}
}
if (flag) {
arr.push(v)
}
})
for (let i = 0; i < arr.length; i++) {
for (let j = i + 1; j < arr.length; j++) {
if (arr[i].webId == arr[j].webId) {
arr.splice(j, 1);
j--;
}
}
}
this.total = arr.length
if (arr.length > 0) {
let newArr = this.getMapping(arr, this.pageSize)

4
pages/shipWork/index.vue
View File

@ -763,7 +763,7 @@
} else {
uni.showToast({
icon: 'none',
title: '当前船只不可下载'
title: '该船名航次已被其他用户下载，不可再次下载'
});
}
} else {
@ -954,7 +954,7 @@
} else {
uni.showToast({
icon: 'none',
title: '当前船只不可上传'
title: '该船名航次已被其他用户下载，不可再次上传'
});
}
},

6
pages/shipWork/mixSign.vue
View File

@ -175,7 +175,7 @@
</view>
</view>
</view>
<view class="rowTwo" v-if="shiftInfo1.length == 0">
<view class="rowTwo" v-show="shiftInfo1.length == 0">
<view class="left bo_r">
<view class="cell bo_r">
First Shift
@ -264,7 +264,7 @@
</view>
</view>
</view>
<view class="rowTwo" v-if="shiftInfo2.length == 0">
<view class="rowTwo" v-show="shiftInfo2.length == 0">
<view class="left bo_r">
<view class="cell bo_r">
Second Shift
@ -353,7 +353,7 @@
</view>
</view>
</view>
<view class="rowTwo" v-if="shiftInfo3.length == 0">
<view class="rowTwo" v-show="shiftInfo3.length == 0">
<view class="left bo_r">
<view class="cell bo_r">
Third Shift

88
pages/shipWork/shiftAdd.vue
View File

@ -93,7 +93,7 @@
</view>
<view class="li widthLi iLi">
<p class="liTitle">备注：</p>
<uni-easyinput type="textarea" autoHeight v-model="item2.remark"
<uni-easyinput type="textarea" v-model="item2.remark"
placeholder="请输入任务描述(200字以内)" maxlength="200"></uni-easyinput>
</view>
</view>
@ -150,7 +150,7 @@
</view>
<view class="li widthLi iLi">
<p class="liTitle">备注：</p>
<uni-easyinput type="textarea" autoHeight v-model="item2.remark"
<uni-easyinput type="textarea" v-model="item2.remark"
placeholder="请输入任务描述(200字以内)" maxlength="200"></uni-easyinput>
</view>
</view>
@ -285,19 +285,19 @@
</view>
<view class="li iLi">
<p class="liTitle">描述：</p>
<uni-easyinput type="textarea" autoHeight v-model="item.describe"
<uni-easyinput type="textarea" v-model="item.describe"
placeholder="请输入任务描述(200字以内)" maxlength="200"></uni-easyinput>
</view>
<p class="title">待工作业</p>
<view class="li iLi">
<p class="liTitle">描述：</p>
<uni-easyinput type="textarea" autoHeight v-model="item.dgWork"
<uni-easyinput type="textarea" v-model="item.dgWork"
placeholder="请输入任务描述(200字以内)" maxlength="200"></uni-easyinput>
</view>
<p class="title">作业备注</p>
<view class="li iLi">
<p class="liTitle">描述：</p>
<uni-easyinput type="textarea" autoHeight v-model="item.remark"
<uni-easyinput type="textarea" v-model="item.remark"
placeholder="请输入任务描述(200字以内)" maxlength="200"></uni-easyinput>
</view>
</view>
@ -526,45 +526,45 @@
}
})
} else {
this.fcUlList = [{
retallyType: "",
retallyTypeName: "",
retallyOrigin: "",
retallyTerminus: "",
carType: "",
carTypeName: "",
datetime: ['', ''],
retallyStartTime: "",
retallyEndTime: "",
goodsNumber: 0,
goodsVolume: 0,
goodsWeight: 0,
mafiGroupNum: 0,
mfType: false,
editStatus: 0,
}]
// this.fcUlList = [{
// retallyType: "",
// retallyTypeName: "",
// retallyOrigin: "",
// retallyTerminus: "",
// carType: "",
// carTypeName: "",
// datetime: ['', ''],
// retallyStartTime: "",
// retallyEndTime: "",
// goodsNumber: 0,
// goodsVolume: 0,
// goodsWeight: 0,
// mafiGroupNum: 0,
// mfType: false,
// editStatus: 0,
// }]
}
} else if (tableName == 'infoRespList') {
if (value.length == 0) {
this.otherArr = [{
webId: '',
contactId: '',
jsworker: 0,
datetime: ['', ''],
startTime: '',
endTime: '',
zlValue: 0,
tjValue: 0,
ptworker: 0,
datetime2: ['', ''],
startTime2: '',
endTime2: '',
zlValue2: 0,
tjValue2: 0,
describe: '',
dgWork: '',
remark: ''
}]
// this.otherArr = [{
// webId: '',
// contactId: '',
// jsworker: 0,
// datetime: ['', ''],
// startTime: '',
// endTime: '',
// zlValue: 0,
// tjValue: 0,
// ptworker: 0,
// datetime2: ['', ''],
// startTime2: '',
// endTime2: '',
// zlValue2: 0,
// tjValue2: 0,
// describe: '',
// dgWork: '',
// remark: ''
// }]
} else {
this.otherArr = []
}
@ -677,13 +677,13 @@
},
//状态为编辑获取数据
editData() {
this.executeSql1('workMessageRespList')
this.executeSql1('workMessageRespList')
let that = this
setTimeout(function() {
that.loadItem()
}, 200)
this.executeSql1('retallyMessageRespList')
this.executeSql1('infoRespList')
this.executeSql1('retallyMessageRespList')
this.executeSql1('infoRespList')
},
async loadItem() {
for (let i = 0; i < this.ulList1.length; i++) {

2
pages/shipWork/shiftDetails.vue
View File

@ -421,7 +421,7 @@
flex-wrap: wrap;
align-items: baseline;
gap: 16px;
justify-content: space-between;
.masonryLi {
width: 49%;
height: auto;

32
pages/shipWork/workAssignAdd.vue
View File

@ -329,6 +329,38 @@
},
// 保存
save() {
if (this.vvyId == "") {
uni.showModal({
title: '提示',
showCancel: false,
content: '请输入航次！'
})
return
}
if (this.bthId == "") {
uni.showModal({
title: '提示',
showCancel: false,
content: '请输入泊位！'
})
return
}
if (this.pwcType == "") {
uni.showModal({
title: '提示',
showCancel: false,
content: '请输入工班！'
})
return
}
if (this.startTime == "") {
uni.showModal({
title: '提示',
showCancel: false,
content: '请输入作业时间！'
})
return
}
let date = new Date().getTime()
let altId = uuidv4()
let webStatus = 0