项目管理

dsk-operate-ui/src/store/modules/user.js

@@ -7,7 +7,8 @@ const user = {
     name: '',
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
+    userId:'',
   },
 
   mutations: {
@@ -25,6 +26,9 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_USERID: (state, userId) => {
+      state.userId = userId
     }
   },
 
@@ -60,6 +64,7 @@ const user = {
           }
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
+          commit('SET_USERID', user.userId)
           resolve(res)
         }).catch(error => {
           reject(error)

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -283,7 +283,7 @@
 <script>
   import { getToken } from "@/utils/auth";
   import "@/assets/styles/project.scss"
-  import {getCustomerList,importData} from '@/api/custom/custom'
+  import {getCustomerList,importData,addCustomer} from '@/api/custom/custom'
   import {getEnterprise,getDictType,} from '@/api/main'
   import prvinceTree from '@/assets/json/provinceTree'
   import axios from 'axios'
@@ -428,7 +428,7 @@ export default {
         list.push(item.cityId)
       if(item.districtId != null && item.districtId != "")
         list.push(item.districtId)
-      this.address = list
+      this.queryParam.address = list
       this.queryParam.registerAddress = item.registerAddress
       this.showlist = false
     },
@@ -441,24 +441,33 @@ export default {
       }
       this.$refs[formName].validate((valid) => {
         if (valid) {
-
+          addCustomer(this.queryParam).then(result=>{
+            if(result.code == 200){
+              this.$message.success('添加成功！')
+              this.dialogVisible = false
+              this.handleCurrentChange(1)
+              this.resetForm('ruleForm')
+            }else{
+              this.$message.error(result.msg)
+            }
+          })
         } else {
         }
       });
     },
     resetForm(formName) {
      this.queryParam = {
-          companyId:'',//jsk企业id
-          companyName:'',//客户名称（企业名称
-          customerLevel:'',//客户等级
-          legalPerson:'',//法定代表人
-          registerCapital:'',//注册资本
-          registerAddress:'',//企业注册地址
-          creditCode:'',//社会统一信用代码
-          address:'',//选择的地址
-           provinceId:'',
-           cityId:'',
-           districtId:'',
+        companyId:'',//jsk企业id
+        companyName:'',//客户名称（企业名称
+        customerLevel:'',//客户等级
+        legalPerson:'',//法定代表人
+        registerCapital:'',//注册资本
+        registerAddress:'',//企业注册地址
+        creditCode:'',//社会统一信用代码
+        address:'',//选择的地址
+        provinceId:'',
+        cityId:'',
+        districtId:'',
       },
       this.dialogVisible = false
       this.showlist = false

dsk-operate-ui/src/views/custom/overview/index.vue

@@ -149,8 +149,6 @@ export default {
         {name:'其他单位',sum:'44',point:'21%'},
       ],
       datatype:'1',//切换类型
-      dtdata:[],//数据
-      dttime:[],//坐标
       datalist:[
         {name:'重庆市江北区国有资本投资运营管理集团有限公司',time:'2023-05-30',text:'新增招标公告：【江北房地产综合开发公司名下不动产鲤鱼池片区资产评估项目】 公开选取【资产评估】机构的公告',tip1:'正向',tip2:'招标公告'},
         {name:'上海城投（集团）有限公司',time:'2023-05-29',text:'新增招标公告：北横通道新建工程——机电、装饰工程Ⅱ标段',tip1:'正向',tip2:'招标公告'},
@@ -404,8 +402,6 @@ export default {
         default:
           break;
       }
-      this.dtdata = datas
-      this.dttime = labels
       this.initDT(datas,labels)
     },
     handleCurrentChange(val) {

dsk-operate-ui/src/views/project/projectList/component/addProject.vue

+<template>
+  <el-dialog
+    class="popups"
+    width="534px"
+    :visible.sync="dialogVisible"
+    @close="resetForm('ruleForm')"
+  >
+    <div class="poptitle">
+      <img src="@/assets/images/economies/icon.png">
+      <span>添加客户</span>
+    </div>
+    <el-form class="popform j" :model="queryParam" :rules="rules" ref="ruleForm" label-width="130px">
+      <el-form-item label="项目名称：" class="row"  prop="name">
+        <el-input type="text" placeholder="请输入" v-model="queryParam.projectName" @input="getCompany"></el-input>
+      </el-form-item>
+      <el-form-item label="业主单位：" class="row"  prop="company">
+        <el-input type="text" placeholder="请输入" v-model="queryParam.ownerCompany" @input="getCompany"></el-input>
+        <div class="resultlist" v-if="showlist">
+          <div v-for="(item,index) in companData" @click="selCompany(item)"><span  v-html="item.name"></span></div>
+        </div>
+      </el-form-item>
+      <el-form-item label="项目阶段：" class="row">
+        <el-select  placeholder="请选择" v-model="queryParam.projectStage">
+          <el-option v-for="(item,index) in customerLevel" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目类型：" class="row">
+        <el-select  placeholder="请选择" v-model="queryParam.projectType">
+          <el-option v-for="(item,index) in customerLevel" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目类别：" class="row">
+        <el-select  placeholder="请选择" v-model="queryParam.projectCategory">
+          <el-option v-for="(item,index) in customerLevel" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="投资估算：" class="row">
+        <el-input type="text" placeholder="请输入" v-model="queryParam.investmentAmount"></el-input>
+      </el-form-item>
+      <el-form-item label="可见范围：" class="row">
+        <el-select  placeholder="请选择" v-model="queryParam.isPrivate">
+          <el-option v-for="(item,index) in Privatelist" :key="index" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <div class="popbot">
+        <div class="wordprimary">前往商机雷达寻找项目线索></div>
+        <div class="btn btn_cancel h32" @click="resetForm('ruleForm')">返回</div>
+        <div class="btn btn_primary h32" @click="submitForm('ruleForm')">新建商机</div>
+      </div>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    name: 'addProject',
+    data(){
+      return{
+        Privatelist:[
+          {
+          value:0,
+          label:'仅自己可见'
+        },{
+          value:1,
+            label:'他人可见'
+          }
+        ],//可见范围
+        dialogVisible:true,
+        queryParam:{
+          companyId:'',//jsk企业id
+          companyName:'',//客户名称（企业名称
+          customerLevel:'',//客户等级
+          legalPerson:'',//法定代表人
+          registerCapital:'',//注册资本
+          registerAddress:'',//企业注册地址
+          creditCode:'',//社会统一信用代码
+          address:'',//选择的地址
+          provinceId:'',
+          cityId:'',
+          districtId:'',
+        },
+        xmjd:[],//项目阶段
+        queryParam:{
+          userId:this.$store.state.user,//用户id
+          projectName:'',//	项目名称
+          companyId:'',//企业id
+          ownerCompany:'',//业主单位
+          projectStage:'',//项目阶段
+          projectType:'',//项目类型
+          projectCategory:'',//项目类别
+          investmentAmount:'',//投资估算
+          isPrivate:0,//可见范围(0 仅自己可见，1 他人可见)
+        },
+      }
+    },
+    mounted(){
+
+    },
+    created(){
+      //项目阶段
+      // project_stage_type
+    },
+    methods:{
+
+      //添加客户
+      submitForm(formName) {
+        if(this.queryParam.companyId=="" || this.queryParam.companyId == null){
+          this.$message.error({message:'请选择企业！',showClose:true})
+
+          return;
+        }
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            addCustomer(this.queryParam).then(result=>{
+              if(result.code == 200){
+                this.$message.success('添加成功！')
+                this.dialogVisible = false
+                this.handleCurrentChange(1)
+                this.resetForm('ruleForm')
+              }else{
+                this.$message.error(result.msg)
+              }
+            })
+          } else {
+          }
+        });
+      },
+      resetForm(formName) {
+        this.queryParam = {
+          companyId:'',//jsk企业id
+          companyName:'',//客户名称（企业名称
+          customerLevel:'',//客户等级
+          legalPerson:'',//法定代表人
+          registerCapital:'',//注册资本
+          registerAddress:'',//企业注册地址
+          creditCode:'',//社会统一信用代码
+          address:'',//选择的地址
+          provinceId:'',
+          cityId:'',
+          districtId:'',
+        },
+          this.dialogVisible = false
+        this.showlist = false
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

dsk-operate-ui/src/views/project/projectList/component/gjjl.vue

@@ -51,10 +51,11 @@
               </div>
             </div>
             <div class="rec_con">
-              <div><strong>{{name}}</strong> <span v-if="item.visitMode">({{item.visitMode}})</span></div>
+              <div><strong>{{item.nickName}}</strong> <span v-if="item.visitMode">({{item.visitMode}})</span></div>
               <div><span>{{item.content}}</span></div>
               <div class="rec_text">
                 <span>拜访对象：{{item.name||'--'}}</span>
+                <span v-if="showtype == 'gjdt'">关联企业：{{item.companyName||'--'}}</span>
                 <span>职位：{{item.position||'--'}}</span>
                 <span>拜访时间：{{item.createTime && item.createTime.slice(0, 10)}}</span>
                 <span>下次拜访时间：{{item.nextVisitTime == null?'--': item.createTime.slice(0, 10)}}</span>
@@ -89,7 +90,6 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
   import "@/assets/styles/project.scss"
   import {getFollowList,addFollowRecord,getUserList,delFollowRecord} from '@/api/custom/custom'
   import {getEnterprise,getDictType,} from '@/api/main'
@@ -126,9 +126,6 @@
       }
     },
     computed: {
-      ...mapGetters([
-        'name'
-      ])
     },
     created(){
       //获取拜访方式