Merge branch 'release' into dev

src/views/promotion/display_schedule/index.vue

@@ -4,8 +4,8 @@
       <el-tabs v-model="activeName"
         class="demo-tabs"
         @tab-click="handleClickTabs">
-        <el-tab-pane label="陈列计划"
-          name="陈列计划">
+        <el-tab-pane label="常规陈列"
+          name="常规陈列">
           <Display />
         </el-tab-pane>
         <el-tab-pane label="档期计划"
@@ -16,8 +16,8 @@
           name="档期陈列">
           <ScheduleDis />
         </el-tab-pane>
-        <el-tab-pane label="零食计划"
-          name="零食计划">
+        <el-tab-pane label="零食陈列"
+          name="零食陈列">
           <Snack />
         </el-tab-pane>
       </el-tabs>
@@ -30,7 +30,7 @@ import Display from './tabs/display.vue'
 import Schedule from './tabs/schedule.vue'
 import ScheduleDis from './tabs/schedule_dis.vue'
 import Snack from './tabs/snack.vue'
-const activeName = ref('陈列计划');
+const activeName = ref('常规陈列');
 const handleClickTabs = (tab) => {
   activeName.value = tab.name;
 }

src/views/promotion/display_schedule/tabs/display.vue

@@ -630,6 +630,7 @@
         {
           label: "实际主题地堆-是否",
           prop: "actualThemedFloorStack",
+          referenceKey: "actualFloorStackQty",
           visible: true,
           type: 'select',
           options: [
@@ -646,6 +647,7 @@
                     row[col.prop] = value;
                     submitChange(row, col);
                   }}
+                  disabled={!row[col.referenceKey]}
                   placeholder="">
                   {col.options.map(item => (
                     <el-option

src/views/promotion/display_schedule/tabs/schedule_dis.vue

@@ -70,8 +70,9 @@
           "prop": "dealerName",
           "visible": true,
           "type": "string",
-          "fill": false,
-          "width": 200
+          "fill": true,
+          "width": 200,
+          fixed: 'left'
         },
         {
           "label": "经销商类型",
@@ -126,8 +127,9 @@
           "prop": "lineName",
           "visible": true,
           "type": "string",
-          "fill": false,
-          "width": 100
+          "fill": true,
+          "width": 100,
+          fixed: 'left'
         },
         {
           "label": "系统类型",

src/views/promotion/display_schedule/tabs/snack.vue

@@ -69,8 +69,9 @@
           "prop": "dealerName",
           "visible": true,
           "type": "string",
-          "fill": false,
-          "width": 200
+          "fill": true,
+          "width": 200,
+          fixed: 'left'
         },
         {
           "label": "经销商类型",
@@ -125,8 +126,9 @@
           "prop": "lineName",
           "visible": true,
           "type": "string",
-          "fill": false,
-          "width": 100
+          "fill": true,
+          "width": 100,
+          fixed: 'left'
         },
         {
           "label": "系统类型",