流程更改通用

src/api/flow/index.ts

@@ -72,31 +72,7 @@ export function getNextUser(type: string, id: string) {
     method: "get",
   });
 }
-// 提交流程
-export function submitSeqInFlow(data: object) {
-  return request({
-    url: `/api/v1/plan/seq/in/stock/startFlow`,
-    method: "post",
-    data: data,
-  });
-}
-// 流程撤销
-export function cancelSeqInFlow(data: object) {
-  return request({
-    url: `/api/v1/plan/seq/in/stock/cancelFlow`,
-    method: "post",
-    data: data,
-  });
-}
 
-// 提交流程
-export function submitRouteFlow(data: object) {
-  return request({
-    url: `/api/v1/op/route/startFlow`,
-    method: "post",
-    data: data,
-  });
-}
 
 export function audit(data: object) {
   return request({
@@ -106,15 +82,6 @@ export function audit(data: object) {
   });
 }
 
-// 流程撤销
-export function cancelFlow(data: object) {
-  return request({
-    url: `/api/v1/op/route/cancelFlow`,
-    method: "post",
-    data: data,
-  });
-}
-
 // 查看流程记录
 export function queryFlowRecord(insId: string) {
   return request({
@@ -123,36 +90,18 @@ export function queryFlowRecord(insId: string) {
   });
 }
 
-
-// 提交流程
-export function submitFormDataFlow(data: object) {
-  return request({
-    url: `/api/v1/ProcessFormData/startFlow`,
-    method: "post",
-    data: data,
-  });
-}
-// 流程撤销
-export function cancelFormDataFlow(data: object) {
-  return request({
-    url: `/api/v1/ProcessFormData/cancelFlow`,
-    method: "post",
-    data: data,
-  });
-}
-
 // 提交流程
-export function submitReplaceFlow(data: object) {
+export function submitFlow(data: object) {
   return request({
-    url: `/api/v1/processReplace/startFlow`,
+    url: `/api/v1/flowTask/startFlow`,
     method: "post",
     data: data,
   });
 }
 // 流程撤销
-export function cancelReplaceFlow(data: object) {
+export function cancelFlow(data: object) {
   return request({
-    url: `/api/v1/processReplace/cancelFlow`,
+    url: `/api/v1/flowTask/cancelFlow`,
     method: "post",
     data: data,
   });

src/views/base/apply/apply.vue

@@ -125,7 +125,7 @@ import {
   examineList,
   getExcelData,
 } from "@/api/apply";
-import {getNextUser, queryFlowDataList, submitFormDataFlow} from "@/api/flow";
+import {getNextUser, queryFlowDataList, submitFlow} from "@/api/flow";
 import { getUserTree } from "@/api/system/user";
 import ExcelDataBbox from "@/views/base/apply/excelDataBbox.vue";
 const props = defineProps({
@@ -179,7 +179,8 @@ const whenSelectFlow = () => {
 
 const sureToSave = () => {
   flowForm.businessId=props.rowData.id;
-  submitFormDataFlow(flowForm).then(() => {
+  flowForm.flowType = "workFormService"
+  submitFlow(flowForm).then(() => {
     ElMessage.success("提交成功");
     emits("close");
     emits("dataList");

src/views/base/craftManagement/route/index.vue

@@ -292,7 +292,7 @@ import RouteChangeLog from "@/views/base/craftManagement/route/components/routeC
 import { ElMessageBox } from "element-plus";
 import WorkFlowCheck from "@/components/WorkFlows/workFlowCheck.vue";
 import LookFlowStep from "@/views/flow/common/LookFlowStep.vue";
-import { cancelFlow,submitRouteFlow } from "@/api/flow";
+import { cancelFlow,submitFlow } from "@/api/flow";
 const isLoading = ref(false);
 const loading = ref(false);
 // 数据字典相关
@@ -508,7 +508,7 @@ const onCancelFlow = (row) => {
   });
 };
 const onWFSave = (flowForm) => {
-  submitRouteFlow(flowForm).then(() => {
+  submitFlow(flowForm).then(() => {
     ElMessage.success("提交成功");
     workFlowCheckRef.value && workFlowCheckRef.value.close();
     dataList();

src/views/base/craftManagement/routeCommon/index.vue

@@ -53,7 +53,7 @@
           icon="el-icon-copy-document"
           :disabled="false"
           @click="copyRow(row)"
-          v-if="row.routeData != null && row.routeData != ''"
+          v-if="row.flowState === '1'"
           >复制</el-button
         >
         <el-button
@@ -167,7 +167,7 @@ import { getUserTree } from "@/api/system/user/index";
 import RouteChangeLog from "@/views/base/craftManagement/route/components/routeChangeLog.vue";
 import WorkFlowCheck from "@/components/WorkFlows/workFlowCheck.vue";
 import LookFlowStep from "@/views/flow/common/LookFlowStep.vue";
-import { cancelFlow,submitRouteFlow } from "@/api/flow";
+import { cancelFlow,submitFlow } from "@/api/flow";
 
 // 数据字典相关
 const { dicts } = useDictionaryStore();
@@ -472,7 +472,7 @@ const showFlowSteps = (row) => {
   LookFlowStepRef.value && LookFlowStepRef.value.openFlowStepDrawer(row.flowIns);
 };
 const onWFSave = (flowForm) => {
-  submitRouteFlow(flowForm).then(() => {
+  submitFlow(flowForm).then(() => {
     ElMessage.success("提交成功");
     workFlowCheckRef.value && workFlowCheckRef.value.close();
     dataList();

src/views/flow/common/CheckTopInfos/seqInFlowService.vue

@@ -28,43 +28,50 @@ const { dicts } = useDictionaryStore();
 <template>
   <div class="box">
     <el-card>
-      <el-form label-width="120px">
-        <el-row>
-          <el-form-item label="接收人:">
-            <el-text class="mx-1" >{{infoObj.recipient}}</el-text>
-          </el-form-item>
-          <el-form-item label="检验码:">
+        <el-descriptions title="" border :column="3" label-width="100">
+          <el-descriptions-item label="接收人:">
+            {{infoObj.recipient}}
+          </el-descriptions-item>
+          <el-descriptions-item label="检验码:">
             <el-text class="mx-1">{{infoObj.checkCode}}</el-text>
-          </el-form-item>
-          <el-form-item label="单据类型:">
+          </el-descriptions-item>
+          <el-descriptions-item label="单据类型:">
             <el-text class="mx-1">{{infoObj.billTypeStr}}</el-text>
-          </el-form-item>
-          <el-form-item label="仓库类型:">
+          </el-descriptions-item>
+          <el-descriptions-item label="仓库类型:">
             <el-text class="mx-1">{{infoObj.warehouseTypeStr}}</el-text>
-          </el-form-item>
-          <el-form-item label="批号:">
+          </el-descriptions-item>
+          <el-descriptions-item label="批号:">
             <el-text class="mx-1">{{infoObj.lotCode}}</el-text>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item label="备注:">
+          </el-descriptions-item>
+          </el-descriptions>
+      <el-descriptions title="" border :column="3" label-width="100">
+        <div class="cell-item">
+          <el-descriptions-item label="备注:" class="cell-item">
             <el-text class="mx-1">{{infoObj.remark}}</el-text>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item label="管号:">
+          </el-descriptions-item>
+        </div>
+      </el-descriptions>
+      <el-descriptions title="" border :column="1" label-width="100">
+          <el-descriptions-item label="管号:">
             <el-text class="mx-1">{{infoObj.seqNo}}</el-text>
-          </el-form-item>
-        </el-row>
-          <el-row>
-            <el-form-item label="创建人:">
+          </el-descriptions-item>
+      </el-descriptions>
+      <el-descriptions title="" border :column="3" label-width="100">
+            <el-descriptions-item label="创建人:">
               <el-text class="mx-1">{{infoObj.creator}}</el-text>
-            </el-form-item>
-            <el-form-item label="创建时间:">
+            </el-descriptions-item>
+            <el-descriptions-item label="创建时间:" span="2">
               <el-text class="mx-1">{{infoObj.created}}</el-text>
-            </el-form-item>
-        </el-row>
-      </el-form>
+            </el-descriptions-item>
+        </el-descriptions>
     </el-card>
   </div>
 </template>
+
+<style>
+.cell-item {
+  display: flex;
+  align-items: center;
+}
+</style>

src/views/plan/finishProduct/components/detail-stock.vue

@@ -48,7 +48,7 @@ import { useCrud } from "@/hooks/userCrud";
 import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import WorkFlowCheck from "@/components/WorkFlows/workFlowCheck.vue";
 import LookFlowStep from "@/views/flow/common/LookFlowStep.vue";
-import { cancelSeqInFlow,submitSeqInFlow } from "@/api/flow";
+import { cancelFlow,submitFlow } from "@/api/flow";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const { dicts } = useDictionaryStore();
 //  工作流相关 start
@@ -63,7 +63,7 @@ const showFlowSteps = (row) => {
   LookFlowStepRef.value && LookFlowStepRef.value.openFlowStepDrawer(row.flowIns);
 };
 const onWFSave = (flowForm) => {
-  submitSeqInFlow(flowForm).then(() => {
+  submitFlow(flowForm).then(() => {
     ElMessage.success("提交成功");
     workFlowCheckRef.value && workFlowCheckRef.value.close();
     dataNoPageList();
@@ -72,7 +72,7 @@ const onWFSave = (flowForm) => {
 
 const onCancelFlow = (row) => {
   console.log(row);
-  cancelSeqInFlow({
+  cancelFlow({
     businessId: row.id,
     flowIns: row.flowIns,
   }).then(() => {

src/views/quality/replace/index.vue

@@ -41,15 +41,13 @@
             v-if="row?.flowState == '0'||row?.flowState == '2'||row?.flowState == '-1'"
             v-hasPerm="[ButtonPermKeys.PLAN.BTNS.filtersheet_del]"
             @click="deleteReplace(row.id)"
-            >删除</el-button
-          >
+            >删除</el-button >
         <el-button
             link
             icon="el-icon-copy-document"
             v-if="row.flowState == '0' || row.flowState == '2' || row.flowState == '-1'"
             @click="openCheckView(row)"
-        >提审</el-button
-        >
+        >提审</el-button >
 
         <el-button link v-if="row.flowState !== '0'" icon="el-icon-copy-document" @click="showFlowSteps(row)"
         >流程</el-button>
@@ -58,7 +56,7 @@
             link
             icon="el-icon-copy-document"
             v-if="row.flowState == '3'"
-            @click="cancelFlow(row)"
+            @click="onCancelFlow(row)"
         >撤销</el-button
         >
     </template>
@@ -225,6 +223,9 @@ import {
   getSeqList,
 } from "@/api/replace";
 import {useCrud} from "@/hooks/userCrud";
+import WorkFlowCheck from "@/components/WorkFlows/workFlowCheck.vue";
+import LookFlowStep from "@/views/flow/common/LookFlowStep.vue";
+import { cancelFlow,submitFlow } from "@/api/flow";
 const updateTitle = ref("筛选单详情");
 const tableData = ref([]);
 const formRef = ref(null);
@@ -243,14 +244,14 @@ const showFlowSteps = (row) => {
   LookFlowStepRef.value && LookFlowStepRef.value.openFlowStepDrawer(row.flowIns);
 };
 
-const cancelFlow=(row)=>{
-   cancelReplaceFlow(row).then(() => {
+const onCancelFlow=(row)=>{
+   cancelFlow(row).then(() => {
      ElMessage.success("提交成功");
      dataList();
    });
 }
 const onWFSave = (flowForm) => {
-  submitReplaceFlow(flowForm).then(() => {
+  submitFlow(flowForm).then(() => {
     ElMessage.success("提交成功");
     workFlowCheckRef.value && workFlowCheckRef.value.close();
     dataList();
@@ -265,10 +266,6 @@ const dialog = reactive({
   title: "新增替换记录",
 });
 const workFlowCheckRef = ref(null);
-import WorkFlowCheck from "@/components/WorkFlows/workFlowCheck.vue";
-import LookFlowStep from "@/views/flow/common/LookFlowStep.vue";
-import RouteChangeLog from "@/views/base/craftManagement/route/components/routeChangeLog.vue";
-import {submitReplaceFlow,cancelReplaceFlow} from "@/api/flow";
 const openCheckView = (row) => {
   row.businessId = row.id
   workFlowCheckRef.value && workFlowCheckRef.value.openDialog(row, "itemReplaceService");