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

修改bug

dev3
wuwx 2024-03-22 19:00:41 +08:00
parent e8c30b0ed9
commit 4022505655
11 changed files with 60 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/index/domesticTrade.vue
View File

@ -92,7 +92,7 @@
backColor="#f2f2f2" textPosition="outside" percentum precision="0" /> backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
<view class="bottomBox"> <view class="bottomBox">
<p>已装船:<text>{{ item.progress }}</text></p> <p>已装船:<text>{{ item.progress }}</text></p>
<p style="margin-left: 16px;">待卸船:<text>{{ item.totalProgress - item.progress }}</text></p> <p style="margin-left: 16px;">待装船:<text>{{ item.totalProgress - item.progress }}</text></p>
</view> </view>
<view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label"> <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
<image src="../../static/images/tjxz2.png" mode=""></image> <image src="../../static/images/tjxz2.png" mode=""></image>
@ -289,7 +289,7 @@
backColor="#f2f2f2" textPosition="outside" percentum precision="0" /> backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
<view class="bottomBox"> <view class="bottomBox">
<p>已装船:<text>{{ item.progress }}</text></p> <p>已装船:<text>{{ item.progress }}</text></p>
<p style="margin-left: 16px;">待卸船:<text>{{ item.totalProgress - item.progress }}</text></p> <p style="margin-left: 16px;">待装船:<text>{{ item.totalProgress - item.progress }}</text></p>
</view> </view>
<view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label"> <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
<image src="../../static/images/tjxz2.png" mode=""></image> <image src="../../static/images/tjxz2.png" mode=""></image>

8
pages/index/instruct.vue
View File

@ -95,7 +95,7 @@
backColor="#f2f2f2" textPosition="outside" percentum precision="0" /> backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
<view class="bottomBox"> <view class="bottomBox">
<p>已装船:<text>{{ item.progress }}</text></p> <p>已装船:<text>{{ item.progress }}</text></p>
<p style="margin-left: 16px;">待卸船:<text>{{ item.totalProgress - item.progress }}</text></p> <p style="margin-left: 16px;">待装船:<text>{{ item.totalProgress - item.progress }}</text></p>
</view> </view>
<view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label"> <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
<image src="../../static/images/tjxz2.png" mode=""></image> <image src="../../static/images/tjxz2.png" mode=""></image>
@ -292,7 +292,7 @@
backColor="#f2f2f2" textPosition="outside" percentum precision="0" /> backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
<view class="bottomBox"> <view class="bottomBox">
<p>已装船:<text>{{ item.progress }}</text></p> <p>已装船:<text>{{ item.progress }}</text></p>
<p style="margin-left: 16px;">待卸船:<text>{{ item.totalProgress - item.progress }}</text></p> <p style="margin-left: 16px;">待装船:<text>{{ item.totalProgress - item.progress }}</text></p>
</view> </view>
<view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label"> <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
<image src="../../static/images/tjxz2.png" mode=""></image> <image src="../../static/images/tjxz2.png" mode=""></image>
@ -474,7 +474,7 @@
backColor="#f2f2f2" textPosition="outside" percentum precision="0" /> backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
<view class="bottomBox"> <view class="bottomBox">
<p>已装船:<text>{{ item.progress }}</text></p> <p>已装船:<text>{{ item.progress }}</text></p>
<p style="margin-left: 16px;">待卸船:<text>{{ item.totalProgress - item.progress }}</text></p> <p style="margin-left: 16px;">待装船:<text>{{ item.totalProgress - item.progress }}</text></p>
</view> </view>
<view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label"> <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
<image src="../../static/images/tjxz2.png" mode=""></image> <image src="../../static/images/tjxz2.png" mode=""></image>
@ -1613,7 +1613,7 @@
if (res.data.status == 200) { if (res.data.status == 200) {
this.initAsk() this.initAsk()
uni.showToast({ uni.showToast({
title: `设置装船要求成功`, title: `设置成功`,
icon: 'success', icon: 'success',
duration: 2000 duration: 2000
}) })

4
pages/quality/details.vue
View File

@ -15,8 +15,8 @@
<view class="li"> <view class="li">
<p>质损发生环节：</p> <p>质损发生环节：</p>
<view class="rightInfo"> <view class="rightInfo">
<p>{{infoData.qdLink}} </p> <p>{{infoData.qdLinkName}} </p>
<p v-if="infoData.qdLink == '客户反馈' || infoData.qdLink == '其他'"> <p v-if="infoData.qdLinkName == '客户反馈' || infoData.qdLinkName == '其他'">
备注：{{infoData.linkFeedback}}{{infoData.linkOther}} 备注：{{infoData.linkFeedback}}{{infoData.linkOther}}
</p> </p>
</view> </view>

3
pages/quality/edit.vue
View File

@ -1381,7 +1381,8 @@
"goodsType": this.carId, // 车型id "goodsType": this.carId, // 车型id
"linkFeedback": this.feed, // 客户反馈 "linkFeedback": this.feed, // 客户反馈
"linkOther": this.remark, // 环节其他 "linkOther": this.remark, // 环节其他
"qdLink": this.current, // 质损发生环节 // "qdLink": this.current, // 质损发生环节
"qdLink": this.currentValue, // 质损发生环节
"qdGcOther": this.other, // 质损货物品类其他 "qdGcOther": this.other, // 质损货物品类其他
"qdGodsCategory": this.current2, // 质损货物品类 "qdGodsCategory": this.current2, // 质损货物品类
"qdLiablePerson": this.director, // 质损责任人 "qdLiablePerson": this.director, // 质损责任人

8
pages/receipt/details.vue
View File

@ -179,6 +179,7 @@
this.initData() this.initData()
} }
}, },
methods: { methods: {
// 获取当前航次的船信息 // 获取当前航次的船信息
initData() { initData() {
@ -193,7 +194,6 @@
console.log(res) console.log(res)
if (res.statusCode == 200) { if (res.statusCode == 200) {
this.shipInfo = res.data.data.records[0] this.shipInfo = res.data.data.records[0]
console.log(this.shipInfo)
this.title = `船名：${this.shipInfo.spmName} / 航次：${this.shipInfo.vvyName} 装卸货物交接计数单` this.title = `船名：${this.shipInfo.spmName} / 航次：${this.shipInfo.vvyName} 装卸货物交接计数单`
this.getInfo() this.getInfo()
this.getSgin() this.getSgin()
@ -212,8 +212,8 @@
method: 'GET', //请求方式，必须为大写 method: 'GET', //请求方式，必须为大写
success: (res) => { success: (res) => {
if (res.statusCode == 200) { if (res.statusCode == 200) {
this.tableData = res.data.data.plan.records if(res.data.data.plan.records) this.tableData = res.data.data.plan.records
this.totalObj = res.data.data.count if(res.data.data.count) this.totalObj = res.data.data.count
} }
} }
}) })
@ -284,7 +284,7 @@
toSign(type) { toSign(type) {
this.shipInfo['type'] = type this.shipInfo['type'] = type
const params = encodeURIComponent(JSON.stringify(this.shipInfo)); const params = encodeURIComponent(JSON.stringify(this.shipInfo));
uni.navigateTo({ uni.reLaunch({
url: '/pages/receipt/sign?params=' + params url: '/pages/receipt/sign?params=' + params
}) })
}, },

3
pages/receipt/index.vue
View File

@ -7,13 +7,10 @@
<view class="end"> <view class="end">
<superwei-combox class="input" :candidates="tradeList" :isJSON="true" keyName="name" <superwei-combox class="input" :candidates="tradeList" :isJSON="true" keyName="name"
placeholder="请选择贸易类型" v-model="tradeName" @select="tradeSelect"></superwei-combox> placeholder="请选择贸易类型" v-model="tradeName" @select="tradeSelect"></superwei-combox>
</uni-easyinput>
<superwei-combox class="input" :candidates="importExportList" :isJSON="true" keyName="name" <superwei-combox class="input" :candidates="importExportList" :isJSON="true" keyName="name"
placeholder="请选择进出口" v-model="importExport" @select="importExportSelect"></superwei-combox> placeholder="请选择进出口" v-model="importExport" @select="importExportSelect"></superwei-combox>
</uni-easyinput>
<superwei-combox class="input" :candidates="shipList" :isJSON="true" keyName="vvyShip" <superwei-combox class="input" :candidates="shipList" :isJSON="true" keyName="vvyShip"
placeholder="请选择船名/航次" v-model="vvyShip" @select="shipSelect"></superwei-combox> placeholder="请选择船名/航次" v-model="vvyShip" @select="shipSelect"></superwei-combox>
</uni-easyinput>
<button class="btn" @click="onSearch">搜索</button> <button class="btn" @click="onSearch">搜索</button>
</view> </view>
</view> </view>

34
pages/receipt/sign.vue
View File

@ -138,7 +138,7 @@
//将签名笔迹上传到服务器，并将返回来的地址存到本地 //将签名笔迹上传到服务器，并将返回来的地址存到本地
handleConfirm: function() { handleConfirm: function() {
let that = this var that = this
if (tempPoint.length == 0) { if (tempPoint.length == 0) {
uni.showToast({ uni.showToast({
title: '请先签名', title: '请先签名',
@ -147,21 +147,38 @@
}); });
return; return;
} else { } else {
let that = this // var that = this
uni.canvasToTempFilePath({ uni.canvasToTempFilePath({
canvasId: 'mycanvas', canvasId: 'mycanvas',
success: function(e) { success: function(e) {
let timestamp = new Date().getTime(); pathToBase64(e.tempFilePath).then(path => {
let sunumber = Math.floor(Math.random() * 999); // let timestamp = new Date().getTime();
var file = that.base64ToFile(e.tempFilePath, timestamp + sunumber) // let sunumber = Math.floor(Math.random() * 999);
// var file = that.base64ToFile(e.tempFilePath, timestamp + sunumber)
let data = {
"fileName": "abc",
"base64Str": path
}
uni.request({
url: `${that.$local}/pub/file/uploadRaw`,
data: data,
header: {
'Content-Type': 'application/json', //自定义请求头信息
'Authorization': `Bearer ${that.loginObj.access_token}`
},
method: 'POST', //请求方式，必须为大写
success: (res) => {
var file = String(res.data)
uni.uploadFile({ uni.uploadFile({
url: `${that.$local}/api/file/upload`, //上传图片api url: `${that.$local}/api/file/upload`, //上传图片api
header: { header: {
'Authorization': `Bearer ${that.loginObj.access_token}` 'Authorization': `Bearer ${that.loginObj.access_token}`
}, },
file: file, filePath: e.tempFilePath,
fileType: 'image',
name: 'file', name: 'file',
formData: {
'file': file
},
success: (res) => { success: (res) => {
that.signImg = JSON.parse(res.data).data.filePath that.signImg = JSON.parse(res.data).data.filePath
let reqDTO = {} let reqDTO = {}
@ -210,6 +227,9 @@
fail: (err) => { fail: (err) => {
console.log(err) console.log(err)
} }
})
}
})
}) })
} }
}); });

3
pages/shipWork/index.vue
View File

@ -844,7 +844,8 @@
if (delMfIds == null || delMfIds == "") { if (delMfIds == null || delMfIds == "") {
delMfIds = [] delMfIds = []
} }
console.log('111',that.evaluateTable);
console.log('222',that.shipmentQualityConsultationRespList);
let workDataInfo = { let workDataInfo = {
"adviserLayoutReqList": that.shipmentAdviserLayoutRespList, // 指导员作业布置 "adviserLayoutReqList": that.shipmentAdviserLayoutRespList, // 指导员作业布置
"conditionReqList": that.abnormalConditionRespList, // 异常情况单 "conditionReqList": that.abnormalConditionRespList, // 异常情况单

2
pages/shipWork/opinionSign.vue
View File

@ -485,7 +485,9 @@
v.disabled = true v.disabled = true
}) })
this.remakeDisabled = true this.remakeDisabled = true
console.log('this.evaluateList',this.evaluateList);
if (this.evaluateList.length == 0) { if (this.evaluateList.length == 0) {
console.log('2222222222222');
let webId = uuidv4() let webId = uuidv4()
let date = new Date().getTime() let date = new Date().getTime()
let webDate = api.getDate(date) let webDate = api.getDate(date)

22
pages/shipWork/shiftAdd.vue
View File

@ -162,19 +162,21 @@
</van-tab> </van-tab>
<van-tab title="翻仓信息"> <van-tab title="翻仓信息">
<view class="masonry"> <view class="masonry">
<view class="addBox" @click="fcAdd" v-if=" fcUlList.length == 0"> <view class="addBox" @click="fcAdd">
<!-- <view class="addBox" @click="fcAdd" v-if=" fcUlList.length == 0"> -->
<view class="imgBox"> <view class="imgBox">
<image src="../../static/images/addIcon.png" mode=""></image> <image src="../../static/images/addIcon.png" mode=""></image>
<p>添加翻仓</p> <p>添加翻仓</p>
</view> </view>
</view> </view>
<view class="masonryLi" v-for="(item,index) in fcUlList" :key="index + 'fc'"> <view style="display: flex; justify-content: space-between;flex-wrap:wrap;">
<view class="addBox" @click="fcAdd" v-if="index == 0"> <view class="masonryLi" v-for="(item,index) in fcUlList" :key="index + 'fc'" style="width: 49%;">
<!-- <view class="addBox" @click="fcAdd" v-if="index == 0">
<view class="imgBox"> <view class="imgBox">
<image src="../../static/images/addIcon.png" mode=""></image> <image src="../../static/images/addIcon.png" mode=""></image>
<p>添加翻仓</p> <p>添加翻仓</p>
</view> </view>
</view> </view> -->
<view class="ul"> <view class="ul">
<view class="delBox" @click="delFc(item,index)">×</view> <view class="delBox" @click="delFc(item,index)">×</view>
<view class="li"> <view class="li">
@ -223,22 +225,25 @@
</view> </view>
</view> </view>
</view> </view>
</view>
</van-tab> </van-tab>
<van-tab title="其他信息"> <van-tab title="其他信息">
<view class="masonry"> <view class="masonry">
<view class="addBox" @click="qtAdd" v-if=" otherArr.length == 0"> <view class="addBox" @click="qtAdd">
<!-- <view class="addBox" @click="qtAdd" v-if=" otherArr.length == 0"> -->
<view class="imgBox"> <view class="imgBox">
<image src="../../static/images/addIcon.png" mode=""></image> <image src="../../static/images/addIcon.png" mode=""></image>
<p>添加其他</p> <p>添加其他</p>
</view> </view>
</view> </view>
<view class="masonryLi qtUl" v-for="(item,index) in otherArr" :key="index"> <view style="display: flex; justify-content: space-between;flex-wrap:wrap;">
<view class="addBox" @click="qtAdd" v-if=" index == 0"> <view class="masonryLi qtUl" v-for="(item,index) in otherArr" :key="index" style="width: 49%;">
<!-- <view class="addBox" @click="qtAdd" v-if=" index == 0">
<view class="imgBox"> <view class="imgBox">
<image src="../../static/images/addIcon.png" mode=""></image> <image src="../../static/images/addIcon.png" mode=""></image>
<p>添加其他</p> <p>添加其他</p>
</view> </view>
</view> </view> -->
<view class="ul"> <view class="ul">
<p class="title">辅助作业</p> <p class="title">辅助作业</p>
<view class="delBox" @click="delQt(item,index)">×</view> <view class="delBox" @click="delQt(item,index)">×</view>
@ -298,6 +303,7 @@
</view> </view>
</view> </view>
</view> </view>
</view>
</van-tab> </van-tab>
</van-tabs> </van-tabs>
</view> </view>

BIN
static/images/theme/jckIcon1-1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB