Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/components/Dict/DictSelection.vue

@@ -39,29 +39,35 @@
       valueName: {
         type: String,
         default: 'dictCode'
-      }
+      },
+      listFormatte: Function
     },
-    data() {
+    data () {
       return {};
     },
     computed: {
       ...mapGetters(['dict', 'getDict']),
-      dictList() {
-        return this.dict[dictEnum[this.dictName]] || [];
+      dictList () {
+        return (
+          (this.listFormatte &&
+            this.listFormatte(this.dict[dictEnum[this.dictName]] || [])) ||
+          this.dict[dictEnum[this.dictName]] ||
+          []
+        );
       },
       selectVal: {
-        set(val) {
+        set (val) {
           this.$emit('updateVal', val);
           // change获取选中项所有数据
 
           this.$emit('itemChange', this.getDict(this.dictName, val));
         },
-        get() {
+        get () {
           return this.value;
         }
       }
     },
-    created() {
+    created () {
       if (this.dictName) {
         this.requestDict(this.dictName);
       }

src/views/materialPlan/components/materialPlan-search.vue

@@ -29,6 +29,7 @@
       <el-col v-bind="styleResponsive ? { lg: 9, md: 12 } : { span: 9 }">
         <el-form-item label="要求交付日期:" label-width="100px">
           <el-date-picker
+            class="w100"
             v-model="where.deliveryTime"
             type="daterange"
             range-separator="至"
@@ -59,6 +60,7 @@
       <el-col v-bind="styleResponsive ? { lg: 7, md: 12 } : { span: 7 }">
         <el-form-item label="创建时间:">
           <el-date-picker
+            class="w100"
             v-model="where.createTime"
             type="daterange"
             range-separator="至"
@@ -76,6 +78,7 @@
       >
         <el-form-item label="发布时间:">
           <el-date-picker
+            class="w100"
             v-model="where.releaseTime"
             type="daterange"
             range-separator="至"
@@ -90,7 +93,10 @@
       <el-col
         v-bind="
           styleResponsive
-            ? { lg: activeName == 'second' ? 5 : 12, md: 12 }
+            ? {
+                lg: activeName == 'second' ? 5 : 12,
+                md: activeName == 'second' ? 12 : 24
+              }
             : { span: activeName == 'second' ? 5 : 12 }
         "
       >

src/views/materialPlan/index.vue

@@ -8,12 +8,7 @@
         ref="searchRef"
       >
       </materialPlan-search>
-      <el-button
-        type="primary"
-        style="margin: 20px 0"
-        @click="handleEdit('add')"
-        >创建计划</el-button
-      >
+
       <el-tabs v-model="activeName" type="card" @tab-click="handleTabChange">
         <el-tab-pane label="未发布" name="first"></el-tab-pane>
         <el-tab-pane label="已发布" name="second"></el-tab-pane>
@@ -27,6 +22,11 @@
         :datasource="datasource"
         :cache-key="`${activeName}materialPlanTable`"
       >
+        <template v-slot:toolbar>
+          <el-button type="primary" @click="handleEdit('add')"
+            >创建计划</el-button
+          >
+        </template>
         <template v-slot:code="{ row }">
           <el-link type="primary" :underline="false" @click="goDetail(row)">
             {{ row.code }}