瀏覽代碼

修改bug

chenrui 2 年之前
父節點
當前提交
1d3001c5c8
共有 1 個文件被更改,包括 9 次插入7 次删除
  1. 9 7
      src/views/reportData/receivedSendStorageReport/index.vue

+ 9 - 7
src/views/reportData/receivedSendStorageReport/index.vue

@@ -33,12 +33,12 @@
           </a-col>
           <a-col :md="4" :sm="24">
             <a-form-model-item label="产品编码">
-              <a-input id="receivedSendStorageReport-queryWord" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              <a-input id="receivedSendStorageReport-queryWord" v-model.trim="queryParam.product.code" allowClear placeholder="请输入产品编码"/>
             </a-form-model-item>
           </a-col>
           <a-col :md="5" :sm="24">
             <a-form-model-item label="产品名称">
-              <a-input id="receivedSendStorageReport-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              <a-input id="receivedSendStorageReport-name" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
             </a-form-model-item>
           </a-col>
           <a-col :md="5" :sm="24">
@@ -131,8 +131,10 @@ export default {
       queryParam: {
         beginDate: undefined,
         endDate: undefined,
-        productCode: '', // 产品编码
-        productName: '', // 产品名称
+        product: {
+          name: '', // 产品名称
+          code: ''// 产品编码
+        },
         productBrandSn: undefined,
         productTypeSn1: undefined,
         productTypeSn2: undefined,
@@ -238,7 +240,7 @@ export default {
     },
     getEndDate (date, dateString) {
       this.form.time[1] = dateString
-      this.queryParam.endDate = date ? this.moment(dateString).endOf('month').format('YYYY-MM-DD') + ' 59:59:59' : ''
+      this.queryParam.endDate = date ? this.moment(dateString).endOf('month').format('YYYY-MM-DD') + ' 23:59:59' : ''
     },
 
     //  产品分类  change
@@ -306,8 +308,8 @@ export default {
       this.time = []
       this.queryParam.beginDate = undefined
       this.queryParam.endDate = undefined
-      this.queryParam.productCode = undefined
-      this.queryParam.productName = undefined
+      this.queryParam.product.code = ''
+      this.queryParam.product.name = ''
       this.queryParam.productBrandSn = undefined
       this.queryParam.productTypeSn1 = undefined
       this.queryParam.productTypeSn2 = undefined