Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/system/modules/UserModal.vue

@@ -1,13 +1,10 @@
 <template>
-  <a-drawer
+  <a-modal
     :title="title"
-    :maskClosable="true"
-    :width="drawerWidth"
-    placement="right"
+    width="80%"
     :closable="true"
-    @close="close"
+    @cancel="close"
     :visible="visible"
-    style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;"
   >
     <template slot="title">
       <div style="width: 100%;">
@@ -103,9 +100,7 @@
           </a-select>
         </a-form-item>
         <!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
-        <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-image-upload class="avatar-uploader" text="上传" v-model="fileList"></j-image-upload>
-        </a-form-item>
+
 
         <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-date-picker
@@ -147,6 +142,10 @@
             dictCode="activiti_sync"
           />
         </a-form-item>
+
+        <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-image-upload class="avatar-uploader" text="上传" v-model="fileList"></j-image-upload>
+        </a-form-item>
       </a-form>
     </a-spin>
 
@@ -155,7 +154,7 @@
       <a-button style="margin-right: .8rem" @click="handleCancel">取消</a-button>
       <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">提交</a-button>
     </div>
-  </a-drawer>
+  </a-modal>
 </template>
 
 <script>
@@ -698,7 +697,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
 .avatar-uploader > .ant-upload {
   width: 104px;
   height: 104px;
@@ -729,4 +728,12 @@ export default {
   background: #fff;
   border-radius: 0 0 2px 2px;
 }
+/deep/.ant-form-item{
+    width: 31%;
+}
+/deep/.ant-form{
+    display: flex;
+    width: 100%;
+    flex-wrap: wrap;
+}
 </style>