Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

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
     }

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

@@ -24,7 +24,7 @@
                                 <el-col :span="8">
                                     <el-input type="age" style="width: 100%;"
                                         v-model="assemblyForm.detail.hshipperCntyName" size="small" autocomplete="off"
-                                        :disabled="detailData.seeDisabled" clearable placeholder="发货人"></el-input>
+                                        :disabled="detailData.seeDisabled" clearable placeholder="发货人国家代码"></el-input>
                                 </el-col>
                             </div>
                         </el-form-item>
@@ -54,21 +54,25 @@
                                         @corpFocus="remoteMethod($event, 'hconsignee')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="4">
-                                    <span style="padding-left: 10px"></span>
+                                <el-col :span="8">
+<!--                                    <span style="padding-left: 10px"></span>-->
                                     <el-input type="age" style="width: 100%;"
                                         v-model="assemblyForm.detail.hconsigneeCntyName" size="small" autocomplete="off"
-                                        :disabled="detailData.seeDisabled" clearable placeholder="收货人"></el-input>
-                                </el-col>
-                                <el-col :span="4">
-                                    <span style="margin-left: 20px"></span>
-                                    <span style="font-size: 12px;color: #1e9fff;cursor: pointer;"
-                                        @click="notifybyfun">同通</span>
+                                        :disabled="detailData.seeDisabled" clearable placeholder="收货人国家代码"></el-input>
                                 </el-col>
+<!--                                <el-col :span="4">-->
+<!--                                    <span style="margin-left: 20px"></span>-->
+<!--                                    <span style="font-size: 12px;color: #1e9fff;cursor: pointer;"-->
+<!--                                        @click="notifybyfun">同通</span>-->
+<!--                                </el-col>-->
                             </div>
                         </el-form-item>
                         <div>
-                            <el-form-item label="" prop="hconsigneeDetails">
+                            <el-form-item label="同通" prop="hconsigneeDetails">
+                                <span slot="label">
+                                    <span style="font-size: 12px;color: #1e9fff;cursor: pointer;"
+                                          @click="notifybyfun">同通</span>
+                                </span>
                                 <el-input type="textarea" style="width: 100%;"
                                     v-model="assemblyForm.detail.hconsigneeDetails" size="small" autocomplete="off"
                                     :disabled="detailData.seeDisabled" rows="5" clearable placeholder="请输入收货人提单描述"
@@ -93,25 +97,30 @@
                                     </search-query>
                                 </el-col>
                                 <el-col :span="8">
-                                    <div
-                                        style="display: flex;align-items: center;justify-content: space-between;padding-left: 10px">
+                                    <!--                                      padding-left: 10px -->
+                                    <div style="display: flex;align-items: center;justify-content: space-between;">
                                         <div style="flex: 4">
                                             <el-input type="age" style="width: 100%;"
                                                 v-model="assemblyForm.detail.hnotifyCntyName" size="small"
                                                 autocomplete="off" :disabled="detailData.seeDisabled" clearable
-                                                placeholder="通知人"></el-input>
+                                                placeholder="通知人国家代码"></el-input>
                                         </div>
-                                        <div style="flex: 1;margin-left: 10px">
-                                            <el-button type="primary" icon="el-icon-plus" size="mini"
-                                                @click="hnotifyClick"></el-button>
+<!--                                        <div style="flex: 1;margin-left: 10px">-->
+<!--                                            <el-button type="primary" icon="el-icon-plus" size="mini"-->
+<!--                                                @click="hnotifyClick"></el-button>-->
                                             <!-- <div class="addbuttonClass" @click="hnotifyClick">+</div> -->
-                                        </div>
+<!--                                        </div>-->
                                     </div>
                                 </el-col>
                             </div>
                         </el-form-item>
                         <div>
                             <el-form-item label="" prop="hnotifyDetails">
+                                <span slot="label">
+                                    <el-button type="primary" icon="el-icon-plus" size="mini"
+                                           @click="hnotifyClick"></el-button>
+                                </span>
+
                                 <el-input type="textarea" style="width: 100%;"
                                     v-model="assemblyForm.detail.hnotifyDetails" size="small" autocomplete="off"
                                     :disabled="detailData.seeDisabled" rows="5" clearable placeholder="请输入通知人提单描述"
@@ -767,6 +776,7 @@
                                 <!-- <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgImdgCode" size="small"
                                     autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     placeholder="请输入危险品类别"></el-input> -->
+<!--                                -->
                                 <dic-select v-model="assemblyForm.dgImdgCode" placeholder="危险品类别" key="dictKey"
                                     label="dictKey" keyValue="dictKey"
                                     url="/blade-system/dict-biz/dictionary?code=dg_imdg_code" :filterable="true"

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>