Merge branch 'main' of http://121.41.2.71:3000/ykx/jy-safe-app

pages/apply/subPages/SE/1trainNotifyEdit.vue

@@ -54,10 +54,10 @@
 							inputAlign="right" customStyle="margin:0px;display:flex;padding:3px 0px">
 						</u--input>
 					</u-form-item> -->
-					<u-form-item v-if="isAdd==1" label="是否触发培训通知：" prop="ISSENDNOTICE" borderBottom>
+				<!-- 	<u-form-item v-if="isAdd==1" label="是否触发培训通知：" prop="ISSENDNOTICE" borderBottom>
 						<u-switch v-model="model.ISSENDNOTICE" @change="changeSwitch($event,'ISSENDNOTICE')"
 							border="none" slot="right" inputAlign="right"></u-switch>
-					</u-form-item>
+					</u-form-item> -->
 					<u-form-item required label="培训地点" prop="TRAIN_ADDR" borderBottom>
 						<u--input v-model="model.TRAIN_ADDR" border="none" slot="right" inputAlign="right"
 							fontSize="14px" placeholder="请填写培训地点"></u--input>

pages/apply/subPages/SK/riskRectifyEditNew.vue

@@ -121,6 +121,10 @@
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_RectifyDetailFiles" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
+									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.REMARK" placeholder="请填写备注" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 								</view>
 
 

pages/apply/subPages/SK/riskRectifyRecordEditNew.vue

@@ -98,6 +98,10 @@
 							</u--input>
 						</u-form-item>
 					</view>
+					<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+						<u--input v-model="item.REMARK" placeholder="请填写备注" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+						</u--input>
+					</u-form-item>
 
 				</u--form>
 

pages/apply/subPages/SK/riskRectifyRecordShow.vue

@@ -98,6 +98,10 @@
 					<u-form-item label="验收意见:">
 						<u--input v-model="model.ACCEPT_OPINION" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 						</u--input>
+					</u-form-item>
+					<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+						<u--input v-model="item.REMARK" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+						</u--input>
 					</u-form-item>
 				</u--form>
 			</view>

pages/apply/subPages/SK/riskRectifyShow.vue

@@ -104,6 +104,10 @@
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_RectifyDetailFiles" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
+									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.REMARK" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 								</view>
 
 

pages/apply/subPages/SK/riskReportEditNew.vue

@@ -124,6 +124,10 @@
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_ReportDetailFiles" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
+									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.REMARK" placeholder="请填写备注" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 								</view>
 
 

pages/apply/subPages/SK/riskReportShow.vue

@@ -101,6 +101,10 @@
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_ReportDetailFiles" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
+									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.REMARK" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 								</view>
 							</uni-collapse-item>
 						</view>

pages/apply/subPages/SK/riskVerifyEditNew.vue

@@ -106,7 +106,10 @@
 					</u-form-item>
 					<view class="upload-title">附件：</view>
 					<full-upload v-model="model.Nav_Files" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
-
+<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.REMARK" placeholder="请填写备注" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 				</u--form>
 			</view>
 			<view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button">

pages/apply/subPages/SK/riskVerifyShow.vue

@@ -96,7 +96,10 @@
 
 						<view class="upload-title">附件：</view>
 						<full-upload v-model="model.Nav_Files" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
-
+<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.REMARK" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 					</u--form>
 				</u--form>
 			</view>

pages/apply/subPages/SK/safeCheckRecordEditNew.vue

@@ -131,6 +131,10 @@
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_CheckRecordDetailFiles" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
+									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.REMARK" placeholder="请填写备注" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 								</view>
 
 

pages/apply/subPages/SK/safeCheckRecordShow.vue

@@ -105,6 +105,10 @@
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_CheckRecordDetailFiles" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
+									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.REMARK" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 								</view>
 							</uni-collapse-item>
 						</view>

pages/apply/subPages/SK/safeCheckRecordSummaryEditNew.vue

@@ -130,6 +130,10 @@
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_CheckRecordDetailFiles" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
+									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.REMARK" placeholder="请填写备注" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 								</view>
 
 

pages/apply/subPages/SK/safeCheckRecordSummaryShow.vue

@@ -106,6 +106,10 @@
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_CheckRecordDetailFiles" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
+									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.REMARK" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 								</view>
 							</uni-collapse-item>
 						</view>