Browse Source

海域出口附件和货物明细部分bug 出库统计 路由缓存

Qukatie 9 months ago
parent
commit
28212af74a

+ 14 - 0
src/router/views/index.js

@@ -3599,6 +3599,20 @@ export default [{
   }]
 },
 {
+  path: '/tirePartsMall/statisticAnalysis/outboundStatistics/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/statisticAnalysis/outboundStatistics/index',
+    name: '出库统计(L)',
+    meta: {
+      i18n: '/tirePartsMall/statisticAnalysis/outboundStatistics/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/statisticAnalysis/outboundStatistics/index')
+  }]
+},
+{
   path: '/iosBasicData/decisionAnalysis/index',
   component: Layout,
   hidden: true,

+ 1 - 1
src/views/iosBasicData/AirtransportExport/bills/assembly/filescenter.vue

@@ -328,7 +328,7 @@ export default {
       row.pid = this.assemblyForm.id
       row.hblno = this.assemblyForm.hblno
       row.mblno = this.assemblyForm.mblno
-      row.serialNo = Number(row.serialNo)
+      row.serialNo = row.serialNo
       // 保存接口
       this.filescenterSubmitfun(row)
     },

+ 1 - 1
src/views/iosBasicData/AirtransportImport/bills/assembly/filescenter.vue

@@ -328,7 +328,7 @@ export default {
       row.pid = this.assemblyForm.id
       row.hblno = this.assemblyForm.hblno
       row.mblno = this.assemblyForm.mblno
-      row.serialNo = Number(row.serialNo)
+      row.serialNo = row.serialNo
       // 保存接口
       this.filescenterSubmitfun(row)
     },

+ 1 - 1
src/views/iosBasicData/OceanFreightImport/bills/assembly/filescenter.vue

@@ -331,7 +331,7 @@ export default {
       row.pid = this.assemblyForm.id
       row.hblno = this.assemblyForm.hblno
       row.mblno = this.assemblyForm.mblno
-      row.serialNo = Number(row.serialNo)
+      row.serialNo = row.serialNo
       // 保存接口
       this.filescenterSubmitfun(row)
     },

+ 810 - 828
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -3,109 +3,73 @@
         <el-tabs v-model="activeName">
             <el-tab-pane label="可装箱" name="second">
                 <div class="tbasTop">
-                    <el-table
-                        :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
-                        :cell-style="{padding:'0px',fontSize:'12px'}"
-                        :data="assemblyForm.waitingBoxList"
-                        :header-cell-style="tableHeaderCellStyle"
-                        border
-                        stripe
-                        height="300px"
-                        style="width: 100%">
-                        <el-table-column
-                            prop="billNo"
-                            label="BILLNO">
+                    <el-table :row-style="{ height: '20px', padding: '0px', fontSize: '12px' }"
+                        :cell-style="{ padding: '0px', fontSize: '12px' }" :data="assemblyForm.waitingBoxList"
+                        :header-cell-style="tableHeaderCellStyle" border stripe height="300px" style="width: 100%">
+                        <el-table-column prop="billNo" label="BILLNO">
                             <template slot-scope="{ row }">
-                                <span class="textoverflow">{{row.billNo}}</span>
+                                <span class="textoverflow">{{ row.billNo }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column
-                            prop="hblno"
-                            label="H B/L NO">
+                        <el-table-column prop="hblno" label="H B/L NO">
                         </el-table-column>
-                        <el-table-column
-                            prop="corpCnName"
-                            label="客户">
+                        <el-table-column prop="corpCnName" label="客户">
                             <template slot-scope="{ row }">
-                                <span class="textoverflow">{{row.corpCnName}}</span>
+                                <span class="textoverflow">{{ row.corpCnName }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column
-                            prop="polCnName"
-                            label="目的港">
+                        <el-table-column prop="polCnName" label="目的港">
                         </el-table-column>
-                        <el-table-column
-                            prop="editQuantity"
-                            label="件数">
+                        <el-table-column prop="editQuantity" label="件数">
                             <template slot-scope="scope">
-                                <el-input v-if="scope.row.edit"
-                                          type="numbers" size="small"
-                                          v-model="scope.row.editQuantity"
-                                          clearable placeholder="请输入件数" @blur="quantityBlur(scope.row)"
-                                ></el-input>
-                                <span v-else>{{Number(scope.row.editQuantity).toFixed(0)}}</span>
+                                <el-input v-if="scope.row.edit" type="numbers" size="small"
+                                    v-model="scope.row.editQuantity" clearable placeholder="请输入件数"
+                                    @blur="quantityBlur(scope.row)"></el-input>
+                                <span v-else>{{ Number(scope.row.editQuantity).toFixed(0) }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column
-                            prop="editGrossWeight"
-                            label="毛重">
+                        <el-table-column prop="editGrossWeight" label="毛重">
                             <template slot-scope="scope">
-                                <el-input v-if="scope.row.edit"
-                                          type="numbers" size="small"
-                                          v-model="scope.row.editGrossWeight"
-                                          clearable placeholder="请输入毛重"
-                                ></el-input>
-                                <span v-else>{{Number(scope.row.editGrossWeight).toFixed(2)}}</span>
+                                <el-input v-if="scope.row.edit" type="numbers" size="small"
+                                    v-model="scope.row.editGrossWeight" clearable placeholder="请输入毛重"></el-input>
+                                <span v-else>{{ Number(scope.row.editGrossWeight).toFixed(2) }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column
-                            prop="editMeasurement"
-                            label="尺码(体积)">
+                        <el-table-column prop="editMeasurement" label="尺码(体积)">
                             <template slot-scope="scope">
-                                <el-input v-if="scope.row.edit"
-                                          type="numbers" size="small"
-                                          v-model="scope.row.editMeasurement"
-                                          clearable placeholder="请输入尺码(体积)"
-                                ></el-input>
-                                <span v-else>{{Number(scope.row.editMeasurement).toFixed(2)}}</span>
+                                <el-input v-if="scope.row.edit" type="numbers" size="small"
+                                    v-model="scope.row.editMeasurement" clearable placeholder="请输入尺码(体积)"></el-input>
+                                <span v-else>{{ Number(scope.row.editMeasurement).toFixed(2) }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column
-                            prop="quantity"
-                            label="总件数">
+                        <el-table-column prop="quantity" label="总件数">
                             <template slot-scope="scope">
-                                {{Number(scope.row.quantity).toFixed(0)}}
+                                {{ Number(scope.row.quantity).toFixed(0) }}
                             </template>
                         </el-table-column>
-                        <el-table-column
-                            prop="grossWeight"
-                            label="总毛重">
+                        <el-table-column prop="grossWeight" label="总毛重">
                             <template slot-scope="scope">
-                                {{Number(scope.row.grossWeight).toFixed(2)}}
+                                {{ Number(scope.row.grossWeight).toFixed(2) }}
                             </template>
                         </el-table-column>
-                        <el-table-column
-                            prop="measurement"
-                            label="总尺码(体积)">
+                        <el-table-column prop="measurement" label="总尺码(体积)">
                             <template slot-scope="scope">
-                                {{Number(scope.row.measurement).toFixed(2)}}
+                                {{ Number(scope.row.measurement).toFixed(2) }}
                             </template>
                         </el-table-column>
-                        <el-table-column
-                            label="操作"
-                            width="100">
+                        <el-table-column label="操作" width="100">
                             <template slot-scope="scope">
                                 <el-button type="text" size="small" v-if="scope.row.edit"
-                                           :disabled="detailData.seeDisabled || pleasereviewType||showLock"
-                                           @click="waitingBoxeditfun(scope.row,false)">保存
+                                    :disabled="detailData.seeDisabled || pleasereviewType || showLock"
+                                    @click="waitingBoxeditfun(scope.row, false)">保存
                                 </el-button>
                                 <el-button type="text" size="small" v-else
-                                           :disabled="detailData.seeDisabled || pleasereviewType||showLock"
-                                           @click="waitingBoxeditfun(scope.row,true)">编辑
+                                    :disabled="detailData.seeDisabled || pleasereviewType || showLock"
+                                    @click="waitingBoxeditfun(scope.row, true)">编辑
                                 </el-button>
                                 <el-button type="text" size="small"
-                                           :disabled="detailData.seeDisabled || pleasereviewType||showLock"
-                                           @click="allocationfun(scope.row)">分配
+                                    :disabled="detailData.seeDisabled || pleasereviewType || showLock"
+                                    @click="allocationfun(scope.row)">分配
                                 </el-button>
                             </template>
                         </el-table-column>
@@ -113,58 +77,51 @@
                 </div>
             </el-tab-pane>
             <el-tab-pane label="货物明细" name="first">
-                <avue-crud :option="optionDetail"
-                           :table-loading="loading"
-                           :data="containersCommodityList"
-                           v-model="Detailform"
-                           id="out-table"
-                           :header-cell-class-name="headerClassName"
-                           ref="crudDetail"
-                           :row-style="{height:'20px'}"
-                           :cell-style="{padding:'0px'}"
-                           @selection-change="handleSelectionChange"
-                           @row-save="rowSaveDetail"
-                           @row-update="addUpdateDetail"
-                           @resetColumn="resetColumnTwo('crudDetail', 'optionDetail', 'optionBackDetail', 309.4)"
-                           @saveColumn="saveColumnTwo('crudDetail', 'optionDetail', 'optionBackDetail', 309.4)" >
+                <avue-crud :option="optionDetail" :table-loading="loading" :data="containersCommodityList"
+                    v-model="Detailform" id="out-table" :header-cell-class-name="headerClassName" ref="crudDetail"
+                    :row-style="{ height: '20px' }" :cell-style="{ padding: '0px' }"
+                    @selection-change="handleSelectionChange" @row-save="rowSaveDetail" @row-update="addUpdateDetail"
+                    @resetColumn="resetColumnTwo('crudDetail', 'optionDetail', 'optionBackDetail', 309.4)"
+                    @saveColumn="saveColumnTwo('crudDetail', 'optionDetail', 'optionBackDetail', 309.4)">
                     <template slot="lineNoHeader" slot-scope="scope">
                         <el-button type="primary" size="small" icon="el-icon-plus" circle
-                                   :disabled="selectionList.length == 0 || detailData.seeDisabled||showLock" @click="DetailAdd"></el-button>
+                            :disabled="selectionList.length == 0 || detailData.seeDisabled || showLock"
+                            @click="DetailAdd"></el-button>
+                    </template>
+                    <template slot="lineNo" slot-scope="{row,index}">
+                        <span>{{ index + 1 }}</span>
                     </template>
                     <template slot-scope="scope" slot="menuLeft">
-                        <el-button
-                            type="primary" plain
-                            size="small"
-                            :disabled="pleasereviewType || detailData.seeDisabled||showLock"
-                            @click.stop="containerscommoditySubmitListfun"
-                        >批量保存</el-button>
-                        <el-button
-                            type="danger" plain
-                            size="small"
-                            :disabled="pleasereviewType || detailData.seeDisabled||showLock"
-                            @click.stop="BatchDelete"
-                        >批量删除</el-button>
+                        <el-button type="primary" plain size="small"
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
+                            @click.stop="allEdit">一键编辑</el-button>
+                        <el-button type="primary" plain size="small"
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
+                            @click.stop="containerscommoditySubmitListfun">一键保存</el-button>
+                        <el-button type="danger" plain size="small"
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
+                            @click.stop="BatchDelete">批量删除</el-button>
                     </template>
                     <template slot-scope="scope" slot="menu">
-                        <el-button
-                            v-if="!scope.row.$cellEdit"
-                            size="mini"
-                            type="text"
-                            icon="el-icon-edit"
-                            :disabled="pleasereviewType || detailData.seeDisabled||showLock"
+                        <el-button v-if="!scope.row.$cellEdit" size="mini" type="text" icon="el-icon-edit"
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
                             @click.stop="editfun(scope.row, scope.index)">
                             编辑
                         </el-button>
                         <el-button type="text" size="small"
-                                   :disabled="pleasereviewType || detailData.seeDisabled||showLock"
-                                   @click="containerscommodityRemovefun(scope.row.id,scope.index)">删除
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
+                            @click="containerscommodityRemovefun(scope.row.id, scope.index)">删除
                         </el-button>
                     </template>
                     <template slot-scope="{type,disabled}" slot="hscodeForm">
-                        <dic-select style="width: 100%;" 
-                                v-model="Detailform.hscode" placeholder="hsCode" key="id" label="hsCode"
-                                url="/blade-los/bcommodity/list" :filterable="true" :remote="true"  res="records"  dataName="hsCode" 
-                                @selectChange="dicChange('hscode', $event)"></dic-select>
+                        <dic-select style="width: 100%;" v-model="Detailform.hscode" placeholder="hsCode" key="id"
+                            label="hsCode" url="/blade-los/bcommodity/list" :filterable="true" :remote="true"
+                            res="records" dataName="hsCode" @selectChange="dicChange('hscode', $event)"></dic-select>
+                    </template>
+                    <template slot-scope="{type,disabled}" slot="packingUnitForm">
+                        <dic-select style="width: 100%;" v-model="Detailform.packingUnit" placeholder="包装单位" key="id"
+                            label="cnName" url="/blade-los/bpackages/list" :filterable="true" :remote="true"
+                            res="records" dataName="cnName" @selectChange="dicChange('packingUnit', $event)"></dic-select>
                     </template>
                 </avue-crud>
             </el-tab-pane>
@@ -234,751 +191,776 @@
 </template>
 
 <script>
-    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {
-        containerscommodityRemove,
-        containerscommoditySubmit,
-        containerscommoditySubmitList
-    } from "@/api/iosBasicData/containers";
-    import { bcommodityList } from "@/api/iosBasicData/bcommodity";
-    import {getBunitsList} from "@/api/iosBasicData/bunits";
-    import {getWorkDicts} from "@/api/system/dictbiz";
-    import dicSelect from "@/components/dicSelect/main";
-    export default {
-        components: {SearchQuery,dicSelect},
-        props:{
-            assemblyForm:{},
-            detailData:{},
-            // 选中的数据
-            selectionList:{
-                type:Array,
-            },
-            // 请核禁用
-            pleasereviewType:{
-                type:Boolean,
-                default:false
-            },
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import {
+    containerscommodityRemove,
+    containerscommoditySubmit,
+    containerscommoditySubmitList
+} from "@/api/iosBasicData/containers";
+import { bcommodityList } from "@/api/iosBasicData/bcommodity";
+import { getBunitsList } from "@/api/iosBasicData/bunits";
+import { getWorkDicts } from "@/api/system/dictbiz";
+import dicSelect from "@/components/dicSelect/main";
+
+export default {
+    components: { SearchQuery, dicSelect },
+    props: {
+        assemblyForm: {},
+        detailData: {},
+        // 选中的数据
+        selectionList: {
+            type: Array,
+        },
+        // 请核禁用
+        pleasereviewType: {
+            type: Boolean,
+            default: false
+        },
         showLock: {
             type: Boolean,
             default: false
         }
-        },
-        data(){
-            return {
-                hscodeData:[], // 商品数据
-                packingUnitData:[], // 包装
-                dgPackingUnitData:[], // 危险品包装
-                // 当前选择箱子的数据
-                containersBillsList:[],
-                // 撤回的
-                subtractContainersBillsList:[],
-                // 货物明细
-                containersCommodityList:[],
-                // 要选择的数据
-                waitingBoxList:[],
-                // tabs切换
-                activeName:"second",
-                // 货物明细配置项
-                optionDetail:{},
-                optionBackDetail:{
-                    stripe:true,
-                    maxHeight:'250',
-                    calcHeight: 30,
-                    tip: false,
-                    searchShow: true,
-                    searchMenuSpan: 6,
-                    border: true,
-                    selection: true,
-                    dialogClickModal: false,
-                    addBtn:false,
-                    viewBtn:false,
-                    delBtn:false,
-                    editBtn:false,
-                    menuWidth:'180',
-                    cellBtn:true,
-                    column:[
-                        {
-                            label: "行号",
-                            prop: "lineNo",
-                            width: "55",
-                            headerslot:true,
-                            display:false,
-                            overHidden:true,
-                        },
-                        {
-                            label: "单据编号",
-                            prop: "billNo",
-                            display:false,
-                            labelWidth:100,
-                            overHidden:true,
-                        },
-                        {
-                            label: "商品HS-CODE",
-                            prop: "hscode",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            // cell:true,
-                            type:"select",
-                            // dicData:[],
-                            props: {
-                                label: "hsCode",
-                                value: "hsCode",
-                                res: 'data.records'
-                            },
-                            remote:true,
-                            dicUrl: '/api/blade-los/bcommodity/list?hsCode={{key}}',
-                            // dicFormatter: (res => {
-                            //     return res.data.records
-                            // }),
-                        },
-                        {
-                            label: "商品简称",
-                            prop: "commodityShName",
-                            labelWidth:100,
-                            width:"120",
-                            display:false,
-                            overHidden:true,
-                        },
-                        {
-                            label: "商品中文名称",
-                            prop: "commodityCnName",
-                            labelWidth:100,
-                            width:"120",
-                            display:false,
-                            overHidden:true,
-                        },
-                        {
-                            label: "商品英文名称",
-                            prop: "commodityEnName",
-                            labelWidth:100,
-                            width:"120",
-                            display:false,
-                            overHidden:true,
-                        },
-                        {
-                            label: "货物短描",
-                            prop: "commodityShortDescr",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "货物描述",
-                            prop: "commodityDescr",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "唛头",
-                            prop: "marks",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "包装单位",
-                            prop: "packingUnit",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                            type:"select",
-                            dicData:[],
-                            props: {
-                                label: "cnName",
-                                value: "cnName"
-                            },
-                            remote:true,
-                            dicUrl: '/api/blade-los/bunits/list?cnName={{key}}',
-                            dicFormatter: (res => {
-                                return res.data.records
-                            }),
-                        },
-                        {
-                            label: "装箱件数",
-                            prop: "quantity",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "装箱毛重(KGM)",
-                            prop: "grossWeight",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "装箱净重(KGM)",
-                            prop: "netWeight",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "装箱体积(CBM)",
-                            prop: "measurement",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "是否危险品",
-                            prop: "isDangerous",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            type:"select",
-                            dicData:[],
-                            props: {
-                                label: "dictValue",
-                                value: "dictKey"
-                            },
-                            cell:true,
-                        },
-                        {
-                            label: "危险品分类代码(IMDG CODE)",
-                            prop: "dgImdgCode",
-                            labelWidth:100,
-                            width:"200",
-                            overHidden:true,
-                            display:false,
-                            cell:true,
-                        },
-                        {
-                            label: "危险品分类代码名称",
-                            prop: "dgImdgName",
-                            labelWidth:100,
-                            width:"140",
-                            overHidden:true,
-                            display:false,
-                            cell:true,
-                        },
-                        {
-                            label: "危险品国际代码",
-                            prop: "dgUnCode",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            display:false,
-                            cell:true,
-                        },
-                        {
-                            label: "危险品名称",
-                            prop: "dgCommodityName",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            display:false,
-                            cell:true,
-                        },
-                        {
-                            label: "危险品包装单位",
-                            prop: "dgPackingUnit",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            display:false,
-                            type:"select",
-                            dicData:[],
-                            props: {
-                                label: "cnName",
-                                value: "cnName"
-                            },
-                            cell:true,
-                            remote:true,
-                            dicUrl: '/api/blade-los/bunits/list?cnName={{key}}',
-                            dicFormatter: (res => {
-                                return res.data.records
-                            }),
-                        },
-                        {
-                            label: "危险品包装等级",
-                            prop: "dgPackingLevel",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            display:false,
-                            cell:true,
-                        },
-                        {
-                            label: "易燃易爆品闪点",
-                            prop: "dgFlashPoint",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            display:false,
-                            cell:true,
-                        },
-                        {
-                            label: "易燃易爆品闪点单位",
-                            prop: "dgFlashPointUnit",
-                            labelWidth:100,
-                            width:"140",
-                            overHidden:true,
-                            display:false,
-                            cell:true,
-                        },
-                        {
-                            label: "危险品联系人",
-                            prop: "dgContacts",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            display:false,
-                            cell:true,
-                        },
-                        {
-                            label: "危险品联系人电话",
-                            prop: "dgTel",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            display:false,
-                            cell:true,
-                        },
-                        {
-                            label: "是否海洋污染物",
-                            prop: "dgIsMarinePollutant",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            type:"select",
-                            dicData:[],
-                            props: {
-                                label: "dictValue",
-                                value: "dictKey"
-                            },
-                            cell:true,
-                        },
-                        {
-                            label: "是否申报数量",
-                            prop: "dgIsDeclareQuantity",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            type:"select",
-                            dicData:[],
-                            props: {
-                                label: "dictValue",
-                                value: "dictKey"
-                            },
-                            cell:true,
-                        },
-                        {
-                            label: "CAS NO",
-                            prop: "dgCasNo",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "CAA INFO",
-                            prop: "dgCaaInfo",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "DC Weight",
-                            prop: "dgDcWeight",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "Emergency温度",
-                            prop: "dgEmerTemperature",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "Emergency温度单位",
-                            prop: "dgEmerTemperatureUnit",
-                            labelWidth:100,
-                            width:"140",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "Control温度",
-                            prop: "dgCtrlTemperature",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "Control温度单位",
-                            prop: "dgCtrlTemperatureUnit",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "左超 厘米",
-                            prop: "overLeft",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "右超 厘米",
-                            prop: "overRight",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "前超 厘米",
-                            prop: "overFront",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "后超 厘米",
-                            prop: "overBack",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                        {
-                            label: "超高 厘米",
-                            prop: "overTop",
-                            labelWidth:100,
-                            width:"120",
-                            overHidden:true,
-                            cell:true,
-                        },
-                    ]
-                },
-                selectionDetailList:[], // 选中的数据
-                loading:false,
-                Detailform:{},
-            }
-        },
-        comments:{
+    },
+    data() {
+        return {
+            hscodeData: [], // 商品数据
+            packingUnitData: [], // 包装
+            dgPackingUnitData: [], // 危险品包装
+            // 当前选择箱子的数据
+            containersBillsList: [],
+            // 撤回的
+            subtractContainersBillsList: [],
+            // 货物明细
+            containersCommodityList: [],
+            // 要选择的数据
+            waitingBoxList: [],
+            // tabs切换
+            activeName: "second",
+            // 货物明细配置项
+            optionDetail: {},
+            optionBackDetail: {
+                stripe: true,
+                maxHeight: '250',
+                calcHeight: 30,
+                tip: false,
+                searchShow: true,
+                searchMenuSpan: 6,
+                border: true,
+                selection: true,
+                dialogClickModal: false,
+                addBtn: false,
+                viewBtn: false,
+                delBtn: false,
+                editBtn: false,
+                menuWidth: '180',
+                cellBtn: true,
+                column: [
+                    {
+                        label: "行号",
+                        prop: "lineNo",
+                        width: "55",
+                        headerslot: true,
+                        display: false,
+                        overHidden: true,
+                    },
+                    {
+                        label: "单据编号",
+                        prop: "billNo",
+                        display: false,
+                        labelWidth: 100,
+                        overHidden: true,
+                    },
+                    {
+                        label: "商品HS-CODE",
+                        prop: "hscode",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        // cell:true,
+                        type: "select",
+                        // dicData:[],
+                        props: {
+                            label: "hsCode",
+                            value: "hsCode",
+                            res: 'data.records'
+                        },
+                        remote: true,
+                        dicUrl: '/api/blade-los/bcommodity/list?hsCode={{key}}',
+                        // dicFormatter: (res => {
+                        //     return res.data.records
+                        // }),
+                    },
+                    {
+                        label: "商品简称",
+                        prop: "commodityShName",
+                        labelWidth: 100,
+                        width: "120",
+                        display: false,
+                        overHidden: true,
+                    },
+                    {
+                        label: "商品中文名称",
+                        prop: "commodityCnName",
+                        labelWidth: 100,
+                        width: "120",
+                        display: false,
+                        overHidden: true,
+                    },
+                    {
+                        label: "商品英文名称",
+                        prop: "commodityEnName",
+                        labelWidth: 100,
+                        width: "120",
+                        display: false,
+                        overHidden: true,
+                    },
+                    {
+                        label: "货物短描",
+                        prop: "commodityShortDescr",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "货物描述",
+                        prop: "commodityDescr",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "唛头",
+                        prop: "marks",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "包装单位",
+                        prop: "packingUnit",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                        type: "select",
+                        dicData: [],
+                        props: {
+                            label: "cnName",
+                            value: "cnName"
+                        },
+                        remote: true,
+                        dicUrl: '/api/blade-los/bunits/list?cnName={{key}}',
+                        dicFormatter: (res => {
+                            return res.data.records
+                        }),
+                    },
+                    {
+                        label: "装箱件数",
+                        prop: "quantity",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "装箱毛重(KGM)",
+                        prop: "grossWeight",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "装箱净重(KGM)",
+                        prop: "netWeight",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "装箱体积(CBM)",
+                        prop: "measurement",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "是否危险品",
+                        prop: "isDangerous",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        type: "select",
+                        dicData: [],
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey"
+                        },
+                        cell: true,
+                    },
+                    {
+                        label: "危险品分类代码(IMDG CODE)",
+                        prop: "dgImdgCode",
+                        labelWidth: 100,
+                        width: "200",
+                        overHidden: true,
+                        display: false,
+                        cell: true,
+                    },
+                    {
+                        label: "危险品分类代码名称",
+                        prop: "dgImdgName",
+                        labelWidth: 100,
+                        width: "140",
+                        overHidden: true,
+                        display: false,
+                        cell: true,
+                    },
+                    {
+                        label: "危险品国际代码",
+                        prop: "dgUnCode",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        display: false,
+                        cell: true,
+                    },
+                    {
+                        label: "危险品名称",
+                        prop: "dgCommodityName",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        display: false,
+                        cell: true,
+                    },
+                    {
+                        label: "危险品包装单位",
+                        prop: "dgPackingUnit",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        display: false,
+                        type: "select",
+                        dicData: [],
+                        props: {
+                            label: "cnName",
+                            value: "cnName"
+                        },
+                        cell: true,
+                        remote: true,
+                        dicUrl: '/api/blade-los/bunits/list?cnName={{key}}',
+                        dicFormatter: (res => {
+                            return res.data.records
+                        }),
+                    },
+                    {
+                        label: "危险品包装等级",
+                        prop: "dgPackingLevel",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        display: false,
+                        cell: true,
+                    },
+                    {
+                        label: "易燃易爆品闪点",
+                        prop: "dgFlashPoint",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        display: false,
+                        cell: true,
+                    },
+                    {
+                        label: "易燃易爆品闪点单位",
+                        prop: "dgFlashPointUnit",
+                        labelWidth: 100,
+                        width: "140",
+                        overHidden: true,
+                        display: false,
+                        cell: true,
+                    },
+                    {
+                        label: "危险品联系人",
+                        prop: "dgContacts",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        display: false,
+                        cell: true,
+                    },
+                    {
+                        label: "危险品联系人电话",
+                        prop: "dgTel",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        display: false,
+                        cell: true,
+                    },
+                    {
+                        label: "是否海洋污染物",
+                        prop: "dgIsMarinePollutant",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        type: "select",
+                        dicData: [],
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey"
+                        },
+                        cell: true,
+                    },
+                    {
+                        label: "是否申报数量",
+                        prop: "dgIsDeclareQuantity",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        type: "select",
+                        dicData: [],
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey"
+                        },
+                        cell: true,
+                    },
+                    {
+                        label: "CAS NO",
+                        prop: "dgCasNo",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "CAA INFO",
+                        prop: "dgCaaInfo",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "DC Weight",
+                        prop: "dgDcWeight",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "Emergency温度",
+                        prop: "dgEmerTemperature",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "Emergency温度单位",
+                        prop: "dgEmerTemperatureUnit",
+                        labelWidth: 100,
+                        width: "140",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "Control温度",
+                        prop: "dgCtrlTemperature",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "Control温度单位",
+                        prop: "dgCtrlTemperatureUnit",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "左超 厘米",
+                        prop: "overLeft",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "右超 厘米",
+                        prop: "overRight",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "前超 厘米",
+                        prop: "overFront",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "后超 厘米",
+                        prop: "overBack",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "超高 厘米",
+                        prop: "overTop",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                ]
+            },
+            selectionDetailList: [], // 选中的数据
+            loading: false,
+            Detailform: {},
+        }
+    },
+    comments: {
 
-        },
-        async created() {
-            this.optionDetail = await this.getColumnData(this.getColumnName(309.4), this.optionBackDetail);
-            this.bcommodityListfun()
-            this.packingUnitListfun()
-            this.dgPackingUnitListfun()
-            this.ifInvoiceWorkDictsfun()
-        },
-        watch:{
-            // 监听
-            "Detailform.isDangerous":{
-                // 执行方法
-                handler(oldValue,newValue) {
-                   if (oldValue == '1') {
-                       this.findObject(this.optionDetail.column, "dgImdgCode").display = true
-                       this.findObject(this.optionDetail.column, "dgImdgName").display = true
-                       this.findObject(this.optionDetail.column, "dgUnCode").display = true
-                       this.findObject(this.optionDetail.column, "dgCommodityName").display = true
-                       this.findObject(this.optionDetail.column, "dgPackingUnit").display = true
-                       this.findObject(this.optionDetail.column, "dgPackingLevel").display = true
-                       this.findObject(this.optionDetail.column, "dgFlashPoint").display = true
-                       this.findObject(this.optionDetail.column, "dgFlashPointUnit").display = true
-                       this.findObject(this.optionDetail.column, "dgContacts").display = true
-                       this.findObject(this.optionDetail.column, "dgTel").display = true
-                   }else if (oldValue == '0') {
-                       this.findObject(this.optionDetail.column, "dgImdgCode").display = false
-                       this.findObject(this.optionDetail.column, "dgImdgName").display = false
-                       this.findObject(this.optionDetail.column, "dgUnCode").display = false
-                       this.findObject(this.optionDetail.column, "dgCommodityName").display = false
-                       this.findObject(this.optionDetail.column, "dgPackingUnit").display = false
-                       this.findObject(this.optionDetail.column, "dgPackingLevel").display = false
-                       this.findObject(this.optionDetail.column, "dgFlashPoint").display = false
-                       this.findObject(this.optionDetail.column, "dgFlashPointUnit").display = false
-                       this.findObject(this.optionDetail.column, "dgContacts").display = false
-                       this.findObject(this.optionDetail.column, "dgTel").display = false
-                   }else {
+    },
+    async created() {
+        this.optionDetail = await this.getColumnData(this.getColumnName(309.4), this.optionBackDetail);
+        this.bcommodityListfun()
+        this.packingUnitListfun()
+        this.dgPackingUnitListfun()
+        this.ifInvoiceWorkDictsfun()
+    },
+    watch: {
+        // 监听
+        "Detailform.isDangerous": {
+            // 执行方法
+            handler(oldValue, newValue) {
+                if (oldValue == '1') {
+                    this.findObject(this.optionDetail.column, "dgImdgCode").display = true
+                    this.findObject(this.optionDetail.column, "dgImdgName").display = true
+                    this.findObject(this.optionDetail.column, "dgUnCode").display = true
+                    this.findObject(this.optionDetail.column, "dgCommodityName").display = true
+                    this.findObject(this.optionDetail.column, "dgPackingUnit").display = true
+                    this.findObject(this.optionDetail.column, "dgPackingLevel").display = true
+                    this.findObject(this.optionDetail.column, "dgFlashPoint").display = true
+                    this.findObject(this.optionDetail.column, "dgFlashPointUnit").display = true
+                    this.findObject(this.optionDetail.column, "dgContacts").display = true
+                    this.findObject(this.optionDetail.column, "dgTel").display = true
+                } else if (oldValue == '0') {
+                    this.findObject(this.optionDetail.column, "dgImdgCode").display = false
+                    this.findObject(this.optionDetail.column, "dgImdgName").display = false
+                    this.findObject(this.optionDetail.column, "dgUnCode").display = false
+                    this.findObject(this.optionDetail.column, "dgCommodityName").display = false
+                    this.findObject(this.optionDetail.column, "dgPackingUnit").display = false
+                    this.findObject(this.optionDetail.column, "dgPackingLevel").display = false
+                    this.findObject(this.optionDetail.column, "dgFlashPoint").display = false
+                    this.findObject(this.optionDetail.column, "dgFlashPointUnit").display = false
+                    this.findObject(this.optionDetail.column, "dgContacts").display = false
+                    this.findObject(this.optionDetail.column, "dgTel").display = false
+                } else {
 
-                   }
-                },
-                deep: true, // 深度监听
-                immediate: true  // 第一次改变就执行
+                }
             },
+            deep: true, // 深度监听
+            immediate: true  // 第一次改变就执行
         },
-        mounted() {
+    },
+    mounted() {
 
+    },
+    methods: {
+        // 货物详情弹窗开启
+        DetailAdd() {
+            this.$refs.crudDetail.rowAdd()
         },
-        methods:{
-            // 货物详情弹窗开启
-            DetailAdd(){
-                this.$refs.crudDetail.rowAdd()
-            },
-            // 货物明细单个保存接口
-            rowSaveDetail(row,done,loading){
-                row.billNo = this.assemblyForm.billNo
-                row.ppId = this.assemblyForm.id
-                row.pid = this.selectionList[0].id
-                row.lineNo = this.selectionList[0].containersCommodityList.length
-                for (let item of this.hscodeData) {
-                    if (item.hsCode == row.hscode) {
-                        this.$set(row,'commodityShName',item.ncmCode)
-                        this.$set(row,'commodityCnName',item.cnName)
-                        this.$set(row,'commodityEnName',item.enName)
-                    }
+        // 货物明细单个保存接口
+        rowSaveDetail(row, done, loading) {
+            row.billNo = this.assemblyForm.billNo
+            row.ppId = this.assemblyForm.id
+            row.pid = this.selectionList[0].id
+            row.lineNo = this.selectionList[0].containersCommodityList.length
+            for (let item of this.hscodeData) {
+                if (item.hsCode == row.hscode) {
+                    this.$set(row, 'commodityShName', item.ncmCode)
+                    this.$set(row, 'commodityCnName', item.cnName)
+                    this.$set(row, 'commodityEnName', item.enName)
                 }
-                for (let item of this.packingUnitData) {
-                    if (item.cnName == row.cnName) {
-                        this.$set(row,'packingUnitId',item.id)
-                        this.$set(row,'packingUnit',item.cnName)
-                    }
+            }
+            for (let item of this.packingUnitData) {
+                if (item.cnName == row.cnName) {
+                    this.$set(row, 'packingUnitId', item.id)
+                    this.$set(row, 'packingUnit', item.cnName)
                 }
-                for (let item of this.dgPackingUnitData) {
-                    if (item.cnName == row.cnName) {
-                        this.$set(row,'dgPackingUnitId',item.id)
-                        this.$set(row,'dgPackingUnit',item.cnName)
-                    }
+            }
+            for (let item of this.dgPackingUnitData) {
+                if (item.cnName == row.cnName) {
+                    this.$set(row, 'dgPackingUnitId', item.id)
+                    this.$set(row, 'dgPackingUnit', item.cnName)
                 }
-                containerscommoditySubmit(row).then(res=>{
-                    this.$message.success("操作成功!");
-                    this.$emit('billsDetailfun')
-                    done();
-                },error => {
-                    loading();
-                })
-            },
-            dicChange(name,row){
-                if(name=='hscode'){
-                    if(row){
-                        this.$set(this.Detailform,'commodityShName',row.ncmCode)
-                        this.$set(this.Detailform,'commodityCnName',row.cnName)
-                        this.$set(this.Detailform,'commodityEnName',row.enName)
-                    }else{
-                        this.$set(this.Detailform,'commodityShName',null)
-                        this.$set(this.Detailform,'commodityCnName',null)
-                        this.$set(this.Detailform,'commodityEnName',null)
-                    }
+            }
+            containerscommoditySubmit(row).then(res => {
+                this.$message.success("操作成功!");
+                this.$emit('billsDetailfun')
+                done();
+            }, error => {
+                loading();
+            })
+        },
+        dicChange(name, row) {
+            if (name == 'hscode') {
+                if (row) {
+                    this.$set(this.Detailform, 'commodityShName', row.ncmCode)
+                    this.$set(this.Detailform, 'commodityCnName', row.cnName)
+                    this.$set(this.Detailform, 'commodityEnName', row.enName)
+                } else {
+                    this.$set(this.Detailform, 'commodityShName', null)
+                    this.$set(this.Detailform, 'commodityCnName', null)
+                    this.$set(this.Detailform, 'commodityEnName', null)
                 }
-            },
-            // 行编辑保存
-            addUpdateDetail(row,index,done,loading){
-                row.lineNo = index
-                for (let item of this.hscodeData) {
-                    if (item.hsCode == row.hscode) {
-                        this.$set(row,'commodityShName',item.ncmCode)
-                        this.$set(row,'commodityCnName',item.cnName)
-                        this.$set(row,'commodityEnName',item.enName)
-                    }
+            }
+            if (name == 'packingUnit') {
+                if (row) {
+                    this.$set(this.Detailform, 'packingUnitId', row.id)
+                    this.$set(this.Detailform, 'packingUnit', row.cnName)
+                } else {
+                    this.$set(this.Detailform, 'packingUnitId', null)
+                    this.$set(this.Detailform, 'packingUnit', null)
                 }
-                for (let item of this.packingUnitData) {
-                    if (item.cnName == row.cnName) {
-                        this.$set(row,'packingUnitId',item.id)
-                        this.$set(row,'packingUnit',item.cnName)
-                    }
+            }
+        },
+        // 行编辑保存
+        addUpdateDetail(row, index, done, loading) {
+            row.lineNo = index
+            for (let item of this.hscodeData) {
+                if (item.hsCode == row.hscode) {
+                    this.$set(row, 'commodityShName', item.ncmCode)
+                    this.$set(row, 'commodityCnName', item.cnName)
+                    this.$set(row, 'commodityEnName', item.enName)
                 }
-                for (let item of this.dgPackingUnitData) {
-                    if (item.cnName == row.cnName) {
-                        this.$set(row,'dgPackingUnitId',item.id)
-                        this.$set(row,'dgPackingUnit',item.cnName)
-                    }
+            }
+            for (let item of this.packingUnitData) {
+                if (item.cnName == row.cnName) {
+                    this.$set(row, 'packingUnitId', item.id)
+                    this.$set(row, 'packingUnit', item.cnName)
                 }
-                containerscommoditySubmit(row).then(res=>{
-                    this.$message.success("操作成功!");
-                    this.$emit('billsDetailfun')
-                    done();
-                },error => {
-                    loading();
-                })
-            },
-            // 货物明细批量保存接口
-            containerscommoditySubmitListfun(){
-                if (this.selectionDetailList.length === 0) {
-                    this.$message.warning("请选择至少一条数据");
-                    return;
+            }
+            for (let item of this.dgPackingUnitData) {
+                if (item.cnName == row.cnName) {
+                    this.$set(row, 'dgPackingUnitId', item.id)
+                    this.$set(row, 'dgPackingUnit', item.cnName)
                 }
-                this.$confirm("确定将选择数据保存?", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(()=>{
-                    for(let item of this.selectionDetailList) {
-                        item.billNo = this.assemblyForm.billNo
-                        item.ppId = this.assemblyForm.id
-                        item.pid = this.selectionList[0].id
-                        item.lineNo = this.selectionList[0].containersCommodityList.length
-                    }
-                    containerscommoditySubmitList(this.selectionDetailList).then(res=>{
-                        this.$message.success("操作成功!");
-                        this.containersCommodityList = []
-                        this.$emit('billsDetailfun')
-                    })
-                })
-            },
-            // 编辑
-            editfun(row,index) {
-                // this.Detailform = row
-                this.$set(row,'$cellEdit',true)
-            },
-            BatchDelete(){
-                if (this.selectionDetailList.length === 0) {
-                    this.$message.warning("请选择至少一条数据");
-                    return;
+            }
+            containerscommoditySubmit(row).then(res => {
+                this.$message.success("操作成功!");
+                this.$emit('billsDetailfun')
+                done();
+            }, error => {
+                loading();
+            })
+        },
+        allEdit(){
+            this.containersCommodityList.forEach(row=>{
+                this.$set(row, '$cellEdit', true)
+            })
+        },
+        // 货物明细批量保存接口
+        containerscommoditySubmitListfun() {
+            // if (this.selectionDetailList.length === 0) {
+            //     this.$message.warning("请选择至少一条数据");
+            //     return;
+            // }
+            this.$confirm("确定将选择数据保存?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                for (let item of this.containersCommodityList) {
+                    item.billNo = this.assemblyForm.billNo
+                    item.ppId = this.assemblyForm.id
+                    item.pid = this.selectionList[0].id
+                    item.lineNo = this.selectionList[0].containersCommodityList.length
                 }
-                let ids = [];
-                this.selectionDetailList.forEach(ele => {
-                    ids.push(ele.id);
-                });
-                this.containerscommodityRemovefun(ids.join(","))
-            },
-            // 箱货物明细删除接口
-            containerscommodityRemovefun(id,index){
-                this.$confirm("确定将选择数据删除?", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(()=>{
-                    containerscommodityRemove(id).then(res=>{
-                        this.$message.success("操作成功!");
-                        this.$emit('billsDetailfun')
-                    })
-                })
-            },
-            // 获取商品数据
-            bcommodityListfun(){
-                bcommodityList(1,10).then(res=>{
-                    this.hscodeData = res.data.data.records
-                    this.findObject(this.optionDetail.column, "hscode").dicData = res.data.data.records
-                })
-            },
-            // 获取包装单位
-            packingUnitListfun(){
-                getBunitsList(1,10).then(res=>{
-                    this.packingUnitData = res.data.data.records
-                    this.findObject(this.optionDetail.column, "packingUnit").dicData = res.data.data.records
-                })
-            },
-            // 获取危险品包装单位
-            dgPackingUnitListfun(){
-                getBunitsList(1,10).then(res=>{
-                    this.dgPackingUnitData = res.data.data.records
-                    this.findObject(this.optionDetail.column, "dgPackingUnit").dicData = res.data.data.records
+                containerscommoditySubmitList(this.containersCommodityList).then(res => {
+                    this.$message.success("操作成功!");
+                    this.containersCommodityList = []
+                    this.$emit('billsDetailfun')
                 })
-            },
-            // 全部是否字典
-            ifInvoiceWorkDictsfun(){
-                getWorkDicts('ifInvoice').then(res=>{
-                    this.findObject(this.optionDetail.column, "isDangerous").dicData = res.data.data
-                    this.findObject(this.optionDetail.column, "dgIsMarinePollutant").dicData = res.data.data
-                    this.findObject(this.optionDetail.column, "dgIsDeclareQuantity").dicData = res.data.data
+            })
+        },
+        // 编辑
+        editfun(row, index) {
+            // this.Detailform = row
+            this.$set(row, '$cellEdit', true)
+        },
+        BatchDelete() {
+            if (this.selectionDetailList.length === 0) {
+                this.$message.warning("请选择至少一条数据");
+                return;
+            }
+            let ids = [];
+            this.selectionDetailList.forEach(ele => {
+                ids.push(ele.id);
+            });
+            this.containerscommodityRemovefun(ids.join(","))
+        },
+        // 箱货物明细删除接口
+        containerscommodityRemovefun(id, index) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                containerscommodityRemove(id).then(res => {
+                    this.$message.success("操作成功!");
+                    this.$emit('billsDetailfun')
                 })
-            },
+            })
+        },
+        // 获取商品数据
+        bcommodityListfun() {
+            bcommodityList(1, 10).then(res => {
+                this.hscodeData = res.data.data.records
+                this.findObject(this.optionDetail.column, "hscode").dicData = res.data.data.records
+            })
+        },
+        // 获取包装单位
+        packingUnitListfun() {
+            getBunitsList(1, 10).then(res => {
+                this.packingUnitData = res.data.data.records
+                this.findObject(this.optionDetail.column, "packingUnit").dicData = res.data.data.records
+            })
+        },
+        // 获取危险品包装单位
+        dgPackingUnitListfun() {
+            getBunitsList(1, 10).then(res => {
+                this.dgPackingUnitData = res.data.data.records
+                this.findObject(this.optionDetail.column, "dgPackingUnit").dicData = res.data.data.records
+            })
+        },
+        // 全部是否字典
+        ifInvoiceWorkDictsfun() {
+            getWorkDicts('ifInvoice').then(res => {
+                this.findObject(this.optionDetail.column, "isDangerous").dicData = res.data.data
+                this.findObject(this.optionDetail.column, "dgIsMarinePollutant").dicData = res.data.data
+                this.findObject(this.optionDetail.column, "dgIsDeclareQuantity").dicData = res.data.data
+            })
+        },
 
-            // 件数input
-            quantityBlur(row){
-                this.$set(row,'editGrossWeight',((row.grossWeight / row.quantity) * row.editQuantity).toFixed(2))
-                this.$set(row,'editMeasurement',((row.measurement / row.quantity) * row.editQuantity).toFixed(2))
-            },
-            // 编辑
-            waitingBoxeditfun(row,type) {
-                this.$set(row,'edit',type)
-            },
-            // 分配
-            allocationfun(row){
-                this.$emit('allocationfun',row)
-            },
-            // 撤回
-            withdrawfun(row,index){
-                // 先判断是否有id 有就把数据放到撤的数组里,增的数据清空
-                this.$emit('withdrawfun', {row,index})
-            },
-            // 多选
-            handleSelectionChange(list){
-                // this.ids = this.selectionDetailList.map()
-                this.selectionDetailList = list
-            },
-            // 表头样式
-            tableHeaderCellStyle({row,column,rowIndex, columnIndex}){
-                return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff;textAlign:center"
-            },
-            // 更改表格颜色
-            headerClassName(tab) {
-                //颜色间隔
-                let back = ""
-                if (tab.columnIndex >= 0 && tab.column.level === 1) {
-                    if (tab.columnIndex % 2 === 0) {
-                        back = "back-one"
-                    } else if (tab.columnIndex % 2 === 1) {
-                        back = "back-two"
-                    }
-                }
-                return back;
-            },
-            //自定义列保存
-            async saveColumnTwo(ref, option, optionBack, code) {
-                /**
-                 * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
-                 * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
-                 * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
-                 */
-                const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
-                if (inSave) {
-                    this.$message.success("保存成功");
-                    //关闭窗口
-                    this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                }
-            },
-            //自定义列重置
-            async resetColumnTwo(ref, option, optionBack, code) {
-                this[option] = this[optionBack];
-                const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
-                if (inSave) {
-                    this.$message.success("重置成功");
-                    this.$refs[ref].$refs.dialogColumn.columnBox = false;
+        // 件数input
+        quantityBlur(row) {
+            this.$set(row, 'editGrossWeight', ((row.grossWeight / row.quantity) * row.editQuantity).toFixed(2))
+            this.$set(row, 'editMeasurement', ((row.measurement / row.quantity) * row.editQuantity).toFixed(2))
+        },
+        // 编辑
+        waitingBoxeditfun(row, type) {
+            this.$set(row, 'edit', type)
+        },
+        // 分配
+        allocationfun(row) {
+            this.$emit('allocationfun', row)
+        },
+        // 撤回
+        withdrawfun(row, index) {
+            // 先判断是否有id 有就把数据放到撤的数组里,增的数据清空
+            this.$emit('withdrawfun', { row, index })
+        },
+        // 多选
+        handleSelectionChange(list) {
+            // this.ids = this.selectionDetailList.map()
+            this.selectionDetailList = list
+        },
+        // 表头样式
+        tableHeaderCellStyle({ row, column, rowIndex, columnIndex }) {
+            return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff;textAlign:center"
+        },
+        // 更改表格颜色
+        headerClassName(tab) {
+            //颜色间隔
+            let back = ""
+            if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                if (tab.columnIndex % 2 === 0) {
+                    back = "back-one"
+                } else if (tab.columnIndex % 2 === 1) {
+                    back = "back-two"
                 }
-            },
+            }
+            return back;
+        },
+        //自定义列保存
+        async saveColumnTwo(ref, option, optionBack, code) {
+            /**
+             * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+             * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+             * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
+             */
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+            this.ifInvoiceWorkDictsfun()
+            this.packingUnitListfun()
+            this.dgPackingUnitListfun()
+        },
+        //自定义列重置
+        async resetColumnTwo(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+            this.ifInvoiceWorkDictsfun()
+            this.packingUnitListfun()
+            this.dgPackingUnitListfun()
+        },
 
-        }
     }
+}
 
 </script>
 
 <style scoped lang="scss">
-    .tbasTop {
-        margin: 10px 0;
-    }
-    ::v-deep.el-table th.gutter {
-        display: table-cell !important
-    }
-    ::v-deep#out-table .back-one {
-        background: #ecf5ff !important;
-        text-align: center;
-        padding: 4px 0;
-    }
-    ::v-deep#out-table .back-two {
-        background: #ecf5ff !important;
-        text-align: center;
-        padding: 4px 0;
-    }
-    .textoverflow {
-        width: 100%;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-    }
+.tbasTop {
+    margin: 10px 0;
+}
+
+::v-deep.el-table th.gutter {
+    display: table-cell !important
+}
+
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+    text-align: center;
+    padding: 4px 0;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+    text-align: center;
+    padding: 4px 0;
+}
+
+.textoverflow {
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
 </style>

+ 2 - 2
src/views/iosBasicData/SeafreightExportF/bills/assembly/filescenter.vue

@@ -27,7 +27,7 @@
       </template>
 
       <template slot-scope="scope" slot="serialNo">
-        <el-input v-if="scope.row.edit" type="age" style="width: 100%;" v-model="scope.row.serialNo" size="small"
+        <el-input v-if="scope.row.edit" style="width: 100%;" v-model="scope.row.serialNo" size="small"
           autocomplete="off" :disabled="detailData.seeDisabled" clearable placeholder="请输入自定义序号"></el-input>
         <span v-else>{{ scope.row.serialNo }}</span>
       </template>
@@ -334,7 +334,7 @@ export default {
       row.pid = this.assemblyForm.id
       row.hblno = this.assemblyForm.hblno
       row.mblno = this.assemblyForm.mblno
-      row.serialNo = Number(row.serialNo)
+      row.serialNo = row.serialNo
       // 保存接口
       this.filescenterSubmitfun(row)
     },

+ 11 - 7
src/views/iosBasicData/bcorps/detailsPage.vue

@@ -1069,7 +1069,9 @@
         <el-button type="primary" @click="corpsAttnAddConfirm">确 定</el-button>
       </span>
     </el-dialog>
-
+    <dictbiz-dialog ref="dictbiz" title="添加客户来源" code="corp_Source" parentId="1866359762266894337"
+      @closed="getAllWorkDicts">
+    </dictbiz-dialog>
 
   </dev>
 </template>
@@ -1375,16 +1377,18 @@ export default {
         this.formData.enterpriseType = this.enterpriseTypeDict[0].dictKey
       }
     });
-    getWorkDicts('corp_Source').then((res) => {
-      this.corpSourceDict = res.data.data
-    });
-
+    this.getAllWorkDicts()
 
   },
   mounted() { },
   methods: {
-    addDic(){
-
+    addDic() {
+      this.$refs.dictbiz.open()
+    },
+    getAllWorkDicts() {
+      getWorkDicts('corp_Source').then((res) => {
+        this.corpSourceDict = res.data.data
+      });
     },
     // ps规则监听输入事件
     psRateValid(inputContent) {

+ 3 - 0
src/views/serviceConfiguration/businessbillno/index.vue

@@ -135,6 +135,7 @@
               prop: "businessTypeId",
               width: "180",
               search:true,
+              editDisplay:false,
               formslot: true,
               type: 'select',
               props: {
@@ -161,12 +162,14 @@
             {
               label: "业务类型代码",
               prop: "businessType",
+              editDisplay:false,
               width: "100",
               readonly: true
             },
             {
               label: "单据号码格式代码",
               prop: "code",
+              editDisplay:false,
               width: "120",
               rules: [{
                 required: true,

+ 1 - 17
src/views/tirePartsMall/statisticAnalysis/outboundStatistics/index.vue

@@ -63,7 +63,7 @@ export default {
                 viewBtn: false,
                 editBtn: false,
                 delBtn: false,
-                searchMenuSpan: 12,
+                searchMenuSpan: 18,
                 emptyBtnText: '清空所有条件',
                 menu: false,
                 column: [
@@ -191,22 +191,6 @@ export default {
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd",
-                    },
-                    {
-                        label: "类型",
-                        prop: "type",
-                        type: 'select',
-                        dicData: [{
-                            label: '自有',
-                            value: 0
-                        }, {
-                            label: '融资',
-                            value: 1
-                        }],
-                        search: true,
-                        searchValue: 1,
-                        showColumn: false,
-                        hide: true,
                     }
                 ],
             },