需求115 后台-集运-包裹列表-操作-费用申请

src/views/bpm/processInstance/detail.vue

@@ -128,6 +128,8 @@ import SplitDetail from "@/views/ecw/order/components/SplitDetail"
 import MergeDetail from "@/views/ecw/order/components/MergeDetail"
 import CargoControlDetail from "@/views/ecw/order/components/CargoControlDetail"
 import BoxSplitDetail from "@/views/ecw/order/components/BoxSplitDetail"
+import UpdateFeeApproval from "@/views/ecw/cons/components/UpdateFeeApproval"
+
 // 流程实例的详情页，可用于审批
 export default {
   name: "ProcessInstanceDetail",
@@ -139,6 +141,7 @@ export default {
     SplitDetail,
     MergeDetail,
     CargoControlDetail,
+    UpdateFeeApproval,
     BoxSplitDetail
   },
   computed: {
@@ -487,7 +490,11 @@ export default {
         order_overseas_warehouse_change: {
           component: () => import("@/views/ecw/order/components/updateReleaseTypeApproval"),
           id: parseInt(this.processInstance.businessKey)
-        }
+        },
+        ecw_cons_fee_apply:  {
+          component: "updateFeeApproval",
+          id: this.processInstance.id
+        },
       }
       console.log("formCustomViewPath", this.processInstance.processDefinition.formCustomViewPath.trim())
       return map[this.processInstance.processDefinition.formCustomViewPath.trim()]

src/views/ecw/cons/components/FeeApplicationCons.vue

@@ -110,18 +110,16 @@
             >
             <el-button
               type="text"
-              v-if="scope.row.status === 0"
+              v-if="scope.row.editMode&& !processInstanceId"
               @click="del(scope.$index)"
             >删除
-            </el-button
-            >
+            </el-button>
             <el-button
               type="text"
-              v-if="scope.row.id && scope.row.fee === 0 && scope.row.status === 2 && !scope.row.editMode"
-              @click="deleteByFeeIsZero(scope.row.id)"
+              v-if="scope.row.status === 0&& !processInstanceId"
+              @click="del(scope.$index)"
             >删除
-            </el-button
-            >
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -239,12 +237,13 @@ export default {
 
     // 查询是否有审核中的费用申请
     getConsApprovalList({consId:this.consId,approvalType: 6,status: 1}).then((res) => {
-      if (res.data) {
-        this.processInstanceId = res.data.formId
-        this.list = res.data.approvalDetail
+      if (res.data.length!=0) {
+        this.processInstanceId = res.data[0].formId
+        this.list = JSON.parse(res.data[0].approvalDetail)
       } else {
         // 查询历史申请
         getConsFeeList({ consId: this.consId }).then((res) => {
+          console.log("历史申请", res.data)
           this.list = res.data
         })
       }
@@ -262,6 +261,7 @@ export default {
       this.$set(item, "editMode", true)
     },
     addCost() {
+      console.log("添加费用",this.list)
       this.list.push({
         consId: this.consId,
         feeType: undefined, //费用申请类型

src/views/ecw/cons/components/UpdateFeeApproval.vue

+<template>
+  <div>
+    <div class="title-font">
+      <label>【{{ $t("包裹信息") }}】</label>
+    </div>
+    <el-descriptions :column="6" :colon="false" :contentStyle="{'color': '#000000'}" :labelStyle="{'color': '#000000'}">
+      <el-descriptions-item :label="$t('快递单号')+'：'">{{ form.expressNo }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('包裹号')+'：'">{{ form.consNum }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('发货人')+'：'">{{ form.customerName }}{{ form.customerNumber }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('始发仓')+'：'">{{ warehouseList.filter(a => a.id == form.wareId)[0]!=undefined?warehouseList.filter(a => a.id == form.wareId)[0].titleZh:'' }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('目的仓')+'：'">{{ warehouseList.filter(a => a.id == form.consigneeWarehouseId)[0]!=undefined?warehouseList.filter(a => a.id == form.consigneeWarehouseId)[0].titleZh:'' }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('运输方式')+'：'">
+        <dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="form.transportId" />
+      </el-descriptions-item>
+    </el-descriptions>
+    <div class="title-font">
+      <label>【{{ $t("申请理由") }}】</label>
+    </div>
+    <div v-for="(item, index) in list" :key="item.id" style="font-size: 14px;">
+      {{ index + 1 }}、【
+      <dict-tag :type="DICT_TYPE.FEE_TYPE" :value="item.feeType" />
+      】，
+      <dict-tag :type="DICT_TYPE.PAYMENT_TYPE" :value="item.payType" />
+      ，
+      {{ item.fee }}{{ currencyList.filter(a => a.id == item.feeCurrency)[0].titleZh }}，
+      {{ $t("备注") }}：{{ item.remarks }}
+    </div>
+  </div>
+</template>
+<script>
+import { getConsApprovalList } from "@/api/ecw/consApproval"
+import { getCurrencyList } from "@/api/ecw/currency"
+import { getCons } from "@/api/ecw/cons"
+import { getWarehouseList } from "@/api/ecw/warehouse"
+
+export default {
+  name: "updateFeeApproval",
+  props: {
+    id: [String]
+  },
+  data() {
+    return {
+      list: [],
+      currencyList: [],
+      form: {
+        consigneeWarehouseId: null,
+        wareId: null
+      },
+      warehouseList:[],
+    }
+  },
+  created() {
+    getWarehouseList().then((r) => {
+      this.warehouseList = r.data;
+    });
+    getCurrencyList().then((res) => (this.currencyList = res.data))
+    console.log("id", this.id)
+    if (this.id) {
+      getConsApprovalList({ formId: this.id }).then((res) => {
+        if (res.data.length != 0) {
+          this.list = JSON.parse(res.data[0].approvalDetail)
+          getCons(res.data[0].consId).then(res => {
+            this.form = res.data
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+.title {
+  padding: 10px 0;
+
+  span {
+    font-size: 14px;
+    font-weight: bold;
+  }
+}
+
+.bold {
+  font-weight: bold;
+}
+
+.title-font {
+  font-size: 16px;
+  font-weight: 600;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
+</style>