fix: 日期属性为type="datetimerange"，value默认值数组

src/views/basic_data/stock/Issue_list.vue

@@ -199,7 +199,7 @@ export default {
         correspondId: [],
         endTime: '',
         materialName: '',
-        date: '',
+        date: [],
         materialNumber: '',
         materialOldNumber: '',
         specification: '',

src/views/basic_data/stock/material_list.vue

@@ -187,7 +187,7 @@ export default {
         billNo: '',
         correspondId: [],
         endTime: '',
-        date: '',
+        date: [],
         materialName: '',
         materialNumber: '',
         materialOldNumber: '',

src/views/basic_data/stock/warehousing_list.vue

@@ -191,7 +191,7 @@ export default {
         billNo: '',
         correspondId: [],
         endTime: '',
-        date: '',
+        date: [],
         materialName: '',
         materialNumber: '',
         materialOldNumber: '',

src/views/notice/index.vue

@@ -349,7 +349,7 @@ export default {
         type: '',
         code: '',
         title: '',
-        date: ''
+        date: []
       },
       mainForm: {
         type: '',

src/views/setting/components/log-examine.vue

@@ -116,8 +116,8 @@ export default {
         // 筛选表单数据
         account: '',
         name: '',
-        examineDate: '',
-        submitDate: ''
+        examineDate: [],
+        submitDate: []
       },
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量

src/views/setting/components/log-login.vue

@@ -108,7 +108,7 @@ export default {
         // 筛选表单数据
         account: '',
         name: '',
-        date: '',
+        date: [],
         region: ''
       },
       currentPage: 1, // 当前页码

src/views/setting/components/log-operation.vue

@@ -105,7 +105,7 @@ export default {
         // 筛选表单数据
         account: '',
         name: '',
-        date: '',
+        date: [],
         obj: ''
       },
       currentPage: 1, // 当前页码

src/views/supply/adjust/adjust_list.vue

@@ -249,7 +249,7 @@ export default {
         deliverNum: '',
         type: '',
         dealer: '',
-        date: ''
+        date: []
       },
       typeList: [
         { label: '商用工程订单', value: 'TRADE' },

src/views/supply/allot/allot_list.vue

@@ -231,7 +231,7 @@ export default {
         // 筛选表单数据
         orderNum: '',
         wlName: '',
-        date: ''
+        date: []
       },
       isCollapse: true,
       queryItem: {}

src/views/supply/apply/apply_list.vue

@@ -561,7 +561,7 @@ export default {
         warehouse: '',
         jxsNum: '',
         jxsName: '',
-        date: '',
+        date: [],
         chName: '',
         model: '',
         salesMan: '',

src/views/supply/apply/components/engin_form.vue

@@ -578,7 +578,7 @@ export default {
         loginNum: '',
         enginName: '',
         model: '',
-        date: '',
+        date: [],
         warehouse: '',
         type: '',
         refProjectName: ''

src/views/supply/apply/engin_list.vue

@@ -591,7 +591,7 @@ export default {
         warehouse: '',
         jxsNum: '',
         jxsName: '',
-        date: '',
+        date: [],
         chName: '',
         model: '',
         salesMan: '',

src/views/supply/apply/new_apply.vue

@@ -503,7 +503,7 @@ export default {
         warehouse: '',
         jxsNum: '',
         jxsName: '',
-        date: '',
+        date: [],
         chName: '',
         model: '',
         salesMan: '',

src/views/supply/apply/new_engin.vue

@@ -535,7 +535,7 @@ export default {
         warehouse: '',
         jxsNum: '',
         jxsName: '',
-        date: '',
+        date: [],
         chName: '',
         model: '',
         salesMan: '',

src/views/supply/deliver/commerce_list.vue

@@ -424,7 +424,7 @@ export default {
         jxsName: '',
         chName: '',
         model: '',
-        date: '',
+        date: [],
         jxsNum: '',
         status: '',
         salesMan: '',

src/views/supply/deliver/deliver_list.vue

@@ -358,7 +358,7 @@ export default {
         jxsName: '',
         chName: '',
         model: '',
-        date: '',
+        date: [],
         type: '',
         salesMan: ''
       },

src/views/supply/deliver/home_list.vue

@@ -403,7 +403,7 @@ export default {
         jxsName: '',
         chName: '',
         model: '',
-        date: '',
+        date: [],
         jxsNum: '',
         status: '',
         salesMan: '',

src/views/supply/deliver/sum_list.vue

@@ -829,8 +829,8 @@ export default {
         goodsCode: '',
         goodsOldCode: '',
         model: '',
-        createDate: '',
-        deliverDate: '',
+        createDate: [],
+        deliverDate: [],
         correspondId: [],
         jxsNum: '',
         jxsName: '',
@@ -839,7 +839,7 @@ export default {
         salesMan: '',
         k3ServiceId: '',
         mainOrderId: '',
-        approvaTime: '',
+        approvaTime: [],
         types: '',
         printStatus: '',
         discriminate: '',

src/views/supply/direct/direct_list.vue

@@ -355,7 +355,7 @@ export default {
         warehouse: '',
         jxsNum: '',
         jxsName: '',
-        date: '',
+        date: [],
         chName: '',
         model: '',
         status: ''

src/views/supply/displace/displace_list copy.vue

@@ -295,7 +295,7 @@ export default {
         originOrderNo: '',
         customerKeyword: '',
         productName: '',
-        date: '',
+        date: [],
         createName: '',
         confirmName: '',
         orderType: ''

src/views/supply/engin/commerce_list.vue

@@ -555,7 +555,7 @@ export default {
         enginNum: '',
         loginNum: '',
         enginName: '',
-        date: '',
+        date: [],
         saleType: '',
         createMan: '',
         examineMan: '',

src/views/supply/engin/engin_list.vue

@@ -511,7 +511,7 @@ export default {
         enginNum: '',
         loginNum: '',
         enginName: '',
-        date: '',
+        date: [],
         dealer: '',
         company: '',
         createMan: '',
@@ -519,7 +519,7 @@ export default {
         status: '',
         salesMan: '',
         model: '',
-        orderDate: '',
+        orderDate: [],
         isClose: '',
         isDirectTransfer: null,
         examineStatus: ''

src/views/supply/engin/home_list.vue

@@ -646,7 +646,7 @@ export default {
         enginNum: '',
         loginNum: '',
         refTradeCategory: '',
-        date: '',
+        date: [],
         saleType: '',
         createMan: '',
         examineMan: '',

src/views/supply/implement/commercial_implement_list.vue

@@ -281,7 +281,7 @@ export default {
         // 筛选表单数据
         confirmName: '',
         customerId: '',
-        orderTime: '',
+        orderTime: [],
         isClose: '',
         refEnginRecordNo: '',
         refProjectName: '',

src/views/supply/implement/implement_list.vue

@@ -516,7 +516,7 @@ export default {
         dealer: '',
         goodsName: '',
         model: '',
-        date: '',
+        date: [],
         serviceName: '',
         itemServiceName: '',
         newServiceName: '',
@@ -527,7 +527,7 @@ export default {
         policyRemark: '',
         isOver: '',
         walletIds1: [],
-        orderDate: ''
+        orderDate: []
       },
       categoryList: [],
       statusList: [

src/views/supply/implement/implement_total_list.vue

@@ -537,7 +537,7 @@ export default {
         dealer: '',
         goodsName: '',
         model: '',
-        date: '',
+        date: [],
         serviceName: '',
         itemServiceName: '',
         newServiceName: '',
@@ -547,7 +547,7 @@ export default {
         policyCode: '',
         policyRemark: '',
         isOver: '',
-        orderDate: '',
+        orderDate: [],
         walletIds1: [],
         isDisplaceOrder:''
       },

src/views/supply/implement/nsales_list.vue

@@ -554,15 +554,15 @@ export default {
         chNum: '',
         model: '',
         warehouse: '',
-        date: '',
+        date: [],
         status: '',
-        approval: '',
-        printTime: '',
+        approval:[],
+        printTime: [],
         mainOrderId: '',
         printDesc: null,
         syncStatus: '',
         categoryId: '',
-        invoiceDate: '',
+        invoiceDate: [],
         id: ''
       },
       statusList: [

src/views/supply/pickup/pickup_list.vue

@@ -331,11 +331,11 @@ export default {
         jxsName: '',
         jxsNum: '',
         correspondId: '',
-        date: '',
+        date: [],
         status: '',
         takerPhone: '',
         takerId: '',
-        printTime: '',
+        printTime: [],
         salesOrderId: '',
         createBy: ''
       },
@@ -364,8 +364,8 @@ export default {
         takerPhone: this.screenForm.takerPhone,
         createBy: this.screenForm.createBy,
         takerId: this.screenForm.takerId,
-        printStartTime: this.screenForm.printTime[0],
-        printEndTime: this.screenForm.printTime[1],
+        printStartTime: this.screenForm.printTime?this.screenForm.printTime[0]:'',
+        printEndTime: this.screenForm.printTime?this.screenForm.printTime[1]:'',
         salesOrderId: this.screenForm.salesOrderId
       }
     }

src/views/supply/pickup/statistics.vue

@@ -170,7 +170,7 @@ export default {
   data() {
     return {
       screenForm: {
-        date: ''
+        date: []
       },
       detailData: {}
     }

src/views/supply/pickup/sum_list.vue

@@ -26,21 +26,20 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="仓库" prop="correspondId">
-                    <el-select
-                      v-model="screenForm.correspondId"
-                      placeholder="请选择发货仓库"
-                      size="mini"
-                      style="margin-right: 10px"
-                    >
-                      <el-option
-                        v-for="(item, index) in warehouseList"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.id"
-                      />
-                    </el-select>
-                  </el-form-item>
+                <el-form-item label="仓库" prop="correspondId">
+                  <el-select
+                    v-model="screenForm.correspondId"
+                    placeholder="请选择发货仓库"
+                    size="mini"
+                    style="margin-right: 10px"
+                  >
+                    <el-option
+                      v-for="(item, index) in warehouseList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.id"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
@@ -78,7 +77,7 @@
                   <el-date-picker
                     v-model="screenForm.date"
                     type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                    :default-time="['00:00:00', '23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -92,7 +91,7 @@
                   <el-date-picker
                     v-model="screenForm.printTime"
                     type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                    :default-time="['00:00:00', '23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -170,27 +169,27 @@
             </template>
           </el-table-column>
           <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <CopyButton
-                  :copy-text="
-                    scope.row.orderType === 'TRADE' ||
-                    scope.row.orderType === 'HOME' ||
-                    scope.row.orderType === 'REQUISITION_TRADE' ||
-                    scope.row.orderType === 'REQUISITION_HOME'
-                      ? scope.row.enginOrderNo
-                      : scope.row.mainOrderId
-                  "
-                />
-                <span>{{
+            <template slot-scope="scope">
+              <CopyButton
+                :copy-text="
                   scope.row.orderType === 'TRADE' ||
                   scope.row.orderType === 'HOME' ||
                   scope.row.orderType === 'REQUISITION_TRADE' ||
                   scope.row.orderType === 'REQUISITION_HOME'
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
-                }}</span>
-              </template>
-            </el-table-column>
+                "
+              />
+              <span>{{
+                scope.row.orderType === 'TRADE' ||
+                scope.row.orderType === 'HOME' ||
+                scope.row.orderType === 'REQUISITION_TRADE' ||
+                scope.row.orderType === 'REQUISITION_HOME'
+                  ? scope.row.enginOrderNo
+                  : scope.row.mainOrderId
+              }}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copy-text="scope.row.materialCode" />
@@ -297,18 +296,18 @@ export default {
         jxsName: '',
         jxsNum: '',
         correspondId: '',
-        date: '',
+        date: [],
         status: '',
         takerPhone: '',
         takerId: '',
-        printTime: '',
+        printTime: [],
         salesOrderId: '',
         logisticsId: ''
       },
       pickupManList: '',
       isCollapse: true,
       logisticsList: [],
-      warehouseList:[]
+      warehouseList: []
     }
   },
 
@@ -325,8 +324,8 @@ export default {
         takerPhone: this.screenForm.takerPhone,
         takerId: this.screenForm.takerId,
         logisticsId: this.screenForm.logisticsId,
-        printStartTime: this.screenForm.printTime[0],
-        printEndTime: this.screenForm.printTime[1],
+        printStartTime: this.screenForm.printTime ? this.screenForm.printTime[0] : '',
+        printEndTime: this.screenForm.printTime ? this.screenForm.printTime[1] : '',
         salesOrderId: this.screenForm.salesOrderId
       }
     }
@@ -357,8 +356,8 @@ export default {
         status: this.screenForm.status,
         takerPhone: this.screenForm.takerPhone,
         takerId: this.screenForm.takerId,
-        printStartTime: this.screenForm.printTime[0],
-        printEndTime: this.screenForm.printTime[1],
+        printStartTime: this.screenForm.printTime ? this.screenForm.printTime[0] : '',
+        printEndTime: this.screenForm.printTime ? this.screenForm.printTime[1] : '',
         salesOrderId: this.screenForm.salesOrderId
       }
       getPickupList(params).then(res => {
@@ -367,8 +366,8 @@ export default {
         this.listLoading = false
       })
     },
-// 获取仓库列表
-getWarehouseList() {
+    // 获取仓库列表
+    getWarehouseList() {
       getWarehouseList({
         pageNum: 1,
         pageSize: -1
@@ -399,7 +398,7 @@ getWarehouseList() {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$refs.screenForm.resetFields()
+      this.$refs.screenForm.resetFields()
       this.currentPage = 1
       this.getList()
     },

src/views/supply/policy/components/policy_list.vue

@@ -311,7 +311,7 @@ export default {
         policyCode: '',
         policyRemark: '',
         jxsName: '',
-        date: '',
+        date: [],
         zbMan: '',
         shMan: '',
         status: ''

src/views/supply/policy/policy_list.vue

@@ -559,7 +559,7 @@ export default {
         policyCode: '',
         policyRemark: '',
         jxsName: '',
-        date: '',
+        date: [],
         zbMan: '',
         shMan: '',
         status: '',

src/views/supply/purchase/enter_list.vue

@@ -242,7 +242,7 @@ export default {
         orderNum: '',
         chName: '',
         chNum: '',
-        date: '',
+        date: [],
         company: ''
       },
       isCollapse: true,

src/views/supply/purchase/purchase_list.vue

@@ -264,7 +264,7 @@ export default {
         // 筛选表单数据
         business: '',
         supplier: '',
-        date: ''
+        date: []
       },
       isCollapse: true,
       queryItem: {}

src/views/supply/reserve/reserve_list.vue

@@ -368,7 +368,7 @@ export default {
         orderNum: '',
         jxsName: '',
         jxsNum: '',
-        date: '',
+        date: [],
         createMan: '',
         updateMan: '',
         saleNum: '',

src/views/supply/retail/retail_list.vue

@@ -592,7 +592,7 @@ export default {
         goodsName: '',
         model: '',
         jxsName: '',
-        date: '',
+        date: [],
         isDirectTransfer: '',
         zbMan: '',
         shMan: '',

src/views/supply/return/online_list.vue

@@ -221,7 +221,7 @@ export default {
         chNum: '',
         chName: '',
         model: '',
-        date: ''
+        date: []
       },
 
       queryItem: {}

src/views/supply/return/return_list.vue

@@ -215,7 +215,7 @@ export default {
         jxsName: '',
         goodsName: '',
         model: '',
-        date: ''
+        date: []
       },
 
       queryItem: {},

src/views/supply/sales/sales_list.vue

@@ -545,11 +545,11 @@ export default {
         chNum: '',
         model: '',
         warehouse: [],
-        date: '',
+        date: [],
         status: '',
         mainOrderId: '',
-        approval: '',
-        printTime: '',
+        approval: [],
+        printTime: [],
         printDesc: null,
         syncStatus: '',
         id: '',