修复bug暂存

src/Form/QuotedPrice/add.vue

@@ -6,7 +6,7 @@
   </span>
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="项目报价">项目报价</el-dropdown-item>
-        <el-dropdown-item command="普通报价">普通报价</el-dropdown-item>
+        <el-dropdown-item command="客户报价">客户报价</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
 
@@ -59,7 +59,7 @@ export default {
           value:'1'
         },
         {
-          label:'普通报价',
+          label:'客户报价',
           value:'2'
         }
       ],

src/Form/QuotedPrice/edit.vue

@@ -479,7 +479,7 @@ export default {
       this.projectList()
     },
     async customerList(){
-      if (this.form.quotedpricetype === '普通报价'){
+      if (this.form.quotedpricetype === '客户报价'){
         this.customerParam.content.where.sa_projectid = 0
         this.customerParam.content.where.type = 2
       }else {

src/Form/marketing2/saler/add.vue

@@ -4,52 +4,52 @@
     <el-drawer
         title="创建业务员"
         :visible.sync="dialogVisible"
-        size="25%"
+        size="30%"
         direction="rtl"
         append-to-body
         :show-close="false"
         @close="dialogVisible = false">
       <div class="drawer__panel">
         <el-row>
-          <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="125px" size="small">
-            <el-col :span="24">
+          <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="75px" size="small">
+            <el-col :span="12">
               <el-form-item label="业务员:" prop="hrid">
                 <selectMenber  @selectMenber="selectMenber"></selectMenber>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item label="手机号:"  prop="phonenumber">
                 <el-input   v-model="form.phonenumber" placeholder="手机号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item  label="汇报对象:" prop="reporthrname">
                 <el-input   v-model="form.reporthrname" placeholder="汇报对象" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item  label="编号:" prop="hrcode">
                 <el-input   v-model="form.hrcode" placeholder="编号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item  label="邮箱:" prop="email">
                 <el-input   v-model="form.email" placeholder="邮箱" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item  label="部门:" prop="depname">
                 <el-input   v-model="form.depname" placeholder="部门" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item  label="区域:" prop="areaname">
                 <el-input  v-model="form.areaname" placeholder="区域" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item  label="最低授权折扣率:" prop="discountrate">
-                <el-input  v-model="form.discountrate" placeholder="最低授权折扣" ></el-input>
+            <el-col :span="15">
+              <el-form-item  label="最低授权折扣(%):" prop="discountrate" label-width="132px">
+                <el-input  v-model="form.discountrate" placeholder="请输入最低授权折扣" ></el-input>
               </el-form-item>
             </el-col>
           </el-form>

src/Form/marketing2/saler/edit.vue

@@ -4,54 +4,54 @@
     <el-drawer
         title="编辑业务员"
         :visible.sync="dialogVisible"
-        size="25%"
+        size="30%"
         direction="rtl"
         append-to-body
         :show-close="false"
         @close="dialogVisible = false">
       <div class="drawer__panel">
         <el-row>
-          <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="125px" size="small" disabled>
-            <el-col :span="24" >
+          <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="75px" size="small" disabled>
+            <el-col :span="12" >
               <el-form-item label="业务员:" prop="hrid" >
                 <selectMenber ref="salerName"  @selectMenber="selectMenbers" ></selectMenber>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item label="手机号:"  prop="phonenumber">
                 <el-input   v-model="form.phonenumber" placeholder="手机号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item  label="汇报对象:" prop="reporthrname">
                 <el-input   v-model="form.reporthrname" placeholder="汇报对象" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item  label="编号:" prop="hrcode">
                 <el-input   v-model="form.hrcode" placeholder="编号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item  label="邮箱:" prop="email">
                 <el-input   v-model="form.email" placeholder="邮箱" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item  label="部门:" prop="depname">
                 <el-input   v-model="form.depname" placeholder="部门" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item  label="区域:" prop="areaname">
                 <el-input  v-model="form.areaname" placeholder="区域" disabled></el-input>
               </el-form-item>
             </el-col>
           </el-form>
-          <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="125px" size="small">
-            <el-col :span="24">
-              <el-form-item  label="最低授权折扣率:" prop="discountrate">
-                <el-input  v-model="form.discountrate" placeholder="最低授权折扣率" ></el-input>
+          <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="132px" size="small">
+            <el-col :span="15">
+              <el-form-item  label="最低授权折扣(%):" prop="discountrate">
+                <el-input  v-model="form.discountrate" placeholder="请输入最低授权折扣" ></el-input>
               </el-form-item>
             </el-col>
           </el-form>

src/Form/publicCustomer/add.vue

@@ -145,6 +145,9 @@ export default {
         enterprisename:[
           { required: true, message: '输入客户名称', trigger: 'blur'},
         ],
+        type: [
+          { required: true, message: '还未选择客户类型', trigger: 'change' },
+        ],
         source:[
           { required: false, message: '请填写客户来源', trigger: 'blur'}
         ],

src/Form/publicCustomer/edit.vue

@@ -29,7 +29,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="客户来源:" prop="source">
+              <el-form-item label="客户来源:" >
                 <el-input v-model="form.source" placeholder="客户来源"></el-input>
               </el-form-item>
             </el-col>
@@ -141,6 +141,9 @@ export default {
         enterprisename:[
           { required: true, message: '输入客户名称', trigger: 'blur'},
         ],
+        type: [
+          { required: true, message: '还未选择客户类型', trigger: 'change' },
+        ],
         source:[
           { required: true, message: '请填写客户来源', trigger: 'blur'}
         ],

src/Form/salerPrivatecustomer/add.vue

@@ -17,8 +17,8 @@
                 <el-input v-model="form.enterprisename" placeholder="请输入客户名称" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" prop="type">
-              <el-form-item label="客户类型:" >
+            <el-col :span="12" >
+              <el-form-item label="客户类型:" prop="type">
                 <el-select v-model="form.type" placeholder="请选择客户类型" style="width: 100%">
                   <el-option
                       v-for="item in options.type"
@@ -166,7 +166,10 @@ export default {
       },
       rules:{
         enterprisename: [
-          { required: true, message: '输入客户', trigger: 'blur' },
+          { required: true, message: '输入客户名称', trigger: 'blur' },
+        ],
+        type: [
+          { required: true, message: '还未选择客户类型', trigger: 'change' },
         ],
       }
     }

src/Form/salerPrivatecustomer/edit.vue

@@ -18,7 +18,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="客户类型:" >
+              <el-form-item label="客户类型:" prop="type">
                 <el-select v-model="form.type" placeholder="请选择客户类型" style="width: 100%">
                   <el-option
                       v-for="item in options.type"
@@ -155,6 +155,9 @@ export default {
         enterprisename: [
           { required: true, message: '输入客户', trigger: 'blur' },
         ],
+        type: [
+          { required: true, message: '还未选择客户类型', trigger: 'change' },
+        ],
       }
     }
   },

src/HDrpManagement/projectChange/modules/modules/rival/index.vue

@@ -2,6 +2,7 @@
 <template>
   <div>
     <div style="margin-bottom: 15px">
+      <add class="inline-16" :data="data"></add>
       <el-input
           size="small"
           style="width: 200px;"
@@ -10,14 +11,13 @@
           placeholder="品牌名称/企业名称"
           @keyup.enter.native="listData(params.content.pageNumber= 1)"
           @clear="listData(params.content.pageNumber= 1)"
-          clearable></el-input>&nbsp;
+          clearable></el-input>
     </div>
     <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  height="calc(100vh - 340px)" >
       <template v-slot:customcol="scope">
         <p >{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
-
       </template>
       <div style="margin-top:16px;text-align:right">
         <el-pagination
@@ -36,6 +36,7 @@
 </template>
 
 <script>
+import add from './modules/add'
 export default {
   props:["data"],
   data () {
@@ -63,7 +64,7 @@ export default {
 
     }
   },
-  components:{},
+  components:{add},
   methods:{
     /*list (param) {
       param.content.sa_projectid = this.$route.query.id

src/HDrpManagement/projectChange/modules/modules/rival/modules/add.vue

@@ -0,0 +1,197 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="dialogFormVisible = true">添 加</el-button>
+    <el-drawer
+        title="关联竞争对手"
+        :visible.sync="dialogFormVisible"
+        size="25%"
+        direction="rtl"
+        :show-close="false"
+        append-to-body
+        @close="dialogFormVisible = false">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="82px">
+            <el-col :span="24">
+              <el-form-item  label="企业名称:" prop="enterprisename">
+                <el-popover
+                    placement="bottom"
+                    width="580"
+                    trigger="click"
+                    v-model="enterpriseShow"
+                    @show="enterpriseList">
+                  <el-table :data="enterprise.enterpriseData" @row-click="enterpriseData">
+                    <el-table-column
+                        label="品牌名称"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.brandname?scope.row.brandname:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="企业名称"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="优势信息"
+                        width="300">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.advantage?scope.row.advantage:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="劣势信息"
+                        width="300">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.industry?scope.row.industry:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="备注"
+                        width="300">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.remarks?scope.row.remarks:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <!--                    <el-table-column
+                                            fixed="right"
+                                            label="操作"
+                                            width="60">
+                                          <template slot-scope="scope">
+                                            <el-button type="text" @click="projectData(scope.row)">选择</el-button>
+                                          </template>
+                                        </el-table-column>-->
+                  </el-table>
+                  <div class="container normal-panel" style="text-align:right">
+                    <el-pagination
+                        background
+                        small
+                        @size-change="handleSizeChangeProject"
+                        @current-change="handleCurrentChangeProject"
+                        :current-page="enterprise.currentPage"
+                        :total="enterprise.total">
+                    </el-pagination>
+                  </div>
+                  <el-input slot="reference"  v-model="form.enterprisename" autocomplete="off" placeholder="请选择企业名称"   @input="selectEnterprise"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="品牌名称:">
+                <el-input  autosize v-model="form.brandname" placeholder="品牌名称" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="优势信息:">
+                <el-input  autosize v-model="form.advantage" placeholder="优势信息" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="劣势信息:" >
+                <el-input  autosize v-model="form.industry" placeholder="劣势信息" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="备注:" >
+                <el-input  autosize v-model="form.remarks" placeholder="备注" disabled></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </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="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "add",
+  props:["data"],
+  data(){
+    return {
+      enterpriseShow:false,
+      dialogFormVisible:false,
+      enterprise:{
+        enterpriseData:[],
+        total:0,
+        currentPage:0,
+      },
+      enterpriseParam:{
+        "content": {
+          "isExport": false,
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": "",
+            "tablefilter": {},
+            "sa_projectid": ''//不传差全部，传过滤掉对应项目中的数据
+          }
+        },
+        "id": 20221018164302,
+      },
+      form:{
+        "enterprisename":'',
+        "brandname":'',
+        "industry":'',
+        "sa_project_competeid": 0,
+        "sa_projectid": 1, //工程项目表ID
+        "contactsid": '', //可不传
+        "sa_competitorid": 1, //竞争对手ID
+        "important": '', //主要威胁 0/1
+        "advantage": "",
+        "inferiority": "",
+        "remarks": ""
+      },
+      rules:{
+        enterprisename:[
+          { required: true, message: '还未选择企业', trigger: 'change' },
+        ]
+      }
+    }
+  },
+  methods:{
+    /*可选企业列表*/
+    async enterpriseList(){
+      this.enterpriseParam.content.where.sa_projectid = this.data.sa_projectid
+      const res = await this.$api.requested(this.enterpriseParam)
+      this.enterprise.enterpriseData = res.data
+      this.enterprise.total = res.total
+      this.enterprise.currentPage = res.pageNumber
+      console.log(res)
+    },
+    selectEnterprise(){
+      this.enterpriseParam.content.where.condition = this.form.enterprisename
+      this.enterpriseList()
+    },
+    enterpriseData(val){
+      this.form = Object.assign({},this.form,val)
+      this.enterpriseShow = false
+    },
+    onSubmit(){
+      console.log(this.form)
+    },
+    /*企业分页*/
+    handleSizeChangeProject(val) {
+      // console.log(`每页 ${val} 条`);
+      this.enterpriseParam.content.pageSize = val
+      this.projectList()
+    },
+    handleCurrentChangeProject(val) {
+      // console.log(`当前页: ${val}`);
+      this.enterpriseParam.content.pageNumber = val
+      this.projectList()
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/publicManage/index.vue

@@ -16,7 +16,8 @@ vue
         <div v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</div>
       </template>
       <template v-slot:tbOpreation="scope">
-        <delete-btn class="inline-16" @deleteSuccess="$refs.basicLayout.listData()" :id="scope.data.data.sa_customerpoolid" nameId="20221009100602" nameKey="sa_customerpoolids" />
+<!--        <delete-btn class="inline-16" @deleteSuccess="$refs.basicLayout.listData()" :id="scope.data.data.sa_customerpoolid" nameId="20221009100602" nameKey="sa_customerpoolids" />-->
+        <delBtn class="inline-16"></delBtn>
         <editTemp class="inline-16" :data="scope.data.data"></editTemp>
       </template>
     </basicLayout>
@@ -25,6 +26,7 @@ vue
 
 <script>
 import editTemp from '@/Form/publicManage/edit.vue'
+import delBtn from './modules/delBtn'
 export default {
   data () {
     return {
@@ -37,7 +39,8 @@ export default {
     }
   },
   components:{
-    editTemp
+    editTemp,
+    delBtn
   },
   methods:{
     async getPeople () {

src/HDrpManagement/publicManage/modules/delBtn.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+    <el-button type="text" size="mini">删 除</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "delBtn"
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -127,12 +127,12 @@ export default {
           },
         ],
         systemInfo: [
-          {label:'创建人',value:this.mainData.createBy},
+          {label:'创建人',value:this.mainData.createby},
           {label:'发布人',value:this.mainData.checkby},
-          {label:'最近编辑人',value:this.mainData.editBy},
-          {label:'创建时间',value:this.mainData.createDate},
+          {label:'最近编辑人',value:this.mainData.changeby},
+          {label:'创建时间',value:this.mainData.createdate},
           {label:'发布时间',value:this.mainData.checkdate},
-          {label:'最近跟进时间',value:this.mainData.followDate},
+          /*{label:'最近跟进时间',value:this.mainData.followDate},*/
           {label:'最近编辑时间',value:this.mainData.changedate},
         ]
       }

src/HManagement/marketing2/saler/area/detail/index.vue

@@ -86,7 +86,7 @@ export default {
           value:this.mainData.reporthrname
         },
         {
-          label:'最低权限折扣率',
+          label:'最低权限折扣(%)',
           value:this.mainData.discountrate*100
         }
       ]

src/SDrpManagement/QuotedPrice/components/quotedPriceProduct.vue

@@ -12,7 +12,7 @@
           clearable>
       </el-input>
 
-      <importExcel style="float: right" @onSuccess="onSuccess" v-if="type === '普通报价'" ref="quoterImport" @checkForm="checkFormImport"></importExcel>
+      <importExcel style="float: right" @onSuccess="onSuccess" v-if="type === '客户报价'" ref="quoterImport" @checkForm="checkFormImport"></importExcel>
       <productTable style="float: right;margin-right: 10px;margin-bottom: 10px" :id="sa_projectid" @checkForm="checkForm" ref="quoterPrice" @productAdd="productData"></productTable>
       <delProduct style="float: right;margin-right: 10px" :data="selectDel" @delSuccess="delSuccess"></delProduct>
     </div>

src/SDrpManagement/QuotedPrice/index.vue

@@ -133,7 +133,7 @@ export default {
       ],
       isprojectList:[
         {
-          label:'普通报价',
+          label:'客户报价',
           value:'0'
         },
         {

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -470,7 +470,7 @@ export default {
       this.projectList()
     },
     async customerList(){
-      if (this.form.sa_projectid === '0' && this.form.type === '普通报价'){
+      if (this.form.sa_projectid === '0' && this.form.type === '客户报价'){
         this.customerParam.content.where.type = 2
       }else {
         this.customerParam.content.where.type = 4

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -9,7 +9,7 @@
         turnPageId="20221012164402"
         idname="sa_customersid"
         tags=""
-        :tabs="['详细信息','联系人信息','客户地址','财务信息','项目商机','报价单']"
+        :tabs="['详细信息','联系人信息','客户地址','开票信息','项目商机','报价单']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">