瀏覽代碼

修改bug

chenrui 2 年之前
父節點
當前提交
858e5f370c

+ 7 - 2
src/views/promotionRulesManagement/promotionManagement/addModal.vue

@@ -169,10 +169,15 @@ export default {
     },
     },
     // 添加经销商
     // 添加经销商
     handleAddDealer (list) {
     handleAddDealer (list) {
-      this.chooseDealerList = list
+      this.chooseDealerList = list.map(con => {
+        return {
+          buyerSn: con.dealerSn,
+          buyerName:con.dealerName
+        }
+      })
       const newArr = list.map(item => {
       const newArr = list.map(item => {
         return {
         return {
-          buyerSn: item.buyerSn
+          buyerSn: item.dealerSn
         }
         }
       })
       })
       this.form.promoBuyerList = newArr
       this.form.promoBuyerList = newArr

+ 8 - 8
src/views/promotionRulesManagement/promotionManagement/chooseDealer.vue

@@ -236,15 +236,15 @@ export default {
         return
         return
       }
       }
       const dealerSnList = _this.rowSelectionInfo.selectedRows
       const dealerSnList = _this.rowSelectionInfo.selectedRows
-      const newDealerSnList = dealerSnList.map(con => {
-        const obj = {
-          buyerName: con.dealerName,
-          buyerSn: con.dealerSn
-        }
-        return obj
-      })
+      // const newDealerSnList = dealerSnList.map(con => {
+      //   const obj = {
+      //     buyerName: con.dealerName,
+      //     buyerSn: con.dealerSn
+      //   }
+      //   return obj
+      // })
       this.spinning = false
       this.spinning = false
-      this.$emit('plAdd', newDealerSnList)
+      this.$emit('plAdd', dealerSnList)
     },
     },
     handleAdd (row) {
     handleAdd (row) {
       if (row.subareaArea) {
       if (row.subareaArea) {

+ 4 - 4
src/views/promotionRulesManagement/promotionManagement/editModal.vue

@@ -82,14 +82,14 @@
           </a-form-model-item>
           </a-form-model-item>
           <a-form-model-item label="内容" prop="content" v-show="form.contentType =='IMAGE_CONTENT'">
           <a-form-model-item label="内容" prop="content" v-show="form.contentType =='IMAGE_CONTENT'">
             <editor
             <editor
-              v-show="pageType === 'add'"
+              v-if="pageType === 'add'"
               id="promotionEdit-editor"
               id="promotionEdit-editor"
               ref="editor"
               ref="editor"
               class="promotionEdit-editor"
               class="promotionEdit-editor"
               @on-change="editorChange"
               @on-change="editorChange"
               :cache="false"></editor>
               :cache="false"></editor>
             <editor
             <editor
-              v-show="pageType === 'edit'&&!isDisabled"
+              v-if="pageType === 'edit'&&!isDisabled"
               id="promotionEdit-editor"
               id="promotionEdit-editor"
               ref="editor"
               ref="editor"
               class="promotionEdit-editor"
               class="promotionEdit-editor"
@@ -289,7 +289,7 @@ export default {
         if (valid) {
         if (valid) {
           _this.form.promoActiveSn = this.itemId
           _this.form.promoActiveSn = this.itemId
           const formData = JSON.parse(JSON.stringify(_this.form))
           const formData = JSON.parse(JSON.stringify(_this.form))
-          if (this.pageType === 'add') {
+          if (this.pageType === 'add' || (this.pageType === 'edit' && !this.isDisabled)) {
             formData.imageSet = formData.imageSet ? formData.imageSet.split(',') : []
             formData.imageSet = formData.imageSet ? formData.imageSet.split(',') : []
           }
           }
           formData.showFlag = formData.enabledFlag == 0 ? '0' : formData.showFlag
           formData.showFlag = formData.enabledFlag == 0 ? '0' : formData.showFlag
@@ -331,7 +331,7 @@ export default {
     isShow (newValue, oldValue) {
     isShow (newValue, oldValue) {
       if (!newValue) {
       if (!newValue) {
         this.$emit('close')
         this.$emit('close')
-        if (this.pageType == 'add' || !this.isDisabled) {
+        if (this.pageType == 'add' || (this.pageType == 'edit' && !this.isDisabled)) {
           this.$refs.imageSet.setFileList('')
           this.$refs.imageSet.setFileList('')
           this.$refs.videoSet.setFileList('')
           this.$refs.videoSet.setFileList('')
         }
         }

+ 2 - 0
src/views/promotionRulesManagement/promotionManagement/list.vue

@@ -382,9 +382,11 @@ export default {
   }
   }
   .desc{
   .desc{
     width: 100%;
     width: 100%;
+    padding:0 10px;
     overflow: hidden;
     overflow: hidden;
     text-overflow: ellipsis;
     text-overflow: ellipsis;
     display: -webkit-box;
     display: -webkit-box;
+    box-sizing: border-box;
     -webkit-line-clamp: 3;
     -webkit-line-clamp: 3;
     -webkit-box-orient: vertical;
     -webkit-box-orient: vertical;
   }
   }