托书详情页字段调整

src/views/book/detailsBookDrawer.vue

@@ -12,7 +12,7 @@
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
           <a-form-model layout="inline" ref="form" :model="addBook" :rules="validatorRules">
-            <a-row :gutter="24">
+           <a-row :gutter="24">
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="托书日期" prop="shippingOrderDate">
                   {{addBook.shippingOrderDate}}
@@ -22,30 +22,19 @@
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="托书号" prop="shippingOrderNumber">
                   {{addBook.shippingOrderNumber}}
-                </a-form-model-item>
-              </a-col>
-
-              <a-col :md="12" :sm="12">
-                <a-form-model-item label="外销发票号码" prop="exportInvoiceNo">
-                  {{addBook.exportInvoiceNo}}
+                  
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="经营单位" prop="businessUnit">
+                <a-form-model-item label="经营单位" prop="unitInOperation">
                   {{addBook.unitInOperation}}
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="经营单位地址" prop="businessUnitAdd">
+                <a-form-model-item label="经营单位地址" prop="unitInOperationAddress">
                   {{addBook.unitInOperationAddress}}
-                  <!-- <a-select placeholder="请选择经营单位地址" v-model="addBook.unitInOperationAddress" disabled="true">
-                    <a-select-option value="">请选择</a-select-option>
-                    <a-select-option value="0">客户1</a-select-option>
-                    <a-select-option value="1">客户2</a-select-option>
-                    <a-select-option value="2">客户3</a-select-option>
-                  </a-select> -->
                 </a-form-model-item>
               </a-col>
 
@@ -55,15 +44,33 @@
                 </a-form-model-item>
               </a-col>
 
+
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="最终船期" prop="finalShipDate">
+                <a-form-model-item label="最终船期" prop="theFinalShippingDate">
                   {{addBook.theFinalShippingDate}}
+                 
+                </a-form-model-item>
+              </a-col>
+
+               <a-col :md="6" :sm="8">
+                <a-form-model-item label="运抵国别" prop="arriveInCountry">
+                  {{addBook.arriveInCountry}}
+                  <!-- <a-input placeholder="请输入运抵国别" v-model="addBook.arriveInCountry"></a-input> -->
+                </a-form-model-item>
+              </a-col>
+
+              
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="贸易国别" prop="tradeCountry">
+                  {{addBook.tradeCountry}}
+                  <!-- <a-input placeholder="请输入贸易国别" v-model="addBook.tradeCountry"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
                <a-col :md="6" :sm="8">
                 <a-form-model-item label="收货人" prop="consignee">
                   {{addBook.consignee}}
+                
                 </a-form-model-item>
               </a-col>
 
@@ -76,65 +83,68 @@
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="通知方" prop="notifyParty">
                   {{addBook.notifyParty}}
+              
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="通知方地址" prop="notifyPartyAddress">
                   {{addBook.notifyPartyAddress}}
+              
                 </a-form-model-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="贸易国别" prop="tradeCountry">
-                  {{addBook.tradeCountry}}
-                </a-form-model-item>
-              </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="运抵国别" prop="arriveCountry">
-                  {{addBook.arriveInCountry}}
-                </a-form-model-item>
-              </a-col>
+             
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="出口口岸" prop="exportPort">
                   {{addBook.exportPort}}
+                    
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="目的港" prop="destinationport">
+                <a-form-model-item label="目的港" prop="destinationPort">
                   {{addBook.destinationPort}}
+                  
+                  <!-- <a-input placeholder="请输入目的港" v-model="addBook.destinationPort"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="收汇方式" prop="collectionMethod">
+                <a-form-model-item label="收汇方式" prop="exchangeEarningsValue">
                   {{addBook.exchangeEarningsValue}}
+                   
+                  <!-- <a-input placeholder="请输入收汇方式" v-model="addBook.exchangeEarningsValue"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="成交方式" prop="soldType">
+                <a-form-model-item label="成交方式" prop="termsOfDeliveryvalue">
                   {{addBook.termsOfDeliveryvalue}}
+               
+                  <!-- <a-input placeholder="请输入成交方式" v-model="addBook.termsOfDeliveryvalue"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="金额" prop="money">
                   {{addBook.money}}
+                 
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="人民币" prop="RMB">
+                <a-form-model-item label="人民币" prop="cny">
                   {{addBook.cny}}
+                 
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="美元" prop="dollar">
-                  {{addBook.usd}}
+                <a-form-model-item label="美元" prop="usd">
+                    {{addBook.usd}}
+                  
                 </a-form-model-item>
               </a-col>
             </a-row>
@@ -267,132 +277,118 @@ export default {
     return {
       // 表头
       addBookColumns: [
-        {
-          title: '英文名称',
-          dataIndex: 'englishName',
-          width: 120,
-          fixed: 'left',
-          className: 'replacecolor'
-        },
         {
           title: '款号',
-          dataIndex: 'styleNumber',
+          dataIndex: 'itemNumber',
           width: 120,
-          fixed: 'left',
+          ellipsis: true,
           className: 'replacecolor'
         },
-        {
-          title: '小po号',
-          dataIndex: 'smailPo',
+         {
+          title: '小po',
+          dataIndex: 'smallPo',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
           title: '数量',
           dataIndex: 'number',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
-        {
+         {
           title: '箱数',
-          dataIndex: 'boxNumber',
-          width: 90,
+          dataIndex: 'planQuantity',
+          width: 160,
+          ellipsis: true,
           className: 'replacecolor'
         },
-
-        {
+         {
           title: '毛重',
           dataIndex: 'grossWeight',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
           title: '净重',
           dataIndex: 'netWeight',
           width: 120,
+          ellipsis: true,
+          // scopedSlots: { customRender: 'containerCode' },
           className: 'replacecolor'
         },
         {
           title: '体积',
-          dataIndex: 'volume',
-          width: 160,
-          className: 'replacecolor'
+          dataIndex: 'totalVolume',
+          width: 120,
+          ellipsis: true,
+          // scopedSlots: { customRender: 'containerNo' },
+          // className: 'replacecolor'
         },
         {
           title: '分销点',
           dataIndex: 'distributionPoint',
-          customRender: t => ellipsis(t),
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
-        {
-          title: '集装箱代号',
-          dataIndex: 'containerCode',
-          width: 120,
-          className: 'replacecolor'
-        },
-
         {
           title: '集装箱号',
           dataIndex: 'containerNumber',
+          ellipsis: true,
+          scopedSlots: { customRender: 'containerNumber' },
           width: 120,
+          // fixed: 'left',
           className: 'replacecolor'
         },
-        {
-          title: '单价',
-          dataIndex: 'unitPrice',
+          {
+          title: '集装箱代号',
+          dataIndex: 'containerCode',
+          scopedSlots: { customRender: 'containerCode' },
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
-        //         {
-        //   title: '创建时间',
-        //   dataIndex: 'createTime',
-        //   align: 'center',
-        //   sorter: true,
-        //   customRender: text => {
-        //     return moment(text).format('YYYY-MM-DD')
-        //   }
-        // },
-        {
-          title: '预发货日期',
-          dataIndex: 'preShipmentDate',
+          {
+          title: '单价',
+          dataIndex: 'price',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '业务员',
-          dataIndex: 'salesman',
+          title: '金额',
+          dataIndex: 'totalPrice',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
 
-        {
-          title: '业务部门',
-          dataIndex: 'operatingDepartment',
+         {
+          title: '制单人',
+          dataIndex: 'createBy',
           width: 120,
+          ellipsis: true,
+          // fixed: 'left',
           className: 'replacecolor'
         },
-        {
+           {
           title: '采购/委外订单号',
-          dataIndex: 'purchaseOutsourcingOrderNo',
+          dataIndex: 'purOrSubOrder',
           width: 160,
+          ellipsis: true,
           className: 'replacecolor'
         },
-
         {
-          title: '采购/委外工厂',
-          dataIndex: 'outsourcingFactoryForProcurement',
+          title: '英文名称',
+          dataIndex: 'englishProductName',
           width: 160,
+          ellipsis: true,
           className: 'replacecolor'
         },
-
-        {
-          title: '操作',
-          dataIndex: 'operation',
-          width: 160,
-          fixed: 'right',
-          className: 'replacecolor'
-        }
       ],
       addBookData: [],
       CNYColumns: [