Просмотр исходного кода

Merge branch 'develop_yh30' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh30

lilei 1 год назад
Родитель
Сommit
bb097cf59c

+ 1 - 1
src/views/bnSetting/menu/childModal.vue

@@ -257,7 +257,7 @@ export default {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-          console.log(values.formData, ' formData.type222222222')
+          console.log(values.formData, ' formData.type')
           values.formData.permission = values.formData.permission.replace(/\//g, '_')
           const saveRequest = this.parentType == 'store' ? saveMdMenu : saveYyMenu
           saveRequest(Object.assign(this.formData, values.formData)).then(res => {

+ 1 - 1
src/views/bnSetting/menu/storeMenus.vue

@@ -351,7 +351,7 @@ export default {
     // 获取菜单树列表
     getMdMenuList () {
       getMdMenuList().then(res => {
-        console.log(res, 'res1111111')
+        console.log(res, 'res')
         if (res.status == 200) {
           this.treeData = res.data
           console.log(this.treeData, 'this.treeData')

+ 0 - 1
src/views/common/chooseTypeModal.vue

@@ -140,7 +140,6 @@ export default {
       }
     },
     handleAllDisabled (list) {
-      console.log('111111111:', list)
       this.chooseList = list
     },
     // 禁用递归

+ 0 - 2
src/views/dealerManagement/businessOwnerSettings/chooseDealer.vue

@@ -148,7 +148,6 @@ export default {
                 }
               }
             }
-            console.log('11111111111111:', chooseData)
             if (!this.pageFlag) {
               this.pageFlag = true
               _this.$refs.table.setTableSelected(_this.chooseInfo, chooseData) // 设置表格选中项
@@ -188,7 +187,6 @@ export default {
     // 表格选中项
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
-      console.log('22222222222222222222:', obj)
     },
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : ''

+ 0 - 1
src/views/dealerManagement/businessOwnerSettings/chooseSupplier.vue

@@ -88,7 +88,6 @@ export default {
               }
             }
             if (!_this.pageFlag) {
-              console.log('11111111111111111111111', _this.chooseInfo, chooseData)
               _this.$refs.table.setTableSelected(_this.chooseInfo, chooseData) // 设置表格选中项
               _this.pageFlag = true
             }

+ 12 - 13
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -96,7 +96,7 @@
           <template slot="joinCustomers" slot-scope="text, record">
             <span class="joinCustomer" v-if="record.dealerScope ==='ALL_DEALER'" @click="handleCustomers(record)">全部客户</span>
             <span class="joinCustomer" v-else @click="handleCustomers(record)">共有<span style="color:#39f;vertical-align:top;">{{ record.dealerSnList?record.dealerSnList.length:0 }}</span>个客户</span>
-            <a-badge count="审" v-show="record.dealerAuditFlag == 1" :number-style="{ backgroundColor: '#f30', zoom:'80%' }" />
+            <a-badge count="审" v-show="record.dealerAuditFlag == 1 &&(record.state==='NOT_START'||record.state==='RUNNING') " :number-style="{ backgroundColor: '#f30', zoom:'80%' }" />
             <!-- dealerAuditFlag  1 是 0否 -->
           </template>
           <!-- 发布状态 -->
@@ -110,6 +110,7 @@
             <span v-else>--</span>
           </template>
           <!-- 操作 -->
+          <!--  state 待提交:WAIT_SUBMIT 待审核:WAIT_AUDIT 未开始:NOT_START 进行中:RUNNING 审核不通过:AUDIT_REJECT 已结束:IS_OVER -->
           <template slot="action" slot-scope="text, record">
             <a-button
               size="small"
@@ -332,7 +333,6 @@ export default {
     },
     // 参与客户
     handleCustomers (row) {
-      this.openCustomerModal = true
       this.itemPromotionSn = row.promotionSn
       if ((row.state === 'NOT_START' || row.state === 'RUNNING') && row.dealerAuditFlag && (row.dealerAuditFlag == 0 || row.dealerAuditFlag == 2)) {
         this.itemStatusType = 'isEdit'
@@ -346,6 +346,7 @@ export default {
       } else {
         this.getAllDealerSnList()
       }
+      this.openCustomerModal = true
     },
     async getAllDealerSnList () {
       const dealerSnArr = await allDealerSnList({})
@@ -523,18 +524,25 @@ export default {
     },
     //  重置
     resetSearchForm () {
+      // 获取创建人默认值
+      const creatorObj = this.$store.state.user.info
+      const newObj = {
+        key: creatorObj.userid,
+        name: creatorObj.userNameCN,
+        label: creatorObj.userNameCN
+      }
+      this.$refs.creatorList.setDefaultVal(newObj)
       this.queryParam = {
         beginDate: undefined,
         endDate: undefined,
         queryWord: '',
         enabledFlag: undefined, // 发布状态
         state: undefined,
-        creatorId: undefined,
+        creatorId: creatorObj.userid,
         dealerAuditFlag: undefined
       }
       this.$refs.rangeDate.resetDate()
       this.$refs.table.refresh(true)
-      // this.$refs.dealerSubareaScopeList.resetForm()
     },
 
     pageInit () {
@@ -545,16 +553,7 @@ export default {
       this.openModal = false
       this.openDetailModal = false
       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 - 2
src/views/promotionRulesManagement/dealerPromotions/lookUpCustomersModal.vue

@@ -63,7 +63,7 @@
           </template>
         </s-table>
       </a-card>
-      <div style="text-align:right;color:#666;" v-if="showType ==='isEdit' || (showType === 'isAudit'&& !$hasPermissions('B_dealerAudit'))"><span v-if="showType === 'isAudit'&& !$hasPermissions('B_dealerAudit')">待审核,</span>增加的客户显示红色,删除的客户显示绿色</div>
+      <div style="text-align:right;color:#666;" v-if="showType ==='isEdit' || showType === 'isAudit'"><span v-if="showType === 'isAudit'">待审核,</span>增加的客户显示红色,删除的客户显示绿色</div>
       <div class="btn-cont" v-if="showType ==='isEdit'">
         <a-button type="primary" class="button-warning" @click="editDealerModal">修改</a-button>
         <a-button type="primary" style="margin-left: 15px;" :loading="spinning" id="promotion-modal-save" @click="submitAudit">提交审核</a-button>
@@ -243,7 +243,6 @@ export default {
       this.updateFlag = false
       this.$refs.areaList.clearData()
       this.$refs.subarea.clearData()
-      this.$refs.table.refresh(true)
     },
     //  导出
     handleExport () {

+ 2 - 9
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -481,13 +481,6 @@ export default {
     hanldeOk (arr) {
       // 门槛产品导入
       const resultArr = []
-      arr.forEach(item => {
-        const obj = {
-          productCode: item.productCode,
-          productSn: item.product.productSn
-        }
-        resultArr.push(obj)
-      })
       if (this.chooseVal == 'a') {
         const name = this.chooseVal == 'a' ? 'cill' : this.chooseVal == 'b' ? 'normalPrice' : 'offer'
         this.$refs[name + 'Product'].importRow(arr)
@@ -592,8 +585,8 @@ export default {
             provinceDiscountPrice: item.provinceDiscountPriceText,
             cityDiscountPrice: item.cityDiscountPriceText,
             specialDiscountPrice: item.specialDiscountPriceText,
-            unitType: 'SL',
-            unitQty: 1,
+            unitType: item.unitType,
+            unitQty: item.unitQty,
             provinceDiscountRate: item.provinceDiscountRate ? item.provinceDiscountRate : undefined,
             cityDiscountRate: item.cityDiscountRate ? item.cityDiscountRate : undefined,
             specialDiscountRate: item.specialDiscountRate ? item.specialDiscountRate : undefined