Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

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

@@ -21,7 +21,7 @@
             <span>{{scope.column.data[scope.column.columnname]}}</span>
           </div>
           <div v-else-if="scope.column.columnname === 'tag'">
-            <el-tag v-for="item in scope.column.data.tag" color="#FA8C16" size="mini" type="warning" effect="dark" style="margin-right: 5px">
+            <el-tag v-for="(item,index) in scope.column.data.tag" color="#FA8C16" size="mini" type="warning" effect="dark" style="margin-right: 5px" :key="index">
               <span>{{item}}</span>
             </el-tag>
           </div>

src/template/clueModel/designer.vue

@@ -4,7 +4,8 @@
         placement="top"
         width="600"
         trigger="click"
-        v-model="popoverShow">
+        v-model="popoverShow"
+        v-if="!(sys_enterpriseid === '' || sys_enterpriseid === 0)">
       <el-input style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
       </el-input>
       <tableList height="600px"  style="margin-top: 10px"   :layout="tablecols" :data="list" :opwidth="200" :custom="true" @rowClick="rowClick"
@@ -27,6 +28,7 @@
       </div>
       <el-input v-model="contactsname" readonly  placeholder="请选择设计院" slot="reference"  :disabled="sys_enterpriseid === '' || sys_enterpriseid === 0 || !disabled" @focus="listData"></el-input>
     </el-popover>
+    <el-input v-else v-model="contactsname" readonly  placeholder="请选择设计院" slot="reference"  :disabled="sys_enterpriseid === '' || sys_enterpriseid === 0" @focus="listData"></el-input>
   </div>
 </template>
 

src/template/clueModel/designingInstitute.vue

@@ -4,7 +4,8 @@
         placement="top"
         width="600"
         trigger="click"
-        v-model="popoverShow">
+        v-model="popoverShow"
+        v-if="disabled">
       <el-input style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
       </el-input>
       <tableList height="600px"  style="margin-top: 10px"   :layout="tablecols" :data="list" :opwidth="200" :custom="true" @rowClick="rowClick"
@@ -59,7 +60,7 @@
       </div>
       <el-input v-model="enterprisename" readonly  placeholder="请选择设计院" slot="reference"  :disabled="!disabled"></el-input>
     </el-popover>
-
+    <el-input v-else v-model="enterprisename" readonly  placeholder="请选择设计院" slot="reference"  :disabled="!disabled"></el-input>
   </div>
 </template>
 

src/template/clueModel/project.vue

@@ -4,7 +4,8 @@
         placement="top"
         width="750"
         trigger="click"
-        v-model="popoverShow">
+        v-model="popoverShow"
+        v-if="disabled">
       <el-input style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
       </el-input>
       <tableList height="600px"  style="margin-top: 10px"   :layout="tablecols" :data="list" :opwidth="200" :custom="true" @rowClick="rowClick"
@@ -38,6 +39,8 @@
       <el-input v-model="projectName" readonly  placeholder="请选择关联项目" slot="reference"  :disabled="!disabled" >
       </el-input>
     </el-popover>
+    <el-input v-else v-model="projectName" readonly  placeholder="请选择设计院" :disabled="!disabled" >
+    </el-input>
   </div>
 </template>