修改bug

src/views/iosBasicData/accountsDetails/index.vue

@@ -4,9 +4,9 @@
       <avue-form :option="optionForm" v-model="query" class="form-mb">
         <tempalte slot="button" slot-scope="{ row }">
           <span style="display: flex;justify-content: end;">
-            <el-button icon="el-icon-arrow-down" size="small" @click="searchShow = true" v-if="!searchShow">展
+            <el-button icon="el-icon-arrow-down" size="small" @click="searchShow = true,showHight()" v-if="!searchShow">展
               开</el-button>
-            <el-button icon="el-icon-arrow-up" size="small" @click="searchShow = false" v-if="searchShow">收 缩</el-button>
+            <el-button icon="el-icon-arrow-up" size="small" @click="searchShow = false,showHight()" v-if="searchShow">收 缩</el-button>
             <el-button type="primary" size="small" plain @click="inItial">初始入账
             </el-button>
             <el-button type="success" size="small" plain @click="outExport">导出
@@ -445,23 +445,31 @@ export default {
       deep: false, // 深度监听
       immediate: false  // 第一次改变就执行
     },
-    "searchShow": {
-      handler(newVla, oldVal) {
-        if (newVla) {
-          this.option.height = this.option.height - 149;
-        } else {
-          this.option.height = this.option.height + 149;
-        }
-        this.$refs.crud.getTableHeight();
-      },
-      deep: false, // 深度监听
-      immediate: false  // 第一次改变就执行
-    },
+    // "searchShow": {
+    //   handler(newVla, oldVal) {
+    //     if (newVla) {
+    //       this.option.height = this.option.height - 149;
+    //     } else {
+    //       this.option.height = this.option.height + 149;
+    //     }
+    //     this.$refs.crud.getTableHeight();
+    //   },
+    //   deep: false, // 深度监听
+    //   immediate: false  // 第一次改变就执行
+    // },
   },
   created() {
-    this.option.height = window.innerHeight - 337;
+    this.option.height = window.innerHeight - 190;
   },
   methods: {
+    showHight() {
+      if (this.searchShow) {
+        this.option.height = this.option.height - 149;
+      } else {
+        this.option.height = this.option.height + 149;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     nodeClick(data) {
       this.getList(data)
     },
@@ -617,11 +625,11 @@ export default {
 }
 
 .treeStyle {
-  height: 60vh;
+  height: 57vh;
   /* overflow-y: scroll; */
 }
 
 .bigTreeStyle {
-  height: 76vh;
+  height: 74vh;
 }
 </style>

src/views/iosBasicData/fingenlegcalc/index.vue

@@ -4,9 +4,10 @@
       <avue-form :option="optionForm" v-model="query" class="form-mb">
         <tempalte slot="button" slot-scope="{ row }">
           <span style="display: flex;justify-content: end;">
-            <el-button icon="el-icon-arrow-down" size="small" @click="searchShow = true" v-if="!searchShow">展
+            <el-button icon="el-icon-arrow-down" size="small" @click="searchShow = true, showHight()" v-if="!searchShow">展
               开</el-button>
-            <el-button icon="el-icon-arrow-up" size="small" @click="searchShow = false" v-if="searchShow">收 缩</el-button>
+            <el-button icon="el-icon-arrow-up" size="small" @click="searchShow = false, showHight()" v-if="searchShow">收
+              缩</el-button>
             <el-button type="primary" size="small" plain @click="inItial">初始入账
             </el-button>
             <el-button type="success" size="small" plain @click="outExport">导出
@@ -31,7 +32,7 @@
         </span>
       </div>
     </basic-container>
-    <basic-container v-show="treeData.length > 0">
+    <basic-container v-show="treeData.length > 0"  >
       <el-row>
         <el-col :span="4">
           <avue-tree ref="tree" :class="searchShow ? 'treeStyle' : 'bigTreeStyle'" :option="treeOption" :data="treeData"
@@ -56,7 +57,7 @@ import {
   fingenlegInitialization
 } from "@/api/iosBasicData/fingenlegcalc";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-import {dateFormat} from "@/util/date";
+import { dateFormat } from "@/util/date";
 import { getToken } from "@/util/auth";
 
 export default {
@@ -89,7 +90,7 @@ export default {
         noAmountIncurred: 0,
         doNotDisplayYear: 0
       },
-      outExportQuery:{},
+      outExportQuery: {},
       searchShow: true,
       optionForm: {
         submitBtn: false,
@@ -411,26 +412,34 @@ export default {
       deep: false, // 深度监听
       immediate: false  // 第一次改变就执行
     },
-    "searchShow": {
-      handler(newVla, oldVal) {
-        if (newVla) {
-          this.option.height = this.option.height - 149;
-        } else {
-          this.option.height = this.option.height + 149;
-        }
-        this.$refs.crud.getTableHeight();
-      },
-      deep: false, // 深度监听
-      immediate: false  // 第一次改变就执行
-    },
+    // "searchShow": {
+    //   handler(newVla, oldVal) {
+    //     // if (newVla) {
+    //     //   this.option.height = this.option.height - 30;
+    //     // } else {
+    //     //   this.option.height = this.option.height + 30;
+    //     // }
+    //     this.$refs.crud.getTableHeight();
+    //   },
+    //   deep: false, // 深度监听
+    //   immediate: false  // 第一次改变就执行
+    // },
   },
   created() {
-    this.option.height = window.innerHeight - 337;
+    this.option.height = window.innerHeight - 190;
     getAllList({ type: this.query.type }).then(res => {
       this.corpDic = res.data.data
     })
   },
   methods: {
+    showHight() {
+      if (this.searchShow) {
+        this.option.height = this.option.height - 115;
+      } else {
+        this.option.height = this.option.height + 115;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     nodeClick(data) {
       this.getList(data)
     },
@@ -512,7 +521,7 @@ export default {
         corpIds: data.id,
         accType: data.type,
       }
-      this.outExportQuery=obj
+      this.outExportQuery = obj
       const loading = this.$loading({
         lock: true,
         text: '加载中',
@@ -581,11 +590,11 @@ export default {
 }
 
 .treeStyle {
-  height: 60vh;
+  height: 61vh;
   /* overflow-y: scroll; */
 }
 
 .bigTreeStyle {
-  height: 76vh;
+  height: 74vh;
 }
 </style>

src/views/iosBasicData/release/jobApplication/detailsPage.vue

@@ -13,10 +13,9 @@
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
                     v-if="!editButton" @click="submit">保 存
                 </el-button>
-                <el-button type="success" size="small" v-if="form.id && form.issueStatus == 'N'"
-                    @click="subApplication">提 交</el-button>
-                <el-button type="info" size="small" v-if="form.id && form.issueStatus == 'S'"
-                    @click="revokeApp">撤
+                <el-button type="success" size="small" v-if="form.id && form.issueStatus == 'N'" @click="subApplication">提
+                    交</el-button>
+                <el-button type="info" size="small" v-if="form.id && form.issueStatus == 'S'" @click="revokeApp">撤
                     销</el-button>
                 <el-button type="warning" size="small" v-if="form.id && form.issueStatus == 'S'"
                     @click="submitSign">签单完成确认</el-button>
@@ -585,7 +584,20 @@ export default {
                             label: '等级',
                             prop: 'itemLevel',
                             overHidden: true,
-                            display: false
+                            display: false,
+                            dicData: [{
+                                label: '普通',
+                                value: 0
+                            }, {
+                                label: '一级',
+                                value: 1
+                            }, {
+                                label: '二级',
+                                value: 2
+                            }, {
+                                label: '三级',
+                                value: 3
+                            }],
                         }, {
                             label: 'MBL NO',
                             prop: 'mblno',
@@ -711,6 +723,13 @@ export default {
                         disabled: false,
                         remote: true,
                         overHidden: true,
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }],
                     },
                     {
                         label: '单据类型',
@@ -897,7 +916,7 @@ export default {
                 })
             }
             if (name == 'carrierCnName') {
-                getListByType({ current: 1, size: 10,corpTypeName:'船公司',status:0, cnName: val ? val : null }).then(res => {
+                getListByType({ current: 1, size: 10, corpTypeName: '船公司', status: 0, cnName: val ? val : null }).then(res => {
                     this.carrierData = res.data.data.records
                 })
             }
@@ -917,7 +936,7 @@ export default {
                 })
             }
             if (name == 'runnerName') {
-                getRunner({ roles:'跑单员', name: val ? val : null }).then(res => {
+                getRunner({ roles: '跑单员', name: val ? val : null }).then(res => {
                     this.runnerData = res.data.data
                 })
             }
@@ -1086,7 +1105,7 @@ export default {
                     });
                     application(this.form).then(res => {
                         this.form = res.data.data
-                        this.editButton=true
+                        this.editButton = true
                         this.optionForm.disabled = true
                         this.$message.success("提交成功");
                         this.getDetail(this.form.id)

src/views/iosBasicData/release/releaseManagement/detailsPage.vue

@@ -512,7 +512,7 @@ export default {
                         span: 6
                     },
                     {
-                        label: '已生成账单未放单*',
+                        label: '已生成账单未放单',
                         prop: "unplacedOrders",
                         type: 'select',
                         disabled: true,
@@ -681,12 +681,19 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: '产生账单*',
-                        prop: '',
+                        label: '产生账单',
+                        prop: 'isAccbill',
                         width: 120,
                         disabled: false,
                         remote: true,
                         overHidden: true,
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }],
                     },
                     {
                         label: 'RMB',
@@ -746,24 +753,31 @@ export default {
                             display: false
                         }]
                     },
-                    {
-                        label: '发票号*',
-                        prop: '',
-                        disabled: false,
-                        remote: true,
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: '发票号*',
+                    //     prop: '',
+                    //     disabled: false,
+                    //     remote: true,
+                    //     overHidden: true,
+                    // },
                     {
                         label: '单票超额费用',
                         overHidden: true,
                         disabled: false,
                         children: [{
-                            label: '是否*',
+                            label: '是否',
                             prop: 'isOverLimit',
                             overHidden: true,
-                            display: false
+                            display: false,
+                            dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }],
                         }, {
-                            label: '金额*',
+                            label: '金额',
                             prop: 'overAmountDr',
                             overHidden: true,
                             display: false
@@ -818,15 +832,28 @@ export default {
                             overHidden: true,
                             display: false
                         }, {
-                            label: '完成时间*',
-                            prop: '',
+                            label: '完成时间',
+                            prop: 'releaseTime',
                             overHidden: true,
                             display: false
                         }, {
-                            label: '紧急程度*',
-                            prop: '',
+                            label: '紧急程度',
+                            prop: 'itemLevel',
                             overHidden: true,
                             width: 120,
+                            dicData: [{
+                                label: '普通',
+                                value: 0
+                            }, {
+                                label: '一级',
+                                value: 1
+                            }, {
+                                label: '二级',
+                                value: 2
+                            }, {
+                                label: '三级',
+                                value: 3
+                            }],
                         }]
                     },
                     {
@@ -852,6 +879,19 @@ export default {
                         disabled: false,
                         remote: true,
                         overHidden: true,
+                        dicData: [{
+                            label: '直单',
+                            value: 'DD'
+                        }, {
+                            label: '主单',
+                            value: 'MM'
+                        }, {
+                            label: '主分单',
+                            value: 'MH'
+                        }, {
+                            label: '从分单',
+                            value: 'HH'
+                        }],
                     },
 
 

src/views/iosBasicData/release/schedulingManagement/detailsPage.vue

@@ -196,7 +196,20 @@ export default {
                             label: '等级',
                             prop: 'itemLevel',
                             overHidden: true,
-                            display: false
+                            display: false,
+                            dicData: [{
+                                label: '普通',
+                                value: 0
+                            }, {
+                                label: '一级',
+                                value: 1
+                            }, {
+                                label: '二级',
+                                value: 2
+                            }, {
+                                label: '三级',
+                                value: 3
+                            }],
                         }, {
                             label: '签单方式',
                             prop: 'masterBillNo',
@@ -293,7 +306,7 @@ export default {
                             overHidden: true,
                             display: false
                         }, {
-                            label: 'VOY？',
+                            label: 'VOY',
                             prop: 'voyageNo',
                             overHidden: true,
                             display: false
@@ -304,7 +317,14 @@ export default {
                         prop: 'swtichCount',
                         disabled: false,
                         overHidden: true,
-                        width: 100
+                        width: 100,
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }],
                     },
                     {
                         label: '换签原因',