From a6022f016201a33fc6d8754a8005710f8896e140 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Tue, 30 Apr 2024 18:00:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |  12 +-
 .env.development                              |  12 +-
 src/api/modular/main/BookingLedger.js         |   8 +
 src/core/lazy_lib/components_use.js           |   4 +-
 .../main/BookingCustomerLedger/list/index.vue |  52 +++++-
 src/views/main/BookingDjy/detail/index.vue    |  71 ++++++--
 src/views/main/BookingGangjie/list/index.vue  |   8 +-
 .../detail/modules/goodsTable.vue             |   6 +-
 src/views/main/CabinManagement/index.vue      |  24 +++
 src/views/main/Printing/index.vue             | 171 +++++++++++-------
 src/views/main/Taskmanage/BCModify/index.vue  |  23 +++
 .../main/Taskmanage/BcFileDetail/Editing.vue  |  23 +++
 src/views/main/mskOrderList/index.vue         |   2 +-
 src/views/main/ruleTemp/detail.vue            |  13 +-
 14 files changed, 327 insertions(+), 102 deletions(-)

diff --git a/.env b/.env
index ce55dd7..c84d1c6 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,8 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=true
 # VUE_APP_TYPE = 'customer'
-# VUE_APP_TYPE = 'hechuan'
-VUE_APP_TYPE = 'yunyingduan'
+VUE_APP_TYPE = 'hechuan'
+# VUE_APP_TYPE = 'yunyingduan'
 # VUE_APP_TYPE = 'gangjie'
 # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy
 
@@ -11,8 +11,8 @@ VUE_APP_TYPE = 'yunyingduan'
 # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
 
 # 和川大简云测试
-# VUE_APP_API_BASE_URL=http://60.209.125.238:35100
-# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
+VUE_APP_API_BASE_URL=http://60.209.125.238:35100
+VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
 
 # 客户端测试
 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@@ -31,5 +31,5 @@ VUE_APP_TYPE = 'yunyingduan'
 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001
 
 # 运营端正式
-VUE_APP_API_BASE_URL=http://118.190.144.189:6002
-VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
\ No newline at end of file
+# VUE_APP_API_BASE_URL=http://118.190.144.189:6002
+# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
\ No newline at end of file
diff --git a/.env.development b/.env.development
index 2afe06a..7caaa7b 100644
--- a/.env.development
+++ b/.env.development
@@ -1,8 +1,8 @@
 NODE_ENV=development
 VUE_APP_PREVIEW=true
 # VUE_APP_TYPE = 'customer'
-# VUE_APP_TYPE = 'hechuan'
-VUE_APP_TYPE = 'yunyingduan'
+VUE_APP_TYPE = 'hechuan'
+# VUE_APP_TYPE = 'yunyingduan'
 # VUE_APP_TYPE = 'gangjie'
 # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan
 
@@ -11,8 +11,8 @@ VUE_APP_TYPE = 'yunyingduan'
 # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
 
 # 和川大简云测试
-# VUE_APP_API_BASE_URL=http://60.209.125.238:35100
-# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
+VUE_APP_API_BASE_URL=http://60.209.125.238:35100
+VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
 
 # 客户端测试
 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@@ -30,8 +30,8 @@ VUE_APP_TYPE = 'yunyingduan'
 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
 
 # 运营端正式
-VUE_APP_API_BASE_URL=http://118.190.144.189:6002
-VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
+# VUE_APP_API_BASE_URL=http://118.190.144.189:6002
+# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
 
 # 客户端正式
 # VUE_APP_API_BASE_URL=http://118.190.144.189:6001
diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js
index a253ca1..80e7fbf 100644
--- a/src/api/modular/main/BookingLedger.js
+++ b/src/api/modular/main/BookingLedger.js
@@ -1609,4 +1609,12 @@ export function PostApiSO(parameter) {
     method: 'post',
     params: parameter
   })
+}
+
+export function ImportBookingCurst(parameter) {
+  return axios({
+    url: '/BookingCustomerOrder/ImportBooking',
+    method: 'post',
+    data: parameter
+  })
 }
\ No newline at end of file
diff --git a/src/core/lazy_lib/components_use.js b/src/core/lazy_lib/components_use.js
index 547a72b..b042414 100644
--- a/src/core/lazy_lib/components_use.js
+++ b/src/core/lazy_lib/components_use.js
@@ -52,7 +52,8 @@ import {
   Empty,
   PageHeader,
   Descriptions,
-  Result
+  Result,
+  Statistic
 } from 'ant-design-vue'
 // import VueCropper from 'vue-cropper'
 
@@ -62,6 +63,7 @@ Vue.use(Input)
 Vue.use(InputNumber)
 Vue.use(Button)
 Vue.use(Switch)
+Vue.use(Statistic)
 Vue.use(Radio)
 Vue.use(Checkbox)
 Vue.use(Select)
diff --git a/src/views/main/BookingCustomerLedger/list/index.vue b/src/views/main/BookingCustomerLedger/list/index.vue
index 571f88d..312cf1d 100644
--- a/src/views/main/BookingCustomerLedger/list/index.vue
+++ b/src/views/main/BookingCustomerLedger/list/index.vue
@@ -69,7 +69,22 @@
                   <div class="nav-box">
                     <div class="nav" @click="addBooking"><i class="iconfont icon-jiahao2fill"></i>新建</div>
                     <div class="nav" @click="copyBooking"><i class="iconfont icon-fuzhi"></i>复制</div>
-                    <div class="nav"><i class="iconfont icon-fuzhi"></i>导入</div>
+                    <a-spin :spinning="importLoad" style="display: inline-block">
+                      <a-dropdown >
+                        <div class="nav"><i class="iconfont icon-fuzhi"></i>导入</div>
+                        <a-menu slot="overlay">
+                          <a-menu-item>
+                            <a-upload
+                              :customRequest="customRequest"
+                              :showUploadList="false"
+                              :multiple="false"
+                              name="file">
+                              <div class="nav"><i class="iconfont icon-fuzhi"></i>COSCO导入</div>
+                            </a-upload>
+                          </a-menu-item>
+                        </a-menu>
+                      </a-dropdown>
+                    </a-spin>
                     <div class="nav" @click="handleOpenTemp"><i class="iconfont icon-fuzhi"></i>模板</div>
                     <a-popconfirm
                       title="确定删除当前选中订舱？"
@@ -171,7 +186,11 @@
                   <div class="closingdate" v-if="row.closingdate">{{ row.closingdate.substring(0, 13) }}</div>
                 </template>
                 <template #operate="{ row }">
-                  <vxe-button class="operate-btn" type="text" icon="vxe-icon-edit" @click="editColumns(row)"></vxe-button>
+                  <vxe-button
+                    class="operate-btn"
+                    type="text"
+                    icon="vxe-icon-edit"
+                    @click="editColumns(row)"></vxe-button>
                   <a-popconfirm
                     title="确定删除当前订舱？"
                     ok-text="是"
@@ -183,13 +202,19 @@
                 </template>
                 <template #bookstatus="{ row, column }">
                   <div class="billtrace-box" :class="column.resizeWidth > 240 ? 'normal-box' : 'flex-box'">
-                    <div class="billtrace-btn" v-for="(btn, bindex) in row.bookstatus" :class="btn.staCode" :key="bindex">
+                    <div
+                      class="billtrace-btn"
+                      v-for="(btn, bindex) in row.bookstatus"
+                      :class="btn.staCode"
+                      :key="bindex">
                       <a-popover placement="topLeft" v-if="btn.staTime">
                         <div slot="content">{{ btn.staTime }}</div>
                         <span :class="{ active: btn.isChecked }">{{ enmuBookingBtn(btn.staCode) }}</span>
                       </a-popover>
                       <span :class="{ active: btn.isChecked }" v-else>{{ enmuBookingBtn(btn.staCode) }}</span>
-                      <i class="iconfont icon-xiaoyoujiantou" :class="{ hide: bindex === row.bookstatus.length - 1 }"></i>
+                      <i
+                        class="iconfont icon-xiaoyoujiantou"
+                        :class="{ hide: bindex === row.bookstatus.length - 1 }"></i>
                     </div>
                   </div>
                 </template>
@@ -418,7 +443,8 @@ import {
   BookingCustomerOrderSubmit,
   BookingCustomerOrderDelete,
   OrderTemplateList,
-  OrderTemplateDel
+  OrderTemplateDel,
+  ImportBookingCurst
 } from '@/api/modular/main/BookingLedger'
 import initData from './modules/initData'
 import { DjyUserConfigGet, DjyUserConfigAdd } from '@/api/modular/main/DjyUserConfig'
@@ -438,6 +464,7 @@ export default {
     return {
       spinning: false,
       isUpload: false,
+      importLoad: false,
       tempColumns: [
         {
           dataIndex: 'title',
@@ -928,6 +955,21 @@ export default {
       }
       console.log('== 展开结束 ==', new Date().getTime() - start)
     },
+    customRequest(data) {
+      const formData = new FormData()
+      formData.append('file', data.file)
+      formData.append('carrierId', 'COSCO')
+      this.importLoad = true
+      ImportBookingCurst(formData, (percent) => this.setUploadProcess(percent)).then((res) => {
+        if (res.success) {
+          this.$message.success('上传成功')
+          this.getList(this.searchData)
+        } else {
+          this.$message.error('上传失败：' + res.message)
+        }
+        this.importLoad = false
+      })
+    },
     tableRefresh() {
       const data = { ...this.formRes }
       data.multisort = this.searchData.multisort
diff --git a/src/views/main/BookingDjy/detail/index.vue b/src/views/main/BookingDjy/detail/index.vue
index ed998b6..14f5ee4 100644
--- a/src/views/main/BookingDjy/detail/index.vue
+++ b/src/views/main/BookingDjy/detail/index.vue
@@ -17,8 +17,7 @@
                 label="订单状态"
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
-                has-feedback
-                prop="destination">
+                has-feedback>
                 <span>{{ details.bsstatus }}</span>
               </a-form-model-item>
             </a-col>
@@ -44,6 +43,16 @@
                 <span>{{ details.portloadid }}</span>
               </a-form-model-item>
             </a-col>
+            <a-col :span="'4-8'">
+              <a-form-model-item
+                class="from-label"
+                label="卸货港"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback>
+                <span>{{ details.portdischargeid }}</span>
+              </a-form-model-item>
+            </a-col>
             <a-col :span="'4-8'">
               <a-form-model-item
                 class="from-label"
@@ -51,8 +60,8 @@
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 has-feedback
-                prop="portdischargeid">
-                <span>{{ details.portdischargeid }}</span>
+                prop="destinationid">
+                <span>{{ details.destinationid }}</span>
               </a-form-model-item>
             </a-col>
             <a-col :span="'4-8'">
@@ -68,6 +77,49 @@
                 </div>
               </a-form-model-item>
             </a-col>
+            <a-col :span="'4-8'">
+              <a-form-model-item
+                class="from-label"
+                label="船司航线"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="lanecode">
+                <span>{{ details.lanecode }}</span>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="'4-8'">
+              <a-form-model-item
+                class="from-label"
+                label="起运港名称"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="portload">
+                <span>{{ details.portload }}</span>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="'4-8'">
+              <a-form-model-item
+                class="from-label"
+                label="卸货港名称"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback>
+                <span>{{ details.portdischarge }}</span>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="'4-8'">
+              <a-form-model-item
+                class="from-label"
+                label="目的地名称"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="destination">
+                <span>{{ details.destination }}</span>
+              </a-form-model-item>
+            </a-col>
           </a-row>
           <a-row>
             <a-col :span="'4-8'">
@@ -140,17 +192,6 @@
                 <span>{{ details.saleCode }}</span>
               </a-form-model-item>
             </a-col>
-            <a-col :span="'4-8'">
-              <a-form-model-item
-                class="from-label"
-                label="船司航线"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                has-feedback
-                prop="lanecode">
-                <span>{{ details.lanecode }}</span>
-              </a-form-model-item>
-            </a-col>
           </a-row>
           <a-row>
             <a-col :span="24">
diff --git a/src/views/main/BookingGangjie/list/index.vue b/src/views/main/BookingGangjie/list/index.vue
index 8e9db2a..d7fb741 100644
--- a/src/views/main/BookingGangjie/list/index.vue
+++ b/src/views/main/BookingGangjie/list/index.vue
@@ -357,7 +357,13 @@
                             </div>
                           </a-popover>
                         </a-spin>
-                        <span style="margin-left: 5px">未提：{{ row.txopNumber }}/{{ row.statuslogs1.length }}</span>
+                        <div style="margin-left: 10px">
+                          <div style="color: gray;font-size: 12px">未提</div>
+                          <div>
+                            <span style="font-size: 15px;font-weight: bold;">{{ row.txopNumber }}</span>
+                            <span style="font-size: 15px;font-weight: bold;">/{{ row.statuslogs1.length }}</span>
+                          </div>
+                        </div>
                       </div>
                     </div>
                   </div>
diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
index 54834f3..bff2cff 100644
--- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue
+++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
@@ -920,8 +920,8 @@ export default {
             } else if (pNum[1].length < 2) {
               this.totalCbm = num + '0'
             } else {
-              // this.totalCbm = num
               this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+              this.totalCbm = this.totalCbm.toFixed(2)
             }
           }
           if (column.field === 'kgs' || column.field === 'tareweight') {
@@ -1206,8 +1206,8 @@ export default {
             } else if (pNum[1].length < 2) {
               this.totalCbm = num + '0'
             } else {
-              // this.totalCbm = num
               this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+              this.totalCbm = this.totalCbm.toFixed(2)
             }
           }
           if (selectionRangeKeys.endColKey === 'kgs' || selectionRangeKeys.endColKey === 'tareweight') {
@@ -1496,6 +1496,7 @@ export default {
               this.totalCbm = onum + '0'
             } else {
               this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+              this.totalCbm = this.totalCbm.toFixed(2)
             }
           }
         })
@@ -1561,6 +1562,7 @@ export default {
               this.totalCbm = onum + '0'
             } else {
               this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+              this.totalCbm = this.totalCbm.toFixed(2)
             }
           }
         })
diff --git a/src/views/main/CabinManagement/index.vue b/src/views/main/CabinManagement/index.vue
index bb3df90..a677901 100644
--- a/src/views/main/CabinManagement/index.vue
+++ b/src/views/main/CabinManagement/index.vue
@@ -267,6 +267,7 @@
                   :show-arrow="false"
                   :filter-option="false"
                   :not-found-content="null"
+                  @change="handleChangeUser"
                   @search="SearchUser">
                   <a-select-option v-for="item in customerByList" :key="item.id" :value="item.id">
                     {{ item.name }}
@@ -276,6 +277,11 @@
             </a-spin>
           </a-col>
         </a-row>
+        <a-row style="padding-left: 20px;margin-bottom: 10px">
+            <span style="margin-right: 10px;" v-for="(item, index) in userInfoList" :key="index">
+              {{ item.name }}  {{ item.email }}
+            </span>
+          </a-row>
         <a-row>
           <a-col :span="8">
             <a-form-item label="销售：" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
@@ -472,6 +478,7 @@ export default {
       customerByList: [],
       CustomerList: [],
       SlotVisible: false,
+      userInfoList:[],
       setVisible1: false,
       fetching: false,
       queryParam: {
@@ -791,6 +798,9 @@ export default {
       })
     },
     handleOpenSlot(row) {
+      this.userInfoList = []
+      this.$forceUpdate()
+      this.CreateData = {}
       ValidateCreateBookingOrder({ id: row.id }).then(res => {
         if (res.success) {
           this.slotEdit = row
@@ -924,6 +934,17 @@ export default {
         }
       })
     },
+    handleChangeUser(val) {
+      const arr = []
+      this.customerByList.forEach(item => {
+        val.forEach(ite => {
+          if (item.id == ite) {
+            arr.push(item)
+          }
+        })
+      })
+      this.userInfoList = arr
+    },
     handleEdit(id) {
       this.$router.push({
         name: 'CabinManagementDetails',
@@ -1071,4 +1092,7 @@ button {
     }
   }
 }
+/deep/ .ant-form-item{
+  margin-bottom: 0px !important;
+}
 </style>
diff --git a/src/views/main/Printing/index.vue b/src/views/main/Printing/index.vue
index 62c4480..f8120f4 100644
--- a/src/views/main/Printing/index.vue
+++ b/src/views/main/Printing/index.vue
@@ -4,8 +4,7 @@
       <div
         class="table-page-search-wrapper"
         v-if="hasPerm('BookingTemplate:page')"
-        :class="advanced ? 'Open' : 'Close'"
-      >
+        :class="advanced ? 'Open' : 'Close'">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="19">
@@ -22,8 +21,7 @@
                       :show-arrow="false"
                       :filter-option="false"
                       allowClear
-                      :not-found-content="null"
-                    >
+                      :not-found-content="null">
                       <a-select-option v-for="item in SysTenantData" :key="item.id" :value="item.name">
                         123
                       </a-select-option>
@@ -32,8 +30,7 @@
                       v-else
                       v-model="queryParam[item.dataIndex]"
                       allow-clear
-                      :placeholder="`请输入${item.title}`"
-                    />
+                      :placeholder="`请输入${item.title}`" />
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
@@ -111,8 +108,7 @@
         round
         :loading="loading"
         empty-text="没有更多数据了！"
-        v-if="!TableType"
-      >
+        v-if="!TableType">
         <vxe-column type="seq" width="40" fixed="left"></vxe-column>
         <vxe-column title="显示名称" width="200" align="center">
           <template #default="{ row }">
@@ -126,8 +122,7 @@
           :min-width="item.width"
           :title="item.title"
           :align="item.align"
-          v-if="item.checked"
-        >
+          v-if="item.checked">
           <template #default="{ row }" v-if="item.title == '文件名称'">
             <a @click="FnDFile(row)">{{ row.fileName }}</a>
           </template>
@@ -156,8 +151,7 @@
                 e => {
                   confirm(e, row)
                 }
-              "
-            >
+              ">
               <vxe-button type="text">
                 <a-icon type="delete" :style="{ color: '#13c2c2' }" />
               </vxe-button>
@@ -171,8 +165,7 @@
         :page-size="queryParam.pageSize"
         :total="queryParam.totalResult"
         :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
-        @page-change="handlePageChange"
-      >
+        @page-change="handlePageChange">
       </vxe-pager>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
@@ -180,7 +173,7 @@
     <a-modal v-model="ExcelVisible" width="1100px" title="详细设置">
       <vxe-toolbar>
         <template #buttons>
-          <vxe-button @click="insertEvent(-1)">添加一行</vxe-button>
+          <vxe-button @click="insertEvent()">添加一行</vxe-button>
           <vxe-button @click="handleDelete">删除选中</vxe-button>
           <vxe-button icon="vxe-icon-save" @click="saveEvent">保存</vxe-button>
         </template>
@@ -193,18 +186,21 @@
         ref="xTable"
         height="600"
         :data="tableData"
-        :edit-config="{ trigger: 'click', mode: 'row', icon: 'vxe-icon-edit', showStatus: true }"
-      >
+        :loading="loadingTable"
+        :edit-config="{ trigger: 'click', mode: 'row', icon: 'vxe-icon-edit', showStatus: true }">
         <vxe-column type="checkbox" width="60"></vxe-column>
-        <vxe-column field="Ffield" title="对象名" :edit-render="{}">
+        <vxe-column field="Ffield" width="100" title="对象名" :edit-render="{}">
           <template #edit="{ row }">
-            <vxe-select @change="roleChangeEvent($event, row)" v-model="row.Ffield" style="width: 100%" placeholder="请选择对象名">
+            <vxe-select
+              @change="roleChangeEvent($event, row)"
+              v-model="row.Ffield"
+              style="width: 100%"
+              placeholder="请选择对象名">
               <vxe-option
                 v-for="(item, index) in fieldList"
                 :key="index"
                 :value="item.name"
-                :label="item.name"
-              ></vxe-option>
+                :label="item.name"></vxe-option>
             </vxe-select>
           </template>
         </vxe-column>
@@ -217,8 +213,7 @@
                   placeholder="请选择字段名称"
                   :disabled="!row.Ffield"
                   @focus="focusEvent1(row)"
-                  @keyup="keyupEvent1(row)"
-                ></vxe-input>
+                  @keyup="keyupEvent1(row)"></vxe-input>
               </template>
               <template #dropdown>
                 <div class="my-dropdown1">
@@ -226,8 +221,7 @@
                     class="list-item1"
                     v-for="(item, index) in fieldData"
                     :key="index"
-                    @click="selectEvent1(item, row)"
-                  >
+                    @click="selectEvent1(item, row)">
                     <span>{{ item.name }}</span>
                   </div>
                 </div>
@@ -250,6 +244,12 @@
             <vxe-input v-model="row.describe" type="text"></vxe-input>
           </template>
         </vxe-column>
+        <vxe-column field="active" title="操作" width="140" :edit-render="{}">
+          <template #default="{ row,rowIndex  }">
+            <a-button type="primary" size="small" @click.stop="moveUp(rowIndex)">上移</a-button>
+            <a-button type="primary" size="small" @click.stop="moveDown(rowIndex)">下移</a-button>
+          </template>
+        </vxe-column>
       </vxe-table>
       <template slot="footer"> <span></span> </template>
     </a-modal>
@@ -301,6 +301,7 @@ export default {
       loading: false,
       setVisible: false,
       setVisible1: false,
+      loadingTable:false,
       queryParam: {
         currentPage: 1,
         pageSize: 10,
@@ -382,14 +383,20 @@ export default {
       const tableData = []
       const arr = []
       this.tableData.forEach(item => {
-        this.fieldList.forEach(item2 => {
-          if (item.Ffield == item2.name) {
-            tableData.push({
-              ...item,
-              field: `${item2.code}.${item.field}`
-            })
-          }
-        })
+        if (item.id && !item.field.includes('.')) {
+          this.fieldList.forEach(item2 => {
+            if (item.Ffield == item2.name) {
+              tableData.push({
+                ...item,
+                field: `${item2.code}.${item.field}`
+              })
+            }
+          })
+        } else {
+          tableData.push({
+            ...item
+          })
+        }
         if (!item.fieldName) {
           arr.push(1)
         }
@@ -399,40 +406,47 @@ export default {
         return false
       }
       const children = [...tableData, ...insertRecords]
-      if (removeRecords.length) {
-        children.forEach((item, index) => {
-          removeRecords.forEach(ele => {
-            if (item.id == ele.id) {
-              children.splice(index, 1)
-            }
-          })
-        })
-      }
-      if (updateRecords.length) {
-        children.forEach((item, index) => {
-          updateRecords.forEach(ele => {
-            if (item.id == ele.id) {
-              children[index] = ele
-            }
-          })
-        })
-      }
+      // if (removeRecords.length) {
+      //   children.forEach((item, index) => {
+      //     removeRecords.forEach(ele => {
+      //       if (item.id == ele.id) {
+      //         children.splice(index, 1)
+      //       }
+      //     })
+      //   })
+      // }
+      // if (updateRecords.length) {
+      //   children.forEach((item, index) => {
+      //     updateRecords.forEach(ele => {
+      //       if (item.id == ele.id) {
+      //         children[index] = ele
+      //       }
+      //     })
+      //   })
+      // }
       console.log(children, this.fieldList)
       BookingTemplateAddOrUpdateExcelTemplate({
         pid: this.ExcelPid,
         children
       }).then(res => {
         this.$message.success('保存成功')
+        this.getDetail()
       })
     },
     async insertEvent(row) {
-      const $table = this.$refs.xTable
-      const { row: newRow } = await $table.insertAt({}, row)
-      await $table.setActiveCell(newRow, 'name')
+      // console.log(this.tableData.length)
+      // const $table = this.$refs.xTable
+      // const { row: newRow } = await $table.insertAt({}, row)
+      // await $table.setActiveCell(newRow, 'name')
+      this.tableData.push({})
     },
     FnExcel(data) {
       this.ExcelPid = data.id
+      this.getDetail()
+    },
+    getDetail() {
       this.tableData = []
+      this.loadingTable = true
       BookingTemplateBookingExcelTemplateList({ id: this.ExcelPid }).then(res => {
         res.data.forEach(item => {
           this.fieldList.forEach(item2 => {
@@ -468,6 +482,8 @@ export default {
           })
         })
         this.tableData = res.data
+        this.loadingTable = false
+        console.log(this.tableData)
       })
       this.ExcelVisible = true
     },
@@ -503,17 +519,35 @@ export default {
     handleDelete() {
       const selectRecords = this.$refs.xTable.getCheckboxRecords()
       for (let i = 0; i < selectRecords.length; i++) {
-          const delIndex = this.tableData.indexOf(selectRecords[i])
-          if (delIndex != -1) {
-            this.tableData.splice(delIndex, 1)
-            i--;
-          }
+        const delIndex = this.tableData.indexOf(selectRecords[i])
+        if (delIndex != -1) {
+          this.tableData.splice(delIndex, 1)
+          i--;
         }
+      }
     },
     roleChangeEvent(row, row1) {
       console.log(row, row1)
       row1.fieldName = ''
     },
+    moveUp(index) {
+      console.log(index)
+      console.log(this.tableData)
+      if (index > 0) {
+        this.swapItems(index, index - 1);
+      }
+    },
+    moveDown(index) {
+      console.log(this.tableData)
+      if (index < this.tableData.length - 1) {
+        this.swapItems(index, index + 1);
+      }
+    },
+    swapItems(index1, index2) {
+      const temp = this.tableData[index1];
+      this.tableData.splice(index1, 1, this.tableData[index2]);
+      this.tableData.splice(index2, 1, temp);
+    },
     columnChange1(data) {
       this.TableType = true
       this.TableColumns = data
@@ -692,17 +726,20 @@ export default {
 button {
   margin-right: 8px;
 }
-.Open {
-}
+
+.Open {}
+
 .Close {
   max-height: 50px;
   padding-bottom: 8px;
   overflow: hidden;
 }
+
 .SetFlex {
   display: flex;
   justify-content: flex-end;
 }
+
 .my-dropdown1 {
   height: 200px;
   overflow: auto;
@@ -710,15 +747,19 @@ button {
   border: 1px solid #dcdfe6;
   background-color: #fff;
 }
+
 .list-item1:hover {
   background-color: #f5f7fa;
 }
+
 .vxe-table--render-default .vxe-body--row.row--stripe {
   background: #f5f9fe;
 }
+
 .ant-card-body {
   padding-top: 10px;
 }
+
 .nav-box {
   padding: 0 10px;
 
@@ -744,6 +785,7 @@ button {
       .iconfont {
         color: #1d8aff;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -754,6 +796,7 @@ button {
       .iconfont {
         color: #865ef8;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -764,6 +807,7 @@ button {
       .iconfont {
         color: #ff9702;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -774,6 +818,7 @@ button {
       .iconfont {
         color: #1d8aff;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -784,6 +829,7 @@ button {
       .iconfont {
         color: #ff1062;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -794,6 +840,7 @@ button {
       .iconfont {
         color: #1ebeca;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -804,6 +851,7 @@ button {
       .iconfont {
         color: #82c93d;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -814,6 +862,7 @@ button {
       .iconfont {
         color: #1d8aff;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
diff --git a/src/views/main/Taskmanage/BCModify/index.vue b/src/views/main/Taskmanage/BCModify/index.vue
index 81e796a..fef054e 100644
--- a/src/views/main/Taskmanage/BCModify/index.vue
+++ b/src/views/main/Taskmanage/BCModify/index.vue
@@ -389,6 +389,7 @@
                     :show-arrow="false"
                     :filter-option="false"
                     :not-found-content="null"
+                    @change="handleChangeUser"
                     @search="SearchUser">
                     <a-select-option v-for="item in customerByList" :key="item.id" :value="item.id">
                       {{ item.name }}
@@ -398,6 +399,11 @@
               </a-spin>
             </a-col>
           </a-row>
+          <a-row style="padding-left: 20px;margin-bottom: 10px">
+            <span style="margin-right: 10px;" v-for="(item, index) in userInfoList" :key="index">
+              {{ item.name }}  {{ item.email }}
+            </span>
+          </a-row>
           <a-row>
             <a-col :span="8">
               <a-form-item label="销售：" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
@@ -622,6 +628,7 @@ export default {
       UserId: '',
       fetching: false,
       value: '',
+      userInfoList: [],
       customerByList: [],
       openLoading: false,
       compareResultFlag: false,
@@ -763,6 +770,17 @@ export default {
         this.fetching = false
       })
     },
+    handleChangeUser(val) {
+      const arr = []
+      this.customerByList.forEach(item => {
+        val.forEach(ite => {
+          if (item.id == ite) {
+            arr.push(item)
+          }
+        })
+      })
+      this.userInfoList = arr
+    },
     ChangeCustomerList(e) {
       this.customerByList.forEach(item => {
         if (item.id == e) {
@@ -891,6 +909,8 @@ export default {
     OpenModal() {
       this.visible = true
       this.openLoading = true
+      this.userInfoList = []
+      this.$forceUpdate()
       GetBookingOrder({ taskPkId: this.$route.query.taskPKId }).then(res => {
         if (res.data.ext) {
           this.CreateData = {
@@ -1097,4 +1117,7 @@ export default {
     }
   }
 }
+/deep/ .ant-form-item{
+  margin-bottom: 0px !important;
+}
 </style>
diff --git a/src/views/main/Taskmanage/BcFileDetail/Editing.vue b/src/views/main/Taskmanage/BcFileDetail/Editing.vue
index 893842b..91cde60 100644
--- a/src/views/main/Taskmanage/BcFileDetail/Editing.vue
+++ b/src/views/main/Taskmanage/BcFileDetail/Editing.vue
@@ -342,6 +342,7 @@
                   :default-active-first-option="false"
                   :show-arrow="false"
                   :filter-option="false"
+                  @change="handleChangeUser"
                   :not-found-content="fetching ? undefined : null"
                   @search="SearchUser"
                 >
@@ -353,6 +354,11 @@
             </a-spin>
           </a-col>
         </a-row>
+        <a-row style="padding-left: 20px;margin-bottom: 10px">
+          <span style="margin-right: 10px;" v-for="(item, index) in userInfoList" :key="index">
+            {{ item.name }}  {{ item.email }}
+          </span>
+        </a-row>
         <a-row>
           <a-col :span="8">
             <a-form-item label="销售：" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
@@ -572,6 +578,7 @@ export default {
         ctnList: [],
         fileList: []
       },
+      userInfoList:[],
       formext2: {
         ctnList: []
       },
@@ -795,8 +802,21 @@ export default {
           this.CreateData.opName = item.name
         }
       })
+      this.userInfoList = []
+      this.$forceUpdate()
       this.visible = true
     },
+    handleChangeUser(val) {
+      const arr = []
+      this.customerByList.forEach(item => {
+        val.forEach(ite => {
+          if (item.id == ite) {
+            arr.push(item)
+          }
+        })
+      })
+      this.userInfoList = arr
+    },
     OpenUser() {
       this.UserId = ''
       this.UserVisible = true
@@ -959,4 +979,7 @@ export default {
     }
   }
 }
+/deep/ .ant-form-item{
+  margin-bottom: 0px !important;
+}
 </style>
diff --git a/src/views/main/mskOrderList/index.vue b/src/views/main/mskOrderList/index.vue
index a3f4878..8a67d35 100644
--- a/src/views/main/mskOrderList/index.vue
+++ b/src/views/main/mskOrderList/index.vue
@@ -679,7 +679,7 @@ export default {
         this.editPageSizeSave(pageSize)
         this.changeSetting('mskOrder_page', { pageSize: pageSize })
       }
-      this.queryParam.pageSize = currentPage
+      this.queryParam.pageNo = currentPage
       this.queryParam.pageSize = pageSize
       this.FnGetData()
     },
diff --git a/src/views/main/ruleTemp/detail.vue b/src/views/main/ruleTemp/detail.vue
index 2dc07dd..1b0bc21 100644
--- a/src/views/main/ruleTemp/detail.vue
+++ b/src/views/main/ruleTemp/detail.vue
@@ -20,7 +20,7 @@
                 @search="handleSearch"
                 @change="handleChange">
                 <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-                <a-select-option v-for="item in suggestList" :key="item.codeName">
+                <a-select-option v-for="(item,index) in suggestList" :key="item.codeName">
                   {{ item.shortName }}
                 </a-select-option>
               </a-select>
@@ -346,6 +346,7 @@ export default {
       deep: true,
       immediate: true,
       handler(val) {
+        console.log(this.$route.path)
         if (this.$route.path === '/ruleTemp/detail') {
           if (this.$route.query.type === 'add') {
             this.form = {
@@ -481,9 +482,12 @@ export default {
             codeName: this.form.custCode,
             shortName: this.form.custName
           })
-          this.usreList.push({
-            id: this.form.userId,
-            name: this.form.userName
+          DjyCustomerdetail({ id: this.form.custId }).then(res => {
+            if (res.success) {
+              this.usreList = res.data.contacts
+            } else {
+              this.$message.error(res.message)
+            }
           })
           this.$forceUpdate()
         } else {
@@ -511,6 +515,7 @@ export default {
       this.suggestList.forEach(item => {
         if (item.codeName === val) {
           this.form.custName = item.shortName
+          this.form.custId = item.id
           DjyCustomerdetail({ id: item.id }).then(res => {
             if (res.success) {
               this.usreList = res.data.contacts