Browse Source

Merge remote-tracking branch 'origin/master'

master
God 8 months ago
parent
commit
e1aeb7e10b
  1. 2
      anrui-riskcenter-ui/src/views/alsotransfer/alsotransfer.vue
  2. 2
      anrui-riskcenter-ui/src/views/alsotransfer/pendingtransfer.vue
  3. 4
      anrui-riskcenter-ui/src/views/buyback/buyback.vue
  4. 97
      anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue
  5. 44
      anrui-riskcenter-ui/src/views/buyback/buybackInfo.vue
  6. 8
      anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue
  7. 2
      anrui-riskcenter-ui/src/views/customerrepayment/customerrepaymentdetails.vue
  8. 2
      anrui-riskcenter-ui/src/views/settle/settle.vue
  9. 18
      anrui-riskcenter-ui/src/views/settle/settleAdd.vue
  10. 4
      anrui-riskcenter-ui/src/views/settle/settleInfo.vue
  11. 34
      anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackDaiBan.vue
  12. 82
      anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue
  13. 34
      anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackYiBan.vue
  14. 4
      anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue
  15. 32
      anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
  16. 4
      anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue
  17. 20
      yxt-as-ui/src/router/index.js
  18. 2
      yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecordAdd.vue
  19. 2
      yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecordInfo.vue
  20. 1
      yxt-as-ui/src/views/operation/claimadjustment/claimadjustmentAdd.vue
  21. 1
      yxt-as-ui/src/views/operation/claimadjustment/claimadjustmentInfo.vue
  22. 7
      yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue
  23. 22
      yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue
  24. 7
      yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
  25. 2
      yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue
  26. 2
      yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingInfo.vue
  27. 12
      yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue
  28. 166
      yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue
  29. 176
      yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue
  30. 6
      yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
  31. 16
      yxt-as-ui/src/views/storage/oldPartsFactory/index.vue
  32. 166
      yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue
  33. 154
      yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue
  34. 166
      yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue
  35. 2
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingDaiBan.vue
  36. 2
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue
  37. 2
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingYiBan.vue
  38. 1
      yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentDaiBan.vue
  39. 1
      yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentEdit.vue
  40. 1
      yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentYiBan.vue
  41. 2
      yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordDaiBan.vue
  42. 2
      yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordEdit.vue
  43. 2
      yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordYiBan.vue
  44. 50
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java
  45. 33
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleDetailsVo.java
  46. 61
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleRest.java
  47. 112
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java

2
anrui-riskcenter-ui/src/views/alsotransfer/alsotransfer.vue

@ -66,7 +66,7 @@
<el-table-column prop="transferDate" label="实际转付日期" align="center" width="120" />
<!-- <el-table-column prop="spread" label="息差" align="center" width="100" />-->
<el-table-column prop="transferPrincipal" label="转付资方月还" align="center" width="120" />
<el-table-column prop="defaultInterest" label="转付资方逾期利息" align="center" width="140" />
<el-table-column prop="defaultInterest" label="转付资方逾期利息" align="center" width="150" />
<el-table-column prop="account" label="收款账户名称" align="center" width="160" />
<el-table-column prop="accountNumber" label="收款账号" align="center" width="160" />
</el-table>

2
anrui-riskcenter-ui/src/views/alsotransfer/pendingtransfer.vue

@ -67,7 +67,7 @@
<el-table-column prop="dueMoney" label="应还金额" align="center" width="100" />
<el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
<el-table-column prop="actualMoney" label="实还金额" align="center" width="100" />
<el-table-column prop="prepareDate" label="预转付日期" align="center" width="100" />
<el-table-column prop="prepareDate" label="预转付日期" align="center" width="120" />
</el-table>
</div>
<div class="pages">

4
anrui-riskcenter-ui/src/views/buyback/buyback.vue

@ -131,6 +131,9 @@
<el-form-item label="车牌号">
<el-input v-model="carList.params.vehMark" clearable style="width: 150px;" placeholder=""/>
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="carList.params.vinNo" clearable style="width: 150px;" placeholder=""/>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="selectCar">查询</el-button>
</el-form-item>
@ -263,6 +266,7 @@ export default {
customer: '',
orgPath: '',
vehMark: '',
vinNo: '',
type: '1'
}
},

97
anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue

@ -83,7 +83,26 @@
<el-form-item><span class="addinputInfo">{{ formobj.notDuePrice }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">资方结清费用</div>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/>
</el-form-item>
</el-col>
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>贷款保证金:<el-input style="width: 60%" @keyup.native="UpNumber" v-model="formobj.bankCostVo.loanDeposit" clearable placeholder="" /></div>
<div>是否抵顶:
<el-radio-group v-model="formobj.bankCostVo.topping">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</div>
</div>
</div>
<el-row>
<el-col :span="8">
<div class="span-sty">资方逾期月还</div>
@ -123,10 +142,22 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="8">
<div class="span-sty">资方结清金额</div>
<el-form-item><span class="addinputInfo">{{ calculateBankSettlePrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方收款账号</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.bankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
<el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.accountName" :value="item.bankAccount"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方收款账户</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankCostVo.accountName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -252,6 +283,7 @@ import req from '@/api/buyback/buyback'
import uploadImg from '@/components/uploadFile/uploadImg'
import vehiclecollectionrecords from '../overduevehicle/vehiclecollectionrecords'
import financialschemeInfo from '@/components/publicPage/financialschemeInfo'
import { fetchListByBankSid } from '@/api/Common/dictcommons'
export default {
name: 'BuyBackAdd',
@ -263,7 +295,15 @@ export default {
computed: {
// --
calculateBankSettlePrice() {
return parseFloat(this.formobj.bankCostVo.price === '' ? 0 : this.formobj.bankCostVo.price) + parseFloat(this.formobj.bankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.bankCostVo.currentNotDuePrice) + parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice) + parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable) || 0
let bankSettlePrice = '0'
// = + + + + + + -
if (this.formobj.bankCostVo.topping !== '' && this.formobj.bankCostVo.topping === '1') {
bankSettlePrice = Math.round((parseFloat(this.formobj.bankCostVo.price === '' ? 0 : this.formobj.bankCostVo.price) + parseFloat(this.formobj.bankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.bankCostVo.currentNotDuePrice) + parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice) + parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable) - parseFloat(this.formobj.bankCostVo.loanDeposit !== '' ? this.formobj.bankCostVo.loanDeposit : '0')) * 100) / 100
} else {
// = + + + + + +
bankSettlePrice = Math.round((parseFloat(this.formobj.bankCostVo.price === '' ? 0 : this.formobj.bankCostVo.price) + parseFloat(this.formobj.bankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.bankCostVo.currentNotDuePrice) + parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice) + parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable)) * 100) / 100
}
return bankSettlePrice
},
// --
calculateSettleAll() {
@ -279,6 +319,7 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
bank_list: [],
formobj: {
amount: '',
applyDate: '',
@ -294,9 +335,14 @@ export default {
currentNotDuePrice: '',
notDuePrice: '',
otherReceivableRemarks: '',
price: ''
price: '',
topping: '',
loanDeposit: '',
bankAccount: '',
accountName: ''
},
bankName: '',
bankSid: '',
bankReceivingAccount: '',
busVinSid: '',
buybacksReason: '',
@ -337,7 +383,8 @@ export default {
taskId: '',
userSid: '',
vehMark: '',
vinNo: ''
vinNo: '',
remarks: ''
},
rules: {}
}
@ -362,6 +409,11 @@ export default {
req.repurchaseInit({ busVinSid: row.busVinSid, orgPath: window.sessionStorage.getItem('defaultOrgPath'), prepareDate: '', userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.formobj = res.data
fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
if (res.success) {
this.bank_list = res.data
}
})
}
})
},
@ -373,6 +425,11 @@ export default {
req.fetchBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
if (res.success) {
this.bank_list = res.data
}
})
}
})
},
@ -400,6 +457,14 @@ export default {
resetState() {
this.viewState = 1
},
bankAccountChange(value) {
const choose = this.bank_list.filter((item) => item.bankAccount === value)
if (choose !== null && choose.length > 0) {
this.formobj.bankCostVo.accountName = choose[0].accountName
} else {
this.formobj.bankCostVo.accountName = ''
}
},
//
changeDate(val) {
req.repurchaseInit({ busVinSid: this.formobj.busVinSid, orgPath: this.formobj.orgPath, prepareDate: val, userSid: this.formobj.userSid }).then((res) => {
@ -487,9 +552,14 @@ export default {
currentNotDuePrice: '',
notDuePrice: '',
otherReceivableRemarks: '',
price: ''
price: '',
topping: '',
loanDeposit: '',
bankAccount: '',
accountName: ''
},
bankName: '',
bankSid: '',
bankReceivingAccount: '',
busVinSid: '',
buybacksReason: '',
@ -530,7 +600,8 @@ export default {
taskId: '',
userSid: '',
vehMark: '',
vinNo: ''
vinNo: '',
remarks: ''
}
this.submitdisabled = false
this.$emit('doback')
@ -550,4 +621,16 @@ export default {
margin-left: 150px !important;
width: calc(100% - 145px);
}
/* 覆盖element-ui的单选按钮样式 */
/deep/ .el-radio__input.is-checked .el-radio__inner {
border-color: #409EFF; /* 未选中状态下的边框颜色 */
background-color: #409EFF; /* 选中后的背景色 */
}
/* 如果需要改变选中后对勾的颜色 */
/deep/ .el-radio__input.is-checked .el-radio__inner:after {
background-color: #000000; /* 对勾的颜色 */
}
/deep/ .el-radio__input.is-checked+.el-radio__label {
color: #000000; /* 选中后的字体颜色 */
}
</style>

44
anrui-riskcenter-ui/src/views/buyback/buybackInfo.vue

@ -81,7 +81,19 @@
<el-form-item><span class="addinputInfo">{{ formobj.notDuePrice }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">资方结清费用</div>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div>
<span style="margin-right: 10px">贷款保证金: {{ formobj.bankCostVo.loanDeposit }}</span>
<span>是否抵顶: {{ formobj.bankCostVo.topping == '1' ? '是' : formobj.bankCostVo.topping == '0' ? '否' : '' }}</span>
</div>
</div>
<el-row>
<el-col :span="8">
<div class="span-sty">资方逾期月还</div>
@ -121,10 +133,18 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="8">
<div class="span-sty">资方结清金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankCostVo.bankSettlePrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方收款账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankCostVo.bankAccount }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方收款账户</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankCostVo.accountName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -275,9 +295,14 @@ export default {
currentNotDuePrice: '',
notDuePrice: '',
otherReceivableRemarks: '',
price: ''
price: '',
topping: '',
loanDeposit: '',
bankAccount: '',
accountName: ''
},
bankName: '',
bankSid: '',
bankReceivingAccount: '',
busVinSid: '',
buybacksReason: '',
@ -318,7 +343,8 @@ export default {
taskId: '',
userSid: '',
vehMark: '',
vinNo: ''
vinNo: '',
remarks: ''
},
rules: {}
}
@ -390,9 +416,14 @@ export default {
currentNotDuePrice: '',
notDuePrice: '',
otherReceivableRemarks: '',
price: ''
price: '',
topping: '',
loanDeposit: '',
bankAccount: '',
accountName: ''
},
bankName: '',
bankSid: '',
bankReceivingAccount: '',
busVinSid: '',
buybacksReason: '',
@ -433,7 +464,8 @@ export default {
taskId: '',
userSid: '',
vehMark: '',
vinNo: ''
vinNo: '',
remarks: ''
}
this.$emit('doback')
}

8
anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue

@ -100,15 +100,15 @@
<span>{{ scope.row.returnState == '01' ? '未还' : scope.row.returnState == '02' ? '部分还款' : scope.row.returnState == '03' ? '已还款' : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="paymentMoney" label="公司垫款余额" width="100" align="center" />
<el-table-column prop="bankBeInter" label="垫资方逾期利息余额" width="120" align="center" />
<el-table-column prop="fund" label="资金占用费余额" width="100" align="center" />
<el-table-column prop="paymentMoney" label="公司垫款余额" width="120" align="center" />
<el-table-column prop="bankBeInter" label="垫资方逾期利息余额" width="150" align="center" />
<el-table-column prop="fund" label="资金占用费余额" width="130" align="center" />
<el-table-column label="当前是否逾期" width="120" align="center">
<template slot-scope="scope">
<span>{{ scope.row.nowOverdue == '0' ? '是' : scope.row.nowOverdue == '1' ? '否' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="本期是否曾逾期" width="120" align="center">
<el-table-column label="本期是否曾逾期" width="130" align="center">
<template slot-scope="scope">
<span>{{ scope.row.dueOverdue == '0' ? '是' : scope.row.dueOverdue == '1' ? '否' : '' }}</span>
</template>

2
anrui-riskcenter-ui/src/views/customerrepayment/customerrepaymentdetails.vue

@ -124,7 +124,7 @@
</el-table-column>
<el-table-column prop="billNo" label="财务收款单编号" align="center" min-width="160" />
<el-table-column prop="buckle" label="划扣状态" align="center" width="100" />
<el-table-column prop="closingDate" label="划扣申请通过时间" align="center" width="140" />
<el-table-column prop="closingDate" label="划扣申请通过时间" align="center" width="150" />
</el-table>
</div>
<!--End 主页面主要部分-->

2
anrui-riskcenter-ui/src/views/settle/settle.vue

@ -164,7 +164,7 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="carList.length > 0" :limit.sync="carList.size" :page.sync="carList.current" :total="carList.total" class="pagination" @pagination="getCarList"/>
<pagination v-show="listByCar.length > 0" :limit.sync="carList.size" :page.sync="carList.current" :total="carList.total" class="pagination" @pagination="getCarList"/>
</div>
</el-dialog>
</div>

18
anrui-riskcenter-ui/src/views/settle/settleAdd.vue

@ -103,11 +103,11 @@
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>贷款保证金:<el-input style="width: 60%" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" /></div>
<div>贷款保证金:<el-input style="width: 60%" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" /></div>
<div>是否抵顶:
<el-radio-group v-model="formobj.loanSettleBankCostVo.topping">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
</el-radio-group>
</div>
</div>
@ -183,7 +183,7 @@
<div class="span-sty">资方收款账号</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.loanSettleBankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
<el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.accountName" :value="item.bankAccount"></el-option>
<el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.bankAccount" :value="item.bankAccount"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -344,7 +344,7 @@ export default {
calculateBankSettlePrice() {
let bankSettlePrice = '0'
// = + + + + + + -
if (this.formobj.loanSettleBankCostVo.topping !== '' && this.formobj.loanSettleBankCostVo.topping === '1') {
if (this.formobj.loanSettleBankCostVo.topping) {
bankSettlePrice = Math.round((parseFloat(this.formobj.loanSettleBankCostVo.price === '' ? 0 : this.formobj.loanSettleBankCostVo.price) + parseFloat(this.formobj.loanSettleBankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.currentNotDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) - parseFloat(this.formobj.loanSettleBankCostVo.loanDeposit !== '' ? this.formobj.loanSettleBankCostVo.loanDeposit : '0')) * 100) / 100
} else {
// = + + + + + +
@ -716,15 +716,15 @@ export default {
margin-left: 190px !important;
}
/* 覆盖element-ui的单选按钮样式 */
.el-radio__input.is-checked .el-radio__inner {
/deep/ .el-radio__input.is-checked .el-radio__inner {
border-color: #409EFF; /* 未选中状态下的边框颜色 */
background-color: #409EFF; /* 选中后的背景色 */
}
/* 如果需要改变选中后对勾的颜色 */
.el-radio__input.is-checked .el-radio__inner::after {
/deep/ .el-radio__input.is-checked .el-radio__inner:after {
background-color: #000000; /* 对勾的颜色 */
}
.el-radio__input.is-checked+.el-radio__label {
color: #000000;
/deep/ .el-radio__input.is-checked+.el-radio__label {
color: #000000; /* 选中后的字体颜色 */
}
</style>

4
anrui-riskcenter-ui/src/views/settle/settleInfo.vue

@ -100,8 +100,8 @@
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div>
<span>贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
<span>是否抵顶: {{ formobj.loanSettleBankCostVo.topping == '1' ? '是' : formobj.loanSettleBankCostVo.topping == '0' ? '否' : '' }}</span>
<span style="margin-right: 10px">贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
<span>是否抵顶: {{ formobj.loanSettleBankCostVo.topping ? '是' : !formobj.loanSettleBankCostVo.topping ? '否' : '' }}</span>
</div>
</div>
<el-row>

34
anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackDaiBan.vue

@ -84,7 +84,19 @@
<el-form-item><span class="addinputInfo">{{ formobj.notDuePrice }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">资方结清费用</div>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div>
<span style="margin-right: 10px">贷款保证金: {{ formobj.bankCostVo.loanDeposit }}</span>
<span>是否抵顶: {{ formobj.bankCostVo.topping == '1' ? '是' : formobj.bankCostVo.topping == '0' ? '否' : '' }}</span>
</div>
</div>
<el-row>
<el-col :span="8">
<div class="span-sty">资方逾期月还</div>
@ -124,10 +136,18 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="8">
<div class="span-sty">资方结清金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankCostVo.bankSettlePrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方收款账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankCostVo.bankAccount }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方收款账户</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankCostVo.accountName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -317,9 +337,14 @@ export default {
currentNotDuePrice: '',
notDuePrice: '',
otherReceivableRemarks: '',
price: ''
price: '',
topping: '',
loanDeposit: '',
bankAccount: '',
accountName: ''
},
bankName: '',
bankSid: '',
bankReceivingAccount: '',
busVinSid: '',
buybacksReason: '',
@ -360,7 +385,8 @@ export default {
taskId: '',
userSid: '',
vehMark: '',
vinNo: ''
vinNo: '',
remarks: ''
},
rules: {},
options: [],

82
anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue

@ -82,7 +82,26 @@
<el-form-item><span class="addinputInfo">{{ formobj.notDuePrice }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">资方结清费用</div>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/>
</el-form-item>
</el-col>
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>贷款保证金:<el-input style="width: 60%" @keyup.native="UpNumber" v-model="formobj.bankCostVo.loanDeposit" clearable placeholder="" /></div>
<div>是否抵顶:
<el-radio-group v-model="formobj.bankCostVo.topping">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</div>
</div>
</div>
<el-row>
<el-col :span="8">
<div class="span-sty">资方逾期月还</div>
@ -122,10 +141,22 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="8">
<div class="span-sty">资方结清金额</div>
<el-form-item><span class="addinputInfo">{{ calculateBankSettlePrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方收款账号</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.bankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
<el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.accountName" :value="item.bankAccount"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方收款账户</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankCostVo.accountName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -251,6 +282,7 @@ import req from '@/api/buyback/buyback'
import uploadImg from '@/components/uploadFile/uploadImg'
import vehiclecollectionrecords from '../cuishoucuoshiFlow/relation/vehiclecollectionrecords'
import financialschemeInfo from '../publicPage/financialschemeInfo'
import { fetchListByBankSid } from '@/api/Common/dictcommons'
export default {
name: 'BuyBackEdit',
@ -262,7 +294,15 @@ export default {
computed: {
// --
calculateBankSettlePrice() {
return parseFloat(this.formobj.bankCostVo.price === '' ? 0 : this.formobj.bankCostVo.price) + parseFloat(this.formobj.bankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.bankCostVo.currentNotDuePrice) + parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice) + parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable) || 0
let bankSettlePrice = '0'
// = + + + + + + -
if (this.formobj.bankCostVo.topping !== '' && this.formobj.bankCostVo.topping === '1') {
bankSettlePrice = Math.round((parseFloat(this.formobj.bankCostVo.price === '' ? 0 : this.formobj.bankCostVo.price) + parseFloat(this.formobj.bankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.bankCostVo.currentNotDuePrice) + parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice) + parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable) - parseFloat(this.formobj.bankCostVo.loanDeposit !== '' ? this.formobj.bankCostVo.loanDeposit : '0')) * 100) / 100
} else {
// = + + + + + +
bankSettlePrice = Math.round((parseFloat(this.formobj.bankCostVo.price === '' ? 0 : this.formobj.bankCostVo.price) + parseFloat(this.formobj.bankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.bankCostVo.currentNotDuePrice) + parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice) + parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable)) * 100) / 100
}
return bankSettlePrice
},
// --
calculateSettleAll() {
@ -278,6 +318,7 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
bank_list: [],
formobj: {
amount: '',
applyDate: '',
@ -293,9 +334,14 @@ export default {
currentNotDuePrice: '',
notDuePrice: '',
otherReceivableRemarks: '',
price: ''
price: '',
topping: '',
loanDeposit: '',
bankAccount: '',
accountName: ''
},
bankName: '',
bankSid: '',
bankReceivingAccount: '',
busVinSid: '',
buybacksReason: '',
@ -336,7 +382,8 @@ export default {
taskId: '',
userSid: '',
vehMark: '',
vinNo: ''
vinNo: '',
remarks: ''
},
rules: {}
}
@ -378,6 +425,11 @@ export default {
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
if (res.success) {
this.bank_list = res.data
}
})
}
})
},
@ -405,6 +457,14 @@ export default {
resetState() {
this.viewState = 1
},
bankAccountChange(value) {
const choose = this.bank_list.filter((item) => item.bankAccount === value)
if (choose !== null && choose.length > 0) {
this.formobj.bankCostVo.accountName = choose[0].accountName
} else {
this.formobj.bankCostVo.accountName = ''
}
},
//
changeDate(val) {
req.repurchaseInit({ busVinSid: this.formobj.busVinSid, orgPath: this.formobj.orgPath, prepareDate: val, userSid: this.formobj.userSid }).then((res) => {
@ -504,4 +564,16 @@ export default {
margin-left: 150px !important;
width: calc(100% - 145px);
}
/* 覆盖element-ui的单选按钮样式 */
/deep/ .el-radio__input.is-checked .el-radio__inner {
border-color: #409EFF; /* 未选中状态下的边框颜色 */
background-color: #409EFF; /* 选中后的背景色 */
}
/* 如果需要改变选中后对勾的颜色 */
/deep/ .el-radio__input.is-checked .el-radio__inner:after {
background-color: #000000; /* 对勾的颜色 */
}
/deep/ .el-radio__input.is-checked+.el-radio__label {
color: #000000; /* 选中后的字体颜色 */
}
</style>

34
anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackYiBan.vue

@ -81,7 +81,19 @@
<el-form-item><span class="addinputInfo">{{ formobj.notDuePrice }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">资方结清费用</div>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div>
<span style="margin-right: 10px">贷款保证金: {{ formobj.bankCostVo.loanDeposit }}</span>
<span>是否抵顶: {{ formobj.bankCostVo.topping == '1' ? '是' : formobj.bankCostVo.topping == '0' ? '否' : '' }}</span>
</div>
</div>
<el-row>
<el-col :span="8">
<div class="span-sty">资方逾期月还</div>
@ -121,10 +133,18 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="8">
<div class="span-sty">资方结清金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankCostVo.bankSettlePrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方收款账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankCostVo.bankAccount }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方收款账户</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankCostVo.accountName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -275,9 +295,14 @@ export default {
currentNotDuePrice: '',
notDuePrice: '',
otherReceivableRemarks: '',
price: ''
price: '',
topping: '',
loanDeposit: '',
bankAccount: '',
accountName: ''
},
bankName: '',
bankSid: '',
bankReceivingAccount: '',
busVinSid: '',
buybacksReason: '',
@ -318,7 +343,8 @@ export default {
taskId: '',
userSid: '',
vehMark: '',
vinNo: ''
vinNo: '',
remarks: ''
},
//
linkByParameter: {

4
anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue

@ -102,8 +102,8 @@
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div>
<span>贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
<span>是否抵顶: {{ formobj.loanSettleBankCostVo.topping == '1' ? '是' : formobj.loanSettleBankCostVo.topping == '0' ? '否' : '' }}</span>
<span style="margin-right: 10px">贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
<span>是否抵顶: {{ formobj.loanSettleBankCostVo.topping ? '是' : !formobj.loanSettleBankCostVo.topping ? '否' : '' }}</span>
</div>
</div>
<el-row>

32
anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue

@ -101,16 +101,12 @@
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div>
<div>
<span>贷款保证金:</span>
<el-input v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" />
</div>
<div>
<span>是否抵顶:</span>
<el-radio-group v-model="formobj.loanSettleBankCostVo.topping ">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>贷款保证金:<el-input style="width: 60%" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" /></div>
<div>是否抵顶:
<el-radio-group v-model="formobj.loanSettleBankCostVo.topping">
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
</el-radio-group>
</div>
</div>
@ -186,7 +182,7 @@
<div class="span-sty">资方收款账号</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.loanSettleBankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
<el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.accountName" :value="item.bankAccount"></el-option>
<el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.bankAccount" :value="item.bankAccount"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -347,7 +343,7 @@ export default {
calculateBankSettlePrice() {
let bankSettlePrice = '0'
// = + + + + + + -
if (this.formobj.loanSettleBankCostVo.topping !== '' && this.formobj.loanSettleBankCostVo.topping === '1') {
if (this.formobj.loanSettleBankCostVo.topping) {
bankSettlePrice = Math.round((parseFloat(this.formobj.loanSettleBankCostVo.price === '' ? 0 : this.formobj.loanSettleBankCostVo.price) + parseFloat(this.formobj.loanSettleBankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.currentNotDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) - parseFloat(this.formobj.loanSettleBankCostVo.loanDeposit !== '' ? this.formobj.loanSettleBankCostVo.loanDeposit : '0')) * 100) / 100
} else {
// = + + + + + +
@ -631,4 +627,16 @@ export default {
.addinputInfo {
margin-left: 190px !important;
}
/* 覆盖element-ui的单选按钮样式 */
/deep/ .el-radio__input.is-checked .el-radio__inner {
border-color: #409EFF; /* 未选中状态下的边框颜色 */
background-color: #409EFF; /* 选中后的背景色 */
}
/* 如果需要改变选中后对勾的颜色 */
/deep/ .el-radio__input.is-checked .el-radio__inner:after {
background-color: #000000; /* 对勾的颜色 */
}
/deep/ .el-radio__input.is-checked+.el-radio__label {
color: #000000; /* 选中后的字体颜色 */
}
</style>

4
anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue

@ -99,8 +99,8 @@
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div>
<span>贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
<span>是否抵顶: {{ formobj.loanSettleBankCostVo.topping == '1' ? '是' : formobj.loanSettleBankCostVo.topping == '0' ? '否' : '' }}</span>
<span style="margin-right: 10px">贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
<span>是否抵顶: {{ formobj.loanSettleBankCostVo.topping ? '是' : !formobj.loanSettleBankCostVo.topping ? '否' : '' }}</span>
</div>
</div>
<el-row>

20
yxt-as-ui/src/router/index.js

@ -135,7 +135,7 @@ export const constantRoutes = [{
component: () => import('@/views/operation/workorderinvoicing/workorderinvoicing.vue'),
name: 'WorkOrderInvoicing',
meta: {
title: '保外工单开票管理',
title: '维修单开票管理',
noCache: true
}
},
@ -144,7 +144,7 @@ export const constantRoutes = [{
component: () => import('@/views/operation/workorderreceivable/workorderreceivable.vue'),
name: 'WorkOrderReceivable',
meta: {
title: '单应收调差管理',
title: '维修单应收调差管理',
noCache: true
}
},
@ -162,7 +162,7 @@ export const constantRoutes = [{
component: () => import('@/views/operation/pendingclaim/pendingclaim.vue'),
name: 'PendingClaim',
meta: {
title: '待索赔维修单',
title: '待索赔维修单',
noCache: true
}
},
@ -216,7 +216,7 @@ export const constantRoutes = [{
component: () => import('@/views/operation/workslrsettlement/workslrsettlement.vue'),
name: 'WorkSLRSettlement',
meta: {
title: '工单反结算管理',
title: '反结算管理',
noCache: true
}
},
@ -927,42 +927,42 @@ export const constantRoutes = [{
import('@/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue'),
name: 'PurchaseReturnYiBan'
},
// 工单反结算管理--编辑
// 反结算管理--编辑
{
path: '/fanjiesuanFlow/workslrsettlementEdit',
component: () =>
import('@/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue'),
name: 'WorkSLRSettlementEdit'
},
// 工单反结算管理--待办
// 反结算管理--待办
{
path: '/fanjiesuanFlow/workslrsettlementDaiBan',
component: () =>
import('@/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue'),
name: 'WorkSLRSettlementDaiBan'
},
// 工单反结算管理--已办
// 反结算管理--已办
{
path: '/fanjiesuanFlow/workslrsettlementYiBan',
component: () =>
import('@/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue'),
name: 'WorkSLRSettlementYiBan'
},
// 保外欠款出厂管理--编辑
// 欠款出厂管理--编辑
{
path: '/qikuanchuchangFlow/arrearsleavefactoryEdit',
component: () =>
import('@/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryEdit.vue'),
name: 'ArrearsLeaveFactoryEdit'
},
// 保外欠款出厂管理--待办
// 欠款出厂管理--待办
{
path: '/qikuanchuchangFlow/arrearsleavefactoryDaiBan',
component: () =>
import('@/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryDaiBan.vue'),
name: 'ArrearsLeaveFactoryDaiBan'
},
// 保外欠款出厂管理--已办
// 欠款出厂管理--已办
{
path: '/qikuanchuchangFlow/arrearsleavefactoryYiBan',
component: () =>

2
yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecordAdd.vue

@ -39,7 +39,7 @@
</el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<div class="title">维修项目列表</div>
<el-table :key="tableKey" :data="formobj.sitemsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sitemName" label="项目名称" align="center" width="170" />

2
yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecordInfo.vue

@ -35,7 +35,7 @@
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.file" :key="index" :src="item" :preview-src-list="formobj.file" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<div class="title">维修项目列表</div>
<el-table :key="tableKey" :data="formobj.sitemsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sitemName" label="项目名称" align="center" width="170" />

1
yxt-as-ui/src/views/operation/claimadjustment/claimadjustmentAdd.vue

@ -39,7 +39,6 @@
</el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="repairBillNo" label="维修工单号" align="center" width="170" />

1
yxt-as-ui/src/views/operation/claimadjustment/claimadjustmentInfo.vue

@ -35,7 +35,6 @@
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.fileList" :key="index" :src="item" :preview-src-list="formobj.fileList" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="repairBillNo" label="维修工单号" align="center" width="170"/>

7
yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue

@ -12,7 +12,7 @@
<el-form-item label="索赔单号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="维修单号">
<el-form-item label="维修单号">
<el-input v-model="listQuery.params.repairBillNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据状态">
@ -47,7 +47,7 @@
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column prop="repairBillNo" label="维修单号" align="center" min-width="170" />
<el-table-column prop="repairBillNo" label="维修单号" align="center" min-width="170" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="billNo" label="索赔单号" align="center" width="170" />
@ -56,7 +56,8 @@
<el-table-column prop="claimGoodsAmount" label="索赔材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount" label="外出费" align="center" width="100" />
<el-table-column prop="claimSubsidyAmount" label="厂家补助" align="center" width="120" />
<el-table-column prop="claimOtherAmount" label="索赔其他费用" align="center" width="120" />
<el-table-column prop="claimRescueAmount" label="施救费" align="center" width="120" />
<el-table-column prop="claimOtherAmount" label="索赔其它费用" align="center" width="120" />
<el-table-column label="单据状态" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.state == '0' ? '审核中' : scope.row.state == '1' ? '已通过' : scope.row.state == '2' ? '未通过' : scope.row.state == '3' ? '作废' : '' }}</span>

22
yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue

@ -2,7 +2,7 @@
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="待索赔维修单管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<button-bar view-title="待索赔维修单管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
@ -26,7 +26,7 @@
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="单类型">
<el-form-item label="维修单类型">
<el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
<el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
</el-option>
@ -35,12 +35,12 @@
<el-form-item label="科目">
<el-input v-model="listQuery.params.subject" placeholder="" clearable/>
</el-form-item>
<el-form-item label="进厂日期">
<el-form-item label="进厂时间">
<el-date-picker v-model="listQuery.params.entryTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.entryTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="预计完工日期">
<el-form-item label="预计完工时间">
<el-date-picker v-model="listQuery.params.estimatedFinishTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.estimatedFinishTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
@ -51,9 +51,6 @@
<el-form-item label="联系电话">
<el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户单位">
<el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
</el-form-item>
@ -83,7 +80,7 @@
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">维修单列表</div>
<div class="tit">维修单列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
@ -107,13 +104,12 @@
<el-table-column prop="deptName" label="制单部门" align="center" width="100" />
<el-table-column prop="createByName" label="制单人" align="center" width="100" />
<el-table-column prop="createTime" label="制单日期" align="center" width="120" />
<el-table-column prop="billType" label="单类型" align="center" width="100" />
<el-table-column prop="billType" label="维修单类型" align="center" width="120" />
<el-table-column prop="subject" label="科目" align="center" width="100" />
<el-table-column prop="entryTime" label="进厂日期" align="center" width="120" />
<el-table-column prop="estimatedFinishTime" label="预计完成日期" align="center" width="130" />
<el-table-column prop="entryTime" label="进厂时间" align="center" width="120" />
<el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="140" />
<el-table-column prop="customerName" label="客户名称" align="center" width="100" />
<el-table-column prop="mobile" label="联系电话" align="center" width="110" />
<el-table-column prop="customerOrg" label="客户单位" align="center" width="120" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="vehModel" label="车型" align="center" width="150" />
@ -135,7 +131,7 @@
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">维修单编号</div>
<div class="span-sty">维修单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.repairBillNo }}</span></el-form-item>
</el-col>
</el-row>

7
yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@ -1547,6 +1547,13 @@ export default {
this.$message({ showClose: true, type: 'error', message: '维修项目列表不能为空' })
return
}
this.formobj.hourAmount = this.gsfTotal //
this.formobj.goodsAmount = this.clfTotal //
this.formobj.addAmount = this.fjfTotal //
this.formobj.taxAmount = '0' //
this.formobj.receivableAmount = this.ysTotal //
this.formobj.actualAmount = this.ssTotal //
this.formobj.discountAmount = this.yhTotal //
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {

2
yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue

@ -58,7 +58,7 @@
</el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<div class="title">维修单列表</div>
<el-table :key="tableKey" :data="formobj.asBwinvoiceapplyDetailList" :index="index" border style="width: 100%">
<el-table-column width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />

2
yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingInfo.vue

@ -49,7 +49,7 @@
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.fileList" :key="index" :src="item" :preview-src-list="formobj.fileList" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<div class="title">维修单列表</div>
<el-table :key="tableKey" :data="formobj.asBwinvoiceapplyDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />

12
yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue

@ -2,7 +2,7 @@
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="工单反结算申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<button-bar view-title="反结算管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
@ -31,10 +31,10 @@
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.closeDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="单编号">
<el-form-item label="维修单编号">
<el-input v-model="listQuery.params.sourceBillNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单类型">
<el-form-item label="维修单类型">
<el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
<el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
</el-option>
@ -61,7 +61,7 @@
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">工单反结算申请列表</div>
<div class="tit">反结算列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
@ -87,8 +87,8 @@
<el-table-column prop="createByName" label="申请人" align="center" width="120" />
<el-table-column prop="applyDate" label="申请日期" align="center" width="120" />
<el-table-column prop="closeDate" label="办结日期" align="center" width="120" />
<el-table-column prop="sourceBillNo" label="单编号" align="center" width="120" />
<el-table-column prop="billType" label="单类型" align="center" width="120" />
<el-table-column prop="sourceBillNo" label="维修单编号" align="center" width="190" />
<el-table-column prop="billType" label="维修单类型" align="center" width="130" />
<el-table-column prop="subject" label="科目" align="center" width="100" />
<el-table-column prop="customerName" label="客户名称" align="center" width="160" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />

166
yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue

@ -31,10 +31,10 @@
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.reason" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<div class="title">维修单信息</div>
<div class="title">维修单信息</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单编号</div>
<div class="span-sty">维修单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -48,7 +48,7 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单类型</div>
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -74,38 +74,31 @@
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">客户单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合计金额</div>
<el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费{{ gsfTotal }} + 材料费{{ clfTotal }} + 附加费{{ fjfTotal }} + 税额{{ seTotal }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.receivableAmount }} = 工时费{{ formobj.hourAmount }} + 材料费{{ formobj.goodsAmount }} + 附加费{{ formobj.addAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应收金额</div>
<el-form-item><span class="addinputInfo">{{ ysjeTotal }} = 合计金额{{ jeTotal }} - 优惠<span>{{ formobj.discountAmount }}</span> - 优惠<span>{{ formobj.coupon }}</span> - 积分抵扣<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.actualAmount }} = 合计金额{{ formobj.receivableAmount }} - 优惠{{ formobj.discountAmount }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">服务项目</div>
<div class="title">维修项目</div>
<el-table :key="serviceKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="serviceItem" label="服务项目" align="center" width="200" />
<el-table-column prop="serviceItem" label="维修项目" align="center" width="200" />
<el-table-column prop="serviceType" label="工种" align="center" width="150" />
<el-table-column prop="subject" label="科目" align="center" width="150" />
<el-table-column prop="repairerName" label="维修人" align="center" width="200" />
<el-table-column prop="examineHourPrice" label="考核工时" align="center" width="100" />
<el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="amount" label="销售金额" align="center" width="150" />
<el-table-column prop="amount" label="金额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">商品</div>
@ -116,7 +109,6 @@
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
<el-table-column prop="unit" label="单位" width="100" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
@ -125,9 +117,61 @@
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">附加项目</div>
<el-row>
<el-col :span="8">
<div class="span-sty">外出费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.outAmount }}</span>
<span v-show="formobj.outKPAmount !== ''">开票金额{{ formobj.outKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">厂家补助()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.subsidyAmount }}</span>
<span v-show="formobj.subsidyKPAmount !== ''">开票金额{{ formobj.subsidyKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">施救费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.rescueAmount }}</span>
<span v-show="formobj.rescueKPAmount !== ''">开票金额{{ formobj.rescueKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
<el-button type="text" v-for="(item, index) in formobj.fileName" :key="index" @click="handleOpen(item.url)">{{ item.name }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="aitemName" label="附加项目" align="center" width="200" />
<el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
@ -184,70 +228,30 @@ export default {
settleDate: '',
taxRate: '',
taskId: '',
instanceId: ''
instanceId: '',
receivableAmount: '',
hourAmount: '',
goodsAmount: '',
addAmount: '',
discountAmount: '',
actualAmount: '',
outAmount: '',
outKPAmount: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueRemarks: '',
fileName: []
},
rules: {}
}
},
computed: {
// =
gsfTotal() {
let gsf = '0'
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.serviceItem !== '') {
gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return gsf
},
// =
clfTotal() {
let clf = '0'
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
if (e.goodsSpuName !== '') {
clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return clf
},
// ==
fjfTotal() {
let fjf = '0'
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
if (e.aitemName !== '') {
fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return fjf
},
// = *
seTotal() {
let se = '0'
se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.taxRate !== '' ? this.formobj.taxRate : '0')) * 100) / 100
return se
},
// = + + +
jeTotal() {
let je = '0'
je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
return je
},
//
ysjeTotal() {
let ysje = '0'
ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
return ysje
}
},
methods: {
showAdd(sid) {
this.viewTitle = '【新增】工单反结算'
this.viewTitle = '【新增】反结算申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -265,7 +269,7 @@ export default {
})
},
showEdit(row) {
this.viewTitle = '【编辑】工单反结算'
this.viewTitle = '【编辑】反结算申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -341,7 +345,13 @@ export default {
settleDate: '',
taxRate: '',
taskId: '',
instanceId: ''
instanceId: '',
receivableAmount: '',
hourAmount: '',
goodsAmount: '',
addAmount: '',
discountAmount: '',
actualAmount: ''
}
this.$emit('doback')
}

176
yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue

@ -29,10 +29,10 @@
<el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">维修单信息</div>
<div class="title">维修单信息</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单编号</div>
<div class="span-sty">维修单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -46,7 +46,7 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单类型</div>
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -74,24 +74,29 @@
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">客户单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
<div class="span-sty">合计金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.receivableAmount }} = 工时费{{ formobj.hourAmount }} + 材料费{{ formobj.goodsAmount }} + 附加费{{ formobj.addAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应收金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.actualAmount }} = 合计金额{{ formobj.receivableAmount }} - 优惠{{ formobj.discountAmount }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">服务项目</div>
<div class="title">维修项目</div>
<el-table :key="serviceKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="serviceItem" label="服务项目" align="center" width="200" />
<el-table-column prop="serviceItem" label="维修项目" align="center" width="200" />
<el-table-column prop="serviceType" label="工种" align="center" width="150" />
<el-table-column prop="subject" label="科目" align="center" width="150" />
<el-table-column prop="repairerName" label="维修人" width="100" align="center" />
<el-table-column prop="examineHourPrice" label="考核工时" align="center" width="100" />
<el-table-column prop="repairerName" label="维修人" align="center" width="200" />
<el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="amount" label="销售金额" align="center" width="150" />
<el-table-column prop="amount" label="金额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">商品</div>
@ -102,7 +107,6 @@
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
<el-table-column prop="unit" label="单位" width="100" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
@ -111,24 +115,64 @@
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">附加项目</div>
<el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="aitemName" label="附加项目" align="center" width="200" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">合计金额</div>
<el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费{{ gsfTotal }} + 材料费{{ clfTotal }} + 附加费{{ fjfTotal }} + 税额{{ seTotal }}</span></el-form-item>
<el-col :span="8">
<div class="span-sty">外出费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.outAmount }}</span>
<span v-show="formobj.outKPAmount !== ''">开票金额{{ formobj.outKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应收金额</div>
<el-form-item><span class="addinputInfo">{{ ysjeTotal }} = 合计金额{{ jeTotal }} - 优惠<span>{{ formobj.discountAmount }}</span> - 优惠券<span>{{ formobj.coupon }}</span> - 积分抵扣<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
<el-col :span="8">
<div class="span-sty">厂家补助()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.subsidyAmount }}</span>
<span v-show="formobj.subsidyKPAmount !== ''">开票金额{{ formobj.subsidyKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">施救费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.rescueAmount }}</span>
<span v-show="formobj.rescueKPAmount !== ''">开票金额{{ formobj.rescueKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
<el-button type="text" v-for="(item, index) in formobj.fileName" :key="index" @click="handleOpen(item.url)">{{ item.name }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
</div>
</div>
@ -182,70 +226,30 @@ export default {
settleDate: '',
taxRate: '',
taskId: '',
instanceId: ''
instanceId: '',
receivableAmount: '',
hourAmount: '',
goodsAmount: '',
addAmount: '',
discountAmount: '',
actualAmount: '',
outAmount: '',
outKPAmount: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueRemarks: '',
fileName: []
},
rules: {}
}
},
computed: {
// =
gsfTotal() {
let gsf = '0'
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.serviceItem !== '') {
gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return gsf
},
// =
clfTotal() {
let clf = '0'
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
if (e.goodsSpuName !== '') {
clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return clf
},
// ==
fjfTotal() {
let fjf = '0'
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
if (e.aitemName !== '') {
fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return fjf
},
// = *
seTotal() {
let se = '0'
se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.taxRate !== '' ? this.formobj.taxRate : '0')) * 100) / 100
return se
},
// = + + +
jeTotal() {
let je = '0'
je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
return je
},
//
ysjeTotal() {
let ysje = '0'
ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
return ysje
}
},
methods: {
showInfo(row) {
this.viewTitle = '工单反结算详情'
this.viewTitle = '反结算申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -294,7 +298,13 @@ export default {
settleDate: '',
taxRate: '',
taskId: '',
instanceId: ''
instanceId: '',
receivableAmount: '',
hourAmount: '',
goodsAmount: '',
addAmount: '',
discountAmount: '',
actualAmount: ''
}
this.$emit('doback')
}

6
yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue

@ -125,6 +125,8 @@
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
this.submitdisabled = false
this.$emit('doback')
},
@ -138,7 +140,7 @@
this.formobj = resp.data
for (var i = 0; i < resp.data.filePaths.length; i++) {
this.imgList.push({
url: resp.data.filePaths[i].url
url: resp.data.filePaths[i]
})
}
}
@ -168,7 +170,7 @@
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
this.imgList = value
this.formobj.filePaths = []
for (var i = 0; i < this.imgList.length; i++) {
this.formobj.filePaths.push(this.imgList[i].url)
}

16
yxt-as-ui/src/views/storage/oldPartsFactory/index.vue

@ -79,19 +79,21 @@
<el-table-column prop="actualReturnCount" label="实际返厂数量合计" width="180" align="center" />
<el-table-column label="附件" align="center" width="100">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showAdjunct(scope.row.filePaths)">查看
<div style="color: #1890FF; text-decoration: underline ;cursor: pointer;"
@click="showAdjunct(scope.row.filePaths)">查看
</div>
</template>
</el-table-column>
<el-table-column label="返厂情况" align="center" width="100">
<template slot-scope="scope">
<el-table-column label="返厂情况" prop="state" align="center" width="100" />
<!-- <template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;">{{scope.row.state}}
</div>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="厂家确认情况" align="center" width="150">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showDetail(scope.row)">
<div style="color: #1890FF; text-decoration: underline ;cursor: pointer;"
v-show="scope.row.confirmSid!=''" @click="showDetail(scope.row)">
查看
</div>
</template>
@ -281,8 +283,10 @@
this.dialogVisible = true
},
showDetail(row) {
this.viewState = 5
this.$refs['manufacturerconfirmInfo'].showEdit(row.sid)
this.$refs['manufacturerconfirmInfo'].showEdit(row.confirmSid)
},
showResult(row) {

166
yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue

@ -32,10 +32,10 @@
<el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">维修单信息</div>
<div class="title">维修单信息</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单编号</div>
<div class="span-sty">维修单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -49,7 +49,7 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单类型</div>
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -77,24 +77,29 @@
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">客户单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
<div class="span-sty">合计金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.receivableAmount }} = 工时费{{ formobj.hourAmount }} + 材料费{{ formobj.goodsAmount }} + 附加费{{ formobj.addAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应收金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.actualAmount }} = 合计金额{{ formobj.receivableAmount }} - 优惠{{ formobj.discountAmount }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">服务项目</div>
<div class="title">维修项目</div>
<el-table :key="serviceKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="serviceItem" label="服务项目" align="center" width="200" />
<el-table-column prop="serviceItem" label="维修项目" align="center" width="200" />
<el-table-column prop="serviceType" label="工种" align="center" width="150" />
<el-table-column prop="subject" label="科目" align="center" width="150" />
<el-table-column prop="repairerName" label="维修人" width="100" align="center" />
<el-table-column prop="examineHourPrice" label="考核工时" align="center" width="100" />
<el-table-column prop="repairerName" label="维修人" align="center" width="200" />
<el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="amount" label="销售金额" align="center" width="150" />
<el-table-column prop="amount" label="金额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">商品</div>
@ -105,7 +110,6 @@
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
<el-table-column prop="unit" label="单位" width="100" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
@ -114,24 +118,64 @@
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">附加项目</div>
<el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="aitemName" label="附加项目" align="center" width="200" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">合计金额</div>
<el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费{{ gsfTotal }} + 材料费{{ clfTotal }} + 附加费{{ fjfTotal }} + 税额{{ seTotal }}</span></el-form-item>
<el-col :span="8">
<div class="span-sty">外出费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.outAmount }}</span>
<span v-show="formobj.outKPAmount !== ''">开票金额{{ formobj.outKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应收金额</div>
<el-form-item><span class="addinputInfo">{{ ysjeTotal }} = 合计金额{{ jeTotal }} - 优惠<span>{{ formobj.discountAmount }}</span> - 优惠券<span>{{ formobj.coupon }}</span> - 积分抵扣<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
<el-col :span="8">
<div class="span-sty">厂家补助()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.subsidyAmount }}</span>
<span v-show="formobj.subsidyKPAmount !== ''">开票金额{{ formobj.subsidyKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">施救费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.rescueAmount }}</span>
<span v-show="formobj.rescueKPAmount !== ''">开票金额{{ formobj.rescueKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
<el-button type="text" v-for="(item, index) in formobj.fileName" :key="index" @click="handleOpen(item.url)">{{ item.name }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
</div>
</div>
@ -224,7 +268,23 @@ export default {
settleDate: '',
taxRate: '',
taskId: '',
instanceId: ''
instanceId: '',
receivableAmount: '',
hourAmount: '',
goodsAmount: '',
addAmount: '',
discountAmount: '',
actualAmount: '',
outAmount: '',
outKPAmount: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueRemarks: '',
fileName: []
},
rules: {},
options: [],
@ -293,62 +353,6 @@ export default {
}
}, '*')
},
computed: {
// =
gsfTotal() {
let gsf = '0'
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.serviceItem !== '') {
gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return gsf
},
// =
clfTotal() {
let clf = '0'
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
if (e.goodsSpuName !== '') {
clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return clf
},
// ==
fjfTotal() {
let fjf = '0'
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
if (e.aitemName !== '') {
fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return fjf
},
// = *
seTotal() {
let se = '0'
se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.taxRate !== '' ? this.formobj.taxRate : '0')) * 100) / 100
return se
},
// = + + +
jeTotal() {
let je = '0'
je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
return je
},
//
ysjeTotal() {
let ysje = '0'
ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
return ysje
}
},
methods: {
showInfo(sid) {
this.viewTitle = '工单反结算详情'

154
yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue

@ -30,10 +30,10 @@
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.reason" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<div class="title">维修单信息</div>
<div class="title">维修单信息</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单编号</div>
<div class="span-sty">维修单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -47,7 +47,7 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单类型</div>
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -73,38 +73,31 @@
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">客户单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合计金额</div>
<el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费{{ gsfTotal }} + 材料费{{ clfTotal }} + 附加费{{ fjfTotal }} + 税额{{ seTotal }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.receivableAmount }} = 工时费{{ formobj.hourAmount }} + 材料费{{ formobj.goodsAmount }} + 附加费{{ formobj.addAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应收金额</div>
<el-form-item><span class="addinputInfo">{{ ysjeTotal }} = 合计金额{{ jeTotal }} - 优惠<span>{{ formobj.discountAmount }}</span> - 优惠<span>{{ formobj.coupon }}</span> - 积分抵扣<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.actualAmount }} = 合计金额{{ formobj.receivableAmount }} - 优惠{{ formobj.discountAmount }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">服务项目</div>
<div class="title">维修项目</div>
<el-table :key="serviceKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="serviceItem" label="服务项目" align="center" width="200" />
<el-table-column prop="serviceItem" label="维修项目" align="center" width="200" />
<el-table-column prop="serviceType" label="工种" align="center" width="150" />
<el-table-column prop="subject" label="科目" align="center" width="150" />
<el-table-column prop="repairerName" label="维修人" align="center" width="200" />
<el-table-column prop="examineHourPrice" label="考核工时" align="center" width="100" />
<el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="amount" label="销售金额" align="center" width="150" />
<el-table-column prop="amount" label="金额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">商品</div>
@ -115,7 +108,6 @@
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
<el-table-column prop="unit" label="单位" width="100" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
@ -124,9 +116,61 @@
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">附加项目</div>
<el-row>
<el-col :span="8">
<div class="span-sty">外出费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.outAmount }}</span>
<span v-show="formobj.outKPAmount !== ''">开票金额{{ formobj.outKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">厂家补助()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.subsidyAmount }}</span>
<span v-show="formobj.subsidyKPAmount !== ''">开票金额{{ formobj.subsidyKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">施救费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.rescueAmount }}</span>
<span v-show="formobj.rescueKPAmount !== ''">开票金额{{ formobj.rescueKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
<el-button type="text" v-for="(item, index) in formobj.fileName" :key="index" @click="handleOpen(item.url)">{{ item.name }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="aitemName" label="附加项目" align="center" width="200" />
<el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
@ -183,7 +227,23 @@ export default {
settleDate: '',
taxRate: '',
taskId: '',
instanceId: ''
instanceId: '',
receivableAmount: '',
hourAmount: '',
goodsAmount: '',
addAmount: '',
discountAmount: '',
actualAmount: '',
outAmount: '',
outKPAmount: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueRemarks: '',
fileName: []
},
rules: {}
}
@ -205,62 +265,6 @@ export default {
}
}, '*')
},
computed: {
// =
gsfTotal() {
let gsf = '0'
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.serviceItem !== '') {
gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return gsf
},
// =
clfTotal() {
let clf = '0'
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
if (e.goodsSpuName !== '') {
clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return clf
},
// ==
fjfTotal() {
let fjf = '0'
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
if (e.aitemName !== '') {
fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return fjf
},
// = *
seTotal() {
let se = '0'
se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.taxRate !== '' ? this.formobj.taxRate : '0')) * 100) / 100
return se
},
// = + + +
jeTotal() {
let je = '0'
je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
return je
},
//
ysjeTotal() {
let ysje = '0'
ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
return ysje
}
},
methods: {
showInfo(sid) {
this.viewTitle = '【编辑】工单反结算'

166
yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue

@ -29,10 +29,10 @@
<el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">维修单信息</div>
<div class="title">维修单信息</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单编号</div>
<div class="span-sty">维修单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -46,7 +46,7 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单类型</div>
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -74,24 +74,29 @@
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">客户单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
<div class="span-sty">合计金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.receivableAmount }} = 工时费{{ formobj.hourAmount }} + 材料费{{ formobj.goodsAmount }} + 附加费{{ formobj.addAmount }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">服务项目</div>
<el-row>
<el-col :span="24">
<div class="span-sty">应收金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.actualAmount }} = 合计金额{{ formobj.receivableAmount }} - 优惠{{ formobj.discountAmount }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">维修项目</div>
<el-table :key="serviceKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="serviceItem" label="服务项目" align="center" width="200" />
<el-table-column prop="serviceItem" label="维修项目" align="center" width="200" />
<el-table-column prop="serviceType" label="工种" align="center" width="150" />
<el-table-column prop="subject" label="科目" align="center" width="150" />
<el-table-column prop="repairerName" label="维修人" width="100" align="center" />
<el-table-column prop="examineHourPrice" label="考核工时" align="center" width="100" />
<el-table-column prop="repairerName" label="维修人" align="center" width="200" />
<el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="amount" label="销售金额" align="center" width="150" />
<el-table-column prop="amount" label="金额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">商品</div>
@ -102,7 +107,6 @@
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
<el-table-column prop="unit" label="单位" width="100" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
@ -111,24 +115,64 @@
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">附加项目</div>
<el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="aitemName" label="附加项目" align="center" width="200" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">合计金额</div>
<el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费{{ gsfTotal }} + 材料费{{ clfTotal }} + 附加费{{ fjfTotal }} + 税额{{ seTotal }}</span></el-form-item>
<el-col :span="8">
<div class="span-sty">外出费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.outAmount }}</span>
<span v-show="formobj.outKPAmount !== ''">开票金额{{ formobj.outKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应收金额</div>
<el-form-item><span class="addinputInfo">{{ ysjeTotal }} = 合计金额{{ jeTotal }} - 优惠<span>{{ formobj.discountAmount }}</span> - 优惠券<span>{{ formobj.coupon }}</span> - 积分抵扣<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
<el-col :span="8">
<div class="span-sty">厂家补助()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.subsidyAmount }}</span>
<span v-show="formobj.subsidyKPAmount !== ''">开票金额{{ formobj.subsidyKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">施救费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.rescueAmount }}</span>
<span v-show="formobj.rescueKPAmount !== ''">开票金额{{ formobj.rescueKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
<el-button type="text" v-for="(item, index) in formobj.fileName" :key="index" @click="handleOpen(item.url)">{{ item.name }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
</div>
</div>
@ -182,7 +226,23 @@ export default {
settleDate: '',
taxRate: '',
taskId: '',
instanceId: ''
instanceId: '',
receivableAmount: '',
hourAmount: '',
goodsAmount: '',
addAmount: '',
discountAmount: '',
actualAmount: '',
outAmount: '',
outKPAmount: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueRemarks: '',
fileName: []
},
rules: {},
//
@ -222,62 +282,6 @@ export default {
}
}, '*')
},
computed: {
// =
gsfTotal() {
let gsf = '0'
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.serviceItem !== '') {
gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return gsf
},
// =
clfTotal() {
let clf = '0'
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
if (e.goodsSpuName !== '') {
clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return clf
},
// ==
fjfTotal() {
let fjf = '0'
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
if (e.aitemName !== '') {
fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return fjf
},
// = *
seTotal() {
let se = '0'
se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.taxRate !== '' ? this.formobj.taxRate : '0')) * 100) / 100
return se
},
// = + + +
jeTotal() {
let je = '0'
je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
return je
},
//
ysjeTotal() {
let ysje = '0'
ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
return ysje
}
},
methods: {
showInfo(sid) {
this.viewTitle = '工单反结算详情'

2
yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingDaiBan.vue

@ -52,7 +52,7 @@
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.fileList" :key="index" :src="item" :preview-src-list="formobj.fileList" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<div class="title">维修单列表</div>
<el-table :key="tableKey" :data="formobj.asBwinvoiceapplyDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />

2
yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue

@ -57,7 +57,7 @@
</el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<div class="title">维修单列表</div>
<el-table :key="tableKey" :data="formobj.asBwinvoiceapplyDetailList" :index="index" border style="width: 100%">
<el-table-column width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />

2
yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingYiBan.vue

@ -49,7 +49,7 @@
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.fileList" :key="index" :src="item" :preview-src-list="formobj.fileList" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<div class="title">维修单列表</div>
<el-table :key="tableKey" :data="formobj.asBwinvoiceapplyDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />

1
yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentDaiBan.vue

@ -38,7 +38,6 @@
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.fileList" :key="index" :src="item" :preview-src-list="formobj.fileList" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="repairBillNo" label="维修工单号" align="center" width="170"/>

1
yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentEdit.vue

@ -38,7 +38,6 @@
</el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="repairBillNo" label="维修工单号" align="center" width="170" />

1
yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentYiBan.vue

@ -35,7 +35,6 @@
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.fileList" :key="index" :src="item" :preview-src-list="formobj.fileList" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="repairBillNo" label="维修工单号" align="center" width="170"/>

2
yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordDaiBan.vue

@ -38,7 +38,7 @@
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.file" :key="index" :src="item" :preview-src-list="formobj.file" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<div class="title">维修项目列表</div>
<el-table :key="tableKey" :data="formobj.sitemsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sitemName" label="项目名称" align="center" width="170" />

2
yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordEdit.vue

@ -38,7 +38,7 @@
</el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<div class="title">维修项目列表</div>
<el-table :key="tableKey" :data="formobj.sitemsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sitemName" label="项目名称" align="center" width="170" />

2
yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordYiBan.vue

@ -35,7 +35,7 @@
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.file" :key="index" :src="item" :preview-src-list="formobj.file" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<div class="title">维修项目列表</div>
<el-table :key="tableKey" :data="formobj.sitemsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sitemName" label="项目名称" align="center" width="170" />

50
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java

@ -19,16 +19,18 @@ import java.util.List;
public class AsBusrepairBillDto implements Dto {
private String sid;
private String orgPath;
@ApiModelProperty("是否外出(1是,2否)")
private String isGoOut;
@ApiModelProperty("索赔厂家")
private String claimManufacturer;
@ApiModelProperty("索赔厂家sid")
private String claimManufacturerSid;
@ApiModelProperty("特殊标志(1有,0无)")
private String isSpecialSign;
@ApiModelProperty("客户来源")
@ApiModelProperty("特殊标志(1有,0无)")
private String isSpecialSign2;
@ApiModelProperty("客户来源 ")
private String customerSource;
@ApiModelProperty("客户来源 ")
private String customerSource2;
@ApiModelProperty("对接人sid")
private String dockingPeopleSid;
@ApiModelProperty("对接人")
@ -45,32 +47,38 @@ public class AsBusrepairBillDto implements Dto {
private String goodsAmount;
@ApiModelProperty("外出费")
private String outAmount;
@ApiModelProperty("附加费")
private String addAmount;
@ApiModelProperty("税额")
private String taxAmount;
@ApiModelProperty("是否外出(1是,2否)")
private String isGoOut;
@ApiModelProperty("是否外出(1是,2否)")
private String isGoOut2;
@ApiModelProperty("厂家补助")
private String subsidyAmount;
@ApiModelProperty("其他费用")
private String otherAmount;
@ApiModelProperty("班组sid")
private String groupSid;
private String createDate;
@ApiModelProperty("班组名称")
private String groupName;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("制单部门sid")
private String deptSid; // 制单部门sid
@ApiModelProperty("制单部门")
private String deptName; // 制单部门
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("操作人Sid")
private String operatorSid;
@ApiModelProperty("操作人")
private String operator;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
private String billTypeKey;
@ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
@ -102,6 +110,20 @@ public class AsBusrepairBillDto implements Dto {
private String coupon;
@ApiModelProperty("积分抵扣")
private String scoreDeduct;
@ApiModelProperty("当前环节编码(登记1、派工2、竣工3、结算4)")
private String nodeCode;
@ApiModelProperty("当前环节")
private String nodeName;
@ApiModelProperty("进入当前环节时间")
private String nodeTime;
@ApiModelProperty("出厂状态 (0未出厂,1已出厂)")
private String outDoorState;
@ApiModelProperty("出厂时间")
private String outDoorTime;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("客户名称")
@ -132,8 +154,9 @@ public class AsBusrepairBillDto implements Dto {
private OtherVo otherVo = new OtherVo();//送修人信息
private List<SitemVo> sitemVos = new ArrayList<>();// 服务项目
private List<AitemVo> aitemVos = new ArrayList<>();// 附加项目
private SettleVo settleVo = new SettleVo(); //结算信息
private List<GoodsDetailsVo> goodsDetailsVos = new ArrayList<>(); //商品信息
private SettleVo settleVo = new SettleVo(); //结算信息
private boolean showReSettleBtn; //是否显示反结算按钮,ture显示,false不显示
@ApiModelProperty("厂家补助备注")
private String subsidyRemarks;
@ApiModelProperty("施救费备注")
@ -151,6 +174,5 @@ public class AsBusrepairBillDto implements Dto {
private List<FileUrlQuery> fileName = new ArrayList<>(); //文件名称
@ApiModelProperty("商品登记备注")
private String registerRemarks;
@ApiModelProperty("附加费")
private String addAmount;
private List<String> files = new ArrayList<>(); //文件名称
}

33
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleDetailsVo.java

@ -29,6 +29,7 @@ package com.yxt.anrui.as.api.asbusrepairbillreversesettle;
import com.yxt.anrui.as.api.asbusrepairbill.AitemVo;
import com.yxt.anrui.as.api.asbusrepairbill.GoodsDetailsVo;
import com.yxt.anrui.as.api.asbusrepairbill.SitemVo;
import com.yxt.anrui.as.api.utils.FileUrlQuery;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -109,6 +110,18 @@ public class AsBusrepairBillReverseSettleDetailsVo implements Vo {
private String vinNo;
@ApiModelProperty("车牌号")
private String vehMark;
@ApiModelProperty("应收金额")
private String receivableAmount;
@ApiModelProperty("实收金额")
private String actualAmount;
@ApiModelProperty("工时费")
private String hourAmount;
@ApiModelProperty("材料费")
private String goodsAmount;
@ApiModelProperty("外出费")
private String outAmount;
@ApiModelProperty("附加费")
private String addAmount;
private List<SitemVo> sitemVos = new ArrayList<>();// 服务项目
private List<AitemVo> aitemVos = new ArrayList<>();// 附加项目
private List<GoodsDetailsVo> goodsDetailsVos = new ArrayList<>(); //商品信息
@ -118,4 +131,24 @@ public class AsBusrepairBillReverseSettleDetailsVo implements Vo {
private String taskId;
@ApiModelProperty("实例id")
private String instanceId;
@ApiModelProperty("实例id")
private String procInsId;
private List<FileUrlQuery> fileName = new ArrayList<>(); //文件名称
@ApiModelProperty("厂家补助备注")
private String subsidyRemarks;
@ApiModelProperty("施救费备注")
private String rescueRemarks;
@ApiModelProperty("外出费备注")
private String outRemarks;
@ApiModelProperty("施救费")
private String rescueAmount;
@ApiModelProperty("外出费开票金额")
private String outKPAmount;
@ApiModelProperty("厂家补助开票金额")
private String subsidyKPAmount;
@ApiModelProperty("厂家补助金额")
private String subsidyAmount;
@ApiModelProperty("施救费开票金额")
private String rescueKPAmount;
private List<String> files = new ArrayList<>(); //文件名称
}

61
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleRest.java

@ -26,6 +26,10 @@
package com.yxt.anrui.as.biz.asbusrepairbillreversesettle;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleDelegateQuery;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleTaskQuery;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.CompleteSettleDto;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.SettleFlowableQuery;
import com.yxt.anrui.as.api.asbusrepairbillreversesettle.*;
import com.yxt.anrui.as.api.asbusrepairbillreversesettle.flowable.*;
import com.yxt.anrui.as.api.asoldparthandleapply.flowable.*;
@ -167,4 +171,61 @@ public class AsBusrepairBillReverseSettleRest{
public ResultBean delegate(@RequestBody ReverseSettleDelegateQuery query) {
return asBusrepairBillReverseSettleService.delegate(query);
}
// ----------------------------------app------------------------------------------------
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid2/{sid}")
public ResultBean<AsBusrepairBillReverseSettleDetailsVo> fetchDetailsBySid2(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
AsBusrepairBillReverseSettleDetailsVo vo = asBusrepairBillReverseSettleService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("办理")
@PutMapping("/agreeCreditInfo")
@ResponseBody
ResultBean agreeCreditInfo(@Valid @RequestBody CompleteSettleDto dto){
return asBusrepairBillReverseSettleService.agreeCreditInfo(dto);
}
@ApiOperation("驳回")
@PutMapping("/rejectCreditInfo")
@ResponseBody
ResultBean rejectCreditInfo(@Valid @RequestBody AppSettleTaskQuery query){
return asBusrepairBillReverseSettleService.rejectCreditInfo(query);
}
@ApiOperation("撤回")
@PutMapping("/recallCreditInfo")
@ResponseBody
ResultBean recallCreditInfo(@Valid @RequestBody AppSettleTaskQuery query){
return asBusrepairBillReverseSettleService.recallCreditInfo(query);
}
@ApiOperation("终止")
@PutMapping("/stopCreditInfo")
@ResponseBody
ResultBean stopCreditInfo(@Valid @RequestBody AppSettleTaskQuery query){
return asBusrepairBillReverseSettleService.stopCreditInfo(query);
}
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap SettleFlowableQuery query){
return asBusrepairBillReverseSettleService.getFlowOperateTitle(query);
}
@ApiOperation(value = "加签")
@PutMapping(value = "/delegate2")
@ResponseBody
public ResultBean delegate(@RequestBody AppSettleDelegateQuery delegateQuery){
return asBusrepairBillReverseSettleService.delegate2(delegateQuery);
}
}

112
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java

@ -31,6 +31,11 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asbillsettelapply.flow.*;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleDelegateQuery;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleTaskQuery;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.CompleteSettleDto;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.SettleFlowableQuery;
import com.yxt.anrui.as.api.asbusrepairbill.*;
import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode;
import com.yxt.anrui.as.api.asbusrepairbillreversesettle.*;
@ -52,6 +57,7 @@ import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrg;
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
import com.yxt.anrui.as.feign.portal.sysuser.SysUserVo;
@ -229,10 +235,12 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
vo.setApplyDate(DateUtil.formatDate(entity.getApplyDate()));
if (StringUtils.isNotBlank(entity.getProcInstId())) {
vo.setInstanceId(entity.getProcInstId());
vo.setProcInsId(entity.getProcInstId());
}
if (StringUtils.isNotBlank(entity.getSourceSid())) {
AsBusrepairBillDetailsVo bill = asBusrepairBillService.fetchDetailsBySid(entity.getSourceSid()).getData();
if (null != bill) {
BeanUtil.copyProperties(bill,vo,"id","sid","billNo","useOrgSid","createBySid","createOrgSid","orgPath");
if (bill.getInvoiceVo() != null) {
if (StringUtils.isNotBlank(bill.getInvoiceVo().getTaxRate())) {
vo.setTaxRate(bill.getInvoiceVo().getTaxRate());
@ -345,6 +353,7 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
vo.setDeptSid(deptSid);
AsBusrepairBillDetailsVo bill = asBusrepairBillService.fetchDetailsBySid(sourceSid).getData();
if (null != bill) {
BeanUtil.copyProperties(bill,vo,"id","sid","billNo","useOrgSid","createBySid","createOrgSid","orgPath");
if (bill.getInvoiceVo() != null) {
if (StringUtils.isNotBlank(bill.getInvoiceVo().getTaxRate())) {
vo.setTaxRate(bill.getInvoiceVo().getTaxRate());
@ -774,4 +783,107 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
flowFeign.delegate(delegateQuery);
return rb.success();
}
public ResultBean agreeCreditInfo(CompleteSettleDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
SettleCompleteDto completeDto = new
SettleCompleteDto();
BeanUtil.copyProperties(dto, completeDto);
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(completeDto, bv);
bv.setModelId(ProcDefEnum.REVERSESETTLEAPPLY.getProDefId());
ResultBean resultBean = complete(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean rejectCreditInfo(AppSettleTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
ReverseSettleTaskQuery taskQuery = new
ReverseSettleTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = reject(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean recallCreditInfo(AppSettleTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
ReverseSettleTaskQuery taskQuery = new
ReverseSettleTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = revokeProcess(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean stopCreditInfo(AppSettleTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
ReverseSettleTaskQuery taskQuery = new
ReverseSettleTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = breakProcess(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean<String> getFlowOperateTitle(SettleFlowableQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
ReverseSettleNodeQuery getNodeQuery = new
ReverseSettleNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<ReverseSettleNodeVo>> getPreviousNodesForReject = getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<ReverseSettleNodeVo>> getNextNodesForSubmit = getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误:next");
}
return rb.success().setData(data);
}
public ResultBean delegate2(AppSettleDelegateQuery delegateQuery) {
ResultBean rb = ResultBean.fireFail();
ReverseSettleDelegateQuery delegateQuery1 = new
ReverseSettleDelegateQuery();
BeanUtil.copyProperties(delegateQuery, delegateQuery1);
ResultBean delegate = delegate(delegateQuery1);
return rb.success();
}
}

Loading…
Cancel
Save