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

src/components/BaseTable/parentTable.vue

@@ -19,7 +19,7 @@
     "
     @selection-change="selectionChange"
     @sort-change="sortChange"
-    @row-click="goToDetail"
+    @row-click="clickRow"
     @row-dblclick="expandRow"
   >
 
@@ -80,8 +80,8 @@
       // selectionChange(val) {
       //   this.$emit("selectionChange", val);
       // },
-      goToDetail(){
-        this.$emit("goToDetail");
+      clickRow(row){
+        this.$refs.table.toggleRowSelection(row);
       },
       expandRow(row){
         row.expand = !row.expand

src/components/personalForms/houseCertificate.vue

@@ -485,9 +485,9 @@ export default {
                 isPledge:"否",
                 pledgePerson:null,
                 otherPledgePerson:null,
-                ensureDebiAmount:null,
-                defaultDebiAmount:null,
-                otherDebiAmount:null,
+                ensureDebiAmount:0,
+                defaultDebiAmount:0,
+                otherDebiAmount:0,
                 isNoneShangCase:false,
                 isNoneWestCase:false
             }

src/components/personalForms/immovableCertificate.vue

@@ -473,9 +473,9 @@ export default {
                 isPledge:"否",
                 pledgePerson:null,
                 otherPledgePerson:null,
-                ensureDebiAmount:null,
-                defaultDebiAmount:null,
-                otherDebiAmount:null,
+                ensureDebiAmount:0,
+                defaultDebiAmount:0,
+                otherDebiAmount:0,
                 isNoneShangCase:false,
                 isNoneWestCase:false
           }

src/views/finance/fundList.vue

@@ -263,7 +263,7 @@
               <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
               </el-button>
             </template>
-            <parentTable  :data="myMajorPageData.records" slot="table" style="width: 100%;" :selectionChange="handleSelectionChange">
+            <parentTable ref="table" :data="myMajorPageData.records" slot="table" style="width: 100%;" :selectionChange="handleSelectionChange">
               <el-table-column
                 align="center"
                 type="selection"
@@ -353,7 +353,7 @@
                 />
               <!-- <input type="file" ref="fileInput" style="display: none" @change="handleFileChange" /> -->
             </template>
-            <parentTable  :data="myPersonalPageData.records" slot="table" style="width: 100%;" :selectionChange="handleSelectionChange">
+            <parentTable ref="table" :data="myPersonalPageData.records" slot="table" style="width: 100%;" :selectionChange="handleSelectionChange" >
               <el-table-column
                 align="center"
                 type="selection"
@@ -413,8 +413,8 @@
       </el-tabs>
       <el-button  style="display:flex; position:absolute;right:50px;top:50px" round type="danger" @click="openClaimDialog()">选择认领</el-button>
     </el-dialog>
-    <el-dialog :visible.sync="allotAmountDialog" width="55%" center  custom-class="doWarehouseClass"  @closed="cleanClaimDTO">
-      <el-form v-model="claimOrders" ref="claimOrders">
+    <el-dialog :visible.sync="allotAmountDialog" width="55%"  center  custom-class="doWarehouseClass"  @closed="cleanClaimDTO">
+      <el-form v-model="claimOrders" ref="claimOrdersForm">
         <el-row>
             <el-col :xs="24" :sm="12" :lg="21" :span="6">
               <div style="font-size:20px;">
@@ -428,29 +428,23 @@
         <el-card style="margin-top:20px" v-for="(p,id) in claimOrders" shadow="hover">
           <div slot="header" class="clearfix">
             <el-row>
-              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+              <el-col :xs="24" :sm="12" :lg="24" :span="6">
                 <el-form-item :label="labelName" prop="orderName"   label-width="140px" class="postInfo-container-item">
                   <el-input :value="p.orderName" type="text" class="filter-item" disabled readonly />
                 </el-form-item >
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                <el-form-item :label="labelNum" prop="orderId"   label-width="140px" class="postInfo-container-item">
-                  <el-input :value="p.orderId" type="text" class="filter-item" disabled readonly />
-                </el-form-item >
-              </el-col>
             </el-row>
             <el-row>
               <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <span class="redPoint">*</span>
                 <el-form-item label="本次认领金额：" prop="thisTimeAmount"  label-width="140px" class="postInfo-container-item">
-                  <el-input-number  :precision="2" :min="0" :value-on-clear="0" v-model.number="p.thisTimeAmount" type="number" 
+                  <el-input-number  :precision="2" :min="0" :value-on-clear="0" v-model.number="p.thisTimeAmount"
                         style="width:100%" class="filter-item" />
                 </el-form-item >
               </el-col>
               <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                <el-form-item label="订单应收金额："  prop="shouldAmount" label-width="140px" class="postInfo-container-item">
-                  <el-input :value="p.shouldAmount" type="text" class="filter-item" disabled readonly>
-                    <template slot="append">元</template>
-                  </el-input>
+                <el-form-item :label="labelNum" prop="orderId"   label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.orderId" type="text" class="filter-item" disabled readonly />
                 </el-form-item >
               </el-col>
             </el-row>
@@ -462,6 +456,13 @@
                   </el-input>
                 </el-form-item >
               </el-col>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="订单应收金额："  prop="shouldAmount" label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.shouldAmount" type="text" class="filter-item" disabled readonly>
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item >
+              </el-col>
             </el-row>
           </div>
           <div v-if="activeName==='MAJOR_BUSINESS'">
@@ -603,6 +604,7 @@ export default {
             }
           }]
       },
+      amountError:false
     }
   },
   created() {
@@ -764,49 +766,19 @@ export default {
       this.notInfo = "此笔实收款剩余：";
     },
     claim(){
-      if (this.activeName === 'MAJOR_BUSINESS'){
-          this.$api.businessProduction.allotRealAmount(this.claimOrders).then(res=>{
-          if (res.code === 200 && res.data){
-            this.$notify({
-              title: '成功',
-              message: '实收款认领成功',
-              type: 'success',
-              duration: 2000
-            });
-            this.getMyMajorOrder();
-            this.allotAmountDialog = false;
-          }else {
-            this.$notify({
-              title: '失败',
-              message: '实收款认领失败',
-              type: 'error',
-              duration: 2000
-            });
-          }
-        })
+      const orders = this.claimOrders;
+      for (let i in orders){
+        if (!orders[i].thisTimeAmount){
+            this.$message.error("编号:["+orders[i].orderId+"],本次认领金额不能为空。");
+            return;
+         }
+      }
+      if (this.activeName === 'MAJOR_BUSINESS' ){
+          this.doClaimMajor();
       }
       if (this.activeName === 'PERSONAL_BUSINESS'){
-        this.$api.businessProduction.personalAllotRealAmount(this.claimOrders).then(res=>{
-          if (res.code === 200 && res.data){
-            this.$notify({
-              title: '成功',
-              message: '实收款认领成功',
-              type: 'success',
-              duration: 2000
-            });
-            this.getMyPersonalOrder();
-            this.allotAmountDialog = false;
-          }else {
-            this.$notify({
-              title: '失败',
-              message: '实收款认领失败',
-              type: 'error',
-              duration: 2000
-            });
-          }
-        })
+          this.doClaimPersonal();
       }
-      
     },
     updateClaim(row){
       this.doClaimDialog = true;
@@ -870,7 +842,6 @@ export default {
     // },
     handleSelectionChange(val){
         let pickeds = [];
-        console.log(val)
         for (let i in val){
           let picked = new Object();
           picked.id = val[i].id;
@@ -927,6 +898,48 @@ export default {
     downloadTemp(){
       window.location.href  = "/api/financeClaim/personal/claim/template"
     },
+    doClaimMajor(){
+      this.$api.businessProduction.allotRealAmount(this.claimOrders).then(res=>{
+        if (res.code === 200 && res.data){
+          this.$notify({
+            title: '成功',
+            message: '实收款认领成功',
+            type: 'success',
+            duration: 2000
+          });
+          this.getMyMajorOrder();
+          this.allotAmountDialog = false;
+        }else {
+          this.$notify({
+            title: '失败',
+            message: '实收款认领失败',
+            type: 'error',
+            duration: 2000
+          });
+        }
+      })
+    },
+    doClaimPersonal(){
+      this.$api.businessProduction.personalAllotRealAmount(this.claimOrders).then(res=>{
+        if (res.code === 200 && res.data){
+          this.$notify({
+            title: '成功',
+            message: '实收款认领成功',
+            type: 'success',
+            duration: 2000
+          });
+          this.getMyPersonalOrder();
+          this.allotAmountDialog = false;
+        }else {
+          this.$notify({
+            title: '失败',
+            message: '实收款认领失败',
+            type: 'error',
+            duration: 2000
+          });
+        }
+      })
+    },
   },
   
 }
@@ -935,4 +948,10 @@ export default {
     /deep/.doWarehouseClass {
       border-radius: 10px;
     }
+  .redPoint{
+      color:red;
+      position: absolute;
+      top:8px;
+      left:5px;
+    }
 </style>

src/views/personal/order.vue

@@ -89,7 +89,7 @@
                           </el-select>
                     </el-form-item>
                   </el-col>
-                  <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                  <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="personal.clienteleType==='企业'">
                     <el-form-item
                       label="客户名称："
                       prop="clienteleId"
@@ -103,7 +103,7 @@
                         <el-input :value="personal.cclienteleName" class="filter-item"  style=" width: 225px" v-else/>
                     </el-form-item>
                   </el-col>
-                  <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                  <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="personal.clienteleType==='企业'">
                     <el-form-item
                       label="业务来源："
                       prop="clienteleSubId"
@@ -270,11 +270,11 @@
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
                     <el-form-item
                       label="委托人1电话："
-                      prop="bailorATel"
+                      prop="bailoraTel"
                       label-width="120px"
                       class="postInfo-container-item"
                     >
-                    <el-input v-model="personal.bailorATel" class="filter-item" style=" width: 225px"/>
+                    <el-input v-model="personal.bailoraTel" class="filter-item" style=" width: 225px"/>
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -290,11 +290,11 @@
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
                     <el-form-item
                       label="委托人2电话："
-                      prop="bailorBTel"
+                      prop="bailorbTel"
                       label-width="120px"
                       class="postInfo-container-item"
                     >
-                    <el-input v-model="personal.bailorBTel" class="filter-item" style=" width: 225px" />
+                    <el-input v-model="personal.bailorbTel" class="filter-item" style=" width: 225px" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -760,7 +760,7 @@
               evaluateAim:null,
               purpose:[],
               location:null,
-              clienteleType:null,
+              clienteleType:'企业',
               cclienteleName:null,
               cclienteleSubName:null,
               agent:null,
@@ -775,10 +775,10 @@
               loanExpire:false,
               credentials:[],
               bailorA:null,
-              bailorATel:null,
+              bailoraTel:null,
               bailorB:null,
-              bailorBTel:null,
-              terminalClienteleType:null,
+              bailorbTel:null,
+              terminalClienteleType:'企业',
               tterminalClienteleName:null,
               tterminalClienteleContactName:null,
               tmobile:null,
@@ -864,7 +864,6 @@
                   if (back) {
                     this.$router.push(back)
                   }
-                  this.initData();
                 }
               })
             } else {

src/views/personal/pendingList.vue

@@ -37,7 +37,17 @@
             <span>{{ row.location }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="面积" align="center" width="280" prop="reportNo">
+        <el-table-column label="当前节点" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.currentNodeName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="处理人" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.handlerName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="面积" align="center" width="130" prop="reportNo">
           <template slot-scope="{row}">
             <span>{{ row.acreage }}</span>
           </template>
@@ -82,11 +92,11 @@
             <span>{{ row.bailorA}}{{ row.bailorB}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托人电话" align="center">
+        <!-- <el-table-column label="委托人电话" align="center">
           <template slot-scope="{row}">
             <span>{{ row.bailoraTel }} {{ row.bailorbTel }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="客户经理" align="center">
           <template slot-scope="{row}">
             <span>{{ row.clientManager }}</span>
@@ -107,16 +117,6 @@
             <span>{{ row.pricingStaffName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="当前节点" align="center" width="130">
-          <template slot-scope="{row}">
-            <span>{{ row.currentNodeName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="处理人" align="center" width="130">
-          <template slot-scope="{row}">
-            <span>{{ row.handlerName }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="下单时间" align="center" width="100" prop="created" sortable>
           <template slot-scope="{row}">
             {{ row.created }}

src/views/personal/todoList.vue

@@ -37,6 +37,16 @@
             <span>{{ row.orderId }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="当前节点" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.nodeName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="处理人" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.handlerName }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="面积" align="center" width="130">
           <template slot-scope="{row}">
             <span>{{ row.acreage }}</span>
@@ -82,11 +92,11 @@
             <span>{{ row.bailorA}}{{ row.bailorB}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托人电话" align="center" width="130">
+        <!-- <el-table-column label="委托人电话" align="center" width="130">
           <template slot-scope="{row}">
             <span>{{ row.bailorATel }} {{ row.bailorBTel }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="客户经理" align="center">
           <template slot-scope="{row}">
             <span>{{ row.clientManager }}</span>
@@ -107,16 +117,6 @@
             <span>{{ row.pricingStaffName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="当前节点" align="center" width="130">
-          <template slot-scope="{row}">
-            <span>{{ row.nodeName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="处理人" align="center" width="130">
-          <template slot-scope="{row}">
-            <span>{{ row.handlerName }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="下单时间" align="center" width="100" >
           <template slot-scope="{row}">
             {{ row.created }}