货代发送EDI和轮胎机构 2023-12-5

public/MP_verify_LCnI64lpRNzYbVOQ.txt

@@ -0,0 +1 @@
+LCnI64lpRNzYbVOQ

public/MP_verify_opAym2UgPN8GWvGu.txt

@@ -0,0 +1 @@
+opAym2UgPN8GWvGu

src/api/iosBasicData/bills.js

@@ -55,6 +55,14 @@ export const billsSendingEdi = (id) => {
     }
   })
 }
+// 新的发送edi
+export const editypesSendingEdi = (data) => {
+  return request({
+    url: '/api/blade-los/editypes/sendingEdi',
+    method: 'POST',
+    data: data
+  })
+}
 
 
 export const billsRemove = (ids) => {

src/option/system/paramService.js

@@ -43,6 +43,16 @@ export default {
         message: "请输入参数键值",
         trigger: "blur"
       }]
+    },
+    {
+      label: "所属公司",
+      prop: "salesCompanyName",
+      span: 24,
+      rules: [{
+        required: true,
+        message: "请选择所属公司",
+        trigger: "blur"
+      }]
     }
   ]
 };

src/router/views/index.js

@@ -2541,7 +2541,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tirePartsMall/basicData/commodityInformation/index',
-    name: '轮胎',
+    name: '商品',
     meta: {
       i18n: '/tirePartsMall/basicData/commodityInformation/index',
       keepAlive: true,

src/views/billM/billingCenter/index.vue

@@ -504,10 +504,39 @@
             },
             {
                 label: "开票CNY",
-                prop: "invoiceNo",
+                prop: "uninvoicedAmount",
                 overHidden:true,
             },
             {
+                label: "开票USD",
+                prop: "uninvoicedAmountUsd",
+                overHidden:true,
+            },
+            {
+                label: "付费申请金额CNY",
+                prop: "appliedAmount",
+                overHidden:true,
+                width: "120"
+            },
+            {
+                label: "付费申请金额USD",
+                prop: "appliedAmountUsd",
+                overHidden:true,
+                width: "120"
+            },
+            {
+                label: "申请发票金额CNY",
+                prop: "appliedInvoiceAmount",
+                overHidden:true,
+                width: "120"
+            },
+            {
+                label: "申请发票金额USD",
+                prop: "appliedInvoiceAmountUsd",
+                overHidden:true,
+                width: "120"
+            },
+            {
               label: "凭证号",
               prop: "voucherNo",
               width:"180",

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -410,8 +410,8 @@ export default {
         previewreportfun(){
             getreportsList(1,10,{
                 businessType:'FFSQ',
-                classifyCode:'付费申请',
-                groupCode:'付费申请'
+                classifyCode:'结算中心',
+                // groupCode:'付费结算'
             }).then(res=>{
                 if (res.data.data.records.length == 1){
                     this.reportRadio(res.data.data.records[0])
@@ -427,8 +427,8 @@ export default {
                     this.$nextTick(()=>{
                         this.$refs.reportformsList.onLoad(page,{
                             businessType:'FFSQ',
-                            classifyCode:'付费申请',
-                            groupCode:'付费申请'
+                            classifyCode:'结算中心',
+                            // groupCode:'付费结算'
                         })
                     })
                 }

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -3,7 +3,7 @@
         <!--:row-style="{height:'20px',padding:'0px',fontSize:'12px'}"-->
         <el-table
             ref="tableRef"
-            :cell-style="{padding:'0px',fontSize:'12px'}"
+            :cell-style="cellStyle"
             :header-cell-style="tableHeaderCellStyle"
             :data="tableData"
             border
@@ -23,7 +23,7 @@
             </el-table-column>
             <el-table-column
                 prop="isCleared"
-                label="核销">
+                label="核销" width="50px">
                 <template slot-scope="{ row }">
                     <span v-if="row.isCleared == item.dictKey" v-for="item in ifInvoiceData" :key="item.dictKey">
                         {{item.dictValue}}
@@ -31,6 +31,13 @@
                 </template>
             </el-table-column>
             <el-table-column
+                prop="dc"
+                label="收/付" width="50px">
+                <template slot-scope="{ row }">
+                    <span>{{row.dc}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
                 prop="billNo"
                 label="原业务编号" width="120px">
             </el-table-column>
@@ -53,13 +60,6 @@
                 </template>
             </el-table-column>
             <el-table-column
-                prop="dc"
-                label="收/付" width="120px">
-                <template slot-scope="{ row }">
-                    <span>{{row.dc}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column
                 prop="currentStlExrate"
                 label="汇率">
             </el-table-column>
@@ -112,7 +112,7 @@
             </el-table-column>
             <el-table-column
                 prop="etd"
-                label="ETD">
+                label="ETD" width="100px">
             </el-table-column>
             <el-table-column
                 prop="vesselCnName"
@@ -127,7 +127,7 @@
             </el-table-column>
             <el-table-column
                 prop="podCnName"
-                label="目的港">
+                label="目的港" width="100px">
             </el-table-column>
             <el-table-column
                 prop="quantityCntrTypesDescr"
@@ -386,6 +386,16 @@
                 }
                 return rowName; //也可以再加上其他类名 如果有需求的话
             },
+            // 收付展示不一样的颜色
+            cellStyle({row,rowIndex,columnIndex}){
+                let rowStyle = ''
+                if (row.dc == 'D') {
+                    rowStyle = 'color:#8cb24b;'
+                }else if (row.dc == 'C') {
+                    rowStyle = 'color:#7ebace;'
+                }else {}
+                return  rowStyle + 'padding:0px;fontSize:12px'
+            },
         },
         mounted() {
             // 按住ctrl实现多选 设置监听keydown事件,以及keyup事件，

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

@@ -3,6 +3,7 @@
         <div>
             <containers ref="containers" :assemblyForm="assemblyForm" :pid="assemblyForm.id"
                         :detailData="detailData"
+                        :pleasereviewType="pleasereviewType"
                         @selectionChange="selectionChange"
                         @rowSavefun="containersSubmitfun"
                         @billsDetailfun="billsDetailfun"
@@ -14,6 +15,7 @@
                              :assemblyForm="assemblyForm"
                              :detailData="detailData"
                              :selectionList="selectionList"
+                             :pleasereviewType="pleasereviewType"
                              @billsDetailfun="billsDetailfun"
                              @allocationfun="allocationfun"
                              @withdrawfun="withdrawfun"></PackingBusiness>
@@ -36,7 +38,12 @@ export default {
         },
         props:{
             assemblyForm:{},
-            detailData:{}
+            detailData:{},
+            // 请核禁用
+            pleasereviewType:{
+                type:Boolean,
+                default:false
+            }
         },
         data(){
             return {

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

@@ -24,11 +24,13 @@
                         <el-button
                             type="primary" plain
                             size="small"
+                            :disabled="pleasereviewType"
                             @click.stop="containerscommoditySubmitListfun"
                         >批量保存</el-button>
                         <el-button
                             type="danger" plain
                             size="small"
+                            :disabled="pleasereviewType"
                             @click.stop="BatchDelete"
                         >批量删除</el-button>
                     </template>
@@ -38,10 +40,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-edit"
+                            :disabled="pleasereviewType"
                             @click.stop="editfun(scope.row, scope.index)">
                             编辑
                         </el-button>
-                        <el-button type="text" size="small" @click="containerscommodityRemovefun(scope.row.id,scope.index)">删除</el-button>
+                        <el-button type="text" size="small"
+                                   :disabled="pleasereviewType"
+                                   @click="containerscommodityRemovefun(scope.row.id,scope.index)">删除
+                        </el-button>
                     </template>
                 </avue-crud>
             </el-tab-pane>
@@ -134,11 +140,17 @@
                             width="100">
                             <template slot-scope="scope">
                                 <el-button type="text" size="small" v-if="scope.row.edit"
-                                           :disabled="detailData.seeDisabled" @click="waitingBoxeditfun(scope.row,false)">保存</el-button>
+                                           :disabled="detailData.seeDisabled || pleasereviewType"
+                                           @click="waitingBoxeditfun(scope.row,false)">保存
+                                </el-button>
                                 <el-button type="text" size="small" v-else
-                                           :disabled="detailData.seeDisabled" @click="waitingBoxeditfun(scope.row,true)">编辑</el-button>
+                                           :disabled="detailData.seeDisabled || pleasereviewType"
+                                           @click="waitingBoxeditfun(scope.row,true)">编辑
+                                </el-button>
                                 <el-button type="text" size="small"
-                                           :disabled="detailData.seeDisabled" @click="allocationfun(scope.row)">分配</el-button>
+                                           :disabled="detailData.seeDisabled || pleasereviewType"
+                                           @click="allocationfun(scope.row)">分配
+                                </el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -229,6 +241,11 @@
             selectionList:{
                 type:Array,
             },
+            // 请核禁用
+            pleasereviewType:{
+                type:Boolean,
+                default:false
+            }
         },
         data(){
             return {
@@ -669,7 +686,7 @@
                        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 {
+                   }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
@@ -680,6 +697,8 @@
                        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, // 深度监听

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

@@ -21,11 +21,26 @@
                   <div style="display: flex;align-items: center;justify-content: space-between">
                       <div>
                           <!--<el-button type="primary" size="small" @click="DistributionBox">配箱</el-button>-->
-                          <el-button type="danger" size="small" :disabled="detailData.seeDisabled" @click="revokefun">撤销</el-button>
-                          <el-button type="danger" size="small" :disabled="detailData.seeDisabled" @click="wholeRevokefun">全部撤销</el-button>
-                          <el-button type="warning" size="small" :disabled="detailData.seeDisabled" @click="cleanCntrNofun">清除箱号</el-button>
-                          <el-button type="primary" size="small" :disabled="detailData.seeDisabled" @click="containersSubmitListfun" >批量保存</el-button>
-                          <el-button type="success" size="small" :disabled="detailData.seeDisabled || !assemblyForm.id" @click="excelBox = true" >导入箱号,铅封号</el-button>
+                          <el-button type="danger" size="small"
+                                     :disabled="detailData.seeDisabled || pleasereviewType"
+                                     @click="revokefun">撤销
+                          </el-button>
+                          <el-button type="danger" size="small"
+                                     :disabled="detailData.seeDisabled || pleasereviewType"
+                                     @click="wholeRevokefun">全部撤销
+                          </el-button>
+                          <el-button type="warning" size="small"
+                                     :disabled="detailData.seeDisabled || pleasereviewType"
+                                     @click="cleanCntrNofun">清除箱号
+                          </el-button>
+                          <el-button type="primary" size="small"
+                                     :disabled="detailData.seeDisabled || pleasereviewType"
+                                     @click="containersSubmitListfun" >批量保存
+                          </el-button>
+                          <el-button type="success" size="small"
+                                     :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType"
+                                     @click="excelBox = true" >导入箱号,铅封号
+                          </el-button>
 
                           <!--<el-button type="warning" size="small"-->
                           <!--           :disabled="numberfalsefun() || assemblyForm.id"-->
@@ -43,11 +58,11 @@
                              @click.stop="rowSavefun(scope.row, scope.index)">保存
                   </el-button>
                   <el-button v-else :type="scope.type" :size="scope.size" icon="el-icon-edit"
-                             :disabled="detailData.seeDisabled"
+                             :disabled="detailData.seeDisabled || pleasereviewType"
                              @click.stop="rowCellfun(scope.row, scope.index)">编辑
                   </el-button>
                   <el-button :type="scope.type" :size="scope.size" icon="el-icon-delete"
-                             :disabled="detailData.seeDisabled"
+                             :disabled="detailData.seeDisabled || pleasereviewType"
                              @click.stop="rowDel(scope.row, scope.index)">删除
                   </el-button>
               </template>
@@ -133,7 +148,12 @@ import {getToken} from "@/util/auth";
       components: {SearchQuery,bports},
       props:{
           assemblyForm:{},
-          detailData:{}
+          detailData:{},
+          // 请核禁用
+          pleasereviewType:{
+              type:Boolean,
+              default:false,
+          }
       },
     data() {
       return {

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

@@ -315,6 +315,7 @@
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled" rows="5"
                                           clearable placeholder="备注唛头"
+                                          @input="handleInput($event,'marks')"
                                           @blur="textareaBlur('marks')" ></el-input>
                             </div>
                             <div style="margin-top: 4px">
@@ -569,7 +570,7 @@
                 </el-col>
             </el-row>
 
-            <el-row :gutter="20">
+            <el-row :gutter="0">
                 <el-col :span="12">
                     <el-form-item label="COLOADER" prop="coloaderCnName" >
                         <span slot="label">
@@ -1226,6 +1227,18 @@ import {NdayDate} from "@/util/date";
                     })
                     .catch(_ => {});
             },
+            handleInput(event,name){
+                console.log(event,1231)
+                // 2E80-2EFF   CJK 部首补充    2F00-2FDF   康熙字典部首
+                // 3000-303F   CJK 符号和标点   31C0-31EF   CJK 笔画
+                // 3200-32FF   封闭式 CJK 文字和月份   3300-33FF   CJK 兼容
+                // 3400-4DBF   CJK 统一表意符号扩展 A  4DC0-4DFF   易经六十四卦符号
+                // 4E00-9FBF   CJK 统一表意符号  F900-FAFF   CJK 兼容象形文字
+                // FE30-FE4F   CJK 兼容形式    FF00-FFEF   全角ASCII、全角标点
+                // 匹配中文字符
+                let a = event.replace(/[\u2E80-\u2EFF\u2F00-\u2FDF\u3000-\u303F\u31C0-\u31EF\u3200-\u32FF\u3300-\u33FF\u3400-\u4DBF\u4DC0-\u4DFF\u4E00-\u9FBF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]+/g, '')
+                this.assemblyForm[name] = a
+            },
             // text文本框input
             textareaBlur(name){
                 console.log(name,1160)

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

@@ -124,6 +124,7 @@ import {
             saveBtn:false,
             cancelBtn:false,
             cellBtn:true, // 行编辑
+            menuWidth:140,
           column: [
             {
               label: "尺码箱型",

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

@@ -71,21 +71,21 @@
                         <span>应收费用</span>
                     </div>
                     <el-button type="danger" plain size="small"
-                               :disabled="!selectionDList.length || detailData.seeDisabled" @click="batchDelete('D')">批量删除</el-button>
+                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType" @click="batchDelete('D')">批量删除</el-button>
                     <el-button type="success" plain size="small"
-                               :disabled="!selectionDList.length || detailData.seeDisabled" @click="GenerateBillsfun('D')">应收账单
+                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType" @click="GenerateBillsfun('D')">应收账单
                     </el-button>
                     <el-button type="danger" plain size="small"
-                               :disabled="!selectionDList.length || detailData.seeDisabled" @click="RevokingBillsfun('D')">撤销账单
+                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType" @click="RevokingBillsfun('D')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
-                    <el-button type="success" plain size="small" :disabled="!this.assemblyForm.id || detailData.seeDisabled" @click="templateClick('D')">应收模板</el-button>
-                    <el-button type="info" plain size="small" :disabled="detailData.seeDisabled" @click="feecenterSubmitListfun">保存账单</el-button>
-                    <el-button type="primary" plain size="small" :disabled="detailData.seeDisabled" @click="copyfun('D')">生成应付</el-button>
+                    <el-button type="success" plain size="small" :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType" @click="templateClick('D')">应收模板</el-button>
+                    <el-button type="info" plain size="small" :disabled="detailData.seeDisabled || pleasereviewType" @click="feecenterSubmitListfun">保存账单</el-button>
+                    <el-button type="primary" plain size="small" :disabled="detailData.seeDisabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button type="primary" size="small" icon="el-icon-plus" circle
-                               :disabled="detailData.seeDisabled" @click="addDfun"></el-button>
+                               :disabled="detailData.seeDisabled || pleasereviewType" @click="addDfun"></el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
                     <span>{{scope.index + 1}}</span>
@@ -183,12 +183,12 @@
                     <span>{{row.isTax?'是':'否'}}</span>
                 </template>
                 <template slot="price" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.price" size="small"
+                    <el-input v-if="row.edit" type="number" v-model="row.price" size="small" :min="1"
                               placeholder="请输入" @blur="priceinputfun($event,row)"></el-input>
                     <span v-else>{{row.price}}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small"
+                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
                               placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{row.quantity}}</span>
                 </template>
@@ -199,8 +199,8 @@
                 </template>
                 <template slot-scope="scope" slot="menu">
                     <el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'D')">保存</el-button>
-                    <el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled" @click="editDfun(scope.row,scope.index)">编辑</el-button>
-                    <el-button type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled" @click="deletefun(scope.row,scope.index,'D')">删除</el-button>
+                    <el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="editDfun(scope.row,scope.index)">编辑</el-button>
+                    <el-button type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="deletefun(scope.row,scope.index,'D')">删除</el-button>
                 </template>
             </avue-crud>
         </el-card>
@@ -224,20 +224,35 @@
                         <span>应付费用</span>
                     </div>
                     <el-button type="danger" plain size="small"
-                               :disabled="!selectionCList.length || detailData.seeDisabled" @click="batchDelete('C')">批量删除</el-button>
+                               :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
+                               @click="batchDelete('C')">批量删除
+                    </el-button>
                     <el-button type="primary" plain size="small"
-                               :disabled="!selectionCList.length || detailData.seeDisabled" @click="GenerateBillsfun('C')" >应付账单</el-button>
+                               :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
+                               @click="GenerateBillsfun('C')" >应付账单
+                    </el-button>
                     <el-button type="danger" plain size="small"
-                               :disabled="!selectionCList.length || detailData.seeDisabled" @click="RevokingBillsfun('C')">撤销账单
+                               :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
+                               @click="RevokingBillsfun('C')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
-                    <el-button type="success" plain size="small" :disabled="!this.assemblyForm.id || detailData.seeDisabled" @click="templateClick('C')">应付模板</el-button>
-                    <el-button type="info" plain size="small" :disabled="detailData.seeDisabled" @click="feecenterSubmitListfun">保存账单</el-button>
-                    <el-button type="primary" plain size="small" :disabled="detailData.seeDisabled" @click="copyfun('C')">生成应收</el-button>
+                    <el-button type="success" plain size="small"
+                               :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
+                               @click="templateClick('C')">应付模板
+                    </el-button>
+                    <el-button type="info" plain size="small"
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="feecenterSubmitListfun">保存账单
+                    </el-button>
+                    <el-button type="primary" plain size="small"
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="copyfun('C')">生成应收
+                    </el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button type="primary" size="small" icon="el-icon-plus" circle
-                               :disabled="detailData.seeDisabled" @click="addCfun"></el-button>
+                               :disabled="detailData.seeDisabled || pleasereviewType" @click="addCfun">
+                    </el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
                     <span>{{scope.index + 1}}</span>
@@ -335,12 +350,12 @@
                     <span>{{row.isTax?'是':'否'}}</span>
                 </template>
                 <template slot="price" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.price" size="small"
+                    <el-input v-if="row.edit" type="number" v-model="row.price" size="small" :min="1"
                               placeholder="请输入" @blur="priceinputfun($event,row)"></el-input>
                     <span v-else>{{row.price}}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small"
+                    <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
                               placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{row.quantity}}</span>
                 </template>
@@ -351,8 +366,8 @@
                 </template>
                 <template slot-scope="scope" slot="menu">
                     <el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'C')">保存</el-button>
-                    <el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled" @click="editCfun(scope.row,scope.index)">编辑</el-button>
-                    <el-button type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled" @click="deletefun(scope.row,scope.index,'C')">删除</el-button>
+                    <el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="editCfun(scope.row,scope.index)">编辑</el-button>
+                    <el-button type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="deletefun(scope.row,scope.index,'C')">删除</el-button>
                 </template>
             </avue-crud>
         </el-card>
@@ -579,6 +594,11 @@
                 type:Object
             },
             detailData:{},
+            // 请核之后禁用
+            pleasereviewType:{
+                type:Boolean,
+                default:false,
+            },
         },
         data(){
             return {
@@ -1529,51 +1549,39 @@
             },
             // 批量删除
             batchDelete(dc){
-                let arr = []
-                if (dc == 'D') {
-                    for(let item of this.selectionDList) {
-                        if (item.id) {
-                            arr.push(item.id)
-                        }
-                    }
-                }else {
-                    for(let item of this.selectionCList) {
-                        if (item.id) {
-                            arr.push(item.id)
-                        }
-                    }
-                }
                 this.$confirm("确定将选择数据删除?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(()=>{
-                    if (arr.length != 0) {
-                        feecenterRemove(arr.join(',')).then(res=>{
-                            this.$message({
-                                type: "success",
-                                message: "操作成功!"
-                            });
-                            this.$emit('billsDetailfun')
-                        })
-                    }
+                    let multiList = []
+                    let arr = []
                     if (dc == 'D') {
-                        for (let index = this.selectionDList.length; index >= 0; index--) {
-                            this.assemblyForm.feeCenterListD.splice(index, 1)
-                        }
-                        // for (let item of this.selectionDList) {
-                        //     this.assemblyForm.feeCenterListD.splice(item.$index, 1)
-                        // }
+                        multiList = this.selectionDList
+                        arr = this.assemblyForm.feeCenterListD
                     }else {
-                        for (let index = this.selectionCList.length; index >= 0; index--) {
-                            this.assemblyForm.feeCenterListC.splice(index, 1)
+                        multiList = this.selectionCList
+                        arr = this.assemblyForm.feeCenterListC
+                    }
+                    // 获取有id 的数据
+                    const itemsWithId = multiList.filter(item => item.hasOwnProperty('id'));
+                    let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
+                    // 把选中的删除掉
+                    multiList.forEach((item)=>{
+                        for (let index in arr) {
+                            if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                                arr.splice(Number(index),1)
+                            }
                         }
-                        // for (let item of this.selectionCList) {
-                        //     this.assemblyForm.feeCenterListC.splice(item.$index, 1)
-                        // }
+                    })
+                    // 有id 的处理
+                    if(itemsWithId.length != 0) {
+                        feecenterRemove(arrIds.join(',')).then(res=>{
+                            this.$message.success('操作成功')
+                            // this.$emit('billsDetailfun')
+                        })
                     }
                 })
-                // this.deletefun({id:arr.join(',')})
             },
             // 应收删除
             deletefun(row,index,dc) {

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

@@ -251,6 +251,8 @@
             {
               label: "文件名",
               prop: "fileName",
+                width: "120",
+
             },
             {
               label: "文件扩展名",

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

@@ -15,16 +15,22 @@
                 <!--    <div>-->
 
                 <!--    </div>-->
-                <el-button size="small" type="success" style="margin-right: 8px"
-                           :loading="saveLoading" :disabled="!form.id" @click="billsSendingEdifun" >发送 EDI
-                </el-button>
+
+                <el-dropdown style="line-height: 0">
+                    <el-button size="small" type="success" style="margin-right: 8px"
+                               :loading="saveLoading" :disabled="!form.id" >
+                        发送 EDI<i class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item v-for="item in ediData" :key="item.id"
+                                          @click.native="editypesSendingEdifun(item)">{{item.cnName}}
+                        </el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" @click="previewDialogfun" >预 览
                 </el-button>
-                <!--</el-popover>-->
-                <!--<el-button  size="small" type="warning" style="margin-right: 8px"-->
-                <!--            :loading="saveLoading" >打 印-->
-                <!--</el-button>-->
                 <el-button size="small" type="warning" :disabled="!form.id" v-if="form.status == 1"
                            @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
@@ -158,7 +164,7 @@
                                                                       :remote="true"
                                                                       :disabled="detailData.seeDisabled || item[2].disabled"
                                                                       :buttonIf="false"
-                                                                      :forParameter="item[1].forParameter"
+                                                                      :forParameter="item[2].forParameter"
                                                                       :placeholder="`请选择${item[2].text || ''}`"
                                                                       @remoteMethod="remoteMethod($event,item[2].prop)"
                                                                       @corpChange="corpChange($event,item[2].prop)"
@@ -219,7 +225,10 @@
                                     </entrustment-lnformation>
                                 </el-tab-pane>
                                 <el-tab-pane label="配箱处理" name="second">
-                                    <DistributionBox :assemblyForm="form" :detailData="detailData" @billsDetailfun="billsDetailfun(form.id)"></DistributionBox>
+                                    <DistributionBox :assemblyForm="form" :detailData="detailData"
+                                                     :pleasereviewType="pleasereviewType"
+                                                     @billsDetailfun="billsDetailfun(form.id)">
+                                    </DistributionBox>
                                 </el-tab-pane>
                                 <el-tab-pane label="MB/L信息" name="third">
                                     <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>
@@ -241,7 +250,7 @@
                     </div>
                 </el-tab-pane>
                 <el-tab-pane label="费用信息" name="fy">
-                    <feecenter :assemblyForm="form" :detailData="detailData" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
+                    <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">
                     <document-center ref="documentCenter" :assemblyForm="form" ></document-center>
@@ -265,7 +274,6 @@
                    :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <business-reports :id="form.id" :disabled="detailData.seeDisabled"></business-reports>
         </el-dialog>
-
     </div>
 </template>
 
@@ -294,9 +302,9 @@ import {
     billsCheckBills, billsCopyBills,
     billsDetail,
     billsGetBillNo,
-    billsListAll, billsRevokeCheckBills, billsSendingEdi,
+    billsListAll, billsRevokeCheckBills, editypesSendingEdi,
     billsSubmit,
-    deptGetDetailPol
+    deptGetDetailPol,
 } from '@/api/iosBasicData/bills'
 import {dateFormat} from "@/util/date";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -304,6 +312,8 @@ import {getBvesselsList} from "@/api/iosBasicData/bvessels";
 import DocumentCenter from "@/views/iosBasicData/SeafreightExportF/bills/assembly/DocumentCenter.vue";
 import businessReports from "@/views/iosBasicData/SeafreightExportF/bills/assembly/businessReports.vue";
 import {popupReminder} from "@/util/messageReminder";
+import editypes from "@/views/iosBasicData/editypes/index.vue";
+import {editypesList} from "@/api/iosBasicData/editypes";
     export default {
         components:{
             checkSchedule,
@@ -321,7 +331,8 @@ import {popupReminder} from "@/util/messageReminder";
             SplitList,
             TreeSelect,
             DocumentCenter,
-            businessReports
+            businessReports,
+            editypes,
         },
         props:{
             detailData: {
@@ -330,8 +341,10 @@ import {popupReminder} from "@/util/messageReminder";
         },
         data() {
             return {
+                ediData:[], // edi 列表数据
                 previewDialog:false, // 预览报表弹窗开启
                 generateBillsfalse:false, // 如果生成账单就禁用
+                pleasereviewType:false, // 如果请核就禁用
                 checkScheduleDialog:false, // 审核弹窗
                 checkId:'', // 审核需要的id
                 batchNo:'',
@@ -701,12 +714,21 @@ import {popupReminder} from "@/util/messageReminder";
             this.getLazylistfun() // 获取审核数据
             this.mpaymodeWorkDictsfun() // 获取 付款方式字典
             this.srcTypeWorkDictsfun()
+            // 获取EDI 数据
+            this.editypesListfun()
         },
         methods:{
+            // 获取EDI列表数据
+            editypesListfun(){
+                editypesList(1,30).then(res=>{
+                    this.ediData = res.data.data.records
+                })
+            },
             // 发送edi
-            billsSendingEdifun(){
+            editypesSendingEdifun(row){
+                row.billId = this.form.id
                 this.saveLoading = true
-                billsSendingEdi(this.form.id).then(res=>{
+                editypesSendingEdi(row).then(res=>{
                     this.saveLoading = false
                     this.$message.success('操作成功,请去文件中心查看')
                     this.billsDetailfun(this.form.id) // 详情接口
@@ -762,9 +784,12 @@ import {popupReminder} from "@/util/messageReminder";
             },
             // 获取付款方式字典数据
             mpaymodeWorkDictsfun(){
+                console.log(787)
                 getWorkDicts('payment_method_los').then((res) => {
+                    console.log(res,789)
                     this.columnforfun('mpaymode').dicData = res.data.data
                     this.columnforfun('hpaymode').dicData = res.data.data
+                    console.log(this.columnforfun('hpaymode'),792)
                 })
             },
             // 获取核算部分数据 // 机构管理接口
@@ -1030,9 +1055,9 @@ import {popupReminder} from "@/util/messageReminder";
                     // 主单付费方式
                     this.form[name] = value
                     if (value == 'PP') {
-                        this.$set(this.form,'mpayplace',this.form.polEnName.split(' - ')[0])
+                        this.$set(this.form,'mpayplace',this.form.polEnName?this.form.polEnName.split(' - ')[0]:'')
                     }else {
-                        this.$set(this.form,'mpayplace',this.form.podEnName.split(' - ')[0])
+                        this.$set(this.form,'mpayplace',this.form.podEnName?this.form.podEnName.split(' - ')[0]:'')
                     }
                 }
                 else if (name == 'hpaymode') {
@@ -1380,6 +1405,7 @@ import {popupReminder} from "@/util/messageReminder";
                 this.form = res.data.data;
                 // 先把状态改成可以编辑，然后判断是否可以编辑
                 this.generateBillsfalse = false
+                this.pleasereviewType = false
                 // 如果已经请核就禁用按钮
                 // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
                 //     this.detailData.seeDisabled = true
@@ -1393,6 +1419,7 @@ import {popupReminder} from "@/util/messageReminder";
                     this.columnforfun('bookingNo').disabled = true
                     this.columnforfun('refno').disabled = true
                     this.generateBillsfalse = true
+                    this.pleasereviewType = true // 请核禁用
                 }
                 this.pageLoading = false
                 this.searchMontage() // 下拉 中文名称和编号拼接

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

@@ -30,21 +30,21 @@
                       <el-row>
                           <el-col :span="fold?6:8" >
                               <el-form-item label="主单号">
-                                  <el-input placeholder="请输入主单号"
+                                  <el-input placeholder="请输入主单号" clearable
                                             size="small" style="width:100%" v-model="query.mblno">
                                   </el-input>
                               </el-form-item>
                           </el-col>
                           <el-col :span="fold?6:8">
                               <el-form-item label="委托人">
-                                  <el-input placeholder="请输入委托人"
+                                  <el-input placeholder="请输入委托人" clearable
                                             size="small" style="width:100%" v-model="query.corpCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
                           <el-col :span="fold?6:8" >
                               <el-form-item label="业务号">
-                                  <el-input placeholder="请输入业务号"
+                                  <el-input placeholder="请输入业务号" clearable
                                             size="small" style="width:100%" v-model="query.billNo">
                                   </el-input>
                               </el-form-item>
@@ -64,49 +64,49 @@
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="分单号">
-                                  <el-input placeholder="请输入分单号"
+                                  <el-input placeholder="请输入分单号" clearable
                                             size="small" style="width:100%" v-model="query.hblno">
                                   </el-input>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="船名">
-                                  <el-input placeholder="请输入船名"
+                                  <el-input placeholder="请输入船名" clearable
                                             size="small" style="width:100%" v-model="query.vesselCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold" >
                               <el-form-item label="航次">
-                                  <el-input placeholder="请输入航次"
+                                  <el-input placeholder="请输入航次" clearable
                                             size="small" style="width:100%" v-model="query.voyageNo">
                                   </el-input>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="船公司">
-                                  <el-input placeholder="请输入船公司"
+                                  <el-input placeholder="请输入船公司" clearable
                                             size="small" style="width:100%" v-model="query.carrierCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="目的港">
-                                  <el-input placeholder="请输入目的港"
+                                  <el-input placeholder="请输入目的港" clearable
                                             size="small" style="width:100%" v-model="query.podCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="航线">
-                                  <el-input placeholder="请输入航线"
+                                  <el-input placeholder="请输入航线" clearable
                                             size="small" style="width:100%" v-model="query.lineCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="场站">
-                                  <el-input placeholder="请输入场站"
+                                  <el-input placeholder="请输入场站" clearable
                                             size="small" style="width:100%" v-model="query.cyCode">
                                   </el-input>
                               </el-form-item>
@@ -126,7 +126,7 @@
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="来源详情">
-                                  <el-input placeholder="请输入来源详情"
+                                  <el-input placeholder="请输入来源详情" clearable
                                             size="small" style="width:100%" v-model="query.srcCnName">
                                   </el-input>
                               </el-form-item>
@@ -172,14 +172,14 @@
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="创建部门">
-                                  <el-input placeholder="请输入创建部门"
+                                  <el-input placeholder="请输入创建部门" clearable
                                             size="small" style="width:100%" v-model="query.createDeptName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="订舱代理">
-                                  <el-input placeholder="请输入订舱代理"
+                                  <el-input placeholder="请输入订舱代理" clearable
                                             size="small" style="width:100%" v-model="query.bookingAgentCnName">
                                   </el-input>
                               </el-form-item>
@@ -200,7 +200,7 @@
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="收货人">
-                                  <el-input placeholder="请输入收货人"
+                                  <el-input placeholder="请输入收货人" clearable
                                             size="small" style="width:100%" v-model="query.hConsigneeCnName">
                                   </el-input>
                               </el-form-item>
@@ -243,6 +243,17 @@
                              plain
                              @click="handleDelete">删 除
                   </el-button>
+
+                  <el-dropdown style="line-height: 0">
+                      <el-button size="small" type="success" style="margin-right: 8px" :disabled="selectionList.length == 0" >
+                          发送 EDI<i class="el-icon-arrow-down el-icon--right"></i>
+                      </el-button>
+                      <el-dropdown-menu slot="dropdown">
+                          <el-dropdown-item v-for="item in ediData" :key="item.id"
+                                            @click.native="editypesSendingEdifun(item)" >{{item.cnName}}
+                          </el-dropdown-item>
+                      </el-dropdown-menu>
+                  </el-dropdown>
                   <div style="margin-top: 10px">
                       <el-tabs type="card" v-model="query.billStatus" @tab-click="handleClick">
                           <el-tab-pane label="接单" name="0">
@@ -327,7 +338,7 @@ import {
     billsDetail,
     billsSubmit,
     billsRemove,
-    billsIncreaseReinsurancePolicy, billsListAll, billsDisembarking
+    billsIncreaseReinsurancePolicy, billsListAll, billsDisembarking, editypesSendingEdi
 } from "@/api/iosBasicData/bills";
   import {mapGetters} from "vuex";
   import billsDetails from "@/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue";
@@ -336,11 +347,13 @@ import {
 import {getWorkDicts} from "@/api/system/dictbiz";
 import {dateFormat, defaultDate} from "@/util/date";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import {editypesList} from "@/api/iosBasicData/editypes";
 
   export default {
     components:{SearchQuery, feesTemplateItems, billsDetails,SplitList},
     data() {
       return {
+          ediData:[], // 获取的 edi 数据
           // 展开和收回
           fold:false,
           maxShow:3,
@@ -769,6 +782,22 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
                   overHidden:true,
               },
             {
+                label: "edi发送状态",
+                prop: "ediStatus",
+                type:"select",
+                dicData: [
+                    {
+                        label: '未发送',
+                        value: '0'
+                    },{
+                        label: '已发送',
+                        value: '1'
+                    }
+                ],
+                width: "100",
+                overHidden:true,
+            },
+            {
               label: "业务状态",
               prop: "billStatus",
                 type:"select",
@@ -964,8 +993,23 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
           this.accountStatusWorkDictsfun()
           this.getWorkDictsfun() // 获取签单方式字典数据
           this.statusWorkDictsfun() // 业务审核类型
+          this.editypesListfun() // edi 数据获取
       },
       methods: {
+          // 发送EDI
+          editypesSendingEdifun(row){
+              row.billId = this.ids
+              editypesSendingEdi(row).then(res=>{
+                  this.$message.success('发送EDI成功')
+                  this.onLoad(this.page)
+              })
+          },
+          // 获取EDI列表数据
+          editypesListfun(){
+              editypesList(1,30,{type:'HYCK'}).then(res=>{
+                  this.ediData = res.data.data.records
+              })
+          },
         // 展开和收起
           shiftCollapsiable(){
               this.fold = !this.fold

src/views/iosBasicData/bcntrtypes/index.vue

@@ -174,7 +174,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         labelWidth: 120,
         border: true,
         index: true,
@@ -362,6 +362,7 @@ export default {
             label: "状态",
             prop: "status",
             type: 'select',
+              search: true,
             dicData: [{
               label: '启用',
               value: 0

src/views/iosBasicData/bcommodity/index.vue

@@ -128,7 +128,7 @@ export default {
         labelWidth: 100,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: false,
@@ -196,6 +196,7 @@ export default {
             label: "状态",
             prop: "status",
             type: 'select',
+            search: true,
             dicData: [{
               label: '正常',
               value: 0

src/views/iosBasicData/bcorps/index.vue

@@ -879,6 +879,7 @@ export default {
             label: "状态",
             prop: "status",
             type: 'select',
+            search: true,
             dicData: [{
               label: '启用',
               value: 0

src/views/iosBasicData/bcountrys/index.vue

@@ -113,7 +113,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 24,
                 border: true,
                 index: true,
                 viewBtn: false,
@@ -172,6 +172,7 @@ export default {
                         label: "状态",
                         prop: "status",
                         type: 'select',
+                        search: true,
                         dicData: [{
                             label: '启用',
                             value: 0

src/views/iosBasicData/bfeesdefine/index.vue

@@ -220,7 +220,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: false,
@@ -381,6 +381,7 @@ export default {
             label: "状态",
             prop: "status",
             type: 'select',
+              search: true,
             dicData: [{
               label: '启用',
               value: 0

src/views/iosBasicData/blines/index.vue

@@ -184,7 +184,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: false,
@@ -266,6 +266,7 @@ export default {
             label: "状态",
             prop: "status",
             type: 'select',
+            search: true,
             dicData: [{
               label: '启用',
               value: 0

src/views/iosBasicData/bpackages/index.vue

@@ -168,7 +168,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: false,
@@ -236,6 +236,7 @@ export default {
             label: "状态",
             prop: "status",
             type: 'select',
+            search: true,
             dicData: [{
               label: '启用',
               value: 0

src/views/iosBasicData/bports/index.vue

@@ -135,7 +135,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: false,
@@ -256,6 +256,7 @@ export default {
             label: "状态",
             prop: "status",
             type: 'select',
+            search: true,
             dicData: [{
               label: '启用',
               value: 0

src/views/iosBasicData/bserviceterms/index.vue

@@ -162,7 +162,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: false,
@@ -229,6 +229,7 @@ export default {
             label: "状态",
             prop: "status",
             type: "select",
+            search: true,
             dicData: [{
               label: '启用',
               value: 0

src/views/iosBasicData/btrademodes/index.vue

@@ -113,7 +113,7 @@ export default {
         searchIndex: 3,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: false,
@@ -175,6 +175,7 @@ export default {
             label: "状态",
             prop: "status",
             type: "select",
+            search: true,
             dicData: [{
               label: '启用',
               value: 0

src/views/iosBasicData/bunits/index.vue

@@ -112,7 +112,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: false,
@@ -197,6 +197,7 @@ export default {
             label: "状态",
             prop: "status",
             type: "select",
+              search: true,
             dicData: [{
               label: '启用',
               value: 0

src/views/iosBasicData/bvessels/index.vue

@@ -190,7 +190,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: false,
@@ -270,7 +270,7 @@ export default {
               overHidden: true,
           },
           {
-            label: "船公司 ID",
+            label: "船公司",
             prop: "carrierId",
             search: true,
             hide: true,
@@ -359,6 +359,7 @@ export default {
             label: "状态",
             prop: "status",
             type: "select",
+            search: true,
             dicData: [{
               label: '启用',
               value: 0

src/views/iosBasicData/editypes/index.vue

@@ -72,17 +72,25 @@
               </template>
               <template slot="menu" slot-scope="{row}">
                   <el-button type="text"
-                             size="small"
+                             size="small" icon="el-icon-edit"
                              @click="editFun(row)">编辑
                   </el-button>
                   <el-button type="text"
-                             size="small"
+                             size="small" icon="el-icon-delete"
                              @click="rowDel(row)">删除
                   </el-button>
+                  <el-button v-if="row.status == 1" type="text" icon="el-icon-turn-off" style="color: #85e967" size="small"
+                             @click.stop="statusfun(row.id,0)">
+                      启用
+                  </el-button>
+                  <el-button v-if="row.status == 0" type="text" icon="el-icon-turn-off" style="color: #e83c3a" size="small"
+                             @click.stop="statusfun(row.id,1)">
+                      停用
+                  </el-button>
               </template>
           </avue-crud>
       </basic-container>
-      <el-dialog title="title" :visible.sync="ressVisible" width="70%" top="5vh" append-to-body
+      <el-dialog title="配置发送数据" :visible.sync="ressVisible" width="70%" top="5vh" append-to-body
                  class="el-dialogDeep" :close-on-click-modal="false" v-dialog-drag>
           <div>
               <avue-crud :option="ressOption" :data="tableData"
@@ -105,9 +113,12 @@
   import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
   import {getBcorpslistByType} from "@/api/iosBasicData/bcorps";
   import {getList as getRoleList} from "@/api/system/role"
+  import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
 
   export default {
       components: {SearchQuery},
+      props:{
+      },
     data() {
       return {
         form: {
@@ -127,17 +138,35 @@
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 24,
           border: true,
           index: true,
           viewBtn: true,
           selection: true,
           dialogClickModal: false,
-            menuWidth:140,
+            menuWidth:240,
           column: [
             {
+                label: "业务类型",
+                prop: "type",
+                search: true,
+                overHidden:true,
+                type: 'select',
+                dicData:[],
+                props: {
+                    label: "cnName",
+                    value: "code"
+                },
+                rules: [{
+                    required: true,
+                    message: "请输入业务类型",
+                    trigger: "blur"
+                }]
+            },
+            {
               label: "edi编码",
               prop: "code",
+                search: true,
               overHidden:true,
               rules: [{
                 required: true,
@@ -148,6 +177,7 @@
             {
               label: "edi名称",
               prop: "cnName",
+                search: true,
               overHidden:true,
               rules: [{
                 required: true,
@@ -176,7 +206,7 @@
               }]
             },
             {
-              label: "客户英文名称",
+              label: "客户英文",
               prop: "corpEnName",
               display:false,
               overHidden:true,
@@ -184,16 +214,28 @@
             {
               label: "发送ftp/邮件",
               prop: "address",
+                hide:true,
               overHidden:true,
             },
             {
               label: "权限用户",
               prop: "userlist",
+                hide:true,
               overHidden:true,
             },
             {
               label: "状态",
               prop: "status",
+                type: "select",
+                search: true,
+                dicData: [{
+                    label: '启用',
+                    value: 0
+                }, {
+                    label: '停用',
+                    value: 1
+                }],
+                value: 0,
               overHidden:true,
             },
             {
@@ -232,6 +274,7 @@
               overHidden:true,
               type: "textarea",
               minRows: 3,
+              span:24
             },
           ]
         },
@@ -320,8 +363,36 @@
     async created() {
         this.option = await this.getColumnData(this.getColumnName(325), this.optionBack);
         this.getRoleListfun()
+        this.bbusinesstypeListfun() // 业务类型
     },
     methods: {
+      // 获取业务类型接口
+      bbusinesstypeListfun(){
+          // 获取业务类型
+          bbusinesstypeList(1,20).then(res=>{
+              this.findObject(this.option.column, "type").dicData = res.data.data.records
+          })
+      },
+      // 禁用启用按钮
+      statusfun(id,status){
+          this.$confirm("确定将选择数据更改状态?", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+          }).then(()=>{
+              editypesDetail(id).then(res=>{
+                  let obj = res.data.data;
+                  obj.status = status
+                  editypesSubmit(obj).then(()=>{
+                      this.onLoad(this.page);
+                      this.$message({
+                          type: "success",
+                          message: "操作成功!"
+                      });
+                  })
+              })
+          })
+      },
       // 添加
       addfun(){
           this.$refs.crud.rowAdd()

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -2,7 +2,7 @@
     <div>
         <el-table
             ref="tableRef"
-            :cell-style="{padding:'0px',fontSize:'12px'}"
+            :cell-style="cellStyle"
             :header-cell-style="tableHeaderCellStyle"
             :data="tableData"
             border
@@ -28,6 +28,13 @@
                 </template>
             </el-table-column>
             <el-table-column
+                prop="dc"
+                label="收/付" width="50px">
+                <template slot-scope="{ row }">
+                    <span>{{row.dc}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
                 prop="mblno"
                 label="MB/L NO">
                 <template slot-scope="{row}">
@@ -283,6 +290,16 @@
                 }
                 return rowName; //也可以再加上其他类名 如果有需求的话
             },
+            // 收付展示不一样的颜色
+            cellStyle({row,rowIndex,columnIndex}){
+                let rowStyle = ''
+                if (row.dc == 'D') {
+                    rowStyle = 'color:#8cb24b;'
+                }else if (row.dc == 'C') {
+                    rowStyle = 'color:#7ebace;'
+                }else {}
+                return  rowStyle + 'padding:0px;fontSize:12px'
+            },
         },
         mounted() {
             // 按住ctrl实现多选 设置监听keydown事件,以及keyup事件，

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -448,9 +448,9 @@
                                                      :disabled="editSave"
                                                      v-model="form.isExchangeToCny">转换成人民币
                                         </el-checkbox>
-                                        <el-checkbox v-model="appendType" :disabled="statusType" false-label="检索" true-label="追加">追加</el-checkbox>
+                                        <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索" true-label="追加">追加</el-checkbox>
                                         <el-button type="primary"
-                                                   size="small" :disabled="statusType"
+                                                   size="small" :disabled="editSave"
                                                    plain @click="finstlbillslistAccBillV1fun(appendType)">提取费用
                                         </el-button>
                                     </el-col>
@@ -481,9 +481,9 @@
                                               @corpChange="corpChange($event,'serverName')"
                                               @corpFocus="serverWorkDictsfun" >
                                 </search-query>
-                                <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoicingfun" >生成开票明细</el-button>
-                                <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="warning" @click="invoicingRevokefun" >撤销开票明细</el-button>
-                                <el-button size="small" :disabled="statusType" type="danger" @click="batchDeletefun" >批量删除</el-button>
+                                <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="primary" @click="invoicingfun" >生成开票明细</el-button>
+                                <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="warning" @click="invoicingRevokefun" >撤销开票明细</el-button>
+                                <el-button size="small" :disabled="editSave" type="danger" @click="batchDeletefun" >批量删除</el-button>
                             </div>
                             <fininvoicesitems :tableData="tableData"
                                               :handleSelectionData="handleSelectionData"
@@ -494,7 +494,7 @@
                         </el-tab-pane>
                         <el-tab-pane label="开票明细" name="second">
                             <div style="margin-bottom: 10px;display: flex;">
-                                <el-button size="small" :disabled="statusType" type="danger" @click="invoicingBatchDelete" >批量删除</el-button>
+                                <el-button size="small" :disabled="editSave" type="danger" @click="invoicingBatchDelete" >批量删除</el-button>
                             </div>
                             <fininvoiceitemdetail :tableData="InvoicingList"
                                                   :handleSelectionData="invoicingCheckboxData"

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -25,7 +25,7 @@
                 <!--    </el-checkbox>-->
                 <!--</template>-->
             </el-table-column>
-            <el-table-column type="expand">
+            <el-table-column type="expand" v-if="brfalse">
                 <template slot-scope="{row}">
                         <costDetails :costDate="row.costDate || []"></costDetails>
                 </template>
@@ -548,9 +548,9 @@
             cellStyle({row,rowIndex,columnIndex}){
                 let rowStyle = ''
                 if (row.dc == 'D') {
-                    rowStyle = 'background:#8cb24b;'
+                    rowStyle = 'color:#8cb24b;'
                 }else if (row.dc == 'C') {
-                    rowStyle = 'background:#7ebace;'
+                    rowStyle = 'color:#7ebace;'
                 }else {}
                 return  rowStyle + 'padding:0px;fontSize:12px'
             },

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -16,10 +16,10 @@
                 <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-else
                             :loading="saveLoading" @click="finstlbillsConfirmReconciliationfun">确认对账
                 </el-button>
-                <el-button  size="small" type="primary" style="margin-right: 8px" v-if="editSave"
+                <el-button  size="small" type="primary" style="margin-right: 8px" v-if="editSave" :disabled="submitType"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>
-                <el-button  size="small" type="primary" style="margin-right: 8px" v-else
+                <el-button  size="small" type="primary" style="margin-right: 8px" v-else :disabled="submitType"
                             :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
             </div>
@@ -51,7 +51,7 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="5">
-                                <el-form-item label="限定金额" prop="billDate">
+                                <el-form-item label="限定金额" prop="limitedAmount">
                                     <el-input style="width: 100%;" v-model="form.limitedAmount"
                                               size="small" autocomplete="off"
                                               :disabled="editSave"
@@ -401,10 +401,10 @@
                         <el-row>
                             <el-col span="24">
                                 <div style="text-align: right">
-                                    <el-button  size="small" type="" style="margin-right: 8px"
+                                    <el-button  size="small" type="" style="margin-right: 8px" :disabled="editSave"
                                                 :loading="saveLoading" @click="ResetFilter">重置条件
                                     </el-button>
-                                    <el-button  size="small" type="primary"  style="margin-right: 8px"
+                                    <el-button  size="small" type="primary"  style="margin-right: 8px" :disabled="editSave"
                                                 :loading="saveLoading" @click="finstlbillslistAccBillV1fun" >检 索
                                     </el-button>
                                 </div>
@@ -445,10 +445,10 @@
                             <!--<el-button  size="small" type="primary" style="margin-right: 8px"-->
                             <!--            :loading="saveLoading" >计算合计值-->
                             <!--</el-button>-->
-                            <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="!form.id"
+                            <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="!form.id || editSave"
                                         :loading="saveLoading" @click="ConfirmReceiptfun">批量签收
                             </el-button>
-                            <el-button  size="small" type="danger" style="margin-right: 8px" :disabled="!form.id"
+                            <el-button  size="small" type="danger" style="margin-right: 8px" :disabled="!form.id || editSave"
                                         :loading="saveLoading" @click="RevokeReceiptfun">撤销签收
                             </el-button>
                         </div>
@@ -560,6 +560,7 @@
                         value:'SI'
                     }
                 ],
+                submitType:false, // 是否提交
             }
         },
         watch:{
@@ -739,6 +740,12 @@
                 this.pageLoading = true
                 finstlbillsDetail(id).then(res=>{
                     this.form = res.data.data
+                    // 判断是否已经提交过了
+                    if(this.form.isChecked == 1) {
+                        this.submitType = true
+                    }else {
+                        this.submitType = false
+                    }
                     this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.split(','):'' // 业务类型转换成数组显示
                     this.tableData = this.form.finStlBillsItemsList.map(item=>{
                         if(item.curCode == 'CNY') {
@@ -768,6 +775,7 @@
             // 重置条件
             ResetFilter(){
                 this.form = {}
+
             },
             // 检索接口
             finstlbillslistAccBillV1fun(){

src/views/iosBasicData/finstlbills/index.vue

@@ -107,7 +107,7 @@
             {
               label: "单据编号",
               prop: "billNo",
-                search:true,
+              search:true,
               overHidden:true,
             },
             {
@@ -294,58 +294,70 @@
             {
               label: "航次",
               prop: "voyageNo",
+              overHidden:true,
             },
             {
               label: "MB/L NO",
               prop: "mblno",
+              overHidden:true,
             },
             {
               label: "HB/L NO",
               prop: "hblno",
+                overHidden:true,
             },
             {
               label: "财务开始日期",
               prop: "accountDateFrom",
-                width: "140"
+                width: "140",
+                overHidden:true,
             },
             {
               label: "财务结束日期",
               prop: "accountDateTo",
-                width: "140"
+                width: "140",
+                overHidden:true,
             },
             {
               label: "审核开始日期",
               prop: "auditDateFrom",
-                width: "140"
+                width: "140",
+                overHidden:true,
             },
             {
               label: "审核结束日期",
               prop: "auditDateTo",
-                width: "140"
+                width: "140",
+                overHidden:true,
             },
             {
               label: "发票号",
               prop: "invoiceNo",
+                overHidden:true,
             },
             {
               label: "检验检疫 NO",
               prop: "iqNo",
-                width: "140"
+                width: "140",
+                overHidden:true,
             },
             {
               label: "费用中文名称",
               prop: "feeCode",
-                width: "140"
+                width: "140",
+                overHidden:true,
             },
             {
               label: "费用中文名称",
               prop: "feeCnName",
-                width: "140"
+                width: "140",
+                overHidden:true,
             },
             {
               label: "费用英文名称",
               prop: "feeEnName",
-                width: "140"
+                width: "140",
+                overHidden:true,
             },
             {
               label: "是否审核",
@@ -355,6 +367,7 @@
                     label: "dictValue",
                     value: "dictKey"
                 },
+                overHidden:true,
             },
             {
               label: "是否签收",
@@ -364,6 +377,7 @@
                 label: "dictValue",
                 value: "dictKey"
               },
+                overHidden:true,
             },
             {
               label: "是否对账",
@@ -373,6 +387,7 @@
                     label: "dictValue",
                     value: "dictKey"
                 },
+                overHidden:true,
             },
             {
               label: "是否销账",
@@ -382,6 +397,7 @@
                     label: "dictValue",
                     value: "dictKey"
                 },
+                overHidden:true,
             },
             {
               label: "是否开发票",
@@ -391,7 +407,8 @@
                     label: "dictValue",
                     value: "dictKey"
                 },
-                width: "140"
+                width: "140",
+                overHidden:true,
             },
             {
               label: "是否含税价计算",
@@ -401,23 +418,28 @@
                     label: "dictValue",
                     value: "dictKey"
                 },
-                width: "140"
+                width: "140",
+                overHidden:true,
             },
             {
               label: "凭证类型",
               prop: "voucherType",
+                overHidden:true,
             },
             {
               label: "凭证号",
               prop: "voucherNo",
+                overHidden:true,
             },
             {
               label: "凭证日期",
               prop: "voucherDate",
+                overHidden:true,
             },
             {
               label: "备注",
               prop: "remarks",
+                overHidden:true,
             },
           ]
         },
@@ -451,7 +473,23 @@
           // 展开行
         expandChange(row,expendList){
             finstlbillsitemsList(1,20,{pid:row.id}).then(res=>{
-                row.finStlBillsItemsList = res.data.data.records
+                console.log(res.data.data.records,476)
+                row.finStlBillsItemsList = res.data.data.records.map(item=>{
+                    if(item.curCode == 'CNY') {
+                        this.$set(item,'amountRMB',item.amount)
+                        this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)
+                        this.$set(item,'unsettledAmountRMB',item.unsettledAmount)
+                        this.$set(item,'stlTtlAmountRMB',item.stlTtlAmount)
+                        this.$set(item,'currentStlAmountRMB',item.currentStlAmount)
+                    }else {
+                        this.$set(item,'amountUSD',item.amount)
+                        this.$set(item,'currentInvoiceAmountUSD',item.currentInvoiceAmount)
+                        this.$set(item,'unsettledAmountUSD',item.unsettledAmount)
+                        this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
+                        this.$set(item,'currentStlAmountUSD',item.currentStlAmount)
+                    }
+                    return item
+                })
             })
         },
       // 新建账单

src/views/iosBasicData/losbfeestemplate/index.vue

@@ -177,7 +177,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: false,
@@ -313,6 +313,7 @@ export default {
             label: "状态",
             prop: "status",
             type: 'select',
+            search: true,
             dicData: [{
               label: '启用',
               value: 0

src/views/iosBasicData/rateManagement/detailsPage.vue

@@ -216,10 +216,10 @@ export default {
                   dictValue: "月汇率",
                   dictKey: 1
                 },
-                {
-                  dictValue: "日汇率",
-                  dictKey: 2
-                }
+                // {
+                //   dictValue: "日汇率",
+                //   dictKey: 2
+                // }
               ],
               span: 6,
             },
@@ -229,7 +229,6 @@ export default {
               type: "year",
               valueFormat: "yyyy",
               span: 6,
-              display: false,
             },
             {
               label: "月份",
@@ -573,14 +572,13 @@ export default {
         handler(row,newValue) {
             if (row == "日汇率") {
                 this.findObject(this.option.column, "moon").display = true;
-                this.findObject(this.option.column, "annual").display = false;
+                // this.findObject(this.option.column, "annual").display = false;
             } else if (row == "月汇率") {
                 this.findObject(this.option.column, "moon").display = false;
-                this.findObject(this.option.column, "annual").display = false;
-                // this.$set(this.findObject(this.option.column, "annual"),'disabled',true)
+                // this.findObject(this.option.column, "annual").display = false;
             } else {
                 this.findObject(this.option.column, "moon").display = false;
-                this.findObject(this.option.column, "annual").display = true;
+                // this.findObject(this.option.column, "annual").display = true;
             }
         },
         deep: true, // 深度监听

src/views/system/dept.vue

@@ -202,7 +202,6 @@
                   editDisplay:false,//当前行数据在编辑表单中是否可见
                   viewDisplay:false, // 当前行数据在查看表单中是否可见
               },
-
             {
               label: "排序",
               prop: "sort",

src/views/system/paramService.vue

@@ -2,9 +2,10 @@
   <basic-container>
     <avue-crud v-bind="bindVal"
                v-on="onEvent"
+               @selection-change="selectionChange"
                v-model="form"
                :permission="permissionList"
-               :page.sync="page">
+               :page.sync="page" >
       <template slot="menuLeft">
         <el-button type="danger"
                    size="small"
@@ -13,12 +14,30 @@
                    plain
                    @click="handleDelete">删 除
         </el-button>
+          <el-button type="danger"
+                     size="small"
+                     plain
+                     @click="copyfun">复 制
+          </el-button>
       </template>
       <template slot="paramValueForm">
         <el-input placeholder="请输入内容" v-model="form.paramValue" class="input-with-select">
           <el-button slot="append" icon="el-icon-upload" @click="excelBox = true"></el-button>
         </el-input>
       </template>
+      <template slot="salesCompanyNameForm">
+          <search-query :datalist="salesCompanyData"
+                        :selectValue="form.salesCompanyName"
+                        :filterable="true"
+                        :clearable="true"
+                        :remote="true"
+                        :buttonIf="false"
+                        :forParameter="{key:'id',label:'deptName',value:'deptName'}"
+                        @remoteMethod="getLazyListfun"
+                        @corpChange="corpChange($event,'commodity')"
+                        @corpFocus="getLazyListfun">
+          </search-query>
+      </template>
     </avue-crud>
     <el-dialog
         title="附件上传"
@@ -52,26 +71,65 @@
 <script>
 
 import {getToken} from "@/util/auth";
+import {getLazyList} from '@/api/system/dept'
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import {add as fuzhiAdd,} from "@/api/system/paramService"
 
 export default window.$crudCommon({
+    components:{SearchQuery},
   data() {
     return {
       excelBox:false,
       action: "/api/blade-resource/oss/endpoint/put-file",
       headers: { "Blade-Auth": "Bearer " + getToken() },
+        salesCompanyData:[],
+        selectionList:[],
     }
   },
   computed: {
     permissionList() {
-      return {
-        addBtn: this.vaildData(this.permission.param_add, false),
-        viewBtn: this.vaildData(this.permission.param_view, false),
-        delBtn: this.vaildData(this.permission.param_delete, false),
-        editBtn: this.vaildData(this.permission.param_edit, false)
-      };
+        // 查看是否有admin 权限 没有admin的话按钮都不显示
+         if (JSON.parse(localStorage.getItem('saber-userInfo')).content.role_name.indexOf('admin') != -1) {
+            return {}
+        }
+        return {
+            addBtn: this.vaildData(this.permission.param_add, false),
+            viewBtn: this.vaildData(this.permission.param_view, false),
+            delBtn: this.vaildData(this.permission.param_delete, false),
+            editBtn: this.vaildData(this.permission.param_edit, false)
+        };
     },
   },
-  methods: {
+    created() {
+      if (JSON.parse(localStorage.getItem('saber-userInfo')).content.role_name.indexOf('admin') != -1) {
+          this.permission.param_delete = true
+      }
+
+    },
+    methods: {
+        copyfun(){
+            let obj = this.selectionList[0]
+            delete obj.id
+            fuzhiAdd(obj).then(res=>{
+                this.getList()
+            })
+        },
+        selectionChange(list) {
+            this.selectionList = list;
+        },
+        getLazyListfun(){
+            getLazyList().then(res=>{
+                this.salesCompanyData = res.data.data
+            })
+        },
+        corpChange(value){
+            for(let item of this.salesCompanyData) {
+                if (item.deptName == value) {
+                    this.$set(this.form,'salesCompanyId',item.id)
+                    this.$set(this.form,'salesCompanyName',item.deptName)
+                }
+            }
+        },
     //修改上传成功
     onSuccess(response) {
       console.log(response)

src/views/tirePartsMall/basicData/brandPage/detailsPage.vue

@@ -144,6 +144,10 @@ export default {
     },
     //修改提交触发
     editCustomer() {
+        if (JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_id.indexOf(this.form.createDept) == -1) {
+            this.$message.warning('暂无权限')
+            return
+        }
       if (this.form.brandFilesList.length === 0){
         return this.$message.error("请上传主图")
       }

src/views/tirePartsMall/basicData/brandPage/index.vue

@@ -89,6 +89,10 @@ export default {
           prop: "cname",
           search: true,
           overHidden: true,
+        },{
+            label: '所属公司',
+            prop: "salesCompanyName",
+            overHidden: true,
         }, {
           label: "制单人",
           search: true,

src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -721,16 +721,16 @@ export default {
     }
     ,
     addRow() {
-      if (this.data.length > 0) {
-          this.data.push({
-              $cellEdit: true,
-              contacts:this.data[this.data.length - 1].contacts,
-              tel:this.data[this.data.length - 1].tel,
-          })
-      }else {
-          this.data.push({ $cellEdit: true })
-      }
-
+        this.data.push({ $cellEdit: true })
+      // if (this.data.length > 0) {
+      //     this.data.push({
+      //         $cellEdit: true,
+      //         contacts:this.data[this.data.length - 1].contacts,
+      //         tel:this.data[this.data.length - 1].tel,
+      //     })
+      // }else {
+      //     this.data.push({ $cellEdit: true })
+      // }
     }
     ,
     rowCell(row, index) {

src/views/tirePartsMall/basicData/customerInformation/js/optionList.js

@@ -243,7 +243,7 @@ export const option2 = {
         message: " ",
         trigger: "blur"
       }
-    ]
+    ],
   }, {
     label: '电话',
     prop: 'tel',