12/26

src/api/modular/main/ExpressModule.js

@@ -80,6 +80,14 @@ export function ExpressDeliveryPrintWaybill(parameter) {
     params: parameter
   })
 }
+// 获取当前登陆人的寄件信息（最后一次寄件信息或登陆人的个人信息）
+export function ExpressDeliveryGetSenderInfo(parameter) {
+  return axios({
+    url: `/ExpressDelivery/GetSenderInfo`,
+    method: 'get',
+    params: parameter
+  })
+}
 
 // -------------------------------------------------
 /**

src/views/main/ExpressModule/details.vue

@@ -70,14 +70,7 @@
               :wrapperCol="{ xs: { span: 25 }, sm: { span: 16 } }"
               has-feedback
             >
-              <a-date-picker
+              <a-date-picker format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" show-time v-decorator="['date']" allowClear />
-                format="YYYY-MM-DD"
-                valueFormat="YYYY-MM-DD"
-                show-time
-                :style="{ width: '100%' }"
-                v-decorator="['date']"
-                allowClear
-              />
             </a-form-item>
           </a-col>
           <a-col :span="4">
@@ -467,12 +460,15 @@
           </a-col>
         </a-row>
         <a-row>
-          <a-col :span="24">
+          <a-col :span="8">
-            <vxe-table class="firstTable" ref="xTable" border resizable show-overflow :data="feeListData">
+            <vxe-table class="SecondTable" ref="xTable" border resizable show-overflow :data="feeListData">
-              <vxe-column field="feeTypeName" title="费用类型" :edit-render="{}"> </vxe-column>
+              <vxe-column field="feeTypeName" width="150" title="费用类型"> </vxe-column>
-              <vxe-column field="feeAmount" title="费用金额" :edit-render="{}"> </vxe-column>
+              <vxe-column field="feeAmount" :title="`费用金额 (总金额：￥${feeListDataNum})`">
+                <template #default="{ row }"> ￥{{ row.feeAmount }} </template>
+              </vxe-column>
             </vxe-table>
           </a-col>
+          <a-col :span="8"></a-col>
         </a-row>
         <p class="CsFormTitle">
           <span><i class="iconfont icon-tuandui"></i>关联业务明细</span>
@@ -666,7 +662,17 @@
               <a-input size="small" v-model="SearchData.kdCode" allowClear />
             </a-form-item>
           </a-col> -->
-          <a-col :span="4">
+          <a-col :span="3">
+            <a-form-item
+              label="提单号:"
+              :labelCol="{ xs: { span: 25 }, sm: { span: 6 } }"
+              :wrapperCol="{ xs: { span: 25 }, sm: { span: 17 } }"
+              has-feedback
+            >
+              <a-input size="small" v-model="SearchData.MBLNO" allowClear />
+            </a-form-item>
+          </a-col>
+          <a-col :span="3">
             <a-form-item
               label="船名:"
               :labelCol="{ xs: { span: 25 }, sm: { span: 6 } }"
@@ -676,7 +682,7 @@
               <a-input size="small" v-model="SearchData.VESSEL" allowClear />
             </a-form-item>
           </a-col>
-          <a-col :span="4">
+          <a-col :span="3">
             <a-form-item
               label="航次:"
               :labelCol="{ xs: { span: 25 }, sm: { span: 6 } }"
@@ -785,6 +791,14 @@
               <vxe-column field="destination" title="目的港" :edit-render="{}" width="100"> </vxe-column>
               <vxe-column field="carrier" title="船公司" :edit-render="{}" width="100"> </vxe-column>
             </vxe-table>
+            <vxe-pager
+              :current-page="BusinessDataPages.PageNo"
+              :page-size="BusinessDataPages.PageSize"
+              :total="BusinessDataPages.totalCount"
+              :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+              @page-change="BusinessDataPageChange"
+            >
+            </vxe-pager>
           </a-col>
         </a-row>
       </a-form>
@@ -804,7 +818,8 @@ import {
   BookingOrderSFSendBooking,
   commondbCodeProvinceList,
   commondbCodeCityList,
-  ExpressDeliveryPrintWaybill
+  ExpressDeliveryPrintWaybill,
+  ExpressDeliveryGetSenderInfo
 } from '@/api/modular/main/ExpressModule'
 import { ExpressDeliveryGetAddressList } from '@/api/modular/main/ExpressTemplate'
 import { PageDataByBooking } from '@/api/modular/main/BookingLedger'
@@ -967,9 +982,15 @@ export default {
       initTime: true,
       AddSVisible: false,
       BusinessData: [],
+      BusinessDataPages: {
+        PageNo: 1,
+        PageSize: 10,
+        totalCount: 0
+      },
       BusinessLoading: false,
       DetailData: [],
       feeListData: [],
+      feeListDataNum: 0.0,
       ProvinceData: [],
       sjCityData: [],
       fjCityData: [],
@@ -1041,6 +1062,45 @@ export default {
     //     value: str.repeat(repeat)
     //   }
     // },
+    BusinessDataPageChange({ currentPage, pageSize }) {
+      this.BusinessLoading = true
+      this.BusinessDataPages.PageNo = currentPage
+      this.BusinessDataPages.PageSize = pageSize
+      PageDataByBooking({
+        multisort: [
+          { sortField: 'bsstatusname', descSort: true },
+          { sortField: 'mblno', descSort: true }
+        ],
+        ...this.BusinessDataPages,
+        ...this.SearchData
+      })
+        .then(res => {
+          this.BusinessData = res.data.items
+          this.BusinessDataPages = {
+            PageNo: res.data.pageIndex,
+            PageSize: res.data.pageSize,
+            totalCount: res.data.totalCount
+          }
+          let arr = []
+          if (this.Ids != undefined) {
+            this.BusinessData.forEach((item2, index) => {
+              this.Ids.split(',').forEach(item => {
+                if (item2.id == item) {
+                  arr.push(this.BusinessData[index])
+                }
+              })
+            })
+          }
+          setTimeout(() => {
+            this.$refs.xTable2.setCheckboxRow(arr, true)
+            this.BusinessLoading = false
+            this.insertEvent2()
+          }, 100)
+        })
+        .catch(err => {
+          this.BusinessLoading = false
+        })
+    },
     RDisabled() {
       let Obj = {
         暂存: false,
@@ -1192,12 +1252,16 @@ export default {
           { sortField: 'bsstatusname', descSort: true },
           { sortField: 'mblno', descSort: true }
         ],
-        PageNo: 1,
+        ...this.BusinessDataPages,
-        PageSize: 9999,
         ...this.SearchData
       })
         .then(res => {
           this.BusinessData = res.data.items
+          this.BusinessDataPages = {
+            PageNo: res.data.pageIndex,
+            PageSize: res.data.pageSize,
+            totalCount: res.data.totalCount
+          }
           let arr = []
           if (this.Ids != undefined) {
             this.BusinessData.forEach((item2, index) => {
@@ -1302,6 +1366,12 @@ export default {
 
               if (Data.feeList) {
                 this.feeListData = Data.feeList
+                let Num = 0
+                Data.feeList.forEach(item => {
+                  console.log(item)
+                  Num = Num + item.feeAmount
+                })
+                this.feeListDataNum = Num
               }
               this.form.setFieldsValue({
                 ...Data
@@ -1371,33 +1441,40 @@ export default {
           // values.tmsForwarderOrderLoadingPlaceEntityList = this.tmsForwarderOrderLoadingPlaceEntityList
           console.log(this.id, this.type)
           if (this.id && this.type != 'Copy') {
-            BookingOrderSFSave({ ...values, id: this.id }).then(res => {
+            BookingOrderSFSave(
+              FnType == 'FnSendBooking' ? { ...values, id: this.id, IsSending: true } : { ...values, id: this.id }
+            ).then(res => {
               if (res.success) {
                 this.$message.success('保存成功')
                 this.form.setFieldsValue({
                   ...res.data
                 })
                 if (FnType == 'FnSendBooking') {
-                  BookingOrderSFSendBooking({ Id: this.id }).then(res => {
-                    if (res.success) {
-                      this.$message.success('下单成功')
-                      setTimeout(() => {
-                        this.form.setFieldsValue({
-                          ...this.form.getFieldsValue(),
-                          ...res.extras
-                        })
-                        this.confirmLoading = false
                   this.PrintFaceList()
-                      }, 100)
-                    } else {
-                      this.confirmLoading = false
-                      this.$message.error(`发送失败,${res.message}`)
-                    }
-                  })
-                } else {
-                  this.confirmLoading = false
                 }
+
+                // if (FnType == 'FnSendBooking') {
+                //   BookingOrderSFSendBooking({ Id: this.id }).then(res => {
+                //     if (res.success) {
+                //       this.$message.success('下单成功')
+                //       setTimeout(() => {
+                //         this.form.setFieldsValue({
+                //           ...this.form.getFieldsValue(),
+                //           ...res.extras
+                //         })
+                //         this.confirmLoading = false
+                //         this.PrintFaceList()
+                //       }, 100)
+                //     } else {
+                //       this.confirmLoading = false
+                //       this.$message.error(`发送失败,${res.message}`)
+                //     }
+                //   })
+                // } else {
+                //   this.confirmLoading = false
+                // }
                 // this.type = 'Details'
+                this.confirmLoading = false
               } else {
                 this.confirmLoading = false
                 this.$message.error(res.message)
@@ -1506,7 +1583,9 @@ export default {
         this.form.resetFields()
         this.getListData()
         if (this.id) {
+          this.confirmLoading = true
           BookingOrderSFGet({ id: this.id }).then(res => {
+            this.confirmLoading = false
             if (res.success && res.data.id != 0) {
               setTimeout(() => {
                 console.log(res.data)
@@ -1534,6 +1613,12 @@ export default {
                 console.log(Data)
                 if (Data.feeList) {
                   this.feeListData = Data.feeList
+                  let Num = 0
+                  Data.feeList.forEach(item => {
+                    console.log(item)
+                    Num = Num + item.feeAmount
+                  })
+                  this.feeListDataNum = Num
                 }
                 this.form.setFieldsValue({
                   ...Data
@@ -1551,11 +1636,25 @@ export default {
             }
           })
         } else if (this.WebId || this.Ids) {
+          this.confirmLoading = true
+          ExpressDeliveryGetSenderInfo().then(res => {
+            this.confirmLoading = false
+            let data = res.data.expressDeliveryAddressDto
+            this.form.setFieldsValue({
+              ...this.form.getFieldsValue(),
+              fjCompany: data.company,
+              fjPeople: data.people,
+              fjProvinceId: data.provinceId,
+              fjCity: data.city,
+              fjAddress: data.address,
+              fjTel: data.tel
+            })
+            console.log(res, 'ExpressDeliveryGetSenderInfo')
+          })
           setTimeout(() => {
             this.form.setFieldsValue({
               ...this.form.getFieldsValue(),
               goodsname: '文件',
-              fjCompany: this.userInfo.loginEmpInfo.orgName,
               kdNum: 1,
               currentStateDesc: '发件',
               kdCompany: 'sf',
@@ -1657,6 +1756,9 @@ export default {
 // @import url('../../BookingLedger/detail/style/operationArea.less');
 </style>
 <style scoped lang="less">
+.ant-calendar-picker {
+  min-width: auto !important;
+}
 .ButtonBox {
   display: flex;
   align-items: center;
@@ -1666,6 +1768,9 @@ export default {
 .firstTable {
   width: calc(100vw - 330px);
 }
+.SecondTable {
+  margin-left: 16px;
+}
 .imgBox {
   height: 50vh;
   overflow-y: auto;

src/views/main/ExpressModule/index.vue

@@ -413,6 +413,7 @@ export default {
       })
 
       if (selectRecords.length) {
+        this.loading = true
         BookingOrderSFDelete({ Ids: Ids }).then(res => {
           if (res.code == 204) {
             this.$message.success('已完成删除')
@@ -420,6 +421,7 @@ export default {
           } else {
             this.$message.warning(res.message)
           }
+          this.loading = false
         })
       } else {
         this.$message.warning('请至少选择一条数据')