From 7288ed869b1affeabbe66a5c98a7c7c01366aa69 Mon Sep 17 00:00:00 2001
From: chenxinying <1039655633@qq.com>
Date: Thu, 25 Jan 2024 17:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=8E=AA=E6=96=BD=E7=A1=AE=E8=AE=A4=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=90=E4=B8=AA=E4=BA=BA=E6=89=93=E5=9B=9E=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E5=85=B6=E4=BB=96=E7=A1=AE=E8=AE=A4=E4=BA=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=89=93=E5=9B=9E=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 colorui/unit.css                              |  1 +
 .../hotwork-accept/hotwork-accept-detail.vue  |  7 ++++---
 .../hotwork-endwork-detail.vue                |  2 +-
 .../hotwork/hotwork-list/index.vue            | 21 ++++++++++---------
 .../hotwork-measures-confirm-detail.vue       |  1 +
 .../hotwork-startwork-detail.vue              | 11 +++++++++-
 6 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/colorui/unit.css b/colorui/unit.css
index 9bb7e92..e1562b0 100644
--- a/colorui/unit.css
+++ b/colorui/unit.css
@@ -1087,6 +1087,7 @@
 	font-weight: bold;
 	color: #000000;
 	font-size: 28upx;
+	height: auto;
 	/* white-space: nowrap; */
 }
 
diff --git a/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue
index 9706c09..154ae37 100644
--- a/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue
+++ b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue
@@ -11,10 +11,11 @@
 				<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
 					<view class="cu-form-title">完工验收</view>
 					<textarea maxlength="255" v-model="pd.DESCR" placeholder="请输入意见"></textarea>
-					<view class="cu-form-group ">
+				</view>
+				<view style="border-bottom: 1px dashed #eee;">
+					<view class="cu-form-group">
 						<view class="title">验收时间</view>
-						<ruiDatePicker
-									   fields="minute"
+						<ruiDatePicker fields="minute"
 									   :value="pd.ACCEPT_TIME?pd.ACCEPT_TIME:''"
 									   @change="changeStartDate"
 						></ruiDatePicker>
diff --git a/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue b/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue
index 6f3cef9..cd405c0 100644
--- a/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue
+++ b/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue
@@ -8,7 +8,7 @@
 		<view class="form">
 			<detail v-if="pd.HOTWORK_ID" :hotworkId="pd.HOTWORK_ID"></detail>
 			<view class="wui-form-list">
-				<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
+				<view style="border-bottom: 1px dashed #eee;">
 					<view class="cu-form-group">
 						<view class="title">作业结束时间</view>
 						<ruiDatePicker fields="minute"
diff --git a/pages/application/hotwork/hotwork-list/index.vue b/pages/application/hotwork/hotwork-list/index.vue
index 0646f04..a0df8fc 100644
--- a/pages/application/hotwork/hotwork-list/index.vue
+++ b/pages/application/hotwork/hotwork-list/index.vue
@@ -70,7 +70,7 @@
 						</view>
 						<view class="dy-subtitle-flex">
 							<text><button class="cu-btn bg-green" style="padding: 0 5px; height:24px;"
-										  @click="showDrawer('showRight',item.HOTWORK_ID)">查看流程图</button></text>
+							  @click="showDrawer('showRight',item.HOTWORK_ID)">查看流程图</button></text>
 						</view>
 					</view>
 				</view>
@@ -139,7 +139,7 @@
         		stepList:[],
 				sindex:-1,
         		STEP_ID:'',
-        flowList:[],
+        		flowList:[],
 			}
 		},
 		onReady() {
@@ -167,7 +167,7 @@
 			_this.list = [];
 			_this.isEnd = false;
 			_this.getData();
-      _this.getSetps();
+      		_this.getSetps();
 			// _this.getDept();
 			loginSession();
 		},
@@ -194,10 +194,10 @@
 						url: '/pages/application/hotwork/hotwork-measures/hotwork-measures-detail?HOTWORK_ID='+e
 					});
 				}else if(this.flow === '安全措施确认'){
-          uni.navigateTo({
-            url: '/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail?HOTWORK_ID='+e
-          });
-        }else if(this.flow === '监护人签字'){
+				  uni.navigateTo({
+					url: '/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail?HOTWORK_ID='+e
+				  });
+				}else if(this.flow === '监护人签字'){
 					uni.navigateTo({
 						url: '/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail?HOTWORK_ID='+e
 					});
@@ -314,9 +314,10 @@
 					},
 					data: {
 						CREATOR:_this.flow === '提交申请'?loginUser.USER_ID : '',
-            GASCHECK:_this.flow === '气体检测'?loginUser.USER_ID : '',
-            STEP_NAME: (_this.flow === '提交申请' || _this.flow === '气体检测')?'' : _this.flow,
-            STEP_ID: _this.STEP_ID,
+						GASCHECK:_this.flow === '气体检测'?loginUser.USER_ID : '',
+						STEP_NAME: (_this.flow === '提交申请' || _this.flow === '气体检测')?'' : _this.flow,
+						measures: _this.flow === '安全措施确认'?1 : '', // 如果是多个安全措施确认人，某个人打回，则其他确认人不显示打回作业
+						STEP_ID: _this.STEP_ID,
 						KEYWORDS : _this.KEYWORDS, //关键字模糊查询
 						CORPINFO_ID:loginUser.CORPINFO_ID,
 						USER_ID:loginUser.USER_ID,
diff --git a/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue b/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
index d2579dc..c7e4af1 100644
--- a/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
+++ b/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
@@ -256,6 +256,7 @@
                 this.uploadImgFaults(files,signtime)
                 formData.APPLY_STATUS = APPLY_STATUS
                 formData.HOTWORK_ID = _this.pd.HOTWORK_ID
+                formData.DESCR = _this.pd.DESCR
                 formData.SIGNTIME = signtime.join(",")
                 formData.USER_ID = loginUser.USER_ID
                 formData.MEASURES = JSON.stringify(this.measuresList)
diff --git a/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue b/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue
index 8868a2d..c20232b 100644
--- a/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue
+++ b/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue
@@ -2,12 +2,21 @@
 	<view >
 		<cu-custom bgColor="bg-gradual-blueness" :isBack="true" >
 			<block slot="backText">返回</block>
-			<block slot="content">完工验收</block>
+			<block slot="content">作业开始时间选择</block>
 		</cu-custom>
 		<scroll-view scroll-y="false" >
 		<view class="form">
 			<detail v-if="pd.HOTWORK_ID" :hotworkId="pd.HOTWORK_ID"></detail>
 			<view class="wui-form-list">
+				<view style="border-bottom: 1px dashed #eee;">
+					<view class="cu-form-group">
+						<view class="title">作业开始时间</view>
+						<ruiDatePicker fields="minute"
+									   :value="pd.WORK_START_DATE?pd.WORK_START_DATE:''"
+									   @change="changeStartDate"
+						></ruiDatePicker>
+					</view>
+				</view>
 				<view class="wui-sign">
 					<view class="title">填写作业开始时间负责人</view>
 					<button class="cu-btn bg-green shadow" @tap="showModal" data-target="Modal">手写签字</button>