|
|
@@ -84,20 +84,23 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
v-if="form.platformName === platformNames[1]"
|
|
|
label="活动权益"
|
|
|
align="center"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ :prop="`deviceRespList.${scope.$index}.goodId`"
|
|
|
+ :rules="{ required: true, trigger: 'change' }"
|
|
|
+ >
|
|
|
<el-select
|
|
|
v-model="scope.row.goodId"
|
|
|
placeholder="请选择活动权益"
|
|
|
:disabled="scope.row.deviceId == null || disabledActivity"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item in aaaa[scope.row.deviceId]"
|
|
|
+ v-for="item in form.platformName === platformNames[1]?aaaa[scope.row.deviceId]:serviceTimeOptions"
|
|
|
:key="item.goodId"
|
|
|
:value="item.goodId"
|
|
|
:label="item.goodName"
|
|
|
@@ -105,9 +108,9 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
|
|
|
- <el-table-column v-else label="活动权益" align="center">
|
|
|
+ <el-table-column label="活动权益" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item>
|
|
|
<el-select
|
|
|
@@ -116,16 +119,22 @@
|
|
|
:disabled="disabledActivity"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item in serviceTimeOptions"
|
|
|
- :key="item.goodId"
|
|
|
- :value="item.goodId"
|
|
|
- :label="item.goodName"
|
|
|
+ v-for="item in form.platformName === platformNames[1]
|
|
|
+ ? aaaa[scope.row.deviceId]
|
|
|
+ : serviceTimeOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :value="item.value"
|
|
|
+ :label="item.label"
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ {{ scope.row.deviceId }}---{{ aaaa }}--
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
<el-table-column label="领取数量" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item
|
