页面样式微调以及个贷总价计算

src/views/major/myOrder.vue

@@ -103,19 +103,15 @@
             <span>{{ row.created }}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="150" align="center">
+        <el-table-column fixed="right" label="操作" width="200" align="center">
           <template slot-scope="{row}">
-            <div>
               <PermissionButton menu-code="_views_myOrder_detail" class-name="filter-item" type="text" :page-jump="true"
                 size="mini"
                 :page-query="{ 'couldEdit': true, 'id': row.businessId, 'back': '/major/my/order', 'recall': true, 'couldBack': true ,'orderId':row.orderId}" />
               <el-button :disabled="!row.id" type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
               <!-- <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button> -->
-            </div>
-            <div>
               <el-button :disabled="!row.id" type="text" size="small" @click="openFinanceInvoiceDialog(row.orderFundId,row.realAmount,row.clienteleName,row.clienteleSubName,row.productionFundId)">申请开票</el-button>
               <el-button type="text" size="small" @click="productionList(row.businessId)">产品包</el-button>
-            </div>
           </template>
         </el-table-column>
       </parentTable>
@@ -573,7 +569,7 @@ export default {
       pageData: { records: [] },
       listQuery: {
         page: 1,
-        size: 10,
+        size: 20,
         descs: 'id',
         keyword: null,
         startDate: null,
@@ -702,7 +698,7 @@ export default {
       this.orderDate = '';
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 20,
         descs: 'id',
       }
       this.getList()
@@ -711,7 +707,7 @@ export default {
     searchList() {
       // 重置分页
       this.listQuery.page = 1;
-      this.listQuery.size = 10;
+      this.listQuery.size = 20;
       if (this.orderDate) {
         this.listQuery.startDate = this.orderDate[0] + ' 00:00:00';
         this.listQuery.endDate = this.orderDate[1] + ' 23:59:59';
@@ -1296,7 +1292,7 @@ export default {
     searchList() {
       // 重置分页
       this.listQuery.page = 1
-      this.listQuery.size = 10
+      this.listQuery.size = 20
       this.getList()
     },
 
@@ -1304,7 +1300,7 @@ export default {
       this.$router.push({ query: {} });
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 20,
         descs: 'created',
       }
       this.getList();

src/views/personal/myOrder.vue

@@ -18,7 +18,7 @@
         </MoreSearchBar>
       </template>
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" >
-        <el-table-column label="坐落" align="center" width="300">
+        <el-table-column label="坐落" align="center" width="300" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span>{{ row.orderName }}</span>
           </template>
@@ -605,7 +605,7 @@ export default {
       listLoading: false,
       listQuery: {
         page: 1,
-        size: 10,
+        size: 20,
         current: 1,
         descs: null,
         ascs:null,
@@ -702,7 +702,7 @@ export default {
     searchList() {
       // 重置分页
       this.listQuery.page = 1
-      this.listQuery.size = 10
+      this.listQuery.size = 20
       this.getPage()
     },
 
@@ -710,7 +710,7 @@ export default {
       this.$router.push({ query: {} });
       this.listQuery = {
           current: 1,
-          size: 10,
+          size: 20,
           descs: 'created',
       }
       this.getPage();

src/views/personal/readonlyDetail.vue

@@ -387,18 +387,18 @@
           </el-row>
           <el-row class="row-style">
             <el-col :xs="24" :sm="12" :lg="6" :span="6">
-              <el-form-item label="评估面积(平)：" prop="acreage" label-width="140px"
+              <el-form-item label="评估面积：" prop="acreage" label-width="140px"
                 :rules="{ required: true, message: '评估面积不能为空', trigger: 'blur' }" class="postInfo-container-item">
                 <el-input :value="target.acreage"  disabled readonly 
                  style="width: 100%;">
                   <template slot="append">
-                    <span>元</span>
+                    <span>平</span>
                   </template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6" :span="6">
-              <el-form-item label="评估单价(元)：" prop="price" label-width="140px"
+              <el-form-item label="评估单价：" prop="price" label-width="140px"
                 :rules="{ required: true, message: '评估单价不能为空', trigger: 'blur' }" class="postInfo-container-item">
                 <el-input :value="target.price"  disabled readonly 
                    style="width: 100%;">
@@ -409,12 +409,12 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6" :span="6">
-              <el-form-item label="评估总价(元)：" prop="amount" label-width="140px"
+              <el-form-item label="评估总价：" prop="amount" label-width="140px"
                 :rules="{ required: true, message: '评估总价不能为空', trigger: 'blur' }" class="postInfo-container-item">
                 <el-input :value="target.amount"  disabled readonly 
                    style="width: 100%;">
                    <template slot="append">
-                    <span>元</span>
+                    <span>万元</span>
                   </template>
                   </el-input>
               </el-form-item>
@@ -958,7 +958,7 @@ export default {
     target: {
       handler(newVal, oldVal) {
         if (newVal.acreage != null && newVal.price != null) {
-          newVal.amount = Math.round(newVal.acreage * newVal.price)
+          newVal.amount = (newVal.acreage * newVal.price/10000).toFixed(2)
         }
         if (newVal.id) {
           this.getProductions();

src/views/personal/todoDetail.vue

@@ -429,8 +429,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6" :span="6">
-              <el-form-item label="评估总价(元)：" prop="amount" label-width="140px" class="postInfo-container-item">
-                <el-input-number v-model="target.amount" size="medium" controls-position="right" :min="0"
+              <el-form-item label="评估总价(万元)：" prop="amount" label-width="140px" class="postInfo-container-item">
+                <el-input-number v-model="target.amount" size="medium" controls-position="right" :min="0" :precision="2"
                   style="width: 100%;"></el-input-number>
               </el-form-item>
             </el-col>
@@ -1000,7 +1000,7 @@
         <el-button type="primary" @click="doOutWareHouse()">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :visible.sync="checkDialog" width="50%" center top="25vh" custom-class="doWarehouseClass">
+    <el-dialog :visible.sync="checkDialog" width="1000px" center top="25vh" custom-class="doWarehouseClass">
       <el-divider content-position="left">产品审核</el-divider>
       <el-form ref="targetForm" :model="target">
         <el-row>
@@ -1045,7 +1045,7 @@
             <el-form-item label="评估总价：" prop="amount" label-width="140px" class="postInfo-container-item">
               <el-input v-model="target.amount" disabled readonly>
                 <template slot="append">
-                  <span>元</span>
+                  <span>万元</span>
                 </template>
               </el-input>
             </el-form-item>
@@ -1165,8 +1165,8 @@ export default {
     },
     target: {
       handler(newVal, oldVal) {
-        if (newVal.acreage != null && newVal.price != null) {
-          newVal.amount = Math.round(newVal.acreage * newVal.price)
+        if (newVal.acreage != null && newVal.price != null && newVal.price !=null && newVal.price != 0) {
+          newVal.amount = (newVal.acreage * newVal.price/10000).toFixed(2)
         }
         if (newVal.id) {
           this.getProductions();
@@ -1989,8 +1989,8 @@ export default {
           let target = new Object();
           target.id = this.target.id;
           target.personalId = this.target.personalId;
-          target.price = this.target.price;
-          target.amount = this.target.amount;
+          target.price = Math.round(this.target.amount*10000/this.target.acreage);
+          target.amount = this.target.amount*10000;
           target.acreage = this.target.acreage;
           target.location = this.personal.location;
           target.bailorA = this.personal.bailorA;
@@ -2004,6 +2004,7 @@ export default {
                 type: 'success',
                 duration: 2000
               });
+              this.getPersonalTarget();
             } else {
               this.$notify({
                 title: '失败',