reactor:自贡手机号非必填;

src/views/business/order/copy-index.vue

@@ -385,7 +385,7 @@ const columns = ref<any[]>([
 		},
 	},
 	{ prop: 'currentStepName', label: '当前节点', minWidth: 120 },
-	{ prop: 'currentStepAcceptText', label: '受理情况' },
+	{ prop: 'actualStepAcceptText', label: '受理情况' },
 	{ prop: 'statusText', label: '工单状态', minWidth: 100 },
 	{ prop: 'title', label: '工单标题', minWidth: 200 },
 	{

src/views/business/order/index.vue

@@ -557,7 +557,7 @@ const columns = ref<any[]>([
 		},
 	},
 	{ prop: 'currentStepName', label: '当前节点', minWidth: 120 },
-	{ prop: 'currentStepAcceptText', label: '受理情况' },
+	{ prop: 'actualStepAcceptText', label: '受理情况' },
 	{ prop: 'statusText', label: '工单状态', minWidth: 100 },
 	{ prop: 'title', label: '工单标题', minWidth: 200 },
 	{
@@ -622,7 +622,7 @@ const columns1 = ref<any[]>([
 		},
 	},
 	{ prop: 'currentStepName', label: '当前节点', minWidth: 120 },
-	{ prop: 'currentStepAcceptText', label: '受理情况' },
+	{ prop: 'actualStepAcceptText', label: '受理情况' },
 	{ prop: 'statusText', label: '工单状态', minWidth: 100 },
 	{ prop: 'title', label: '工单标题', minWidth: 200 },
 	{

src/views/dataShare/orderNoCallLog.vue

@@ -69,7 +69,6 @@ const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
 	{ type: 'selection', width: 40, align: 'center' },
-	{ prop: 'orderNo', label: '工单编号', align: 'center',minWidth: 140 },
 	{ prop: 'title', label: '工单标题', align: 'center'  ,minWidth: 200},
 	{ prop: 'provinceNo', label: '省本地编码', align: 'center' ,minWidth: 220},
 	{

src/views/system/user/components/User-add.vue

@@ -16,7 +16,7 @@
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="手机号" prop="phoneNo" :rules="[{ required: true, message: '请填写手机号', trigger: 'blur' }]">
+					<el-form-item label="手机号" prop="phoneNo" :rules="[{ required: isPhoneRequired, message: '请填写手机号', trigger: 'blur' }]">
 						<el-input v-model="state.ruleForm.phoneNo" placeholder="请填写手机号" clearable></el-input>
 					</el-form-item>
 				</el-col>
@@ -132,10 +132,12 @@
 </template>
 
 <script setup lang="ts" name="systemUserAdd">
-import { reactive, ref } from 'vue';
+import { computed, reactive, ref } from 'vue';
 import { ElMessage, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
 import { addUser } from '@/api/system/user';
+import { useThemeConfig } from '@/stores/themeConfig';
+import { storeToRefs } from 'pinia';
 
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList']);
@@ -192,6 +194,12 @@ const ruleFormRef = ref<RefType>();
 const openDialog = () => {
 	state.dialogVisible = true;
 };
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+// 判断用户是否必填 自贡非必填 其他必填
+const isPhoneRequired = computed(()=>{
+	return ['YiBin','LuZhou'].includes(themeConfig.value.appScope)
+})
 // 关闭弹窗
 const closeDialog = () => {
 	state.dialogVisible = false;

src/views/system/user/components/User-edit.vue

@@ -18,7 +18,7 @@
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="手机号" prop="phoneNo" :rules="[{ required: true, message: '请填写手机号', trigger: 'blur' }]">
+					<el-form-item label="手机号" prop="phoneNo" :rules="[{ required: isPhoneRequired, message: '请填写手机号', trigger: 'blur' }]">
 						<el-input v-model="state.ruleForm.phoneNo" placeholder="请填写手机号" clearable></el-input>
 					</el-form-item>
 				</el-col>
@@ -136,12 +136,14 @@
 </template>
 
 <script setup lang="ts" name="systemUserEdit">
-import { reactive, ref } from 'vue';
+import { computed, reactive, ref } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { ElMessage } from 'element-plus';
 import { throttle } from '@/utils/tools';
 import { updateUser } from '@/api/system/user';
 import other from '@/utils/other';
+import { useThemeConfig } from '@/stores/themeConfig';
+import { storeToRefs } from 'pinia';
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList']);
 const props = defineProps<{
@@ -203,6 +205,12 @@ const openDialog = (row: any) => {
 	state.ruleForm.defaultTelNo = state.ruleForm.defaultTelNo === '' ? null : state.ruleForm.defaultTelNo;
 	state.dialogVisible = true;
 };
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+// 判断用户是否必填 自贡非必填 其他必填
+const isPhoneRequired = computed(()=>{
+	return ['YiBin','LuZhou'].includes(themeConfig.value.appScope)
+})
 // 关闭弹窗
 const closeDialog = () => {
 	state.dialogVisible = false;