Merge branch 'master' of http://112.74.164.79:3000/chenying/X-web

src/views/modules/works/work.vue

@@ -133,20 +133,21 @@
           </el-select>
         </el-form-item>
         <el-form-item label="移交用户" prop="transferUserId" label-width="120px">
-          <el-select v-model="transferDialogForm.transferUserId" placeholder="请选择移交用户">
-           <el-option
-            v-for="item in transferUserList"
-            :key="item.userId"
-            :label="item.name"
-            :value="item.userId">
-          </el-option>
-          </el-select>
+          <user-component v-model="transferDialogForm.transferUserId" :user-id.sync="transferDialogForm.transferUserId"></user-component>
+<!--          <el-select v-model="transferDialogForm.transferUserId" placeholder="请选择移交用户">-->
+<!--           <el-option-->
+<!--            v-for="item in transferUserList"-->
+<!--            :key="item.userId"-->
+<!--            :label="item.name"-->
+<!--            :value="item.userId">-->
+<!--          </el-option>-->
+<!--          </el-select>-->
         </el-form-item>
         <el-form-item label="移交说明" prop="transferExplain" label-width="120px">
           <el-input v-model="transferDialogForm.transferExplain" placeholder="请输入"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer">
         <el-button @click="transferDialogFormVisible = false">取 消</el-button>
         <el-button type="primary" @click="transferSubmit">确 定</el-button>
       </div>