ccj vor 2 Jahren
Ursprung
Commit
1eed469f70
4 geänderte Dateien mit 23 neuen und 13 gelöschten Zeilen
  1. 2 6
      App.vue
  2. 2 2
      manifest.json
  3. 17 3
      pages/reimbursement/request_funds.vue
  4. 2 2
      pages/task/audit/purchasecontract.vue

+ 2 - 6
App.vue

@@ -182,6 +182,7 @@
 			let type = uni.getSystemInfoSync().platform
 			console.log(type)
 			if (type == "android") {
+				APPUpdate()
 				const plugin = uni.requireNativePlugin("DCloud-PushSound");
 				plugin.setCustomPushChannel({
 					soundName: "ring",
@@ -315,12 +316,7 @@
 				this.version = res.versionName;
 			});
 			// #endif
-			let type = uni.getSystemInfoSync().platform
-			console.log(type)
-			if (type == "android") {
-				// AppUpdate()
-				APPUpdate()
-			}
+			
 			console.log('App Show')
 		},
 		onHide: function() {

+ 2 - 2
manifest.json

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

+ 17 - 3
pages/reimbursement/request_funds.vue

@@ -64,7 +64,7 @@
 					<view class="delete_img" @click="deleteImg(index)">X</view>
 					<image :src="item.appendixPath" mode="" style="width: 100px;height: 100px;"></image>
 				</view>
-				<view class="biankuang" @click="uploadClick" v-if="imglist2.length < 9">
+				<view class="biankuang" @click="uploadClick" v-if="imglist2.length < 30">
 					<view class="tubiao">
 						<image class="upload" src="../../static/img/oa_office/upload.png" mode="">
 						</image>
@@ -169,13 +169,22 @@
 			},
 			uploadClick() {
 				let baseUrlNew = config.def().baseUrlNew
+				console.log('baseUrlNew',baseUrlNew)
 				uni.chooseImage({
+					count:1,
 					success: (chooseImageRes) => {
-						let a = chooseImageRes.tempFiles
+						console.log('chooseImageRes',chooseImageRes)
+						let files = []
+						for (let item of chooseImageRes.tempFiles) {
+							files.push({
+								name: 'fileName',
+								uri : item.path
+							});
+						}
 						uni.uploadFile({
 							url: baseUrlNew + 'appendix/api/uploadFiles',
 							// url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例,非真实的接口地址
-							files: a,
+							files: files,
 							formData: {
 								fileName: chooseImageRes.tempFiles[0],
 								companyId: "2710b21efc1e4393930c5dc800010dc4",
@@ -183,6 +192,7 @@
 								vesselId: '',
 							},
 							success: (uploadFileRes) => {
+								console.log('uploadFileRes',uploadFileRes)
 								console.log(JSON.parse(uploadFileRes.data))
 								var data = JSON.parse(uploadFileRes.data).data
 								this.$api.doRequest('post', '/appendix/api/saveFiles', {
@@ -193,6 +203,10 @@
 									console.log(res)
 								})
 								console.log(uploadFileRes.data);
+							},
+							fail(res) {
+								
+								console.log(res);
 							}
 						});
 					}

+ 2 - 2
pages/task/audit/purchasecontract.vue

@@ -8,7 +8,7 @@
 			</view>
 			
 			<view class="headInfo_middle">
-				<view class="headInfo_title">销售合同审批</view>
+				<view class="headInfo_title">采购合同审批</view>
 				<view class="headInfo_No">{{list.contractNo}}</view>
 			</view>
 			<view class="headInfo_right">
@@ -180,7 +180,7 @@
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						
-						<u-form-item label-width='260' label="溢短装(%)" :borderBottom="false" v-if="list.overShort">
+						<u-form-item label-width='260' label="溢短装(%)" :borderBottom="false" >
 							<u-input v-model="list.overShort" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>