Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/components/upload/WithView.vue

@@ -57,6 +57,9 @@ export default {
       }
     },
     async clearImg() {
+      if(!this.value.id){
+          return
+      }
       await removeFile({ fileId: this.value.id });
       this.$emit('input', {});
       this.$refs.uploadRef.clearFiles();
@@ -81,6 +84,7 @@ export default {
 
   img {
     max-width: 100%;
+    max-height: 100%;
   }
 }
 

src/views/system/organization/components/org-user-edit.vue

@@ -156,7 +156,7 @@
             </el-switch>
           </el-form-item>
           <el-form-item label="审批签名:" prop="signature">
-            <WithView :assetName="''" v-model="form.signature"></WithView>
+            <WithView :assetName="''" v-model="form.signature" style="max-height:370px"></WithView>
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">

src/views/system/organization/components/org-user-list.vue

@@ -153,10 +153,11 @@
 
     <ele-modal
       width="1000px"
-      :visible="userShow"
+      :visible.async="userShow"
       :close-on-click-modal="false"
       custom-class="ele-dialog-form"
       :maxable="true"
+        @close="userShow = false"
     >
       <UserSearch @search="reload1"></UserSearch>
       <!-- 数据表格 -->

src/views/system/parmasManage/search.vue

@@ -13,6 +13,11 @@
           <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="名称:">
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="模块名称:">
           <el-select style="width: 100%" v-model="where.moduleCode" clearable>
@@ -57,7 +62,8 @@
       // 默认表单数据
       const defaultWhere = {
         moduleCode: '',
-        code: ''
+        code: '',
+        name:''
       };
       return {
         // 表单数据