银农独立app

src/router/index.js

@@ -1081,7 +1081,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalList',
   //   name: 'approvalList',
   //   meta: {
-  //     title: '常用转账列表',
+  //     title: '村户转账列表',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList'], resolve)
@@ -1108,7 +1108,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalList4',
   //   name: 'approvalList4',
   //   meta: {
-  //     title: '虚拟转账列表',
+  //     title: '代管转账列表',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList4'], resolve)
@@ -1153,7 +1153,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalDetail',
   //   name: 'approvalDetail',
   //   meta: {
-  //     title: '银农常用转账申请',
+  //     title: '银农村户转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail'], resolve)
@@ -1180,7 +1180,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalDetail4',
   //   name: 'approvalDetail4',
   //   meta: {
-  //     title: '银农虚拟转账申请',
+  //     title: '银农代管转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4'], resolve)
@@ -1225,7 +1225,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalAdd',
   //   name: 'approvalAdd',
   //   meta: {
-  //     title: '添加常用转账申请',
+  //     title: '添加村户转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd'], resolve)
@@ -1252,7 +1252,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalAdd4',
   //   name: 'approvalAdd4',
   //   meta: {
-  //     title: '添加虚拟转账申请',
+  //     title: '添加代管转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4'], resolve)
@@ -1333,7 +1333,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalModify',
   //   name: 'approvalModify',
   //   meta: {
-  //     title: '修改常用转账申请',
+  //     title: '修改村户转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify'], resolve)
@@ -1360,7 +1360,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalModify4',
   //   name: 'approvalModify4',
   //   meta: {
-  //     title: '修改虚拟转账申请',
+  //     title: '修改代管转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4'], resolve)
@@ -1649,7 +1649,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalList',
     name: 'approvalList',
     meta: {
-      title: '常用转账列表',
+      title: '村户转账列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList'], resolve)
@@ -1658,7 +1658,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalList2',
     name: 'approvalList2',
     meta: {
-      title: '信用卡转账列表',
+      title: '公务卡转账列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList2'], resolve)
@@ -1676,7 +1676,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalList4',
     name: 'approvalList4',
     meta: {
-      title: '虚拟转账列表',
+      title: '代管转账列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList4'], resolve)
@@ -1721,7 +1721,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalDetail',
     name: 'approvalDetail',
     meta: {
-      title: '银农常用转账申请',
+      title: '银农村户转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail'], resolve)
@@ -1748,7 +1748,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalDetail4',
     name: 'approvalDetail4',
     meta: {
-      title: '银农虚拟转账申请',
+      title: '银农代管转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail4'], resolve)
@@ -1793,7 +1793,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalAdd',
     name: 'approvalAdd',
     meta: {
-      title: '添加常用转账申请',
+      title: '添加村户转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd'], resolve)
@@ -1820,7 +1820,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalAdd4',
     name: 'approvalAdd4',
     meta: {
-      title: '添加虚拟转账申请',
+      title: '添加代管转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4'], resolve)
@@ -1901,7 +1901,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalModify',
     name: 'approvalModify',
     meta: {
-      title: '修改常用转账申请',
+      title: '修改村户转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify'], resolve)
@@ -1928,7 +1928,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalModify4',
     name: 'approvalModify4',
     meta: {
-      title: '修改虚拟转账申请',
+      title: '修改代管转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify4'], resolve)

src/views/homesteadSurvey/add.vue

@@ -2108,7 +2108,7 @@
       <van-popup v-model="shownmfwlyzk" position="bottom">
         <van-picker
           show-toolbar
-          :columns="lyzkOptions"
+          :columns="nmfwlyzkOptions"
           value-key="dictLabel"
           @confirm="onConfirmnmfwlyzk"
           @cancel="shownmfwlyzk = false"
@@ -3124,6 +3124,8 @@
         industryOptions:[],
         // 户籍所在省市
         hjszssOptions:[],
+        // 农名房屋利用状况
+        nmfwlyzkOptions:[],
 
         // 图片上传路径
         baseUrl:"",
@@ -3164,6 +3166,7 @@
       axios.get('../static/dictyType.json').then(res => {
         this.dictTypeList = res.data
         this.lyzkOptions= this.dictTypeList.zjdlyzk
+        this.nmfwlyzkOptions = this.dictTypeList.nmfwlyzk
         this.zjdqdfsOptions = this.dictTypeList.acquisition_method;
         this.sjlyOptions = this.dictTypeList.sjly;
         this.fssslxOptions = this.dictTypeList.fsss_type;
@@ -5572,8 +5575,8 @@
             sjlyName:'农村宅基地使用权确权登记发证',
             fwlx:'01',
             fwlxName:'住宅',
-            lyzk:'1',
-            lyzkName:'正常使用',
+            lyzk:'11',
+            lyzkName:'居住',
             lzyx:'0',
             yctcyx:'0',
             qsly:'01',
@@ -5604,8 +5607,8 @@
             this.nmfwform.lzyx = "0"
           }
           if(this.nmfwform.lyzk==null||this.nmfwform.lyzk==""){
-            this.nmfwform.lyzk = "1"
-            this.nmfwform.lyzkName = "正常使用"
+            this.nmfwform.lyzk = "11"
+            this.nmfwform.lyzkName = "居住"
           }
           if(this.nmfwform.fwlx==null||this.nmfwform.fwlx==""){
             this.nmfwform.fwlx = "01"
@@ -5725,7 +5728,7 @@
               this.nmfwform.fwlxName = res.dictLabel
             }
           })
-          this.lyzkOptions.map(res => {
+          this.nmfwlyzkOptions.map(res => {
             if(res.dictValue == item.lyzk){
               this.nmfwform.lyzkName = res.dictLabel
             }

src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue

@@ -492,6 +492,9 @@
           this.$notify({ type: 'danger', message: '请选择所属银行！' });
           return;
         }
+        if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>1){
+          this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+        }else{
         this.getDicts("bank_type").then(res => {
           this.chargeItme.splice(index + 1, 0, {
             payeeId: "", //收款方ID
@@ -504,7 +507,7 @@
             showPayee:false,
             showbankType:false
           });
-        });
+        });}
       },
       getPayeeList() {
         //普通转账
@@ -959,9 +962,13 @@
               fuzhitype = 2;
               return true;
             }
-            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
-              fuzhitype = 1;
-              return true;
+            if(_this.form.isPeers!=undefined&&_this.form.isPeers!=null&&_this.form.isPeers=='N'){
+
+            }else{
+              if(obj.bankType==1&&value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+                fuzhitype = 1;
+                return true;
+              }
             }
           });
         }

src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue

@@ -496,7 +496,9 @@
       },
       getPayeeList() {
         //信用卡转账
-        this.queryParams.accountType = this.form.accountType
+        this.queryParams.isPeers = this.form.isPeers?this.form.isPeers:null
+        this.queryParams.accountType = this.form.accountType?this.form.accountType:null
+        this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
@@ -597,7 +599,7 @@
       accountTypeChange(e){
         this.payeeList = [];
         this.chargeItme = [];
-        this.queryParams.accountType = this.form.accountType
+        this.queryParams.accountType = this.form.accountType?this.form.accountType:null
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {

src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue

@@ -958,9 +958,13 @@
               fuzhitype = 2;
               return true;
             }
-            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
-              fuzhitype = 1;
-              return true;
+            if(_this.form.isPeers!=undefined&&_this.form.isPeers!=null&&_this.form.isPeers=='N'){
+
+            }else{
+              if(obj.bankType==1&&value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+                fuzhitype = 1;
+                return true;
+              }
             }
           });
         }

src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue

@@ -439,6 +439,7 @@
             this.showproject = false
           }
           this.form = response.data;
+          this.getPayeeList();
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
           this.getDicts("bank_type").then(res => {
@@ -453,7 +454,6 @@
             this.chargeItme = response.rows;
             console.log(this.chargeItme)
           });
-          this.getPayeeList();
         });
       },
       getChange(){
@@ -483,6 +483,9 @@
           this.$notify({ type: 'danger', message: '请选择所属银行！' });
           return;
         }
+        if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>1){
+          this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+        }else{
         this.getDicts("bank_type").then(res => {
           this.chargeItme.splice(index + 1, 0, {
             payeeId: "", //收款方ID
@@ -495,12 +498,13 @@
             showPayee:false,
             showbankType:false
           });
-        });
+        });}
       },
       getPayeeList() {
         //普通转账
-        this.queryParams.isPeers = this.form.isPeers
-        this.queryParams.accountType = this.form.accountType
+        this.queryParams.isPeers = this.form.isPeers?this.form.isPeers:null
+        this.queryParams.accountType = this.form.accountType?this.form.accountType:null
+        this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
@@ -951,9 +955,13 @@
               fuzhitype = 2;
               return true;
             }
-            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
-              fuzhitype = 1;
-              return true;
+            if(_this.form.isPeers!=undefined&&_this.form.isPeers!=null&&_this.form.isPeers=='N'){
+
+            }else{
+              if(obj.bankType==1&&value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+                fuzhitype = 1;
+                return true;
+              }
             }
           });
         }
@@ -1065,6 +1073,7 @@
             this.uploadFiles.splice(index,1)
           }
         })
+        console.log(file)
         if(file.id){
           systemAttachment(file.id).then((res) => {
           });

src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改付款申请</p>
+        <p style="font-weight: bold;">修改现金使用申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -231,7 +231,7 @@
     addCash, addCashdetail,
     attachmentList,
     commonAttach, getCash,
-    listCashdetailByCashId, updateCash
+    listCashdetailByCashId, systemAttachment, updateCash
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import Dialog from "vant/lib/dialog";
   import request from '@/utils/request'
@@ -609,7 +609,7 @@
             this.$set(this.form, "bankTypeList", this.chargeItme);
             this.$set(this.form, "accountTypeList", this.chargeItme);
             this.$set(this.form, "transferStatusList", this.chargeItme);
-            if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+            if(this.uploadFiles==null||this.uploadFiles.length==0){
               Dialog.confirm({
                 title: '提示',
                 message: '此申请单中未上传任何附件，是否确认提交？',
@@ -635,7 +635,7 @@
                     }else if(this.form.capitalExpenditureType==4){
                       this.infoForm.transferId = this.form.id
                       addInfoto(this.infoForm).then(res => {
-                        customSubmit(response.data.id).then(res => {
+                        cashSubmit(response.data.id).then(res => {
                           this.$toast.success('提交成功');
                           setTimeout(function(){
                             history.go(-1)
@@ -684,7 +684,7 @@
                 }else if(this.form.capitalExpenditureType==4){
                   this.infoForm.transferId = this.form.id
                   addInfoto(this.infoForm).then(res => {
-                    customSubmit(response.data.id).then(res => {
+                    cashSubmit(this.form.id).then(res => {
                       this.$toast.success('提交成功');
                       setTimeout(function(){
                         history.go(-1)
@@ -753,6 +753,16 @@
             }
             this.projectForm.outId = this.form.id
             if(this.uploadFiles!=null&&this.uploadFiles.length>0){
+              this.uploadFiles.map(rr => {
+                const params = new FormData();
+                params.append("tableId", this.form.id);
+                params.append("tableName", "t_yinnong_cash");
+                params.append("bizPath", "upload");
+                params.append("fileType", "0");
+                params.append("file", rr);
+                commonAttach(params).then((r) => {
+                })
+              })
               updateCash(this.form).then((response) => {
                 this.chargeItme.map(res => {
                   res.cashId = this.form.id
@@ -771,12 +781,10 @@
                 }else if(this.form.capitalExpenditureType==4){
                   this.infoForm.transferId = this.form.id
                   addInfoto(this.infoForm).then(res => {
-                    customSubmit(response.data.id).then(res => {
-                      this.$toast.success('提交成功');
-                      setTimeout(function(){
-                        history.go(-1)
-                      },2000)
-                    })
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
                   })
                 }else{
                   this.$toast.success('保存成功');
@@ -787,16 +795,6 @@
               });
             }else {
               updateCash(this.form).then((response) => {
-                this.uploadFiles.map(rr => {
-                  const params = new FormData();
-                  params.append("tableId", this.form.id);
-                  params.append("tableName", "t_yinnong_cash");
-                  params.append("bizPath", "upload");
-                  params.append("fileType", "0");
-                  params.append("file", rr);
-                  commonAttach(params).then((r) => {
-                  })
-                })
                 this.chargeItme.map(res => {
                   console.log(res)
                   res.cashId = this.form.id
@@ -815,12 +813,10 @@
                 }else if(this.form.capitalExpenditureType==4){
                   this.infoForm.transferId = this.form.id
                   addInfoto(this.infoForm).then(res => {
-                    customSubmit(response.data.id).then(res => {
-                      this.$toast.success('提交成功');
-                      setTimeout(function(){
-                        history.go(-1)
-                      },2000)
-                    })
+                    this.$toast.success('保存成功');
+                    setTimeout(function(){
+                      history.go(-1)
+                    },2000)
                   })
                 }else{
                   this.$toast.success('保存成功');
@@ -956,6 +952,12 @@
             this.uploadFiles.splice(index,1)
           }
         })
+        console.log(file)
+        if(file.id){
+          console.log(file.id)
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
@@ -967,7 +969,7 @@
         attachmentList(oData).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
           })
         })
       },

src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改付款申请</p>
+        <p style="font-weight: bold;">修改汇票支出申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -282,7 +282,7 @@
     addCash, addCashdetail,
     attachmentList, cashSubmit,
     commonAttach, getCash,
-    listCashdetailByCashId, listMoneyorder, updateCash
+    listCashdetailByCashId, listMoneyorder, systemAttachment, updateCash
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import Dialog from "vant/lib/dialog";
   export default {
@@ -969,6 +969,10 @@
             this.uploadFiles.splice(index,1)
           }
         })
+        if(file.id){
+          systemAttachment(file.id).then((res) => {
+          });
+        }
       },
       getFileList(){
         let oData= {
@@ -978,12 +982,9 @@
           fileType: "0",
         }
         attachmentList(oData).then(res => {
-          console.log(res)
-          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
-            console.log(r)
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
           })
         })
       },

src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue

@@ -263,7 +263,7 @@
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 8px;">
-        <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
+        <van-uploader v-model="fileList" :after-read="beforeRead" accept="image/*,file/*" @delete="deleteFile"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -442,6 +442,7 @@
             this.showproject = false
           }
           this.form = response.data;
+          this.getPayeeList();
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
           this.getDicts("bank_type").then(res => {
@@ -454,9 +455,7 @@
               response.rows[j].showPayee = false;
             }
             this.chargeItme = response.rows;
-            console.log(this.chargeItme)
           });
-          this.getPayeeList();
         });
       },
       getChange(){
@@ -508,7 +507,9 @@
         //普通转账
         this.queryParams.isPeers = this.form.isPeers
         this.queryParams.accountType = this.form.accountType
+        this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
+        console.log(this.queryParams)
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==4){
@@ -577,7 +578,6 @@
         this.showcontract = false;
       },
       onConfirmPayee(data,index){
-        console.log(data)
         for (var i = 0 ; i < this.chargeItme.length ; i++){
           this.chargeItme[i].showPayee = false;
         }
@@ -950,6 +950,7 @@
       payeeSelectChange(select, i) {
         let obj = {};
         let fuzhitype = 0;
+        let _this = this
         obj = this.payeeList.find((account) => {
           //model就是上面的数据源
           return account.id === select ; //筛选出匹配数据
@@ -960,9 +961,13 @@
               fuzhitype = 2;
               return true;
             }
-            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
-              fuzhitype = 1;
-              return true;
+            if(_this.form.isPeers!=undefined&&_this.form.isPeers!=null&&_this.form.isPeers=='N'){
+
+            }else{
+              if(obj.bankType==1&&value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+                fuzhitype = 1;
+                return true;
+              }
             }
           });
         }

src/views/yinnong/bankAgriculture/paymentApproval/approvalModify4.vue

@@ -439,6 +439,7 @@
             this.showproject = false
           }
           this.form = response.data;
+          this.getPayeeList();
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
           this.getDicts("bank_type").then(res => {
@@ -453,7 +454,7 @@
             this.chargeItme = response.rows;
             console.log(this.chargeItme)
           });
-          this.getPayeeList();
+
         });
       },
       getChange(){
@@ -955,9 +956,13 @@
               fuzhitype = 2;
               return true;
             }
-            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
-              fuzhitype = 1;
-              return true;
+            if(_this.form.isPeers!=undefined&&_this.form.isPeers!=null&&_this.form.isPeers=='N'){
+
+            }else{
+              if(obj.bankType==1&&value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+                fuzhitype = 1;
+                return true;
+              }
             }
           });
         }
@@ -1025,7 +1030,6 @@
         this.uploadFiles.push(file.file);
       },
       deleteFile(file){
-        console.log(file)
         this.uploadFiles.map((response,index) => {
           if(file.file == response){
             this.uploadFiles.splice(index,1)

static/dictyType.json

@@ -80,6 +80,151 @@
       "update_by": "",
       "update_time": ""
     }],
+  "nmfwlyzk": [
+    {
+      "dict_code":1237,
+      "dict_sort":10,
+      "dictLabel":"居住",
+      "dictValue":"10",
+      "dict_type":"nmfwlyzk",
+      "css_class":null,
+      "list_class":"default",
+      "is_default":"N",
+      "status":"1",
+      "remark":null,
+      "create_by":"admin",
+      "create_time":"2021\/7\/27 08:51:58",
+      "update_by":"admin",
+      "update_time":"2021\/7\/27 09:31:26"
+    },
+    {
+      "dict_code":1238,
+      "dict_sort":11,
+      "dictLabel":"自住",
+      "dictValue":"22",
+      "dict_type":"nmfwlyzk",
+      "css_class":null,
+      "list_class":"default",
+      "is_default":"N",
+      "status":"0",
+      "remark":null,
+      "create_by":"admin",
+      "create_time":"2021\/7\/27 08:52:13",
+      "update_by":"admin",
+      "update_time":"2021\/7\/27 08:52:21"
+    },
+    {
+      "dict_code":1239,
+      "dict_sort":12,
+      "dictLabel":"出租居住",
+      "dictValue":"12",
+      "dict_type":"nmfwlyzk",
+      "css_class":null,
+      "list_class":"default",
+      "is_default":"N",
+      "status":"0",
+      "remark":null,
+      "create_by":"admin",
+      "create_time":"2021\/7\/27 08:52:33",
+      "update_by":null,
+      "update_time":null
+    },
+    {
+      "dict_code":1240,
+      "dict_sort":20,
+      "dictLabel":"经营",
+      "dictValue":"20",
+      "dict_type":"nmfwlyzk",
+      "css_class":null,
+      "list_class":"default",
+      "is_default":"N",
+      "status":"1",
+      "remark":null,
+      "create_by":"admin",
+      "create_time":"2021\/7\/27 08:52:53",
+      "update_by":"admin",
+      "update_time":"2021\/7\/27 09:31:35"
+    },
+    {
+      "dict_code":1241,
+      "dict_sort":21,
+      "dictLabel":"自营",
+      "dictValue":"21",
+      "dict_type":"nmfwlyzk",
+      "css_class":null,
+      "list_class":"default",
+      "is_default":"N",
+      "status":"0",
+      "remark":null,
+      "create_by":"admin",
+      "create_time":"2021\/7\/27 08:53:05",
+      "update_by":null,
+      "update_time":null
+    },
+    {
+      "dict_code":1242,
+      "dict_sort":22,
+      "dictLabel":"出租经营",
+      "dictValue":"22",
+      "dict_type":"nmfwlyzk",
+      "css_class":null,
+      "list_class":"default",
+      "is_default":"N",
+      "status":"0",
+      "remark":null,
+      "create_by":"admin",
+      "create_time":"2021\/7\/27 08:53:21",
+      "update_by":null,
+      "update_time":null
+    },
+    {
+      "dict_code":1243,
+      "dict_sort":23,
+      "dictLabel":"合作（入股）经营",
+      "dictValue":"23",
+      "dict_type":"nmfwlyzk",
+      "css_class":null,
+      "list_class":"default",
+      "is_default":"N",
+      "status":"0",
+      "remark":null,
+      "create_by":"admin",
+      "create_time":"2021\/7\/27 08:53:38",
+      "update_by":null,
+      "update_time":null
+    },
+    {
+      "dict_code":1244,
+      "dict_sort":30,
+      "dictLabel":"闲置",
+      "dictValue":"30",
+      "dict_type":"nmfwlyzk",
+      "css_class":null,
+      "list_class":"default",
+      "is_default":"N",
+      "status":"0",
+      "remark":null,
+      "create_by":"admin",
+      "create_time":"2021\/7\/27 08:53:56",
+      "update_by":null,
+      "update_time":null
+    },
+    {
+      "dict_code":1245,
+      "dict_sort":99,
+      "dictLabel":"其他",
+      "dictValue":"99",
+      "dict_type":"nmfwlyzk",
+      "css_class":null,
+      "list_class":"default",
+      "is_default":"N",
+      "status":"0",
+      "remark":null,
+      "create_by":"admin",
+      "create_time":"2021\/7\/27 08:54:08",
+      "update_by":null,
+      "update_time":null
+    }],
   "acquisition_method": [
     {
       "dict_code": "1060",