Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

config/index.js

@@ -4,7 +4,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.110.9:8099/',
 	// baseUrlNew: 'http://192.168.110.9:9888/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.67:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
@@ -16,7 +16,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erp/exWarehousing/exWarehousing.vue

@@ -727,7 +727,8 @@
 				}
 			},
 			getImgUrl(res) {
-				this.detailData.addressUrl = res
+				console.log(res)
+				this.detailData.addressUrl = res.data.appendixPath
 			},
 			onError(error) {
 				console.log('------------error-----------')

pages/erpbusiness/add_quality_testing.vue

@@ -23,18 +23,31 @@
 			<view class="c-row ">
 				<view class="title">任务编号</view>
 				<view class="con-list">
-					<view @click='show4=true'>{{gridList.inOutTaskNo1?gridList.inOutTaskNo1:'请选择任务编号'}}</view>
+					<view @click='show4=true'>{{gridList.inOutTaskNo?gridList.inOutTaskNo:'请选择任务编号'}}</view>
 					<u-picker :range="taskNolist" range-key="inOutTaskNo1" @confirm='tasknopicker($event)'
 						v-model="show4" mode="selector">
 					</u-picker>
 				</view>
 			</view>
+			<view  style=' align-items: flex-start;' class="c-row ">
+				<view class="title">任务提示</view>
+				<view class="con-list">
+					{{gridList.taskFlag?gridList.taskFlag:'自动获取，不可编辑'}}
+				</view>
+			</view>
 			<view v-show='typevalue==1&&gridList.inOutType!="移库入库"||typevalue==3' class="c-row ">
 				<view class="title">合同编号</view>
 				<view class="con-list">
 					{{gridList.contractNo?gridList.contractNo:'自动获取，不可编辑'}}
 				</view>
 			</view>
+			<view  style=' align-items: flex-start;' class="c-row ">
+				<view class="title">任务提示</view>
+				<view class="con-list">
+					{{gridList.pointOut?gridList.pointOut:'自动获取，不可编辑'}}
+				</view>
+			</view>
+			
 			<view v-show='typevalue==1&&gridList.inOutType=="移库入库"' class="c-row ">
 				<view class="title">移库编号</view>
 				<view class="con-list">
@@ -1317,6 +1330,7 @@
 				console.log("切换任务编号", e)
 				this.gridList.inOutTaskNo = this.taskNolist[e[0]].inOutTaskNo
 				this.gridList.inOutTaskNo1 = this.taskNolist[e[0]].inOutTaskNo1
+				this.gridList.taskFlag = this.taskNolist[e[0]].taskFlag
 				var data = this.taskNolist[e[0]]
 				this.gridList.donecount = data.completedQuantity + '/' + data.weight
 				if (this.taskNolist[e[0]].inOutType == '收购入库') {
@@ -1347,6 +1361,7 @@
 					compId: uni.getStorageSync('pcUserInfo').compId
 				}).then(res => {
 					this.contractNolist = res.data.data
+					this.gridList.pointOut =this.contractNolist.pointOut
 					if (this.typevalue == 3) {
 						var gooddata = this.goodsList.filter((item) => {
 							return item.goodsName == this.contractNolist.goodsName

pages/reimbursement/the_reimbursement.vue

@@ -41,9 +41,9 @@
 					<!-- <view class="wenzi1 audit" v-if="!item.approveStatus && item.status =='已驳回' "  @click="rejecttext(item)">驳回原因</view> -->
 					<view class="wenzi1 audit"v-if="item.approveStatus && item.approveStatus !='发起人撤回' " @click="withdraw(item)">撤回</view>
 					<view class="wenzi1 audit" @click="deleExpense(item)"
-						v-if="item.status=='已驳回'">删除</view>
+						v-if="item.status=='已驳回'||item.approveStatus=='发起人撤回'">删除</view>
 					<view class="wenzi1 audit" @click="requestFunds(3,item)"
-						v-if="item.status=='已驳回'">编辑</view>
+						v-if="item.status=='已驳回'||item.approveStatus=='发起人撤回'">编辑</view>
 						<view class="wenzi1 audit" @click="gofujian(item)">补充附件</view>
 					<view class="wenzi1 audit" @click="getRequestFunds(1,item)">查看</view>
 				</view>
@@ -116,6 +116,7 @@
 				
 			},
 			withdraw(val){
+				
 				var that = this
 				uni.showModal({
 					content: "撤回成功后，可再次提交，确定撤回吗？",
@@ -123,14 +124,20 @@
 					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中',
+								mask: true
+							})
 							that.$api.doRequest('post', '/newWorkflow/api/stopInstance', {
 								businessKey: val.id,
 								workflowId: val.workflowId,
 							}).then(res => {
 								if (res.data.code == 200) {
+									uni.hideLoading()
 									that.$api.msg('撤回成功')
 									that.getList()
 								} else {
+									uni.hideLoading()
 									that.$api.msg('撤回成功')
 								}
 							})

pages/task/audit/warehouse_details.vue

@@ -151,7 +151,6 @@
 		},
 		methods: {
 			getStatus(val) {
-				console.log(11111)
 				if (val == 200) this.getData()
 			},
 			showcontent(item) {