[发运明细]查询条件（日期范围）样式改变

field/document/shipmentDetail.md

@@ -30,7 +30,7 @@ shippingDetailsId '发运主表 ID',
 syOrderDataId '订单数据主表 id',
 syOrderDataItemId '订单数据子表 id',
 acSetNo '账套',
-orderNumber '订单号',
+orderNumber '订单号'/'销售订单号'
 orderDate '订单日期',
 businessTypeValue '业务类型',
 businessTypeText '业务类型文本',

src/views/shipment-details/shipmentList.vue

@@ -11,8 +11,19 @@
                 <a-input placeholder="请输入单据号" v-model="queryParam.documentNo"></a-input>
               </a-form-item>
             </a-col>
-
-            <a-col :md="6" :sm="8">
+            <a-col :md="6" :sm="12">
+              <a-form-item label="起始时间">
+                <a-range-picker
+                  style="width: 100%"
+                  v-model="queryParam.timeRange"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onDateChange"
+                  @ok="onDateOk"
+                />
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :md="6" :sm="8">
               <a-form-item label="开始时间">
                 <a-date-picker
                   placeholder="请选择开始时间"
@@ -22,9 +33,9 @@
                   @change="startTimeChange"
                 />
               </a-form-item>
-            </a-col>
+            </a-col> -->
 
-            <a-col :md="6" :sm="8">
+            <!-- <a-col :md="6" :sm="8">
               <a-form-item label="结束时间" style="width:100%;">
                 <a-date-picker
                   placeholder="请选择结束时间"
@@ -34,21 +45,20 @@
                   @change="endTimeChange"
                 />
               </a-form-item>
+            </a-col> -->
+            <a-col :md="6" :sm="8">
+              <a-form-item label="预完工日期">
+                <a-date-picker
+                  placeholder="请选择发货日期"
+                  format="YYYY-MM-DD"
+                  style="width: 100%"
+                  v-model="queryParam.deliveryDate"
+                  @change="deliveryDateChange"
+                />
+              </a-form-item>
             </a-col>
 
             <template v-if="toggleSearchStatus">
-              <a-col :md="6" :sm="8">
-                <a-form-item label="预完工日期">
-                  <a-date-picker
-                    placeholder="请选择发货日期"
-                    format="YYYY-MM-DD"
-                    style="width: 100%"
-                    v-model="queryParam.deliveryDate"
-                    @change="deliveryDateChange"
-                  />
-                </a-form-item>
-              </a-col>
-
               <a-col :md="6" :sm="8">
                 <a-form-item label="业务员">
                   <a-input placeholder="请输入业务员" v-model="queryParam.salesman"></a-input>
@@ -197,7 +207,7 @@ export default {
         },
         {
           title: '销售订单号',
-          dataIndex: '',
+          dataIndex: 'orderNumber',
           fixed: 'left',
           width: 120,
           className: 'replacecolor'
@@ -393,6 +403,7 @@ export default {
         documentNo: '', // 单据号
         startTime: '',
         endTime: '',
+        // timeRange: [], // 查询条件  时间范围
         deliveryDate: '',
         salesman: '',
         itemNumber: '', // 款号
@@ -438,6 +449,7 @@ export default {
     // 重置
     searchReset() {
       this.queryParam.documentNo = ''
+      this.queryParam.timeRange = []
       this.queryParam.startTime = ''
       this.queryParam.endTime = ''
       this.queryParam.deliveryDate = ''
@@ -514,13 +526,13 @@ export default {
         })
       })
     },
-    startTimeChange(value, dateString) {
-      console.log('开始时间', dateString)
-      this.queryParam.startTime = dateString
+    onDateChange(value, dateString) {
+      console.log('查询开始时间', dateString[0], '查询结束时间', dateString[1])
+      this.queryParam.startTime = dateString[0]
+      this.queryParam.endTime = dateString[1]
     },
-    endTimeChange(value, dateString) {
-      console.log('结束时间', dateString)
-      this.queryParam.endTime = dateString
+    onDateOk(value) {
+      console.log('value', value)
     },
     deliveryDateChange(value, dateString) {
       console.log('预完工日期', dateString)