Merge branch 'blueBranch' into allTestUrgent

src/HManagement/clueManage/clue_private/modules/add.vue

@@ -169,15 +169,15 @@
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t(`设计师`)+':'" prop="contactsid" v-if="param.content.isuppictured === 1" :rules="{required:true,message:$t('请选择设计师'),trigger:'change'}">
-                <designer  ref="designer" :sys_enterpriseid="param.content.sys_enterpriseid" @designer="selectDesigner" :disabled="isuppictured === 1"></designer>
+                <designer  ref="designer" :sys_enterpriseid="param.content.sys_enterpriseid" @designer="selectDesigner" :disabled="isuppictured === 1" placeholder="请选择设计师"></designer>
               </el-form-item>
               <el-form-item :label="$t(`设计师`)+':'" prop="contactsid" v-else >
-                <designer ref="designer" :sys_enterpriseid="param.content.sys_enterpriseid" @designer="selectDesigner" :disabled="isuppictured === 1"></designer>
+                <designer ref="designer" :sys_enterpriseid="param.content.sys_enterpriseid" @designer="selectDesigner" :disabled="isuppictured === 1" placeholder="请选择设计师"></designer>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t(`关联项目`)+':'" prop="projectname">
-                <project ref="project" @project="selectProject" :sat_orderclueid="0" :disabled="isuppictured === 1"></project>
+                <project ref="project" @project="selectProject" :sat_orderclueid="0" :disabled="isuppictured === 1" placeholder="请选择关联项目"></project>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/HManagement/clueManage/clue_private/modules/edit.vue

@@ -172,15 +172,15 @@
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t(`设计师`)+':'" prop="name" v-if="form.isuppictured === 1" :rules="{required:true,message:$t('请选择设计师'),trigger:'change'}">
-                <designer ref="designer" :sys_enterpriseid="form.sys_enterpriseid" :data="form.designer" @designer="selectDesigner" :disabled="isuppictured === 1"></designer>
+                <designer ref="designer" :sys_enterpriseid="form.sys_enterpriseid" :data="form.designer" @designer="selectDesigner" :disabled="isuppictured === 1" placeholder="请选择设计师"></designer>
               </el-form-item>
               <el-form-item :label="$t(`设计师`)+':'" prop="name" v-else >
-                <designer ref="designer" :sys_enterpriseid="form.sys_enterpriseid" :data="form.designer" @designer="selectDesigner" :disabled="isuppictured === 1"></designer>
+                <designer ref="designer" :sys_enterpriseid="form.sys_enterpriseid" :data="form.designer" @designer="selectDesigner" :disabled="isuppictured === 1" placeholder="请选择设计师"></designer>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t(`关联项目`)+':'" prop="projectname">
-                <project ref="project" :data="form.projectname1" :sat_orderclueid="$route.query.id" @project="selectProject" :disabled="isuppictured === 1"></project>
+                <project ref="project" :data="form.projectname1" :sat_orderclueid="$route.query.id" @project="selectProject" :disabled="isuppictured === 1" placeholder="请选择关联项目"></project>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/HManagement/clueManage/m_activity/modules/addClue.vue

@@ -23,7 +23,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t('联系人')+':'" prop="name">
-                <contactsNewTemplate ownertable="" ownerid="" @contactData="contactData" :name="form.name" @inputChange="inputChange"></contactsNewTemplate>
+                <contactsNewTemplate ownertable="" ownerid="" @contactData="contactData" :name="form.name" @inputChange="inputChange" placement="left"></contactsNewTemplate>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/HManagement/clueManage/m_activity/modules/editClue.vue

@@ -23,7 +23,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t('联系人')" prop="name">
-                <contactsNewTemplate ownertable="" ownerid="" @contactData="contactData" :name="form.name" @inputChange="inputChange"></contactsNewTemplate>
+                <contactsNewTemplate ownertable="" ownerid="" @contactData="contactData" :name="form.name" @inputChange="inputChange" placement="left"></contactsNewTemplate>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/HManagement/ecycle/modules/recovery.vue

@@ -34,6 +34,7 @@
             :current-page="currentPage"
             :page-sizes="[20, 50, 100, 200]"
             :page-size="20"
+            layout="total,sizes, prev, pager, next, jumper"
             :total="total">
         </el-pagination>
       </div>

src/HManagement/projectTarget/target/modules/edit/components/table.vue

@@ -390,6 +390,7 @@
               :current-page="currentPage"
               :page-sizes="[20, 50, 100, 200]"
               :page-size="100"
+              layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
         </div>

src/HManagement/siteManage/securityConfig/index.vue

@@ -89,22 +89,20 @@
       </div>
     </div>
     <div class="panel" style="margin-bottom:16px">
-      <div class="flex-align-center flex-between">
-        <div class="flex-align-stretch">
-          <img width="72" height="72" src="../../../assets/icons/projectRule.svg" alt="">
+      <div style="display: flex;justify-content: space-between">
+        <img width="72" height="72" src="../../../assets/icons/projectRule.svg" alt="">
+        <div style="margin-right: 30px">
           <div class="text-panel">
-            <p class="explain-title">{{ $t('项目查重规则') }}</p>
-            <div style="display: flex;justify-content: left">
-              <div class="explain-tips">{{$t(`当前设置:`)}}</div>
-              <div class="explain-tips">{{$t(`排除文字：`) }}</div>
+            <div class="explain-title">{{ $t('项目查重规则') }}</div>
+            <div>
               <div class="explain-tips">
+                <span>{{$t(`当前设置:`)}}</span>
+                <span>{{$t(`排除文字：`)}}</span>
                 <span v-for="(item,index) in projectnameexcludefields">
                   <span v-if="index === projectnameexcludefields.length -1">{{$t(item)}}</span>
                   <span v-else>{{item + '、'}}</span>
                 </span>
-              </div>
-              <span class="explain-tips">,</span>
-              <div class="explain-tips">{{ $t('第一层') }}
+                ,{{ $t('第一层') }}
                 <span v-for="(item,index) in projectRule.fields1">
                   <span v-if="index === projectRule.fields1.length -1">{{$t(item)}}</span>
                   <span v-else>{{item + ','}}</span>

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

@@ -9,7 +9,7 @@
         <el-col :span="24" style="margin-top: 20px">
           <div>
             <span style="margin-right: 10px">{{$t(`项目名称查重排除文字`)}}:</span>
-            <el-tag v-for="(item,index) in projectnameexcludefields" :key="index" style="margin-right: 10px" closable @close="tagDel(item,index)">{{item}}</el-tag>
+            <el-tag v-for="(item,index) in projectnameexcludefields" :key="index" style="margin-right: 10px" class="mt-10" closable @close="tagDel(item,index)">{{item}}</el-tag>
             <el-button type="primary" size="mini" @click="setWordVisible = true">{{$t(`添加`)}}</el-button>
           </div>
         </el-col>

src/components/duplicatesCheck/competitorCheck.vue

@@ -51,6 +51,7 @@
           :current-page="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="20"
+          layout="total,sizes, prev, pager, next, jumper"
           :total="total"
         ></el-pagination>
       </div>

src/components/duplicatesCheck/customerChangeCheck.vue

@@ -74,6 +74,7 @@
           :current-page="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="20"
+          layout="total,sizes, prev, pager, next, jumper"
           :total="total"
         ></el-pagination>
       </div>

src/components/duplicatesCheck/customerCheck.vue

@@ -75,6 +75,7 @@
           :current-page="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="20"
+          layout="total,sizes, prev, pager, next, jumper"
           :total="total"
         ></el-pagination>
       </div>

src/components/duplicatesCheck/projectChangeCheck.vue

@@ -61,6 +61,7 @@
           :current-page="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="20"
+          layout="total,sizes, prev, pager, next, jumper"
           :total="total"
         ></el-pagination>
       </div>

src/components/duplicatesCheck/projectCheck.vue

@@ -55,6 +55,7 @@
           :current-page="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="20"
+          layout="total,sizes, prev, pager, next, jumper"
           :total="total"
         ></el-pagination>
       </div>

src/components/duplicatesData/duplicatesCompetitor.vue

@@ -36,6 +36,7 @@
           :current-page="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="20"
+          layout="total,sizes, prev, pager, next, jumper"
           :total="total"
         >
         </el-pagination>

src/components/duplicatesData/duplicatesCustomer.vue

@@ -65,6 +65,7 @@
           :current-page="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="20"
+          layout="total,sizes, prev, pager, next, jumper"
           :total="total"
         ></el-pagination>
       </div>

src/components/duplicatesData/duplicatesProject.vue

@@ -68,6 +68,7 @@
           :current-page="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="20"
+          layout="total,sizes, prev, pager, next, jumper"
           :total="total"
         ></el-pagination>
       </div>
@@ -119,6 +120,8 @@ export default {
       this.param.content.sa_projectid = this.data.sa_projectid;
       const res = await this.$api.requested(this.param);
       this.list = res.data;
+      this.total = res.total
+      this.currentPage = res.pageNumber
       this.dialogTableVisible = true;
       if (res.data.length !== 0) {
         this.tagData(this.$route.query.id);

src/template/clueModel/designer.vue

@@ -27,10 +27,10 @@
             :total="total">
         </el-pagination>
       </div>
-      <el-input v-if="disabled" v-model="contactsname" readonly  :placeholder="$t(`请选择设计院`)" slot="reference"  :disabled="sys_enterpriseid === '' || sys_enterpriseid === 0  " @focus="listData"></el-input>
-      <el-input v-else v-model="contactsname" readonly  :placeholder="$t(`请选择设计院`)" slot="reference"  disabled @focus="listData"></el-input>
+      <el-input v-if="disabled" v-model="contactsname" readonly  :placeholder="placeholder?$t(placeholder):$t(`请选择设计院`)" slot="reference"  :disabled="sys_enterpriseid === '' || sys_enterpriseid === 0  " @focus="listData"></el-input>
+      <el-input v-else v-model="contactsname" readonly  :placeholder="placeholder?$t(placeholder):$t(`请选择设计院`)" slot="reference"  disabled @focus="listData"></el-input>
     </el-popover>
-    <el-input v-else v-model="contactsname" readonly  :placeholder="$t(`请选择设计院`)" slot="reference"  disabled @focus="listData"></el-input>
+    <el-input v-else v-model="contactsname" readonly  :placeholder="placeholder?$t(placeholder):$t(`请选择设计院`)" slot="reference"  disabled @focus="listData"></el-input>
   </div>
 </template>
 
@@ -38,7 +38,7 @@
 import tableList from '@/components/table/index5';
 export default {
   name: "designer",
-  props:["sys_enterpriseid","data","disabled"],
+  props:["sys_enterpriseid","data","disabled","placeholder"],
   components:{tableList},
   data(){
     return {

src/template/clueModel/project.vue

@@ -36,10 +36,10 @@
           </el-pagination>
         </div>
       </div>
-      <el-input v-model="projectName" readonly  :placeholder="$t(`请选择关联项目`)" slot="reference"  :disabled="!disabled" >
+      <el-input v-model="projectName" readonly  :placeholder="placeholder?$t(placeholder):$t(`请选择关联项目`)" slot="reference"  :disabled="!disabled" >
       </el-input>
     </el-popover>
-    <el-input v-else v-model="projectName" readonly  :placeholder="$t(`请选择设计院`)" :disabled="!disabled" >
+    <el-input v-else v-model="projectName" readonly  :placeholder="placeholder?$t(placeholder):$t(`请选择设计院`)" :disabled="!disabled" >
     </el-input>
   </div>
 </template>
@@ -48,7 +48,7 @@
 import tableList from '@/components/table/index5';
 export default {
   name: "project",
-  props:["data","sat_orderclueid",'disabled'],
+  props:["data","sat_orderclueid",'disabled','placeholder'],
   components:{tableList},
   data(){
     return {