一单n制等功能,接入随手拍之前我先提交一版本

This commit is contained in:
王利强
2026-08-12 14:43:53 +08:00
parent ec76d588e2
commit 47deeedb22
664 changed files with 1429 additions and 2894 deletions

View File

@@ -209,30 +209,45 @@
></canvas>
<view class="form-label margin-bottom margin-top">
<view class="text-gray">下一步流程</view>
<view class="text-gray">是否结束隐患整改</view>
<view class="text-red">*</view>
</view>
<view class="static-field">{{ nextStepDisplay }}</view>
<view class="form-label margin-bottom margin-top">
<view class="text-gray">下一步处理人</view>
<view class="text-red">*</view>
</view>
<view class="static-field">管理人员</view>
<view class="form-label margin-bottom margin-top">
<view class="text-gray">短信提醒</view>
<view class="text-red">*</view>
</view>
<up-radio-group v-model="sendMsgFlagRadio" placement="row" activeColor="#2667e9">
<up-radio-group :key="'hazard-end-' + hazardEndRadio" v-model="hazardEndRadio" placement="row" activeColor="#2667e9">
<up-radio
label=""
name="yes"
label=""
name="no"
:customStyle="{ marginRight: '48rpx' }"
></up-radio>
<up-radio label="" name="no"></up-radio>
<up-radio label="" name="yes"></up-radio>
</up-radio-group>
<template v-if="!hazardEnd">
<view class="form-label margin-bottom margin-top">
<view class="text-gray">下一步流程</view>
<view class="text-red">*</view>
</view>
<view class="static-field">{{ nextStepDisplay }}</view>
<view class="form-label margin-bottom margin-top">
<view class="text-gray">下一步处理人</view>
<view class="text-red">*</view>
</view>
<view class="static-field">管理人员</view>
<view class="form-label margin-bottom margin-top">
<view class="text-gray">短信提醒</view>
<view class="text-red">*</view>
</view>
<up-radio-group v-model="sendMsgFlagRadio" placement="row" activeColor="#2667e9">
<up-radio
label="是"
name="yes"
:customStyle="{ marginRight: '48rpx' }"
></up-radio>
<up-radio label="否" name="no"></up-radio>
</up-radio-group>
</template>
<!-- 电子签名表单最底部 -->
<view class="form-label margin-bottom margin-top flex justify-between align-center" style="width: 100%;">
<view class="flex align-center">
@@ -541,6 +556,11 @@
const rectifyTimeValue = ref(Date.now());
const selectedRectifyTime = ref('');
// 是否结束隐患整改
const hazardEndRadio = ref('no');
const hazardEnd = computed(() => hazardEndRadio.value === 'yes');
const normalizeHazardEndRadio = (value) => (value === 'yes' ? 'yes' : 'no');
// 短信提醒
const sendMsgFlagRadio = ref('yes');
const sendMsgFlag = computed(() => sendMsgFlagRadio.value === 'yes');
@@ -946,7 +966,8 @@
memberIds: selectedIdentityIds.value.map((id) => Number(id)),
rectifyTime: selectedRectifyTime.value || formatDateValue(rectifyTimeValue.value),
signPath: signatureServerPath.value || '',
sendMsgFlag: sendMsgFlag.value
hazardEnd: hazardEnd.value,
sendMsgFlag: hazardEnd.value ? null : sendMsgFlag.value
};
if (selectedDeadlineDate.value) {
params.deadline = selectedDeadlineDate.value;
@@ -1354,7 +1375,8 @@
signatureLocalPath: signatureLocalPath.value,
showCanvas: showCanvas.value,
signaturePaths: signaturePaths.value,
sendMsgFlagRadio: sendMsgFlagRadio.value
sendMsgFlagRadio: sendMsgFlagRadio.value,
hazardEndRadio: hazardEndRadio.value
}),
hasContent: rectifyDraftHasContent,
applyPayload: (data) => {
@@ -1375,6 +1397,7 @@
showCanvas.value = false;
}
sendMsgFlagRadio.value = data.sendMsgFlagRadio === 'no' ? 'no' : 'yes';
hazardEndRadio.value = normalizeHazardEndRadio(data.hazardEndRadio ?? (data.hazardEnd === true ? 'yes' : 'no'));
},
clearForm: () => {
formData.rectifyPlan = '';
@@ -1393,6 +1416,7 @@
signatureRef.value.clear();
}
sendMsgFlagRadio.value = 'yes';
hazardEndRadio.value = 'no';
},
canSave: () => !!(hazardId.value || rectifyId.value),
onAfterRestore: (data) => {
@@ -1422,7 +1446,8 @@
signatureLocalPath.value,
showCanvas.value,
signaturePaths.value,
sendMsgFlagRadio.value
sendMsgFlagRadio.value,
hazardEndRadio.value
]);
onHide(() => {
@@ -1469,6 +1494,10 @@
initRectifyTimeDefault();
}
nextTick(() => {
hazardEndRadio.value = normalizeHazardEndRadio(hazardEndRadio.value);
});
// 从列表页带入的限定整改时间(待整改交办 deadline
if (options.deadline) {
applyDeadlineFromOptions(options.deadline);