修改bug

src/views/exportTrade/salesContract/detailsPage.vue

@@ -146,8 +146,8 @@
                         <el-select size="small" v-model="form.banks" placeholder="请选择" @change="banksChange"
                                    clearable
                                    :disabled="detailData.status == 1 || !form.belongToCorpId">
-                            <el-option v-for="item in banksData" :key="item.id" :label="item.accountBank+'-'+item.remarks"
-                                       :value="item.accountNo">
+                            <el-option v-for="item in banksData" :key="item.id" :label="item.remarks+'-'+item.accountNo"
+                                       :value="item.accountNo" :disabled="form.currency!=item.fcyno">
                             </el-option>
                         </el-select>
                     </template>
@@ -1558,10 +1558,15 @@ export default {
                 return item
             })
             if (this.banksData.length > 0) {
-                console.log(this.banksData[0],1524)
-                this.$set(this.form,'banks',this.banksData[0].accountNo)
-                this.$set(this.form,'accountBank',this.banksData[0].accountBank.split(' - ')[0])
-                this.$set(this.form,'banksAccountName',this.banksData[0].accountName)
+              this.banksData.some(e=>{
+                  if(this.form.currency==e.fcyno){
+                    this.$set(this.form,'banks',e.accountNo)
+                    this.$set(this.form,'accountBank',e.accountBank.split(' - ')[0])
+                    this.$set(this.form,'banksAccountName',e.accountName)
+                    return true
+                  }
+                })
+
             }else {
                 this.$set(this.form,'banks','')
                 this.$set(this.form,'accountBank','')
@@ -1888,6 +1893,21 @@ export default {
       if (this.form.currency && this.form.businesDate) {
         this.getParities("currency");
       }
+      if (this.banksData.length > 0) {
+              this.banksData.some(e=>{
+                  if(this.form.currency==e.fcyno){
+                    this.$set(this.form,'banks',e.accountNo)
+                    this.$set(this.form,'accountBank',e.accountBank.split(' - ')[0])
+                    this.$set(this.form,'banksAccountName',e.accountName)
+                    return true
+                  }
+                })
+
+      }else {
+                this.$set(this.form,'banks','')
+                this.$set(this.form,'accountBank','')
+                this.$set(this.form,'banksAccountName','')
+      }
     },
     dateClauseChange(row) {
       this.dateClauseList.forEach(e => {

src/views/iosBasicData/finvouchers/index.vue

@@ -350,11 +350,13 @@ import {
                       return item.id
                   }
               })
+              this.loading = true;
               confirmFinVouchers({ids:arrids.join(',')}).then(res=>{
                   this.$message({
                       type: "success",
                       message: "操作成功!"
                   });
+                  this.loading = false;
                   this.onLoad(this.page, this.query);
               })
           })
@@ -380,11 +382,13 @@ import {
                       return item.id
                   }
               })
+              this.loading = true;
               revokeFinVouchers({ids:arrids.join(',')}).then(res=>{
                   this.$message({
                       type: "success",
                       message: "操作成功!"
                   });
+                  this.loading = false;
                   this.onLoad(this.page, this.query);
               })
           })

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -487,7 +487,9 @@ export default {
             let item=this.deepClone(row)
             item.id = null;
             item.pid = null;
-            this.form.feesTemplateItemsList.push(item)
+            this.feestemplateForm = item
+            this.feestemplateVisible = true
+            // this.form.feesTemplateItemsList.push(item)
         },
         getCopyTemplate(id) {
             this.pageLoading = true

src/views/iosBasicData/periodManagement/index.vue

@@ -47,10 +47,17 @@
         </detailsPage>
         <el-dialog v-dialogdrag append-to-body :title="title" :visible.sync="openDialog" width="30%"
             :before-close="handleClose">
-            <span v-if="title == '汇兑损益汇率' || '期间损益汇率'" style="display: flex;align-items: center;">
+            <span v-if="title == '汇兑损益汇率'" style="display: flex;align-items: center;">
                 <avue-crud :data="itemData" :option="itemOption"></avue-crud>
             </span>
-            <span v-else-if="title == '开账' || '账套初始化'" style="display: flex;align-items: center;">
+            <span v-if="title == '期间损益汇率'" style="display: flex;align-items: center;">
+                <avue-crud :data="itemData" :option="itemOption"></avue-crud>
+            </span>
+            <span v-else-if="title == '开账'" style="display: flex;align-items: center;">
+                开账日期：<avue-date size="small" type="datetime" v-model="openDate" format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开张日期"></avue-date>
+            </span>
+            <span v-else-if="title == '账套初始化'" style="display: flex;align-items: center;">
                 开账日期：<avue-date size="small" type="datetime" v-model="openDate" format="yyyy-MM-dd HH:mm:ss"
                     value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开张日期"></avue-date>
             </span>
@@ -67,8 +74,9 @@
             <span slot="footer" class="dialog-footer">
                 <el-button size="mini" @click="openDialog = false">取 消</el-button>
                 <el-button v-if="title == '开账'" size="mini" type="primary" @click="onBill">确 定</el-button>
-                <el-button v-if="title == '账套初始化'" size="mini" type="primary" @click="resetBill">确 定</el-button>
-                <el-button v-if="title == '汇兑损益汇率' || '期间损益汇率'" size="mini" type="primary" @click="inPeriod">确 定</el-button>
+                <el-button v-else-if="title == '账套初始化'" size="mini" type="primary" @click="resetBill">确 定</el-button>
+                <el-button v-else-if="title == '汇兑损益汇率'" size="mini" type="primary" @click="inPeriod">确 定</el-button>
+                <el-button v-else-if="title == '期间损益汇率'" size="mini" type="primary" @click="inPeriod">确 定</el-button>
             </span>
         </el-dialog>
         <el-dialog v-dialogdrag append-to-body title="业务审核未通过明细" :visible.sync="openDialog2" width="50%"

src/views/iosBasicData/rateManagement/detailsPage.vue

@@ -28,6 +28,18 @@
               :disabled="detailData.status == 1">
             </el-switch>
           </template>
+          <!-- <template slot="paritiesType">
+            <avue-select v-model="form.paritiesType" placeholder="请选择汇率类型" :disabled="detailData.status == 1"
+              :dic="typeData" @change="paritiesChange"></avue-select>
+          </template> -->
+          <template slot="annual">
+            <avue-date v-model="form.annual" placeholder="请选择汇率年度" :disabled="detailData.status == 1" type="year"
+              @change="annualChange" valueFormat="yyyy"></avue-date>
+          </template>
+          <template v-if="form.paritiesType == '日汇率'" slot="moon">
+            <avue-select  v-model="form.moon" placeholder="请选择月份" :disabled="detailData.status == 1" :dic="MoonData"
+              @change="MoonChange"></avue-select>
+          </template>
           <template slot="button">
             <el-button v-if="form.code != 'CNY'" size="small" type="primary" @click="createExRate"
               :disabled="detailData.status == 1 || dataList.length != 0">产生汇率项目</el-button>
@@ -39,14 +51,13 @@
       <basic-container v-if="form.code != 'CNY'">
         <avue-crud ref="crud" v-model="crudForm" :option="optionList" id="out-table" :search.sync="search"
           :header-cell-class-name="headerClassName" :data="dataList" :table-loading="loading" :cell-style="cellStyle"
-          @row-save="rowSave" @row-update="rowUpdate" @search-change="searchChange" @search-reset="resetChange">
-          <!--<template slot="menuLeft">-->
-          <!--    <el-button-->
-          <!--        type="danger" plain-->
-          <!--        size="small"-->
-          <!--        @click.stop="BatchDelete"-->
-          <!--    >批量删除</el-button>-->
-          <!--</template>-->
+          @row-save="rowSave" @row-update="rowUpdate" @search-change="searchChange" @search-reset="resetChange"
+          @selection-change="selectionChange">
+
+          <template slot="menuLeft">
+            <el-button type="danger" size="small" @click.stop="BatchDelete"
+              :disabled="detailData.status == 1 || selectionList.length == 0">一键删除</el-button>
+          </template>
           <template v-if="!row.$cellEdit" slot="menu" slot-scope="{row}">
             <el-button type="text" size="small" @click="editFun(row)">编辑
             </el-button>
@@ -67,6 +78,70 @@ export default {
   name: "detailsPage",
   data() {
     return {
+      typeData: [
+        {
+          label: "年汇率",
+          value: "年汇率"
+        },
+        {
+          label: "月汇率",
+          value: "月汇率"
+        },
+        {
+          label: "日汇率",
+          value: "日汇率"
+        }
+      ],
+      MoonData: [
+        {
+          label: "一月",
+          value: 1
+        },
+        {
+          label: "二月",
+          value: 2
+        },
+        {
+          label: "三月",
+          value: 3
+        },
+        {
+          label: "四月",
+          value: 4
+        },
+        {
+          label: "五月",
+          value: 5
+        },
+        {
+          label: "六月",
+          value: 6
+        },
+        {
+          label: "七月",
+          value: 7
+        },
+        {
+          label: "八月",
+          value: 8
+        },
+        {
+          label: "九月",
+          value: 9
+        },
+        {
+          label: "十月",
+          value: 10
+        },
+        {
+          label: "十一月",
+          value: 11
+        },
+        {
+          label: "十二月",
+          value: 12
+        },
+      ],
       time: "",
       search: {
         annual: '2024'
@@ -189,71 +264,8 @@ export default {
           {
             label: "月份",
             prop: "moon",
-            type: "select",
-            filterable: true,
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            dicData: [
-              {
-                dictValue: "一月",
-                dictKey: 1
-              },
-              {
-                dictValue: "二月",
-                dictKey: 2
-              },
-              {
-                dictValue: "三月",
-                dictKey: 3
-              },
-              {
-                dictValue: "四月",
-                dictKey: 4
-              },
-              {
-                dictValue: "五月",
-                dictKey: 5
-              },
-              {
-                dictValue: "六月",
-                dictKey: 6
-              },
-              {
-                dictValue: "七月",
-                dictKey: 7
-              },
-              {
-                dictValue: "八月",
-                dictKey: 8
-              },
-              {
-                dictValue: "九月",
-                dictKey: 9
-              },
-              {
-                dictValue: "十月",
-                dictKey: 10
-              },
-              {
-                dictValue: "十一月",
-                dictKey: 11
-              },
-              {
-                dictValue: "十二月",
-                dictKey: 12
-              },
-            ],
             span: 6,
             display: false,
-            rules: [
-              {
-                required: true,
-                message: " ",
-                trigger: "change"
-              }
-            ]
           },
           {
             label: "状态",
@@ -308,18 +320,58 @@ export default {
     this.optionList.height = 450;
   },
   methods: {
+    selectionChange(list) {
+      this.selectionList = list
+    },
+    // paritiesChange(row) {
+    //   let obj = {
+    //     current: 1,
+    //     size: 20,
+    //     type: row,
+    //     code: this.form.code,
+    //     exrateYear: this.form.annual,
+
+    //   }
+    //   if (row == "日汇率") {
+    //     this.findObject(this.option.column, "moon").display = true;
+    //     this.search.annual = this.form.annual
+    //     this.search.moon = this.form.moon
+    //     this.search.paritiesType = row
+    //   } else if (row == "月汇率") {
+    //     this.findObject(this.option.column, "moon").display = false;
+    //     this.search.annual = this.form.annual
+    //     this.search.moon = null
+    //     this.form.moon=null
+    //     this.search.paritiesType = row
+    //   } else {
+    //     this.findObject(this.option.column, "moon").display = false;
+    //     this.search.annual = this.form.annual
+    //     this.search.moon = null
+    //     this.form.moon=null
+    //     this.search.paritiesType = row
+    //   }
+    // },
+    annualChange(row) {
+      this.search.annual = row
+      this.search.moon = this.form.moon
+      this.search.paritiesType = this.form.paritiesType
+      this.searchChange(this.search)
+    },
+    MoonChange(row) {
+      this.search.annual = this.form.annual
+      this.search.moon = row
+      this.search.paritiesType = this.form.paritiesType
+      this.searchChange(this.search)
+    },
     searchChange(params, done) {
-      console.log(params)
-      if (params.paritiesType == "日汇率") {
-        this.findObject(this.option.column, "moon").display = true;
-        // this.findObject(this.option.column, "annual").display = false;
-      } else if (params.paritiesType == "月汇率") {
-        this.findObject(this.option.column, "moon").display = false;
-        // 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;
-      }
+      // if (params.paritiesType == "日汇率") {
+      //   this.findObject(this.option.column, "moon").display = 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;
+      // }
       let obj = {
         current: 1,
         size: 35,
@@ -332,7 +384,6 @@ export default {
         this.dataList = res.data.data.records;
         done();
       })
-
     },
     resetChange() {
 
@@ -367,7 +418,7 @@ export default {
         })
         bcurexrateDetails(arrId.join(',')).then(res => {
           this.$message.success('操作成功')
-          this.getDetail(this.form.id)
+          this.searchChange(this.search)
         })
       })
     },
@@ -394,9 +445,6 @@ export default {
         .then(res => {
           this.form = res.data.data
           this.form.annual = this.form.annual + ''
-          // this.dataList = res.data.data.curExrateList
-          //   ? res.data.data.curExrateList
-          //   : [];
         })
         .finally(() => {
           this.allloading = false;
@@ -486,11 +534,11 @@ export default {
         if (valid) {
           this.toggleForm();
           const loading = this.$loading({
-              lock: true,
-              text: '加载中',
-              spinner: 'el-icon-loading',
-              background: 'rgba(255,255,255,0.7)'
-            });
+            lock: true,
+            text: '加载中',
+            spinner: 'el-icon-loading',
+            background: 'rgba(255,255,255,0.7)'
+          });
           // 拿有id 的数据
           // let arrId = []
           // for (let item of  this.dataList) {
@@ -655,55 +703,60 @@ export default {
           this.search.annual = this.form.annual
           this.search.moon = this.form.moon
           this.search.paritiesType = row
-          this.searchChange(this.search)
+          // this.searchChange(this.search)
+          // console.log("日汇率", this.search)
           // this.findObject(this.option.column, "annual").display = false;
         } else if (row == "月汇率") {
           this.findObject(this.option.column, "moon").display = false;
           this.search.annual = this.form.annual
-          this.search.moon = ''
+          this.search.moon = null
+          this.form.moon=null
           this.search.paritiesType = row
-          this.searchChange(this.search)
+          // this.searchChange(this.search)
+          // console.log("月汇率", this.search)
           // this.findObject(this.option.column, "annual").display = false;
         } else {
-          this.findObject(this.option.column, "moon").display = false;
+          // this.findObject(this.option.column, "moon").display = false;
           this.search.annual = this.form.annual
-          this.search.moon = ''
+          this.search.moon = null
+          this.form.moon=null
           this.search.paritiesType = row
-          this.searchChange(this.search)
+          // this.searchChange(this.search)
+          // console.log("年汇率", this.search)
           // this.findObject(this.option.column, "annual").display = true;
         }
-        // if (this.form.code) {
-        //   // 查明细信息
-        //   bcurexrateList(obj).then(res => {
-        //     this.dataList = res.data.data.records;
-        //   })
-        // }
-      },
-      deep: false, // 深度监听
-      immediate: false  // 第一次改变就执行
-    },
-    "form.annual": {
-      // 执行方法
-      handler(row, newValue) {
-        this.search.annual = row
-        this.search.moon = this.form.moon
-        this.search.paritiesType = this.form.paritiesType
-        this.searchChange(this.search)
-      },
-      deep: false, // 深度监听
-      immediate: false  // 第一次改变就执行
-    },
-    "form.moon": {
-      // 执行方法
-      handler(row, newValue) {
-        this.search.annual = this.form.annual
-        this.search.moon = row
-        this.search.paritiesType = this.form.paritiesType
-        this.searchChange(this.search)
+
+        if (this.form.code) {
+          // 查明细信息
+          obj={...obj,...this.search}
+          this.searchChange(obj)
+        }
       },
       deep: false, // 深度监听
       immediate: false  // 第一次改变就执行
     },
+    // "form.annual": {
+    //   // 执行方法
+    //   handler(row, newValue) {
+    //     this.search.annual = row
+    //     this.search.moon = this.form.moon
+    //     this.search.paritiesType = this.form.paritiesType
+    //     this.searchChange(this.search)
+    //   },
+    //   deep: false, // 深度监听
+    //   immediate: false  // 第一次改变就执行
+    // },
+    // "form.moon": {
+    //   // 执行方法
+    //   handler(row, newValue) {
+    //     this.search.annual = this.form.annual
+    //     this.search.moon = row
+    //     this.search.paritiesType = this.form.paritiesType
+    //     this.searchChange(this.search)
+    //   },
+    //   deep: false, // 深度监听
+    //   immediate: false  // 第一次改变就执行
+    // },
     "search.paritiesType": {
       handler(row, newValue) {
 

src/views/iosBasicData/rateManagement/js/optionList.js

@@ -39,6 +39,8 @@ export const optionList = {
   dialogFullscreen: true,
   addRowBtn:false,
   cellBtn:true,
+  tip: false,
+  selection: true,
   rowKey: "id",
   column: [{
     label: "币种代码",

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

@@ -13,14 +13,14 @@
                 <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="editButton && form.id && form.issueStatus == 'N'"
+                <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="editButton && form.id && form.issueStatus == 'S'"
+                <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="editButton && form.id && form.issueStatus == 'S'"
+                <el-button type="warning" size="small" v-if="form.id && form.issueStatus == 'S'"
                     @click="submitSign">签单完成确认</el-button>
-                <el-button type="info" size="small" v-if="editButton && form.id && form.issueStatus == 'O'"
+                <el-button type="info" size="small" v-if="form.id && form.issueStatus == 'O'"
                     @click="revokeSign">取消签单完成</el-button>
             </div>
         </div>
@@ -44,28 +44,28 @@
                             @corpChange="selectChange($event, 'carrierCnName')">
                         </search-query>
                     </tempalte>
-                    <tempalte slot="vesselCnName" slot-scope="{ row }">
-                        <search-query :datalist="vesselData" :selectValue="form.vesselCnName" :clearable="true"
+                    <tempalte slot="vesselEnName" slot-scope="{ row }">
+                        <search-query :datalist="vesselData" :selectValue="form.vesselEnName" :clearable="true"
                             :buttonIf="false" :filterable="true" :remote="true" :disabled="editButton" placeholder="请选择船名"
-                            :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                            @corpFocus="getRemote($event, 'vesselCnName')" @remoteMethod="getRemote($event, 'vesselCnName')"
-                            @corpChange="selectChange($event, 'vesselCnName')">
+                            :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                            @corpFocus="getRemote($event, 'vesselEnName')" @remoteMethod="getRemote($event, 'vesselEnName')"
+                            @corpChange="selectChange($event, 'vesselEnName')">
                         </search-query>
                     </tempalte>
-                    <tempalte slot="polCnName" slot-scope="{ row }">
-                        <search-query :datalist="polData" :selectValue="form.polCnName" :clearable="true" :buttonIf="false"
+                    <tempalte slot="polEnName" slot-scope="{ row }">
+                        <search-query :datalist="polData" :selectValue="form.polEnName" :clearable="true" :buttonIf="false"
                             :filterable="true" :remote="true" :disabled="editButton" placeholder="请选择起运港"
-                            :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                            @corpFocus="getRemote($event, 'polCnName')" @remoteMethod="getRemote($event, 'polCnName')"
-                            @corpChange="selectChange($event, 'polCnName')">
+                            :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                            @corpFocus="getRemote($event, 'polEnName')" @remoteMethod="getRemote($event, 'polEnName')"
+                            @corpChange="selectChange($event, 'polEnName')">
                         </search-query>
                     </tempalte>
-                    <tempalte slot="podCnName" slot-scope="{ row }">
-                        <search-query :datalist="podData" :selectValue="form.podCnName" :clearable="true" :buttonIf="false"
+                    <tempalte slot="podEnName" slot-scope="{ row }">
+                        <search-query :datalist="podData" :selectValue="form.podEnName" :clearable="true" :buttonIf="false"
                             :filterable="true" :remote="true" :disabled="editButton" placeholder="请选择目的港"
-                            :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                            @corpFocus="getRemote($event, 'podCnName')" @remoteMethod="getRemote($event, 'podCnName')"
-                            @corpChange="selectChange($event, 'podCnName')">
+                            :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                            @corpFocus="getRemote($event, 'podEnName')" @remoteMethod="getRemote($event, 'podEnName')"
+                            @corpChange="selectChange($event, 'podEnName')">
                         </search-query>
                     </tempalte>
                     <tempalte slot="runnerName" slot-scope="{ row }">
@@ -204,8 +204,8 @@ export default {
                 corpCnName: null,
                 carrierCnName: null,
                 vesselCnNam: null,
-                polCnName: null,
-                podCnName: null,
+                polEnName: null,
+                podEnName: null,
                 runnerName: null,
                 workType: 'RELEASE',
                 businessType: 'SE',
@@ -330,7 +330,7 @@ export default {
                     },
                     {
                         label: '船名',
-                        prop: "vesselCnName",
+                        prop: "vesselEnName",
                         overHidden: true,
                         formslot: true,
                         disabled: false,
@@ -351,7 +351,7 @@ export default {
                     },
                     {
                         label: '起运港',
-                        prop: "polCnName",
+                        prop: "polEnName",
                         overHidden: true,
                         formslot: true,
                         disabled: false,
@@ -448,7 +448,7 @@ export default {
                     },
                     {
                         label: '目的港',
-                        prop: "podCnName",
+                        prop: "podEnName",
                         overHidden: true,
                         formslot: true,
                         disabled: false,
@@ -657,7 +657,7 @@ export default {
                                 display: false
                             }, {
                                 label: 'VSL',
-                                prop: 'vesselCnName',
+                                prop: 'vesselEnName',
                                 overHidden: true,
                                 display: false
                             }, {
@@ -819,7 +819,7 @@ export default {
                         }
                     })
                 }
-                if (name == 'vesselCnName') {
+                if (name == 'vesselEnName') {
                     this.vesselData.forEach(e => {
                         if (e.cnName == val) {
                             this.form.vesselId = e.id
@@ -828,7 +828,7 @@ export default {
                         }
                     })
                 }
-                if (name == 'polCnName') {
+                if (name == 'polEnName') {
                     this.polData.forEach(e => {
                         if (e.cnName == val) {
                             this.form.polId = e.id
@@ -837,7 +837,7 @@ export default {
                         }
                     })
                 }
-                if (name == 'podCnName') {
+                if (name == 'podEnName') {
                     this.podData.forEach(e => {
                         if (e.cnName == val) {
                             this.form.podId = e.id
@@ -868,17 +868,17 @@ export default {
                     this.form.carrierCnName = null
                     this.form.carrierEnName = null
                 }
-                if (name == 'vesselCnName') {
+                if (name == 'vesselEnName') {
                     this.form.vesselId = null
                     this.form.vesselCnName = null
                     this.form.vesselEnName = null
                 }
-                if (name == 'polCnName') {
+                if (name == 'polEnName') {
                     this.form.polId = null
                     this.form.polCnName = null
                     this.form.polEnName = null
                 }
-                if (name == 'podCnName') {
+                if (name == 'podEnName') {
                     this.form.podId = null
                     this.form.podCnName = null
                     this.form.podEnName = null
@@ -901,18 +901,18 @@ export default {
                     this.carrierData = res.data.data.records
                 })
             }
-            if (name == 'vesselCnName') {
-                getBvessels({ current: 1, size: 10, cnName: val ? val : null }).then(res => {
+            if (name == 'vesselEnName') {
+                getBvessels({ current: 1, size: 10, enName: val ? val : null }).then(res => {
                     this.vesselData = res.data.data.records
                 })
             }
-            if (name == 'polCnName') {
-                getBports({ current: 1, size: 10, cnName: val ? val : null }).then(res => {
+            if (name == 'polEnName') {
+                getBports({ current: 1, size: 10, enName: val ? val : null }).then(res => {
                     this.polData = res.data.data.records
                 })
             }
-            if (name == 'podCnName') {
-                getBports({ current: 1, size: 10, cnName: val ? val : null }).then(res => {
+            if (name == 'podEnName') {
+                getBports({ current: 1, size: 10, enName: val ? val : null }).then(res => {
                     this.podData = res.data.data.records
                 })
             }
@@ -1040,8 +1040,8 @@ export default {
                         submit(obj).then(res => {
                             this.form = res.data.data
                             this.$message.success("保存成功");
-                            this.editButton = true;
-                            this.optionForm.disabled = true
+                            // this.editButton = true;
+                            // this.optionForm.disabled = true
                         }).finally(() => {
                             loading.close();
                         });
@@ -1057,8 +1057,8 @@ export default {
                             submit(obj).then(res => {
                                 this.form = res.data.data
                                 this.$message.success("保存成功");
-                                this.editButton = true;
-                                this.optionForm.disabled = true
+                                // this.editButton = true;
+                                // this.optionForm.disabled = true
                             }).finally(() => {
                                 loading.close();
                             });
@@ -1086,6 +1086,8 @@ export default {
                     });
                     application(this.form).then(res => {
                         this.form = res.data.data
+                        this.editButton=true
+                        this.optionForm.disabled = true
                         this.$message.success("提交成功");
                         this.getDetail(this.form.id)
                     }).finally(() => {

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

@@ -103,6 +103,7 @@ export default {
             prop: "corpCnName",
             search: true,
             overHidden: true,
+            filterable:true,
             type: 'select',
             props: {
               label: 'cnName',
@@ -205,11 +206,6 @@ export default {
           //   overHidden: true,
           // },
           {
-            label: '备注',
-            prop: "remarks",
-            overHidden: true,
-          },
-          {
             label: '提单份数',
             prop: "numberOfObl",
             overHidden: true,

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

@@ -13,7 +13,7 @@
                 <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="editButton && form.id && form.issueStatus == 'I'"
+                <el-button type="success" size="small" v-if="form.id && form.issueStatus == 'I'"
                     @click="subApplication">放单完成</el-button>
             </div>
         </div>
@@ -1129,7 +1129,27 @@ export default {
                         });
                     } else {
                         if (this.selectionList.length > 0) {
-                            this.form.releaseBillList = this.selectionList
+                            if (this.selectionList.length > 0) {
+                                this.form.releaseBillList = this.selectionList
+                                obj = {
+                                    billNoFormat: 'FD',
+                                    businessTypeCode: 'FD',
+                                    ...this.form,
+                                    billType: "R"
+                                }
+                                submit(obj).then(res => {
+                                    this.form = res.data.data
+                                    this.$message.success("保存成功");
+                                    this.editButton = true;
+                                    this.optionForm.disabled = true
+                                }).finally(() => {
+                                    loading.close();
+                                });
+                            } else {
+                                loading.close();
+                                this.$message.error("请选择明细");
+                            }
+                        } else {
                             obj = {
                                 billNoFormat: 'FD',
                                 businessTypeCode: 'FD',
@@ -1139,15 +1159,11 @@ export default {
                             submit(obj).then(res => {
                                 this.form = res.data.data
                                 this.$message.success("保存成功");
-                                this.editButton = true;
-                                this.optionForm.disabled = true
                             }).finally(() => {
                                 loading.close();
                             });
-                        } else {
-                            loading.close();
-                            this.$message.error("请选择明细");
                         }
+
                     }
                 } else {
                     return false;
@@ -1167,6 +1183,8 @@ export default {
                     application(this.form).then(res => {
                         this.form = res.data.data
                         this.$message.success("提交成功");
+                        this.editButton = true;
+                        this.optionForm.disabled = true
                         this.getDetail(this.form.id)
                     }).finally(() => {
                         loading.close();

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

@@ -103,6 +103,7 @@ export default {
             prop: "corpCnName",
             search: true,
             overHidden: true,
+            filterable:true,
             type: 'select',
             props: {
               label: 'cnName',

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

@@ -13,7 +13,7 @@
                 <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="editButton && form.id && form.issueStatus == 'D'"
+                <el-button type="success" size="small" v-if="form.id && form.issueStatus == 'D'"
                     @click="subApplication">调度完成</el-button>
             </div>
         </div>
@@ -430,8 +430,6 @@ export default {
                 submit(this.form).then(res => {
                     this.form = res.data.data
                     this.$message.success("保存成功");
-                    this.editButton = true;
-                    this.optionForm.disabled = true
                 }).finally(() => {
                     loading.close();
                 });
@@ -466,6 +464,8 @@ export default {
                     });
                     application(this.form).then(res => {
                         this.form = res.data.data
+                        this.editButton = true;
+                        this.optionForm.disabled = true
                         this.$message.success("调度成功");
                         this.getDetail(this.form.id)
                     }).finally(() => {

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

@@ -24,9 +24,9 @@
         </el-tab-pane>
         <el-tab-pane label="调度单据" name="second">
           <avue-crud :option="option" :search.sync="search2" v-model="form2" :table-loading="loading" :data="dataList2"
-            ref="crud" :key="key" @on-load="onLoad2" @search-change="searchChange2" @row-del="rowDel"
-            @refresh-change="refreshChange2" @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 362)"
-            @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 362)" :page.sync="page2">
+            ref="crud2" :key="key" @on-load="onLoad2" @search-change="searchChange2" @row-del="rowDel"
+            @refresh-change="refreshChange2" @resetColumn="resetColumnTwo('crud2', 'option', 'optionList', 362)"
+            @saveColumn="saveColumnTwo('crud2', 'option', 'optionList', 362)" :page.sync="page2">
             <template slot-scope="{type,size,row,index}" slot="menu">
               <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
               <el-button :size="size" :type="type" :disabled="row.issueStatus != 'D'"
@@ -136,6 +136,7 @@ export default {
             prop: "corpCnName",
             search: true,
             overHidden: true,
+            filterable:true,
             type: 'select',
             props: {
               label: 'cnName',