前端

pages/erp/exWarehousing/exWarehousing.vue

@@ -12,6 +12,12 @@
 					mode="selector">
 				</u-picker>
 			</view>
+			<view class="row ">
+				<view class="left">已完成量</view>
+				<view class="right">
+					<view >{{detailData.donecount?detailData.detailData:'自动获取，不可编辑'}}</view>
+				</view>
+			</view>
 			<view class="row row-bottom">
 				<view class="left">合同编号</view>
 				<!-- <view @click='slectcontractNo'>{{detailData.contractNo}}</view> -->
@@ -487,6 +493,7 @@
 					    this.detailData.goodsNameKey = res.data.data[0].goodsNameKey
 						this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo ? this.inOutNoList[0]
 							.inOutTaskNo : ''
+						this.detailData.donecount =  this.inOutNoList[0].completedQuantity + '/' + this.inOutNoList[0].weight
 						this.detailData.agent = this.inOutNoList[0].agent
 						if (this.inOutNoList[0].contractNo) {
 							this.detailData.contractNo = this.inOutNoList[0].contractNo
@@ -568,6 +575,7 @@
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
 				this.detailData.goodsNameKey = this.inOutNoList[e[0]].goodsNameKey
 				this.detailData.grade = this.inOutNoList[e[0]].grade
+				this.detailData.donecount = this.inOutNoList[e[0]].completedQuantity + '/' + this.inOutNoList[e[0]].weight
 				// this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 				this.weightbills.goodsName = this.inOutNoList[e[0]].goodsName
 				// this.contractType = this.inOutNoList[e[0]].contractType //获取合同类型   用于判断输入车牌号

pages/erpbusiness/add_quality_testing.vue

@@ -1304,6 +1304,7 @@
 				this.gridList.inOutTaskNo = this.taskNolist[e[0]].inOutTaskNo
 				this.gridList.inOutTaskNo1 = this.taskNolist[e[0]].inOutTaskNo1
 				var data = this.taskNolist[e[0]]
+				this.gridList.donecount = data.completedQuantity + '/' + data.weight
 				if (this.taskNolist[e[0]].inOutType == '收购入库') {
 					this.gridList.contractNo = this.taskNolist[e[0]].contractNo
 					this.inType = this.taskNolist[e[0]].inOutType

pages/erpbusiness/edit_quality_testing.vue

@@ -21,6 +21,12 @@
 					<view >{{gridList.inOutTaskNo}}</view>
 				</view>
 			</view>
+			<view class="c-row ">
+				<view class="title">已完成量</view>
+				<view class="con-list">
+					<view >{{gridList.donecount?gridList.donecount:'自动获取，不可编辑'}}</view>
+				</view>
+			</view>
 			<view v-if='gridList.serviceManagementType==1&&gridList.inOutType!="移库入库"&&flag!=3||gridList.serviceManagementType==3' class="c-row ">
 				<view class="title">合同编号</view>
 				<view class="con-list">

pages/erpbusiness/quality_testing.vue

@@ -260,7 +260,8 @@
 			// this.companyList=uni.getStorageSync('companyList')
 			uni.setStorageSync('isClick', false)
 			uni.showLoading({
-				title: "正在加载"
+				title: "正在加载",
+				mask: true
 			})
 			var that = this
 			if (this.cangid) {

pages/task/audit/refuel.vue

@@ -639,14 +639,6 @@
 					}, 1000);
 				})
 			},
-			pass() {
-				this.show = true
-				this.title = '审核意见'
-			},
-			reject() {
-				this.show = true
-				this.title = '驳回原因（驳回）'
-			},
 			//通过
 			passSubmit() {
 				var that = this