reactor:119 补充发放记录优化

src/views/snapshot/config/industry/components/Industry-add.vue

@@ -237,13 +237,31 @@
 			</el-row>
 			<!-- 积分配置 -->
 			<el-row v-show="state.activeName === '2'">
+				<el-col>
+					<el-form-item
+						label="是否启用积分配置"
+						label-width="140px"
+						prop="isPoints"
+						:rules="[{ required: false, message: '请填写上报积分', trigger: 'change' }]"
+					>
+						<el-switch v-model="state.ruleForm.isPoints" inline-prompt active-text="启用" inactive-text="禁用" />
+					</el-form-item>
+				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="上报积分" prop="reportPoints" :rules="[{ required: true, message: '请填写上报积分', trigger: 'blur' }]">
+					<el-form-item
+						label="上报积分"
+						prop="reportPoints"
+						:rules="[{ required: state.ruleForm.isPoints, message: '请填写上报积分', trigger: 'blur' }]"
+					>
 						<el-input-number v-model="state.ruleForm.reportPoints" :min="0" :precision="2" class="w100" placeholder="请填写上报积分" />
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="审核同意积分" prop="argeePoints" :rules="[{ required: true, message: '请填写审核同意积分', trigger: 'blur' }]">
+					<el-form-item
+						label="审核同意积分"
+						prop="argeePoints"
+						:rules="[{ required: state.ruleForm.isPoints, message: '请填写审核同意积分', trigger: 'blur' }]"
+					>
 						<el-input-number v-model="state.ruleForm.argeePoints" :min="0" :precision="2" class="w100" placeholder="请填写审核同意积分" />
 					</el-form-item>
 				</el-col>
@@ -252,13 +270,17 @@
 						label="审核不同意扣除积分"
 						label-width="150px"
 						prop="refusePoints"
-						:rules="[{ required: true, message: '请填写审核不同意扣除积分', trigger: 'blur' }]"
+						:rules="[{ required: state.ruleForm.isPoints, message: '请填写审核不同意扣除积分', trigger: 'blur' }]"
 					>
 						<el-input-number v-model="state.ruleForm.refusePoints" :min="0" :precision="2" class="w100" placeholder="请填写审核不同意扣除积分" />
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="额外扣除积分" prop="extraDeductedPoints" :rules="[{ required: true, message: '请填写额外扣除积分', trigger: 'blur' }]">
+					<el-form-item
+						label="额外扣除积分"
+						prop="extraDeductedPoints"
+						:rules="[{ required: state.ruleForm.isPoints, message: '请填写额外扣除积分', trigger: 'blur' }]"
+					>
 						<el-input-number v-model="state.ruleForm.extraDeductedPoints" :min="0" :precision="2" class="w100" placeholder="请填写额外扣除积分" />
 					</el-form-item>
 				</el-col>
@@ -320,6 +342,7 @@ const state = reactive<any>({
 		argeePoints: null, // 审核同意积分
 		refusePoints: null, // 审核不同意扣除积分
 		extraDeductedPoints: null, // 额外扣除积分
+		isPoints: false, // 是否开启随手拍积分配置
 	},
 	activeName: '0',
 	tabPaneList: [

src/views/snapshot/config/industry/components/Industry-edit.vue

@@ -237,6 +237,16 @@
 			</el-row>
 			<!-- 积分配置 -->
 			<el-row v-show="state.activeName === '2'">
+				<el-col>
+					<el-form-item
+						label="是否启用积分配置"
+						label-width="140px"
+						prop="isPoints"
+						:rules="[{ required: false, message: '请填写上报积分', trigger: 'change' }]"
+					>
+						<el-switch v-model="state.ruleForm.isPoints" inline-prompt active-text="启用" inactive-text="禁用" />
+					</el-form-item>
+				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="上报积分" prop="reportPoints" :rules="[{ required: true, message: '请填写上报积分', trigger: 'blur' }]">
 						<el-input-number v-model="state.ruleForm.reportPoints" :min="0" :precision="2" class="w100" placeholder="请填写上报积分" />
@@ -319,6 +329,7 @@ const state = reactive<any>({
 		argeePoints: null, // 审核同意积分
 		refusePoints: null, // 审核不同意扣除积分
 		extraDeductedPoints: null, // 额外扣除积分
+		isPoints: false, // 是否开启随手拍积分配置
 	},
 	activeName: '0',
 	tabPaneList: [

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

@@ -78,7 +78,8 @@
 				>1.{{ auditType }}红包金额：<el-text tag="b" type="danger">{{ state.infoForm.amount }}</el-text
 				>元；</el-form-item
 			>
-			<template v-if="auditType === '市民'">
+			<!-- 当前审核类型是市民并且是开启了积分审批 -->
+			<template v-if="auditType === '市民' && state.infoForm.isPoints">
 				<p class="border-title mt20 mb10">审批信息<el-text tag="b" type="danger" class="ml5">积分</el-text></p>
 				<el-row>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
@@ -88,39 +89,43 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<!-- 同意 -->
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="[0, 1].includes(state.ruleForm.pointsStatus)">
 						<el-form-item label="积分" prop="points" :rules="[{ required: true, message: '请填写积分', trigger: 'blur' }]">
 							<el-input-number v-model="state.ruleForm.points" :min="0" :precision="2" class="w100" placeholder="请填写积分" disabled />
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item
-							label="额外扣除积分"
-							prop="extraDeductedPoints"
-							:rules="[{ required: false, message: '请填写额外扣除积分', trigger: 'blur' }]"
-						>
-							<el-input-number
-								v-model="state.ruleForm.extraDeductedPoints"
-								:min="0"
-								:precision="2"
-								class="w100"
-								placeholder="请填写额外扣除积分"
-								disabled
-							/>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item
-							label="额外扣除积分类型"
-							prop="extraDeductionPointsTypeId"
-							label-width="140px"
-							:rules="[{ required: state.ruleForm.extraDeductedPoints, message: '请选择额外扣除积分类型', trigger: 'change' }]"
-						>
-							<el-select v-model="state.ruleForm.extraDeductionPointsTypeId" clearable placeholder="请选择额外扣除积分类型" @change="selectType">
-								<el-option v-for="item in extraDeductionPointsType" :label="item.dicDataName" :key="item.dicDataValue" :value="item.dicDataValue" />
-							</el-select>
-						</el-form-item>
-					</el-col>
+					<!-- 不同意 -->
+					<template v-if="state.ruleForm.pointsStatus === 1">
+						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+							<el-form-item
+								label="额外扣除积分"
+								prop="extraDeductedPoints"
+								:rules="[{ required: false, message: '请填写额外扣除积分', trigger: 'blur' }]"
+							>
+								<el-input-number
+									v-model="state.ruleForm.extraDeductedPoints"
+									:min="0"
+									:precision="2"
+									class="w100"
+									placeholder="请填写额外扣除积分"
+									disabled
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+							<el-form-item
+								label="额外扣除积分类型"
+								prop="extraDeductionPointsTypeId"
+								label-width="140px"
+								:rules="[{ required: state.ruleForm.extraDeductedPoints, message: '请选择额外扣除积分类型', trigger: 'change' }]"
+							>
+								<el-select v-model="state.ruleForm.extraDeductionPointsTypeId" clearable placeholder="请选择额外扣除积分类型" @change="selectType">
+									<el-option v-for="item in extraDeductionPointsType" :label="item.dicDataName" :key="item.dicDataValue" :value="item.dicDataValue" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</template>
 				</el-row>
 			</template>
 			<el-form-item label="审批意见" prop="opinion" :rules="[{ required: false, message: '请填写审批意见', trigger: 'blur' }]">
@@ -173,6 +178,7 @@ const state = reactive<any>({
 		extraDeductedPoints: null, // 额外扣除积分
 		extraDeductionPointsTypeId: null, // 额外扣除积分类型
 		extraDeductionPointsTypeName: null, // 额外扣除积分类型名称
+		isPoints: false, // 是否开启了积分配置
 	},
 	orderId: null,
 });
@@ -247,12 +253,12 @@ const selectPointStatus = (val: any) => {
 	} else {
 		state.ruleForm.points = null;
 	}
+	ruleFormRef.value?.resetFields('extraDeductionPointsTypeId');
 };
 // 选择额外扣除积分类型
 const selectType = (val: any) => {
 	const item = extraDeductionPointsType.value.find((item) => item.dicDataValue === val);
 	state.ruleForm.extraDeductionPointsTypeName = item?.dicDataName;
-	console.log(item);
 };
 // 保存
 const onSubmit = throttle(async (formEl: FormInstance | undefined) => {