Merge branch 'release' into dev

src/api/snapshot/reAudit.ts

@@ -67,7 +67,7 @@ export const citizenRedEnvelopeApproval = (data: object) => {
 		method: 'put',
 		data,
 	});
-}
+};
 /**
  * @description 获取红包审批特提信息
  * @param {string} id
@@ -77,7 +77,7 @@ export const getCitizenRedEnvelopeApprovalSpecialInfo = (id?: string) => {
 		url: `/api/v1/RedPack/audit/back/${id}`,
 		method: 'get',
 	});
-}
+};
 /**
  * @description 添加备注页面基础信息
  * @param {object} params
@@ -88,7 +88,7 @@ export const getCitizenRedEnvelopeApprovalRemarkBaseInfo = (params?: object) =>
 		method: 'get',
 		params,
 	});
-}
+};
 /**
  * @description 添加备注
  * @param {object} data
@@ -99,18 +99,17 @@ export const citizenRedEnvelopeApprovalRemark = (data: object) => {
 		method: 'put',
 		data,
 	});
-}
+};
 /**
  * @description 添加补充发放信息基础信息
- * @param {object} params
+ * @param {object} id
  */
-export const getCitizenRedEnvelopeApprovalAdditionalBaseInfo = (params?: object) => {
+export const getCitizenRedEnvelopeApprovalAdditionalBaseInfo = (id?: string) => {
 	return request({
-		url: `/api/v1/RedPack/record/basedata`,
+		url: `/api/v1/RedPack/record/basedata/${id}`,
 		method: 'get',
-		params,
 	});
-}
+};
 /**
  * @description 添加补充发放信息
  * @param {object} data
@@ -121,7 +120,7 @@ export const citizenRedEnvelopeApprovalAdditional = (data: object) => {
 		method: 'put',
 		data,
 	});
-}
+};
 /**
  * @description 获取网格员红包审批列表
  * @param {object} params
@@ -132,7 +131,7 @@ export const getGridRedEnvelopeApprovalList = (params?: object) => {
 		method: 'get',
 		params,
 	});
-}
+};
 /**
  * @description 获取网格员红包审批详情
  * @param {object} id
@@ -142,7 +141,7 @@ export const getGridRedEnvelopeApprovalDetail = (id?: string) => {
 		url: `/api/v1/RedPack/audit/guider/${id}`,
 		method: 'get',
 	});
-}
+};
 /**
  * @description 网格员红包审批或者拒绝
  * @param {object} data
@@ -153,4 +152,4 @@ export const gridRedEnvelopeApproval = (data: object) => {
 		method: 'put',
 		data,
 	});
-}
+};

src/components/ProcessAudit/ZGSSPProcess.vue

@@ -21,7 +21,7 @@
 		<el-form :model="state.ruleForm" label-width="110px" ref="ruleFormRef" v-loading="state.loading">
 			<slot name="header"></slot>
 			<el-row :gutter="10">
-<!--				<el-col>
+				<!--				<el-col>
 					<el-form-item label="当前选择的流程">
 						{{ seatTopaidan ? '话务部到派单组' : '' }}
 						{{ seatToOrgOne ? '话务部到一级部门' : '' }}
@@ -158,8 +158,8 @@
 										</el-form-item>
 									</el-col>
 									<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
-										<el-form-item prop="awardOpenBack" label-width="0" :rules="[{ required: false, message: '奖励人开户行', trigger: 'blur' }]">
-											<el-input v-model="state.ruleForm.awardOpenBack" placeholder="奖励人开户行" clearable />
+										<el-form-item prop="awardOpenBank" label-width="0" :rules="[{ required: false, message: '奖励人开户行', trigger: 'blur' }]">
+											<el-input v-model="state.ruleForm.awardOpenBank" placeholder="奖励人开户行" clearable />
 										</el-form-item>
 									</el-col>
 									<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
@@ -551,17 +551,38 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="24">
-							<el-form-item label="其他原因" prop="otherRemark" :rules="[{ required: false, message: '请填写其他原因', trigger: 'blur' }]">
+							<el-form-item
+								label="其他原因"
+								prop="otherRemark"
+								:rules="[
+									{ required: state.ruleForm.checkedCities.includes('2'), message: '请填写其他原因', trigger: 'blur' },
+									{ required: true, pattern: '[^ \x20]+', trigger: 'blur', message: '其他原因不能为空' },
+								]"
+							>
 								<el-input v-model="state.ruleForm.otherRemark" placeholder="请填写其他原因"> </el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="8" :md="8" :lg="8">
-							<el-form-item prop="realHandlerName" :rules="[{ required: true, message: '请填写经办人姓名', trigger: 'blur' }]">
+							<el-form-item
+								prop="realHandlerName"
+								:rules="[
+									{ required: true, message: '请填写经办人姓名', trigger: 'blur' },
+									{ required: true, pattern: '[^ \x20]+', trigger: 'blur', message: '经办人姓名不能为空' },
+								]"
+							>
 								<el-input v-model="state.ruleForm.realHandlerName" placeholder="经办人姓名" autocomplete="on"> </el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
-							<el-form-item prop="realHandlerPhone" label-width="0" :rules="[{ required: true, message: '请填写经办人电话', trigger: 'blur' }]">
+							<el-form-item
+								prop="realHandlerPhone"
+								label-width="0"
+								:rules="[
+									{ required: true, message: '请填写经办人电话', trigger: 'blur' },
+									{ required: true, pattern: '[^ \x20]+', trigger: 'blur', message: '经办人电话不能为空' },
+									{ required: true, pattern: /^(?:(?:\+|00)86)?1\d{10}$/, trigger: 'blur', message: '经办人电话格式错误' },
+								]"
+							>
 								<el-input v-model="state.ruleForm.realHandlerPhone" placeholder="经办人电话" autocomplete="on"> </el-input>
 							</el-form-item>
 						</el-col>
@@ -724,6 +745,7 @@ const state = reactive<any>({
 		orderAssignMode: 0, // 派单类型默认逐级
 		copyToHandlers: [], // 抄送对象
 		isDirect: true, // 是否直派 默认是
+		checkedCities: [],
 	},
 	nextStepOptions: [], // 下一节点
 	handlerOptions: [], // 办理对象
@@ -1541,7 +1563,7 @@ const handleIsAward = (val: any) => {
 		state.ruleForm.awardName = null;
 		state.ruleForm.awardBankCardNo = null;
 		state.ruleForm.awardAmount = null;
-		state.ruleForm.awardOpenBack = null;
+		state.ruleForm.awardOpenBank = null;
 	}
 };
 // 打开文件
@@ -1555,6 +1577,13 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.validate((valid: boolean) => {
 		if (!valid) return;
+   /* if (orgAQYH.value || orgDQH.value) {
+      // 附件必填的情况
+      if (!handleFiles.value.length) {
+        ElMessage.error('附件必填');
+        return;
+      }
+    }*/
 		state.loading = true;
 		let submitObj = other.deepClone(state.ruleForm);
 		if (!flowDirection.value) {
@@ -1620,6 +1649,7 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 		if (state.ruleForm.orderAssignMode === 2) {
 			// 主协办
 		}
+
 		// ,secondaryOrgs:secondaryOrgs.value,copys:copys.value
 		switch (state.processType) {
 			case '工单受理':

src/views/snapshot/reAudit/components/Re-audit.vue

@@ -137,15 +137,15 @@ const openDialog = async (row: any, type?: string) => {
 	state.orderId = row.orderId;
 	try {
 		if (type) {
-			// 市民红包审核
-			const { result } = await getCitizenRedEnvelopeApprovalDetail(row.orderId);
+			// 网格员
+			const { result } = await getGridRedEnvelopeApprovalDetail(row.orderId);
 			auditComBox.value = result.auditComBox ?? [];
 			state.infoForm = result;
 			state.ruleForm.redPackAuditId = row.id;
 			loading.value = false;
 		} else {
-			// 网格员
-			const { result } = await getGridRedEnvelopeApprovalDetail(row.orderId);
+			// 市民红包审核
+			const { result } = await getCitizenRedEnvelopeApprovalDetail(row.orderId);
 			auditComBox.value = result.auditComBox ?? [];
 			state.infoForm = result;
 			state.ruleForm.redPackAuditId = row.id;

src/views/snapshot/reAudit/components/Re-supply.vue

@@ -95,16 +95,20 @@ let loading = ref<boolean>(false); // 加载状态
 // 打开弹窗
 const ruleFormRef = ref<RefType>();
 const openDialog = (row: any) => {
-	getBaseData();
+	getBaseData(row.orderId);
 	state.ruleForm.replenishTime = new Date().toISOString();
 	state.auditObj = row;
 	state.dialogVisible = true;
 };
 // 获取基础数据
 const replenishTypeOptions = ref<EmptyArrayType>([]);
-const getBaseData = async () => {
+const getBaseData = async (id:string) => {
 	try {
-		const { result } = await getCitizenRedEnvelopeApprovalAdditionalBaseInfo();
+		const { result } = await getCitizenRedEnvelopeApprovalAdditionalBaseInfo(id);
+    state.ruleForm.amount = result.amount ?? 0;
+    state.ruleForm.bankCardNo = result.bankCardNo ?? 0;
+    state.ruleForm.name = result.name;
+    state.ruleForm.openBank = result.openBank;
 		replenishTypeOptions.value = result.replenishType;
 	} catch (e) {
 		console.log(e);

src/views/statistics/department/satisfied.vue

@@ -80,8 +80,8 @@
 							<span v-else>{{ scope.row.orgName }}</span>
 						</template>
 					</vxe-column>
+          <vxe-column field="totalSumCount" title="小计" min-width="90" fixed="left"> </vxe-column>
 					<vxe-column field="orgTypeText" title="部门类别" min-width="100" fixed="left"> </vxe-column>
-					<vxe-column field="totalSumCount" title="小计" min-width="90" fixed="left"> </vxe-column>
 					<vxe-column field="totalSumRateText" title="总满意率" min-width="120"> </vxe-column>
 					<vxe-column field="verySatisfiedCount" title="非常满意"  min-width="100">
 						<template #default="scope">