Merge branch 'master' into dev

# Conflicts:
#	src/views/todo/seats/accept/index.vue

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

@@ -209,69 +209,69 @@
 											state.ruleForm.ageRange = val?.dicDataName ?? null;
 											state.ruleForm.ageRangeCode = val?.dicDataValue ?? null;
 										}"
-										>
-											<el-option v-for="item in state.ageRangeOptions" :key="item.dicDataValue" :label="item.dicDataName" :value="item" />
-										</el-select>
-									</el-form-item>
-								</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 :gutter="9">
-											<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">
-												<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">
-									<el-form-item
-										label="企业名称"
-										prop="enterpriseName"
-										:rules="[{ required: state.ruleForm.identityType === 2, message: '请填写企业名称', trigger: 'blur' }]"
-									>
-										<el-input v-model="state.ruleForm.enterpriseName" placeholder="请填写企业名称" clearable> </el-input>
-									</el-form-item>
-								</el-col>
-								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-									<el-form-item
-										label="专班名称"
-										prop="zhuanBanMingCheng"
-										:rules="[{ required: state.ruleForm.identityType === 2, message: '请填写专班名称', trigger: 'blur' }]"
-									>
-										<el-input v-model="state.ruleForm.zhuanBanMingCheng" placeholder="请填写专班名称" clearable>
-											<template #append>
-												<el-button type="primary" @click="handleSelect"><SvgIcon name="ele-Search" class="mr4" /> 查询企业</el-button>
-											</template>
-										</el-input>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							<p class="border-title mb10">诉求信息</p>
-							<el-row>
-								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" v-if="state.ruleForm.no">
-									<el-form-item label="工单编码">
-										{{ state.ruleForm.no }} <span v-if="state.ruleForm?.password">【{{ state.ruleForm.password }}】</span>
-									</el-form-item>
-								</el-col>
-								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-									<el-form-item label="拓展信息">
-										<el-button @click="showExpandForm" :loading="extraLoading">
-											<SvgIcon name="ele-CirclePlus" class="mr3" size="16px" /> 拓展信息
-										</el-button>
-									</el-form-item>
-								</el-col>
-								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-									<el-form-item label="受理类型" prop="acceptTypeObj" :rules="[{ required: true, message: '请选择受理类型', trigger: 'change' }]">
-										<el-select
-											v-model="state.ruleForm.acceptTypeObj"
-											placeholder="请选择受理类型"
-											class="w100"
-											value-key="dicDataValue"
-											@change="
+                    >
+                      <el-option v-for="item in state.ageRangeOptions" :key="item.dicDataValue" :label="item.dicDataName" :value="item" />
+                    </el-select>
+                  </el-form-item>
+                </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 :gutter="9">
+                      <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">
+                        <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">
+                  <el-form-item
+                    label="企业名称"
+                    prop="enterpriseName"
+                    :rules="[{ required: state.ruleForm.identityType === 2, message: '请填写企业名称', trigger: 'blur' }]"
+                  >
+                    <el-input v-model="state.ruleForm.enterpriseName" placeholder="请填写企业名称" clearable> </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                  <el-form-item
+                    label="专班名称"
+                    prop="zhuanBanMingCheng"
+                    :rules="[{ required: state.ruleForm.identityType === 2, message: '请填写专班名称', trigger: 'blur' }]"
+                  >
+                    <el-input v-model="state.ruleForm.zhuanBanMingCheng" placeholder="请填写专班名称" clearable>
+                      <template #append>
+                        <el-button type="primary" @click="handleSelect"><SvgIcon name="ele-Search" class="mr4" /> 查询企业</el-button>
+                      </template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <p class="border-title mb10">诉求信息</p>
+              <el-row>
+                <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" v-if="state.ruleForm.no">
+                  <el-form-item label="工单编码">
+                    {{ state.ruleForm.no }} <span v-if="state.ruleForm?.password">【{{ state.ruleForm.password }}】</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                  <el-form-item label="拓展信息">
+                    <el-button @click="showExpandForm" :loading="extraLoading">
+                      <SvgIcon name="ele-CirclePlus" class="mr3" size="16px" /> 拓展信息
+                    </el-button>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                  <el-form-item label="受理类型" prop="acceptTypeObj" :rules="[{ required: true, message: '请选择受理类型', trigger: 'change' }]">
+                    <el-select
+                      v-model="state.ruleForm.acceptTypeObj"
+                      placeholder="请选择受理类型"
+                      class="w100"
+                      value-key="dicDataValue"
+                      @change="
 												(val) => {
 													state.ruleForm.acceptType = val?.dicDataName ?? null;
 													state.ruleForm.acceptTypeCode = val?.dicDataValue ?? null;
@@ -1088,13 +1088,10 @@ const chooseAdvice = (item: any) => {
 };
 // 流程提交成功
 const orderProcessSuccess = () => {
-	// 关闭当前 tagsView
-	mittBus.emit('onCurrentContextmenuClick', Object.assign({}, { contextMenuClickId: 1, ...route }));
-	mittBus.emit('clearCache', 'order');
-	mittBus.emit('clearCache', 'todoSeats');
-	mittBus.emit('clearCache', 'todoOrder');
-	mittBus.emit('clearCache', 'todoCenter');
-	router.go(-1);
+  // 关闭当前 tagsView
+  mittBus.emit('onCurrentContextmenuClick', Object.assign({}, { contextMenuClickId: 1, ...route }));
+  mittBus.emit('clearCache', 'order');
+  router.go(-1);
 };
 // 取消
 const onCancel = () => {