chenrui 1 rok temu
rodzic
commit
42e8ff4a4d

+ 3 - 1
src/views/common/creatorList.vue

@@ -22,7 +22,6 @@
 </template>
 <script>
 import debounce from 'lodash/debounce'
-import { dealerDetailBySn } from '@/api/dealer'
 import { queryCreatorList } from '@/api/promotion'
 export default {
   props: {
@@ -77,6 +76,9 @@ export default {
     },
     resetForm () {
       this.creatorName = []
+    },
+    setDefaultVal (val) {
+      this.creatorName = val
     }
   }
 }

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

@@ -18,7 +18,7 @@
             <li v-if="goodFlag==='1'">1) 导入的Excel文件中必须包含名为“产品编码”的列,“产品编码”必填</li>
             <li v-else>1) 导入的Excel文件中必须包含名为“产品编码”、“省级特价”、“市级特价”和“特约特价”的列,都为必填,省级特价≤市级特价≤特约特价</li>
             <li>2) 如果导入的产品已经存在,则不会导入该行</li>
-            <li>3)设置类型和起订数量非必填:设置类型为空则默认为“按数量设置”,起订数量为空则默认为“1”。</li>
+            <li>3)起订类型和起订数量非必填:起订类型为空则默认为“按数量设置”,起订数量为空则默认为“1”。</li>
             <li>
               <a :href="filePath" style="margin: 5px 0 0;display: block;">
                 <a-icon type="download" style="padding-right: 5px;" />下载导入模板

+ 16 - 4
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -63,11 +63,12 @@
       </div>
     </a-card>
     <a-card size="small" :bordered="false">
+      <!-- v-if="$hasPermissions('B_dealerAudit')" -->
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator tableBtnSet" >
           <a-button v-if="$hasPermissions('B_dealerPromotionAdd')" id="promotionList-add" type="primary" @click="handleAdd">新增</a-button>
-          <a-checkbox @change="handleDealerAudit" v-if="$hasPermissions('B_dealerAudit')">
+          <a-checkbox @change="handleDealerAudit" :checked="queryParam.dealerAuditFlag &&queryParam.dealerAuditFlag==1">
             待审核(修改参与客户)
           </a-checkbox>
         </div>
@@ -269,7 +270,8 @@ export default {
         queryWord: '',
         enabledFlag: undefined, // 发布状态
         state: undefined,
-        creatorId: undefined
+        creatorId: undefined,
+        dealerAuditFlag: undefined
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
@@ -384,7 +386,7 @@ export default {
     },
     // 审核参与客户
     handleDealerAudit (val) {
-      this.queryParam.dealerAuditFlag = val.target.checked ? '1' : '0'
+      this.queryParam.dealerAuditFlag = val.target.checked ? '1' : undefined
       this.$nextTick(() => {
         this.$refs.table.refresh(true)
       })
@@ -527,7 +529,9 @@ export default {
         endDate: undefined,
         queryWord: '',
         enabledFlag: undefined, // 发布状态
-        state: undefined
+        state: undefined,
+        creatorId: undefined,
+        dealerAuditFlag: undefined
       }
       this.$refs.rangeDate.resetDate()
       this.$refs.table.refresh(true)
@@ -544,6 +548,14 @@ export default {
       this.itemSn = null
       this.rowSelectionInfo = null
       this.$refs.table.clearTable()
+      // 获取创建人默认值
+      const creatorObj = this.$store.getters.userInfo
+      const newObj = {
+        key: creatorObj.userid,
+        name: creatorObj.rootOrgName,
+        label: creatorObj.rootOrgName
+      }
+      this.$refs.creatorList.setDefaultVal(newObj)
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight

+ 1 - 3
src/views/promotionRulesManagement/dealerPromotions/lookUpCustomersModal.vue

@@ -185,7 +185,6 @@ export default {
       const _this = this
       _this.openDealerModal = true
       const arr = _this.chooseDealerList
-      console.log('111111111111111:', arr)
       // 选择参与客户回显
       _this.$nextTick(() => {
         _this.$refs.dealerChoose.pageInit(arr)
@@ -244,7 +243,7 @@ export default {
       this.updateFlag = false
       this.$refs.areaList.clearData()
       this.$refs.subarea.clearData()
-      this.$refs.table.clearTable()
+      this.$refs.table.refresh(true)
     },
     //  导出
     handleExport () {
@@ -280,7 +279,6 @@ export default {
         this.$emit('close')
         this.resetSearchForm()
       } else {
-        console.log('this.showType', this.showType)
         this.$nextTick(() => {
           this.$refs.table.refresh(true)
         })