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

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

@@ -349,14 +349,18 @@
                                                       @remoteMethod="remoteMethod($event,'commodity')"
                                                       @corpChange="corpChange($event,'commodity')"
                                                       @corpFocus="remoteMethod($event,'commodity')">
-                                        </search-query> -->
-                                        <el-select v-model="assemblyForm.hscode" placeholder="请选择HS CODE" size="small"
-                                            @change="hsCodeChang" allow-create filterable :loading="hsLoading" remote
-                                            :remote-method="searchHsQuery">
-                                            <el-option v-for="(item, index) in commodityData" :key="index"
-                                                :label="item.hsCode" :value="item.hsCode">
-                                            </el-option>
-                                        </el-select>
+                                        </search-query>
+                                        -->
+<!--                                        <el-select v-model="assemblyForm.hscode" placeholder="请选择HS CODE" size="small"-->
+<!--                                            @change="hsCodeChang" allow-create filterable :loading="hsLoading" remote-->
+<!--                                            :remote-method="searchHsQuery">-->
+<!--                                            <el-option v-for="(item, index) in commodityData" :key="index"-->
+<!--                                                :label="item.hsCode" :value="item.hsCode">-->
+<!--                                            </el-option>-->
+<!--                                        </el-select>-->
+                                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.hscode"
+                                                  size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                                  placeholder="HS CODE"></el-input>
                                     </el-col>
                                     <el-col :span="11">
                                         <span style="padding-left: 20px"></span>

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

@@ -665,6 +665,7 @@ export default {
                         label: "核算要素",
                         prop: "elementsCnName",
                         width: "120",
+                        hide: true,
                         overHidden: true,
                     },
                     {
@@ -934,6 +935,7 @@ export default {
                         label: "核算要素",
                         prop: "elementsCnName",
                         width: "120",
+                        hide:true,
                         overHidden: true,
                     },
                     {
@@ -1092,6 +1094,7 @@ export default {
                         label: "核算要素",
                         prop: "elementsCnName",
                         width: "120",
+                        hide: true,
                         overHidden: true,
                     },
                     {

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

@@ -2013,10 +2013,18 @@ export default {
                 background: 'rgba(255,255,255,0.7)'
             });
             billsCopyBills({ id }).then(res => {
-                if (type == '复制费用' || type == '') {
+                let types = typeof type == "string" ? type.split(",") : []
+                // if (type == '复制费用' || type == '') {
+                //     res.data.data.preContainersList = []
+                // }
+                // if (type == '复制箱型箱量' || type == '') {
+                //     res.data.data.feeCenterListD = []
+                //     res.data.data.feeCenterListC = []
+                // }
+                if(types.indexOf("复制箱型箱量")<0){
                     res.data.data.preContainersList = []
                 }
-                if (type == '复制箱型箱量' || type == '') {
+                if(types.indexOf("复制费用")<0){
                     res.data.data.feeCenterListD = []
                     res.data.data.feeCenterListC = []
                 }

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

@@ -684,7 +684,7 @@ export default {
                     //     overHidden:true,
                     // },
                     {
-                        label: "客户名",
+                        label: "客户简称",
                         prop: "corpCnName",
                         width: "160",
                         overHidden: true,
@@ -717,7 +717,7 @@ export default {
                         searchOrder: 2,
                     },
                     {
-                        label: "MPayMode",
+                        label: "M/PayMode",
                         prop: "mpaymode",
                         width: "100",
                         overHidden: true,
@@ -732,7 +732,7 @@ export default {
                         searchOrder: 3,
                     },
                     {
-                        label: "HPayMode",
+                        label: "H/PayMode",
                         prop: "hpaymode",
                         width: "100",
                         overHidden: true,
@@ -1072,7 +1072,8 @@ export default {
                         width: "120",
                         overHidden: true,
                         type: 'select',
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_status_los",
+                        // audit_status_los
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=issue_type_F",
                         props: {
                             label: 'dictValue',
                             value: 'dictKey',
@@ -1895,7 +1896,7 @@ export default {
             this.isShow = false
             this.$nextTick(() => {
                 this.$refs.billsDetails.pageLoading = true
-                this.$refs.billsDetails.billsCopyBillsfun(this.selectionList[0].id, '复制费用,复制箱型箱量')
+                this.$refs.billsDetails.billsCopyBillsfun(this.selectionList[0].id, '') // 复制费用,复制箱型箱量
             })
             this.$store.commit("IN_SEAFE_DETAIL");
         },

src/views/iosBasicData/bcorps/index.vue

@@ -6,7 +6,7 @@
           <el-scrollbar>
             <basic-container>
               <avue-tree :option="treeOption" :data="customTypeData" @node-click="nodeClick">
-                <template slot="addBtn">
+                <template v-if="!eldialog" slot="addBtn">
                   <el-tooltip class="item" effect="dark" content="新建分类" placement="top">
                     <i class="el-icon-setting" style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
                       @click="corpTypeVisible = true"></i>
@@ -37,14 +37,14 @@
                 class="statusClass" :style="'background:' + item.colour">{{ item.dictValue }}</div>
             </template>
 
-            <template slot="menuLeft">
+            <template v-if="!eldialog" slot="menuLeft">
               <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入</el-button>
               <el-button type="success" size="small" @click="handleExport" icon="el-icon-printer">导出</el-button>
               <!--<el-button type="primary" size="small" icon="el-icon-turn-off" @click="Deactivatefun" >批量停用</el-button>-->
               <!--<el-button type="success" size="small" @click="handleReportDesigner" icon="el-icon-printer">设计报表</el-button>-->
               <!--<el-button type="success" size="small" @click="handleReportPreview" icon="el-icon-printer">预览报表</el-button>-->
             </template>
-            <template slot-scope="{ row, index }" slot="menu">
+            <template v-if="!eldialog"  slot-scope="{ row, index }" slot="menu">
               <el-button icon="el-icon-edit" type="text" size="small" @click.stop="editOpen(row)">
                 编辑
               </el-button>
@@ -434,7 +434,7 @@ export default {
     };
   },
   props: {
-    // 是否的弹窗状态打开
+    // 是否的弹窗状态打开，弹窗状态时，不能编辑
     eldialog: {
       type: Boolean,
       default: false
@@ -445,6 +445,8 @@ export default {
     permissionList() {
       return {
         // addBtn: this.vaildData(this.permission.bcorps_add, false),
+        addBtn: !this.eldialog,
+        menu: !this.eldialog,
         viewBtn: this.vaildData(this.permission.bcorps_view, false),
         delBtn: this.vaildData(this.permission.bcorps_delete, false),
         editBtn: this.vaildData(this.permission.bcorps_edit, false)
@@ -615,6 +617,10 @@ export default {
       })
     },
     editOpen(row) {
+        if(this.eldialog){
+            return
+        }
+
       this.detailData = {
         id: row.id
       };

src/views/iosBasicData/bports/index.vue

@@ -245,7 +245,84 @@ export default {
             //   trigger: "blur"
             // }]
           },
+            // INTTRA,MAEU,OOCL,APL,PIL,HJ,HMM,ESL,ZIM,PO,MSC,CSAV,QQCT,CTM,SML
           {
+                label: "INTTRA",
+                prop: "INTTRA",
+                overHidden: true,
+            },
+            {
+                label: "MAEU",
+                prop: "MAEU",
+                overHidden: true,
+            },
+            {
+                label: "OOCL",
+                prop: "OOCL",
+                overHidden: true,
+            },
+            {
+                label: "APL",
+                prop: "APL",
+                overHidden: true,
+            },
+            {
+                label: "PIL",
+                prop: "PIL",
+                overHidden: true,
+            },
+            {
+                label: "HJ",
+                prop: "HJ",
+                overHidden: true,
+            },
+            {
+                label: "HMM",
+                prop: "HMM",
+                overHidden: true,
+            },
+            {
+                label: "ESL",
+                prop: "ESL",
+                overHidden: true,
+            },
+            {
+                label: "ZIM",
+                prop: "ZIM",
+                overHidden: true,
+            },
+            {
+                label: "PO",
+                prop: "PO",
+                overHidden: true,
+            },
+            // MSC,CSAV,QQCT,CTM,SML
+            {
+                label: "MSC",
+                prop: "MSC",
+                overHidden: true,
+            },
+            {
+                label: "CSAV",
+                prop: "CSAV",
+                overHidden: true,
+            },
+            {
+                label: "QQCT",
+                prop: "QQCT",
+                overHidden: true,
+            },
+            {
+                label: "CTM",
+                prop: "CTM",
+                overHidden: true,
+            },
+            {
+                label: "SML",
+                prop: "SML",
+                overHidden: true,
+            },
+            {
             label: "版本",
             prop: "version",
             hide: true,
@@ -580,6 +657,19 @@ export default {
       bportsList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
+        console.log('ports', data.records);
+        // INTTRA,MAEU,OOCL,APL,PIL,HJ,HMM,ESL,ZIM,PO,MSC,CSAV,QQCT,CTM,SML
+        var cols = 'INTTRA,MAEU,OOCL,APL,PIL,HJ,HMM,ESL,ZIM,PO,MSC,CSAV,QQCT,CTM,SML'.split(',');
+        data.records.forEach(r=>{
+            cols.forEach(col=>{
+                r[col]=''
+            })
+            if(Array.isArray(r.extendedDataArr)){
+                r.extendedDataArr.forEach(d=>{
+                    r[d.name]=d.value
+                })
+            }
+        })
         this.data = data.records;
         this.loading = false;
         this.selectionClear();