sunyadv преди 5 години
родител
ревизия
e1b8cda21e
променени са 2 файла, в които са добавени 24 реда и са изтрити 4 реда
  1. 4 0
      ys_int/src/views/project/project.vue
  2. 20 4
      ys_int/src/views/project/projectDetail.vue

+ 4 - 0
ys_int/src/views/project/project.vue

@@ -75,7 +75,11 @@
                 <el-col :span="24">
                     <el-form-item label="项目经理" prop="managerId">
                         <el-select v-model="addForm.managerId" clearable filterable placeholder="请选择项目经理" value-key='id' style="width:510px">
+                            <!-- <el-option v-for="item in charger" :key="item.id" :label="item.username" :value="item">
+                            </el-option> -->
                             <el-option v-for="item in charger" :key="item.id" :label="item.username" :value="item">
+                                <span style="float: left">{{ item.username }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.companyName }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>

+ 20 - 4
ys_int/src/views/project/projectDetail.vue

@@ -162,25 +162,37 @@
                 <el-col :span="24" v-if="user.parentId == 1 && user.subordinateType == 0">
                     <el-form-item label="项目经理" prop="managerId">
                         <el-select v-model="editForm.managerId" @change="changeStaff(0)" clearable filterable placeholder="请选择项目经理" value-key='id' style="width:510px">
+                            <!-- <el-option v-for="item in charger" :key="item.id" :label="item.username" :value="item">
+                            </el-option> -->
                             <el-option v-for="item in charger" :key="item.id" :label="item.username" :value="item">
+                                <span style="float: left">{{ item.username }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.companyName }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="24">
                     <el-form-item label="资产方审批人">
                         <!--  prop="ownerApproverId" -->
-                        <el-select v-model="editForm.ownerApproverId" @change="changeStaff(0)" clearable filterable placeholder="请选择资产方审批人" value-key='id' style="width:190px">
+                        <el-select v-model="editForm.ownerApproverId" @change="changeStaff(0)" clearable filterable placeholder="请选择资产方审批人" value-key='id' style="width:510px">
+                            <!-- <el-option v-for="item in assets" :key="item.id" :label="item.username" :value="item.id">
+                            </el-option> -->
                             <el-option v-for="item in assets" :key="item.id" :label="item.username" :value="item.id">
+                                <span style="float: left">{{ item.username }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.companyName }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="24">
                     <el-form-item label="生产方审批人">
                         <!--  prop="customerApproverId" -->
-                        <el-select v-model="editForm.customerApproverId" @change="changeStaff(0)" clearable filterable placeholder="请选择生产方审批人" value-key='id' style="width:190px">
+                        <el-select v-model="editForm.customerApproverId" @change="changeStaff(0)" clearable filterable placeholder="请选择生产方审批人" value-key='id' style="width:510px">
+                            <!-- <el-option v-for="item in produce" :key="item.id" :label="item.username" :value="item.id">
+                            </el-option> -->
                             <el-option v-for="item in produce" :key="item.id" :label="item.username" :value="item.id">
+                                <span style="float: left">{{ item.username }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.companyName }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -188,7 +200,11 @@
                 <el-col :span="24">
                     <el-form-item label="项目普通用户">
                         <el-select v-model="editForm.users" @change="changeStaff(1)" clearable filterable multiple placeholder="请选择项目普通用户" style="width:510px">
+                            <!-- <el-option v-for="item in general" :key="item.id" :label="item.username" :value="item.id">
+                            </el-option> -->
                             <el-option v-for="item in general" :key="item.id" :label="item.username" :value="item.id">
+                                <span style="float: left">{{ item.username }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px;margin-right:17px;">{{ item.companyName }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>