Преглед изворни кода

审核路径显示机构名称 salesCompanyName

wfg пре 7 месеци
родитељ
комит
73e9041bdc

+ 15 - 7
src/views/approval/processConfigH/config/mainList.json

@@ -19,18 +19,26 @@
 
   "column": [
     {
-      "label": "审核路径名",
-      "prop": "pathName",
-      "search": true,
+      "label": "所属机构",
+      "prop": "salesCompanyName",
+      "search": false,
       "index": 1,
       "overHidden": true,
       "searchSpan": 8
     },
+      {
+          "label": "审核路径名",
+          "prop": "pathName",
+          "search": true,
+          "index": 2,
+          "overHidden": true,
+          "searchSpan": 8
+      },
     {
       "label": "维护人",
       "prop": "opUserName",
       "search": false,
-      "index": 2,
+      "index": 3,
       "overHidden": true,
       "searchSpan": 8
     },
@@ -38,7 +46,7 @@
       "label": "维护时间",
       "prop": "opDate",
       "search": false,
-      "index": 3,
+      "index": 4,
       "overHidden": true,
       "searchSpan": 8
     },
@@ -46,7 +54,7 @@
       "label": "状态",
       "prop": "status",
       "search": false,
-      "index": 4,
+      "index": 5,
       "overHidden": true,
       "searchSpan": 8
     },
@@ -54,7 +62,7 @@
       "label": "备注",
       "prop": "remarks",
       "search": false,
-      "index": 5,
+      "index": 6,
       "overHidden": true,
       "searchSpan": 8
     }

+ 11 - 1
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -35,7 +35,7 @@
                         发送 EDI<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item v-for="item in ediData" :key="item.id"
+                        <el-dropdown-item v-for="item in ediData" :key="item.id" class="dropdown-max"
                             @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
                         </el-dropdown-item>
                     </el-dropdown-menu>
@@ -2129,4 +2129,14 @@ export default {
 .isShow {
     display: none;
 }
+.dropdown-max{
+    top: 150px !important;
+    max-width: 600px;
+    display: flex;
+    flex-flow: row wrap;
+    li{
+        margin-right: 5px;
+        white-space: nowrap;
+    }
+}
 </style>