修改bug

src/views/basicData/commodityType/configuration/specification.json

@@ -10,12 +10,12 @@
   "menuWidth": 130,
   "column": [
     {
-      "label": "属性编号",
-      "prop": "attributeNo"
-    },
-    {
       "label": "属性名称",
       "prop": "attributeName"
+    },
+    {
+      "label": "属性编号",
+      "prop": "attributeNo"
     }
   ]
 }

src/views/statisticAnalysis/dataDetail/index.vue

@@ -182,7 +182,7 @@ export default {
       if (item.search) i++
     })
     this.getWorkDicts("packageRemarks").then(res => {
-      this.findObject(this.defaultOption.column, "packageRemarks").dicData =
+      this.findObject(this.option.column, "packageRemarks").dicData =
         res.data.data;
     });
     if (i % 3 !== 0) {

src/views/statisticAnalysis/packFeeRecon/index.vue

@@ -1,23 +1,10 @@
 <template>
   <div>
     <basic-container class="page-crad">
-      <avue-crud
-        ref="crud"
-        :option="option"
-        :data="dataList"
-        :page.sync="page"
-        :search.sync="search"
-        :cell-style="cellStyle"
-        @search-change="searchChange"
-        @current-change="currentChange"
-        @size-change="sizeChange"
-        @refresh-change="refreshChange"
-        @on-load="onLoad"
-        :table-loading="loading"
-        @saveColumn="saveColumn"
-        @resetColumn="resetColumn"
-        @search-criteria-switch="searchCriteriaSwitch"
-      >
+      <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
+        :cell-style="cellStyle" @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
+        @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
+        @resetColumn="resetColumn" @search-criteria-switch="searchCriteriaSwitch">
         <template slot="menuLeft">
           <!-- <el-button
             type="info"
@@ -30,17 +17,9 @@
           <el-button type="info" size="small" @click="outExport" icon="el-icon-download">导出</el-button>
         </template>
         <template slot="brandSearch">
-          <el-select
-            v-model="search.brand"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="(item, index) in brandOption"
-              :key="index"
-              :label="item.dictValue"
-              :value="item.dictValue"
-            />
+          <el-select v-model="search.brand" filterable clearable>
+            <el-option v-for="(item, index) in brandOption" :key="index" :label="item.dictValue"
+              :value="item.dictValue" />
           </el-select>
         </template>
       </avue-crud>
@@ -62,8 +41,8 @@ export default {
   },
   data() {
     return {
-      exportLoading:false,
-      switchDialog:false,
+      exportLoading: false,
+      switchDialog: false,
       statementData: {},
       form: {},
       search: {},
@@ -183,7 +162,7 @@ export default {
       this.page.currentPage = 1;
       this.page.pageSize = val;
     },
-    outExport(){
+    outExport() {
       let params = { ...this.search }
       if (!params.brand) this.$set(params, 'brand', '');
       if (params.createTime && params.createTime.length > 0) {
@@ -223,11 +202,11 @@ export default {
       if (this.search.careteTime && this.search.careteTime.length > 0) {
         params = {
           ...params,
-          beginCreateTime: this.search.careteTime[0],
-          endCreateTime: this.search.careteTime[1]
+          beginCreateTime: this.search.careteTime[0] + ' 00:00:00',
+          endCreateTime: this.search.careteTime[1] + ' 23:59:59',
         };
       }
-      let queryParams = this.deepClone(Object.assign({},params, this.search));
+      let queryParams = this.deepClone(Object.assign({}, params, this.search));
       delete queryParams.careteTime;
       getList(
         page.currentPage,
@@ -268,10 +247,10 @@ export default {
       }
     },
     statement() {
-      this.statementData = {...this.search};
+      this.statementData = { ...this.search };
       if (this.statementData.createTime && this.statementData.createTime.length > 0) {
-        this.statementData.createStartTime = this.statementData.createTime[0]+ " " + "00:00:00"
-        this.statementData.createEndTime = this.statementData.createTime[1]+ " " + "23:59:59"
+        this.statementData.createStartTime = this.statementData.createTime[0] + " " + "00:00:00"
+        this.statementData.createEndTime = this.statementData.createTime[1] + " " + "23:59:59"
         delete this.statementData.createTime
       }
       this.switchDialog = !this.switchDialog;
@@ -314,9 +293,11 @@ export default {
 .page-crad ::v-deep .basic-container__card {
   height: 94.2vh;
 }
+
 ::v-deep .el-table__expanded-cell[class*="cell"] {
   padding: 0px;
 }
+
 .itemTable ::v-deep .el-table {
   width: 100%;
 }

src/views/statisticAnalysis/purchaseReconciliation/index.vue

@@ -208,8 +208,8 @@ export default {
       if (this.search.careteTime && this.search.careteTime.length > 0) {
         params = {
           ...params,
-          beginCreateTime: this.search.careteTime[0],
-          endCreateTime: this.search.careteTime[1]
+          beginCreateTime: this.search.careteTime[0] + ' 00:00:00',
+          endCreateTime: this.search.careteTime[1] + ' 23:59:59'
         };
       }
       let queryParams = this.deepClone(Object.assign({}, params, this.search));

src/views/statisticAnalysis/salesmanCommission/index.vue

@@ -220,11 +220,11 @@ export default {
       if (this.search.careteTime && this.search.careteTime.length > 0) {
         params = {
           ...params,
-          beginCreateTime: this.search.careteTime[0],
-          endCreateTime: this.search.careteTime[1]
+          beginCreateTime: this.search.careteTime[0] + ' 00:00:00',
+          endCreateTime: this.search.careteTime[1] + ' 23:59:59'
         };
       }
-      let queryParams = this.deepClone(Object.assign({},params, this.search));
+      let queryParams = this.deepClone(Object.assign({}, params, this.search));
       delete queryParams.careteTime;
       this.loading = true;
       getList(