Merge branch 'mergeBranch' into table

src/Form/cashcouponPay/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="onShow" :disabled="data.status !== '新建'">编 辑</el-button>
+    <el-button size="mini" type="primary" @click="onShow" v-if="data.status === '新建'" >编 辑</el-button>
     <el-drawer
         title="编辑返利代金券支出"
         :visible.sync="dialogFormVisible"

src/HDrpManagement/competitor/detail/modules/competeProjects/list.vue

@@ -121,7 +121,6 @@ export default {
       this.listData()
     },
     detailGo(row){
-      console.log(row)
       let route = this.$route
       if (route.path !== '/projectChangeDetail') {
         this.oldRoute = {path:route.path,query:route.query}

src/HDrpManagement/competitor/index.vue

@@ -31,7 +31,19 @@
         </div>
       </template>
       <template v-slot:tbList="scope">
-        <div>
+        <div v-if="scope.data.column.columnname === 'tag_sys'">
+          <div v-for="item in scope.data.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-top:5px;margin-bottom: 5px">
+            <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
+              <span>{{item}}</span>
+            </el-tag>
+          </div>
+          <div v-for="item in scope.data.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-top:5px;margin-bottom: 5px">
+            <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
+              <span>{{item}}</span>
+            </el-tag>
+          </div>
+        </div>
+        <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
       </template>

src/HDrpManagement/projectChange/modules/detail.vue

@@ -226,7 +226,6 @@ export default {
       }else {
         this.mainData.discountrate = Math.round((this.mainData.discountrate * 100) * 100)/100
       }*/
-      console.log(this.mainData,"项目商机详情");
       
       /* 获取标签数据 */
       /*this.tagObj = await this.$store.dispatch('queryTagList',{table:'sa_project',id:this.mainData.sa_projectid})*/
@@ -272,7 +271,7 @@ export default {
     },
     /*修改项目阶段*/
     async setStage(val){
-      /*console.log(this.nowStage)*/
+
       const res = await this.$api.requested({
         "id": "20221024160102",
         "content": {
@@ -515,7 +514,7 @@ export default {
       this.queryMainData(this.$route.query.id)
     },
     setClick(row){
-      console.log(row,'选择阶段')
+
       const message = '是否更换到'+ row.stagename + '阶段?'
       this.$confirm(message, '提示', {
         confirmButtonText: '确定',

src/HDrpManagement/projectChange/modules/modules/andEnterprise/index.vue

@@ -96,12 +96,10 @@ export default {
       param.content.sa_projectid = this.$route.query.id
     },*/
     async listData(){
-      console.log(this.rowData)
       this.params.content.sa_projectid = this.rowData.sa_projectid
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
-      console.log(this.list)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -135,7 +133,6 @@ export default {
         }
       })
       this.enterpriseTypeList = res.data
-      console.log(this.enterpriseTypeList,"客户类型")
     }
   },
   mounted() {
@@ -143,7 +140,6 @@ export default {
   },
   created() {
     this.tablecols = this.tool.tabelCol(this.$route.name).andEnterpriseTable.tablecols
-    console.log(this.tablecols,"tablecols")
     this.enterpriseType()
   },
 }

src/HDrpManagement/projectChange/modules/modules/clue/index.vue

@@ -83,7 +83,7 @@ export default {
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
-      console.log(this.list)
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HDrpManagement/projectChange/modules/modules/contract/index.vue

@@ -92,7 +92,7 @@ export default {
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
-      console.log(res,'合同数据信息')
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HDrpManagement/projectChange/modules/modules/quotation/index.vue

@@ -101,7 +101,7 @@ export default {
   components:{buillDetail,add},
   methods:{
     detailGo(row){
-      console.log(row)
+
       let route = this.$route
       if (route.path !== '/quotedPriceDetail') {
         this.oldRoute = {path:route.path,query:route.query}
@@ -151,7 +151,7 @@ export default {
       this.productList = res.data
     },
     async listData(){
-      console.log(this.data,'项目商机')
+
       this.params.content.sa_projectid = this.data.sa_projectid
       const res = await this.$api.requested(this.params)
       this.list = res.data
@@ -159,7 +159,7 @@ export default {
         /*this.list[index].begdate = new Date(e.begdate).getFullYear() +*/
       })
       this.total = res.total
-      console.log(this.list,"报价单")
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -172,7 +172,7 @@ export default {
       this.listData()
     },
     clearData(){
-      console.log("执行")
+
       this.search = ""
       this.params.content.where.condition = this.search
       this.listData()

src/HDrpManagement/projectChange/modules/modules/rival/index.vue

@@ -107,7 +107,7 @@ export default {
       this.listData()
     },
     async onDel(id){
-      console.log(id)
+
       const res = await this.$api.requested({
         "id": 20221019165902,
         "content": {

src/HManagement/accountManage/modules/account_detail.vue

@@ -21,7 +21,8 @@
         <!-- <changeData class="inline-16"></changeData> -->
         <restPas v-if="tool.checkAuth($route.name,'restpas')" :userid="mainData.userid" class="inline-16"></restPas>
         <useTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></useTemp>
-        <unuseTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></unuseTemp>
+        <removeSite v-if="tool.checkAuth($route.name,'removeSite')" :data="mainData"></removeSite>
+<!--        <unuseTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></unuseTemp>-->
       </div>
       <div slot="slot0" >
         <detailInfo :more="true" :data="detailInfo"></detailInfo>
@@ -49,6 +50,8 @@ import restPas from "@/HManagement/department/staff/detail/modules/restPassword"
 import detailInfo from '@/components/detailInfo/index'
 import teamInformation from './teamInformation/index'
 
+import removeSite from "@/HManagement/accountManage/modules/removeSite";
+
 export default {
   name: "detail",
   data() {
@@ -71,7 +74,8 @@ export default {
     detailInfo,
     teamInformation,
     restPas,
-    selectPeople
+    selectPeople,
+    removeSite
   },
   methods:{
     async queryMainData(id) {

src/HManagement/accountManage/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="default" :disabled="data.status === 'ACTIVE'" @click="onShow">编 辑</el-button>
+    <el-button size="mini" :type="data.status !== 'ACTIVE'?'primary':''" :disabled="data.status === 'ACTIVE'" @click="onShow">编 辑</el-button>
     <el-drawer
       title="编辑用户"
       :visible.sync="drawer"

src/HManagement/accountManage/modules/removeSite.vue

@@ -0,0 +1,34 @@
+<template>
+  <div class="inline-16" >
+    <el-popconfirm
+        title="确定移除当前选中账号吗？"
+        @confirm="remove()">
+      <el-button slot="reference"  size="mini" type="primary">移除站点</el-button>
+    </el-popconfirm>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "removeSite",
+  props:['data'],
+  methods:{
+    async remove(){
+      const res = await this.$api.requested({
+        "classname": "webmanage.users.users",
+        "method": "deleteUserSite",
+        "content": {
+          "userid": this.data.userid
+        }
+      })
+      this.tool.showMessage(res,() => {
+        this.$store.dispatch('changeDetailDrawer',false)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/accountManage/modules/useAccdount.vue

@@ -3,7 +3,7 @@
     <el-popconfirm
       title="确定启用当前选中账号吗？"
       @confirm="start()">
-      <el-button slot="reference" type="default" size="mini">启 用</el-button>
+      <el-button slot="reference"  size="mini" type="primary">启 用</el-button>
     </el-popconfirm>
   </div>
 </template>

src/HManagement/addressList/mycontact/index.vue

@@ -82,6 +82,7 @@ export default {
     }, 
     setGroupData (val) {
       this.group = val
+      console.log(this.group,'group')
     },
     clickGroup (val,allData) {
       this.activeGroupData = val

src/HManagement/addressList/mycontact/modules/addContact.vue

@@ -97,7 +97,7 @@
 
             <el-col :span="24">
               <el-form-item label="群组" prop="sys_phonebookgroupid">
-                <el-select v-model="form.sys_phonebookgroupid" style="width:100%">
+                <el-select v-model="form.sys_phonebookgroupid" style="width:100%" >
                   <el-option v-for="item in group" :key="item.index" :value="item.sys_phonebookgroupid" :label="item.groupname"></el-option>
                 </el-select>
               </el-form-item>
@@ -156,6 +156,7 @@ export default {
       form:{
         "sys_phonebookid":0,     //sys_phonebookid<=0时 为新增
         "sys_phonebookgroupid":"",
+        "groupname":"",
         "name": "",
         "phonenumber": "",
         "company": "",
@@ -231,7 +232,8 @@ export default {
             "isTelephone":'0',
             "fax":"",
             "areaCode":'',
-            "telephone":''
+            "telephone":'',
+            "groupname":"",
           }
           this.$emit('onAddSuccess')
         })
@@ -259,7 +261,7 @@ export default {
         "areaCode":'',
         "telephone":''
       }
-    }
+    },
   },
   mounted () {
     this.$store.dispatch('optiontypeselect','sex')

src/HManagement/addressList/mycontact/modules/edit.vue

@@ -97,14 +97,14 @@
 
             <el-col :span="24">
               <el-form-item label="群组" prop="sys_phonebookgroupid">
-                <el-select v-model="form.sys_phonebookgroupid" style="width:100%">
+                <el-select v-model="form.sys_phonebookgroupid" style="width:100%" >
                   <el-option v-for="item in group" :key="item.index" :value="item.sys_phonebookgroupid" :label="item.groupname"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="标签" prop="tags">
-                <el-select v-model="tags" style="width:100%" multiple>
+                <el-select v-model="form.tag" style="width:100%" multiple>
                   <el-option v-for="item in tagList" :key="item.index" :value="item.tag" :label="item.tag"></el-option>
                 </el-select>
               </el-form-item>
@@ -186,6 +186,7 @@ export default {
   },
   methods:{
     onShow () {
+      console.log(this.data,'data数据')
       this.form = Object.assign({},this.form,this.data.data)
       if ((this.form.phonenumber.indexOf('-')) != '-1'){
         this.form.isTelephone = '1'

src/HManagement/addressList/mycontact/modules/group.vue

@@ -77,9 +77,11 @@ export default {
         if(e.sys_phonebookgroupid !== 0)
           return e
       })
-      console.log(this.sysGroup);
-      
-      this.$emit('setGroupData',this.myGroup)
+      this.groupList = res.data.filter(e=>{
+        if(e.groupname != '客户联系人' && e.groupname != '项目联系人')
+          return e
+      })
+      this.$emit('setGroupData',this.groupList)
       fn?fn():this.clickGroup(this.sysGroup[0])
     },
     clickGroup (item) {

src/HManagement/siteManage/securityConfig/modules/projectCheckRule.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="small" style="width:120px" type="primary" @click="querySite_Parameter">设 置</el-button>
-    <el-dialog title="客户查重规则" append-to-body :visible.sync="dialogEditVisible" width="860px">
+    <el-dialog title="项目查重规则" append-to-body :visible.sync="dialogEditVisible" width="860px">
       <el-row :gutter="16">
         <el-col :span="24" style="margin-top: -20px">
           <span style="color: red">注意：每层的查重条件可多选字段</span>

src/views/login/login.vue

@@ -134,14 +134,30 @@ export default {
       })
       let that = this
       if (res.code === 1) {
-        this.checked?localStorage.setItem('phonenumber',this.loginForm.phonenumber):localStorage.clear('phonenumber')
-        sessionStorage.setItem('account_list',JSON.stringify(res.account_list))
-        sessionStorage.setItem('active_account',JSON.stringify(res.account_list[0]))
-        this.basicData.query_userauth().then(()=>{
-          this.basicData.querySite_Parameter()
-          this.$router.push({path:'/main'})
-          this.getAccountInfo()
-        })
+        var flag = 0
+        for (var i = 0;i<res.account_list.length ;i++){
+          if (res.account_list[i].status === 'ACTIVE'){
+            flag = 1
+            break
+          }
+        }
+        if (flag === 1){
+          this.checked?localStorage.setItem('phonenumber',this.loginForm.phonenumber):localStorage.clear('phonenumber')
+          sessionStorage.setItem('account_list',JSON.stringify(res.account_list))
+          sessionStorage.setItem('active_account',JSON.stringify(res.account_list[0]))
+          this.basicData.query_userauth().then(()=>{
+            this.basicData.querySite_Parameter()
+            this.$router.push({path:'/main'})
+            this.getAccountInfo()
+          })
+        }else {
+          this.$notify({
+            title: '失败',
+            message: '该账号已停用',
+            type: 'error'
+          })
+        }
+
       } else {
         this.$notify({
           title: '失败',
@@ -169,17 +185,32 @@ export default {
         "systemclient":"web"
       })
       if (res.code === 1) {
-        
-        this.checked?localStorage.setItem('phonenumber',this.loginForm.phonenumber):localStorage.clear('phonenumber')
-        sessionStorage.setItem('account_list',JSON.stringify(res.account_list))
+        var flag = 0
+        for (var i = 0;i<res.account_list.length ;i++){
+          if (res.account_list[i].status === 'ACTIVE'){
+            flag = 1
+            break
+          }
+        }
+        if (flag === 1){
+          this.checked?localStorage.setItem('phonenumber',this.loginForm.phonenumber):localStorage.clear('phonenumber')
+          sessionStorage.setItem('account_list',JSON.stringify(res.account_list))
 
-        sessionStorage.setItem('active_account',JSON.stringify(res.account_list[0]))
+          sessionStorage.setItem('active_account',JSON.stringify(res.account_list[0]))
+
+          this.basicData.query_userauth().then(()=>{
+            this.basicData.querySite_Parameter()
+            this.$router.push({path:'/main'})
+            this.getAccountInfo()
+          })
+        }else {
+          this.$notify({
+            title: '失败',
+            message: '该账号已停用',
+            type: 'error'
+          })
+        }
 
-        this.basicData.query_userauth().then(()=>{
-          this.basicData.querySite_Parameter()
-          this.$router.push({path:'/main'})
-          this.getAccountInfo()
-        })
       } else {
         this.$notify({
           title: '失败',