feat: 还原1.0.9代码

zhanbo.xu
Commit a49ffe00358166f1ab771722c1c0ab1bd37fd08e a49ffe00 1 parent 96ff21fa
Showing 2 changed files with 71 additions and 238 deletions
src/views/arrival-declare/index.vue
src/views/reportingData/index.vue
--- a/src/views/arrival-declare/index.vue
View file @a49ffe0
+++ b/src/views/arrival-declare/index.vue
View file @a49ffe0
@@ -23,26 +23,34 @@
             ></el-input>
           </Formitem>
         </el-col>
-        <!-- 回执状态 -->
+        <!-- 监管场所经营人代码 -->
         <el-col :span="5">
-          <Formitem label="回执状态" prop="receiptStatus">
+          <Formitem label="监管场所经营人代码" prop="operatorCode">
-            <el-select
+            <el-input
               type="text"
-              id="inputInner--receiptStatus"
+              class="inputShadow"
-              v-model="sreachFormData.receiptStatus"
+              id="inputInner--operatorCode"
+              resize="none"
+              v-model="sreachFormData.operatorCode"
               clearable
               placeholder=""
-            >
+            ></el-input>
-              <el-option
+          </Formitem>
-                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
+        </el-col>
-                :key="index"
+        <!-- 监管场所经营人名称 -->
-                :label="item.itemChineseName"
+        <el-col :span="5">
-                :value="item.itemValue"
+          <Formitem label="监管场所经营人名称" prop="operatorName">
-              ></el-option>
+            <el-input
-            </el-select>
+              type="text"
+              class="inputShadow"
+              id="inputInner--operatorName"
+              resize="none"
+              v-model="sreachFormData.operatorName"
+              clearable
+              placeholder=""
+            ></el-input>
           </Formitem>
         </el-col>
-
         <!-- 创建时间 -->
         <el-col :span="5">
           <Formitem label="创建时间" prop="createTime" :activeType="true">
@@ -83,25 +91,33 @@
           </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
@@ -110,18 +126,6 @@
         ></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"
@@ -164,18 +168,6 @@
           {{ 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"
@@ -197,86 +189,22 @@
           </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 {
+import { getArrivalIneList, arrivalInReceipt } from "@/api/declareData-api.js";
-  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 {
@@ -287,6 +215,8 @@ export default {
       selected: [],
       sreachFormData: {
         billNo: "",
+        operatorCode: "",
+        operatorName: "",
         receiptStatus: null,
         receiptType: null,
         createTime: [],
@@ -306,47 +236,43 @@ export default {
           slot: true,
         },
         {
-          name: "清单审结进度",
+          name: "监管场所经营人代码",
-          value: "listReceiptStatus",
+          value: "operatorCode",
           width: "",
           align: "left",
-          slot: true,
         },
         {
-          name: "清单放行进度",
+          name: "监管场所经营人名称",
-          value: "listDontReleaseCount",
+          value: "operatorName",
           width: "",
           align: "left",
-          slot: true,
         },
+        // {
+        //   name: "电商企业名称",
+        //   value: "ecomEntName",
+        //   width: "",
+        //   align: "left",
+        // },
         {
-          name: "清单总分单回执",
+          name: "创建时间",
-          value: "totalReceiptStatus",
+          value: "createTime",
           width: "",
           align: "left",
-          slot: true,
         },
         {
-          name: "运抵单回执",
+          name: "清单审结进度",
-          value: "arrivalInReceiptStatus",
+          value: "listReceiptStatus",
           width: "",
           align: "left",
           slot: true,
         },
-
         {
-          name: "离境单回执",
+          name: "运抵单回执",
-          value: "logisticsDepartureReceiptStatus",
+          value: "arrivalInReceiptStatus",
           width: "",
           align: "left",
           slot: true,
         },
-        {
-          name: "创建时间",
-          value: "createTime",
-          width: "",
-          align: "left",
-        },
       ],
       receiptDataHead: [
         {
@@ -370,15 +296,9 @@ export default {
       ],
       loadings: {
         sreachLoading: false,
-        declaration: false,
       },
       tableMaxheight: null,
       outerVisible: false,
-      // 清分单总单申报
-      dataPreviewVisible: false,
-      dataPreviewTitle: "",
-      // 离境单申报
-      timeVisible: false,
     };
   },
   created() {
@@ -392,61 +312,6 @@ 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 } =
@@ -481,10 +346,8 @@ 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;
@@ -493,7 +356,7 @@ export default {
     },
     //查询回执
-    receiptApi(billNo, type, declareId) {
+    receiptApi(billNo, type) {
       return new Promise((resolve, reject) => {
         let obj = { billNo };
         // if (type == "listReceiptStatus") {
@@ -523,34 +386,6 @@ 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();
-            });
         }
       });
     },
@@ -559,7 +394,7 @@ export default {
       console.log(val);
-      this.receiptApi(val.data.billNo, val.status, val.data.declareId)
+      this.receiptApi(val.data.billNo, val.status)
         .then((res) => {
           val.tableData.forEach((item) => {
             if (item.declareId == val.data.declareId) {
@@ -571,10 +406,8 @@ 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;
           });
         });
     },
@@ -584,6 +417,8 @@ export default {
       //重置数据
       this.sreachFormData = {
         billNo: "",
+        operatorCode: "",
+        operatorName: "",
         receiptStatus: null,
         receiptType: null,
         createTime: [],
@@ -615,10 +450,8 @@ 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 = [];
             });
--- a/src/views/reportingData/index.vue
View file @a49ffe0
+++ b/src/views/reportingData/index.vue
View file @a49ffe0
@@ -145,14 +145,14 @@
         >
           批量修改
         </el-button>
-        <el-button
+        <!-- <el-button
           class="entrySaveButton"
           size="small"
           icon="el-icon-edit"
           @click="weightAdjustFn"
         >
           重量调整
-        </el-button>
+        </el-button> -->
         <el-button
           class="entrySaveButton"
           size="small"