货代海运出口10.26

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

@@ -118,6 +118,7 @@ import fa from "element-ui/src/locale/lang/fa";
         // },
         selectionList: [],
         option: {
+            stripe:true,
           height:'250',
           calcHeight: 30,
           tip: false,

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

@@ -832,6 +832,7 @@ import bcorpstypedefine from "@/views/iosBasicData/bcorps/bcorpstypedefine.vue";
                             this.$set(this.assemblyForm,name + 'EnName',item.enName)
                             this.$set(this.assemblyForm,name + 'Code',item.code)
                             this.$set(this.assemblyForm,name + 'NamePrint',item.enName)
+                            this.$set(this.assemblyForm,'issueAt',this.assemblyForm.polCnName) // 签单地点 默认 装货港
                         }
                     }
                 }

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

@@ -1,7 +1,9 @@
 <template>
     <div>
         <avue-crud :table-loading="loading" :option="option" :data="data"
-                   @selection-change="selectionChange" >
+                   @selection-change="selectionChange"
+                   id="out-table" ref="crud"
+                   :header-cell-class-name="headerClassName" >
             <template slot-scope="scope" slot="menuLeft">
                 <el-button v-if="!typeMenu" type="danger"
                            size="small"
@@ -17,6 +19,26 @@
                            @click.stop="withdrawfun(scope.row, scope.index)">撤回
                 </el-button>
             </template>
+            <template slot-scope="scope" slot="billNo">
+                <avue-text-ellipsis :text="scope.row.billNo" :height="30" use-tooltip placement="top">
+                    <small slot="more">...</small>
+                </avue-text-ellipsis>
+            </template>
+            <template slot-scope="scope" slot="billDate">
+                <avue-text-ellipsis :text="scope.row.billDate" :height="30" use-tooltip placement="top">
+                    <small slot="more">...</small>
+                </avue-text-ellipsis>
+            </template>
+            <template slot-scope="scope" slot="corpCnName">
+                <avue-text-ellipsis :text="scope.row.corpCnName" :height="30" use-tooltip placement="top">
+                    <small slot="more">...</small>
+                </avue-text-ellipsis>
+            </template>
+            <template slot-scope="scope" slot="corpEnName">
+                <avue-text-ellipsis :text="scope.row.corpEnName" :height="30" use-tooltip placement="top">
+                    <small slot="more">...</small>
+                </avue-text-ellipsis>
+            </template>
         </avue-crud>
     </div>
 </template>
@@ -43,7 +65,6 @@
                 selectionList:[],
                 loading:false,
                 option:{
-                    height:'450',
                     calcHeight: 30,
                     tip: false,
                     searchShow: true,
@@ -107,12 +128,19 @@
             if (this.typeMenu) {
                 this.option.menu = false
                 this.option.selection = false
-                this.option.height = '200'
+                // this.option.height = '200'
             }else {
                 this.option.menu = true
                 this.option.selection = true
-                this.option.height = '450'
+                // this.option.height = '450'
             }
+
+        },
+        // 解决AVue表格错位问题
+        activated(){
+            this.$nextTick(() => {
+                this.$refs.crud.doLayout()
+            })
         },
         methods:{
             // 批量撤回
@@ -155,10 +183,35 @@
                     this.$emit('billsListAllfun')
                 })
             },
+
+            // 更改表格颜色
+            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;
+            },
+
         }
     }
 </script>
 
 <style scoped>
+::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;
+}
 </style>

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

@@ -99,9 +99,6 @@
                     <el-button type="primary" plain size="small">打印账单</el-button>
                     <el-button type="success" plain size="small">应收模板</el-button>
                 </el-col>
-                <!--<el-col :span="3">-->
-                <!--    <el-button type="success" size="small" @click="addDfun">新 增</el-button>-->
-                <!--</el-col>-->
             </el-row>
             <div style="margin-top: 10px">
                 <el-table
@@ -120,10 +117,10 @@
                     </el-table-column>
                     <el-table-column
                         fixed="left"
-                        width="90">
+                        width="60">
                         <template slot="header" slot-scope="scope">
-                            <el-button type="success" size="small"
-                                       :disabled="detailData.seeDisabled" @click="addDfun">新 增</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-plus" circle
+                                       :disabled="detailData.seeDisabled" @click="addDfun"></el-button>
                         </template>
                     </el-table-column>
                     <el-table-column
@@ -321,10 +318,10 @@
                     </el-table-column>
                     <el-table-column
                         fixed="left"
-                        width="90">
+                        width="60">
                         <template slot="header" slot-scope="scope">
-                            <el-button type="success" size="small"
-                                       :disabled="detailData.seeDisabled" @click="addCfun">新 增</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-plus" circle
+                                       :disabled="detailData.seeDisabled" @click="addCfun"></el-button>
                         </template>
                     </el-table-column>
                     <el-table-column

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

@@ -332,10 +332,6 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                                     {
                                         label:'主分单',
                                         value:'MH'
-                                    },
-                                    {
-                                        label:'从分单',
-                                        value:'HH'
                                     }
                                 ],
                                 rules: [{
@@ -818,6 +814,14 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                         }
                     }
                 }
+                else if (name == 'billType') {
+                    this.form.billType = value
+                    if (value == 'MM') {
+                        // 主单付费方式 默认PP
+                        this.$set(this.form,'hPaymode','PP')
+                    }
+                    // 分单付费方式 默认 PP ?
+                }
                 else {
                     this.form[name] = value
                 }

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

@@ -104,7 +104,7 @@ import {
   import billsDetails from "@/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue";
   import feesTemplateItems from "@/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue";
   import SplitList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/SplitList.vue";
-import fa from "element-ui/src/locale/lang/fa";
+import {getWorkDicts} from "@/api/system/dictbiz";
 
   export default {
     components:{feesTemplateItems, billsDetails,SplitList},
@@ -431,17 +431,27 @@ import fa from "element-ui/src/locale/lang/fa";
                 width:"160"
             },
             {
-              label: "状态（业务参数配置）",
+              label: "业务状态",
               prop: "billStatus",
                 search: true,
                 type:"select",
                 dicData: [],
+                props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                },
                 width: "160"
             },
             {
-              label: "财务状态（业务参数配置）",
+              label: "财务状态",
               prop: "accountStatus",
-                width: "180"
+                type:"select",
+                dicData: [],
+                props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                },
+                width: "180",
             },
             {
               label: "状态",
@@ -583,8 +593,22 @@ import fa from "element-ui/src/locale/lang/fa";
     },
       async created() {
           this.option = await this.getColumnData(this.getColumnName(309), this.optionBack);
+          this.billStatusWorkDictsfun()
+          this.accountStatusWorkDictsfun()
       },
       methods: {
+        // 获取业务状态字典数据
+        billStatusWorkDictsfun(){
+           getWorkDicts('bill_status').then(res=>{
+               this.findObject(this.option.column, "billStatus").dicData = res.data.data;
+           })
+        },
+        // 获取财务状态字典数据
+        accountStatusWorkDictsfun(){
+           getWorkDicts('account_status').then(res=>{
+              this.findObject(this.option.column, "accountStatus").dicData = res.data.data;
+           })
+        },
         // 添加到主单
         increaseMawb(){
             if (this.selectionList.length === 0) {
@@ -792,10 +816,17 @@ import fa from "element-ui/src/locale/lang/fa";
         billsList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
-          this.data = data.records;
-          for (let item of this.data) {
+          this.data = data.records.map(item=>{
               item.billsListAllData = []
-          }
+              item.billStatus = item.billStatus + ''
+              item.accountStatus = item.accountStatus + ''
+              return item
+          })
+            console.log(this.data,811)
+          // for (let item of this.data) {
+          //
+          // }
+          // this.data = data.records;
           this.loading = false;
           this.selectionClear();
         });