Merge remote-tracking branch 'origin/master'

src/views/company/companyUser/indexAll.vue

@@ -301,7 +301,7 @@
     <el-dialog title="绑定企微账号"  :visible.sync="qwOpen" width="800px" append-to-body >
       <el-form ref="form" :model="form"  label-width="80px" >
         <el-form-item label="查询"  prop="companyUserId">
-          <el-button type="primary" icon="el-icon-search"  @click="selectQwUser()"  size="mini">搜索账号</el-button>
+          <el-button type="primary" icon="el-icon-search"  @click="selectQwUser(qwOpenCompanyId)"  size="mini">搜索账号</el-button>
         </el-form-item>
         <el-form-item label="企微账号"  prop="companyUserId">
           <el-tag
@@ -566,7 +566,7 @@
 
     <!-- 修改 selectUser 组件的引用 -->
     <el-dialog :title="user.title" :visible.sync="user.open" width="1000px" append-to-body>
-      <selectUser ref="selectUser" @bindQwUser="bindQwUser" @close="handleSelectUserClose"/>
+      <selectUser ref="selectUser" :qwOpenCompanyId="qwOpenCompanyId" @bindQwUser="bindQwUser" @close="handleSelectUserClose"/>
     </el-dialog>
 
     <el-dialog :title="companyUserArea.title" :visible.sync="companyUserArea.open" width="300px" append-to-body>
@@ -829,6 +829,7 @@ export default {
       open: false,
       bindCompanyOpen: false,
       qwOpen:false,
+      qwOpenCompanyId:null,
       // 部门名称
       deptName: undefined,
       // 日期范围
@@ -1111,6 +1112,7 @@ export default {
         }
         // 先打开"绑定企微账号"对话框
         this.qwOpen = true;
+        this.qwOpenCompanyId=row.companyId;
       });
     },
 

src/views/company/components/selectQwUser.vue

@@ -74,11 +74,17 @@
 </template>
 
 <script>
-import { userList,getMyQwCompanyList } from '@/api/qw/user'
+import { userList, getMyQwCompanyList } from '@/api/qw/user'
 
 export default {
   name: "miniCustomer",
   components: {},
+  props: {
+    qwOpenCompanyId: {
+      type: [String, Number],
+      default: null
+    }
+  },
   data() {
     return {
       // 遮罩层
@@ -117,7 +123,7 @@ export default {
     this.getDicts("sys_qw_user_status").then(response => {
       this.qwStatusOptions = response.data;
     });
-    getMyQwCompanyList().then(response => {
+    getMyQwCompanyList(this.qwOpenCompanyId).then(response => {
       this.myQwCompanyList = response.data;
       if(this.myQwCompanyList!=null){
         this.queryParams.corpId=this.myQwCompanyList[0].dictValue
@@ -125,6 +131,22 @@ export default {
       }
     });
   },
+  watch: {
+    qwOpenCompanyId: {
+      handler(newVal) {
+        if (newVal != null) {
+          getMyQwCompanyList(newVal).then(response => {
+            this.myQwCompanyList = response.data;
+            if(this.myQwCompanyList!=null){
+              this.queryParams.corpId=this.myQwCompanyList[0].dictValue
+              this.getList();
+            }
+          });
+        }
+      },
+      immediate: false
+    }
+  },
   methods: {
     updateCorpId(){
       this.getList();

src/views/system/config/config.vue

@@ -2039,7 +2039,7 @@
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="企微Sop客户评级配置" name="qwRating:config">
-        <el-form ref="form20" :model="form20" :rules="rules20" label-width="120px">
+        <el-form ref="form20" :model="form20" :rules="rules20" label-width="150px">
           <el-form-item label="评级天数(天)" prop="levelDay">
             <el-tooltip class="item" effect="dark" content="最小评级天数(天)" placement="top-end">
               <el-input-number v-model="form20.levelDay" :min="4" :max="365"></el-input-number>
@@ -2065,6 +2065,14 @@
             </el-tooltip>
             <span style="margin: 0 10px;">-</span>
             <span>100</span> <!-- aLevelMax 固定为 100 -->
+            <span style="margin: 0 16px;">---A级推送次数限制</span>
+            <el-tooltip class="item" effect="dark" content="A级客户每日发送次数限制" placement="top-end">
+              <el-input-number
+                v-model="form20.aLevelSend"
+                :min="0"
+                placeholder="发送次数"
+              ></el-input-number>
+            </el-tooltip>
           </el-form-item>
 
           <!-- B级范围 -->
@@ -2084,6 +2092,14 @@
                 :max="100"
               ></el-input-number>
             </el-tooltip>
+            <span style="margin: 0 16px;">---B级推送次数限制</span>
+            <el-tooltip class="item" effect="dark" content="B级客户每日发送次数限制" placement="top-end">
+              <el-input-number
+                v-model="form20.bLevelSend"
+                :min="0"
+                placeholder="发送次数"
+              ></el-input-number>
+            </el-tooltip>
           </el-form-item>
 
           <!-- C级范围 -->
@@ -2103,6 +2119,14 @@
                 :max="100"
               ></el-input-number>
             </el-tooltip>
+            <span style="margin: 0 16px;">---C级推送次数限制</span>
+            <el-tooltip class="item" effect="dark" content="C级客户每日发送次数限制" placement="top-end">
+              <el-input-number
+                v-model="form20.cLevelSend"
+                :min="0"
+                placeholder="发送次数"
+              ></el-input-number>
+            </el-tooltip>
           </el-form-item>
 
           <!-- D级范围 -->
@@ -2116,6 +2140,14 @@
                 :max="100"
               ></el-input-number>
             </el-tooltip>
+            <span style="margin: 0 16px;">---D级推送次数限制</span>
+            <el-tooltip class="item" effect="dark" content="D级客户每日发送次数限制" placement="top-end">
+              <el-input-number
+                v-model="form20.dLevelSend"
+                :min="0"
+                placeholder="发送次数"
+              ></el-input-number>
+            </el-tooltip>
           </el-form-item>
 
           <div class="line"></div>
@@ -3253,12 +3285,16 @@ export default {
         notStudyDays: 4,
         aLevelMin: 80,
         aLevelMax: 100,
+        aLevelSend: 99,
         bLevelMin: 40,
         bLevelMax: 80,
+        bLevelSend: 2,
         cLevelMin: 10,
         cLevelMax: 40,
+        cLevelSend: 1,
         dLevelMin: 0,
-        dLevelMax: 10
+        dLevelMax: 10,
+        dLevelSend: 0
       },
       form21: {},
       form22: {},