diff --git a/pages/index/domesticTrade.vue b/pages/index/domesticTrade.vue
index 3b48c45..cefb917 100644
--- a/pages/index/domesticTrade.vue
+++ b/pages/index/domesticTrade.vue
@@ -92,7 +92,7 @@
 							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
 							  <view class="bottomBox">
 								<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 class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
@@ -289,7 +289,7 @@
 							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
 							  <view class="bottomBox">
 								<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 class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue
index 0f47a77..f90b2a3 100644
--- a/pages/index/instruct.vue
+++ b/pages/index/instruct.vue
@@ -95,7 +95,7 @@
 							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
 							  <view class="bottomBox">
 								<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 class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
@@ -292,7 +292,7 @@
 							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
 							  <view class="bottomBox">
 								<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 class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
@@ -474,7 +474,7 @@
 							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
 							  <view class="bottomBox">
 								<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 class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
@@ -1613,7 +1613,7 @@
 						if (res.data.status == 200) {
 							this.initAsk()
 							uni.showToast({
-								title: `设置装船要求成功`,
+								title: `设置成功`,
 								icon: 'success',
 								duration: 2000
 							})
diff --git a/pages/quality/details.vue b/pages/quality/details.vue
index 9d11e00..4a08b7b 100644
--- a/pages/quality/details.vue
+++ b/pages/quality/details.vue
@@ -15,8 +15,8 @@
 					<view class="li">
 						<p>质损发生环节：</p>
 						<view class="rightInfo">
-							<p>{{infoData.qdLink}} </p>
-							<p v-if="infoData.qdLink == '客户反馈' || infoData.qdLink == '其他'">
+							<p>{{infoData.qdLinkName}} </p>
+							<p v-if="infoData.qdLinkName == '客户反馈' || infoData.qdLinkName == '其他'">
 								备注：{{infoData.linkFeedback}}{{infoData.linkOther}}
 							</p>
 						</view>
diff --git a/pages/quality/edit.vue b/pages/quality/edit.vue
index 23554db..b6ac989 100644
--- a/pages/quality/edit.vue
+++ b/pages/quality/edit.vue
@@ -1381,7 +1381,8 @@
 					"goodsType": this.carId, // 车型id
 					"linkFeedback": this.feed, // 客户反馈
 					"linkOther": this.remark, // 环节其他
-					"qdLink": this.current, // 质损发生环节
+					// "qdLink": this.current, // 质损发生环节
+					"qdLink": this.currentValue, // 质损发生环节
 					"qdGcOther": this.other, // 质损货物品类其他
 					"qdGodsCategory": this.current2, // 质损货物品类
 					"qdLiablePerson": this.director, // 质损责任人
diff --git a/pages/receipt/details.vue b/pages/receipt/details.vue
index e820384..de31ce1 100644
--- a/pages/receipt/details.vue
+++ b/pages/receipt/details.vue
@@ -179,6 +179,7 @@
 				this.initData()
 			}
 		},
+		
 		methods: {
 			// 获取当前航次的船信息
 			initData() {
@@ -193,7 +194,6 @@
 						console.log(res)
 						if (res.statusCode == 200) {
 							this.shipInfo = res.data.data.records[0]
-							console.log(this.shipInfo)
 							this.title = `船名：${this.shipInfo.spmName} / 航次：${this.shipInfo.vvyName} 装卸货物交接计数单`
 							this.getInfo()
 							this.getSgin()
@@ -212,8 +212,8 @@
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
 						if (res.statusCode == 200) {
-							this.tableData = res.data.data.plan.records
-							this.totalObj = res.data.data.count
+						if(res.data.data.plan.records) this.tableData = res.data.data.plan.records
+						if(res.data.data.count)	this.totalObj = res.data.data.count
 						}
 					}
 				})
@@ -284,7 +284,7 @@
 			toSign(type) {
 				this.shipInfo['type'] = type
 				const params = encodeURIComponent(JSON.stringify(this.shipInfo));
-				uni.navigateTo({
+				uni.reLaunch({
 					url: '/pages/receipt/sign?params=' + params
 				})
 			},
diff --git a/pages/receipt/index.vue b/pages/receipt/index.vue
index f661e6f..66ff634 100644
--- a/pages/receipt/index.vue
+++ b/pages/receipt/index.vue
@@ -7,13 +7,10 @@
 					<view class="end">
 						<superwei-combox class="input" :candidates="tradeList" :isJSON="true" keyName="name"
 							placeholder="请选择贸易类型" v-model="tradeName" @select="tradeSelect"></superwei-combox>
-						</uni-easyinput>
 						<superwei-combox class="input" :candidates="importExportList" :isJSON="true" keyName="name"
 							placeholder="请选择进出口" v-model="importExport" @select="importExportSelect"></superwei-combox>
-						</uni-easyinput>
 						<superwei-combox class="input" :candidates="shipList" :isJSON="true" keyName="vvyShip"
 							placeholder="请选择船名/航次" v-model="vvyShip" @select="shipSelect"></superwei-combox>
-						</uni-easyinput>
 						<button class="btn" @click="onSearch">搜索</button>
 					</view>
 				</view>
diff --git a/pages/receipt/sign.vue b/pages/receipt/sign.vue
index 97b48a6..788c463 100644
--- a/pages/receipt/sign.vue
+++ b/pages/receipt/sign.vue
@@ -138,7 +138,7 @@
 
 			//将签名笔迹上传到服务器，并将返回来的地址存到本地
 			handleConfirm: function() {
-				let that = this
+				var that = this
 				if (tempPoint.length == 0) {
 					uni.showToast({
 						title: '请先签名',
@@ -147,21 +147,38 @@
 					});
 					return;
 				} else {
-					let that = this
+					// var that = this
 					uni.canvasToTempFilePath({
 						canvasId: 'mycanvas',
 						success: function(e) {
-							let timestamp = new Date().getTime();
-							let sunumber = Math.floor(Math.random() * 999);
-							var file = that.base64ToFile(e.tempFilePath, timestamp + sunumber)
+						pathToBase64(e.tempFilePath).then(path => {
+							// let timestamp = new Date().getTime();
+							// 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({
 								url: `${that.$local}/api/file/upload`, //上传图片api
 								header: {
 									'Authorization': `Bearer ${that.loginObj.access_token}`
 								},
-								file: file,
-								fileType: 'image',
+								filePath: e.tempFilePath,
 								name: 'file',
+								formData: {
+			                    	'file': file
+			                    },
 								success: (res) => {
 									that.signImg = JSON.parse(res.data).data.filePath
 									let reqDTO = {}
@@ -211,6 +228,9 @@
 									console.log(err)
 								}
 							})
+						   }
+						  })
+                         })
 						}
 					});
 				}
diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue
index 4f6c7fe..50b5a18 100644
--- a/pages/shipWork/index.vue
+++ b/pages/shipWork/index.vue
@@ -844,7 +844,8 @@
 						if (delMfIds == null || delMfIds == "") {
 							delMfIds = []
 						}
-
+                        console.log('111',that.evaluateTable);
+                        console.log('222',that.shipmentQualityConsultationRespList);
 						let workDataInfo = {
 							"adviserLayoutReqList": that.shipmentAdviserLayoutRespList, // 指导员作业布置
 							"conditionReqList": that.abnormalConditionRespList, // 异常情况单
diff --git a/pages/shipWork/opinionSign.vue b/pages/shipWork/opinionSign.vue
index 29ecce9..4da501d 100644
--- a/pages/shipWork/opinionSign.vue
+++ b/pages/shipWork/opinionSign.vue
@@ -485,7 +485,9 @@
 							v.disabled = true
 						})
 						this.remakeDisabled = true
+						console.log('this.evaluateList',this.evaluateList);
 						if (this.evaluateList.length == 0) {
+							console.log('2222222222222');
 							let webId = uuidv4()
 							let date = new Date().getTime()
 							let webDate = api.getDate(date)
diff --git a/pages/shipWork/shiftAdd.vue b/pages/shipWork/shiftAdd.vue
index 40cbdaa..7fbf089 100644
--- a/pages/shipWork/shiftAdd.vue
+++ b/pages/shipWork/shiftAdd.vue
@@ -162,19 +162,21 @@
 				</van-tab>
 				<van-tab title="翻仓信息">
 					<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">
 								<image src="../../static/images/addIcon.png" mode=""></image>
 								<p>添加翻仓</p>
 							</view>
 						</view>
-						<view class="masonryLi" v-for="(item,index) in fcUlList" :key="index + 'fc'">
-							<view class="addBox" @click="fcAdd" v-if="index == 0">
+						<view style="display: flex; justify-content: space-between;flex-wrap:wrap;">
+						 <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">
 									<image src="../../static/images/addIcon.png" mode=""></image>
 									<p>添加翻仓</p>
 								</view>
-							</view>
+							</view> -->
 							<view class="ul">
 								<view class="delBox" @click="delFc(item,index)">×</view>
 								<view class="li">
@@ -221,24 +223,27 @@
 									<uni-number-box v-model="item.goodsWeight" :max="1000000000" />
 								</view>
 							</view>
-						</view>
+						 </view>
+					    </view>
 					</view>
 				</van-tab>
 				<van-tab title="其他信息">
 					<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">
 								<image src="../../static/images/addIcon.png" mode=""></image>
 								<p>添加其他</p>
 							</view>
 						</view>
-						<view class="masonryLi qtUl" v-for="(item,index) in otherArr" :key="index">
-							<view class="addBox" @click="qtAdd" v-if=" index == 0">
+						<view style="display: flex; justify-content: space-between;flex-wrap:wrap;">
+						 <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">
 									<image src="../../static/images/addIcon.png" mode=""></image>
 									<p>添加其他</p>
 								</view>
-							</view>
+							</view> -->
 							<view class="ul">
 								<p class="title">辅助作业</p>
 								<view class="delBox" @click="delQt(item,index)">×</view>
@@ -296,6 +301,7 @@
 										placeholder="请输入任务描述(200字以内)" maxlength="200"></uni-easyinput>
 								</view>
 							</view>
+						 </view>
 						</view>
 					</view>
 				</van-tab>
diff --git a/static/images/theme/jckIcon1-1.png b/static/images/theme/jckIcon1-1.png
index 15d62c1..745586c 100644
Binary files a/static/images/theme/jckIcon1-1.png and b/static/images/theme/jckIcon1-1.png differ