浏览代码

修改bug

chenrui 1 年之前
父节点
当前提交
ff8a8449d2

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -21,7 +21,7 @@
                   v-model="queryParam.enabledFlag"
                   ref="enabledFlag"
                   id="promotionList-enabledFlag"
-                  code="NOTITY_SEND_STATUS"
+                  code="PUBLISH_STATE"
                   placeholder="请选择发布状态"
                   allowClear></v-select>
               </a-form-item>

+ 9 - 1
src/views/promotionRulesManagement/dealerPromotions/tableType1.vue

@@ -113,6 +113,7 @@
           ref="returnReason"
           code="SCOPE_UNIT_TYPE"
           placeholder="请选择"
+          style="width:100%;"
           allowClear></v-select>
         <a-input-number
           size="small"
@@ -258,7 +259,14 @@ export default {
       this.openTypeModal = true
       this.chooseType = this.handleRowData(row)
       const getArr = this.setTypeShowData()
-      this.$refs.typeBox.handleAllDisabled(getArr)
+      // 获取所选品牌
+      const dataList = this.setShowData('Brand')
+      if (dataList && dataList.length == 0) {
+        this.$refs.typeBox.handleAllDisabled(getArr)
+      } else {
+        this.chooseType = []
+        this.$refs.typeBox.handleAllDisabled([])
+      }
     },
     handleTypeOk (mainArr) {
       const classifyArr = []

+ 1 - 0
src/views/promotionRulesManagement/dealerPromotions/tableType3.vue

@@ -182,6 +182,7 @@
           size="small"
           ref="returnReason"
           code="SCOPE_UNIT_TYPE"
+          style="width:100%;"
           placeholder="请选择"
           allowClear></v-select>
         <a-input-number