Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/contractManage/components/editContract.vue

@@ -89,7 +89,7 @@
                   trigger="manual"
                   v-model="projectVisible"
                   width="600">
-                  <seleteProject @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
+                  <seleteProject type="2" @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
                   <el-input readonly type="text" slot="reference" size="small" @focus="projectVisible=true;salerVisible = false;agentVisible=false" v-model="form.projectname"></el-input>
                 </el-popover>
               </el-form-item>
@@ -159,7 +159,7 @@
                   trigger="manual"
                   v-model="projectVisible"
                   width="600">
-                  <seleteProject @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
+                  <seleteProject type="1" @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
                   <el-input readonly type="text" slot="reference" size="small" @focus="projectVisible=true;salerVisible = false;agentVisible=false;accountVisible=false" v-model="form.projectname"></el-input>
                 </el-popover>
               </el-form-item>
@@ -287,7 +287,7 @@
                   trigger="manual"
                   v-model="projectVisible"
                   width="600">
-                  <seleteProject @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
+                  <seleteProject type="3" @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
                   <el-input readonly type="text" slot="reference" size="small" @focus="projectVisible=true;salerVisible = false;agentVisible=false;accountVisible=false" v-model="form.projectname"></el-input>
                 </el-popover>
               </el-form-item>
@@ -470,6 +470,8 @@ export default {
     editBtn () {
       this.form = Object.assign({},this.form,this.data)
       this.drawer = true
+      console.log(this.form);
+      
       this.$nextTick(() => {
         this.$refs.timeSelect.time = [this.form.begdate,this.form.enddate]
       })
@@ -513,9 +515,18 @@ export default {
       this.salerVisible = false 
     },
     projectChange (data) {
-      this.form.projectname = data.projectname
-      this.form.sa_projectid = data.sa_projectid
-      this.projectVisible = false
+      if (this.$route.query.type == '直销项目' || this.$route.query.type == '经销项目') {
+        this.$confirm('变更项目并保存后,将清空"产品清单"并重新拉取,确定执行吗?','提示',{
+          "confirmButtonText":"确定",
+          "cancelButtonText":"取消",
+          "type":"warning"
+        }).then (() => {
+          this.form.projectname = data.projectname
+          this.form.sa_projectid = data.sa_projectid
+          this.projectVisible = false
+        })
+        
+      }
     },
     accountChange (data) {
       this.form.enterprisename = data[0].enterprisename

src/HDrpManagement/contractManage/components/productClassList/productClassList.vue

@@ -12,7 +12,7 @@
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'brand'">
-            {{scope.column.data[scope.column.columnname][0].brandname}}
+            {{scope.column.data[scope.column.columnname][0] && scope.column.data[scope.column.columnname][0].brandname}}
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>

src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -33,7 +33,7 @@
             <p>{{scope.column.data.price * scope.column.data.qty}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'brand'">
-            {{scope.column.data[scope.column.columnname][0].brandname}}
+            {{scope.column.data[scope.column.columnname][0] && scope.column.data[scope.column.columnname][0].brandname}}
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>

src/HDrpManagement/contractManage/components/productList/addProduct.vue

@@ -18,7 +18,7 @@
               ></previewImage>
             </div>
             <div v-else-if="scope.column.columnname == 'brand'">
-              {{scope.column.data[scope.column.columnname][0].brandname}}
+              {{scope.column.data[scope.column.columnname][0] && scope.column.data[scope.column.columnname][0].brandname}}
             </div>
             <div v-else>{{scope.column.data[scope.column.columnname]}}</div>
             <span v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] != 0">--</span>

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -33,7 +33,7 @@
             <p>{{scope.column.data.price * scope.column.data.qty}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'brand'">
-            {{scope.column.data[scope.column.columnname][0].brandname}}
+            {{scope.column.data[scope.column.columnname][0] && scope.column.data[scope.column.columnname][0].brandname}}
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[[scope.column.columnname]] !== 0 && scope.column.columnname != 'operation' && scope.column.columnname != 'countPrice'">--</p>

src/HDrpManagement/contractManage/components/seleteProject.vue

@@ -66,7 +66,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 20,
-          "type":this.type,
+          "type":'',
           "where": {
               "condition": "",
           }

src/HDrpManagement/contractManage/index.vue

@@ -21,7 +21,7 @@
             size="small"
             v-model="area"
             placeholder="请选择范围"
-            @change="$refs.list.param.content.type=area;$refs.list.listData()"
+            @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.type=area;$refs.list.listData()"
           >
             <el-option
               v-for="item in areaList"
@@ -39,7 +39,7 @@
             v-model="type"
             placeholder="请选择合同类型"
             clearable
-            @change="$refs.list.param.content.where.type=type;$refs.list.listData()"
+            @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.where.type=type;$refs.list.listData()"
           >
             <el-option
               v-for="item in typeList"
@@ -57,7 +57,7 @@
             v-model="status"
             placeholder="请选择合同状态"
             clearable
-            @change="$refs.list.param.content.where.status=status;$refs.list.listData()"
+            @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.where.status=status;$refs.list.listData()"
           >
             <el-option label="新建" value="新建" ></el-option>
             <el-option label="审核" value="审核" ></el-option>

src/HDrpManagement/contractManage/modules/detail.vue

@@ -15,7 +15,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
-        <editBtn :modelList="modelList" v-if="tool.checkAuth($route.name,'update')" :disabled="mainData.status != '新建' || !isLeader" @onSuccess="queryMainData" :data="mainData" class="inline-16"/>
+        <editBtn :modelList="modelList" v-if="tool.checkAuth($route.name,'update')" :disabled="mainData.status != '新建' || !isLeader" @onSuccess="queryMainData;$refs.billno.listData()" :data="mainData" class="inline-16"/>
         <Del :idName="20221121202502" :id="mainData.sa_contractid" idKey="sa_contractids" class="inline-16" v-if="tool.checkAuth($route.name,'delete') && mainData.type == '新建' && isLeader"/>
         <submit-check :disabled="!isLeader" :data="mainData" @onSuccess="queryMainData" />
       </div>

src/HManagement/clueManage/clue_import/index.vue

@@ -77,10 +77,12 @@ export default {
   },
   methods:{
     statusChange () {
+      this.$refs.basicLayout.param.content.pageNumber = 1
       this.$refs.basicLayout.param.content.where.status = this.search.status
       this.$refs.basicLayout.listData()
     },
     typeChange () {
+      this.$refs.basicLayout.param.content.pageNumber = 1
       this.$refs.basicLayout.param.content.where.cluetype = this.search.cluetype
       this.$refs.basicLayout.listData()
     }

src/HManagement/clueManage/clue_private/index.vue

@@ -32,14 +32,14 @@
         </div>
         <div class="label_center">
           <p class="search__label">跟进状态:</p>
-          <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+          <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
             <el-option v-for="item in statusList" :label="item.value" :key="item.rowindex" :value="item.remarks">
             </el-option>
           </el-select>
         </div>
         <div class="label_center">
           <p class="search__label">分配状态:</p>
-          <el-select v-model="allocationstatus" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.basicLayout.param.content.where.allocationstatus = allocationstatus;$refs.basicLayout.listData()">
+          <el-select v-model="allocationstatus" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.allocationstatus = allocationstatus;$refs.basicLayout.listData()">
             <el-option label="待分配" value="待分配">
             </el-option>
             <el-option label="已分配" value="已分配">

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

@@ -18,7 +18,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation">
-        <recall class="inline-16" :data="mainData" @onSuccess="queryMainData"></recall>
+        <recall class="inline-16" v-if="mainData.status === '待跟进' || mainData.status === '跟进中' && mainData.isTeam !== '团队' && tool.checkAuth($route.name,'recall')" :data="mainData" @onSuccess="queryMainData"></recall>
       </div>
       <div slot="slot0" class="container normal-panel">
         <BaseInfo :detailInfo="detailInfo"/>

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

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="data.status === '待跟进' || data.status === '跟进中' && data.isTeam !== '团队'" class="inline-16" style="width:100%">
+  <div class="inline-16" style="width:100%">
     <el-popconfirm
       title="确定撤回当前线索吗？"
       @confirm="revoke()">

src/HManagement/clueManage/clue_public/index.vue

@@ -17,7 +17,7 @@
     <div slot="custom" style="display:flex">
       <div class="label_center">
         <p class="search__label">跟进状态:</p>
-        <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+        <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.basicLayout.param.content.pageNumber=1;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
           <el-option v-for="item in statusList" :label="item.value" :key="item.rowindex" :value="item.remarks">
           </el-option>
         </el-select>

src/HManagement/clueManage/m_activity/index.vue

@@ -86,10 +86,12 @@ export default {
       this.campaigntypeList = res.data
     },
     campaigntypeChange () {
+      this.$refs.basicLayout.param.content.pageNumber = 1
       this.$refs.basicLayout.param.content.where.type = this.search.type
       this.$refs.basicLayout.listData()
     },
     statusChange () {
+      this.$refs.basicLayout.param.content.pageNumber = 1
       this.$refs.basicLayout.param.content.where.status = this.search.status
       this.$refs.basicLayout.listData()
     },

src/SManagement/orderclue/index.vue

@@ -23,7 +23,7 @@
           size="small"
           v-model="area"
           placeholder="请选择范围"
-          @change="$refs.list.param.content.type=area;$refs.list.listData()"
+          @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.type=area;$refs.list.listData()"
         >
           <el-option
             v-for="item in areaList2"
@@ -35,7 +35,7 @@
       </div>
       <div class="label_center">
         <p class="search__label">跟进状态:</p>
-        <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.list.param.content.where.status = status;$refs.list.listData()">
+        <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.where.status = status;$refs.list.listData()">
           <el-option v-for="item in statusList" :label="item.value" :key="item.rowindex" :value="item.remarks">
           </el-option>
         </el-select>

src/SManagement/orderclue_detail/index.vue

@@ -18,15 +18,16 @@
         @detailCreate="detailCreate">
       <div slot="customOperation">
         <follow :detailInfo="mainData" 
+          v-if="tool.checkAuth($route.name,'follow')"
           @updataList="queryMainData();$refs.followDetail.getFollowDetail()" @onSuccess="$refs.followDetail.getFollowDetail()" :disabled="!isHandle"></follow>
         <!-- <move :data="mainData" 
           @updataList="queryMainData" 
           :teamList="teamList()"  
           v-if="userInfo.isAuth == 1 ? mainData.status == '待跟进' || mainData.status == '跟进中' : ''"></move> -->
-        <changeData :data="mainData" :disabled="!isHandle" class="inline-16"/>
-        <noNull class="inline-16" :disabled="!isHandle" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid"/>
-        <el-button :disabled="!isHandle" class="inline-16" size="mini" @click="goBack">退 回</el-button>
-        <Del class="inline-16" :disabled="!isHandle" :idName="20221123193702" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid" idKey="sat_orderclueids"/>
+        <changeData v-if="tool.checkAuth($route.name,'change')" :data="mainData" :disabled="!isHandle" class="inline-16"/>
+        <noNull v-if="tool.checkAuth($route.name,'change')" class="inline-16" :disabled="!isHandle" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid"/>
+        <el-button v-if="tool.checkAuth($route.name,'goBack')" :disabled="!isHandle" class="inline-16" size="mini" @click="goBack">退 回</el-button>
+        <Del v-if="tool.checkAuth($route.name,'delete')" class="inline-16" :disabled="!isHandle" :idName="20221123193702" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid" idKey="sat_orderclueids"/>
       </div>
       <div slot="slot1" class="container normal-panel">
         <BaseInfo :detailInfo="detailInfo"/>