检查登记添加备注

检查登记 审批 对于有问题的 添加图标
隐患上报 选验收人 解除限制

pages/apply/subPages/BS/riskSumbit.vue

@@ -97,8 +97,8 @@
 									</u-form-item> -->
 
 									<u-form-item label="备注" prop="REMARK" borderBottom>
-										<u--input disabled disabledColor="#fff" placeholder='备注'  border="none" v-model="item.REMARK"
+										<u--input disabled disabledColor="#fff" placeholder='备注' border="none"
-											inputAlign="right"></u--input>
+											v-model="item.REMARK" inputAlign="right"></u--input>
 									</u-form-item>
 									<view class="upload-title">附件</view>
 									<full-upload v-model="item.Nav_Files" :isShowBtn='true'
@@ -202,6 +202,7 @@
 
 	import {
 		OrderPagedUseful2,
+		OrderPagedUser,
 		GetDpartMentNameHeader
 	} from '../../../../services/common'
 
@@ -581,7 +582,17 @@
 				if (val) {
 					extendRule(json, 'NAME', 9, val);
 				}
-				if (this.selectorInfo.name == 'user' || this.selectorInfo.name == 'userDetailer') {
+				if (this.selectorInfo.name == 'user') {
+					OrderPagedUser(json).then(res => {
+						this.selectorInfo.dataLists = res.map(i => {
+							return {
+								...i,
+								name: i.NAME,
+								code: i.CODE
+							}
+						})
+					})
+				} else if (this.selectorInfo.name == 'userDetailer') {
 					OrderPagedUseful2(json).then(res => {
 						if (res.IsSuccessful) {
 							this.selectorInfo.dataLists = res.Data.map(i => {
@@ -631,7 +642,8 @@
 							//CHECK_DETAIL_ID => RISK_SUBMIT_CONTENT_ID
 							listReason.push({
 								ID: guid(),
-								RISK_SUBMIT_CONTENT_ID: this.model.Nav_ListRiskSubmitContent[this.selectorInfo
+								RISK_SUBMIT_CONTENT_ID: this.model.Nav_ListRiskSubmitContent[this
+									.selectorInfo
 									.index].ID,
 								RISK_REASON_ID: item.ID,
 								ORG_ID: item.ORG_ID,

pages/apply/subPages/BS/safeCheckAudit.vue

@@ -64,7 +64,9 @@
 						<uni-collapse :border="false" accordion>
 							<uni-card style="margin-bottom: 16px;" margin="0" spacing="0" :is-shadow="false"
 								v-for="(item, index) in model.Nav_ListSafeCheckDetail">
-								<uni-collapse-item :title="index + 1 + '. ' + item.CHECKCONTENT">
+								<uni-collapse-item :thumb='item.QUESTION_LEVEL==null||item.QUESTION_LEVEL==0 ?null:"../../../../static/warm.png"'
+									:title="index + 1 + '. ' + item.CHECKCONTENT">
+									<!-- :style="item.QUESTION_LEVEL==null||item.QUESTION_LEVEL==0 ?'background-color: white':'background-color:pink'" -->
 									<u-form-item label="检查项目" prop="Nav_CheckProject.NAME" borderBottom>
 										<u--input disabled disabledColor="#fff" v-model="item.Nav_CheckProject.NAME"
 											border="none" inputAlign="right"></u--input>
@@ -109,8 +111,8 @@
 											inputAlign="right"></u--input>
 									</u-form-item>
 									<u-form-item label="备注" prop="REMARK" borderBottom>
-										<u--input disabled disabledColor="#fff" placeholder='备注'  border="none" v-model="item.REMARK"
+										<u--input disabled disabledColor="#fff" placeholder='备注' border="none"
-											inputAlign="right"></u--input>
+											v-model="item.REMARK" inputAlign="right"></u--input>
 									</u-form-item>
 									<view class="upload-title">附件</view>
 									<full-upload :value="item.Nav_Files" :isShowBtn='false'></full-upload>

pages/apply/subPages/BS/safeCheckSign.vue

@@ -151,6 +151,10 @@
 										<u--input disabledColor="#fff" v-model="item.listCheckDetailReason"
 											border="none" inputAlign="right"></u--input>
 									</u-form-item>
+									<u-form-item label="备注" prop="REMARK" borderBottom>
+										<u--input disabledColor="#fff" placeholder='备注' v-model="item.REMARK"
+											inputAlign="right"></u--input>
+									</u-form-item>
 									<view class="upload-title">附件</view>
 									<full-upload v-model="item.Nav_Files" :isShowBtn=item.ISAUTOLOAD
 										:listProp='listPropSubUpload'

services/common.js

@@ -74,6 +74,18 @@ export function OrderPagedUseful2(params) {
 	})
 }
 
+//未删除 不包含 admin
+export function OrderPagedUser(params) {
+	return new Promise((resolve, reject) => {
+		request.post("/FM/User/OrderPaged", params).then((result) => {
+			if (result.IsSuccessful) {
+				resolve(result.Data);
+			}
+		}).catch((error) => {
+			reject(error);
+		})
+	})
+}
 
 //下拉选择隐患上报  整改实施单位
 export function GetDpartMentNameHeader(params) {