Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/components/ImageListPreview/index.vue

@@ -22,7 +22,7 @@
              v-else>
           <el-image :src="v.url"
                     class="avatar"
-                    :preview-src-list="fileList"
+                    :preview-src-list="previewSrcList"
                     :z-index="6000" />
           <!-- <i v-show="!disabled"
              class="el-icon-error"
@@ -50,7 +50,7 @@ export default {
         const list = Array.isArray(newVal) ? newVal : this.value.split(",");
         this.fileList = list.map((url) => ({ name: url, url }));
         this.previewSrcList=list.map((url) => url);
-        console.log("this.fileList",this.fileList);
+        console.log("this.fileList",this.fileList,this.previewSrcList);
       }        
         else{
           this.fileList =[];

src/views/system/user/index.vue

@@ -60,7 +60,7 @@
                 style="width: 200px"
               >
                 <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
+                  v-for="dict in dict.type.sys_user_is_lock"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
@@ -194,7 +194,7 @@
             >
               <template slot-scope="scope">
                 <dict-tag
-                  :options="dict.type.sys_normal_disable"
+                  :options="dict.type.sys_user_is_lock"
                   :value="scope.row.isLock"
                 />
               </template>