Merge branch 'xiaoqin' into mergeBranch

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

@@ -48,16 +48,16 @@
       </div>
     </el-dialog>
     <el-drawer append-to-body size="80%" :with-header="false" :visible.sync="drawer">
+
       <div class="container">
         <p class="normal-title normal-margin">产品清单</p>
+         <div style="display:flex;align-items:center;margin-bottom:10px">
+            <el-input readonly type="text" placeholder="选择报价单" style="width:200px" size="small" @focus="drawer2=true;getQuotationList()" v-model="currentQuotation.billno"></el-input>
+          </div>
+        <el-divider></el-divider>
         <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:10px">
           <div style="display:flex;align-items:center">
             <el-input size="small" style="width:200px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
-            <div style="display:flex;justify-content:space-between;align-items:center;margin-left:10px">
-              <p style="font-size:14px;margin-right:10px">选择报价单:</p>
-
-              <el-input readonly type="text" style="width:300px" size="small" @focus="drawer2=true;getQuotationList()" v-model="currentQuotation.billno"></el-input>
-            </div>
           </div>
           <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>
         </div>
@@ -73,8 +73,8 @@
                 :deletebtn="false"
               ></previewImage>
             </div>
-            <div v-else-if="scope.column.columnname == 'brand'">
-              {{scope.column.data[scope.column.columnname][0] && scope.column.data[scope.column.columnname][0].brandname}}
+            <div v-else-if="scope.column.columnname == 'itemclass'">
+              {{scope.column.data[scope.column.columnname][0] && scope.column.data[scope.column.columnname][0].itemclassname}}
             </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 && scope.column.columnname != 'operation'">--</span>
@@ -284,5 +284,7 @@ export default {
 </script>
 
 <style scoped>
-
+.el-divider {
+  margin: 16px 0 !important;
+}
 </style>

src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -247,7 +247,7 @@ import {mapGetters} from 'vuex'
 
 import selectAgent from '@/HDrpManagement/contractManage/components/selectAgent'
 import TimeSelect from '@/HDrpManagement/contractManage/components/TimeSelect'
-import seleteProjectContract from '@/HDrpManagement/contractManage/components/seleteProjectContract'
+import seleteProjectContract from './seleteProjectContract'
 
 export default {
   props:['data'],
@@ -418,12 +418,12 @@ export default {
       this.form = Object.assign({},this.form,this.data)
       this.drawer = true
       this.contractType = type
-      if (type == '居间') {
-        this.$nextTick(() => {
-          this.$refs.projectContract.params.content.where.sa_projectid = this.data.sa_projectid
-          this.$refs.projectContract.queryEnterpriseArchives()
-        })
-      }
+      // if (type == '居间') {
+      //   this.$nextTick(() => {
+      //     this.$refs.projectContract.params.content.where.sa_projectid = this.data.sa_projectid
+      //     this.$refs.projectContract.queryEnterpriseArchives()
+      //   })
+      // }
     },
     async onSubmit () {
       this.$refs.form.validate(async val => {

src/HDrpManagement/projectChange/modules/modules/contract/components/seleteProjectContract.vue

@@ -0,0 +1,109 @@
+<template>
+  <div>
+      <div>
+        <div class="inline-16" style="margin-bottom:10px">
+          <el-input suffix-icon="el-icon-search" size="small" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="queryEnterpriseArchives(params.content.pageNumber = 1)" @clear="queryEnterpriseArchives(params.content.pageNumber = 1)" clearable></el-input> 
+        </div>
+        <el-table
+          :data="ENlist"
+          stripe
+          style="width: 100%"
+          height="300"
+          border>
+          <el-table-column
+            prop="billno"
+            label="合同编号"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="projectname"
+            label="合同名称"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="title"
+            label="标题">
+          </el-table-column>
+          <el-table-column>
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" @click="rowClick(scope.row)">选 择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="display:flex;justify-content:space-between;margin-top:16px;">
+          <div style="text-align:left">
+          <el-pagination
+              background
+              small
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="params.content.pageNumber"
+              :page-size="params.content.pageSize"
+              layout="total, prev, pager, next"
+              :total="total">
+            </el-pagination>
+          </div>
+          <el-button size="mini" @click="$emit('onCanel')">取消</el-button>
+        </div>
+        
+        
+      </div>
+      <!-- <el-input :validate-event="false" slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives"  placeholder="输入企业名称" clearable></el-input> -->
+  </div>
+</template>
+
+<script>
+export default {
+  props:['tag','type'],
+  data () {
+    return {
+      ENlist:[],
+      total:0,
+      currentPage:0,
+      form:{},
+      params:{
+        "id": 20221217145402,
+        "content": {
+          "nocache":true,
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+                "condition": ""
+            }
+        }
+      },
+      selected:''
+    }
+  },
+  methods:{
+    async queryEnterpriseArchives () {
+      this.params.content.where.sa_projectid = this.$route.query.id
+      const res = await this.$api.requested(this.params)
+      this.ENlist = res.data
+      this.total = res.total
+      console.log(this.ENlist,'项目合同列表');
+      
+    },
+    handleSizeChange(val) {
+      this.params.content.pageSize = val
+      this.queryEnterpriseArchives()
+    },
+    handleCurrentChange(val) {
+      this.params.content.pageNumber = val
+      this.queryEnterpriseArchives()
+    },
+    rowClick (row) {
+      this.$emit('onSelect',row)
+    },
+    onCancel () {
+      this.$emit('onCancel')
+    }
+  },
+  mounted () {
+    this.queryEnterpriseArchives()
+  }
+}
+
+</script>
+<style>
+</style>

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

@@ -15,7 +15,7 @@
       </div>
       <div slot="customOperation">
         <edit class="inline-16" :data="mainData" @onSuccess="queryMainData" v-if="tool.checkAuth($route.name,'update') && mainData.allocationstatus == '待分配'"/>
-        <distobutionOne v-if="tool.checkAuth($route.name,'distributionSaler') && mainData.allocationstatus == '待分配'" @onSuccess="$store.dispatch('changeDetailDrawer',false),$router.back()" />
+        <distobutionOne v-if="tool.checkAuth($route.name,'oneDistribution') && mainData.allocationstatus == '待分配'" @onSuccess="$store.dispatch('changeDetailDrawer',false),$router.back()" />
         <recall class="inline-16" v-if="mainData.allocationstatus != '待分配' && mainData.status === '待跟进' || mainData.status === '跟进中' && mainData.isTeam !== '团队' && tool.checkAuth($route.name,'recall')" :data="mainData" @onSuccess="queryMainData"></recall>
       </div>
       <div slot="slot1" class="container normal-panel">

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

@@ -18,7 +18,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation">
-        <distobutionOne v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="$store.dispatch('changeDetailDrawer',false),$router.back()" />
+        <distobutionOne v-if="tool.checkAuth($route.name,'oneDistribution')" @onSuccess="$store.dispatch('changeDetailDrawer',false),$router.back()" />
         <!-- <recall v-if="tool.checkAuth($route.name,'recall')" :data="mainData" @onSuccess="queryMainData"></recall> -->
       </div>
       <div slot="slot1" class="container normal-panel">

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

@@ -22,9 +22,9 @@
       </div>
       <div slot="slot0" class="container normal-panel">
         <DetailTable ref="DetailTable">
-          <addClue slot="addClue" :data="mainData" class="inline-16" v-if="tool.checkAuth($route.name,'handleClue')" @onSuccess="$refs.DetailTable.getList()"/>
+          <addClue slot="addClue" :data="mainData" class="inline-16" v-if="tool.checkAuth($route.name,'clueManage')" @onSuccess="$refs.DetailTable.getList()"/>
           <template v-slot:editClue="scope">
-            <editClue  v-if="tool.checkAuth($route.name,'handleClue')" :data="scope.data" @onSuccess="$refs.DetailTable.getList()"/>
+            <editClue  v-if="tool.checkAuth($route.name,'clueManage')" :data="scope.data" @onSuccess="$refs.DetailTable.getList()"/>
           </template>
         </DetailTable>
       </div>

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

@@ -32,8 +32,8 @@
 		</div>
 	</div>
   <el-empty v-if="tableData.length === 0" description="暂无数据" :image-size="40"></el-empty>
-  <el-button size="mini" type="text" style="margin-top:16px;float:right" @click="onCancel">取 消</el-button>
-	<el-button size="mini" type="primary" style="margin-top:16px;float:right;margin-right:10px" @click="onSelect">确 定</el-button>
+  <el-button size="mini" style="margin-top:16px;float:right" @click="onCancel">取 消</el-button>
+	<!-- <el-button size="mini" type="primary" style="margin-top:16px;float:right;margin-right:10px" @click="onSelect">确 定</el-button> -->
  	<div style="margin-top:16px;text-align:left">
     <el-pagination
     background

src/SManagement/sales_forecast/modules/bak/editProduct.vue

@@ -39,7 +39,7 @@
           <!-- <DownSelect title="提报要求:" :list="[{value:'按产品类别'},{value:'按产品类别 + 项目'}]" style="margin-right:16px" /> -->
         </div>
         <div class="right">
-          <add-product v-if="tool.checkAuth($route.name,'add_product')" type="product" :productList="productList" :tablecols="addProductTablecols"
+          <add-product v-if="tool.checkAuth($route.name,'projectProductListManage')" type="product" :productList="productList" :tablecols="addProductTablecols"
             @addSuccess="getSubmitList" />
         </div>
       </div>

src/SManagement/sales_forecast/modules/bak/editSales.vue

@@ -39,7 +39,7 @@
           <!-- <DownSelect title="提报要求:" :list="[{value:'按产品类别'},{value:'按产品类别 + 项目'}]" style="margin-right:16px" /> -->
         </div>
         <div class="right">
-          <add-project v-if="tool.checkAuth($route.name,'add_project')" @addSuccess="getSubmitList"/>
+          <add-project v-if="tool.checkAuth($route.name,'projectProductListManage')" @addSuccess="getSubmitList"/>
         </div>
       </div>
     </div>
@@ -56,7 +56,7 @@
       </template>
       <template v-slot:project_handle="scope">
         <div style="display:flex">
-          <add-product v-if="tool.checkAuth($route.name,'add_product')" :data1="scope" type="project" :productList="productList" :tablecols="addProductTablecols" @addSuccess="getSubmitList" />
+          <add-product v-if="tool.checkAuth($route.name,'projectProductListManage')" :data1="scope" type="project" :productList="productList" :tablecols="addProductTablecols" @addSuccess="getSubmitList" />
           <delete v-if="tool.checkAuth($route.name,'delete')" :rowData="scope.data" :projectid="scope.data.sa_projectid" @deleteSuccess="getSubmitList" />
         </div>
       </template>

src/SManagement/sales_forecast/modules/project.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="flex-align-center flex-between mt-10">
       <el-input style="width:200px" prefix-icon="el-icon-search" size="small" placeholder="搜索项目名称" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
-      <addProject v-if="checkDateOut && tool.checkAuth($route.name,'add_project')" :mainData="mainData" @onSuccess="listData(param.content.pageNumber = 1)"></addProject>
+      <addProject v-if="checkDateOut && tool.checkAuth($route.name,'projectProductListManage')" :mainData="mainData" @onSuccess="listData(param.content.pageNumber = 1)"></addProject>
     </div>
     <el-table
       :data="list"
@@ -30,7 +30,7 @@
         label="操作"
         width="150">
         <template slot-scope="scope">
-          <addProduct v-if="checkDateOut && tool.checkAuth($route.name,'add_product')" class="inline-16" :id="scope.row.sa_projectid" :mainData="mainData" @onSuccess="rowClick(act_row)"></addProduct>
+          <addProduct v-if="checkDateOut && tool.checkAuth($route.name,'projectProductListManage')" class="inline-16" :id="scope.row.sa_projectid" :mainData="mainData" @onSuccess="rowClick(act_row)"></addProduct>
           <el-button size="small" type="text" :disabled="!checkDateOut" @click="deleteProject(scope.row)">删 除{{scope.row.sa_salesforecastid}}</el-button>
         </template>
       </el-table-column>

src/SManagement/user/user-info/components/PassEdit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="password">
     <span @click="dialogVisible=true">编辑</span>
-    <el-dialog title="修改密码" :visible.sync="dialogVisible" :before-close="handleClose">
+    <el-dialog title="修改密码" append-to-body :visible.sync="dialogVisible" :before-close="handleClose">
       <el-form ref="form" :rules="rules" :model="form" label-width="80px">
         <el-form-item label="原密码" prop="pass">
           <el-input v-model="form.pass" placeholder="请输入原密码" autocomplete="off"></el-input>

src/SManagement/user/user-info/components/PhoneEdit.vue

@@ -4,7 +4,8 @@
   <el-dialog
     title="修改手机号"
     :visible.sync="dialogVisible"
-    :before-close="handleClose">
+    :before-close="handleClose"
+    append-to-body>
     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-form-item label="手机号" prop="phonenumber">
         <el-input v-model="form.phonenumber" placeholder="请输入" size="small"></el-input>