Merge branch 'pet' into dev

src/views/hidden/major/morehiddenchange/components/list.vue

@@ -135,7 +135,7 @@
       <el-table-column label="操作" width="220">
         <template slot-scope="{row}">
           <el-button icon="el-icon-view" size="mini" @click="goView(row.HIDDEN_ID,'view')">查看</el-button>
-          <el-button v-if="row.STATE =='13'" type="primary" icon="el-icon-view" size="mini" @click="goView(row.HIDDEN_ID,'edit')">整改</el-button>
+          <el-button v-if="row.STATE =='13' && loginUserId == row.RECTIFICATIONOR" type="primary" icon="el-icon-view" size="mini" @click="goView(row.HIDDEN_ID,'edit')">整改</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -203,7 +203,8 @@ export default {
         keyFindStateTime: '',
         keyFindEndTime: '',
         keyConfirmUser: ''
-      }
+      },
+      loginUserId: JSON.parse(sessionStorage.getItem('user')).USER_ID
     }
   },
   created() {

src/views/keyprojects/outsourced/components/list.vue

@@ -14,8 +14,8 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="施工相关方">
-            <el-select v-model="UNITS_ID" placeholder="请选择施工相关方" style="width: 100%;">
+            <el-select v-model="UNITS_ID" filterable placeholder="请选择施工相关方" style="width: 100%;">
-              <el-option v-for="item in unitsList" :key="item.UNITS_ID" :label="item.UNITS_NAME" :value="item.UNITS_ID" />
+              <el-option v-for="(item, index) in unitsList" :key="index" :label="item.UNITS_NAME" :value="item.UNITS_ID" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -425,6 +425,7 @@ export default {
         { UNITS_ID: this.form.UNITS_ID }
       ).then((data) => {
         this.unitsList = data.varList
+        this.$forceUpdate()
       }).catch((e) => {
       })
     },