update 表单页面附件保存/读取方式处理

Api/Ewide.Application/Ewide.Application.xml

@@ -839,7 +839,11 @@
             总共套数
             </summary>
         </member>
-        <!-- Badly formed XML comment ignored for member "P:Ewide.Application.HouseInfoInput.StraightHouseCount" -->
+        <member name="P:Ewide.Application.HouseInfoInput.StraightHouseCount">
+            <summary>
+            直管公房套数
+            </summary>
+        </member>
         <member name="P:Ewide.Application.HouseInfoInput.SelfHouseCount">
             <summary>
             自管公房套数
@@ -1060,7 +1064,11 @@
             总共套数
             </summary>
         </member>
-        <!-- Badly formed XML comment ignored for member "P:Ewide.Application.HouseInfoOutput.StraightHouseCount" -->
+        <member name="P:Ewide.Application.HouseInfoOutput.StraightHouseCount">
+            <summary>
+            直管公房套数
+            </summary>
+        </member>
         <member name="P:Ewide.Application.HouseInfoOutput.SelfHouseCount">
             <summary>
             自管公房套数

Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs

@@ -100,7 +100,7 @@ namespace Ewide.Application
 		/// 总共套数
 		/// </summary>
 		public int? HouseCount { get; set; }
-
+		/// <summary>
 		/// 直管公房套数
 		/// </summary>
 		public int? StraightHouseCount { get; set; }

Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs

@@ -100,7 +100,7 @@ namespace Ewide.Application
 		/// 总共套数
 		/// </summary>
 		public int? HouseCount { get; set; }
-
+		/// <summary>
 		/// 直管公房套数
 		/// </summary>
 		public int? StraightHouseCount { get; set; }

Api/Ewide.Core/Ewide.Core.xml

@@ -2017,6 +2017,41 @@
             账号已冻结
             </summary>
         </member>
+        <member name="F:Ewide.Core.ErrorCode.D1018">
+            <summary>
+            发送验证流程错误
+            </summary>
+        </member>
+        <member name="F:Ewide.Core.ErrorCode.D1019">
+            <summary>
+            没有可验证方式
+            </summary>
+        </member>
+        <member name="F:Ewide.Core.ErrorCode.D1020">
+            <summary>
+            验证错误
+            </summary>
+        </member>
+        <member name="F:Ewide.Core.ErrorCode.D1021">
+            <summary>
+            绑定失败
+            </summary>
+        </member>
+        <member name="F:Ewide.Core.ErrorCode.D1022">
+            <summary>
+            验证码失效
+            </summary>
+        </member>
+        <member name="F:Ewide.Core.ErrorCode.D1023">
+            <summary>
+            请不要频繁发送验证码
+            </summary>
+        </member>
+        <member name="F:Ewide.Core.ErrorCode.D1024">
+            <summary>
+            请不要频繁发送验证码
+            </summary>
+        </member>
         <member name="F:Ewide.Core.ErrorCode.D2000">
             <summary>
             父机构不存在
@@ -6859,6 +6894,26 @@
             员工信息
             </summary>
         </member>
+        <member name="P:Ewide.Core.Service.Usermailphone.Target">
+            <summary>
+            绑定的值
+            </summary>
+        </member>
+        <member name="P:Ewide.Core.Service.Usermailphone.Type">
+            <summary>
+            发送验证码类型,1为发送给原邮箱，2为发送给原手机号
+            </summary>
+        </member>
+        <member name="P:Ewide.Core.Service.Usermailphone.Orgcode">
+            <summary>
+             第一次验证码
+             </summary>
+        </member>
+        <member name="P:Ewide.Core.Service.Usermailphone.Code">
+            <summary>
+             第二次验证码
+             </summary>
+        </member>
         <member name="T:Ewide.Core.Service.SysUserDataScopeService">
             <summary>
             用户数据范围服务
@@ -7092,102 +7147,96 @@
             <param name="userParam"></param>
             <returns></returns>
         </member>
-        <member name="T:Ewide.Core.MachineUtil">
+        <member name="M:Ewide.Core.Service.SysUserService.SendCode(Ewide.Core.Service.Usermailphone)">
             <summary>
-            获取服务器信息
+            发送验证码
+             </summary>
+        </member>
+        <member name="M:Ewide.Core.Service.SysUserService.CheckBindcode(Ewide.Core.Service.Usermailphone)">
+            <summary>
+            检验验证码并且绑定
+             </summary>
+        </member>
+        <member name="F:Ewide.Core.Util.CodeHelper.code_Countdown">
+            <summary>
+            发送验证码间隔时间(秒)
             </summary>
         </member>
-        <member name="M:Ewide.Core.MachineUtil.GetMachineUseInfo">
+        <member name="F:Ewide.Core.Util.CodeHelper.Orgcode_Key">
             <summary>
-            获取资源使用信息
+             验证code
             </summary>
+        </member>
+        <member name="F:Ewide.Core.Util.CodeHelper.mailcode_Key">
+            <summary>
+            邮箱Code
+             </summary>
+        </member>
+        <member name="F:Ewide.Core.Util.CodeHelper.smscode_Key">
+            <summary>
+            手机Code
+             </summary>
+        </member>
+        <member name="M:Ewide.Core.Util.CodeHelper.Updatecode(System.String,System.Int32,System.String)">
+            <summary>
+            将code存入缓存
+            </summary>
+            <param name="way">验证方式</param>
+            <param name="code">验证码</param>
+            <param name="type">code的类型</param>
+        </member>
+        <member name="M:Ewide.Core.Util.CodeHelper.Checkcode(System.String,System.Nullable{System.Int32},System.String)">
+            <summary>
+            判断是否含有code
+            </summary>
+            <param name="way"></param>
+            <param name="code"></param>
+            <param name="type"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.MachineUtil.GetMachineBaseInfo">
+        <member name="M:Ewide.Core.Util.CodeHelper.Checkhavecode(System.String,System.String)">
             <summary>
-            获取基本参数
+            判断是否含有code
             </summary>
+            <param name="way"></param>
+            <param name="code"></param>
+            <param name="type"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.MachineUtil.GetMachineNetWorkInfo">
+        <member name="M:Ewide.Core.Util.CodeHelper.removecode(System.String,System.String)">
             <summary>
-            动态获取网络信息
+            删除相应缓存
             </summary>
+            <param name="way"></param>
+            <param name="type"></param>
+        </member>
+        <member name="M:Ewide.Core.Util.CodeHelper.IscodeCountdown(System.String,System.String,System.Int32)">
+            <summary>
+            code60秒才可再次发送
+            </summary>
+            <param name="way">验证类型</param>
+            <param name="num">值</param>
+            <param name="coundown"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.MachineUtil.IsUnix">
+        <member name="M:Ewide.Core.Util.CodeHelper.GetSmscodeCountdown(System.String,System.String)">
             <summary>
-            是否Linux
+            发送验证码倒计时
             </summary>
+            <param name="mobile"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.MachineUtil.GetCPURate">
+        <member name="M:Ewide.Core.Util.CodeHelper.SendSmscode(System.String,System.String,System.Int32)">
             <summary>
-            获取CPU使用率
+             发送手机验证码
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Ewide.Core.MachineUtil.GetRunTime">
-            <summary>
-            获取系统运行时间
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Ewide.Core.MachineUtil.GetRamInfo">
-            <summary>
-            获取内存信息
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Ewide.Core.MachineUtil.FormatTime(System.Int64)">
-            <summary>
-            毫秒转天时分秒
-            </summary>
-            <param name="ms"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Ewide.Core.MachineUtil.GetWanIpFromPCOnline">
-            <summary>
-            获取外网IP和地理位置
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="T:Ewide.Core.ShellUtil">
-            <summary>
-            系统Shell命令
             </summary>
         </member>
-        <member name="M:Ewide.Core.ShellUtil.Bash(System.String)">
+        <member name="M:Ewide.Core.Util.CodeHelper.SendMail(System.String,System.String,System.Int32)">
             <summary>
-            Bash命令
+            发送邮箱
             </summary>
-            <param name="command"></param>
+            <param name="mail"></param>
-            <returns></returns>
+            <param name="length"></param>
-        </member>
-        <member name="M:Ewide.Core.ShellUtil.Cmd(System.String,System.String)">
-            <summary>
-            cmd命令
-            </summary>
-            <param name="fileName"></param>
-            <param name="args"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Ewide.Core.NetworkInfo">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:Ewide.Core.NetworkInfo.GetNetworkInfo">
-            <summary>
-            当前正在联网的网卡信息
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Ewide.Core.NetworkInfo.GetInternetSpeed(System.Int32)">
-            <summary>
-            获取当前网卡的网络速度
-            </summary>
-            <param name="Milliseconds"></param>
             <returns></returns>
         </member>
         <member name="M:Ewide.Core.Util.MailHelper.#ctor(System.String,System.String)">
@@ -7295,6 +7344,104 @@
             写入种子数据  --不常用
             </summary>
         </member>
+        <member name="T:Ewide.Core.MachineUtil">
+            <summary>
+            获取服务器信息
+            </summary>
+        </member>
+        <member name="M:Ewide.Core.MachineUtil.GetMachineUseInfo">
+            <summary>
+            获取资源使用信息
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Ewide.Core.MachineUtil.GetMachineBaseInfo">
+            <summary>
+            获取基本参数
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Ewide.Core.MachineUtil.GetMachineNetWorkInfo">
+            <summary>
+            动态获取网络信息
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Ewide.Core.MachineUtil.IsUnix">
+            <summary>
+            是否Linux
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Ewide.Core.MachineUtil.GetCPURate">
+            <summary>
+            获取CPU使用率
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Ewide.Core.MachineUtil.GetRunTime">
+            <summary>
+            获取系统运行时间
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Ewide.Core.MachineUtil.GetRamInfo">
+            <summary>
+            获取内存信息
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Ewide.Core.MachineUtil.FormatTime(System.Int64)">
+            <summary>
+            毫秒转天时分秒
+            </summary>
+            <param name="ms"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Ewide.Core.MachineUtil.GetWanIpFromPCOnline">
+            <summary>
+            获取外网IP和地理位置
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:Ewide.Core.ShellUtil">
+            <summary>
+            系统Shell命令
+            </summary>
+        </member>
+        <member name="M:Ewide.Core.ShellUtil.Bash(System.String)">
+            <summary>
+            Bash命令
+            </summary>
+            <param name="command"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Ewide.Core.ShellUtil.Cmd(System.String,System.String)">
+            <summary>
+            cmd命令
+            </summary>
+            <param name="fileName"></param>
+            <param name="args"></param>
+            <returns></returns>
+        </member>
+        <member name="T:Ewide.Core.NetworkInfo">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:Ewide.Core.NetworkInfo.GetNetworkInfo">
+            <summary>
+            当前正在联网的网卡信息
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Ewide.Core.NetworkInfo.GetInternetSpeed(System.Int32)">
+            <summary>
+            获取当前网卡的网络速度
+            </summary>
+            <param name="Milliseconds"></param>
+            <returns></returns>
+        </member>
         <member name="T:Ewide.Core.ITreeNode">
             <summary>
             树基类

Web/src/pages/business/house/info/form/base/aspect.vue

@@ -102,7 +102,7 @@ export default {
 
         // 从数据中的文件id转换成uploader所需的格式
         if (record) {
-          const fileList = !!record.facadePhoto ? record.facadePhoto.split(',') : [];
+          const fileList = !!record.houseInfo.facadePhoto ? record.houseInfo.facadePhoto.split(',') : [];
           for (let i = 0; i < fileList.length; i++) {
             const file = await PreviewFile(fileList[i]);
             const base64 = await BlobToBase64(file);
@@ -115,7 +115,7 @@ export default {
             });
           }
         }
-
+        defaultForm.houseInfo.facadePhoto = facadePhoto;
         this.form = this.$_.cloneDeep({
           ...defaultForm,
         });

Web/src/pages/business/house/info/form/base/attachments.vue

@@ -109,22 +109,15 @@
   </a-form-model>
 </template>
 <script>
-import { GetFileName } from '@/util/file';
+import { GetFileName, PreviewFile, BlobToBase64 } from '@/util/file';
-
 /* 表单内容默认值 */
 const defaultForm = {
   /* ... */
-  // anEntryDocument: [],
-  // planningPermission: [],
-  // completionRecord: [],
-  // monitor: [],
-  // identificationReport: [],
-  // otherDocument: [],
   houseInfo: {
     anEntryDocument: [],
     planningPermission: [],
     completionRecord: [],
-    monitor: [],
+    monitorDocument: [],
     identificationReport: [],
     otherDocument: [],
   },
@@ -170,11 +163,27 @@ export default {
         // await this.onLoadCodes();
         /** 将默认数据覆盖到form */
         const record = this.param && this.param.record;
-        const form = this.$_.cloneDeep(defaultForm);
 
         if (record) {
-          this.$_.giveDeep(form, record);
+          // this.$_.giveDeep(form, record);
+          for (var key in defaultForm.houseInfo) {
+            const fileValue = [];
+            const fileList = !!record.houseInfo[key] ? record.houseInfo[key].split(',') : [];
+            for (let i = 0; i < fileList.length; i++) {
+              const file = await PreviewFile(fileList[i]);
+              const base64 = await BlobToBase64(file);
+              fileValue.push({
+                uid: fileList[i],
+                response: fileList[i], // 用于和新上传的文件一同回传
+                name: file.name,
+                url: base64,
+                status: 'done',
+              });
+            }
+            defaultForm.houseInfo[key] = fileValue;
+          }
         }
+        const form = this.$_.cloneDeep(defaultForm);
         this.form = form;
       }
       this.loading = false;
@@ -190,6 +199,9 @@ export default {
             const record = this.$_.cloneDeep(this.form);
 
             /** 验证通过后可以对数据进行转换得到想要提交的格式 */
+            for (var key in defaultForm.houseInfo) {
+              record.houseInfo[key] = record.houseInfo[key].map((p) => p.response).join(',');
+            }
             /* ... */
 
             reslove(record);

Web/src/pages/business/house/info/form/base/building.vue

@@ -608,18 +608,30 @@ export default {
         }
       }
     },
-
+    'form.houseInfo.landFloorCount'(value) {
-    'form.houseInfo.curtainWall'(value) {
+      this.form.houseInfo.totalFloor = value + this.form.houseInfo.underFloorCount;
-      this.frame.onTogglePane(!!+value, 'curtainWall');
     },
-    'form.houseInfo.faceBrick'(value) {
+    'form.houseInfo.underFloorCount'(value) {
-      this.frame.onTogglePane(value, 'faceBrick');
+      this.form.houseInfo.totalFloor = value + this.form.houseInfo.landFloorCount;
     },
-    'form.houseInfo.whiteWash'(value) {
+    // 'form.houseInfo.curtainWall'(value) {
-      this.frame.onTogglePane(value, 'whiteWash');
+    //   this.frame.onTogglePane(!!+value, 'curtainWall');
-    },
+    // },
-    'form.houseInfo.coating'(value) {
+    // 'form.houseInfo.faceBrick'(value) {
-      this.frame.onTogglePane(value, 'coating');
+    //   this.frame.onTogglePane(value, 'faceBrick');
+    // },
+    // 'form.houseInfo.whiteWash'(value) {
+    //   this.frame.onTogglePane(value, 'whiteWash');
+    // },
+    // 'form.houseInfo.coating'(value) {
+    //   this.frame.onTogglePane(value, 'coating');
+    // },
+    'form.houseInfo.completedDate': {
+      handler(newVal, oldVal) {
+        this.$emit('completedDateChanged', newVal.constructor === String ? newVal.substr(0, 4) : newVal.format('YYYY'));
+      },
+      deep: true,
+      immediate: false,
     },
   },
 

Web/src/pages/business/house/info/form/base/index.vue

@@ -13,6 +13,7 @@
                 :is="part.component"
                 :key="index"
                 :param="param"
+                @completedDateChanged="completedDateChanged"
                 ref="forms"
                 v-if="part.component"
               />
@@ -71,18 +72,18 @@ export default {
           title: '图纸资料存档处',
           component: () => import('./drawing'),
         },
-        // {
+        {
-        //   title: '相关附件资料',
+          title: '相关附件资料',
-        //   component: () => import('./attachments'),
+          component: () => import('./attachments'),
-        // },
+        },
         // // {
         // //   title: '物业维修资金',
         // //   component: () => import('./fund'),
         // // },
-        // {
+        {
-        //   title: '建筑概貌',
+          title: '建筑概貌',
-        //   component: () => import('./aspect'),
+          component: () => import('./aspect'),
-        // },
+        },
         {
           title: '调查单位',
           component: () => import('./unit'),
@@ -90,7 +91,6 @@ export default {
       ],
     };
   },
-
   methods: {
     /**
      * 循环子组件中的onGetData
@@ -114,6 +114,10 @@ export default {
         }
       });
     },
+    completedDateChanged(value) {
+      console.log(value);
+      this.$emit('completedDateChanged', value);
+    },
   },
 };
 </script>

Web/src/pages/business/house/info/form/base/ownership.vue

@@ -181,6 +181,7 @@
                     <a-input-number
                       :min="0"
                       :step="1"
+                      disabled
                       placeholder="几"
                       v-model="form.houseInfo.houseCount"
                     />
@@ -286,7 +287,29 @@ export default {
       },
     };
   },
-
+  watch: {
+    'form.houseInfo.straightHouseCount'(value) {
+      this.houseCountCal();
+    },
+    'form.houseInfo.selfHouseCount'(value) {
+      this.houseCountCal();
+    },
+    'form.houseInfo.otherCount'(value) {
+      this.houseCountCal();
+    },
+    'form.houseInfo.businessCount'(value) {
+      this.houseCountCal();
+    },
+    'form.houseInfo.changeHouseCount'(value) {
+      this.houseCountCal();
+    },
+    'form.houseInfo.resettlementHouseCount'(value) {
+      this.houseCountCal();
+    },
+    'form.houseInfo.privateHouseCount'(value) {
+      this.houseCountCal();
+    },
+  },
   async created() {
     this.onFillData();
   },
@@ -361,6 +384,16 @@ export default {
           };
         });
     },
+    houseCountCal() {
+      this.form.houseInfo.houseCount =
+        this.form.houseInfo.straightHouseCount +
+        this.form.houseInfo.selfHouseCount +
+        this.form.houseInfo.otherCount +
+        this.form.houseInfo.businessCount +
+        this.form.houseInfo.changeHouseCount +
+        this.form.houseInfo.resettlementHouseCount +
+        this.form.houseInfo.privateHouseCount;
+    },
   },
 };
 </script>

Web/src/pages/business/house/info/form/index.vue

@@ -58,10 +58,12 @@
               v-if="tab.show"
             >
               <component
+                :completed-year="completedYear"
                 :frame="self"
                 :id="id"
                 :is="tab.component"
                 :param="param"
+                @completedDateChanged="completedDateChanged"
                 ref="forms"
                 v-if="tab.component"
               />
@@ -78,6 +80,7 @@ export default {
 
   data() {
     return {
+      completedYear: '',
       saving: false,
       loading: true,
 
@@ -196,6 +199,10 @@ export default {
         pane.show = show;
       }
     },
+    completedDateChanged(value) {
+      this.completedYear = value;
+      console.log('top-index' + value);
+    },
   },
 };
 </script>

Web/src/pages/business/house/info/form/patrol/grade.vue

@@ -66,7 +66,7 @@ const defaultForm = {
 };
 
 export default {
-  props: ['param'],
+  props: ['param', 'completedYear'],
 
   data() {
     return {
@@ -97,9 +97,14 @@ export default {
       },
     };
   },
-
+  watch: {
+    completedYear(value) {
+      console.log('patrol-grade:' + value);
+    },
+  },
   async created() {
     this.onFillData();
+    console.log(this.param);
   },
 
   methods: {

Web/src/pages/business/house/info/form/patrol/index.vue

@@ -9,6 +9,7 @@
             <section :id="`form-${index}-${id}`" :key="index">
               <h5 v-if="part.title">{{part.title}}</h5>
               <component
+                :completed-year="completedYear"
                 :frame="frame"
                 :is="part.component"
                 :key="index"
@@ -43,7 +44,7 @@
 
 <script>
 export default {
-  props: ['id', 'param', 'frame'],
+  props: ['id', 'param', 'frame', 'completedYear'],
 
   data() {
     return {
@@ -52,10 +53,10 @@ export default {
           title: '巡查基本情况',
           component: () => import('./base'),
         },
-        // {
+        {
-        //   title: '房屋检查',
+          title: '房屋检查',
-        //   component: () => import('./inspection'),
+          component: () => import('./inspection'),
-        // },
+        },
         {
           title: '等级划分',
           component: () => import('./grade'),
@@ -71,7 +72,6 @@ export default {
       ],
     };
   },
-
   methods: {
     /**
      * 循环子组件中的onGetData

Web/src/pages/business/house/info/form/patrol/inspection.vue

@@ -36,8 +36,8 @@
               :custom-request="onFileUpload"
               :file-list="form.patrolInfo.settlementTiltFiles"
               :preview-file="onPreviewFile"
-              @change="onFileChange"
+              @change="(data) => onFileChange(data, 'settlementTiltFiles')"
-              @preview="onFilePreview"
+              @preview="(data) => onFilePreview(data, 'settlementTiltFiles')"
               list-type="picture-card"
             >
               <div>
@@ -62,8 +62,8 @@
               :custom-request="onFileUpload"
               :file-list="form.patrolInfo.otherInfoFiles"
               :preview-file="onPreviewFile"
-              @change="onFileChange"
+              @change="(data) => onFileChange(data, 'otherInfoFiles')"
-              @preview="onFilePreview"
+              @preview="(data) => onFilePreview(data, 'otherInfoFiles')"
               list-type="picture-card"
             >
               <div>
@@ -74,11 +74,11 @@
           </a-form-model-item>
         </a-col>
         <a-col :span="24">
-          <a-form-model-item class="ant-row-flex" label="主要安全隐患综述" prop="patrolInfo.MainSafety">
+          <a-form-model-item class="ant-row-flex" label="主要安全隐患综述" prop="patrolInfo.mainSafety">
             <a-textarea
               :auto-size="{ minRows: 3 }"
               placeholder="请输入主要安全隐患综述"
-              v-model="form.patrolInfo.MainSafety"
+              v-model="form.patrolInfo.mainSafety"
             />
           </a-form-model-item>
         </a-col>
@@ -98,7 +98,7 @@ const defaultForm = {
     settlementTiltFiles: [],
     otherInfo: null,
     otherInfoFiles: [],
-    MainSafety: null,
+    mainSafety: null,
   },
 };
 export default {
@@ -119,9 +119,14 @@ export default {
 
       /** 其他成员属性 */
       codes: {},
+      fileFieldArr: ['settlementTiltFiles', 'otherInfoFiles'],
     };
   },
   methods: {
+    /**
+     * 必要的方法
+     * 在打开编辑页时允许填充数据
+     */
     async onFillData() {
       this.loading = true;
       {
@@ -129,11 +134,45 @@ export default {
 
         /** 将默认数据覆盖到form */
         const record = this.param && this.param.record;
-        const form = this.$_.cloneDeep(defaultForm);
 
         if (record) {
-          this.$_.giveDeep(form, record);
+          // this.$_.giveDeep(form, record);
+          // this.fileFieldArr.forEach((key) => {
+          //   const fileValue = [];
+          //   const fileList = !!record.patrolInfo[key] ? record.patrolInfo[key].split(',') : [];
+          //   for (let i = 0; i < fileList.length; i++) {
+          //     const file = await PreviewFile(fileList[i]);
+          //     const base64 = await BlobToBase64(file);
+          //     fileValue.push({
+          //       uid: fileList[i],
+          //       response: fileList[i], // 用于和新上传的文件一同回传
+          //       name: file.name,
+          //       url: base64,
+          //       status: 'done',
+          //     });
+          //   }
+          //   defaultForm.patrolInfo[key] = fileValue;
+          // });
+          for (var key in defaultForm.patrolInfo) {
+            if (key.indexOf('Files') > -1) {
+              const fileValue = [];
+              const fileList = !!record.patrolInfo[key] ? record.patrolInfo[key].split(',') : [];
+              for (let i = 0; i < fileList.length; i++) {
+                const file = await PreviewFile(fileList[i]);
+                const base64 = await BlobToBase64(file);
+                fileValue.push({
+                  uid: fileList[i],
+                  response: fileList[i], // 用于和新上传的文件一同回传
+                  name: file.name,
+                  url: base64,
+                  status: 'done',
+                });
+              }
+              defaultForm.patrolInfo[key] = fileValue;
+            }
+          }
         }
+        const form = this.$_.cloneDeep(defaultForm);
         this.form = form;
       }
       this.loading = false;
@@ -150,8 +189,10 @@ export default {
             const record = this.$_.cloneDeep(this.form);
 
             /** 验证通过后可以对数据进行转换得到想要提交的格式 */
+            this.fileFieldArr.forEach((key) => {
+              record.patrolInfo[key] = record.patrolInfo[key].map((p) => p.response).join(',');
+            });
             /* ... */
-            //record.facadePhoto = record.facadePhoto.map((p) => p.response).join(',');
 
             reslove(record);
           } else {
@@ -178,8 +219,8 @@ export default {
     /* ... */
 
     /* 上传图片相关 Begin */
-    onFileChange({ fileList }) {
+    onFileChange({ fileList }, key) {
-      this.form.patrolInfo.settlementTiltFiles = fileList;
+      this.form.patrolInfo[key] = fileList;
     },
     onPreviewFile(file) {
       return new Promise((resolve) => {
@@ -198,10 +239,10 @@ export default {
         onError();
       }
     },
-    onFilePreview(file) {
+    onFilePreview({ file }, key) {
       const items = [];
-      for (let i = 0; i < this.form.patrolInfo.settlementTiltFiles.length; i++) {
+      for (let i = 0; i < this.form.patrolInfo[key].length; i++) {
-        const _file = this.form.patrolInfo.settlementTiltFiles[i];
+        const _file = this.form.patrolInfo[key][i];
         const img = new Image();
         const src = _file.url || _file.thumbUrl;
         img.src = src;
@@ -212,7 +253,7 @@ export default {
         });
       }
       this.$refs['photo-swipe'].initPhotoSwipe(items, {
-        index: this.form.patrolInfo.settlementTiltFiles.indexOf(file),
+        index: this.form.patrolInfo[key].indexOf(file),
       });
     },
     /* 上传图片相关 End */