Merge branch 'ap' into dev

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

@@ -262,13 +262,23 @@
           "prop": "actualDisplay",
           "visible": true,
           "type": "input",
+          options: [
+            {
+              label: '是',
+              value: '是'
+            },
+            {
+              label: '否',
+              value: '否'
+            }
+          ],
           referenceKey: "plannedDisplay",
           render: (_, row, col) => {
             return (
               <div>
                 <span>{row[col.referenceKey] || '-'}</span>
-                <div>
-                  <el-input modelValue={row[col.prop]}
+                <div style="width: 100%">
+                  <el-select modelValue={row[col.prop]}
                     onUpdate:modelValue={(value) => {
                       row[col.prop] = value;
                       submitChange(row, col);
@@ -276,7 +286,11 @@
                     disabled={!row[col.referenceKey]}
                     placeholder=""
                     clearable
-                  />
+                  >
+                    {col.options.map(item => (
+                      <el-option key={item.value} label={item.label} value={item.value} />
+                    ))}
+                  </el-select>
                 </div>
               </div>
             )
@@ -326,24 +340,24 @@
           // requestKey: ["displayExecuted", "snackDisplayExecuted"]
           requestKey: ["displayExecuted"]
         },
-        {
-          "label": "陈列形式是否执行",
-          "prop": "displayExecuted",
-          "visible": true,
-          "type": "formula",
-          "fill": true,
-          "width": 150,
-          func: (row) => {
-            if (!row.plannedDisplay) {
-              return '-';
-            }
-            // 截取计划陈列形式数据
-            let plannedDisplay = row.plannedDisplay.split('或')
-            row.displayExecuted = plannedDisplay.includes(row.actualDisplay) ? '是' : '否'
-            return row.displayExecuted
-          },
-          formulaStr: "实际陈列形式 === 计划陈列形式"
-        },
+        // {
+        //   "label": "陈列形式是否执行",
+        //   "prop": "displayExecuted",
+        //   "visible": true,
+        //   "type": "formula",
+        //   "fill": true,
+        //   "width": 150,
+        //   func: (row) => {
+        //     if (!row.plannedDisplay) {
+        //       row.displayExecuted = '-'
+        //       return '-';
+        //     }
+        //     // 截取计划陈列形式数据
+        //     row.displayExecuted = row.actualDisplay // 值为"是"或者“否”
+        //     return row.displayExecuted
+        //   },
+        //   formulaStr: "实际陈列形式 === 计划陈列形式"
+        // },
         {
           "label": "计划 - 端架数量（组）",
           "prop": "plannedEndCapQty",
@@ -412,7 +426,7 @@
               return '-'
             }
             // 截取计划端架数量数据
-            row.endCapQtyExecuted = row.actualEndCapQty === row.plannedEndCapQty ? '是' : '否'
+            row.endCapQtyExecuted = row.actualEndCapQty == row.plannedEndCapQty ? '是' : '否'
             return row.endCapQtyExecuted
           },
           formulaStr: "执行端架数量 == 计划端架数量"