退货管理完善

src/views/process/processApproval/index.vue

@@ -21,7 +21,7 @@
         ></SendFunds>
         <ReturnGood
           ref="makeDom"
-          v-else-if="flowForm.flowKey == '40'"
+          v-else-if="flowForm.flowKey == 'sales_return_flow'"
           :queryData="queryData.data"
         ></ReturnGood>
         <PurchaseRefund

src/views/purchaseManage/purchaseManage/returnGoods/index.vue

@@ -157,50 +157,14 @@ const selectConfig = reactive([
       },
       {
         label: "驳回",
-        value: "20",
+        value: "15",
       },
       {
         label: "待退货",
-        value: "30",
-      },
-    ],
-  },
-  {
-    label: "到货状态",
-    prop: "arrivalStatus",
-    data: [
-      {
-        label: "未到货",
-        value: "0",
-      },
-      {
-        label: "部分到货",
-        value: "10",
-      },
-      {
-        label: "已到货",
         value: "20",
       },
     ],
   },
-  {
-    label: "付款状态",
-    prop: "payStatus",
-    data: [
-      {
-        label: "未付款",
-        value: "1",
-      },
-      {
-        label: "部分付款",
-        value: "2",
-      },
-      {
-        label: "已付款",
-        value: "3",
-      },
-    ],
-  },
 ]);
 const config = computed(() => {
   return [
@@ -220,31 +184,40 @@ const config = computed(() => {
     {
       attrs: {
         label: "物品编码",
-        prop: "remarks",
+        prop: "productCode",
       },
     },
     {
       attrs: {
         label: "物品名称",
-        prop: "purchaseName",
+        prop: "productName",
       },
     },
     {
       attrs: {
         label: "单位",
-        prop: "createTime",
+        prop: "productUnit",
       },
     },
     {
       attrs: {
         label: "退货数量",
-        prop: "purchaseStatus",
+        prop: "count",
       },
     },
     {
       attrs: {
         label: "退货状态",
-        prop: "arrivalStatus",
+        prop: "status",
+      },
+      render(status) {
+        return status == 10
+          ? "审批中"
+          : status == 15
+          ? "驳回"
+          : status == 20
+          ? "待退货"
+          : "";
       },
     },
     {
@@ -252,17 +225,23 @@ const config = computed(() => {
         label: "退款状态",
         prop: "payStatus",
       },
+      render() {
+        return "暂无";
+      },
     },
     {
       attrs: {
         label: "操作人",
-        prop: "payStatus",
+        prop: "createUser",
       },
+      //      render() {
+      //   return "暂无";
+      // },
     },
     {
       attrs: {
         label: "操作时间",
-        prop: "payStatus",
+        prop: "createTime",
       },
     },