reactor:自贡工单受理调整;

src/components/OrderDetail/index.vue

@@ -161,10 +161,11 @@
 							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="state.ruleForm.pushType">
 								<el-form-item label="推送分类"> {{ state.ruleForm.pushType }} </el-form-item>
 							</el-col>
-							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="['ZiGong'].includes(themeConfig.appScope)">
-								<el-form-item label="重点事项类型">
-									<span class="color-danger" v-if="state.ruleForm.isUrgent">紧急；</span>
-									<span class="color-danger" v-if="state.ruleForm.is24HoursComplete">24小时办结</span>
+							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="['ZiGong'].includes(themeConfig.appScope) && state.ruleForm.focusOnEvents">
+								<el-form-item label="重点标签">
+									<span class="color-danger" v-if="state.ruleForm.isUrgent">紧急，</span>
+									<span class="color-danger" v-if="state.ruleForm.is24HoursComplete">24小时办结，</span>
+									<span class="color-danger" v-if="state.ruleForm.isThreePartyConference">三方通话</span>
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="['ZiGong'].includes(themeConfig.appScope) && state.ruleForm.orderTag">

src/views/todo/seats/accept/ybAccept.vue

@@ -269,19 +269,16 @@
 									</el-form-item>
 								</el-col>
 								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-									<el-form-item label="推送分类" prop="pushTypeObj" :rules="[{ required: false, message: '请选择推送分类', trigger: 'change' }]">
+									<el-form-item label="推送分类" prop="orderPushTypes" :rules="[{ required: false, message: '请选择推送分类', trigger: 'change' }]">
 										<el-select
-											v-model="state.ruleForm.pushTypeObj"
+											v-model="state.ruleForm.orderPushTypes"
 											placeholder="请选择推送分类"
 											class="w100"
 											clearable
-											value-key="dicDataValue"
-											@change="(val:any) => {
-											state.ruleForm.pushType = val?.dicDataName ?? null;
-											state.ruleForm.pushTypeCode = val?.dicDataValue ?? null;
-										}"
+											value-key="pushTypeCode"
+											multiple
 										>
-											<el-option v-for="item in state.pushTypeOptions" :key="item.dicDataValue" :label="item.dicDataName" :value="item" />
+											<el-option v-for="item in state.pushTypeOptions" :key="item.pushTypeCode" :label="item.pushType" :value="item" />
 										</el-select>
 									</el-form-item>
 								</el-col>
@@ -629,6 +626,7 @@ const state = reactive<any>({
 		isSensitiveWorkOrders: false, // 是否敏感类工单
 		isUrgent: false, // 是否紧急工单
 		id: null,
+		orderPushTypes:[], // 推送分类多选
 	},
 	formLoading: false, // 表单加载状态
 	hotspotExternal: [], // 热点分类外部数据
@@ -998,7 +996,12 @@ const save = throttle((formEl: FormInstance | undefined) => {
 				.then((res: any) => {
 					buttonLoading.value = false;
 					ElMessage.success('保存成功');
-					if (res.result) state.ruleForm.id = res.result;
+					if (res.result){
+						const { id, no, password} = res.result;
+						state.ruleForm.id = id;
+						state.ruleForm.no = no;
+						state.ruleForm.password = password;
+					}
 					isSaveSuccess.value = true;
 					setTimeout(() => {
 						watchPauseAbleFn.resume();
@@ -1018,9 +1021,10 @@ const save = throttle((formEl: FormInstance | undefined) => {
 // 选择来点人身份如果是企业 推送分类自动选择助企纾困
 const selectIdentity = (val: number) => {
 	if (val === 2) {
-		state.ruleForm.pushTypeObj = state.pushTypeOptions.find((item: any) => item.dicDataValue === '8'); // 助企纾困
-		state.ruleForm.pushType = state.ruleForm.pushTypeObj.dicDataName;
-		state.ruleForm.pushTypeCode = state.ruleForm.pushTypeObj.dicDataValue;
+		const item = state.pushTypeOptions.find((item: any) => item.pushType === '8'); // 助企纾困
+		// 如果已经选择了助企纾困就不添加
+		if (state.ruleForm.orderPushTypes.includes(item)) return;
+		state.ruleForm.orderPushTypes.push(item);
 	}
 };
 // 流程审批
@@ -1168,6 +1172,13 @@ const loadBaseData = async () => {
 		state.licenceTypeOptions = res.result?.licenceTypeOptions ?? [];
 		state.transpondCity = res.result?.transpondCity ?? [];
 		state.focusOnEvents = res.result?.focusOnEvents ?? [];
+		state.pushTypeOptions = state.pushTypeOptions.map((item: any)=>{
+			return{
+				...item,
+				pushTypeCode:item.dicDataValue,
+				pushType:item.dicDataName
+			}
+		})
 	} catch (error) {
 		console.log(error);
 	}
@@ -1279,13 +1290,6 @@ const loadForm = async () => {
 					dicDataName: state.ruleForm.acceptType,
 				};
 			}
-			if (state.ruleForm.pushTypeCode) {
-				state.ruleForm.pushTypeObj = {
-					// 推送分类
-					dicDataValue: state.ruleForm.pushTypeCode,
-					dicDataName: state.ruleForm.pushType,
-				};
-			}
 			if (state.ruleForm.transpondCityValue) {
 				state.ruleForm.transpondCityObj = {
 					// 市州互转

src/views/todo/seats/accept/zgAccept.vue

@@ -148,14 +148,7 @@
 								</el-col>-->
 								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 									<el-form-item label="联系电话" prop="contact" :rules="[{ required: true, message: '请填写联系电话', trigger: 'blur' }]">
-										<el-row class="w100">
-											<el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
 												<el-input v-model="state.ruleForm.contact" placeholder="请填写联系电话" @blur="searchHistory" clearable> </el-input>
-											</el-col>
-											<el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="8" style="text-align: center">
-												<el-checkbox v-model="state.ruleForm.acceptSms" label="受理短信" />
-											</el-col>
-										</el-row>
 									</el-form-item>
 								</el-col>
 <!--								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
@@ -203,24 +196,7 @@
 										</el-select>
 									</el-form-item>
 								</el-col>
-								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-									<el-form-item
-										label="重点关注事件"
-										prop="focusOnEventsArr"
-										:rules="[{ required: false, message: '请选择重点关注事件', trigger: 'change' }]"
-									>
-										<el-select
-											v-model="state.ruleForm.focusOnEventsArr"
-											placeholder="请选择重点关注事件"
-											class="w100"
-											multiple
-											@change="changeFocusEvent"
-										>
-											<el-option v-for="item in state.focusOnEvents" :key="item.dicDataValue" :label="item.dicDataName" :value="item.dicDataValue" />
-										</el-select>
-									</el-form-item>
-								</el-col>
-<!--								<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+								<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 									<el-form-item
 										label="重点标签"
 										prop="focusOnEventsArr"
@@ -230,7 +206,7 @@
 											<el-checkbox :label="item.dicDataName" :value="item.dicDataValue"  v-for="item in state.focusOnEvents" :key="item.dicDataValue"/>
 										</el-checkbox-group>
 									</el-form-item>
-								</el-col>-->
+								</el-col>
 								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 									<el-form-item label="推送分类" prop="orderPushTypes" :rules="[{ required: false, message: '请选择推送分类', trigger: 'change' }]">
 										<el-select
@@ -238,10 +214,10 @@
 											placeholder="请选择推送分类"
 											class="w100"
 											clearable
-											value-key="dicDataValue"
-											@change="selectPushType"
+											value-key="pushTypeCode"
+											multiple
 										>
-											<el-option v-for="item in state.pushTypeOptions" :key="item.dicDataValue" :label="item.dicDataName" :value="item" />
+											<el-option v-for="item in state.pushTypeOptions" :key="item.pushTypeCode" :label="item.pushType" :value="item" />
 										</el-select>
 									</el-form-item>
 								</el-col>
@@ -564,6 +540,8 @@ const state = reactive<any>({
 		isFormalistWorkOrder: false, // 是否形式主义工单
 		isSensitiveWorkOrders: false, // 是否敏感类工单
 		isUrgent: false, // 是否紧急工单
+		isThreePartyConference: false, // 是否三方同v话
+		is24HoursComplete: false, // 24小时紧急工单
 		company: null, // 工作单位
 		orderPushTypes:[], // 推送分类多选
 	},
@@ -579,7 +557,6 @@ const state = reactive<any>({
 	pushTypeOptions: [], //推送分类
 	areaOptions: [], //省市区
 	orderTags: [], // 工单标签
-	is24HoursComplete: false, // 24小时紧急工单
 	transpondCity: [],
 	repeatOptions: [
 		//是否重复
@@ -834,11 +811,13 @@ const changeFocusEvent = (val: string[]) => {
 	state.ruleForm.isSensitiveWorkOrders = val.includes('3'); // 是否敏感类工单
 	state.ruleForm.isEnforcementOrder = val.includes('2'); // 是否行政执法类工单
 	state.ruleForm.is24HoursComplete = val.includes('4'); // 24小时紧急工单
+	state.ruleForm.acceptSms = val.includes('5'); // 受理短信
+	state.ruleForm.isThreePartyConference = val.includes('6'); // 三方通话
 	state.ruleForm.focusOnEvents = val.join(',');
 	console.log(
 		`是否紧急工单:${val.includes('0')},是否行政执法类类工单:${val.includes('2')},是否形式主义工单:${val.includes('1')},是否敏感类工单:${val.includes(
 			'3'
-		)},是否24小时紧急工单:${val.includes('4')}`
+		)},是否24小时紧急工单:${val.includes('4')},是否受理短信:${val.includes('5')},是否三方通话:${val.includes('6')}`
 	);
 };
 // 删除不必要的属性
@@ -884,7 +863,12 @@ const save = throttle((formEl: FormInstance | undefined) => {
 				.then((res: any) => {
 					buttonLoading.value = false;
 					ElMessage.success('保存成功');
-					if (res.result) state.ruleForm.id = res.result;
+					if (res.result){
+						const { id, no, password} = res.result;
+						state.ruleForm.id = id;
+						state.ruleForm.no = no;
+						state.ruleForm.password = password;
+					}
 					isSaveSuccess.value = true;
 					setTimeout(() => {
 						watchPauseAbleFn.resume();
@@ -901,17 +885,13 @@ const save = throttle((formEl: FormInstance | undefined) => {
 		}
 	});
 }, 300);
-// 选择推送分类
-const selectPushType = (val: any) => {
-	// state.ruleForm.pushTypeObj = val;
-	console.log(val,'1111')
-};
 // 选择来点人身份如果是企业 推送分类自动选择助企纾困
 const selectIdentity = (val: number) => {
 	if (val === 2) {
-		state.ruleForm.pushTypeObj = state.pushTypeOptions.find((item: any) => item.dicDataValue === '8'); // 助企纾困
-		state.ruleForm.pushType = state.ruleForm.pushTypeObj.dicDataName;
-		state.ruleForm.pushTypeCode = state.ruleForm.pushTypeObj.dicDataValue;
+		const item = state.pushTypeOptions.find((item: any) => item.pushTypeCode === '8'); // 助企纾困
+		// 如果已经选择了助企纾困就不添加
+		if (state.ruleForm.orderPushTypes.includes(item)) return;
+		state.ruleForm.orderPushTypes.push(item);
 	}
 };
 // 是否可以办理(如果有流程id 并且当前账号可以办理 则可以办理 没有流程ID都可以办理)
@@ -1049,6 +1029,13 @@ const loadBaseData = async () => {
 		state.transpondCity = result?.transpondCity ?? [];
 		state.focusOnEvents = result?.focusOnEvents ?? [];
 		state.orderTags = result?.orderTags ?? [];
+		state.pushTypeOptions = state.pushTypeOptions.map((item: any)=>{
+			return{
+				...item,
+				pushTypeCode:item.dicDataValue,
+				pushType:item.dicDataName
+			}
+		})
 	} catch (error) {
 		console.log(error);
 	}