1/10

src/api/modular/main/BookingLedger.js

@@ -664,4 +664,4 @@ export function getGoodsname(parameter) {
     method: 'get',
     params: parameter
   })
-}
+}

src/api/modular/main/BookingLedger_new.js

@@ -0,0 +1,674 @@
+import { axios } from '@/utils/request'
+
+/**
+ * 分页查询订舱主表
+ * @params PageSize
+ * @params PageNo
+ */
+export function BookingOrderPage(parameter) {
+  return axios({
+    url: '/BookingOrder/page',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 获取订舱明细
+ * @params Id
+ */
+export function BookingOrderGet(parameter) {
+  return axios({
+    url: '/BookingOrder/get',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 获取分页查询客户
+ * @params ShortName
+ */
+export function DjyCustomerpage(parameter) {
+  return axios({
+    url: '/DjyCustomer/page',
+    method: 'get',
+    params: parameter
+  })
+}
+/**
+ * 获取分页查询客户
+ * @params keyword
+ */
+export function DjyCustomerSuggest(parameter) {
+  return axios({
+    url: '/DjyCustomer/Suggest',
+    method: 'get',
+    params: parameter
+  })
+}
+/**
+ * 获取船公司
+ * @params CnName
+ */
+export function GetCarrierlist(parameter) {
+  return axios({
+    url: '/commondb/carrierlist',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 获取船名
+ * @params Name
+ */
+export function GetVessellist(parameter) {
+  return axios({
+    url: '/commondb/vessellist',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 用户查询
+ * @params Name
+ */
+export function GetSysUserPage(parameter) {
+  return axios({
+    url: '/sysUser/GetTenantUser',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 订舱模板查询
+ * @params Type : 10, 20, 30, 40
+ * @params SearchValue
+ */
+export function BookingTemplate(parameter) {
+  return axios({
+    url: '/BookingTemplate/page',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 场站
+ * @params SearchValue
+ */
+export function GetYardlist(parameter) {
+  return axios({
+    url: '/commondb/yardlist',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 起始港
+ * @params Name
+ */
+export function GetPortloadlist(parameter) {
+  return axios({
+    url: '/commondb/portloadlist',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 目的港
+ * @params Name
+ */
+export function GetPortlist(parameter) {
+  return axios({
+    url: '/commondb/portlist',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 包装
+ * @params Name
+ */
+export function GetPackage(parameter) {
+  return axios({
+    url: '/commondb/package',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 付费方式
+ * @params Name
+ */
+export function GetFrt(parameter) {
+  return axios({
+    url: '/commondb/frt',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 付费方式
+ * @params Name
+ */
+export function GetService(parameter) {
+  return axios({
+    url: '/commondb/service',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 备注
+ * @params id
+ */
+export function GetRemark(parameter) {
+  return axios({
+    url: '/BookingOrder/getRemark',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 新增备注
+ * @params {
+  "pId": 0,
+  "remark": "string"
+  }
+ */
+export function AddRemark(parameter) {
+  return axios({
+    url: '/BookingOrder/addRemark',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 附件
+ * @params id
+ */
+export function GetFile(parameter) {
+  return axios({
+    url: '/BookingOrder/getFile',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 新增附件
+ * @params {
+  "BookingId": 0,
+  "TypeCode": "string"
+  "TypeName": "string"
+  "file": "string"
+  }
+ */
+
+export function AddFile(params) {
+  console.log(params)
+  return axios({
+    url: '/BookingOrder/addFile',
+    method: 'post',
+    data: params,
+    headers: {
+      'X-Requested-With': 'XMLHttpRequest',
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+/**
+ * 获取货运动态
+ * @params id
+ */
+export function GetBookingLog(parameter) {
+  return axios({
+    url: `/BookingOrder/GetStatusLog`,
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 日志明细
+ * @params id
+ */
+export function GetLog(parameter) {
+  return axios({
+    url: '/BookingOrder/getLog',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 获取箱型
+ * @params id
+ */
+export function GetCtn(parameter) {
+  return axios({
+    url: '/commondb/ctn',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 增加订舱模板
+ */
+export function BookingTemplateAdd(parameter) {
+  return axios({
+    url: '/BookingTemplate/add',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 签单方式
+ * @params name
+ */
+export function Codeissuetypelist(parameter) {
+  return axios({
+    url: '/commondb/codeissuetypelist',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 引入场站数据
+ * @params bookingId
+ * @params isWeb
+ */
+export function GetYardData(parameter) {
+  return axios({
+    url: '/BookingOrder/GetYardData',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 发送订舱、截单EDI
+ */
+export function SendBookingOrClosingEDI(parameter) {
+  return axios({
+    url: '/BookingOrder/SendBookingOrClosingEDI',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 下载订舱、截单EDI
+ */
+export function DownloadBookingOrClosingEDI(parameter) {
+  return axios({
+    url: '/BookingOrder/DownloadBookingOrClosingEDI',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 发送下货纸
+ */
+export function SendXHZ(parameter) {
+  return axios({
+    url: '/BookingOrder/SendXHZ?bookingId=' + parameter,
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 直发VGM
+ */
+export function VgmSend(parameter) {
+  return axios({
+    url: '/BookingOrder/VgmSend?bookingId=' + parameter,
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 获取放舱信息
+ */
+export function LetterYard(parameter) {
+  return axios({
+    url: '/BookingOrder/LetterYard?bookingId=' + parameter,
+    method: 'get'
+  })
+}
+
+/**
+ * 保存（新增或修改）放舱
+ */
+export function SaveBookingLetteryard(parameter) {
+  return axios({
+    url: '/BookingLetteryard/Save',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 放舱发送
+ */
+export function SendLetterYard(parameter) {
+  return axios({
+    url: '/BookingLetteryard/SendLetterYard?bookingId=' + parameter,
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 删除放舱
+ */
+export function DeleteLetterYard(parameter) {
+  return axios({
+    url: '/BookingLetteryard/LetterYardDelete',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 样单
+ */
+export function SampleBill(parameter) {
+  return axios({
+    url: '/BookingOrder/SampleBill?bookingId=' + parameter,
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 保存（新增或修改）样单
+ */
+export function SaveBookingSampleBill(parameter) {
+  return axios({
+    url: '/BookingSampleBill/Save',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 获取VGM、VGM SI链接
+ */
+export function VgmLink(parameter) {
+  return axios({
+    url: '/BookingOrder/VgmLink?bookingId=' + parameter,
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 获取样单pdf
+ */
+export function SampleBillPdf(parameter) {
+  return axios({
+    url: '/BookingOrder/SampleBillPdf?bookingId=' + parameter,
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 获取提箱小票链接
+ */
+export function TxxpLink(parameter) {
+  return axios({
+    url: '/BookingOrder/TxxpLink?bookingId=' + parameter,
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 校验
+ */
+export function ExcuteRulesOceanBooking(parameter) {
+  return axios({
+    url: '/RulesEngineClient/ExcuteRulesOceanBooking?bookingId=' + parameter,
+    method: 'get'
+  })
+}
+
+/**
+ * 付费方式
+ * @params Name
+ */
+export function GetForwarderlist(parameter) {
+  return axios({
+    url: '/commondb/forwarderlist',
+    method: 'get',
+    params: parameter
+  })
+}
+/**
+ * 打印
+ * @params Name
+ */
+export function BookingOrderPrintOrder(parameter) {
+  return axios({
+    url: '/BookingOrder/PrintOrder',
+    method: 'get',
+    params: parameter
+  })
+}
+/**
+ * 打印下载
+ * @params Name
+ */
+export function BookingOrderDownloadPrint(parameter) {
+  return axios({
+    url: '/BookingOrder/downloadPrint',
+    method: 'get',
+    responseType: 'arraybuffer',
+    params: parameter
+  })
+}
+/**
+ * 获取客户
+ * @params Name
+ */
+export function DjyCustomerdetail(parameter) {
+  return axios({
+    url: '/DjyCustomer/detail',
+    method: 'get',
+    params: parameter
+  })
+}
+/**
+ * 批量保存关系人（同时新增、删除、修改）
+ * @params Name
+ */
+export function BookingOrderContactSavebatch(id, parameter) {
+  return axios({
+    url: `/BookingOrderContact/savebatch?bookingId=${id}`,
+    method: 'post',
+    data: parameter
+  })
+}
+/**
+ * 分页查询订舱关系人
+ * @params Name
+ */
+export function BookingOrderContactPage(parameter) {
+  return axios({
+    url: '/BookingOrderContact/page',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 下载附件
+ * @params id
+ */
+export function BookingOrderGetFile(parameter) {
+  return axios({
+    url: '/BookingOrder/GetFile',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function BookingOrderDownload(parameter) {
+  return axios({
+    url: '/BookingOrder/Download',
+    method: 'get',
+    params: parameter,
+    responseType: 'arraybuffer'
+  })
+}
+
+// 上传ocr文件
+export function BookingOrderOcrUpFile(data) {
+  return axios({
+    url: '/BookingOrder/OcrUpFile',
+    method: 'post',
+    data: data.data,
+    params: data.parameter
+  })
+}
+
+/**
+ * 更新订舱
+ */
+export function BookingOrderUpdate(parameter) {
+  return axios({
+    url: '/BookingOrder/Update',
+    method: 'post',
+    data: parameter
+  })
+}
+
+// 获取图片
+export function BookingOrderOcrGetImg(parameter) {
+  return axios({
+    url: '/BookingOrder/OcrGetImg',
+    method: 'post',
+    params: parameter,
+    responseType: 'arraybuffer'
+  })
+}
+// 获取文字
+export function BookingOrderOcrGetText(parameter) {
+  return axios({
+    url: '/BookingOrder/OcrGetText',
+    method: 'post',
+    params: parameter
+  })
+}
+
+/**
+ * 新增订舱
+ */
+export function BookingOrderAdd(parameter) {
+  return axios({
+    url: '/BookingOrder/Add',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function BookingOrderAddOrUpdate(parameter) {
+  return axios({
+    url: '/BookingOrder/AddOrUpdate',
+    method: 'post',
+    data: parameter
+  })
+}
+export function BookingOrderPrintTemplateList(parameter) {
+  return axios({
+    url: '/BookingOrder/PrintTemplateList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function BookingOrderPrintTemplateWithHistoryList(parameter) {
+  return axios({
+    url: '/BookingOrder/PrintTemplateWithHistoryList',
+    method: 'get',
+    params: parameter
+  })
+}
+export function LetterYardPdf(parameter) {
+  return axios({
+    url: '/BookingOrder/LetterYardPdf',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function SendTrace(parameter) {
+  return axios({
+    url: '/BookingOrder/SendTrace',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function getDjyTenantConfig(parameter) {
+  return axios({
+    url: '/DjyTenantConfig/get',
+    method: 'get',
+    params: parameter
+  })
+}
+// 批量编辑
+export function BookingOrderBachUpdate(parameter) {
+  return axios({
+    url: '/BookingOrder/BachUpdate',
+    method: 'post',
+    data: parameter
+  })
+}
+
+// 根据船名航次，获取海关航次等信息
+export function getVesselInfoService(parameter) {
+  return axios({
+    url: '/DjyVesselInfoService/GetList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+// 获取约号
+export function getContractno(parameter) {
+  return axios({
+    url: '/Para/QuerytParaContractNoInfo',
+    method: 'get',
+    params: parameter
+  })
+}
+
+// 获取品名
+export function getGoodsname(parameter) {
+  return axios({
+    url: '/Para/QueryParaGoodsInfo',
+    method: 'get',
+    params: parameter
+  })
+}

src/views/main/BookingLedger/detail/modules/operationArea.vue

@@ -306,7 +306,12 @@
                     :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                     has-feedback
                   >
-                    <a-input class="box-input" style="width:195px;" :allowClear="true" v-model="initCabinFrom.yardcontract" />
+                    <a-input
+                      class="box-input"
+                      style="width:195px;"
+                      :allowClear="true"
+                      v-model="initCabinFrom.yardcontract"
+                    />
                   </a-form-item>
                 </a-col>
                 <a-col :span="8">
@@ -316,7 +321,12 @@
                     :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                     has-feedback
                   >
-                    <a-input class="box-input" style="width:195px;" :allowClear="true" v-model="initCabinFrom.yardcontracttel" />
+                    <a-input
+                      class="box-input"
+                      style="width:195px;"
+                      :allowClear="true"
+                      v-model="initCabinFrom.yardcontracttel"
+                    />
                   </a-form-item>
                 </a-col>
                 <a-col :span="8">
@@ -1376,16 +1386,16 @@ export default {
     saveBookingLetteryard() {
       console.log('=== 放舱 ===', this.initCabinFrom)
       // if (!this.id) {
-        // this.initCabinFrom = {
+      // this.initCabinFrom = {
-        //   ...this.initCabinFrom,
+      //   ...this.initCabinFrom,
-        //   ...{
+      //   ...{
-        //     closeDocTime: this.details.closedocdate,
+      //     closeDocTime: this.details.closedocdate,
-        //     closingTime: this.details.closingdate,
+      //     closingTime: this.details.closingdate,
-        //     vgmTime: this.details.closevgmdate,
+      //     vgmTime: this.details.closevgmdate,
-        //     yardcontract: this.details.yardcontract,
+      //     yardcontract: this.details.yardcontract,
-        //     yardcontracttel: this.details.yardcontracttel
+      //     yardcontracttel: this.details.yardcontracttel
-        //   }
+      //   }
-        // }
+      // }
       // }
       debugger
       SaveBookingLetteryard(this.initCabinFrom)
@@ -1606,13 +1616,13 @@ export default {
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
-    closingdateChange (date, dateString) {
+    closingdateChange(date, dateString) {
       this.initCabinFrom.closingTime = dateString
     },
-    closevgmdateChange (date, dateString) {
+    closevgmdateChange(date, dateString) {
       this.initCabinFrom.vgmTime = dateString
     },
-    closedocdateChange (date, dateString) {
+    closedocdateChange(date, dateString) {
       this.initCabinFrom.closeDocTime = dateString
     }
   }
@@ -1871,7 +1881,7 @@ export default {
     opacity: 0.04;
   }
 }
-/deep/ .ant-select-selection{
+/deep/ .ant-select-selection {
   position: relative;
   z-index: 1;
   &::after {
@@ -1886,7 +1896,7 @@ export default {
     opacity: 0.04;
   }
 }
-/deep/ .ant-calendar-picker{
+/deep/ .ant-calendar-picker {
   position: relative;
   z-index: 1;
   &::after {
@@ -1901,7 +1911,8 @@ export default {
     opacity: 0.04;
   }
 }
-/deep/ .ant-input-affix-wrapper, .ant-input-affix-wrapper-textarea-with-clear-btn{
+/deep/ .ant-input-affix-wrapper,
+.ant-input-affix-wrapper-textarea-with-clear-btn {
   position: relative;
   z-index: 1;
   &::after {
@@ -1916,7 +1927,7 @@ export default {
     opacity: 0.04;
   }
 }
-.remark-input{
+.remark-input {
   position: relative;
   z-index: 1;
   &::after {

src/views/main/PrinttemplateRight/editForm.vue

@@ -69,7 +69,9 @@ export default {
       },
       visible: false,
       confirmLoading: false,
-      form: this.$form.createForm(this)
+      form: this.$form.createForm(this),
+      TemplateList: [],
+      UserList: []
     }
   },
   mounted() {

src/views/main/PrinttemplateRight/index.vue

@@ -69,7 +69,7 @@
 import {
   BookingTemplateGetPrinttemplateRightList,
   BookingPrintTemplateDeletePrinttemplateRight,
-  SysUserPage
+  SysUserGetTenantUser
 } from '@/api/modular/main/PrinttemplateRight'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
@@ -140,8 +140,8 @@ export default {
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()
-      SysUserPage().then(res => {
+      SysUserGetTenantUser().then(res => {
-        this.UserList = res.data.rows
+        this.UserList = res.data
       })
     },
     FnGetData() {

src/views/main/PrinttemplateRightNew/addForm.vue

@@ -27,7 +27,14 @@
               <a-select
                 placeholder="请选择打印模板"
                 mode="multiple"
-                v-decorator="['printTemplateId', { rules: [{ required: true, message: '请选择用户！' }] }]"
+                show-search
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+                @search="handleSearch"
+                @change="handleChange"
+                v-decorator="['printTemplateId', { rules: [{ required: true, message: '请选择打印模板！' }] }]"
               >
                 <a-select-option v-for="item in TemplateList" :key="item.id" :value="item.id">
                   {{ item.typeName }}
@@ -71,21 +78,41 @@ export default {
       confirmLoading: false,
       form: this.$form.createForm(this),
       UserList: [],
-      TemplateList: []
+      TemplateList: [],
+      TemplateList2: []
     }
   },
   mounted() {
     SysUserGetTenantUser().then(res => {
       this.UserList = res.data
     })
-    BookingPrintTemplateGetPrintTemplateList().then(res => {
-      this.TemplateList = res.data.rows
-    })
   },
   methods: {
+    handleSearch(value) {
+      console.log(value)
+      let Rdata = []
+      if (value) {
+        this.TemplateList2.forEach(item => {
+          if (item.typeName && item.typeName.indexOf(value) > -1) {
+            Rdata.push(item)
+          }
+        })
+      } else {
+        Rdata = this.TemplateList2
+      }
+      this.TemplateList = Rdata
+      console.log(this.TemplateList)
+    },
+    handleChange(value) {
+      this.form.printTemplateId = value
+    },
     // 初始化方法
     add(record) {
       this.visible = true
+      BookingPrintTemplateGetPrintTemplateList().then(res => {
+        this.TemplateList = res.data
+        this.TemplateList2 = res.data
+      })
     },
     /**
      * 提交表单

src/views/main/PrinttemplateRightNew/editForm.vue

@@ -27,7 +27,14 @@
               <a-select
                 placeholder="请选择打印模板"
                 mode="multiple"
-                v-decorator="['printTemplateId', { rules: [{ required: true, message: '请选择用户！' }] }]"
+                show-search
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+                @search="handleSearch"
+                @change="handleChange"
+                v-decorator="['printTemplateId', { rules: [{ required: true, message: '请选择打印模板！' }] }]"
               >
                 <a-select-option v-for="item in TemplateList" :key="item.id" :value="item.id">
                   {{ item.typeName }}
@@ -70,24 +77,44 @@ export default {
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this),
+      UserList: [],
       TemplateList: [],
-      UserList: []
+      TemplateList2: []
     }
   },
   mounted() {
     SysUserGetTenantUser().then(res => {
       this.UserList = res.data
     })
-    BookingPrintTemplateGetPrintTemplateList().then(res => {
-      this.TemplateList = res.data.rows
-    })
   },
   methods: {
+    handleSearch(value) {
+      console.log(value)
+      let Rdata = []
+      if (value) {
+        this.TemplateList2.forEach(item => {
+          if (item.typeName && item.typeName.indexOf(value) > -1) {
+            Rdata.push(item)
+          }
+        })
+      } else {
+        Rdata = this.TemplateList2
+      }
+      this.TemplateList = Rdata
+      console.log(this.TemplateList)
+    },
+    handleChange(value) {
+      this.form.printTemplateId = value
+    },
     // 初始化方法
     edit(record) {
       this.data = record
       console.log(record)
       this.visible = true
+      BookingPrintTemplateGetPrintTemplateList().then(res => {
+        this.TemplateList = res.data
+        this.TemplateList2 = res.data
+      })
       setTimeout(() => {
         this.form.setFieldsValue({
           sysUserId: record.sysUserId,