lxf 1 жил өмнө
parent
commit
70b8281dcb

+ 8 - 35
src/views/subsidiary/order/management/index.vue

@@ -62,7 +62,6 @@
 import byTable from "/src/components/byTable/index";
 import { ElMessage, ElMessageBox } from "element-plus";
 import refreshStore from "/src/store/modules/refresh";
-import { flowStatus } from "/src/utils/flowStatus";
 
 const { proxy } = getCurrentInstance();
 const sourceList = ref({
@@ -94,12 +93,6 @@ const searchConfig = computed(() => {
     },
     {
       type: "select",
-      prop: "flowStatus",
-      label: "流程状态",
-      data: flowStatus(),
-    },
-    {
-      type: "select",
       prop: "status",
       dictKey: "order_status",
       label: "订单状态",
@@ -144,24 +137,11 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "流程状态",
-        prop: "flowStatus",
-        width: 120,
-      },
-      render(val) {
-        return proxy.dictKeyValue(val, flowStatus());
-      },
-    },
-    {
-      attrs: {
         label: "订单状态",
         prop: "status",
         width: 120,
       },
-      render(val, row) {
-        if (val == 0 && row.flowStatus !== 2) {
-          return "";
-        }
+      render(val) {
         return proxy.dictKeyValue(val, proxy.useUserStore().allDict["order_status"]);
       },
     },
@@ -340,7 +320,7 @@ const config = computed(() => {
                 },
               }
             : {},
-          row.status == 0 && row.flowStatus !== 1 && row.flowStatus !== 2
+          row.status == 0
             ? {
                 attrs: {
                   label: "编辑",
@@ -410,23 +390,18 @@ const clickReset = () => {
 };
 const clickAddOrder = () => {
   proxy.$router.replace({
-    path: "/platform_manage/process/processApproval",
+    path: "/addOrder",
     query: {
-      flowKey: "order",
-      flowName: "新建订单流程",
       random: proxy.random(),
     },
   });
 };
 const clickCode = (row) => {
   proxy.$router.replace({
-    path: "/platform_manage/process/processApproval",
+    path: "/addOrder",
     query: {
-      flowKey: "order",
-      flowName: "订单详情",
-      processType: "20",
-      id: row.id,
-      flowId: row.flowId,
+      detailId: row.id,
+      text: "订单详情",
       random: proxy.random(),
     },
   });
@@ -447,12 +422,10 @@ const clickDelete = (row) => {
 };
 const clickUpdate = (row) => {
   proxy.$router.replace({
-    path: "/platform_manage/process/processApproval",
+    path: "/addOrder",
     query: {
-      flowKey: "order",
-      flowName: "新建订单流程",
-      processType: "40",
       id: row.id,
+      text: "编辑订单",
       random: proxy.random(),
     },
   });