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.1.118:8090/',
 	// baseUrlNew: 'http://192.168.1.114:8090/',
-	// baseUrlNew: 'http://192.168.1.122:8090/',
+	baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	baseUrlNew: 'http://192.168.110.138:8090/',

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.111",
-    "versionCode" : 21111,
+    "versionName" : "2.1.113",
+    "versionCode" : 21113,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/task/audit/purchasecontract.vue

@@ -222,10 +222,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/300个字
 					</view>
 					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						maxlength="300" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>

pages/task/audit/salecontract.vue

@@ -226,10 +226,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/300个字
 					</view>
 					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						maxlength="300" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>

pages/task/audit/warehouse_warrant.vue

@@ -104,7 +104,11 @@
 			</view>
 			<view class="file" @click="openXls">
 				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
-				<text class="text_css">明细.xls</text>
+				<text class="text_css">付款明细.xls</text>
+			</view>
+			<view class="file" @click="openXls2">
+				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
+				<text class="text_css">车辆指标.xls</text>
 			</view>
 		</view>
 		<view class="content2">
@@ -220,6 +224,7 @@
 				id: "",
 				auditList: [],
 				url: "11",
+				url2:""
 			}
 		},
 		onBackPress(e) {
@@ -263,6 +268,23 @@
 					});
 				}
 			},
+			openXls2() {
+				if (this.url2 && this.url2 != "ng") {
+					uni.downloadFile({
+						url: this.url2,
+						success: function(res) {
+							var filePath = res.tempFilePath;
+							uni.openDocument({
+								filePath: filePath,
+								showMenu: true,
+								success: function(res) {
+									console.log('打开文档成功');
+								}
+							});
+						}
+					});
+				}
+			},
 			getList() {
 				uni.showLoading({
 					title: "加载中...",
@@ -299,6 +321,14 @@
 						this.url = res1.data.data
 					}
 				})
+				this.$api.doRequest('post', '/paymentManagement/exportPhoneOrder', {
+					orderId: this.id,
+					// searchType: 1,
+				}).then(res1 => {
+					if (res1.data.code == 200) {
+						this.url2 = res1.data.data
+					}
+				})
 				this.$api.doRequest('post', '/warehousingOrder/exportPhoneData', {
 					searchType: 1,
 					batchId: this.id

pages/task/audit/warehouse_warrant_detail.vue

@@ -104,7 +104,11 @@
 			</view>
 			<view class="file" @click="openXls">
 				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
-				<text class="text_css">明细.xls</text>
+				<text class="text_css">付款明细.xls</text>
+			</view>
+			<view class="file" @click="openXls2">
+				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
+				<text class="text_css">车辆指标.xls</text>
 			</view>
 		</view>
 		<view class="content2">
@@ -219,6 +223,7 @@
 				id: "",
 				auditList: [],
 				url: "11",
+				url2: "11",
 			}
 		},
 		onBackPress(e) {
@@ -262,6 +267,23 @@
 					});
 				}
 			},
+			openXls2() {
+				if (this.url2 && this.url2 != "ng") {
+					uni.downloadFile({
+						url: this.url2,
+						success: function(res) {
+							var filePath = res.tempFilePath;
+							uni.openDocument({
+								filePath: filePath,
+								showMenu: true,
+								success: function(res) {
+									console.log('打开文档成功');
+								}
+							});
+						}
+					});
+				}
+			},
 			getList() {
 				uni.showLoading({
 					title: "加载中...",
@@ -298,6 +320,14 @@
 						this.url = res1.data.data
 					}
 				})
+				this.$api.doRequest('post', '/paymentManagement/exportPhoneOrder', {
+					orderId: this.id,
+					// searchType: 1,
+				}).then(res1 => {
+					if (res1.data.code == 200) {
+						this.url2 = res1.data.data
+					}
+				})
 				this.$api.doRequest('post', '/warehousingOrder/exportPhoneData', {
 					// searchType: 1,
 					batchId: this.id