fixup! Revert "关贸云字段加长"

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -146,7 +146,7 @@
 
         <el-dialog append-to-body title="导入场站分箱明细" class="el-dialogDeep" :visible.sync="sldcDialogvisible" width="80%"
                    :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-            <import-sldc :sldcData="sldcData"></import-sldc>
+            <import-sldc ref="importSLDC" :sldcData="sldcData"></import-sldc>
             <span slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="importSldcDialogfun(true)">导入</el-button>
                 <el-button type="primary" @click="importSldcDialogfun(false)">只导箱封号</el-button>
@@ -186,7 +186,7 @@ import extractBoxInformation
 import { billsAdd } from "@/api/iosBasicData/bills";
 
 export default {
-    components: { SearchQuery, bports, extractBoxInformation },
+    components: { SearchQuery, bports, importSldc, extractBoxInformation },
     props: {
         assemblyForm: {},
         detailData: {},
@@ -369,6 +369,7 @@ export default {
             }
             this.loadingButton = true
 
+            /*
             var tmp = [{"cntrType":"40HC","cntrTypeExists":true,"sealNo":"CX0289787","gwt":13654,"oldQty":0,"oldVol":0,"index":1,"vol":61,"mblNo":"TAJM50971800","qty":213,"oldGwt":0,"isNewest":true,"cntrNo":"PIDU4035902","selected":true,"status":""},
                 {"cntrType":"40HC","cntrTypeExists":true,"sealNo":"CX0289765","gwt":14419,"oldQty":0,"oldVol":0,"index":2,"vol":61,"mblNo":"TAJM50971800","qty":225,"oldGwt":0,"isNewest":true,"cntrNo":"PIDU4324931","selected":true,"status":""},
                 {"cntrType":"40HC","cntrTypeExists":true,"sealNo":"CX0289787","gwt":13654,"oldQty":0,"oldVol":0,"index":3,"vol":61,"mblNo":"TAJM50971801","qty":213,"oldGwt":0,"isNewest":true,"cntrNo":"PIDU4035902","selected":true,"status":""},
@@ -378,8 +379,9 @@ export default {
             this.sldcData = tmp
             this.loadingButton = false
             this.sldcDialogvisible = true
+            */
 
-            /* 使用固定数据
+            // 使用固定数据
             sldcApiDetail({
                 id: this.assemblyForm.id,
                 billNo: this.assemblyForm.mblno,
@@ -392,7 +394,6 @@ export default {
             }).catch(e=>{
                 this.loadingButton = false;
             })
-            */
 
             // 暂时屏蔽lht
             return
@@ -410,10 +411,21 @@ export default {
             })
         },
         importSldcDialogfun(mode){
-            console.log('sldcData', this.sldcData)
+            var rows = this.$refs.importSLDC.selectedRows
+            if(rows.length==0){
+                this.$message.warning('请勾选要导入的箱号！')
+                return
+            }
 
-            sldcApisubmit({mode: mode}, this.sldcData)
-            this.sldcDialogvisible = false
+            sldcApisubmit({
+                mode: mode,
+                id: this.assemblyForm.id,
+                billNo: this.assemblyForm.mblno,
+            }, rows).then(res => {
+                this.loadingButton = false
+                this.sldcDialogvisible = false
+                this.$emit('billsDetailfun')
+            })
         },
         // 提取箱信息弹窗里的导入
         extractDialogfun() {

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/importSldc.vue

@@ -3,16 +3,19 @@
         <div>
             <div style="display: flex;align-items: center;margin-bottom: 10px;">
                 <div style="width: 5px;height: 20px;background: #2d8cf0;margin-right: 8px;border-radius: 2px;"></div>
-                <span style="font-size: 18px;color: #2d8cf0;">箱货动态</span>
+<!--                <span style="font-size: 18px;color: #2d8cf0;">箱货动态</span>-->
             </div>
             <el-table
+                ref="sldcTable"
                 :data="sldcData"
                 border
                 size="mini"
                 :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
                 :cell-style="{padding:'0px',fontSize:'12px'}"
-                style="width: 100%">
-                <el-table-column prop="status" label="状态" width="64" />
+                style="width: 100%"
+                @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55">
+                </el-table-column>                <el-table-column prop="status" label="状态" width="64" />
                 <el-table-column prop="mblNo" label="MB/L NO" width="110" />
                 <el-table-column prop="isNewest" label="最新" width="64" >
                     <template slot-scope="scope">
@@ -21,7 +24,7 @@
                 </el-table-column>
                 <el-table-column prop="cntrNo" label="箱号" width="110" />
                 <el-table-column prop="oldCntrType" label="已配箱型" width="64" style="background-color: #00b050"/>
-                <el-table-column prop="oldSealNo" label="封号" width="90"  style="background-color: #00b050"/>
+                <el-table-column prop="oldSealNo" label="封号" width="90" style="background-color: #00b050"/>
                 <el-table-column prop="oldQty" label="件数" width="90"  style="background-color: #00b050"/>
                 <el-table-column prop="oldGwt" label="毛重" width="90"  style="background-color: #00b050"/>
                 <el-table-column prop="oldVol" label="体积" width="90"  style="background-color: #00b050"/>
@@ -45,12 +48,23 @@ export default {
     },
     data(){
         return {
-
+            selectedRows: [],
         }
     },
     created(){
         console.log(this.sldcData)
-    }
+    },
+    mounted() {
+        this.selectedRows = []
+        this.sldcData.forEach(row => {
+            this.$refs.sldcTable.toggleRowSelection(row, true);
+        });
+    },
+    methods: {
+        handleSelectionChange(val) {
+            this.selectedRows = val;
+        }
+    },
 }
 </script>
 

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

@@ -40,9 +40,11 @@
       <template slot-scope="scope" slot="menu">
         <el-link type="primary" style="font-size: 12px" icon="el-icon-view" :underline="false"
           @click="addedData(1, scope)">查看详情&nbsp;&nbsp;</el-link>
-        <el-link type="primary" style="font-size: 12px" icon="el-icon-edit" :underline="false" :disabled="disabled"
+<!--          :disabled="disabled"-->
+        <el-link type="primary" style="font-size: 12px" icon="el-icon-edit" :underline="false"
           @click="addedData(2, scope)">编 辑&nbsp;&nbsp;</el-link>
-        <el-link type="primary" style="font-size: 12px" icon="el-icon-delete" :underline="false" :disabled="disabled"
+<!--          :disabled="disabled"-->
+        <el-link type="primary" style="font-size: 12px" icon="el-icon-delete" :underline="false"
           @click="rowDel(scope.row)">删 除</el-link>
         <el-link type="primary" :disabled="scope.row.status == 1"
           @click="handleReportPreview(scope.row.url, scope.row)">预览报表</el-link>