Merge remote-tracking branch 'origin/master'

dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue

@@ -76,9 +76,9 @@
                   </el-form-item>
                 </div>
                 <div class="elcol">
-                  <el-form-item label="项目类型：" prop="projectType">
-                    <el-select v-model="addParam.projectType" style="width: 175px" class="form-content-width" placeholder="请选择项目类型">
-                      <el-option v-for="(item, index) in projectType" :key="index" :label="item.dictLabel" :value="item.dictValue" />
+                  <el-form-item label="项目类别：" prop="projectCategory">
+                    <el-select v-model="addParam.projectCategory" style="width: 175px" class="form-content-width" placeholder="请选择项目类别">
+                      <el-option v-for="(item, index) in projectCategory" :key="index" :label="item.dictLabel" :value="item.dictValue" />
                     </el-select>
                   </el-form-item>
                 </div>
@@ -86,9 +86,9 @@
 
               <div class="erow">
                 <div class="elcol">
-                  <el-form-item label="项目类别：" prop="projectCategory">
-                    <el-select v-model="addParam.projectCategory" style="width: 175px" class="form-content-width" placeholder="请选择项目类别">
-                      <el-option v-for="(item, index) in projectCategory" :key="index" :label="item.dictLabel" :value="item.dictValue" />
+                  <el-form-item label="项目状态：" prop="status">
+                    <el-select v-model="addParam.status" style="width: 175px" class="form-content-width" placeholder="请选择项目状态">
+                      <el-option v-for="(item, index) in status" :key="index" :label="item.dictLabel" :value="item.dictValue" />
                     </el-select>
                   </el-form-item>
                 </div>
@@ -188,6 +188,7 @@ export default {
         projectStage:'',
         projectCategory:'',
         investmentAmount:'',
+        status:'',
         isPrivate:0,
         customerId:'',
       },
@@ -202,6 +203,7 @@ export default {
       projectStage:[], //项目阶段
       projectType:[], //项目类型
       projectCategory:[], //项目类别
+      status:[], //项目状态
       isPrivate:[
         {
           value: 0,
@@ -342,6 +344,7 @@ export default {
               value:res.data[i].dictValue
             })
           }
+          this.status = res.data
         }
       })
     },

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -219,18 +219,20 @@ export default {
     },
     // 判断客户是否关联显示修改
     association(id){
-      customerInfo(id).then(res=>{
-        if(res.code == 200){
-          if(res.data.companyId == this.companyId && res.data.userId == this.$store.state.user.userId){
-            this.customerInfo = res.data
-            this.customerId = res.data.customerId
-          }else{
-            this.currentPath.pathName = 'overview'
+      if(id) {
+        customerInfo(id).then(res => {
+          if (res.code == 200) {
+            if (res.data.companyId == this.companyId && res.data.userId == this.$store.state.user.userId) {
+              this.customerInfo = res.data
+              this.customerId = res.data.customerId
+            } else {
+              this.currentPath.pathName = 'overview'
+            }
           }
-        }
-      }).catch(err=>{
-        this.currentPath.pathName = 'overview'
-      })
+        }).catch(err => {
+          this.currentPath.pathName = 'overview'
+        })
+      }
     }
 
   }