1.进口换单 修改tabs名字

2.系统管理 业务费用 新加列表页字段和检索条件

src/views/iosBasicData/ImportExchange/index.vue

@@ -26,7 +26,7 @@
           <el-tabs v-model="query.changeOrderStatus" type="card" @tab-click="handleClick">
             <el-tab-pane label="申请" name="申请"></el-tab-pane>
             <el-tab-pane label="已换单" name="已换单"></el-tab-pane>
-            <el-tab-pane label="已退单" name="已退单"></el-tab-pane>
+            <el-tab-pane label="免押箱" name="已退单"></el-tab-pane>
             <el-tab-pane label="已退押" name="已退押"></el-tab-pane>
           </el-tabs>
           <el-button type="primary" size="small" @click="allClick('确认设备单')" :disabled="selectionList.length == 0">确认设备单 </el-button>

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -2036,11 +2036,11 @@ export default {
     this.roleName = localStorage.getItem("roleName").split(","); // 获取角色数据
     console.log("roleName", this.roleName);
     this.isAdmin = this.roleName.indexOf("admin") >= 0;
-    this.isFeeViewD = this.isAdmin || this.roleName.indexOf("应收查看") >= 0 || this.roleName.indexOf("国外费用") >= 0;
-    this.isFeeViewC = this.isAdmin || this.roleName.indexOf("应付查看") >= 0 || this.roleName.indexOf("国外费用") >= 0;
+    this.isFeeViewD = this.isAdmin || this.roleName.indexOf("应收查看") >= 0 || this.roleName.indexOf("国外费用") >= 0||this.roleName.indexOf("允许修改他人费用") >= 0;
+    this.isFeeViewC = this.isAdmin || this.roleName.indexOf("应付查看") >= 0 || this.roleName.indexOf("国外费用") >= 0||this.roleName.indexOf("允许修改他人费用") >= 0;
     this.isFeeView = this.isAdmin || this.isFeeViewD || this.isFeeViewC;
-    this.isFeeEditD = this.isAdmin || (this.isFeeViewD && this.roleName.indexOf("应收修改") >= 0);
-    this.isFeeEditC = this.isAdmin || (this.isFeeViewC && this.roleName.indexOf("应付修改") >= 0);
+    this.isFeeEditD = this.isAdmin || (this.isFeeViewD && this.roleName.indexOf("应收修改") >= 0)||this.roleName.indexOf("允许修改他人费用") >= 0;
+    this.isFeeEditC = this.isAdmin || (this.isFeeViewC && this.roleName.indexOf("应付修改") >= 0)||this.roleName.indexOf("允许修改他人费用") >= 0;
     this.isFeeEdit = this.isAdmin || this.isFeeEditD || this.isFeeEditC;
     this.isProfitView = this.isAdmin || this.roleName.indexOf("利润查看") >= 0;
 
@@ -3448,7 +3448,7 @@ export default {
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
             }
-            if (item.id && (item.createUser == this.userId||item.createUser ==0)) {
+            if (item.id && (item.createUser == this.userId||item.createUser ==0||this.roleName.indexOf("允许修改他人费用") >= 0)) {
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
             }
@@ -3461,7 +3461,7 @@ export default {
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
             }
-            if (item.id && (item.createUser == this.userId||item.createUser ==0)) {
+            if (item.id && (item.createUser == this.userId||item.createUser ==0||this.roleName.indexOf("允许修改他人费用") >= 0)) {
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
             }

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -404,7 +404,7 @@
               roleName.includes('应付修改') ||
               roleName.includes('应收查看') ||
               roleName.includes('应付查看') ||
-              roleName.includes('国外费用')
+              roleName.includes('国外费用')||roleName.includes('允许修改他人费用')
           "
         >
           <feecenter
@@ -2814,14 +2814,14 @@ export default {
       if (
         !this.roleName.includes("admin") &&
         (this.roleName.includes("应收修改") || this.roleName.includes("应收查看")) &&
-        !(this.roleName.includes("应付修改") || this.roleName.includes("应付查看"))
+        !(this.roleName.includes("应付修改") || this.roleName.includes("应付查看")|| !this.roleName.includes("允许修改他人费用"))
       ) {
         res.data.data.feeCenterListC = [];
       }
       if (
         !this.roleName.includes("admin") &&
         (this.roleName.includes("应付修改") || this.roleName.includes("应付查看")) &&
-        !(this.roleName.includes("应收修改") || this.roleName.includes("应收查看"))
+        !(this.roleName.includes("应收修改") || this.roleName.includes("应收查看")|| !this.roleName.includes("允许修改他人费用"))
       ) {
         res.data.data.feeCenterListD = [];
       }
@@ -2895,14 +2895,14 @@ export default {
       if (
         !this.roleName.includes("admin") &&
         (this.roleName.includes("应收修改") || this.roleName.includes("应收查看")) &&
-        !(this.roleName.includes("应付修改") || this.roleName.includes("应付查看"))
+        !(this.roleName.includes("应付修改") || this.roleName.includes("应付查看")|| !this.roleName.includes("允许修改他人费用"))
       ) {
         res.data.data.feeCenterListC = [];
       }
       if (
         !this.roleName.includes("admin") &&
         (this.roleName.includes("应付修改") || this.roleName.includes("应付查看")) &&
-        !(this.roleName.includes("应收修改") || this.roleName.includes("应收查看"))
+        !(this.roleName.includes("应收修改") || this.roleName.includes("应收查看")|| !this.roleName.includes("允许修改他人费用"))
       ) {
         res.data.data.feeCenterListD = [];
       }

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -2137,11 +2137,11 @@ export default {
     this.roleName = localStorage.getItem("roleName").split(","); // 获取角色数据
     console.log("roleName", this.roleName);
     this.isAdmin = this.roleName.indexOf("admin") >= 0;
-    this.isFeeViewD = this.isAdmin || this.roleName.indexOf("应收查看") >= 0 || this.roleName.indexOf("国外费用") >= 0;
-    this.isFeeViewC = this.isAdmin || this.roleName.indexOf("应付查看") >= 0 || this.roleName.indexOf("国外费用") >= 0;
+    this.isFeeViewD = this.isAdmin || this.roleName.indexOf("应收查看") >= 0 || this.roleName.indexOf("国外费用") >= 0||this.roleName.indexOf("允许修改他人费用") >= 0;
+    this.isFeeViewC = this.isAdmin || this.roleName.indexOf("应付查看") >= 0 || this.roleName.indexOf("国外费用") >= 0||this.roleName.indexOf("允许修改他人费用") >= 0;
     this.isFeeView = this.isAdmin || this.isFeeViewD || this.isFeeViewC;
-    this.isFeeEditD = this.isAdmin || (this.isFeeViewD && this.roleName.indexOf("应收修改") >= 0);
-    this.isFeeEditC = this.isAdmin || (this.isFeeViewC && this.roleName.indexOf("应付修改") >= 0);
+    this.isFeeEditD = this.isAdmin || (this.isFeeViewD && this.roleName.indexOf("应收修改") >= 0)||this.roleName.indexOf("允许修改他人费用") >= 0;
+    this.isFeeEditC = this.isAdmin || (this.isFeeViewC && this.roleName.indexOf("应付修改") >= 0)||this.roleName.indexOf("允许修改他人费用") >= 0;
     this.isFeeEdit = this.isAdmin || this.isFeeEditD || this.isFeeEditC;
     this.isProfitView = this.isAdmin || this.roleName.indexOf("利润查看") >= 0;
 
@@ -3537,7 +3537,7 @@ export default {
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
             }
-            if (item.id && (item.createUser == this.userId || item.createUser == 0)) {
+            if (item.id && (item.createUser == this.userId || item.createUser == 0||this.roleName.indexOf("允许修改他人费用") >= 0)) {
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
             }
@@ -3550,7 +3550,7 @@ export default {
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
             }
-            if (item.id && (item.createUser == this.userId || item.createUser == 0)) {
+            if (item.id && (item.createUser == this.userId || item.createUser == 0||this.roleName.indexOf("允许修改他人费用") >= 0)) {
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
             }

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -418,7 +418,7 @@
                 roleName.includes('应付修改') ||
                 roleName.includes('应收查看') ||
                 roleName.includes('应付查看'))) ||
-              roleName.includes('国外费用')
+              roleName.includes('国外费用')||roleName.includes('允许修改他人费用')
           "
         >
           <feecenter
@@ -2939,14 +2939,14 @@ export default {
       if (
         !this.roleName.includes("admin") &&
         (this.roleName.includes("应收修改") || this.roleName.includes("应收查看")) &&
-        !(this.roleName.includes("应付修改") || this.roleName.includes("应付查看"))
+        !(this.roleName.includes("应付修改") || this.roleName.includes("应付查看")|| !this.roleName.includes("允许修改他人费用"))
       ) {
         res.data.data.feeCenterListC = [];
       }
       if (
         !this.roleName.includes("admin") &&
         (this.roleName.includes("应付修改") || this.roleName.includes("应付查看")) &&
-        !(this.roleName.includes("应收修改") || this.roleName.includes("应收查看"))
+        !(this.roleName.includes("应收修改") || this.roleName.includes("应收查看")|| !this.roleName.includes("允许修改他人费用"))
       ) {
         res.data.data.feeCenterListD = [];
       }
@@ -3026,14 +3026,14 @@ export default {
       if (
         !this.roleName.includes("admin") &&
         (this.roleName.includes("应收修改") || this.roleName.includes("应收查看")) &&
-        !(this.roleName.includes("应付修改") || this.roleName.includes("应付查看"))
+        !(this.roleName.includes("应付修改") || this.roleName.includes("应付查看")|| !this.roleName.includes("允许修改他人费用"))
       ) {
         res.data.data.feeCenterListC = [];
       }
       if (
         !this.roleName.includes("admin") &&
         (this.roleName.includes("应付修改") || this.roleName.includes("应付查看")) &&
-        !(this.roleName.includes("应收修改") || this.roleName.includes("应收查看"))
+        !(this.roleName.includes("应收修改") || this.roleName.includes("应收查看")|| !this.roleName.includes("允许修改他人费用"))
       ) {
         res.data.data.feeCenterListD = [];
       }

src/views/iosBasicData/financialManagement/reimbursement/index.vue

@@ -84,7 +84,7 @@ export default {
         menuWidth: 140,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 18,
         border: true,
         index: true,
         addBtn: false,
@@ -110,6 +110,13 @@ export default {
             overHidden: true
           },
           {
+            label: "系统号",
+            prop: "billNo",
+            search: true,
+            width:150,
+            overHidden: true
+          },
+          {
             label: "申请人",
             prop: "applicantName",
             search: true,