小东西

src/field/document/shipmentDetail.md

@@ -24,6 +24,7 @@ pushState 推送状态    （0 默认未推送   1 要推送，2 推送失败）
 syShippingDetailsItemList 发运明细子表集合;
  distributionPoint 分销点，
  packId  pack_id
+
 #### 发运明细子表字段
 
 id '主键 id',
@@ -101,4 +102,10 @@ declarationName 报关品名
 
 typeValue  类型
 
-describeText 描述
+describeText 描述
+
+## 参照订单数据
+
+账套 account
+
+币种 currencyText

src/views/shipment-details/addShipDetDrawer.vue

@@ -335,7 +335,7 @@ export default {
         },
         {
           title: '币种',
-          dataIndex: 'currencyValue',
+          dataIndex: 'currencyText',
           width: 120,
           className: 'replacecolor'
         },

src/views/shipment-details/referOrderDataModal.vue

@@ -21,8 +21,8 @@
 
             <a-col :md="6" :sm="8">
               <a-form-item label="账套">
-                <a-input placeholder="请输入账套" v-model="queryParam.orderNumber"></a-input>
-                <!-- <a-select placeholder="请选择账套" v-model="queryParam.acSetNo">
+                <a-input placeholder="请输入账套" v-model="queryParam.account"></a-input>
+                <!-- <a-select placeholder="请选择账套" v-model="queryParam.account">
                   <a-select-option value="">请选择</a-select-option>
                   <a-select-option :value="0">香港森语(101)</a-select-option>
                   <a-select-option :value="1">宁波森语(102)</a-select-option>
@@ -108,7 +108,7 @@ export default {
         // 账套替换
         {
           title: '账套',
-          dataIndex: 'acSetNo',
+          dataIndex: 'account',
           width: 80,
           className: 'replacecolor'
         },
@@ -135,7 +135,7 @@ export default {
         },
         {
           title: '分销点',
-          dataIndex: 'distributionPoint ',
+          dataIndex: 'distributionPoint',
           width: 120,
           className: 'replacecolor'
         },
@@ -235,7 +235,7 @@ export default {
         },
         {
           title: '币种',
-          dataIndex: 'currencyValue',
+          dataIndex: 'currencyText',
           width: 100,
           className: 'replacecolor'
         },
@@ -314,7 +314,7 @@ export default {
       // 查询条件
       queryParam: {
         orderNumber: '', // 订单号
-        acSetNo: '',
+        account: '',
         pageNo: '', // 初始页
         pageSize: '-1' // 每页显示条数
       },
@@ -360,7 +360,7 @@ export default {
     // 重置
     searchReset() {
       this.queryParam.orderNumber = ''
-      this.queryParam.acSetNo = ''
+      this.queryParam.account = ''
       this.getOrderList()
     },
     // 选中行

src/views/shipment-details/shipmentList.vue

@@ -48,12 +48,12 @@
               </a-form-item>
             </a-col> -->
             <a-col :md="6" :sm="8">
-              <a-form-item label="发货日期">
+              <a-form-item label="预发货日期">
                 <a-date-picker
-                  placeholder="请选择发货日期"
+                  placeholder="请选择预发货日期"
                   format="YYYY-MM-DD"
                   style="width: 100%"
-                  v-model="queryParam.deliveryDate"
+                  v-model="queryParam.preDeliveryDate"
                   @change="deliveryDateChange"
                 />
               </a-form-item>
@@ -461,7 +461,7 @@ export default {
         startTime: '',
         endTime: '',
         // timeRange: [], // 查询条件  时间范围
-        deliveryDate: '',
+        preDeliveryDate: '',
         salesman: '',
         itemNumber: '', // 款号
         refer: '',
@@ -509,7 +509,7 @@ export default {
       this.queryParam.timeRange = []
       this.queryParam.startTime = ''
       this.queryParam.endTime = ''
-      this.queryParam.deliveryDate = ''
+      this.queryParam.preDeliveryDate = ''
       this.queryParam.salesman = ''
       this.queryParam.itemNumber = ''
       this.queryParam.refer = ''
@@ -611,7 +611,7 @@ export default {
     },
     deliveryDateChange(value, dateString) {
       console.log('预完工日期', dateString)
-      this.queryParam.deliveryDate = dateString
+      this.queryParam.preCompletionDate = dateString
     }
   },
   computed: {},