feat: 增加总单级申报页面功能

zhanbo.xu
Commit 96ff21fab3904830767e5ab1215a964440a2d6e8 96ff21fa 1 parent b0bb3406
Showing 1 changed file with 236 additions and 69 deletions
src/views/arrival-declare/index.vue
--- a/src/views/arrival-declare/index.vue
View file @96ff21f
+++ b/src/views/arrival-declare/index.vue
View file @96ff21f
@@ -23,34 +23,26 @@
             ></el-input>
           </Formitem>
         </el-col>
-        <!-- 监管场所经营人代码 -->
+        <!-- 回执状态 -->
-        <el-col :span="5">
-          <Formitem label="监管场所经营人代码" prop="operatorCode">
-            <el-input
-              type="text"
-              class="inputShadow"
-              id="inputInner--operatorCode"
-              resize="none"
-              v-model="sreachFormData.operatorCode"
-              clearable
-              placeholder=""
-            ></el-input>
-          </Formitem>
-        </el-col>
-        <!-- 监管场所经营人名称 -->
         <el-col :span="5">
-          <Formitem label="监管场所经营人名称" prop="operatorName">
+          <Formitem label="回执状态" prop="receiptStatus">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
+              id="inputInner--receiptStatus"
-              id="inputInner--operatorName"
+              v-model="sreachFormData.receiptStatus"
-              resize="none"
-              v-model="sreachFormData.operatorName"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
+                :key="index"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
+
         <!-- 创建时间 -->
         <el-col :span="5">
           <Formitem label="创建时间" prop="createTime" :activeType="true">
@@ -91,33 +83,25 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row class="backgroundRow">
-        <!-- 回执状态 -->
-        <el-col :span="5">
-          <Formitem label="回执状态" prop="receiptStatus">
-            <el-select
-              type="text"
-              id="inputInner--receiptStatus"
-              v-model="sreachFormData.receiptStatus"
-              clearable
-              placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
-                :key="index"
-                :label="item.itemChineseName"
-                :value="item.itemValue"
-              ></el-option>
-            </el-select>
-          </Formitem>
-        </el-col>
-      </el-row>
     </el-form>
     <div class="optionButton">
       <el-button
         size="small"
         type="primary"
         class="dropdown-style-button"
+        :loading="loadings.declaration"
+        @click="listDeclaration"
+      >
+        <svg-icon
+          class="el-icon-user-solid"
+          icon-class="fedexDeclareIcon"
+        ></svg-icon>
+        清单总分单申报
+      </el-button>
+      <el-button
+        size="small"
+        type="primary"
+        class="dropdown-style-button"
         @click="addDeclare"
       >
         <svg-icon
@@ -126,6 +110,18 @@
         ></svg-icon>
         运抵单申报
       </el-button>
+      <el-button
+        size="small"
+        type="primary"
+        class="dropdown-style-button"
+        @click="leaveDeclare"
+      >
+        <svg-icon
+          class="el-icon-user-solid"
+          icon-class="fedexDeclareIcon"
+        ></svg-icon>
+        离境单申报
+      </el-button>
     </div>
     <Table
       class="fedexDetialTable fedexSreachTable"
@@ -168,6 +164,18 @@
           {{ scope.row.uncompletedCount }}
         </el-button>
       </template>
+      <template v-slot:listDontReleaseCount="scope">
+        清单放行：{{ scope.row.listReleaseCount }}/{{
+          scope.row.listDontReleaseCount
+        }}
+        <!-- <el-button type="text" style="margin-left: 0">
+          {{ scope.row.listReleaseCount }}
+        </el-button>
+        /
+        <el-button type="text">
+          {{ scope.row.listDontReleaseCount }}
+        </el-button> -->
+      </template>
       <template v-slot:arrivalInReceiptStatus="scope">
         <TablePopover
           ref="arrivalInReceiptStatusPopover"
@@ -189,22 +197,86 @@
           </div>
         </TablePopover>
       </template>
+      <!--  -->
+      <template v-slot:totalReceiptStatus="scope">
+        <TablePopover
+          ref="totalReceiptStatusPopover"
+          dataKey="totalReceiptStatus"
+          idKey="declareId"
+          :parentDom="$refs.entryTable"
+          :receiptDataHead="receiptDataHead"
+          :rowData="scope.row"
+          :tableData="tableData"
+          @popoverChange="popoverChange"
+          @popoverClose="popoverClose"
+        >
+          <div slot="title">
+            <span style="font-weight: 700; color: #515a6e">提运单号：</span
+            >{{ scope.row.billNo }}
+          </div>
+          <div slot="buttonLabel">
+            {{ scope.row.totalReceiptStatus }}
+          </div>
+        </TablePopover>
+      </template>
+      <template v-slot:logisticsDepartureReceiptStatus="scope">
+        <TablePopover
+          ref="logisticsDepartureReceiptStatusPopover"
+          dataKey="logisticsDepartureReceiptStatus"
+          idKey="declareId"
+          :parentDom="$refs.entryTable"
+          :receiptDataHead="receiptDataHead"
+          :rowData="scope.row"
+          :tableData="tableData"
+          @popoverChange="popoverChange"
+          @popoverClose="popoverClose"
+        >
+          <div slot="title">
+            <span style="font-weight: 700; color: #515a6e">提运单号：</span
+            >{{ scope.row.billNo }}
+          </div>
+          <div slot="buttonLabel">
+            {{ scope.row.logisticsDepartureReceiptStatus }}
+          </div>
+        </TablePopover>
+      </template>
     </Table>
     <DialogVue
       :outerVisible="outerVisible"
       :selected="selected"
       @close="dialogClose"
     />
+    <DataPreview
+      :showDialog="dataPreviewVisible"
+      :dataPreviewTitle="dataPreviewTitle"
+      :selectedDatas="selected"
+      @cancelDataPreview="cancelDataPreview"
+    />
+    <TimeDialog
+      :timeVisible="timeVisible"
+      :selected="selected"
+      @close="timeClose"
+    />
   </div>
 </template>
 <script>
-import { getArrivalIneList, arrivalInReceipt } from "@/api/declareData-api.js";
+import {
+  getArrivalIneList,
+  arrivalInReceipt,
+  declareDataUpload,
+  getLogisticsReceipt,
+  getTotalReceipt,
+} from "@/api/declareData-api.js";
 import DialogVue from "./dialog.vue";
+import DataPreview from "../reportingData/data-preview.vue";
+import TimeDialog from "../reportingData/time-dialog.vue";
 export default {
   name: "SupervisePlaceManage",
   components: {
     DialogVue,
+    DataPreview,
+    TimeDialog,
   },
   data() {
     return {
@@ -215,8 +287,6 @@ export default {
       selected: [],
       sreachFormData: {
         billNo: "",
-        operatorCode: "",
-        operatorName: "",
         receiptStatus: null,
         receiptType: null,
         createTime: [],
@@ -236,43 +306,47 @@ export default {
           slot: true,
         },
         {
-          name: "监管场所经营人代码",
+          name: "清单审结进度",
-          value: "operatorCode",
+          value: "listReceiptStatus",
           width: "",
           align: "left",
+          slot: true,
         },
         {
-          name: "监管场所经营人名称",
+          name: "清单放行进度",
-          value: "operatorName",
+          value: "listDontReleaseCount",
           width: "",
           align: "left",
+          slot: true,
         },
-        // {
-        //   name: "电商企业名称",
-        //   value: "ecomEntName",
-        //   width: "",
-        //   align: "left",
-        // },
         {
-          name: "创建时间",
+          name: "清单总分单回执",
-          value: "createTime",
+          value: "totalReceiptStatus",
           width: "",
           align: "left",
+          slot: true,
         },
         {
-          name: "清单审结进度",
+          name: "运抵单回执",
-          value: "listReceiptStatus",
+          value: "arrivalInReceiptStatus",
           width: "",
           align: "left",
           slot: true,
         },
+
         {
-          name: "运抵单回执",
+          name: "离境单回执",
-          value: "arrivalInReceiptStatus",
+          value: "logisticsDepartureReceiptStatus",
           width: "",
           align: "left",
           slot: true,
         },
+        {
+          name: "创建时间",
+          value: "createTime",
+          width: "",
+          align: "left",
+        },
       ],
       receiptDataHead: [
         {
@@ -296,9 +370,15 @@ export default {
       ],
       loadings: {
         sreachLoading: false,
+        declaration: false,
       },
       tableMaxheight: null,
       outerVisible: false,
+      // 清分单总单申报
+      dataPreviewVisible: false,
+      dataPreviewTitle: "",
+      // 离境单申报
+      timeVisible: false,
     };
   },
   created() {
@@ -312,6 +392,61 @@ export default {
   },
   methods: {
+    // 申报
+    postDeclareData(val) {
+      const obj = {
+        declareIds: this.selected.map((item) => item.declareId),
+        type: "totalScore",
+      };
+      declareDataUpload(obj)
+        .then((res) => {
+          if (res.code === "200") {
+            this.alertSuccessMsg("数据已成功提交申报，请等待海关回执。");
+          } else {
+            this.alertWarningMsg(res.message);
+          }
+        })
+        .catch((err) => {
+          console.error(err);
+          this.alertWarningMsg("申报失败，请稍后重试。");
+        })
+        .finally(() => {
+          if (+val === 1) {
+            this.search(0);
+          }
+        });
+    },
+    // 清单总分单申报
+    listDeclaration() {
+      if (this.selected.length === 0) {
+        this.alertWarningMsg("请选择数据！");
+        return;
+      }
+      this.loadings.declaration = true;
+
+      this.dataPreviewVisible = true;
+      this.dataPreviewTitle = `预览-清单总分单申报`;
+    },
+    timeClose(flag = false) {
+      this.timeVisible = false;
+      if (flag) {
+        this.search(0);
+      }
+    },
+    // 离镜单申报
+    leaveDeclare() {
+      if (this.selected.length === 0) {
+        this.alertWarningMsg("请选择数据！");
+        return;
+      }
+      this.timeVisible = true;
+    },
+    cancelDataPreview(val) {
+      this.dataPreviewVisible = false;
+      this.dataPreviewTitle = "";
+      this.loadings.declaration = false;
+      this.postDeclareData(val);
+    },
     // 运单号跳转
     linkChange(record, type) {
       const { billNo, completedLogisticsNo, uncompletedLogisticsNo } =
@@ -346,8 +481,10 @@ export default {
     },
     popoverClose(val) {
       this.tableData.forEach((item) => {
-        item.listReceiptStatusPopoverType = false;
+        // item.listReceiptStatusPopoverType = false;
         item.arrivalInReceiptStatusPopoverType = false;
+        item.logisticsDepartureReceiptStatusPopoverType = false;
+        item.totalReceiptStatusPopoverType = false;
         item.popoverData = [];
       });
       this.selectedLogRow.allLogDataReceiptStatusPopoverType = false;
@@ -356,7 +493,7 @@ export default {
     },
     //查询回执
-    receiptApi(billNo, type) {
+    receiptApi(billNo, type, declareId) {
       return new Promise((resolve, reject) => {
         let obj = { billNo };
         // if (type == "listReceiptStatus") {
@@ -386,6 +523,34 @@ export default {
               console.log(err);
               reject();
             });
+        } else if (type == "logisticsDepartureReceiptStatus") {
+          let objVal = { declareId: declareId };
+          getLogisticsReceipt(objVal)
+            .then((res) => {
+              if (res.code === "200") {
+                resolve(res.data);
+              } else {
+                reject();
+              }
+            })
+            .catch((err) => {
+              console.log(err);
+              reject();
+            });
+        } else if (type == "totalReceiptStatus") {
+          let objVal = { declareId: declareId };
+          getTotalReceipt(objVal)
+            .then((res) => {
+              if (res.code === "200") {
+                resolve(res.data);
+              } else {
+                reject();
+              }
+            })
+            .catch((err) => {
+              console.log(err);
+              reject();
+            });
         }
       });
     },
@@ -394,7 +559,7 @@ export default {
       console.log(val);
-      this.receiptApi(val.data.billNo, val.status)
+      this.receiptApi(val.data.billNo, val.status, val.data.declareId)
         .then((res) => {
           val.tableData.forEach((item) => {
             if (item.declareId == val.data.declareId) {
@@ -406,8 +571,10 @@ export default {
         .finally(() => {
           this.$nextTick(() => {
             this.$store.dispatch("setLoadingState", false);
-            this.$refs.listReceiptStatusPopover.tableLoading = false; // 清单回执
+            // this.$refs.listReceiptStatusPopover.tableLoading = false; // 清单回执
             this.$refs.arrivalInReceiptStatusPopover.tableLoading = false; //运抵单回执
+            this.$refs.logisticsDepartureReceiptStatusPopover.tableLoading = false; // 离境单回执
+            this.$refs.totalReceiptStatusPopover.tableLoading = false;
           });
         });
     },
@@ -417,8 +584,6 @@ export default {
       //重置数据
       this.sreachFormData = {
         billNo: "",
-        operatorCode: "",
-        operatorName: "",
         receiptStatus: null,
         receiptType: null,
         createTime: [],
@@ -450,8 +615,10 @@ export default {
             this.page.total = res.data.totalItems;
             this.tableData.forEach((item, idx) => {
               item.index = idx;
-              item.listReceiptStatusPopoverType = false; // 清单回执
+              // item.listReceiptStatusPopoverType = false; // 清单回执
               item.arrivalInReceiptStatusPopoverType = false; // 运抵单回执
+              item.logisticsDepartureReceiptStatusPopoverType = false; // 离境单回执
+              item.totalReceiptStatusPopoverType = false;
               // item.logLoading = false;
               item.popoverData = [];
             });