Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/components/personalForms/landCertificate.vue

@@ -66,7 +66,7 @@
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
                 <el-form-item label="终止日期：" prop="limitDateD" label-width="140px" type="date" value-format="yyyy-MM-dd"
                   class="postInfo-container-item" :rules="{ required: true, message: '终止日期不能为空', trigger: 'blur' }">
-                  <el-date-picker v-model="certificate.limitDateD" type="date" style="width: 100%;" placeholder="选择日期">
+                  <el-date-picker v-model="certificate.limitDateD" type="date" value-format="yyyy-MM-dd" style="width: 100%;" placeholder="选择日期">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -134,6 +134,7 @@ export default {
     },
   },
   created() {
+    console.log(this.landCertificateObject)
     this.certificate.id = this.id;
     if (this.landCertificateObject) {
       this.certificate = this.landCertificateObject;

src/layout/components/Navbar.vue

@@ -371,5 +371,6 @@ export default {
 .message-area {
   border-radius: 10px;
   overflow-y: scroll;
+  height: 800px;
 }
 </style>

src/views/finance/fundWarning.vue

@@ -29,7 +29,7 @@
             <el-button class="filter-item" style="float: left;" round type="info" @click="exportOverdueMajor()">导出
             </el-button>
           </template>
-          <el-table size="medium" slot="table" row-key="id" :data="overdueMajor.records" fit highlight-current-row
+          <el-table size="medium" slot="table" row-key="id" :data="overdueMajor.records" fit highlight-current-row border
             :header-row-style="{ color: '#333333' }"
             style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;">
             <el-table-column label="超期天数" align="center">
@@ -130,7 +130,7 @@
             <el-button class="filter-item" style="float: left;" round type="info" @click="exportOverduePersonal()">导出
             </el-button>
           </template>
-          <el-table size="medium" slot="table" row-key="id" :data="overduePersonal.records" fit highlight-current-row
+          <el-table size="medium" slot="table" row-key="id" :data="overduePersonal.records" fit highlight-current-row border
             :header-row-style="{ color: '#333333' }"
             style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;">
             <el-table-column label="超期天数" align="center">
@@ -246,7 +246,7 @@
             <el-button class="filter-item" style="float: left;" round type="info" @click="exportOverdueAssets()">导出
             </el-button>
           </template>
-          <el-table size="medium" slot="table" row-key="id" :data="overdueAssets.records" fit highlight-current-row
+          <el-table size="medium" slot="table" row-key="id" :data="overdueAssets.records" fit highlight-current-row border
             :header-row-style="{ color: '#333333' }"
             style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;">
             <el-table-column label="超期天数" align="center">
@@ -344,19 +344,19 @@ export default {
         page: 1,
         size: 1000,
         descs: 'id',
-        overdueMin: 0
+        overdueMin: 90
       },
       listQuery2: {
         page: 1,
         size: 1000,
         descs: 'id',
-        overdueMin: 0
+        overdueMin: 90
       },
       listQuery3: {
         page: 1,
         size: 1000,
         descs: 'id',
-        overdueMin: 0
+        overdueMin: 90
       },
       overdueMajor: {
         records: []
@@ -393,7 +393,7 @@ export default {
         current: 1,
         size: 1000,
         descs: 'id',
-        overdueMin: 0
+        overdueMin: 90
       }
       this.getOverdueMajor()
     },
@@ -427,7 +427,7 @@ export default {
         current: 1,
         size: 1000,
         descs: 'id',
-        overdueMin: 0
+        overdueMin: 90
       }
       this.getOverdueAssets();
     },
@@ -443,7 +443,7 @@ export default {
         current: 1,
         size: 1000,
         descs: 'id',
-        overdueMin: 0
+        overdueMin: 90
       }
       this.getOverdueAssets();
     },
@@ -454,9 +454,11 @@ export default {
       this.getOverduePersonal();
     },
     getOverdueAssets() {
+      let loadingInstance = this.$loading({ fullscreen: true });
       this.$api.financeRealFund.overdueAssets(this.listQuery2).then(res => {
         if (res.code === 200) {
           this.overdueAssets = res.data;
+          loadingInstance.close();
         }
       })
     },
@@ -468,9 +470,11 @@ export default {
       );
     },
     getOverduePersonal(){
+      let loadingInstance = this.$loading({ fullscreen: true });
         this.$api.financeRealFund.personalOverdue(this.listQuery3).then(res=>{
           if (res.code === 200){
               this.overduePersonal = res.data;
+              loadingInstance.close();
           }
         })
     },

src/views/major/detail.vue

@@ -1095,7 +1095,7 @@
                         label-width="120px"
                         class="postInfo-container-item" label="价值时点：">
                           <el-date-picker
-                          v-model="props.row.valueTiming" type="date" placeholder="选择日期" style="width:100%"   :readonly = "!pgLeader"
+                          v-model="props.row.valueTiming" type="date" value-format="yyyy-MM-dd"  placeholder="选择日期" style="width:100%"   :readonly = "!pgLeader"
                           :disabled="!pgLeader">
                           </el-date-picker>
                         </el-form-item>

src/views/personal/todoDetail.vue

@@ -1154,7 +1154,6 @@ export default {
     },
     personal: {
       handler(newVal, oldVal) {
-        console.log(newVal,'personal')
         if (newVal.outwardStaff) {
           this.outwardStaffTip = false;
         } else {
@@ -1692,9 +1691,11 @@ export default {
             this.target = res.data;
             //如果没有单价，则只用总价。 个贷多套有这情况
             if (this.target.price==null || this.target.price===0){
-                let amount = Decimal(this.target.amount);
-                let wan = Decimal(10000);
-                this.target.amount = utils.roundToDecimalPlace(amount.div(wan),2);
+                if (this.target.amount){
+                  let amount = Decimal(this.target.amount);
+                  let wan = Decimal(10000);
+                  this.target.amount = utils.roundToDecimalPlace(amount.div(wan),2);
+                }
             }
             this.linkAttributes.acreage = this.target.acreage;
             if (res.data.isOnline) {
@@ -1705,7 +1706,7 @@ export default {
               this.linkAttributes.location = this.target.houseCertificate.location;
             }
             if (res.data.landCertificate) {
-              this.target.landCertificate = JSON.parse(res.data.landCertificate)  ;
+              this.target.landCertificate = JSON.parse(res.data.landCertificate) 
             }
             if (res.data.immovableCertificate) {
               this.target.immovableCertificate = JSON.parse(res.data.immovableCertificate);