|
|
@@ -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>
|
