Merge remote-tracking branch 'origin/dev' into dev

src/views/finance/charge/kaihe-detail.vue

@@ -276,6 +276,7 @@
           type="danger"
           size="mini"
           v-if="form.fBillstatus == 4"
+          :loading="subLoading"
           @click="backApproval('f_billstatus')"
           >撤销审批</el-button
         >
@@ -699,12 +700,26 @@ export default {
         billId: this.form.fId,
         fidStatus: status,
       };
-      RevocationApproval(data).then((response) => {
-        if (response.code === 200) {
-          this.msgSuccess("撤销审批成功");
-          this.open = false;
-        }
-      });
+      this.subLoading = true;
+      RevocationApproval(data)
+        .then((response) => {
+          if (response.code === 200) {
+            this.msgSuccess("撤销审批成功");
+            const id = this.form.fId;
+            getdetail(id).then((res) => {
+              if (res.data.tFee.fFromDate && res.data.tFee.fToDate) {
+                const date = [];
+                date.push(res.data.tFee.fFromDate, res.data.tFee.fToDate);
+                res.data.tFee.date = date;
+              }
+              this.form = res.data.tFee;
+              this.tableData = res.data.tFeeDo;
+            });
+          }
+        })
+        .finally(() => {
+          this.subLoading = false;
+        });
     },
     returnData() {
       this.$emit("goBack", false);

src/views/finance/charge/kaihe-index.vue

@@ -13,7 +13,6 @@
                 clearable
                 style="width: 100%"
                 filterable
-                :remote-method="remoteMethod"
               >
                 <el-option
                   v-for="item in corpList"

src/views/finance/contrast/kaihe-detail.vue

@@ -258,6 +258,7 @@
           type="danger"
           size="mini"
           v-if="form.fBillstatus == 4"
+          :loading="subLoading"
           @click="backApproval('f_billstatus')"
           >撤销审批</el-button
         >
@@ -682,10 +683,24 @@ export default {
         billId: this.form.fId,
         fidStatus: status,
       };
+      this.subLoading = true;
       RevocationApproval(data).then((response) => {
         if (response.code === 200) {
           this.msgSuccess("撤销审批成功");
-          this.open = false;
+          const id = this.form.fId;
+          getdetail(id)
+            .then((res) => {
+              if (res.data.tFee.fFromDate && res.data.tFee.fToDate) {
+                const date = [];
+                date.push(res.data.tFee.fFromDate, res.data.tFee.fToDate);
+                res.data.tFee.date = date;
+              }
+              this.form = res.data.tFee;
+              this.tableData = res.data.tFeeDo;
+            })
+            .finally(() => {
+              this.subLoading = false;
+            });
         }
       });
     },

src/views/finance/otherFinancial/index.vue

@@ -8,27 +8,68 @@
         :inline="true"
         label-width="88px"
       >
-        <el-row type="flex" justify="space-between">
-          <el-form-item label="参考编号" prop="fMblno">
-            <el-input
-              v-model="query.fMblno"
-              placeholder="请输入参考编号"
-              clearable
-              size="small"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="cyan"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-              >搜索
-            </el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置
-            </el-button>
-          </el-form-item>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="参考编号" prop="fMblno">
+              <el-input
+                v-model="query.fMblno"
+                placeholder="请输入参考编号"
+                clearable
+                size="small"
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="船名">
+              <el-select
+                v-model="query.fVslid"
+                size="small"
+                placeholder="请选择"
+                style="width: 100%"
+                clearable
+                @change="fvslChange2"
+                @clear="fvslClear2"
+              >
+                <el-option
+                  v-for="item in TVesselfs2"
+                  :key="item.fId"
+                  :label="item.fName"
+                  :value="item.fId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="航次">
+              <el-select
+                v-model="query.fVoyid"
+                size="small"
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in TVoyagefs2"
+                  :key="item.fId"
+                  :label="item.fNo"
+                  :value="item.fId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="18" style="display:flex;justify-content: flex-end;">
+            <el-form-item>
+              <el-button
+                type="cyan"
+                icon="el-icon-search"
+                size="mini"
+                @click="getList"
+                >搜索
+              </el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置
+              </el-button>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
 
@@ -230,7 +271,7 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[10, 20, 30, 40, 50, 100, 150, 200]"
           background
           layout="sizes, prev, pager, next"
           :total="total"
@@ -935,6 +976,8 @@ export default {
   },
   data() {
     return {
+      TVesselfs2: [],
+      TVoyagefs2: [],
       rules: {
         fBsdate: [{ required: true, message: " ", trigger: "blur" }],
         fMblno: [{ required: true, message: " ", trigger: "blur" }],
@@ -960,9 +1003,12 @@ export default {
       query: {
         pageNum: 1,
         pageSize: 10,
+        fVslid: null,
+        fVoyid: null,
       },
       selection: [],
       queryParams: {
+        fVslid: null,
         fVoyid: null,
       },
       fFeetUnitOptions: [],
@@ -1063,6 +1109,12 @@ export default {
     selectTVoyagef().then((res) => {
       this.TVoyagefs = res.rows;
     });
+    selectTVesself().then((res) => {
+      this.TVesselfs2 = res.rows;
+    });
+    selectTVoyagef().then((res) => {
+      this.TVoyagefs2 = res.rows;
+    });
     this.getDicts("currency_difference").then((response) => {
       this.currencyList = response.data;
     });
@@ -1092,6 +1144,7 @@ export default {
         this.fFeeid_s = res.data.fees;
       }
     });
+    this.getRow();
     this.getList();
   },
   activated() {
@@ -1112,6 +1165,18 @@ export default {
       });
       this.queryParams.fVoyid = null;
     },
+    fvslChange2(id) {
+      selectTVoyagef({ fPid: id }).then((res) => {
+        this.TVoyagefs2 = res.rows;
+      });
+      this.query.fVoyid = null;
+    },
+    fvslClear2() {
+      selectTVoyagef().then((res) => {
+        this.TVoyagefs2 = res.rows;
+      });
+      this.query.fVoyid = null;
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.query.pageSize = val;

src/views/finance/payment/kaihe-detail.vue

@@ -276,6 +276,7 @@
           type="danger"
           size="mini"
           v-if="form.fBillstatus == 4"
+          :loading="subLoading"
           @click="backApproval('f_billstatus')"
           >撤销审批</el-button
         >
@@ -699,10 +700,24 @@ export default {
         billId: this.form.fId,
         fidStatus: status,
       };
+      this.subLoading = true;
       RevocationApproval(data).then((response) => {
         if (response.code === 200) {
           this.msgSuccess("撤销审批成功");
-          this.open = false;
+          const id = this.form.fId;
+          getdetail(id)
+            .then((res) => {
+              if (res.data.tFee.fFromDate && res.data.tFee.fToDate) {
+                const date = [];
+                date.push(res.data.tFee.fFromDate, res.data.tFee.fToDate);
+                res.data.tFee.date = date;
+              }
+              this.form = res.data.tFee;
+              this.tableData = res.data.tFeeDo;
+            })
+            .finally(() => {
+              this.subLoading = false;
+            });
         }
       });
     },

src/views/kaihe/containerNews/boxInformation/index.vue

@@ -413,7 +413,6 @@
       :fullscreen="dialogFull"
       :title="title"
       :visible.sync="open"
-      close-on-click-modal="false"
       width="60%"
       :close-on-click-modal="false"
       append-to-body
@@ -785,7 +784,14 @@
       <el-table
           :data="tableData"
           style="width: 100%">
-        <el-table-column
+          <el-table-column
+              label="序号"
+              type="index"
+              width="50"
+              fixed
+              align="center"
+            />
+         <el-table-column
             prop="opctnstatusName"
             label="箱动态"
             :show-overflow-tooltip="true"
@@ -873,7 +879,6 @@
     <el-dialog
       :title="boxStateTitle"
       :visible.sync="boxStateOpen"
-      close-on-click-modal="false"
       width="60%"
       :close-on-click-modal="false"
       append-to-body

src/views/kaihe/containerNews/historyBoxNews/index.vue

@@ -340,6 +340,13 @@
       <el-table
         :data="tableData"
         style="width: 100%">
+          <el-table-column
+              label="序号"
+              type="index"
+              width="50"
+              fixed
+              align="center"
+            />
         <el-table-column
           prop="opctnstatusName"
           label="箱动态"