|
|
@@ -58,7 +58,6 @@
|
|
|
placeholder="延期申请数量"
|
|
|
v-model="state.delayForm.timeLimitCount"
|
|
|
controls-position="right"
|
|
|
- @input="computeTime"
|
|
|
:min="1"
|
|
|
:max="AppConfigInfo.applyDelayTime"
|
|
|
class="w100"
|
|
|
@@ -71,7 +70,7 @@
|
|
|
prop="timeLimitUnit"
|
|
|
:rules="[{ required: true, message: '请选择延期申请单位', trigger: 'change' }]"
|
|
|
>
|
|
|
- <el-select disabled v-model="state.delayForm.timeLimitUnit" placeholder="延期申请单位" @change="computeTime">
|
|
|
+ <el-select disabled v-model="state.delayForm.timeLimitUnit" placeholder="延期申请单位">
|
|
|
<el-option v-for="item in timeType" :value="item.key" :key="item.key" :label="item.value" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -79,20 +78,6 @@
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
|
|
|
- <el-form-item label="延期后期满时间" label-width="160px">
|
|
|
- <template #label>
|
|
|
- <div style="height: 34px; display: flex; align-items: center">
|
|
|
- 延期后期满时间
|
|
|
- <el-tooltip placement="top-start">
|
|
|
- <SvgIcon name="ele-QuestionFilled" size="18px" class="ml3" />
|
|
|
- <template #content> 当前计算结果为预计时间，具体结果以申请单通过后时间为准 </template>
|
|
|
- </el-tooltip>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- {{ state.delayForm.endTime }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>-->
|
|
|
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
|
|
|
<el-form-item label="申请理由" prop="content" :rules="[{ required: true, message: '请填写延期申请理由', trigger: 'blur' }]">
|
|
|
<common-advice
|
|
|
@@ -344,7 +329,6 @@
|
|
|
v-model="state.ruleForm.timeLimit"
|
|
|
controls-position="right"
|
|
|
class="w100"
|
|
|
- @input="computeTimeNext"
|
|
|
:min="1"
|
|
|
:max="99"
|
|
|
disabled
|
|
|
@@ -360,7 +344,6 @@
|
|
|
<el-select
|
|
|
v-model="state.ruleForm.timeLimitUnit"
|
|
|
placeholder="办理时限单位"
|
|
|
- @change="computeTimeNext"
|
|
|
disabled
|
|
|
style="width: 240px"
|
|
|
>
|
|
|
@@ -530,20 +513,6 @@
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
|
|
|
- <el-form-item label="延期后期满时间" label-width="160px">
|
|
|
- <template #label>
|
|
|
- <div style="height: 34px; display: flex; align-items: center">
|
|
|
- 延期后期满时间
|
|
|
- <el-tooltip placement="top-start">
|
|
|
- <SvgIcon name="ele-QuestionFilled" size="18px" class="ml3" />
|
|
|
- <template #content> 当前计算结果为预计时间，具体结果以申请单通过后时间为准 </template>
|
|
|
- </el-tooltip>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- {{ state.delayForm.endTime }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>-->
|
|
|
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
|
|
|
<el-form-item label="申请理由" prop="content" :rules="[{ required: true, message: '请填写延期申请理由', trigger: 'blur' }]">
|
|
|
<common-advice
|
|
|
@@ -762,7 +731,6 @@
|
|
|
v-model="state.ruleForm.timeLimit"
|
|
|
controls-position="right"
|
|
|
class="w100"
|
|
|
- @input="computeTimeNext"
|
|
|
:min="1"
|
|
|
:max="99"
|
|
|
disabled
|
|
|
@@ -778,7 +746,6 @@
|
|
|
<el-select
|
|
|
v-model="state.ruleForm.timeLimitUnit"
|
|
|
placeholder="办理时限单位"
|
|
|
- @change="computeTimeNext"
|
|
|
disabled
|
|
|
style="width: 240px"
|
|
|
>
|
|
|
@@ -1291,12 +1258,13 @@ const selectNextStep = (val: any) => {
|
|
|
});
|
|
|
fastStepName.value = next.recommendOrgName; // 推荐派单处理对象
|
|
|
fastStepCode.value = next.recommendOrgId; // 推荐派单处理对象code
|
|
|
- // 办理对象是否必填
|
|
|
- nextHandlersRequired.value = ![0].includes(next.handlerType) && !showStepsArr.includes(state.processType);
|
|
|
if (items.length === 1) {
|
|
|
// 如果办理对象只有一个默认选中
|
|
|
state.ruleForm.nextHandlers = [items[0]];
|
|
|
}
|
|
|
+ // 办理对象是否必填
|
|
|
+ // nextHandlersRequired.value = ![0].includes(next.handlerType) && !showStepsArr.includes(state.processType);
|
|
|
+ nextHandlersRequired.value = ![0].includes(next.handlerType);
|
|
|
};
|
|
|
// 会签是否可用 (多个办理对象,并且配置可以会签)
|
|
|
const countersignAble = computed(() => {
|
|
|
@@ -1540,7 +1508,7 @@ const onSubmit = (formEl: FormInstance | undefined) => {
|
|
|
switch (state.processType) {
|
|
|
case '工单受理':
|
|
|
const request = {
|
|
|
- data: state.orderDetail.id,
|
|
|
+ data: { orderId: state.orderDetail.id, ...submitObj },
|
|
|
workflow: { ...submitObj, files: handleFiles.value },
|
|
|
};
|
|
|
orderStartFlow(request)
|
|
|
@@ -1743,7 +1711,12 @@ const onSubmit = (formEl: FormInstance | undefined) => {
|
|
|
break;
|
|
|
case '工单办理': // 工单办理流程
|
|
|
case '工单代办': // 工单代办流程
|
|
|
- orderHandle({ ...submitObj, files: handleFiles.value })
|
|
|
+ const requestHandle = {
|
|
|
+ data: { orderId: state.orderDetail.id, ...submitObj, crossSteps },
|
|
|
+ workflow: { ...submitObj, files: handleFiles.value },
|
|
|
+ };
|
|
|
+ orderH
|
|
|
+ orderHandle(requestHandle)
|
|
|
.then(() => {
|
|
|
afterSubmit('orderProcessSuccess', true);
|
|
|
})
|
|
|
@@ -1831,7 +1804,11 @@ const onSubmit = (formEl: FormInstance | undefined) => {
|
|
|
});
|
|
|
break;
|
|
|
default: // 默认工单办理
|
|
|
- orderHandle({ ...submitObj, files: handleFiles.value })
|
|
|
+ const requestDefault = {
|
|
|
+ data: { orderId: state.orderDetail.id, ...submitObj },
|
|
|
+ workflow: { ...submitObj, files: handleFiles.value },
|
|
|
+ };
|
|
|
+ orderHandle(requestDefault)
|
|
|
.then(() => {
|
|
|
afterSubmit('orderProcessSuccess', true);
|
|
|
})
|
zhangchong