修改部分页面展示问题

2 years ago · 6d26c48733
5 changed files with 118 additions and 137 deletions
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@ -245,7 +245,7 @@ export default {
          sortable: true,
        },
        {
-          prop: 'kind',
+          prop: 'kindName',
          label: '配送种类',
          type: 3,
          values: '',
@ -285,7 +285,7 @@ export default {
          sortable: true,
        },
        {
-          prop: 'state',
+          prop: 'deliveryStatusName',
          label: '配送状态',
          type: 3,
          values: '',
@ -645,6 +645,12 @@ export default {
      if (!index){
        delete this.query[row.prop]
      }
+      if(row.prop ==='deliveryStatusName'){
+        this.query['deliveryStatus'] = index;
+      }else if(row.prop ==='kindName'){
+        this.query['kind'] = index;
+
+      }
      this.onLoad(this.page);
    },
    timesc(index, row) {
@ -657,34 +663,40 @@ export default {
      }
      this.onLoad(this.page);
    },
+    checkcColumnList(prop,columnList){
+      for(var a = 0; a < columnList.length; a++){
+        if(columnList[a].prop===prop){
+          return columnList[a];
+        }
+      }
+    },
    queryDictionary() {
-      getDictionaryBiz('delivery_type').then(res => {
-        this.deliverytypeData = res.data.data;
-      });
      getDictionaryBiz('addvalue_serve_type').then(res => {
        this.addvalueServeTypeData = res.data.data;
      });
      getDictionaryBiz('delivery_way').then(res => {
        this.deliveryWayData = res.data.data;
      });
-      getDictionaryBiz('distribution_deliverylist_kind').then(res => {
-        this.deliverykindData = res.data.data;
-        this.columnList[2].checkarr =res.data.data.map(item=>{
+
+    
+      //配送状态
+      getDictionaryBiz('distribution_delivery_status').then(res => {
+        this.checkcColumnList("deliveryStatusName", this.columnList).checkarr=res.data.data.map(item=>{
          item.value=item.dictKey
          item.label=item.dictValue
          return item
        });
-        this.onLoad(this.page);
      });
-      getDictionaryBiz('distribution_deliverylist_state').then(res => {
-        this.deliveryliststateData = res.data.data;
-        this.columnList[6].checkarr =res.data.data.map(item=>{
+      //配送种类
+      getDictionaryBiz('distribution_deliverylist_kind').then(res => {
+        this.checkcColumnList("kindName", this.columnList).checkarr=res.data.data.map(item=>{
          item.value=item.dictKey
          item.label=item.dictValue
          return item
        });
-        this.onLoad(this.page);
      });
+      this.onLoad(this.page);
+
    },
    //类型切换
    // deliverytype(type){
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@ -253,13 +253,7 @@ export default {
          values: '',
          width: '180',
          checkarr: [
-            {
-              label: '自主配送',
-              value: '1',
-            },{
-              label: '外协配送',
-              value: '2',
-            },
+           
          ],
          fixed: false,
          sortable: true,
@ -312,16 +306,7 @@ export default {
          values: '',
          width: '150',
          checkarr: [
-            {
-              label: '待配送',
-              value: '1',
-            },{
-              label: '配送中',
-              value: '2',
-            },{
-              label: '已完成',
-              value: '2',
-            },
+           
          ],
          fixed: false,
          sortable: true,
@ -676,6 +661,12 @@ export default {
      if (!index){
        delete this.query[row.prop]
      }
+      if(row.prop ==='deliveryStatusName'){
+        this.query['deliveryStatus'] = index;
+      }else if(row.prop ==='kindName'){
+        this.query['kind'] = index;
+
+      }
      this.onLoad(this.page);
    },
    timesc(index, row) {
@ -688,6 +679,13 @@ export default {
      }
      this.onLoad(this.page);
    },
+    checkcColumnList(prop,columnList){
+      for(var a = 0; a < columnList.length; a++){
+        if(columnList[a].prop===prop){
+          return columnList[a];
+        }
+      }
+    },
    queryDictionary() {
      getDictionaryBiz('delivery_type').then(res => {
        this.deliverytypeData = res.data.data;
@ -698,23 +696,32 @@ export default {
      getDictionaryBiz('delivery_way').then(res => {
        this.deliveryWayData = res.data.data;
      });
-      getDictionaryBiz('distribution_deliverylist_kind').then(res => {
-        this.deliverykindData = res.data.data;
-        this.columnList[2].checkarr =res.data.data.map(item=>{
+   
+      getDictionaryBiz('distribution_deliverylist_state').then(res => {
+        this.deliveryliststateData = res.data.data;
+        this.columnList[6].checkarr =res.data.data.map(item=>{
          item.value=item.dictKey
          item.label=item.dictValue
          return item
        });
        this.onLoad(this.page);
      });
-      getDictionaryBiz('distribution_deliverylist_state').then(res => {
-        this.deliveryliststateData = res.data.data;
-        this.columnList[6].checkarr =res.data.data.map(item=>{
+
+      //配送状态
+      getDictionaryBiz('distribution_delivery_status').then(res => {
+        this.checkcColumnList("deliveryStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+      //配送种类
+      getDictionaryBiz('distribution_deliverylist_kind').then(res => {
+        this.checkcColumnList("kindName", this.columnList).checkarr=res.data.data.map(item=>{
          item.value=item.dictKey
          item.label=item.dictValue
          return item
        });
-        this.onLoad(this.page);
      });
    },
    //类型切换
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@ -9,7 +9,7 @@
            <!--      </avue-form>-->
            <el-row :gutter="24" class="rows">
                <el-col :xl="7" :lg="7" :md="8" :sm="24">
-                    <span>配送类型：{{deliverydata.kind}} </span>
+                    <span>配送类型：{{deliverydata.kindName}} </span>
                </el-col>
                <el-col :xl="7" :lg="7" :md="8" :sm="24">
                    <span>配送车辆：{{deliverydata.vehicleName}} </span>
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@ -234,16 +234,7 @@ export default {
          fixed: false,
          sortable: true,
        },
-        {
-          prop: 'kind',
-          label: '配送种类',
-          type: 3,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+   
        {
          prop: 'kindName',
          label: '配送种类',
@ -251,14 +242,7 @@ export default {
          values: '',
          width: '180',
          checkarr: [
-            {
-              label: '自主配送',
-              value: '1',
-            },
-            {
-              label: '外协配送',
-              value: '2'
-            },
+           
          ],
          fixed: false,
          sortable: true,
@ -293,34 +277,7 @@ export default {
          fixed: false,
          sortable: true,
        },
-        {
-          prop: 'deliveryStatus',
-          label: '配送状态',
-          type: 3,
-          values: '',
-          width: '150',
-          checkarr: [
-                {
-                  label: '待配送',
-                  value: '1',
-                },
-                {
-                  label: '装车',
-                  value: '2'
-                },
-                {
-                  label: '配送中',
-                  value: '3'
-                },
-                {
-                  label: '已完成',
-                  value: '4'
-                },
-          ],
-          fixed: false,
-          sortable: true,
-          hide:true,
-        },
+        
        {
          prop: 'deliveryStatusName',
          label: '配送状态',
@ -328,22 +285,7 @@ export default {
          values: '',
          width: '150',
          checkarr: [
-            {
-              label: '待配送',
-              value: '1',
-            },
-            {
-              label: '装车',
-              value: '2'
-            },
-            {
-              label: '配送中',
-              value: '3'
-            },
-            {
-              label: '已完成',
-              value: '4'
-            },
+        
          ],
          fixed: false,
          sortable: true,
@ -699,6 +641,14 @@ export default {
      if (!index){
        delete this.query[row.prop]
      }
+      if(row.prop ==='deliveryStatusName'){
+        this.query['deliveryStatus'] = index;
+      }else if(row.prop ==='kindName'){
+        this.query['kind'] = index;
+
+      }
+
+
      this.onLoad(this.page);
    },
    timesc(index, row) {
@ -711,40 +661,52 @@ export default {
      }
      this.onLoad(this.page);
    },
+    checkcColumnList(prop,columnList){
+      for(var a = 0; a < columnList.length; a++){
+        if(columnList[a].prop===prop){
+          return columnList[a];
+        }
+      }
+    },
    queryDictionary() {
-      getDictionaryBiz('delivery_type').then(res => {
-        this.deliverytypeData = res.data.data;
-      });
+      // getDictionaryBiz('delivery_type').then(res => {
+      //   this.deliverytypeData = res.data.data;
+      // });
      getDictionaryBiz('addvalue_serve_type').then(res => {
        this.addvalueServeTypeData = res.data.data;
      });
      getDictionaryBiz('delivery_way').then(res => {
        this.deliveryWayData = res.data.data;
      });
-      getDictionaryBiz('distribution_deliverylist_kind').then(res => {
-        this.deliverykindData = res.data.data;
-        this.columnList[2].checkarr =res.data.data.map(item=>{
+
+    
+      //配送状态
+      getDictionaryBiz('distribution_delivery_status').then(res => {
+        this.checkcColumnList("deliveryStatusName", this.columnList).checkarr=res.data.data.map(item=>{
          item.value=item.dictKey
          item.label=item.dictValue
          return item
        });
-        this.onLoad(this.page);
      });
-      getDictionaryBiz('distribution_deliverylist_state').then(res => {
-        this.deliveryliststateData = res.data.data;
-        this.columnList[6].checkarr =res.data.data.map(item=>{
+      //配送种类
+      getDictionaryBiz('distribution_deliverylist_kind').then(res => {
+        this.checkcColumnList("kindName", this.columnList).checkarr=res.data.data.map(item=>{
          item.value=item.dictKey
          item.label=item.dictValue
          return item
        });
-        this.onLoad(this.page);
      });
+
+
+
+
+      this.onLoad(this.page);
    },
-    //类型切换
-    // deliverytype(type){
-    //   this.query.type=type;
-    //   this.onLoad(this.page)
-    // },
+ 
+
+
+
+
    init () {
      this.height = this.setPx(document.body.clientHeight - 340);
    },
@ -877,27 +839,27 @@ export default {
      getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
        const data = res.data.data;
        // eslint-disable-next-line no-empty
-        for (let i = 0; i < data.records.length; i++) {
+        // for (let i = 0; i < data.records.length; i++) {
          // eslint-disable-next-line no-empty
-          for (let j = 0; j < this.deliverytypeData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].type == this.deliverytypeData[j].dictKey) {
-              data.records[i].type = this.deliverytypeData[j].dictValue;
-            }
-          }
-          for (let j = 0; j < this.deliverykindData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].kind == this.deliverykindData[j].dictKey) {
-              data.records[i].kind = this.deliverykindData[j].dictValue;
-            }
-          }
-          for (let j = 0; j < this.deliveryliststateData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].state == this.deliveryliststateData[j].dictKey) {
-              data.records[i].state = this.deliveryliststateData[j].dictValue;
-            }
-          }
-        }
+          // for (let j = 0; j < this.deliverytypeData.length; j++) {
+          //   // eslint-disable-next-line no-empty
+          //   if (data.records[i].type == this.deliverytypeData[j].dictKey) {
+          //     data.records[i].type = this.deliverytypeData[j].dictValue;
+          //   }
+          // }
+          // for (let j = 0; j < this.deliverykindData.length; j++) {
+          //   // eslint-disable-next-line no-empty
+          //   if (data.records[i].kind == this.deliverykindData[j].dictKey) {
+          //     data.records[i].kind = this.deliverykindData[j].dictValue;
+          //   }
+          // }
+          // for (let j = 0; j < this.deliveryliststateData.length; j++) {
+          //   // eslint-disable-next-line no-empty
+          //   if (data.records[i].state == this.deliveryliststateData[j].dictKey) {
+          //     data.records[i].state = this.deliveryliststateData[j].dictValue;
+          //   }
+          // }
+        // }
        this.page.total = data.total;
        this.data = data.records;
        this.loading = false;
--- a/src/views/distribution/reservation/reservationDetails.vue
+++ b/src/views/distribution/reservation/reservationDetails.vue
@ -3,7 +3,7 @@
        <div class="avue-crud">
            <el-row :gutter="24" class="rows">
                <el-col :xl="7" :lg="7" :md="8" :sm="24">
-                    <span style="padding-left: 10%">当前预约单状态>>>>>>>>> {{reservationData.reservationStatus}}</span>
+                    <span style="padding-left: 10%">预约单状态>>>>>>>>> {{reservationData.reservationStatusName}}</span>
                </el-col>
            </el-row>
            <el-divider>基本信息</el-divider>