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

# Conflicts:
#	pages/erpbusiness/index.vue

config/index.js

@@ -1,7 +1,8 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
-	baseUrlNew: 'http://192.168.1.122:9100/',
+	baseUrlNew: 'http://192.168.1.117:8090/',
+	// baseUrlNew: 'http://192.168.1.122:9100/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erpbusiness/index.vue

@@ -4,15 +4,11 @@
 			<view class='title'>收购业务管理</view>
 			<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
 				<view class="cu-item" v-for="(item,index) in gridList" :key="index" @click="gridClick(item, index)"
-					v-if="index<gridCol*2">
-					<view v-show="item.show == true">
-						<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
-							<image :src="item.src" class="sign"></image>
-						</view>
-
-						<text>{{item.name}}</text>
+					v-if="index<gridCol*2 && item.show">
+					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
+						<image :src="item.src" class="sign"></image>
 					</view>
-
+					<text>{{item.name}}</text>
 				</view>
 			</view>
 		</view>
@@ -52,7 +48,7 @@
 		data() {
 			return {
 				isShowAlert1: false,
-				content1: '登录信息过期需要重新登录,是否立即登录?',
+				content1: '当前登入信息验证失败，是否重新登录？',
 				isShowAlert: false,
 				content: '您确定要退出吗?',
 				a: false,
@@ -258,12 +254,12 @@
 					url: '/pages/public/login'
 				})
 			},
-			cancelClick1() {
-				this.isShowAlert1 = false
-			},
 			cancelClick() {
 				this.isShowAlert = false
 			},
+			cancelClick1() {
+				this.isShowAlert = false
+			},
 			goOpenService() {
 				uni.hideTabBarRedDot({
 					index: 3
@@ -393,22 +389,21 @@
 					return;
 				}
 				if (!this.hasLogin) {
-					this.isShowAlert1 = true;
-					// uni.showModal({
-					// 	title: '登录提示',
-					// 	content: '您尚未登录，是否立即登录？',
-					// 	showCancel: true,
-					// 	confirmText: '登录',
-					// 	success: (e) => {
-					// 		if (e.confirm) {
-					// 			uni.navigateTo({
-					// 				url: '/pages/public/login'
-					// 			})
-					// 		}
-					// 	},
-					// 	fail: () => {},
-					// 	complete: () => {}
-					// })
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录，是否立即登录？',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
 				} else {
 					if (item.url) {
 						uni.navigateTo({
@@ -419,22 +414,21 @@
 			},
 			setting() {
 				if (!this.hasLogin) {
-					this.isShowAlert1 = true;
-					// uni.showModal({
-					// 	title: '登录提示',
-					// 	content: '您尚未登录，是否立即登录？',
-					// 	showCancel: true,
-					// 	confirmText: '登录',
-					// 	success: (e) => {
-					// 		if (e.confirm) {
-					// 			uni.navigateTo({
-					// 				url: '/pages/public/login'
-					// 			})
-					// 		}
-					// 	},
-					// 	fail: () => {},
-					// 	complete: () => {}
-					// })
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录，是否立即登录？',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
 				} else {
 					uni.navigateTo({
 						url: '/pages/user/setUp'

pages/task/audit/purchasecontract.vue

@@ -68,7 +68,7 @@
 			<u-form-item label-width='260' label="签订日期">
 				<u-input v-model="list.signingDate" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量 (吨)">
+			<u-form-item label-width='300' label="最终实际交易量（吨）">
 				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item v-if='list.deliverType == 1' label-width='260' label="临时仓库负责人">
@@ -86,7 +86,7 @@
 			<u-form-item label-width='260' label="杂质（%）<=">
 				<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="容重(克/升)>=">
+			<u-form-item label-width='260' label="容重（克/升）>=">
 				<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="霉变粒（%）<=">
@@ -117,7 +117,9 @@
 				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="备注信息">
-				<u-input v-model="list.remarks" input-align="right" placeholder="" disabled />
+			</u-form-item>
+			<u-form-item >
+				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="附件">
 				<!-- <view class="textCss">
@@ -498,4 +500,12 @@
 	   width:100%;height:100%;
 	   z-index:10000;
 	}
+	.textarea{
+		margin:0 auto;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		font-size:28rpx;
+		padding:10px;
+	}
 </style>

pages/task/audit/salecontract.vue

@@ -68,7 +68,7 @@
 			<u-form-item label-width='260' label="签订日期">
 				<u-input v-model="list.signingDate" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量 (吨)">
+			<u-form-item label-width='300' label="最终实际交易量（吨）">
 				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="货名">
@@ -83,8 +83,8 @@
 			<u-form-item label-width='260' label="杂质（%）<=">
 				<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="容重(克/升)>=">
-				<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="" disabled />
+			<u-form-item  label-width='260' label="容重（克/升）>=">
+				<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="霉变粒（%）<=">
 				<u-input v-model="list.contractGoodsInfo.mildewGrain" input-align="right" placeholder="" disabled />
@@ -116,7 +116,9 @@
 				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="备注信息">
-				<u-input v-model="list.remarks" input-align="right" placeholder="" disabled />
+			</u-form-item>
+			<u-form-item >
+				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="附件">
 				<!-- <view class="textCss">
@@ -238,12 +240,17 @@
 			//驳回
 			rejectSubmit() {
 				var that = this
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
 				that.$api.doRequest('post', '/workflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
 					needReapply: true,
 				}).then(res => {
+					uni.hideLoading()
 					that.$api.msg('驳回成功')
 					that.show = false
 				})
@@ -259,12 +266,17 @@
 			//通过
 			passSubmit() {
 				var that = this
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
 				that.$api.doRequest('post', '/workflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: true,
 					auditMind: this.auditMind,
 					needReapply: true,
 				}).then(res => {
+					uni.hideLoading()
 					that.$api.msg('通过成功')
 					that.show = false
 					setTimeout(function() {
@@ -482,4 +494,12 @@
 	   width:100%;height:100%;
 	   z-index:10000;
 	}
+	.textarea{
+		margin:0 auto;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		font-size:28rpx;
+		padding:10px;
+	}
 </style>

pages/task/procurement_details.vue

@@ -11,37 +11,37 @@
 			<u-form-item label-width='260' label="客户">
 				{{list.seller}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="现货"' label-width='260' label="单价(元/吨)">
+			<u-form-item v-if='list.procurementPlanType=="现货"' label-width='260' label="单价（元/吨）">
 				<u-input v-model="list.unitPrice" />
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="基差(元/吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="基差（元/吨）">
 				{{list.basis}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="冻结定金(元)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="冻结定金（元）">
 				{{list.freezingDeposit}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="拖欠定金(元)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="拖欠定金（元）">
 				{{list.defaultDeposit}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="卸车费(元/吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="卸车费（元/吨）">
 				{{list.unloadingCharge}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="发票费(元/吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="发票费（元/吨）">
 				{{list.invoiceFee}}
 			</u-form-item>
-			<u-form-item label-width='260' label="合同重量(吨)">
+			<u-form-item label-width='260' label="合同重量（吨）">
 				{{list.transactionsNumber}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已入库量(吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已入库量（吨）">
 				{{list.stockInQuantity}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="可平仓量(吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="可平仓量（吨）">
 				{{list.openPosition}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已平仓量(吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已平仓量（吨）">
 				{{list.closedPosition}}
 			</u-form-item>
-			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已成交量(吨)">
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已成交量（吨）">
 				{{list.cumulativeTurnover}}
 			</u-form-item>
 			<u-form-item  label-width='260' label="发票类型">

pages/task/sale_details.vue

@@ -11,37 +11,37 @@
 			<u-form-item label-width='260' label="客户">
 				{{list.buyer}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="现货"' label-width='260' label="单价(元/吨)">
+			<u-form-item v-if='list.salePlanType=="现货"' label-width='260' label="单价（元/吨）">
 				<u-input v-model="list.unitPrice" />
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="基差(元/吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="基差（元/吨）">
 				{{list.basis}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="冻结定金(元)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="冻结定金（元）">
 				{{list.freezingDeposit}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="拖欠定金(元)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="拖欠定金（元）">
 				{{list.defaultDeposit}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="卸车费(元/吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="卸车费（元/吨）">
 				{{list.unloadingCharge}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="发票费(元/吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="发票费（元/吨）">
 				{{list.invoiceFee}}
 			</u-form-item>
-			<u-form-item label-width='260' label="合同重量(吨)">
+			<u-form-item label-width='260' label="合同重量（吨）">
 				{{list.transactionsNumber}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已出库量(吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已出库量（吨）">
 				{{list.stockOutQuantity}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="可平仓量(吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="可平仓量（吨）">
 				{{list.openPosition}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已平仓量(吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已平仓量（吨）">
 				{{list.closedPosition}}
 			</u-form-item>
-			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已成交量(吨)">
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已成交量（吨）">
 				{{list.cumulativeTurnover}}
 			</u-form-item>
 			<u-form-item  label-width='260' label="发票类型">