Browse Source

完善维修单结算

master
yunuo970428 5 months ago
parent
commit
7aae72905d
  1. 68
      yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue
  2. 18
      yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue
  3. 18
      yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue
  4. 68
      yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue
  5. 18
      yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue

68
yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue

@ -99,16 +99,6 @@
<el-form-item><span class="addinputInfo">{{ formobj.settleAmount }} = 合计金额{{ formobj.receivableAmount }} - 优惠<span>{{ formobj.discountAmount }}</span></span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">成本合计</div>
<el-form-item><span class="addinputInfo">{{ totalCost }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">利润额</div>
<el-form-item><span class="addinputInfo">{{ amountOfProfit }}</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"/>
@ -121,8 +111,6 @@
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="sitemSettleAmount" label="结算金额" align="center" width="150" />
<el-table-column prop="sitemCost" label="成本小计" align="center" width="150" />
<el-table-column prop="sitemPrint" label="利润额" align="center" width="150" />
<el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
@ -138,8 +126,6 @@
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="goodsSettleAmount" label="结算金额" align="center" width="150" />
<el-table-column prop="goodsCost" label="成本小计" align="center" width="150" />
<el-table-column prop="goodsPrint" label="利润额" align="center" width="150" />
<el-table-column prop="partsSellers" label="配件销售人" align="center" min-width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
@ -227,8 +213,6 @@
<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="aitemReceivableAmount" label="应收金额" align="center" width="150" />
<el-table-column prop="aitemCost" label="成本" align="center" width="150" />
<el-table-column prop="aitemPrint" label="利润额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
@ -312,56 +296,6 @@ export default {
rules: {}
}
},
computed: {
// -- = + + ( + + + )
totalCost() {
let cost = '0'
//
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
cost = Math.round((parseFloat(cost) + parseFloat(e.sitemCost !== '' ? e.sitemCost : 0)) * 100) / 100
})
}
//
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
cost = Math.round((parseFloat(cost) + parseFloat(e.goodsCost !== '' ? e.goodsCost : 0)) * 100) / 100
})
}
//
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
cost = Math.round((parseFloat(cost) + parseFloat(e.aitemCost !== '' ? e.aitemCost : 0)) * 100) / 100
})
}
cost = Math.round((parseFloat(cost) + parseFloat(this.formobj.outCost !== '' ? this.formobj.outCost : 0) + parseFloat(this.formobj.subsidyCost !== '' ? this.formobj.subsidyCost : 0) + parseFloat(this.formobj.rescueCost !== '' ? this.formobj.rescueCost : 0)) * 100) / 100
return cost
},
// -- = + + ( + + + )
amountOfProfit() {
let print = '0'
//
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
print = Math.round((parseFloat(print) + parseFloat(e.sitemPrint !== '' ? e.sitemPrint : 0)) * 100) / 100
})
}
//
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
print = Math.round((parseFloat(print) + parseFloat(e.goodsPrint !== '' ? e.goodsPrint : 0)) * 100) / 100
})
}
//
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
print = Math.round((parseFloat(print) + parseFloat(e.aitemPrint !== '' ? e.aitemPrint : 0)) * 100) / 100
})
}
print = Math.round((parseFloat(print) + parseFloat(this.formobj.outPrint !== '' ? this.formobj.outPrint : 0) + parseFloat(this.formobj.subsidyPrint !== '' ? this.formobj.subsidyPrint : 0) + parseFloat(this.formobj.rescuePrint !== '' ? this.formobj.rescuePrint : 0)) * 100) / 100
return print
}
},
methods: {
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
@ -421,8 +355,6 @@ export default {
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.formobj.costAmount = this.totalCost
this.formobj.profit = this.amountOfProfit
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {

18
yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue

@ -98,7 +98,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.settleAmount }} = 合计金额{{ formobj.receivableAmount }} - 优惠<span>{{ formobj.discountAmount }}</span></span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="conceal">
<el-col :span="12">
<div class="span-sty">成本合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.costAmount }}</span></el-form-item>
@ -120,8 +120,8 @@
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="sitemSettleAmount" label="结算金额" align="center" width="150" />
<el-table-column prop="sitemCost" label="成本小计" align="center" width="150" />
<el-table-column prop="sitemPrint" label="利润额" align="center" width="150" />
<el-table-column v-if="conceal" prop="sitemCost" label="成本小计" align="center" width="150" />
<el-table-column v-if="conceal" prop="sitemPrint" label="利润额" align="center" width="150" />
<el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
@ -137,8 +137,8 @@
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="goodsSettleAmount" label="结算金额" align="center" width="150" />
<el-table-column prop="goodsCost" label="成本小计" align="center" width="150" />
<el-table-column prop="goodsPrint" label="利润额" align="center" width="150" />
<el-table-column v-if="conceal" prop="goodsCost" label="成本小计" align="center" width="150" />
<el-table-column v-if="conceal" prop="goodsPrint" label="利润额" align="center" width="150" />
<el-table-column prop="partsSellers" label="配件销售人" align="center" min-width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
@ -226,8 +226,8 @@
<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="aitemReceivableAmount" label="应收金额" align="center" width="150" />
<el-table-column prop="aitemCost" label="成本" align="center" width="150" />
<el-table-column prop="aitemPrint" label="利润额" align="center" width="150" />
<el-table-column v-if="conceal" prop="aitemCost" label="成本" align="center" width="150" />
<el-table-column v-if="conceal" prop="aitemPrint" label="利润额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
@ -246,6 +246,7 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
conceal: false, // =
tableKey: 0,
index: 0,
// service
@ -320,6 +321,9 @@ export default {
req.fetchBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.createBySid !== window.sessionStorage.getItem('userSid')) {
this.conceal = true
}
}
})
},

18
yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue

@ -101,7 +101,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.settleAmount }} = 合计金额{{ formobj.receivableAmount }} - 优惠<span>{{ formobj.discountAmount }}</span></span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="conceal">
<el-col :span="12">
<div class="span-sty">成本合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.costAmount }}</span></el-form-item>
@ -123,8 +123,8 @@
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="sitemSettleAmount" label="结算金额" align="center" width="150" />
<el-table-column prop="sitemCost" label="成本小计" align="center" width="150" />
<el-table-column prop="sitemPrint" label="利润额" align="center" width="150" />
<el-table-column v-if="conceal" prop="sitemCost" label="成本小计" align="center" width="150" />
<el-table-column v-if="conceal" prop="sitemPrint" label="利润额" align="center" width="150" />
<el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
@ -140,8 +140,8 @@
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="goodsSettleAmount" label="结算金额" align="center" width="150" />
<el-table-column prop="goodsCost" label="成本小计" align="center" width="150" />
<el-table-column prop="goodsPrint" label="利润额" align="center" width="150" />
<el-table-column v-if="conceal" prop="goodsCost" label="成本小计" align="center" width="150" />
<el-table-column v-if="conceal" prop="goodsPrint" label="利润额" align="center" width="150" />
<el-table-column prop="partsSellers" label="配件销售人" align="center" min-width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
@ -229,8 +229,8 @@
<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="aitemReceivableAmount" label="应收金额" align="center" width="150" />
<el-table-column prop="aitemCost" label="成本" align="center" width="150" />
<el-table-column prop="aitemPrint" label="利润额" align="center" width="150" />
<el-table-column v-if="conceal" prop="aitemCost" label="成本" align="center" width="150" />
<el-table-column v-if="conceal" prop="aitemPrint" label="利润额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
@ -288,6 +288,7 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
conceal: false,
tableKey: 0,
index: 0,
// service
@ -426,6 +427,9 @@ export default {
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.createBySid !== window.sessionStorage.getItem('userSid')) {
this.conceal = true
}
}
})
selectStaffListss().then((res) => {

68
yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue

@ -98,16 +98,6 @@
<el-form-item><span class="addinputInfo">{{ formobj.settleAmount }} = 合计金额{{ formobj.receivableAmount }} - 优惠<span>{{ formobj.discountAmount }}</span></span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">成本合计</div>
<el-form-item><span class="addinputInfo">{{ totalCost }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">利润额</div>
<el-form-item><span class="addinputInfo">{{ amountOfProfit }}</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"/>
@ -120,8 +110,6 @@
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="sitemSettleAmount" label="结算金额" align="center" width="150" />
<el-table-column prop="sitemCost" label="成本小计" align="center" width="150" />
<el-table-column prop="sitemPrint" label="利润额" align="center" width="150" />
<el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
@ -137,8 +125,6 @@
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="goodsSettleAmount" label="结算金额" align="center" width="150" />
<el-table-column prop="goodsCost" label="成本小计" align="center" width="150" />
<el-table-column prop="goodsPrint" label="利润额" align="center" width="150" />
<el-table-column prop="partsSellers" label="配件销售人" align="center" min-width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
@ -226,8 +212,6 @@
<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="aitemReceivableAmount" label="应收金额" align="center" width="150" />
<el-table-column prop="aitemCost" label="成本" align="center" width="150" />
<el-table-column prop="aitemPrint" label="利润额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
@ -328,56 +312,6 @@ export default {
}
}, '*')
},
computed: {
// -- = + + ( + + + )
totalCost() {
let cost = '0'
//
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
cost = Math.round((parseFloat(cost) + parseFloat(e.sitemCost !== '' ? e.sitemCost : 0)) * 100) / 100
})
}
//
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
cost = Math.round((parseFloat(cost) + parseFloat(e.goodsCost !== '' ? e.goodsCost : 0)) * 100) / 100
})
}
//
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
cost = Math.round((parseFloat(cost) + parseFloat(e.aitemCost !== '' ? e.aitemCost : 0)) * 100) / 100
})
}
cost = Math.round((parseFloat(cost) + parseFloat(this.formobj.outCost !== '' ? this.formobj.outCost : 0) + parseFloat(this.formobj.subsidyCost !== '' ? this.formobj.subsidyCost : 0) + parseFloat(this.formobj.rescueCost !== '' ? this.formobj.rescueCost : 0)) * 100) / 100
return cost
},
// -- = + + ( + + + )
amountOfProfit() {
let print = '0'
//
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
print = Math.round((parseFloat(print) + parseFloat(e.sitemPrint !== '' ? e.sitemPrint : 0)) * 100) / 100
})
}
//
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
print = Math.round((parseFloat(print) + parseFloat(e.goodsPrint !== '' ? e.goodsPrint : 0)) * 100) / 100
})
}
//
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
print = Math.round((parseFloat(print) + parseFloat(e.aitemPrint !== '' ? e.aitemPrint : 0)) * 100) / 100
})
}
print = Math.round((parseFloat(print) + parseFloat(this.formobj.outPrint !== '' ? this.formobj.outPrint : 0) + parseFloat(this.formobj.subsidyPrint !== '' ? this.formobj.subsidyPrint : 0) + parseFloat(this.formobj.rescuePrint !== '' ? this.formobj.rescuePrint : 0)) * 100) / 100
return print
}
},
methods: {
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
@ -426,8 +360,6 @@ export default {
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.formobj.costAmount = this.totalCost
this.formobj.profit = this.amountOfProfit
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {

18
yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue

@ -98,7 +98,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.settleAmount }} = 合计金额{{ formobj.receivableAmount }} - 优惠<span>{{ formobj.discountAmount }}</span></span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="conceal">
<el-col :span="12">
<div class="span-sty">成本合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.costAmount }}</span></el-form-item>
@ -120,8 +120,8 @@
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="sitemSettleAmount" label="结算金额" align="center" width="150" />
<el-table-column prop="sitemCost" label="成本小计" align="center" width="150" />
<el-table-column prop="sitemPrint" label="利润额" align="center" width="150" />
<el-table-column v-if="conceal" prop="sitemCost" label="成本小计" align="center" width="150" />
<el-table-column v-if="conceal" prop="sitemPrint" label="利润额" align="center" width="150" />
<el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
@ -137,8 +137,8 @@
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="goodsSettleAmount" label="结算金额" align="center" width="150" />
<el-table-column prop="goodsCost" label="成本小计" align="center" width="150" />
<el-table-column prop="goodsPrint" label="利润额" align="center" width="150" />
<el-table-column v-if="conceal" prop="goodsCost" label="成本小计" align="center" width="150" />
<el-table-column v-if="conceal" prop="goodsPrint" label="利润额" align="center" width="150" />
<el-table-column prop="partsSellers" label="配件销售人" align="center" min-width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
@ -226,8 +226,8 @@
<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="aitemReceivableAmount" label="应收金额" align="center" width="150" />
<el-table-column prop="aitemCost" label="成本" align="center" width="150" />
<el-table-column prop="aitemPrint" label="利润额" align="center" width="150" />
<el-table-column v-if="conceal" prop="aitemCost" label="成本" align="center" width="150" />
<el-table-column v-if="conceal" prop="aitemPrint" label="利润额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
@ -246,6 +246,7 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
conceal: false,
tableKey: 0,
index: 0,
// service
@ -355,6 +356,9 @@ export default {
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.createBySid !== window.sessionStorage.getItem('userSid')) {
this.conceal = true
}
}
})
},

Loading…
Cancel
Save