瀏覽代碼

修改bug

QuKatie 3 年之前
父節點
當前提交
e87f047de4

+ 15 - 0
src/views/finance/charge/kaihe-detail.vue

@@ -70,6 +70,8 @@
               size="small"
               placeholder="请选择"
               clearable
+              @change="fvslChange"
+              @clear="fvslClear"
               :disabled="form.fBillstatus >= 4 || readOnly == 0"
               style="width: 100%"
             >
@@ -477,6 +479,7 @@ export default {
       form: {
         fDc: "D",
         fSystemType: Cookies.get("sysType"),
+        fVoyid: null,
       },
       options: [],
       tableData: [],
@@ -505,6 +508,18 @@ export default {
   },
   created() {},
   methods: {
+    fvslChange(id) {
+      selectTVoyagef({ fPid: id }).then((res) => {
+        this.TVoyagefs = res.rows;
+      });
+      this.form.fVoyid = null;
+    },
+    fvslClear() {
+      selectTVoyagef().then((res) => {
+        this.TVoyagefs = res.rows;
+      });
+      this.form.fVoyid = null;
+    },
     /** 导出按钮操作 */
     handleExport() {
       if (this.form.fCorpid == null) {

+ 15 - 0
src/views/finance/contrast/kaihe-detail.vue

@@ -70,6 +70,8 @@
               size="small"
               placeholder="请选择"
               clearable
+              @change="fvslChange"
+              @clear="fvslClear"
               :disabled="form.fBillstatus >= 4 || readOnly == 0"
               style="width: 100%"
             >
@@ -460,6 +462,7 @@ export default {
         fReconciliation: "0",
         fDc: "D",
         fSystemType: Cookies.get("sysType"),
+        fVoyid: null,
       },
       options: [],
       tableData: [],
@@ -488,6 +491,18 @@ export default {
   },
   created() {},
   methods: {
+    fvslChange(id) {
+      selectTVoyagef({ fPid: id }).then((res) => {
+        this.TVoyagefs = res.rows;
+      });
+      this.form.fVoyid = null;
+    },
+    fvslClear() {
+      selectTVoyagef().then((res) => {
+        this.TVoyagefs = res.rows;
+      });
+      this.form.fVoyid = null;
+    },
     /** 导出按钮操作 */
     handleExport() {
       if (this.form.fCorpid == null) {

+ 22 - 8
src/views/finance/otherFinancial/index.vue

@@ -173,8 +173,7 @@
         <el-table-column type="selection" width="55" align="center"/>
         <el-table-column type="index" label="行号" align="center" fixed width="60"/>
         <el-table-column
-          v-for="(item, index) in getRowList"
-          v-if="item.show"
+          v-for="(item, index) in getRowList"      
           :key="index"
           :label="item.name"
           :width="item.width"
@@ -283,13 +282,15 @@
             />
           </el-form-item>
           <el-form-item label="船名" v-if="sysType == 3">
-            <template slot-scope="scope">
               <el-select
                   v-model="queryParams.fVslid"
                   style="width: 200px;"
                   size="small"
                   placeholder="请选择船名"
                   filterable
+                  clearable
+                  @change="fvslChange"
+                  @clear="fvslClear"
               >
                 <el-option
                     v-for="item in TVesselfs"
@@ -298,7 +299,6 @@
                     :value="item.fId"
                 />
               </el-select>
-            </template>
           </el-form-item>
           <el-form-item
               prop="fVoyid"
@@ -306,7 +306,6 @@
               label="航次"
               v-if="sysType == 3"
           >
-            <template slot-scope="scope">
               <el-select
                   v-model="queryParams.fVoyid"
                   size="small"
@@ -321,7 +320,6 @@
                     :value="item.fId"
                 />
               </el-select>
-            </template>
           </el-form-item>
           <el-form-item label="备注" prop="remark">
             <el-input
@@ -949,7 +947,9 @@ export default {
         pageSize: 10
       },
       selection: [],
-      queryParams: {},
+      queryParams: {
+        fVoyid:null
+      },
       fFeetUnitOptions:[],
       currencyList:[],
       TVesselfs:[],
@@ -1085,6 +1085,18 @@ export default {
     }
   },
   methods: {
+    fvslChange(id) {
+      selectTVoyagef({ fPid: id }).then((res) => {
+        this.TVoyagefs = res.rows;
+      });
+      this.queryParams.fVoyid = null;
+    },
+    fvslClear() {
+      selectTVoyagef().then((res) => {
+        this.TVoyagefs = res.rows;
+      });
+      this.queryParams.fVoyid = null;
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.query.pageSize = val
@@ -1198,7 +1210,9 @@ export default {
     handleAdd() {
       this.jiGang = true
       this.disabled = false
-      this.queryParams = {}
+      this.queryParams = {
+        fVoyid:null
+      }
       this.warehouseDrList = []
       this.warehouseCrList = []
     },

+ 15 - 0
src/views/finance/payment/kaihe-detail.vue

@@ -70,6 +70,8 @@
               size="small"
               placeholder="请选择"
               clearable
+              @change="fvslChange"
+              @clear="fvslClear"
               :disabled="form.fBillstatus >= 4 || readOnly == 0"
               style="width: 100%"
             >
@@ -477,6 +479,7 @@ export default {
       form: {
         fDc: "C",
         fSystemType: Cookies.get("sysType"),
+        fVoyid: null,
       },
       options: [],
       tableData: [],
@@ -505,6 +508,18 @@ export default {
   },
   created() {},
   methods: {
+    fvslChange(id) {
+      selectTVoyagef({ fPid: id }).then((res) => {
+        this.TVoyagefs = res.rows;
+      });
+      this.form.fVoyid = null;
+    },
+    fvslClear() {
+      selectTVoyagef().then((res) => {
+        this.TVoyagefs = res.rows;
+      });
+      this.form.fVoyid = null;
+    },
     /** 导出按钮操作 */
     handleExport() {
       if (this.form.fCorpid == null) {

+ 55 - 11
src/views/kaihe/shipDynamics/vesselDetail/index.vue

@@ -2,14 +2,37 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
-          <el-form-item label="航次" prop="fNo" label-width="110px">
-            <el-input
-              v-model="queryParams.fNo"
+         <el-form-item label="船名" prop="fPid" label-width="110px">
+            <el-select
+              v-model="queryParams.fPid"
+              placeholder="请选择"
+              clearable
+              @change="fvslChange"
+              @clear="fvslClear"
               style="width:200px"
-              placeholder="请输入航次"
+            >
+              <el-option
+                v-for="item in TVesselfs"
+                :key="item.fId"
+                :label="item.fName"
+                :value="item.fId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="航次"  prop="fNo" label-width="110px">
+            <el-select
+              v-model="queryParams.fNo"
+              placeholder="请选择"
               clearable
-              size="small"
-            />
+              style="width:200px"
+            >
+              <el-option
+                v-for="item in TVoyagefs"
+                :key="item.fId"
+                :label="item.fNo"
+                :value="item.fNo"
+              />
+            </el-select>
           </el-form-item>
         <el-form-item label="装货港" prop="fPortofloadid" label-width="110px">
           <el-select
@@ -409,7 +432,6 @@
       :fullscreen="dialogFull"
       :title="title"
       :visible.sync="open"
-      close-on-click-modal="false"
       width="60%"
       :close-on-click-modal="false"
       append-to-body>
@@ -661,7 +683,7 @@
                 <el-select style="width:80%;" placeholder="请选择" :disabled="doNot"
                            v-model="form.fLaneid">
                   <el-option
-                      v-for="(dict, index) in rouTe"
+                      v-for="dict in rouTe"
                       :key="dict.fId"
                       :label="dict.fName"
                       :value="dict.fId"
@@ -868,7 +890,7 @@
   import Cookies from 'js-cookie'
   import { addSet, resetModule, select } from '@/api/system/set'
   import {getcntrName} from "@/api/kaihe/shipDynamics/oceanFreightRate";
-
+  import {selectTVoyagef,selectTVesself} from "@/api/finance/kaihe/payment";
   Vue.directive('dialogDrag', {
     bind(el, binding, vnode, oldVnode) {
       const dialogHeaderEl = el.querySelector('.el-dialog__header')
@@ -1126,6 +1148,8 @@
         title: "",
         // 状态数据字典
         statusOptions: [],
+        TVesselfs: [],
+        TVoyagefs: [],
         // 是否显示弹出层
         open: false,
         // 查询参数
@@ -1144,7 +1168,8 @@
           fDays:null,
           fStatus:null,
           createBy:null,
-          remark:null
+          remark:null,
+          fVoyid: null,
         },
         // 表单参数
         form: {
@@ -1164,7 +1189,8 @@
           remark:null,
           fDucomentrayoffdate:null,
           fCutoffdate:null,
-          fTeu:null
+          fTeu:null,
+          fVoyid: null,
         },
         cntrOptions:[],
         // 表单校验
@@ -1209,8 +1235,26 @@
       this.portRemoteMethod()
       this.manageRemoteMethod()
       this.getRow()
+      selectTVesself().then((res) => {
+        this.TVesselfs = res.rows;
+      });
+      selectTVoyagef().then((res) => {
+        this.TVoyagefs = res.rows;
+      });
     },
     methods: {
+    fvslChange(id) {
+      selectTVoyagef({ fPid: id }).then((res) => {
+        this.TVoyagefs = res.rows;
+      });
+      this.queryParams.fNo = null;
+    },
+    fvslClear() {
+      selectTVoyagef().then((res) => {
+        this.TVoyagefs = res.rows;
+      });
+      this.queryParams.fNo = null;
+    },
       //重置列表
       delRow() {
         this.data = {