*

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

@@ -428,8 +428,6 @@ export default {
       //
       //   return;
       // }
-      console.log(this.queryParam)
-      return false
       this.$refs[formName].validate((valid) => {
         if (valid) {
           addCustomer(this.queryParam).then(result=>{

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

@@ -226,7 +226,7 @@
       },
       selCompany(item){
         this.queryParam.companyId = item.jskEid
-        this.queryParam.ownerCompany = item.name.replace(/<[^>]+>/g, '')
+        this.queryParam.companyName = item.name.replace(/<[^>]+>/g, '')
         this.showlist = false
       },
       handleALL(event){

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

@@ -36,7 +36,7 @@
           <div class="con i" style="width: 100%;">
             <span style="float: left;margin-top: 2px">项目标签 ：</span>
             <div class="flex tipinput">
-              <div class="tips" v-for="(item,index) in tipslit">{{item}}<img v-if="disabled == false" @click="deltip(item)" src="@/assets/images/project/del.png"></div>
+              <div class="tips" v-for="(item,index) in tipslit">{{item}}<img v-if="isDisabled == false" @click="deltip(item)" src="@/assets/images/project/del.png"></div>
               <div style="position: relative">
               <el-input placeholder="待添加" :disabled="isDisabled" v-model="tipsvalue" @input="getValue" :style="spanWidth"></el-input><span class="spanText">{{ tipsvalue }}</span>
               </div>

dsk-operate-ui/src/views/project/projectList/detail.vue

@@ -15,6 +15,12 @@
           <div class="titles">
             <img src="@/assets/images/project/headimg.png" class="headimg">
             <strong class="text">{{ProjectData.projectName}}</strong>
+            <div class="protypes i1" v-if="isDisabled == false">
+              <span v-for="(item,index) in projectStatus"><i v-if="ProjectData.status == item.dictValue">{{item.dictLabel}}</i></span>
+              <el-select class="sels" v-model="ProjectData.status" @change="editXMSL({status:ProjectData.status})">
+                <el-option v-for="(item,index) in projectStatus" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+              </el-select>
+            </div>
             <div class="locks" v-if="ProjectData.isFounder == 1">
               <div @click="islock=true">
               <img v-if="ProjectData.isPrivate == 0" src="@/assets/images/project/lock.png">
@@ -167,6 +173,7 @@
         projectStage:[],//项目阶段
         projectType:[],//项目类型
         projectCategory:[],//项目类别
+        projectStatus:[],//项目状态
         nowedit:-1,
         address:[],
         addresstxt:'待添加',
@@ -198,6 +205,10 @@
       getDictType('project_category').then(result=>{
         this.projectCategory = result.code == 200 ? result.data:[]
       })
+      //项目状态
+      getDictType('project_status_type').then(result=>{
+        this.projectStatus = result.code == 200 ? result.data:[]
+      })
       //获取基本信息
       this.getXMSL()
     },
@@ -235,6 +246,7 @@
           this.xmlx = result.data.projectType==""||result.data.projectType==null?"请选择":result.data.projectType
           this.xmlb = result.data.projectCategory==""||result.data.projectCategory==null?"请选择":result.data.projectCategory
           this.thisindex = result.data.projectStage
+          this.ProjectData.status = result.data.status.toString()
           let list = []
           let txt = ''
           if(result.data.provinceId != ""){
@@ -271,6 +283,9 @@
           return false
         let params = param
         params.id = this.id
+        if(param.status){
+          param.status = parseInt(param.status)
+        }
         editXMNR(JSON.stringify(params)).then(res=>{
           if (res.code == 200){
             this.$message.success('修改成功！')
@@ -398,6 +413,57 @@
   .head{
     .titles{
       line-height: 31px;
+      .protypes{
+        min-width: 96px;
+        padding: 0 18px;
+        height: 24px;
+        border-radius: 20px;
+        margin-left: 16px;
+        display: inline-block;
+        cursor: pointer;
+        font-size: 12px;
+        line-height: 24px;
+        text-align: center;
+
+        position: relative;
+        &.i1{
+          background: #FCF3DF;
+          color: #B5760B;
+          &:hover{
+            background: #F3E2BB;
+          }
+        }
+        &.i2{
+          background: #E5F6E4;
+          color: #09A442;
+          &:hover{
+            background: #B8EBB7;
+          }
+        }
+        &.i3{
+          background: #E5F2FF;
+          color: #0081FF;
+          &:hover{
+            background: #CBE5FF;
+          }
+        }
+        >span{
+          width: 100%;
+        }
+        .sels{
+          opacity: 0;
+        }
+        .el-select{
+          position: absolute;
+          top: 0;
+          width: 100%;
+          left: 0;
+          height: 24px;
+          ::v-deep.el-input,::v-deep.el-input__inner{
+            height: 24px;
+          }
+        }
+      }
       .headimg{
         float: left;
         margin-right: 16px;