修改bug

src/components/fee-info/main.vue

@@ -273,8 +273,7 @@ export default {
   },
   async created() {
     // 判断tabShow的activeName默认的显示
-    this.activeName =
-      this.tabShow == 1 ? "first" : this.tabShow == 2 ? "first" : "second";
+    this.activeName = this.tabShow == 1 ? "first" : this.tabShow == 2 ? "first" : "second";
     this.feeOption = await this.getColumnData(
       this.getColumnName(33),
       feeOption

src/views/approveData/configuration/mainList.json

@@ -21,7 +21,7 @@
   "searchLabelWidth": 120,
   "searchIcon": true,
   "searchIndex": 2,
-  "addBtn":false,
+  "addBtn": false,
   "headerAlign": "center",
   "column": [
     {
@@ -30,12 +30,12 @@
       "searchFilterable": true,
       "type": "select",
       "hide": true,
-      "showColumn":false,
+      "showColumn": false,
       "props": {
         "label": "dictValue",
         "value": "dictKey"
       },
-      "dicData":[],
+      "dicData": [],
       "search": true,
       "overHidden": true,
       "index": 1
@@ -52,7 +52,7 @@
       "label": "审核状态",
       "prop": "auditStatus",
       "type": "select",
-      "dicData":[],
+      "dicData": [],
       "props": {
         "label": "dictValue",
         "value": "dictKey"
@@ -67,7 +67,7 @@
       "prop": "corpId",
       "search": true,
       "hide": true,
-      "showColumn":false,
+      "showColumn": false,
       "overHidden": true,
       "width": 100,
       "index": 4
@@ -99,7 +99,7 @@
         "label": "name",
         "value": "id"
       }
-  },
+    },
     {
       "label": "申请日期",
       "prop": "sendTime",
@@ -111,7 +111,7 @@
       "search": true,
       "overHidden": true,
       "index": 8,
-      "width":150
+      "width": 150
     },
     {
       "label": "数量",
@@ -135,25 +135,11 @@
       "index": 11
     },
     {
-      "label": "利润率",
-      "prop": "grossProfitRate",
-      "overHidden": true,
-      "width": 100,
-      "index": 12
-    },
-    {
-      "label": "利润",
-      "prop": "grossProfit",
-      "overHidden": true,
-      "width": 100,
-      "index": 13
-    },
-    {
       "label": "订单备注",
       "prop": "orderRemark",
       "overHidden": true,
       "width": 100,
-      "index": 14
+      "index": 12
     }
   ]
-}
+}

src/views/approveData/configuration/mainList3.json

@@ -0,0 +1,159 @@
+{
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": true,
+  "searchMenuSpan": 24,
+  "dialogWidth": "60%",
+  "align": "center",
+  "height": "auto",
+  "searchSpan": 8,
+  "searchMenuPosition": "right",
+  "border": true,
+  "index": true,
+  "selection": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 180,
+  "stripe": true,
+  "dialogClickModal": false,
+  "searchLabelWidth": 120,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "addBtn": false,
+  "headerAlign": "center",
+  "column": [
+    {
+      "label": "业务类型",
+      "prop": "processType",
+      "searchFilterable": true,
+      "type": "select",
+      "hide": true,
+      "showColumn": false,
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dicData": [],
+      "search": true,
+      "overHidden": true,
+      "index": 1
+    },
+    {
+      "label": "业务类型",
+      "prop": "checkType",
+      "search": false,
+      "overHidden": true,
+      "width": 100,
+      "index": 2
+    },
+    {
+      "label": "审核状态",
+      "prop": "auditStatus",
+      "type": "select",
+      "dicData": [],
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "search": true,
+      "searchValue": "S",
+      "overHidden": true,
+      "index": 3
+    },
+    {
+      "label": "往来单位",
+      "prop": "corpId",
+      "search": true,
+      "hide": true,
+      "showColumn": false,
+      "overHidden": true,
+      "width": 100,
+      "index": 4
+    },
+    {
+      "label": "往来单位",
+      "prop": "corpsName",
+      "overHidden": true,
+      "width": 100,
+      "index": 5
+    },
+    {
+      "label": "业务编号",
+      "prop": "billNo",
+      "search": true,
+      "overHidden": true,
+      "width": 100,
+      "index": 6
+    },
+    {
+      "label": "申请人",
+      "prop": "sendUserId",
+      "overHidden": true,
+      "search": true,
+      "index": 7,
+      "width": 100,
+      "type": "select",
+      "props": {
+        "label": "name",
+        "value": "id"
+      }
+    },
+    {
+      "label": "申请日期",
+      "prop": "sendTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "search": true,
+      "overHidden": true,
+      "index": 8,
+      "width": 150
+    },
+    {
+      "label": "数量",
+      "prop": "orderQuantity",
+      "overHidden": true,
+      "width": 100,
+      "index": 9
+    },
+    {
+      "label": "金额",
+      "prop": "amount",
+      "overHidden": true,
+      "width": 100,
+      "index": 10
+    },
+    {
+      "label": "应收金额",
+      "prop": "amountReceivable",
+      "overHidden": true,
+      "width": 100,
+      "index": 11
+    },
+    {
+      "label": "利润率",
+      "prop": "grossProfitRate",
+      "overHidden": true,
+      "width": 100,
+      "index": 12
+    },
+    {
+      "label": "利润",
+      "prop": "grossProfit",
+      "overHidden": true,
+      "width": 100,
+      "index": 13
+    },
+    {
+      "label": "订单备注",
+      "prop": "orderRemark",
+      "overHidden": true,
+      "width": 100,
+      "index": 14
+    }
+  ]
+}

src/views/approveData/index.vue

@@ -56,6 +56,7 @@
 <script>
 import option from "./configuration/mainList.json";
 import option2 from "./configuration/mainList2.json";
+import option3 from "./configuration/mainList3.json";
 import { getList, approvePass } from "@/api/approveData/main";
 import checkSchedule from "@/components/check/checkSchedule";
 import check from "@/components/check/check";
@@ -108,7 +109,11 @@ export default {
       if (res.data.data.billType == 1) {
         this.option = option2;
       } else {
-        this.option = option;
+        if (this.$store.getters.userInfo.tenant_id === "681169") {
+          this.option = option3;
+        } else {
+          this.option = option;
+        }
       }
       this.getWorkDicts("auditStatus").then(res => {
         this.findObject(this.option.column, "auditStatus").dicData =

src/views/purchase/contract/detailsPage.vue

@@ -243,9 +243,9 @@
           </avue-crud>
         </trade-card>
         <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="viewDisabled" :itemType="'申请'"
-          activeName="second" :optionType="'JK'" @beforeFinance="beforeFinance" @afterFinance="afterFinance"
+           :optionType="'JK'" @beforeFinance="beforeFinance" @afterFinance="afterFinance"
           @getBillNo="getBillNo" feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId"
-          :billNoList="billNoList" :delType="2" />
+          :billNoList="billNoList" :delType="2" :financeDisabled="false"/>
         <upload-file ref="uploadFile" title="合同附件" :disabled="viewDisabled" :orderFilesList="orderFilesList"
           delUrl="" />
       </el-form>

src/views/salesManagement/salesContract/detailsPage.vue

@@ -219,7 +219,7 @@
           </avue-crud>
         </trade-card>
         <fee-info ref="feeInfo" @beforeFinance="beforeFinance" @afterFinance="afterFinance" :disabled="viewDisabled"
-          :orderFeesList="orderFeesList" :itemType="'收费'" :optionType="'JK'"
+          :orderFeesList="orderFeesList" :itemType="'收费'" :optionType="'JK'" :financeDisabled="false"
           feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :delType="2" />
         <upload-file ref="uploadFile" title="合同附件" :disabled="viewDisabled"
           :orderFilesList="orderFilesList || viewDisabled" delUrl="" />