项目商机、客户、公海客户查重

src/Form/projectChange/add.vue

@@ -4,20 +4,20 @@
     <el-drawer
         title="新建项目"
         :visible.sync="dialogFormVisible"
-        size="35%"
+        size="25%"
         direction="rtl"
         append-to-body
         :show-close="false"
         @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="130px" label-position="right" size="mini">
-            <el-col :span="12">
+          <el-form :model="form" :rules="rules" ref="form" label-width="123px" label-position="right" size="mini">
+            <el-col :span="24">
               <el-form-item label="项目名称:" prop="projectname">
                 <el-input v-model="form.projectname" placeholder="请输入项目名称"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="项目类型:" prop="projecttype">
                 <el-select v-model="form.projecttype" placeholder="请选择项目类型" size="mini">
                   <el-option
@@ -29,23 +29,23 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="项目预算(元):" prop="budgetary">
                 <el-input v-model="form.budgetary" placeholder="项目预算"></el-input>
               </el-form-item>
             </el-col>
 
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="项目规模:" prop="scale">
                 <el-input v-model="form.scale" placeholder="请输入项目规模"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="预计签约金额(元):" prop="signamount_due">
                 <el-input v-model="form.signamount_due" placeholder="请输入预计签约金额" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="项目等级:" prop="grade">
                 <el-select v-model="form.grade" placeholder="请选择项目等级" size="mini">
                   <el-option
@@ -57,7 +57,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="省市县:" prop="province">
                 <el-cascader
                     style="width:100%"
@@ -68,12 +68,12 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="详细地址:" prop="address">
                 <el-input v-model="form.address" placeholder="请输入详细地址"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="预计签约月份:" prop="signdate_due">
                 <el-date-picker
                     style="width: 100%"
@@ -89,8 +89,8 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="duplicateChecking" class="normal-btn-width">查 重</el-button>
+        <el-button  size="small" @click="onClose" class="normal-btn-width inline-16">取 消</el-button>
+        <duplicateCheck :data="form"></duplicateCheck>
         <el-button size="small" type="primary" @click="onSave" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -98,10 +98,11 @@
 </template>
 
 <script>
+import duplicateCheck from "@/HDrpManagement/projectChange/components/duplicateCheck";
 export default {
   name: "add",
   inject:['enterpriseList','projectType','projectLead','projectPanl'],
-  components:{},
+  components:{duplicateCheck},
   data(){
     return {
       pickerOptions: {
@@ -164,24 +165,6 @@ export default {
       this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
 
     },
-    /*手动查重*/
-    duplicateChecking(){
-      this.$refs.form.validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "id": 20221208184202,
-          "content": {
-            "projectname":this.form.projectname,
-            "address":this.form.address
-          },
-        })
-        console.log(res,"查重结果")
-        if (res.data.length !== 0){
-          console.log("重复")
-        }
-        this.checkResults = res.data.length
-      })
-    },
     /*自动查重判断*/
     duplicateCheck(){
       this.$refs.form.validate(async (valid) => {
@@ -190,7 +173,8 @@ export default {
           "id": 20221208184202,
           "content": {
             "projectname":this.form.projectname,
-            "address":this.form.address
+            "address":this.form.address,
+            "sa_projectid":this.form.sa_projectid
           },
         })
         console.log(res,"查重结果")
@@ -215,7 +199,7 @@ export default {
           }).catch(() => {
             this.$message({
               type: 'info',
-              message: '已取消删除'
+              message: '已取消创建'
             });
           });
         }else {

src/Form/projectChange/edit.vue

@@ -4,20 +4,20 @@
     <el-drawer
         title="编辑项目"
         :visible.sync="dialogFormVisible"
-        size="35%"
+        size="25%"
         direction="rtl"
         :show-close="false"
         append-to-body
         @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="130px" label-position="right" size="mini">
-            <el-col :span="12">
+          <el-form :model="form" :rules="rules" ref="form" label-width="123px" label-position="right" size="mini">
+            <el-col :span="24">
               <el-form-item label="项目名称:" prop="projectname">
                 <el-input v-model="form.projectname" placeholder="请输入项目名称" :disabled="data.putFlag !== 0"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="项目类型:" prop="projecttype">
                 <el-select v-model="form.projecttype" placeholder="请选择项目类型" size="mini">
                   <el-option
@@ -29,23 +29,23 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="项目预算(元):" prop="budgetary">
                 <el-input v-model="form.budgetary" placeholder="项目预算"></el-input>
               </el-form-item>
             </el-col>
 
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="项目规模:" prop="scale">
                 <el-input v-model="form.scale" placeholder="请输入项目规模"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="预计签约金额(元):" prop="signamount_due">
                 <el-input v-model="form.signamount_due" placeholder="请输入预计签约金额" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="项目等级:" prop="grade">
                 <el-select v-model="form.grade" placeholder="请选择项目等级" size="mini">
                   <el-option
@@ -57,7 +57,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="项目地址:" prop="province">
                 <el-cascader
                     :disabled="data.putFlag !== 0"
@@ -69,7 +69,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="详细地址:" prop="address">
                 <el-input v-model="form.address" placeholder="请输入详细地址" :disabled="data.putFlag !== 0"></el-input>
               </el-form-item>
@@ -90,7 +90,7 @@
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="duplicateChecking" class="normal-btn-width">查 重</el-button>
+        <duplicateCheck :data="form"></duplicateCheck>
         <el-button size="small" type="warning" @click="onSave" class="normal-btn-width">保 存</el-button>
       </div>
     </el-drawer>
@@ -98,10 +98,11 @@
 </template>
 
 <script>
+import duplicateCheck from "@/HDrpManagement/projectChange/components/duplicateCheck";
 export default {
   name: "add",
   inject:['enterpriseList','projectType','projectLead','projectPanl'],
-  components:{},
+  components:{duplicateCheck},
   props:['data','btnType'],
   data(){
     return {
@@ -161,24 +162,6 @@ export default {
       /*this.form.grade = parseInt(this.form.grade)*/
       console.log(this.form,"项目商机内容")
     },
-    /*手动查重*/
-    duplicateChecking(){
-      this.$refs.form.validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "id": 20221208184202,
-          "content": {
-            "projectname":this.form.projectname,
-            "address":this.form.address
-          },
-        })
-        console.log(res,"查重结果")
-        if (res.data.length !== 0){
-          console.log("重复")
-        }
-        this.checkResults = res.data.length
-      })
-    },
     /*自动查重判断*/
     duplicateCheck(){
       this.$refs.form.validate(async (valid) => {
@@ -187,7 +170,8 @@ export default {
           "id": 20221208184202,
           "content": {
             "projectname":this.form.projectname,
-            "address":this.form.address
+            "address":this.form.address,
+            "sa_projectid":this.form.sa_projectid
           },
         })
         console.log(res,"查重结果")
@@ -203,7 +187,7 @@ export default {
         this.duplicateCheck()
       }else {
         if (this.checkResults !== 0){
-          this.$confirm('该项目疑似重复，是否确认创建项目?', '提示', {
+          this.$confirm('该项目疑似重复，是否确认保存项目?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -212,7 +196,7 @@ export default {
           }).catch(() => {
             this.$message({
               type: 'info',
-              message: '已取消删除'
+              message: '已取消保存'
             });
           });
         }else {

src/Form/projectTask/add.vue

@@ -37,7 +37,6 @@
                 </div>
               </el-form-item>
             </el-col>
-            
           </el-form>
         </el-row>
         <div class="normal-margin">
@@ -118,7 +117,7 @@
         </div>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -324,9 +323,30 @@
         })
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
+          this.form = {
+            "sa_projtaskmagid": 0,
+            "taskname": "",
+            "sequence": 0,
+            "important": 0,
+            "onparties": 0,
+            "onstage": 0,
+            "projtaskmag_options": []
+          },
           this.drawer = false
         })
       },
+      onClose(){
+        this.drawer = false
+        this.form = {
+          "sa_projtaskmagid": 0,
+          "taskname": "",
+          "sequence": 0,
+          "important": 0,
+          "onparties": 0,
+          "onstage": 0,
+          "projtaskmag_options": []
+        }
+      }
     }
   }
 </script>

src/Form/publicCustomer/add.vue

@@ -24,13 +24,13 @@
                   width="600"
                   v-model="businessShow"
                   trigger="click">
-                <el-table :data="businessData" @row-click="businessSelect">
+                <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">
                       <span style="margin-left: 10px">{{ scope.row.companyName?scope.row.companyName:'--' }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column width="350" label="客户地址">
+                  <el-table-column  label="客户地址">
                     <template slot-scope="scope">
                       <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
                     </template>
@@ -144,7 +144,7 @@
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="duplicateChecking" class="normal-btn-width">查 重</el-button>
+        <duplicateCheck :data="form"></duplicateCheck>
         <el-button size="small" type="primary" @click="onSave" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -152,9 +152,11 @@
 </template>
 
 <script>
+import duplicateCheck from "@/SDrpManagement/salerPrivatecustomer/components/duplicateCheck";
 export default {
   name: "add",
   inject:['customerLead','customerType','arealist','publicList'],
+  components:{duplicateCheck},
   data(){
     return {
       dialogFormVisible:false,
@@ -210,26 +212,6 @@ export default {
     }
   },
   methods:{
-    /*手动查重*/
-    duplicateChecking(){
-      this.$refs.form.validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "id": 20221208172002,
-          "content": {
-            "enterprisename":this.form.enterprisename,
-            "taxno":this.form.taxno,
-            "address":this.form.address
-
-          },
-        })
-        console.log(res,"查重结果")
-        if (res.data.length !== 0){
-          console.log("重复")
-        }
-        this.checkResults = res.data.length
-      })
-    },
     /*工商查询*/
     async businessSearch(){
       this.businessParam.content.keyword = this.form.enterprisename
@@ -275,6 +257,7 @@ export default {
         const res = await this.$api.requested({
           "id": 20221208172002,
           "content": {
+            "sa_customersid":this.form.sa_customersid,
             "enterprisename":this.form.enterprisename,
             "taxno":this.form.taxno,
             "address":this.form.address
@@ -302,7 +285,7 @@ export default {
           }).catch(() => {
             this.$message({
               type: 'info',
-              message: '已取消删除'
+              message: '已取消创建'
             });
           });
         }else {

src/Form/publicCustomer/edit.vue

@@ -22,13 +22,13 @@
                   width="600"
                   v-model="businessShow"
                   trigger="click">
-                <el-table :data="businessData" @row-click="businessSelect">
+                <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">
                       <span style="margin-left: 10px">{{ scope.row.companyName?scope.row.companyName:'--' }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column width="350" label="客户地址">
+                  <el-table-column  label="客户地址">
                     <template slot-scope="scope">
                       <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
                     </template>
@@ -140,7 +140,7 @@
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="duplicateChecking" class="normal-btn-width">查 重</el-button>
+        <duplicateCheck :data="form"></duplicateCheck>
         <el-button size="small" type="warning" @click="onSave" class="normal-btn-width">保 存</el-button>
       </div>
     </el-drawer>
@@ -148,9 +148,11 @@
 </template>
 
 <script>
+import duplicateCheck from "@/SDrpManagement/salerPrivatecustomer/components/duplicateCheck";
 export default {
   name: "add",
   inject:['customerLead','customerType','arealist','publicList'],
+  components:{duplicateCheck},
   data(){
     return {
       dialogFormVisible:false,
@@ -246,26 +248,6 @@ export default {
       this.param.content.pageNumber = val
       this.businessSearch()
     },*/
-    /*手动查重*/
-    duplicateChecking(){
-      this.$refs.form.validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "id": 20221208172002,
-          "content": {
-            "enterprisename":this.form.enterprisename,
-            "taxno":this.form.taxno,
-            "address":this.form.address
-
-          },
-        })
-        console.log(res,"查重结果")
-        if (res.data.length !== 0){
-          console.log("重复")
-        }
-        this.checkResults = res.data.length
-      })
-    },
     /*自动查重判断*/
     duplicateCheck(){
       this.$refs.form.validate(async (valid) => {
@@ -273,6 +255,7 @@ export default {
         const res = await this.$api.requested({
           "id": 20221208172002,
           "content": {
+            "sa_customersid":this.form.sa_customersid,
             "enterprisename":this.form.enterprisename,
             "taxno":this.form.taxno,
             "address":this.form.address
@@ -291,7 +274,7 @@ export default {
         this.duplicateCheck()
       }else {
         if (this.checkResults !== 0){
-          this.$confirm('该客户疑似重复，是否确认创建客户?', '提示', {
+          this.$confirm('该客户疑似重复，是否确认保存客户?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -300,7 +283,7 @@ export default {
           }).catch(() => {
             this.$message({
               type: 'info',
-              message: '已取消删除'
+              message: '已取消保存'
             });
           });
         }else {

src/Form/salerPrivatecustomer/add.vue

@@ -4,7 +4,7 @@
     <el-drawer
         title="创建客户"
         :visible.sync="dialogFormVisible"
-        size="40%"
+        size="30%"
         direction="rtl"
         :show-close="false"
         append-to-body
@@ -20,16 +20,16 @@
             <el-col :span="4">
               <el-popover
                   placement="right"
-                  width="600"
+                  width="900"
                   v-model="businessShow"
                   trigger="click">
-                <el-table :data="businessData" @row-click="businessSelect">
+                <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">
                       <span style="margin-left: 10px">{{ scope.row.companyName?scope.row.companyName:'--' }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column width="350" label="客户地址">
+                  <el-table-column  label="客户地址">
                     <template slot-scope="scope">
                       <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
                     </template>
@@ -139,8 +139,9 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="duplicateChecking" class="normal-btn-width">查 重</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width inline-16">取 消</el-button>
+<!--        <el-button size="small" type="primary" @click="duplicateChecking" class="normal-btn-width">查 重</el-button>-->
+        <duplicateCheck :data="form"></duplicateCheck>
         <el-button size="small" type="primary" @click="onSave" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -168,9 +169,10 @@
 <script>
 import {mapGetters} from 'vuex'
 import enterprise from '@/SDrpManagement/salerPrivatecustomer/components/enterprise'
+import duplicateCheck from "@/SDrpManagement/salerPrivatecustomer/components/duplicateCheck";
 export default {
   name: "add",
-  components:{enterprise},
+  components:{enterprise,duplicateCheck},
   data(){
     return {
       dialogFormVisible:false,
@@ -276,26 +278,6 @@ export default {
       this.param.content.pageNumber = val
       this.businessSearch()
     },*/
-    /*手动查重*/
-    duplicateChecking(){
-      this.$refs.form.validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "id": 20221208172002,
-          "content": {
-            "enterprisename":this.form.enterprisename,
-            "taxno":this.form.taxno,
-            "address":this.form.address
-
-          },
-        })
-        console.log(res,"查重结果")
-        if (res.data.length !== 0){
-          console.log("重复")
-        }
-        this.checkResults = res.data.length
-      })
-    },
     /*自动查重判断*/
     duplicateCheck(){
       this.$refs.form.validate(async (valid) => {
@@ -303,6 +285,7 @@ export default {
         const res = await this.$api.requested({
           "id": 20221208172002,
           "content": {
+            "sa_customersid":this.form.sa_customersid,
             "enterprisename":this.form.enterprisename,
             "taxno":this.form.taxno,
             "address":this.form.address
@@ -330,7 +313,7 @@ export default {
           }).catch(() => {
             this.$message({
               type: 'info',
-              message: '已取消删除'
+              message: '已取消创建'
             });
           });
         }else {

src/Form/salerPrivatecustomer/edit.vue

@@ -20,16 +20,16 @@
             <el-col :span="4">
               <el-popover
                   placement="right"
-                  width="600"
+                  width="900"
                   v-model="businessShow"
                   trigger="click">
-                <el-table :data="businessData" @row-click="businessSelect">
+                <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">
                       <span style="margin-left: 10px">{{ scope.row.companyName?scope.row.companyName:'--' }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column width="350" label="客户地址">
+                  <el-table-column  label="客户地址">
                     <template slot-scope="scope">
                       <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
                     </template>
@@ -138,7 +138,7 @@
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="duplicateChecking" class="normal-btn-width">查 重</el-button>
+        <duplicateCheck :data="form"></duplicateCheck>
         <el-button size="small" type="warning" @click="onSave" class="normal-btn-width">保 存</el-button>
       </div>
     </el-drawer>
@@ -154,10 +154,11 @@
 
 <script>
 import enterprise from '@/SDrpManagement/salerPrivatecustomer/components/enterprise'
+import duplicateCheck from "@/SDrpManagement/salerPrivatecustomer/components/duplicateCheck";
 export default {
   name: "edit",
   props:['data','btnType'],
-  components:{enterprise},
+  components:{enterprise,duplicateCheck},
   data(){
     return {
       dialogFormVisible:false,
@@ -268,26 +269,6 @@ export default {
       this.param.content.pageNumber = val
       this.businessSearch()
     },*/
-    /*手动查重*/
-    duplicateChecking(){
-      this.$refs.form.validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "id": 20221208172002,
-          "content": {
-            "enterprisename":this.form.enterprisename,
-            "taxno":this.form.taxno,
-            "address":this.form.address
-
-          },
-        })
-        console.log(res,"查重结果")
-        if (res.data.length !== 0){
-          console.log("重复")
-        }
-        this.checkResults = res.data.length
-      })
-    },
     /*自动查重判断*/
     duplicateCheck(){
       this.$refs.form.validate(async (valid) => {
@@ -295,6 +276,7 @@ export default {
         const res = await this.$api.requested({
           "id": 20221208172002,
           "content": {
+            "sa_customersid":this.form.sa_customersid,
             "enterprisename":this.form.enterprisename,
             "taxno":this.form.taxno,
             "address":this.form.address
@@ -313,7 +295,7 @@ export default {
         this.duplicateCheck()
       }else {
         if (this.checkResults !== 0){
-          this.$confirm('该客户疑似重复，是否确认创建客户?', '提示', {
+          this.$confirm('该客户疑似重复，是否确认保存客户?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -322,7 +304,7 @@ export default {
           }).catch(() => {
             this.$message({
               type: 'info',
-              message: '已取消删除'
+              message: '已取消保存'
             });
           });
         }else {

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <add class="normal-margin" :data="data" @insertSuccess="onSuccess" style="float: left;"></add>
-    <div style="width: 20%;float: left;margin-left: 2%">
+    <div style="width: 20%;float: left;margin-left: 10px">
       <el-input
           placeholder="请输入内容"
           v-model="search"

src/HDrpManagement/competitor/detail/modules/addressManage/modules/toVoid.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="inline-16">
     <el-popconfirm
-        title="确定要作废该联系人嘛？"
+        title="确定要作废该客户地址嘛？"
         @confirm="toVoidRow()">
       <el-button slot="reference" size="small" type="text">作 废</el-button>
     </el-popconfirm>
@@ -11,7 +11,7 @@
         @close="dialogToVoidVisible = false"
     >
       <div slot="title" style="font-size: 15px">
-        作废联系人
+        作废客户地址
       </div>
       <div>
         <el-row :gutter="20">

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

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <add class="normal-margin" :data="data" @insertSuccess="onSuccess" style="float: left;"></add>
-    <div style="width: 20%;float: left;margin-left: 2%">
+<!--    <add class="normal-margin" :data="data" @insertSuccess="onSuccess" style="float: left;"></add>-->
+    <div class="normal-margin" style="width: 20%;">
       <el-input
           placeholder="请输入内容"
           v-model="search"
@@ -20,10 +20,10 @@
         </div>
         <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
-      <template v-slot:opreation="scope">
+<!--      <template v-slot:opreation="scope">
         <edit v-if="tool.checkAuth($route.name,'update')" :data="scope.data" @updateSuccess="onSuccess"></edit>
         <toVoid v-if="tool.checkAuth($route.name,'toVoid')" :data="scope.data" @toVoidSuccess="onSuccess"></toVoid>
-      </template>
+      </template>-->
     </tableLayout>
     <div style="margin-top:16px;text-align:right">
       <el-pagination

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <add class="normal-margin" :data="data"  @insertSuccess="onSuccess" style="float: left;"></add>
-    <div style="width: 20%;float: left;margin-left: 2%">
+    <div style="width: 20%;float: left;margin-left: 10px">
       <el-input
           placeholder="请输入内容"
           v-model="search"

src/HDrpManagement/projectChange/components/duplicateCheck.vue

@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="listData" class="inline-16 normal-btn-width">查 重</el-button>
+    <el-dialog title="重复的项目" :visible.sync="dialogTableVisible" append-to-body>
+      <el-table :data="duplicateData" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
+        <el-table-column property="projectname" label="项目名称" width="150"></el-table-column>
+        <el-table-column property="address" label="项目地址" ></el-table-column>
+        <el-table-column property="name" label="业务员" width="150"></el-table-column>
+      </el-table>
+      <div  class="container normal-panel" style="text-align:right">
+        <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20]"
+            layout="total,sizes, prev, pager, next, jumper"
+            :total="total">
+        </el-pagination>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" class="normal-btn-width" size="mini" @click="dialogTableVisible = false" >确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "duplicateCheck",
+  props:["data"],
+  data(){
+    return {
+      dialogTableVisible:false,
+      duplicateData:[],
+      total:0,
+      currentPage:0,
+      param:{
+        "id": 20221208184202,
+        "content": {
+          "projectname":'',
+          "address":'',
+          "sa_projectid":this.data.sa_projectid
+        },
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      this.param.content.projectname = this.data.projectname
+      this.param.content.address = this.data.address
+      this.param.content.sa_projectid = this.data.sa_projectid
+      const res = await this.$api.requested(this.param)
+      console.log(res,"查重结果")
+      if (res.data.length > 0){
+        this.dialogTableVisible = true
+        this.duplicateData = res.data
+        this.total = res.total
+        this.currentPage = res.pageNumber
+      }else {
+        this.$message({
+          message: '无重复数据',
+          type: 'success'
+        });
+      }
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -20,13 +20,13 @@
       <div slot="customOperation">
         <!-- 此区域提供了自定义操作按钮 -->
         <div class="inline-16" v-if="tool.checkAuth($route.name,'receive') && mainData.freeget === 1 && length === 0 ">
-          <receive  :id="mainData.sa_customersid" @onshow="show"></receive>
+          <receive  :id="mainData.sa_customersid" @receiveSuccess="receiveSuccess"></receive>
         </div>
         <div class="inline-16" v-if="tool.checkAuth($route.name,'distribution') && length === 0">
-          <distribution  :data="mainData" @onshow="onSuccess" @setSuccess="onSuccess"></distribution>
+          <distribution  :data="mainData"  @setSuccess="onSuccess"></distribution>
         </div>
         <div class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')">
-          <to_void  :id="mainData.sa_customersid" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>
+          <to_void  :id="mainData.sa_customersid"  @toVoidSuccess="onSuccess"></to_void>
         </div>
       </div>
       <div slot="slot0" >
@@ -199,11 +199,17 @@ export default {
     },
     show(){
       this.visible = false
+      this.$emit('onSuccess')
     },
     onSuccess(){
       this.visible = false
-      this.queryMainData(this.$route.query.id)
+      /*this.queryMainData(this.$route.query.id)*/
+      this.$store.dispatch('changeDetailDrawer',false)
+      this.$emit('onSuccess')
+    },
+    receiveSuccess(){
       this.$emit('onSuccess')
+      this.$store.dispatch('changeDetailDrawer',false)
     }
   },
   mounted () {

src/HDrpManagement/publicCustomer/modules/detail/operation/distribution.vue

@@ -71,6 +71,7 @@ export default {
         })
         this.tool.showMessage(res, ()=>{
           this.dialogForm = false
+          this.$store.dispatch('changeDetailDrawer',false)
           this.$emit("setSuccess")
         })
       })

src/HDrpManagement/publicCustomer/modules/detail/operation/receive.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button style="width:100%" slot="reference" block size="mini" @click="onReceive()">领取</el-button>
+    <el-button style="width:100%" slot="reference" block size="mini" @click="onShow">领 取</el-button>
   </div>
 </template>
 
@@ -9,6 +9,20 @@ export default {
   name: "receive",
   props:["id"],
   methods:{
+    onShow(){
+      this.$confirm('确定领取该客户嘛?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.onReceive()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
     async onReceive(){
       const res = await this.$api.requested({
         "id": 20221014160202,
@@ -17,7 +31,7 @@ export default {
         },
       })
       this.tool.showMessage(res,() => {
-        this.$emit("onshow")
+        this.$emit('receiveSuccess')
       })
     }
   }

src/SDrpManagement/QuotedPrice/detail/components/deApprove.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button slot="reference" size="mini" style="width:100%" @click="onShow" type="primary">反 审</el-button>
+    <el-button slot="reference" size="mini" style="width:100%" @click="onShow" type="primary">反审核(退回)</el-button>
   </div>
 </template>
 

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -23,9 +23,9 @@
         <!-- 此区域提供了自定义操作按钮 -->
         <submit_to class="inline-16" v-if="tool.checkAuth($route.name,'submit') && mainData.status === '新建'" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onSubmit="onSuccess"></submit_to>
         <toVoid class="inline-16" v-if="tool.checkAuth($route.name,'toVoid') && mainData.status === '新建'" :data="mainData.sa_quotedpriceid" ></toVoid>
-        <deApprove class="inline-16" v-if="tool.checkAuth($route.name,'deApprove') && mainData.status === '审核'" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onDeApprove="onSuccess"></deApprove>
         <copyTo class="inline-16" v-if="tool.checkAuth($route.name,'copyTo') && mainData.status === '新建'" :data="mainData.sa_quotedpriceid" ></copyTo>
         <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '提交'" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>
+        <deApprove class="inline-16" v-if="tool.checkAuth($route.name,'deApprove') && mainData.status !== '新建'" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onDeApprove="onSuccess"></deApprove>
       </div>
       <div slot="slot1" class=" normal-panel">
         <detailed :data="mainData"  v-if="flag"></detailed>

src/SDrpManagement/salerPrivatecustomer/components/duplicateCheck.vue

@@ -0,0 +1,85 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="listData" class="inline-16 normal-btn-width">查 重</el-button>
+    <el-dialog title="重复的项目" :visible.sync="dialogTableVisible" append-to-body>
+      <el-table :data="duplicateData" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
+        <el-table-column property="enterprisename" label="客户名称" width="150"></el-table-column>
+        <el-table-column property="address" label="客户地址" ></el-table-column>
+        <el-table-column property="taxno" label="企业税号" width="150"></el-table-column>
+      </el-table>
+      <div  class="container normal-panel" style="text-align:right">
+        <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20]"
+            layout="total,sizes, prev, pager, next, jumper"
+            :total="total">
+        </el-pagination>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" class="normal-btn-width" size="mini" @click="dialogTableVisible = false" >确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "duplicateCheck",
+  props:["data"],
+  data(){
+    return {
+      dialogTableVisible:false,
+      duplicateData:[],
+      total:0,
+      currentPage:0,
+      param:{
+        "id": 20221208172002,
+        "content": {
+          "sa_customersid":'',
+          "enterprisename":'',
+          "taxno":'',
+          "address":''
+        },
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      console.log(this.data,"数据")
+      this.param.content.sa_customersid = this.data.sa_customersid
+      this.param.content.enterprisename = this.data.enterprisename
+      this.param.content.taxno = this.data.taxno
+      this.param.content.address = this.data.address
+      const res = await this.$api.requested(this.param)
+      if (res.data.length > 0){
+        this.dialogTableVisible = true
+        this.duplicateData = res.data
+        this.total = res.total
+        this.currentPage = res.pageNumber
+      }else {
+        this.$message({
+          message: '无重复数据',
+          type: 'success'
+        });
+      }
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -19,12 +19,13 @@
       </div>
       <div slot="customOperation" >
         <!-- 此区域提供了自定义操作按钮 -->
-        <transaction_status class="inline-16" v-if="tool.checkAuth($route.name,'transaction')" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></transaction_status>
+<!--        <transaction_status class="inline-16" v-if="tool.checkAuth($route.name,'transaction')" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></transaction_status>-->
         <statusChange class="inline-16" v-if="tool.checkAuth($route.name,'statusChange')" :id="mainData.sa_customersid"  @statusChangeSuccess="statusChangeSuccess"></statusChange>
         <!--<lock class="inline-16" v-if="tool.checkAuth($route.name,'lock')"   :id="mainData.sa_customersid" @onshow="onSuccess"></lock>-->
          <!--<unlock class="inline-16" v-if="tool.checkAuth($route.name,'unlock')" :id="mainData.sa_customersid" @onshow="onSuccess"></unlock> -->
         <share class="inline-16" v-if="tool.checkAuth($route.name,'share') && mainData.poolname === ''" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></share>
-        <send_back style="display:inline" v-if="tool.checkAuth($route.name,'back') "  :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></send_back>
+<!--        <send_back style="display:inline" v-if="tool.checkAuth($route.name,'back') "  :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></send_back>-->
+        <toBack class="inline-16" v-if="tool.checkAuth($route.name,'back') && mainData.sa_customerpoolid_source !== 0" :data="mainData" @backSuccess="onSuccess"></toBack>
         <to_void class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>
         <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery') "  :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></recovery>
       </div>
@@ -70,6 +71,7 @@ import financial from '@/components/financialInfo/index.vue'
 import projectChange from './modules/projectChange/list'
 import quotedPrice from './modules/quotedPrice/list'
 import followLeads from './modules/followLeads/index'
+import toBack from "@/SDrpManagement/salerPrivatecustomer/detail/modules/operation/toBack";
 export default {
   name: "detail",
   data() {
@@ -104,7 +106,8 @@ export default {
     projectChange,
     quotedPrice,
     followLeads,
-    statusChange
+    statusChange,
+    toBack
   },
   methods:{
     async queryMainData(id) {
@@ -176,7 +179,7 @@ export default {
     onSuccess(){
       this.visible = false
       this.queryMainData(this.$route.query.id)
-      this.$emit('onSuccess')
+      /*this.$emit('onSuccess')*/
     },
     statusChangeSuccess () {
       this.$refs.details.refreshTag()

src/SDrpManagement/salerPrivatecustomer/detail/modules/operation/toBack.vue

@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <el-button class="inline-16" size="mini"   block @click="onshow">退回至公海</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "toBack",
+  props:["data"],
+  methods:{
+    onshow() {
+      this.$confirm('此操作会将客户退回公海, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.goBack()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消退回'
+        });
+      });
+    },
+    async goBack(){
+      const res = await this.$api.requested({
+        "id": 20221014102602,
+        "content": {
+          "sa_customerpoolid":this.data.sa_customerpoolid_source,//公海池id
+          "sa_customersids":[this.data.sa_customersid]//客户id
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.$store.dispatch('changeDetailDrawer',false)
+        this.$emit("backSuccess")
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>