作业管理中人员选择界面修改

src/components/separationPoint/workshop.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="leftcon">
     <!-- <img src="../../assets/images/workshop.png" alt="" /> -->
-    <div class="leftsize">
+    <div class="lefttop">
       <el-form ref="form" :model="form" label-width="100px" :inline="true">
         <el-form-item label="车间">
           <el-select
@@ -64,6 +64,9 @@
         </el-form-item>
       </el-form>
     </div>
+    <div class="leftbottom">
+      <img src="../../assets/images/workshop.png" alt="" />
+    </div>
   </div>
 </template>
 
@@ -260,23 +263,20 @@ export default {
 .leftcon {
   width: 100%;
   height: 100%;
-  // background-color: rgba(229, 229, 229, 1);
   background-size: 100% 100%;
-  //   box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4);
-  // padding: 3% 4%;
-  .leftsize {
+  .lefttop {
+    width: 100%;
+    height: 60px;
+  }
+
+  .leftbottom {
     width: 1100px;
-    height: 100%;
-    background: #000;
-    background: url("../../assets/images/workshop.png") no-repeat center;
-    background-size: 100% 100%;
-    padding: 3% 4%;
-    margin: auto;
+    height: 780px;
+    margin: -16px 0 0 60px;
+    img {
+      width: 100%;
+      height: 100%;
+    }
   }
-  // img {
-  //   width: 1000px;
-  //   height: 830px;
-  //   margin-left: 80px;
-  // }
 }
 </style>

src/views/mes/job/jobm/NewOperations.vue

@@ -204,6 +204,30 @@
               <el-tab-pane label="人员选择" name="third">
                 <!--人员选择-->
                 <el-form ref="form" :model="form" label-width="70px">
+                  <el-form-item label="开始时间" prop="ticketStartTime">
+                    <el-date-picker
+                      v-model="form.ticketStartTime"
+                      type="datetime"
+                      placeholder="选择日期时间"
+                      align="right"
+                      :picker-options="pickerOptions"
+                      style="width: 100%"
+                      @change="ticketStartTimeChange"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="结束时间" prop="ticketEndTime">
+                    <el-date-picker
+                      v-model="form.ticketEndTime"
+                      type="datetime"
+                      placeholder="选择日期时间"
+                      align="right"
+                      :picker-options="pickerOptions"
+                      style="width: 100%"
+                      @change="ticketEndTimeChange"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
                   <el-form-item label="上锁人" prop="locker">
                     <el-select
                       v-model="form.locker"
@@ -220,7 +244,7 @@
                       />
                     </el-select>
                   </el-form-item>
-
+                  <!-- 
                   <el-form-item label="共锁人" prop="coLocker">
                     <el-select
                       v-model="form.coLocker"
@@ -239,39 +263,62 @@
                       >
                       </el-option>
                     </el-select>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="共锁人" prop="coLocker">
-                    <el-button type="primary" @click="addInside"
+                    <el-button
+                      type="primary"
+                      @click="addInside"
+                      class="gsr"
+                      size="mini"
                       >添加内部人员
                     </el-button>
-                    <el-button type="primary" @click="addOutside"
+                    <el-button type="primary" @click="addOutside" size="mini"
                       >添加外部人员
                     </el-button>
                   </el-form-item>
-                  <el-form-item label="开始时间" prop="ticketStartTime">
-                    <el-date-picker
-                      v-model="form.ticketStartTime"
-                      type="datetime"
-                      placeholder="选择日期时间"
-                      align="right"
-                      :picker-options="pickerOptions"
-                      style="width: 100%"
-                      @change="ticketStartTimeChange"
-                    >
-                    </el-date-picker>
-                  </el-form-item>
-                  <el-form-item label="结束时间" prop="ticketEndTime">
-                    <el-date-picker
-                      v-model="form.ticketEndTime"
-                      type="datetime"
-                      placeholder="选择日期时间"
-                      align="right"
-                      :picker-options="pickerOptions"
+                  <div class="text item">
+                    <el-table
+                      :data="sortedTicketUserDTOList"
+                      stripe
+                      height="480"
                       style="width: 100%"
-                      @change="ticketEndTimeChange"
                     >
-                    </el-date-picker>
-                  </el-form-item>
+                      <el-table-column prop="userId" label="序号" width="50">
+                      </el-table-column>
+                      <el-table-column
+                        prop="userName"
+                        label="共锁人"
+                        width="120"
+                      >
+                        <template slot-scope="scope">
+                          <span style="color: #2a87ff">{{
+                            scope.row.userName
+                          }}</span>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="userRole" label="共锁人来源">
+                        <template slot-scope="scope">
+                          <span>{{
+                            scope.row.userRole ? "内部" : "外部"
+                          }}</span>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="" width="80">
+                        <template slot-scope="scope">
+                          <el-button
+                            @click.native.prevent="
+                              deleteRow(scope.$index, sortedTicketUserDTOList)
+                            "
+                            type="text"
+                            size="small"
+                          >
+                            移除
+                          </el-button>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                  </div>
+
                   <el-form-item label="" prop="" style="margin-top: 100%">
                     <el-button
                       style="float: right; height: 30px; line-height: 10px"
@@ -979,6 +1026,10 @@ export default {
     cancel() {
       this.open = false;
     },
+    // 人员列表删除
+    deleteRow(index, rows) {
+      rows.splice(index, 1);
+    },
 
     //   时间选项
     ticketStartTimeChange() {},
@@ -1062,6 +1113,9 @@ export default {
       height: 30px;
       line-height: 10px;
     }
+    .gsr {
+      margin-left: 60px;
+    }
   }
 }