From ac41a8ccfd91eeec20d019a01952bba11c260c9b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 16 五月 2024 17:34:59 +0800
Subject: [PATCH] 1.设备维修申请开发提交

---
 pages/sbgl/sbwx.vue |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/pages/sbgl/sbwx.vue b/pages/sbgl/sbwx.vue
index 41b59b8..c58fb84 100644
--- a/pages/sbgl/sbwx.vue
+++ b/pages/sbgl/sbwx.vue
@@ -12,7 +12,7 @@
 
 
 		<view v-show="topContent.length!==0">
-			<view class="mainContent" :style="{maxHeight:'1000rpx',overflow: 'scroll'}">
+			<view class="mainContent" :style="{maxHeight:'1360rpx',overflow: 'scroll'}">
 
 				<view>
 					<u-gap height="10" bgColor="#eff0f1"></u-gap>
@@ -26,7 +26,7 @@
 							</view>
 
 							<view class="marginRight20">
-								<u-icon name="scan" @click="topScanClick" color="red" size="56"></u-icon>
+								<u-icon name="scan" @click="topScanClick" color="red" size="28"></u-icon>
 							</view>
 
 						</view>
@@ -61,7 +61,7 @@
 											</view>
 										</view>
 									</view>
-									<u-radio size='40' style='position: absolute;top: 45%;right: 0;'
+									<u-radio size='20' style='position: absolute;top: 45%;right: 0;'
 										:key="item.docu_code" :name="item.docu_code"
 										@change="groupChange(item.docu_code)" activeColor="red"></u-radio>
 
@@ -70,7 +70,7 @@
 						</view>
 
 					</view>
-					<u-gap height="20" bgColor="#eff0f1"></u-gap>
+					<u-gap height="10" bgColor="#eff0f1"></u-gap>
 
 					<view class="head" style="padding-bottom: 10rpx;">
 						<view class="head_block" style="margin-bottom: 10rpx;margin-top:20rpx;">
@@ -82,7 +82,7 @@
 							</view>
 						</view>
 						<view class='inputClass contentFont' style="margin: 0 20rpx; width: 95%;">
-							<u--textarea placeholder="璇疯緭鍏�" confirm-type="send" border="surround" height='100'
+							<u--textarea placeholder="璇疯緭鍏�" confirm-type="send" border="surround" height='80'
 								v-model="descMessage">
 							</u--textarea>
 						</view>
@@ -90,7 +90,7 @@
 						<view style="display: flex;">
 							<view v-for="(pic,index) in fileList" :key="pic.name">
 								<view style="margin: 20rpx 0rpx 20rpx 20rpx;position: relative;">
-									<u-icon name="close" color="#fff" size="26"
+									<u-icon name="close" color="#fff" size="13"
 										style="position: absolute;z-index: 10;right: 0;background-color: black;border-radius:50%;"
 										@click="deletePic(pic)"></u-icon>
 
@@ -104,7 +104,7 @@
 					</view>
 
 
-					<u-gap height="20" bgColor="#eff0f1"></u-gap>
+					<u-gap height="10" bgColor="#eff0f1"></u-gap>
 
 					<view class="head" style="padding-bottom: 10rpx;">
 						<view class="head_block" style="margin-bottom: 10rpx;margin-top:20rpx;">
@@ -115,16 +115,18 @@
 								</view>
 							</view>
 
-							<view class="marginRight20" style="width: 200rpx;display: flex;">
-								<u-button type="primary" :plain="isStop!=='Y'" text="鏄�" @click="isStopClick('Y')">
+							<view class="marginRight20" style="width: 200rpx;display: flex;align-items: center;">
+								<u-button type="primary" :plain="isStop!=='Y'" style="height: 60rpx;" text="鏄�"
+									@click="isStopClick('Y')">
 								</u-button>
-								<u-button type="warning" :plain="isStop!=='N'" text="鍚�" @click="isStopClick('N')">
+								<u-button type="warning" :plain="isStop!=='N'" style="height: 60rpx;margin: 0 5rpx;"
+									text="鍚�" @click="isStopClick('N')">
 								</u-button>
 							</view>
 						</view>
 					</view>
 
-					<u-gap height="20" bgColor="#eff0f1"></u-gap>
+					<u-gap height="10" bgColor="#eff0f1"></u-gap>
 
 					<view v-show="isStop==='N'" class="head" style="padding-bottom: 10rpx;padding-bottom: 20rpx;">
 						<view class="head_block" style="margin-bottom: 10rpx;margin-top:20rpx;">
@@ -136,14 +138,14 @@
 							</view>
 						</view>
 						<view class='inputClass contentFont' style="margin: 0 20rpx; width: 95%;">
-							<u--textarea placeholder="璇疯緭鍏�" confirm-type="send" border="surround" height='100'
+							<u--textarea placeholder="璇疯緭鍏�" confirm-type="send" border="surround" height='80'
 								v-model="descMessage2">
 							</u--textarea>
 						</view>
 
 					</view>
 
-					<u-gap height="20" bgColor="#eff0f1"></u-gap>
+					<u-gap height="10" bgColor="#eff0f1"></u-gap>
 					<!-- margin-bottom: 110rpx; -->
 					<view v-show="isStop==='N'" class="head" style="padding-bottom: 10rpx;">
 						<view class="head_block" style="margin-bottom: 10rpx;margin-top:20rpx;">
@@ -155,7 +157,7 @@
 							</view>
 						</view>
 						<view class='inputClass contentFont' style="margin: 0 20rpx; width: 95%;">
-							<u--textarea placeholder="璇疯緭鍏�" confirm-type="send" border="surround" height='100'
+							<u--textarea placeholder="璇疯緭鍏�" confirm-type="send" border="surround" height='80'
 								v-model="descMessage3">
 							</u--textarea>
 						</view>
@@ -163,7 +165,7 @@
 						<view style="display: flex;">
 							<view v-for="(pic,index) in fileList2" :key="pic.name">
 								<view style="margin: 20rpx 0rpx 20rpx 20rpx;position: relative;">
-									<u-icon name="close" color="#fff" size="26"
+									<u-icon name="close" color="#fff" size="13"
 										style="position: absolute;z-index: 10;right: 0;background-color: black;border-radius:50%;"
 										@click="deletePic(pic)"></u-icon>
 
@@ -273,6 +275,7 @@
 						for (let i = 0; i < files.length; i++) {
 							let obj = new Object();
 							obj.name = 'files1;' + i + new Date().getTime();
+							// obj.files1 = i + new Date().getTime();
 							obj.uri = files[i].path;
 							that.fileList.push(obj);
 							if (obj.src == null || obj.src == '' || obj.src == undefined) {
@@ -295,6 +298,7 @@
 						for (let i = 0; i < files.length; i++) {
 							let obj = new Object();
 							obj.name = 'files2;' + i + new Date().getTime();
+							// obj.files2 = i + new Date().getTime();
 							obj.uri = files[i].path;
 							that.fileList2.push(obj);
 							if (obj.src == null || obj.src == '' || obj.src == undefined) {
@@ -411,41 +415,36 @@
 			// 纭鎻愪氦鎸夐挳
 			async submit() {
 				const header = {
-					// 'Content-Type': 'multipart/form-data',
-					'Content-Type': 'application/x-www-form-urlencoded',
-					'rediskey': uni.getStorageSync('rediskey'),
-					'admin': uni.getStorageSync('usercode'),
-					'username': encodeURIComponent(uni.getStorageSync('username')),
-					'navTabId': uni.getStorageSync('usercode'),
-					'userid': uni.getStorageSync('userid'),
-					'guid': uni.getStorageSync('guid'),
-					'usertype': 'APP'
+					'Content-Type': 'multipart/form-data',
+					'Token': uni.getStorageSync('Token')
 				}
 
 				const result = this.topContent.find(item => item.docu_code === this.radioValue)
 				const formData = {
-					username: uni.getStorageSync('username'),
+					// username: uni.getStorageSync('username'),
 					docu_code: result.docu_code,
 					eqpcode: result.eqpcode,
 					wkshpcode: result.wksp_code,
 					faultdescr: this.descMessage,
 					is_stoprepair: this.isStop,
-					// files1: this.fileList,
+					filse1: this.fileList.map(i => i.uri).join(','),
+					filse2: this.fileList2.map(i => i.uri).join(','),
 					repaircontent: this.descMessage2,
 					replaceparts: this.descMessage3
 				}
-				// console.log(formData)
-				// console.log([...this.fileList, ...this.fileList2].length)
+				console.log(formData, 123)
+				console.log([...this.fileList, ...this.fileList2])
 				this.isDisabledSubmitButton = true
 				uni.uploadFile({
-					url: this.$baseUrl + '/AppDeviceManage/RepairScanDeviceSave',
+					url: this.$baseUrl + '/DeviceManager/RepairScanDeviceSave',
 					files: [...this.fileList, ...this.fileList2].length === 0 ? [{
 						"uri": "/"
 					}] : [...this.fileList, ...this.fileList2],
+					name: 'files',
 					header: header,
 					formData: formData,
 					success: (res) => {
-						console.log(res)
+						console.log(res, 'res')
 						let result = JSON.parse(res.data)
 						if (res.statusCode == 200 && result.code == '200') {
 							uni.$u.toast('鎻愪氦鎴愬姛锛�')
@@ -466,6 +465,7 @@
 						this.isDisabledSubmitButton = false
 					},
 					fail(res) {
+						console.log(res, 'res2')
 						uni.$u.toast('鎻愪氦澶辫触锛�')
 						this.isDisabledSubmitButton = false
 					},

--
Gitblit v1.9.3