cz 1 год назад
Родитель
Сommit
3a127dd482

+ 2 - 2
src/components/process/SF/Purchase.vue

@@ -258,8 +258,8 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="计(不含税)" width="130" prop="amount" />
-            <el-table-column label="计(含税)" width="120" prop="amountIncludingTax" />
+            <el-table-column label="计(不含税)" width="130" prop="amount" />
+            <el-table-column label="计(含税)" width="120" prop="amountIncludingTax" />
             <el-table-column label="备注" width="200">
               <template #default="{ row, $index }">
                 <div style="width: 100%">

+ 2 - 2
src/components/process/SF/Subscribe.vue

@@ -55,8 +55,8 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="计(不含税)" width="130" prop="amount" />
-            <el-table-column label="计(含税)" width="120" prop="amountIncludingTax" />
+            <el-table-column label="计(不含税)" width="130" prop="amount" />
+            <el-table-column label="计(含税)" width="120" prop="amountIncludingTax" />
             <el-table-column label="备注" min-width="200">
               <template #default="{ row, $index }">
                 <div style="width: 100%">

+ 14 - 0
src/views/process/dealWith/backlog.vue

@@ -161,6 +161,20 @@ const config = computed(() => {
             },
             el: "button",
             click() {
+              if (row.nodeHandleType == "30") {
+                proxy.$router.push({
+                  path: "/platform_manage/process/processApproval",
+                  query: {
+                    flowKey: row.flowKey,
+                    id: row.id,
+                    processType: 10,
+                    version: row.version,
+                    businessId: row.businessId,
+                    submitType: "10",
+                  },
+                });
+                return;
+              }
               if (row.status != 1 && row.status != 0) {
                 proxy.$router.push({
                   path: "/platform_manage/process/processApproval",

+ 5 - 1
src/views/process/processConfig/handleBtn.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="handle-btn">
     <div class="icon-box">
+      <div class="icon cg" v-if="nodeHandleType=='0'">
+        <i class="iconfont icon-icomx_banli"></i>
+      </div>
       <div class="icon cg" v-if="nodeHandleType=='10'">
         <i class="iconfont icon-icomx_banli"></i>
       </div>
@@ -19,7 +22,7 @@
 import { defineProps, inject, ref } from "vue";
 
 const title = ref("");
-const nodeHandleType = ref("10");
+const nodeHandleType = ref("0");
 const getNode = inject("getNode");
 const node = getNode();
 node.on("change:data", ({ current }) => {
@@ -27,6 +30,7 @@ node.on("change:data", ({ current }) => {
   title.value = current.title;
 });
 const nodeTypeName = {
+  0: "",
   10: "常规",
   20: "聚合",
   30: "抄送",

+ 7 - 0
src/views/process/processConfig/vueFlow.vue

@@ -227,6 +227,13 @@ const rules = reactive({
       trigger: "blur",
     },
   ],
+  nodeButtonSet: [
+    {
+      required: true,
+      message: "请选择",
+      trigger: "change",
+    },
+  ],
 });
 const lineFormConfig = computed(() => {
   return [