暂存

src/Form/publicCustomer/add.vue

@@ -52,7 +52,7 @@
                                       :total="total">
                                   </el-pagination>
                                 </div>-->
-                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference">工商查询</el-button>
+                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference" :disabled="form.enterprisename === ''">工商查询</el-button>
               </el-popover>
             </el-col>
             <el-col :span="24">
@@ -553,4 +553,8 @@ export default {
   /deep/.el-select,.el-cascader  {
     width: 100%;
   }
+  /deep/.el-input__prefix {
+    display: flex;
+    align-items: center;
+  }
 </style>

src/Form/publicCustomer/edit.vue

@@ -50,7 +50,7 @@
                                       :total="total">
                                   </el-pagination>
                                 </div>-->
-                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference">工商查询</el-button>
+                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference" :disabled="form.enterprisename === ''">工商查询</el-button>
               </el-popover>
             </el-col>
             <el-col :span="24">

src/Form/salerPrivatecustomer/add.vue

@@ -50,7 +50,7 @@
                     </template>
                   </el-table-column>
                 </el-table>
-                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference">工商查询</el-button>
+                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference" :disabled="form.enterprisename === ''">工商查询</el-button>
               </el-popover>
             </el-col>
             <el-col :span="24" >

src/Form/salerPrivatecustomer/edit.vue

@@ -23,6 +23,16 @@
                   width="900"
                   v-model="businessShow"
                   trigger="click">
+                <el-input
+                    style="width:300px;margin-bottom: 10px"
+                    placeholder="请输入内容"
+                    v-model="form.enterprisename"
+                    clearable
+                    @clear="businessSearch"
+                    size="mini"
+                    @keyup.enter.native="businessSearch">
+                  <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
+                </el-input>
                 <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">
@@ -51,7 +61,7 @@
                                       :total="total">
                                   </el-pagination>
                                 </div>-->
-                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference">工商查询</el-button>
+                <el-button size="mini" type="primary" style="width: 100%" @click="businessSearch" slot="reference" :disabled="form.enterprisename === ''">工商查询</el-button>
               </el-popover>
             </el-col>
             <el-col :span="24">

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

@@ -156,10 +156,12 @@ export default {
     },
     onClose () {
       this.$refs['ruleForm'].resetFields()
+      this.activityVisible = false
     },
     centerChange (data) {
       this.param.content.campaign_name = data[0].name
       this.param.content.sat_campaignid = data[0].sat_campaignid
+      this.param.content.cluesource = data[0].name
       this.activityVisible = false
     },
     /*工商信息*/

src/HManagement/clueManage/clue_public/modules/distribution_saler.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="default" size="small" @click="getWaitClue">自动分配</el-button>
+    <el-button type="primary" size="small" @click="getWaitClue">自动分配</el-button>
     <el-drawer :with-header="false" append-to-body :visible.sync="dialogTableVisible" size="90%" top="30px">
       <div class="container">
         <p class="normal-title" style="margin-bottom:16px">自动分配</p>

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

@@ -1,11 +1,6 @@
 <template>
   <div v-if="data.status !== '结束'" class="inline-16">
-    <el-popconfirm
-      title="确定结束当前活动吗？"
-      @confirm="finishRow()">
-      <el-button type="primary" slot="reference" size="mini">结 束</el-button>
-    </el-popconfirm>
-    
+      <el-button type="primary" slot="reference" size="mini" @click="onShow">结 束</el-button>
   </div>
 </template>
 
@@ -13,6 +8,21 @@
 export default {
   props:['data'],
   methods:{
+    onShow() {
+      this.$confirm('确定结束该活动嘛?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        closeOnClickModal:false
+      }).then(() => {
+        this.finishRow()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消结束该活动'
+        });
+      });
+    },
     async finishRow () {
       const res = await this.$api.requested({
         "classname": "webmanage.saletool.orderclue.ordercluecampaign",

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

@@ -1,6 +1,6 @@
 <template>
   <div class="inline-16">
-    <el-button :type="data.status === '结束'?'':'primary'" :disabled="data.status === '结束'" size="mini" @click="changeStatus">{{data.status === '新建'?'发 布':data.status === '结束'?'发 布':'取消发布'}}</el-button>
+    <el-button :type="data.status === '结束'?'':'primary'" :disabled="data.status === '结束'" size="mini" @click="onShow">{{data.status === '新建'?'发 布':data.status === '结束'?'发 布':'取消发布'}}</el-button>
   </div>
 </template>
 
@@ -11,6 +11,37 @@ export default {
     return {}
   },
   methods:{
+    onShow() {
+      if (this.data.status === '新建'){
+        this.$confirm('确定发布该活动嘛?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          closeOnClickModal:false
+        }).then(() => {
+          this.changeStatus()
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消发布'
+          });
+        });
+      }else {
+        this.$confirm('确定取消发布该活动嘛?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          closeOnClickModal:false
+        }).then(() => {
+          this.changeStatus()
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消撤销发布'
+          });
+        });
+      }
+    },
     async changeStatus () {
       if (this.data.status === '新建') {
         const res = await this.$api.requested({

src/SManagement/orderclue/components/selectActivity/selectActivity.vue

@@ -106,6 +106,8 @@ export default {
 					return e.sat_campaignid !== item.sat_campaignid
 				})
 			}
+
+      this.$emit('onSelect',this.selected)
 		},
 		showSelelctIcon (item) {
 			let _isSame = this.selected.some(m=>item.sat_campaignid === m.sat_campaignid)

src/components/businessMessage/index.vue

@@ -4,7 +4,17 @@
         placement="right"
         width="900"
         v-model="businessShow"
-        trigger="click">
+        >
+      <el-input
+          style="width:300px;margin-bottom: 10px"
+          placeholder="请输入内容"
+          v-model="keyWord"
+          clearable
+          @clear="businessSearch"
+          size="mini"
+          @keyup.enter.native="businessSearch">
+        <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
+      </el-input>
       <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">
@@ -22,7 +32,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-button size="small" type="primary" style="width: 100%" @click="businessSearch" slot="reference">工商查询</el-button>
+      <el-button size="small" type="primary" style="width: 100%" @click="businessSearch" slot="reference" :disabled="keyWord === ''">工商查询</el-button>
     </el-popover>
   </div>
 </template>
@@ -49,10 +59,12 @@ export default {
     /*工商查询*/
     async businessSearch(){
       console.log(this.keyWord,"关键词")
+     /* this.businessShow = false*/
       this.businessParam.content.keyword = this.keyWord
       const res = await this.$api.requested(this.businessParam)
       console.log(res,"工商查询结果")
       this.businessData = res.data
+      this.businessShow = true
     },
     /*选择工商信息*/
     businessSelect(val){
@@ -65,11 +77,13 @@ export default {
       }).then(() => {
 
         this.$emit("businessData",val)
+        this.businessData = []
         /*this.form.enterprisename = val.companyName
         this.form.address = val.address
         this.form.taxno = val.taxNum*/
 
       }).catch(() => {
+        this.businessData = []
         this.$message({
           type: 'info',
           message: '已取消更新客户信息'

src/components/normal-basic-layout/details/index.vue

@@ -11,7 +11,7 @@
           <div>
             <slot name="customOperation"></slot>
           </div>
-          <el-button v-if="tool.checkAuth($route.name,'delete') && delApiId" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData">删 除</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'delete') && delApiId" :type="checkDisabled()?'':'primary'" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData">删 除</el-button>
          
           <div v-if="!pageChange">
             <el-button :disabled="rowindex === 1" size="mini" icon="el-icon-arrow-left" @click="previous()"></el-button>

src/template/salesForecastUseProject/index.vue

@@ -111,6 +111,7 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
+        this.listData()
       })
     }
   },