|
@@ -15,8 +15,8 @@
|
|
:append-to-body="!isOrderAccept"
|
|
:append-to-body="!isOrderAccept"
|
|
:modal="!isOrderAccept"
|
|
:modal="!isOrderAccept"
|
|
>
|
|
>
|
|
- <template #header="{ close, titleId, titleClass }">
|
|
|
|
- <h4 :id="titleId" :class="titleClass">{{state.dialogTitle}}<el-text tag="b" type="danger" size="large" class="ml10">随手拍</el-text></h4>
|
|
|
|
|
|
+ <template #header="{ close, titleId, titleClass }">
|
|
|
|
+ <h4 :id="titleId" :class="titleClass">{{ state.dialogTitle }}<el-text tag="b" type="danger" size="large" class="ml10">随手拍</el-text></h4>
|
|
</template>
|
|
</template>
|
|
<el-form :model="state.ruleForm" label-width="110px" ref="ruleFormRef" v-loading="state.loading">
|
|
<el-form :model="state.ruleForm" label-width="110px" ref="ruleFormRef" v-loading="state.loading">
|
|
<slot name="header"></slot>
|
|
<slot name="header"></slot>
|
|
@@ -533,7 +533,7 @@
|
|
|
|
|
|
<script setup lang="ts" name="processApproval">
|
|
<script setup lang="ts" name="processApproval">
|
|
import { computed, defineAsyncComponent, nextTick, reactive, ref, watch } from 'vue';
|
|
import { computed, defineAsyncComponent, nextTick, reactive, ref, watch } from 'vue';
|
|
-import { ElMessage, FormInstance } from 'element-plus';
|
|
|
|
|
|
+import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
|
|
import other from '@/utils/other';
|
|
import other from '@/utils/other';
|
|
import { storeToRefs } from 'pinia';
|
|
import { storeToRefs } from 'pinia';
|
|
import { commonEnum } from '@/utils/constants';
|
|
import { commonEnum } from '@/utils/constants';
|
|
@@ -546,6 +546,7 @@ import {
|
|
orderReturnParams,
|
|
orderReturnParams,
|
|
orderStartFlow,
|
|
orderStartFlow,
|
|
orderTimeConfig,
|
|
orderTimeConfig,
|
|
|
|
+ orderTransferCount,
|
|
} from '@/api/business/order';
|
|
} from '@/api/business/order';
|
|
import { orderPrevious, workflowNextSteps, workflowNextStepsByOrder, workflowNextStepsByOrderInstead } from '@/api/system/workflow';
|
|
import { orderPrevious, workflowNextSteps, workflowNextStepsByOrder, workflowNextStepsByOrderInstead } from '@/api/system/workflow';
|
|
import { useAppConfig } from '@/stores/appConfig';
|
|
import { useAppConfig } from '@/stores/appConfig';
|
|
@@ -588,7 +589,7 @@ const state = reactive<any>({
|
|
transpondCityName: null, // 市州转办信息
|
|
transpondCityName: null, // 市州转办信息
|
|
transpondCityId: null, // 市州转办信息id
|
|
transpondCityId: null, // 市州转办信息id
|
|
transpondCityValue: null, // 市州转办信息
|
|
transpondCityValue: null, // 市州转办信息
|
|
- orderAssignMode: 0, // 派单类型默认逐级派单
|
|
|
|
|
|
+ orderAssignMode: 2, // 派单类型默认主协办
|
|
copyToHandlers: [], // 抄送对象
|
|
copyToHandlers: [], // 抄送对象
|
|
isDirect: true, // 是否直派 默认是
|
|
isDirect: true, // 是否直派 默认是
|
|
},
|
|
},
|
|
@@ -663,6 +664,18 @@ const openDialog = async (val: any) => {
|
|
handleResult(nextResponse);
|
|
handleResult(nextResponse);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
+ if (AppConfigInfo.value.snapshot && state.orderDetail.industryName === '安全隐患') {
|
|
|
|
+ orderTransferCount(state.orderDetail.id).then((res: any) => {
|
|
|
|
+ if (res.result < 1) {
|
|
|
|
+ ElMessageBox.alert('建议转网格员处理。', '提示', {
|
|
|
|
+ confirmButtonText: '确定',
|
|
|
|
+ draggable: true,
|
|
|
|
+ showClose: false,
|
|
|
|
+ type:'info'
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ }
|
|
await nextTick(() => {
|
|
await nextTick(() => {
|
|
restForm(ruleFormRef.value);
|
|
restForm(ruleFormRef.value);
|
|
});
|
|
});
|
|
@@ -1422,7 +1435,7 @@ const onSubmit = (formEl: FormInstance | undefined) => {
|
|
case '工单受理':
|
|
case '工单受理':
|
|
const request = {
|
|
const request = {
|
|
data: { orderId: state.orderDetail.id, ...submitObj, crossSteps, secondaryOrgs: secondaryOrgs.value, copys: copys.value },
|
|
data: { orderId: state.orderDetail.id, ...submitObj, crossSteps, secondaryOrgs: secondaryOrgs.value, copys: copys.value },
|
|
- workflow: { ...submitObj, files: handleFiles.value },
|
|
|
|
|
|
+ workflow: { ...submitObj, files: handleFiles.value,currentTag:currentParams.value.currentTag },
|
|
};
|
|
};
|
|
orderStartFlow(request)
|
|
orderStartFlow(request)
|
|
.then(() => {
|
|
.then(() => {
|
|
@@ -1436,7 +1449,7 @@ const onSubmit = (formEl: FormInstance | undefined) => {
|
|
case '工单代办': // 工单代办流程
|
|
case '工单代办': // 工单代办流程
|
|
const requestHandle = {
|
|
const requestHandle = {
|
|
data: { orderId: state.orderDetail.id, ...submitObj, crossSteps, secondaryOrgs: secondaryOrgs.value, copys: copys.value },
|
|
data: { orderId: state.orderDetail.id, ...submitObj, crossSteps, secondaryOrgs: secondaryOrgs.value, copys: copys.value },
|
|
- workflow: { ...submitObj, files: handleFiles.value },
|
|
|
|
|
|
+ workflow: { ...submitObj, files: handleFiles.value,currentTag:currentParams.value.currentTag },
|
|
};
|
|
};
|
|
orderHandle(requestHandle)
|
|
orderHandle(requestHandle)
|
|
.then(() => {
|
|
.then(() => {
|
|
@@ -1447,7 +1460,7 @@ const onSubmit = (formEl: FormInstance | undefined) => {
|
|
});
|
|
});
|
|
break;
|
|
break;
|
|
case '工单退回':
|
|
case '工单退回':
|
|
- const requestReturn = { ...submitObj, files: handleFiles.value };
|
|
|
|
|
|
+ const requestReturn = { ...submitObj, files: handleFiles.value, orderId: state.orderDetail.id };
|
|
orderPrevious(requestReturn)
|
|
orderPrevious(requestReturn)
|
|
.then(() => {
|
|
.then(() => {
|
|
afterSubmit('orderProcessSuccess', true, '退回申请成功');
|
|
afterSubmit('orderProcessSuccess', true, '退回申请成功');
|
|
@@ -1459,7 +1472,7 @@ const onSubmit = (formEl: FormInstance | undefined) => {
|
|
default: // 默认工单办理
|
|
default: // 默认工单办理
|
|
const requestDefault = {
|
|
const requestDefault = {
|
|
data: { orderId: state.orderDetail.id, ...submitObj, crossSteps, secondaryOrgs: secondaryOrgs.value, copys: copys.value },
|
|
data: { orderId: state.orderDetail.id, ...submitObj, crossSteps, secondaryOrgs: secondaryOrgs.value, copys: copys.value },
|
|
- workflow: { ...submitObj, files: handleFiles.value },
|
|
|
|
|
|
+ workflow: { ...submitObj, files: handleFiles.value,currentTag:currentParams.value.currentTag },
|
|
};
|
|
};
|
|
orderHandle(requestDefault)
|
|
orderHandle(requestDefault)
|
|
.then(() => {
|
|
.then(() => {
|