1

src/components/process/SendPurchase.vue

@@ -109,11 +109,6 @@
           <el-table-column prop="productName" label="货品名称" />
           <el-table-column prop="productSpec" label="规格型号" />
           <el-table-column
-            prop="productUnit"
-            label="单位"
-            :formatter="(row) => dictValueLabel(row.productUnit, productUnit)"
-          />
-          <el-table-column
             prop="subscribeCount"
             label="申购数量"
             v-if="ids.length > 0"
@@ -739,15 +734,7 @@ const handleChangeOtherMoney = (val, index, key) => {
   formData.data.purchaseProjectList[index][key] = formatNumber(val, 100);
   handleChangeAmount();
 };
-
-const productUnit = ref([]);
 const getDict = () => {
-  proxy.getDictOne(["unit"]).then((res) => {
-    productUnit.value = res["unit"].map((x) => ({
-      label: x.dictValue,
-      value: x.dictKey,
-    }));
-  });
   proxy.get("/purchaseOtherFee/listName").then((res) => {
     purchaseProjectListData.value = res.data.map((x) => ({
       ...x,

src/views/process/processApproval/index.vue

@@ -61,11 +61,19 @@
             v-if="flowForm.submitType === '10'"
             @auxiliaryChange="(e) => getAuxiliaryData(e)"
           ></PurchaseEHSD>
-          <SendPurchase
+          <!-- <SendPurchase
             ref="makeDom"
             :queryData="queryData.data"
             v-else
             @auxiliaryChange="(e) => getAuxiliaryData(e)"
+          ></SendPurchase> -->
+        </template>
+
+        <template v-else-if="flowForm.flowKey == 'purchase_flow'">
+          <SendPurchase
+            ref="makeDom"
+            :queryData="queryData.data"
+            @auxiliaryChange="(e) => getAuxiliaryData(e)"
           ></SendPurchase>
         </template>
 
@@ -597,6 +605,10 @@ const skipPage = () => {
       router.replace({
         path: "/ehsd/procurement/subscribe",
       });
+    } else if (flowForm.flowKey == "purchase_flow") {
+      router.replace({
+        name: "Purchase",
+      });
     } else if (flowForm.flowKey == "account_request_funds_flow") {
       router.replace({
         path: "/ehsd/fundManage/funds",

src/views/purchaseManage/purchaseManage/purchase/index.vue

@@ -494,10 +494,10 @@ const start = () => {
     proxy.$router.replace({
       path: "/platform_manage/process/processApproval",
       query: {
-        flowKey: "ehsd_purchase_flow",
+        flowKey: "purchase_flow",
         random: proxy.random(),
         ids,
-        submitType: "20",
+        // submitType: "20",
       },
     });
   } else {