修改问题

src/api/modular/main/BookingLedger.js

@@ -1052,3 +1052,19 @@ export function BookingCustomerOrderAuditBooking (parameter) {
     params: parameter
   })
 }
+
+export function LetterYardHis (parameter) {
+  return axios({
+    url: '/BookingOrder/LetterYardHis',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function SaveInList (parameter) {
+  return axios({
+    url: '/BookingOrder/SaveInList',
+    method: 'post',
+    data: parameter
+  })
+}

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

@@ -72,7 +72,7 @@
       <div class="btn-list single-view-4">
         <button @click="FnGoSendCar"><span class="iconfont icon-yunshu1"></span>派车</button>
       </div>
-      <div v-if="scrollTop>100" class="btn-list single-view-2">
+      <div v-if="scrollTop > 100" class="btn-list single-view-2">
         <div>提单号:{{ details.mblno }}</div>
         <div>委托单位:{{ details.customername }}</div>
       </div>
@@ -166,6 +166,9 @@
           <a-button class="btn" type="primary" v-if="modelType == 'initCabin'" @click="sendModel" :loading="SendLoading">
             发送
           </a-button>
+          <a-button class="btn" type="primary" v-if="modelType == 'initCabin'" @click="handleOpenHis">
+            引入
+          </a-button>
         </div>
         <a-form>
           <a-row :gutter="16">
@@ -695,6 +698,72 @@
       </template>
     </a-modal>
     <!-- 运踪弹窗 end -->
+    <a-modal width="1100px" ref="form" :maskClosable="false" v-model="historyFlag" title="历史引入">
+      <a-spin :spinning="hisLoading">
+        <div>
+          <a-form-model :label-col="labelCol" :wrapper-col="wrapperCol" :model="hisSearch">
+            <a-row>
+              <a-col :span="8">
+                <a-form-model-item label="业务编号">
+                  <a-input size="small" v-model="hisSearch.bookingno" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="8">
+                <a-form-model-item label="委托编号">
+                  <a-input size="small" v-model="hisSearch.name" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="8">
+                <a-form-model-item label="委托单位">
+                  <selectView
+                    ref="select"
+                    type="customername"
+                    searchApi="DjyCustomerSuggest"
+                    :searchQuery="{ keyword: '', type: 'consignor' }"
+                    :showLabel="['shortName']"
+                    :openSearch="true"
+                    :isCopy="false"
+                    @change="getSelectViewRes"></selectView>
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row>
+              <a-col :span="8">
+                <a-form-model-item label="主提单号">
+                  <a-input size="small" v-model="hisSearch.mblno" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="8">
+                <a-form-model-item label="分提单号">
+                  <a-input size="small" v-model="hisSearch.hblno" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="8">
+                <a-form-model-item label="开船日期">
+                  <a-range-picker valueFormat="YYYY-MM-DD" v-model="hisSearch.etd" />
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row>
+              <a-col :span="24">
+                <div style="margin-top: 10px;text-align: right;" class="model-btn-list">
+                  <a-button class="btn" @click="handleSearch" style="margin-right: 10px;" type="primary">搜索</a-button>
+                  <a-button class="btn" type="primary" @click="handleRest">重置</a-button>
+                </div>
+              </a-col>
+            </a-row>
+          </a-form-model>
+        </div>
+        <a-table
+          :scroll="{ x: '900' }"
+          @change="tablePaginationChange"
+          :pagination="pagination"
+          :columns="columns"
+          :data-source="data">
+          <a slot="action" slot-scope="text,record" @click="handleInto(record)">引入</a>
+        </a-table>
+      </a-spin>
+    </a-modal>
     <pre-order ref="preOrder" :details="details" @frompre="frompre" />
   </div>
 </template>
@@ -719,10 +788,12 @@ import {
   DownloadBookingOrClosingEDI,
   DeleteLetterYard,
   SendTrace,
-  GetYardlist
+  GetYardlist,
+  LetterYardHis
 } from '@/api/modular/main/BookingLedger'
 import { BookingTruckGetTruckListByBooking } from '@/api/modular/main/SendCar'
 import { mapGetters } from 'vuex'
+import selectView from '../components/selectView'
 import preOrder from './preOrder'
 export default {
   props: {
@@ -747,13 +818,118 @@ export default {
     ])
   },
   components: {
-    preOrder
+    preOrder, selectView
   },
   data() {
     return {
       id: this.$route.query.id,
+      labelCol: { span: 6 },
+      wrapperCol: { span: 18 },
+      hisLoading: false,
       modelType: '',
+      pagination: {
+        current: 1,
+        total: 0, // 总数
+        showSizeChanger: true,
+        pageSizeOptions: ['1', '10', '20', '40', '80', '100'],
+        pageSize: 10
+      },
       changeFlag: true,
+      columns: [
+        {
+          dataIndex: 'mblno',
+          key: 'mblno',
+          title: '主提单号',
+          width: 150
+        },
+        {
+          title: '分提单号',
+          dataIndex: 'hblno',
+          key: 'hblno',
+          width: 120
+        },
+        {
+          title: '业务编号',
+          dataIndex: 'address',
+          key: 'address',
+          width: 120
+        },
+        {
+          title: '开船日期',
+          key: 'etd',
+          dataIndex: 'etd',
+          width: 120
+        },
+        {
+          title: '客户',
+          key: 'customername',
+          dataIndex: 'customername',
+          width: 120
+        },
+        {
+          title: 'To',
+          key: 'toName',
+          dataIndex: 'toName',
+          width: 120
+        },
+        {
+          title: 'ATTN',
+          key: 'attn',
+          dataIndex: 'attn',
+          width: 120
+        },
+        {
+          title: 'ATTN电话',
+          key: 'attnTel',
+          dataIndex: 'attnTel',
+          width: 180
+        },
+        {
+          title: 'ATTN邮箱',
+          key: 'attnMail',
+          dataIndex: 'attnMail',
+          width: 180
+        },
+        {
+          title: 'ATTN手机',
+          key: 'attnPhone',
+          dataIndex: 'attnPhone',
+          width: 120
+        },
+        {
+          title: 'FROM电话',
+          key: 'fromTel',
+          dataIndex: 'fromTel',
+          width: 180
+        },
+        {
+          title: 'FROM',
+          key: 'fromName',
+          dataIndex: 'fromName',
+          width: 120
+        },
+        {
+          title: 'FROM邮箱',
+          key: 'fromMail',
+          dataIndex: 'fromMail',
+          width: 180
+        },
+        {
+          title: 'FROM手机',
+          key: 'fromPhone',
+          dataIndex: 'fromPhone',
+          width: 120
+        },
+        {
+          title: '操作',
+          key: 'action',
+          fixed: 'right',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' },
+          width: 80
+        }
+      ],
+      data: [],
       bookingModelvisible: false,
       bookingModelconfirm: false,
       bookingModelFrom: {
@@ -808,6 +984,7 @@ export default {
       height: 0,
       Bx: 0,
       By: 0,
+      historyFlag: false,
       forwarderFlag: false,
       CvBoxType: false,
       imgSrc: '',
@@ -829,6 +1006,7 @@ export default {
       Rdata: '',
       scale: '1.5',
       PrintType: '1',
+      hisSearch: {},
       downLoadEXCELLoading: false,
       downLoadPDFLoading: false,
       downLoadDOCXLoading: false,
@@ -874,6 +1052,60 @@ export default {
     frompre(data) {
       this.$emit('frompre', data)
     },
+    handleInto(row) {
+      row.orderUrl = {
+        urlTxxp: '',
+        urlVgm: '',
+        urlVgmSi: ''
+      }
+      row.id = this.initCabinFrom.id
+      row.bookingId = this.initCabinFrom.bookingId
+      this.initCabinFrom = row
+      this.historyFlag = false
+    },
+    handleRest() {
+      this.hisSearch = {}
+      this.$refs.select.value = ''
+    },
+    tablePaginationChange(pagination) {
+      this.pagination.current = pagination.current
+      this.pagination.pageSize = pagination.pageSize
+      this.getList()
+    },
+    handleSearch() {
+      this.getList()
+    },
+    handleOpenHis() {
+      this.historyFlag = true
+      this.getList()
+    },
+    getList() {
+      const data = {
+        pageNo: this.pagination.current,
+        pageSize: this.pagination.pageSize,
+        ...this.hisSearch
+      }
+      this.hisLoading = true
+      if (data.etd && data.etd.length > 0) {
+        data.betd = data.etd[0]
+        data.eetd = data.etd[1]
+      }
+      LetterYardHis(data).then(res => {
+        if (res.success) {
+          this.data = res.data.items
+          this.hisLoading = false
+          this.pagination.total = res.data.totalCount
+        } else {
+          this.$message.error(res.data.message)
+          this.hisLoading = false
+        }
+      })
+    },
+    getSelectViewRes({ type, res }) {
+      if (type === 'customername') {
+        this.hisSearch.customername = res.shortName || ''
+      }
+    },
     FnGoSendCar() {
       BookingTruckGetTruckListByBooking({ bookingId: this.id }).then(res => {
         console.log(res)
@@ -1692,4 +1924,8 @@ export default {
 </script>
 <style lang="less" scoped>
 @import url('../style/operationArea.less');
+
+/deep/ .ant-col-8 {
+  height: 35px;
+}
 </style>

src/views/main/BookingLedger/list/index.vue

@@ -354,17 +354,17 @@
                 </template>
 
                 <template #dzRemark="{ row }">
-                  <div v-if="row.dzRemark">
+                  <div >
                     <a-popover placement="topLeft" :content="row.dzRemark">
-                      <span class="dzRemark">{{ row.dzRemark }}</span>
+                      <a-input @blur="handleSaveMark(row)" v-model="row.dzRemark"></a-input>
                     </a-popover>
                   </div>
                 </template>
 
                 <template #czRemark="{ row }">
-                  <div v-if="row.czRemark">
+                  <div >
                     <a-popover placement="topLeft" :content="row.czRemark">
-                      <span class="czRemark">{{ row.czRemark }}</span>
+                      <a-input @blur="handleSaveMark(row)" v-model="row.czRemark"></a-input>
                     </a-popover>
                   </div>
                 </template>
@@ -802,7 +802,8 @@ import {
   checkUpdateManifestNo,
   singleBCFileRead,
   refreshSailingDate,
-  RefreshBillTrace
+  RefreshBillTrace,
+  SaveInList
 } from '@/api/modular/main/BookingLedger'
 
 import initData from './modules/initData'
@@ -2063,6 +2064,18 @@ export default {
     addCancel() {
       this.addVisible = false
     },
+    handleSaveMark(row) {
+      const data = {
+        id: row.id,
+        czRemark: row.czRemark,
+        dzRemark: row.dzRemark
+      }
+      SaveInList(data).then(res => {
+        if (res.success) {
+          this.$message.success('修改成功')
+        }
+      })
+    },
 
     // 表单编辑
     formSetting() {

src/views/main/Customer/editForm.vue

@@ -143,7 +143,12 @@
       </a-col>
       <a-col :span="6">
         <a-form-item class="from-label" label="单证人员" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-          <a-select :showSearch="true" allowClear :filterOption="filterOption" v-decorator="['docid']" @focus="getUserList">
+          <a-select
+            :showSearch="true"
+            allowClear
+            :filterOption="filterOption"
+            v-decorator="['docid']"
+            @focus="getUserList">
             <a-select-option v-for="item in saleUserList" :key="item.id" :value="item.id">
               {{ item.name }}
             </a-select-option>
@@ -331,7 +336,7 @@ export default {
       DjyCustomerDetail({ id: this.$route.query.id }).then(res => {
         if (res.data) {
           this.Data = res.data
-          let WpropString = []
+          const WpropString = []
           if (res.data.propString) {
             res.data.propString.split(']').forEach(item => {
               if (item.split('[')[1]) {
@@ -339,7 +344,7 @@ export default {
               }
             })
           }
-          let WserviceItem = []
+          const WserviceItem = []
           if (res.data.serviceItem) {
             res.data.serviceItem.split(']').forEach(item => {
               if (item.split('[')[1]) {
@@ -351,7 +356,7 @@ export default {
             item.WebKey = index + 1
           })
           // 后端返回的 ID 类型不一致 在此处 转为一致
-          let UserArr = ['saleid', 'opid', 'docid', 'custserviceid']
+          const UserArr = ['saleid', 'opid', 'docid', 'custserviceid']
           UserArr.forEach(item => {
             if (res.data[item]) {
               res.data[item] = parseInt(res.data[item])
@@ -489,12 +494,12 @@ export default {
                 serviceItem == '' ? (serviceItem = `[${item2}]`) : (serviceItem = `${serviceItem}[${item2}]`)
               })
           }
-          let Arr = ['sale', 'op', 'doc', 'custservice']
+          const Arr = ['sale', 'op', 'doc', 'custservice']
           GetSysUserPage()
             .then(res => {
               this.SaveLoading = false
               if (res.success) {
-                let saleUserList = res.data
+                const saleUserList = res.data
                 Arr.forEach(item => {
                   if (values[`${item}id`]) {
                     saleUserList.forEach(i => {
@@ -504,9 +509,17 @@ export default {
                     })
                   }
                 })
+                if (!values.docid) {
+                   this.Data.doc = ''
+                   this.Data.docid = ''
+                }
+                if (!values.custserviceid) {
+                   this.Data.custservice = ''
+                   this.Data.custserviceid = ''
+                }
                 DjyCustomerEdit({
-                  ...this.Data,
                   ...values,
+                  ...this.Data,
                   propString: propString,
                   serviceItem: serviceItem,
                   contacts: this.ContactsData