From d482eda58243d3d8916b26161a50c1021a89865c Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Fri, 3 Nov 2023 11:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/http.js          |  2 +-
 src/view/examine/index.vue | 56 +++++++++++++++++--------
 src/view/home/index.vue    | 85 ++++++++++++++++++++++++++++++--------
 3 files changed, 107 insertions(+), 36 deletions(-)

diff --git a/src/utils/http.js b/src/utils/http.js
index c38fa8c..fa3a089 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
 
 // axios.defaults.baseURL = process.env.NODE_ENV === 'development' ? "http://60.209.125.238:30802": "http://121.42.232.16:5066",
-axios.defaults.baseURL = process.env.NODE_ENV === 'development' ? "http://60.209.125.238:30802": "/api",
+axios.defaults.baseURL = process.env.NODE_ENV === 'development' ? "http://121.42.232.16:5066": "/api",
 axios.defaults.timeout = 50000;
 
 axios.interceptors.request.use(
diff --git a/src/view/examine/index.vue b/src/view/examine/index.vue
index 7c30420..917938c 100644
--- a/src/view/examine/index.vue
+++ b/src/view/examine/index.vue
@@ -57,14 +57,14 @@
         <a-button type="danger" @click="handleNoacc">驳回</a-button>
       </a-row>
     </div>
-    <a-table :pagination="pagination" @change="tablePaginationChange" :customRow="handleClickRow" rowKey="id"
-      :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns"
+    <a-table :scroll="{ y: 520 }" :pagination="pagination" @change="tablePaginationChange" :customRow="handleClickRow"
+      rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns"
       :data-source="data">
       <div slot="action" slot-scope="text, record">
         <a-popover placement="bottom">
           <template slot="content">
-            <div @click="handleDown(index)" class="file" v-for="(item, index) in  record.custFileList" :key="index">{{
-              item }}</div>
+            <div @click="handleDown(item.id)" class="file" v-for="(item, index) in  record.custFileList" :key="index">{{
+              item.fileName }}</div>
           </template>
           <a>原始单据</a>
         </a-popover>
@@ -77,9 +77,10 @@
         </div>
       </div>
       <div slot="blno" slot-scope="text, record">
-        <div @click="handleEdit(record)">
+        <span @click="handleEdit(record)">
           <a>{{ text }}</a>
-        </div>
+        </span>
+        <a-icon @click="handleCopyText(text)" style="color: rgb(24,144,255);cursor: pointer;" type="copy" />
       </div>
     </a-table>
     <a-modal width="1200px" title="业务状态" :visible="visible" @ok="visible = false" @cancel="visible = false">
@@ -93,11 +94,12 @@
         </a-form-model-item>
       </a-form-model>
     </a-modal>
-    <a-modal okText="确定" :footer="null" cancelText="取消" width="800px" title="报关下单" @cancel="editVisible = false" :visible="editVisible">
+    <a-modal okText="确定" :footer="null" cancelText="取消" width="800px" title="报关下单" @cancel="editVisible = false"
+      :visible="editVisible">
       <a-spin :spinning="addLoading">
-        <a-form-model :rules="rules" ref="addForm"  :model="addForm" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-form-model :rules="rules" ref="addForm" :model="addForm" :label-col="labelCol" :wrapper-col="wrapperCol">
           <a-form-model-item prop="blno" label="提单号">
-             {{ addForm.blno }}
+            {{ addForm.blno }}
           </a-form-model-item>
           <a-form-model-item prop="bsType" label="业务类型">
             {{ addForm.bsType }}
@@ -105,7 +107,7 @@
           <a-form-model-item label="备注">
             {{ addForm.customerRemark }}
           </a-form-model-item>
-          <a-form-model-item  label="修改内容">
+          <a-form-model-item label="修改内容">
             {{ addForm.updateRemark }}
           </a-form-model-item>
         </a-form-model>
@@ -191,7 +193,7 @@ export default {
       addForm: {},
       fileList: [],
       logData: [],
-      editVisible:false,
+      editVisible: false,
       addVisible: false,
       selectedRowKeys: [],
       visible: false,
@@ -211,7 +213,7 @@ export default {
           { required: true, message: '请输入驳回原因', trigger: 'blur' },
         ]
       },
-      baseLink:'http://60.209.125.238:30802/'
+      baseLink: 'http://121.42.232.16:5066/'
     }
   },
 
@@ -236,6 +238,15 @@ export default {
           console.log(err)
         })
     },
+    handleCopyText(text) {
+      this.$message.success('复制成功')
+      var cInput = document.createElement('input');
+      cInput.value = text;
+      document.body.appendChild(cInput);
+      cInput.select(); // 选取文本框内容
+      document.execCommand('copy');
+      document.body.removeChild(cInput);
+    },
     handleNoacc() {
       if (this.selectedRowKeys.length == 0) {
         this.$message.warning('请先选择')
@@ -271,6 +282,16 @@ export default {
             baoguanDetail(record.id).then(res => {
               if (res.succeeded) {
                 this.addForm = res.data
+                if (this.addForm.custFileList) {
+                  const arr = []
+                  this.addForm.custFileList.forEach(item => {
+                    arr.push({
+                      id: item.id,
+                      name: item.fileName
+                    })
+                  })
+                  this.fileList = arr
+                }
                 this.addVisible = true
               } else {
                 this.$message.error(res.errors)
@@ -288,6 +309,7 @@ export default {
         this.form.createdTimeStart = this.form.creatDate[0]
         this.form.createdTimeEnd = this.form.creatDate[1]
       }
+      this.pagination.current = 1
       this.getList()
     },
     handleAccess() {
@@ -336,12 +358,12 @@ export default {
       baoguanDetail(row.id).then(res => {
         if (res.succeeded) {
           this.addForm = res.data
-          if (Object.keys(this.addForm.fileListBaoGuan).length > 0) {
+          if (this.addForm.custFileList) {
             const arr = []
-            Object.keys(this.addForm.fileListBaoGuan).forEach((item, index) => {
+            this.addForm.custFileList.forEach(item => {
               arr.push({
-                id: item,
-                name: Object.values(this.addForm.fileListBaoGuan)[index]
+                id: item.id,
+                name: item.fileName
               })
             })
             this.fileList = arr
@@ -380,7 +402,7 @@ export default {
         console.log(res)
         if (res.succeeded) {
           this.$message.success('上传成功')
-          const data = res.data.split('\\')
+          const data = res.data.split('/')
           this.fileList.push({
             name: data[1],
             id: res.data
diff --git a/src/view/home/index.vue b/src/view/home/index.vue
index a2584d0..b1cfd64 100644
--- a/src/view/home/index.vue
+++ b/src/view/home/index.vue
@@ -33,17 +33,38 @@
           <a-col :span="6">
             <a-form-model-item label="报关状态">
               <a-select v-model="form.customsStatus">
-                <a-select-option value="海关放行">
-                  海关放行
+                <a-select-option value="完成接单">
+                  完成接单
+                </a-select-option>
+                <a-select-option value="完成打单">
+                  完成打单
+                </a-select-option>
+                <a-select-option value="海关已申报">
+                  海关已申报
+                </a-select-option>
+                <a-select-option value="海关入库">
+                  海关入库
                 </a-select-option>
                 <a-select-option value="海关审结">
                   海关审结
                 </a-select-option>
-                <a-select-option value="提交单一">
-                  提交单一
+                <a-select-option value="海关查验">
+                  海关查验
                 </a-select-option>
-                <a-select-option value="报关行接单">
-                  报关行接单
+                <a-select-option value="海关放行">
+                  海关放行
+                </a-select-option>
+                <a-select-option value="海关结关">
+                  海关结关
+                </a-select-option>
+                <a-select-option value="准予进港">
+                  准予进港
+                </a-select-option>
+                <a-select-option value="完成审单">
+                  完成审单
+                </a-select-option>
+                <a-select-option value="提交到单一窗口">
+                  提交到单一窗口
                 </a-select-option>
               </a-select>
             </a-form-model-item>
@@ -67,8 +88,8 @@
         <a-button type="primary" @click="handleSubimt">发送</a-button>
       </a-row>
     </div>
-    <a-table :pagination="pagination" @change="tablePaginationChange" :customRow="handleClickRow" rowKey="id"
-      :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns"
+    <a-table :scroll="{ y: 520 }" :pagination="pagination" @change="tablePaginationChange" :customRow="handleClickRow"
+      rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns"
       :data-source="data">
       <div slot="action" slot-scope="text, record">
         <a-icon @click="handleEdit(record)" style="cursor: pointer;color:#1890ff;margin-right: 10px;" type="edit"
@@ -82,8 +103,9 @@
         </a-popover>
         <a-popover placement="bottom">
           <template slot="content">
-            <div @click="handleDownHG(item.id)" class="file" v-for="(item, index) in  record.customsFileList" :key="index">{{
-              index.fileName }}</div>
+            <div @click="handleDownHG(item.filePath)" class="file" v-for="(item, index) in  record.customsFileList"
+              :key="index">{{
+                item.fileName }}</div>
           </template>
           <a>海关单据</a>
         </a-popover>
@@ -102,9 +124,10 @@
         </div>
       </div>
       <div slot="blno" slot-scope="text, record">
-        <div @click="handleEdit(record)">
+        <span @click="handleEdit(record)">
           <a>{{ text }}</a>
-        </div>
+        </span>
+        <a-icon @click="handleCopyText(text)" style="color: rgb(24,144,255);cursor: pointer;" type="copy" />
       </div>
     </a-table>
     <a-modal width="1200px" okText="确定" cancelText="取消" title="业务状态" :visible="visible" @ok="visible = false"
@@ -177,6 +200,7 @@ const columns = [
     title: '业务状态',
     dataIndex: 'statusCustomer',
     key: 'statusCustomer',
+    width: 100,
     scopedSlots: { customRender: 'statusCustomer' },
   },
   {
@@ -193,6 +217,7 @@ const columns = [
   {
     title: '业务类型',
     dataIndex: 'bsType',
+    width: 100,
     key: 'bsType',
   },
   {
@@ -204,6 +229,7 @@ const columns = [
     title: '报关状态',
     dataIndex: 'customsStatus',
     key: 'customsStatus',
+    width: 100,
     scopedSlots: { customRender: 'customsStatus' },
   },
   {
@@ -214,6 +240,7 @@ const columns = [
   {
     title: '操作人',
     dataIndex: 'createdUserName',
+    width: 80,
     key: 'createdUserName',
   },
   {
@@ -230,6 +257,7 @@ const columns = [
     title: '操作',
     dataIndex: 'action',
     key: 'action',
+    width: 180,
     scopedSlots: { customRender: 'action' },
   },
 ];
@@ -250,7 +278,7 @@ const logColums = [
     key: 'createdTime',
   },
   {
-    title: '驳回原因',
+    title: '备注',
     dataIndex: 'remark',
     key: 'remark',
   }
@@ -303,7 +331,7 @@ export default {
           { required: true, message: '请选择业务类型', trigger: 'blur' },
         ]
       },
-      baseLink: 'http://60.209.125.238:30802/'
+      baseLink: 'http://121.42.232.16:5066/'
     }
   },
 
@@ -331,6 +359,15 @@ export default {
           this.$message.error(err)
         })
     },
+    handleCopyText(text) {
+      this.$message.success('复制成功')
+      var cInput = document.createElement('input');
+      cInput.value = text;
+      document.body.appendChild(cInput);
+      cInput.select(); // 选取文本框内容
+      document.execCommand('copy');
+      document.body.removeChild(cInput);
+    },
     handleOpenAdd() {
       this.addVisible = true
       this.addForm = {}
@@ -353,6 +390,16 @@ export default {
             baoguanDetail(record.id).then(res => {
               if (res.succeeded) {
                 this.addForm = res.data
+                if (this.addForm.custFileList) {
+                  const arr = []
+                  this.addForm.custFileList.forEach(item => {
+                    arr.push({
+                      id: item.id,
+                      name: item.fileName
+                    })
+                  })
+                  this.fileList = arr
+                }
                 this.addVisible = true
               } else {
                 this.$message.error(res.errors)
@@ -381,6 +428,7 @@ export default {
         this.form.createdTimeStart = this.form.creatDate[0]
         this.form.createdTimeEnd = this.form.creatDate[1]
       }
+      this.pagination.current = 1
       this.getList()
     },
     handleDelete() {
@@ -443,12 +491,12 @@ export default {
       baoguanDetail(row.id).then(res => {
         if (res.succeeded) {
           this.addForm = res.data
-          if (Object.keys(this.addForm.fileListBaoGuan).length > 0) {
+          if (this.addForm.custFileList) {
             const arr = []
-            Object.keys(this.addForm.fileListBaoGuan).forEach((item, index) => {
+            this.addForm.custFileList.forEach(item => {
               arr.push({
-                id: item,
-                name: Object.values(this.addForm.fileListBaoGuan)[index]
+                id: item.id,
+                name: item.fileName
               })
             })
             this.fileList = arr
@@ -553,6 +601,7 @@ export default {
     },
     handleOpen1(row) {
       this.BGvisible = true
+      this.BGdata = []
       baoguanDetail(row.id).then(res => {
         if (res.succeeded) {
           this.BGdata = res.data.logListCustoms