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

pages/apply/subPages/FO/2currentClassRecordEdit.vue

@@ -7,6 +7,11 @@
 				<u-form-item label="审核意见：" prop="AUDIT_OPINION" borderBottom v-if="model.SHIFT_STATUS==9">
 				</u-form-item>
 				<u--textarea v-html="model.AUDIT_OPINION" border="surround" v-if="model.SHIFT_STATUS==9" disabled></u--textarea>
+				<u-form-item required label="班次：" prop="Nav_Class.NAME" @click="handleChangeMonitor('Nav_Class')" borderBottom>
+					<u--input disabledColor="#fff" v-model="model.Nav_Class.NAME" disabled placeholder="请选择班次" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px"
+						customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
+					</u--input>
+				</u-form-item>
 				<u-form-item label="本班运行情况：" prop="CURRENT_CLASS_STATUS_SHOW" @click="handleShowSheet({title: '运行情况', name: 'CURRENT_CLASS_STATUS'})">
 					<u--input :value="CURRENT_CLASS_STATUS_SHOW" disabled disabledColor="#fff" placeholder="请选择本班运行情况" border="none" inputAlign="right" fontSize="14px"></u--input>
 					<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"></u-icon>
@@ -92,6 +97,8 @@
 			<u-button type="primary" :disabled="isSubmit" :loading="isSubmit" @click="submit" v-if='tableKey==1||isAdd==1' color="#3d4b70">提交</u-button>
 		</view>
 		<query-selector :show="showPopup" :total="curTotal" :lists="userLists" :defaultValue="currentOperateUser.NAME" @close="handleClosePopup" @search="handleSearchUser" @select="handleSelectedUser" />
+		<query-selector :show="showPopupMonitor" :total="curTotalMonitor" :lists="monitorLists" :defaultValue="currentOperateMonitor.NAME" @close="handleClosePopupMonitor" @search="handleSearchMonitor"
+			@select="handleSelectedMonitor" />
 		<u-modal :show="showDelModalIndexPerson >= 0" @confirm="confirmDelPerson" @cancel="cancelDelPerson" showCancelButton title="确认删除？"></u-modal>
 	</view>
 </template>
@@ -113,7 +120,8 @@
 		transformData
 	} from '../../../../utils/common'
 	import {
-		getRequest,
+		getRequest,
+		getClassLists,
 	} from '../../../../services/apply/FOServices/FOServices';
 	import config from '../../../../config/common'
 	import {
@@ -136,7 +144,10 @@
 					SUPPLIES_USED: 1,
 					ORG_ID: "",
 					ENABLE_STATUS: 0,
-					IS_HANDOVER: true,
+					IS_HANDOVER: true,
+					Nav_Class: {
+						NAME: ''
+					},
 				},
 				subModel: {
 					Nav_User: {},
@@ -147,6 +158,11 @@
 						type: 'string',
 						required: true,
 						trigger: ['blur', 'change']
+					},
+					'Nav_Class.NAME': {
+						type: 'string',
+						required: true,
+						trigger: ['blur', 'change']
 					},
 					'CURRENT_CLASS_MEASURE': {
 						type: 'string',
@@ -215,7 +231,11 @@
 				currentOperateUser: {},
 				showPopup: false,
 				userLists: [],
-				curTotal: 0,
+				curTotal: 0,
+				monitorLists: [],
+				currentOperateMonitor: {},
+				curTotalMonitor: 0,
+				showPopupMonitor: false,
 				showDelModalIndexPerson: undefined,
 				enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表）
 				enumsText: {} // 存储枚举文本列表（用于下拉选择等场景）
@@ -297,6 +317,53 @@
 
 					this.model.UserNames = strUserName;
 				})
+			},
+			handleChangeMonitor(name) {
+				this.currentOperateMonitor = name
+				this.showPopupMonitor = true
+				this.handleSearchMonitor('init')
+			},
+			handleSearchMonitor(val, pageIndex) {
+				const orgId = uni.getStorageSync('orgId')
+				const json = initFilter(orgId, "", "NAME", '', pageIndex)
+			
+				if (val !== 'init') {
+					const tempGroup = initFilterGroup(false);
+					extendGroupRule(tempGroup, 'NAME', 9, val)
+					extendFilterGroup(json, tempGroup);
+				}
+				json.Limit = 20
+				if (pageIndex) {
+					json.Start = (pageIndex - 1) * 20;
+				}
+			
+				if (this.currentOperateMonitor == 'Nav_Class') {
+					extendInclude(json, 'Nav_ClassDetail');
+					getClassLists(json).then(res => {
+						if (res.IsSuccessful) {
+							this.monitorLists = res.Data.map(i => {
+								return {
+									...i,
+									name: i.NAME,
+									code: i.CODE
+								}
+							})
+							this.curTotalMonitor = res.TotalCount
+						}
+					})
+				}
+			
+			},
+			handleSelectedMonitor(val) {
+				this.showPopupMonitor = false
+				 if (this.currentOperateMonitor == 'Nav_Class') {
+					this.model.Nav_Class = val
+					this.model.CLASS_ID = val.ID
+				} 
+				this.currentOperateMonitor = val
+			},
+			handleClosePopupMonitor() {
+				this.showPopupMonitor = false
 			},
 			handleSearchUser(val, pageIndex) {
 				const json = initFilter(this.ORG_ID, "", "NAME", '', pageIndex)