Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 7 months ago
parent
commit
9561217b09
  1. 8
      yxt-as-ui/src/api/Common/dictcommons.js
  2. 2
      yxt-as-ui/src/router/index.js
  3. 4
      yxt-as-ui/src/views/operation/settleAccounts/settleAccounts.vue
  4. 104
      yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue
  5. 86
      yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue
  6. 47
      yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue
  7. 60
      yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue
  8. 14
      yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingInfo.vue
  9. 4
      yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue
  10. 108
      yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue
  11. 88
      yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue
  12. 70
      yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue
  13. 70
      yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue
  14. 70
      yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue
  15. 49
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue
  16. 12
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingDaiBan.vue
  17. 55
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue
  18. 11
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingYiBan.vue
  19. 80
      yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue
  20. 98
      yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue
  21. 80
      yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue

8
yxt-as-ui/src/api/Common/dictcommons.js

@ -61,6 +61,14 @@ export function getListDeptByOrgSid(data) {
})
}
// 根据分公司Sid获取分公司下部门对应的采购系统
export function fetchDetailsByUseOrgSid(data) {
return request({
url: '/base/v1/basepurchasesystem/fetchDetailsByUseOrgSid/' + data,
method: 'GET'
})
}
// 根据部门sid查询部门信息
export function fetchByDepSid(data) {
return request({

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

@ -207,7 +207,7 @@ export const constantRoutes = [{
component: () => import('@/views/operation/settleAccounts/settleAccounts.vue'),
name: 'SettleAccounts',
meta: {
title: '结算申请管理',
title: '维修单结算管理',
noCache: true
}
},

4
yxt-as-ui/src/views/operation/settleAccounts/settleAccounts.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">
@ -46,7 +46,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 主页面主要部分 -->

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

@ -46,7 +46,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.billType !== ''">
<el-row>
<el-col :span="8">
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
@ -74,7 +74,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.billType !== ''">
<el-row>
<el-col :span="8">
<div class="span-sty">是否开票</div>
<el-form-item><span class="addinputInfo">{{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }}</span></el-form-item>
@ -110,29 +110,38 @@
<el-form-item><span class="addinputInfo">{{ formobj.profit }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.sitemVos.length > 0">
<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="sitemReceivableAmount" label="应收金额" align="center" width="150" />
<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="remarks" label="备注" align="center" min-width="300" />
</el-table>
</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="serviceType" label="工种" align="center" width="150" />
<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="sitemReceivableAmount" 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="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>
<div class="title">商品</div>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<el-table-column prop="count" label="数量" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="goodsReceivableAmount" 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="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>
<div class="title">附加项目</div>
@ -146,7 +155,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.outCost = getNumber(formobj.outCost, 2)" v-model="formobj.outCost" clearable placeholder="" />
<span>利润额{{ formobj.outPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
@ -161,7 +179,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.subsidyCost = getNumber(formobj.subsidyCost, 2)" v-model="formobj.subsidyCost" clearable placeholder="" />
<span>利润额{{ formobj.subsidyPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
@ -177,10 +204,19 @@
</el-form-item>
</el-col>
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.rescueCost = getNumber(formobj.rescueCost, 2)" v-model="formobj.rescueCost" clearable placeholder="" />
<span>利润额{{ formobj.rescuePrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="4">
<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>
@ -257,12 +293,18 @@ export default {
aitemVos: [],
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: [],
taskId: '',
@ -272,8 +314,26 @@ export default {
}
},
methods: {
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
showEdit(row) {
this.viewTitle = '【编辑】结算申请'
this.viewTitle = '【编辑】维修单结算申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -361,12 +421,18 @@ export default {
aitemVos: [],
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: [],
taskId: '',

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

@ -44,7 +44,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.billType !== ''">
<el-row>
<el-col :span="8">
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
@ -72,7 +72,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.billType !== ''">
<el-row>
<el-col :span="8">
<div class="span-sty">是否开票</div>
<el-form-item><span class="addinputInfo">{{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }}</span></el-form-item>
@ -108,29 +108,38 @@
<el-form-item><span class="addinputInfo">{{ formobj.profit }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.sitemVos.length > 0">
<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="sitemReceivableAmount" label="应收金额" align="center" width="150" />
<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="remarks" label="备注" align="center" min-width="300" />
</el-table>
</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="serviceType" label="工种" align="center" width="150" />
<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="sitemReceivableAmount" 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="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>
<div class="title">商品</div>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<el-table-column prop="count" label="数量" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="goodsReceivableAmount" 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="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>
<div class="title">附加项目</div>
@ -144,7 +153,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.outCost }}</span>
<span>利润额{{ formobj.outPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
@ -159,7 +177,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.subsidyCost }}</span>
<span>利润额{{ formobj.subsidyPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
@ -175,10 +202,19 @@
</el-form-item>
</el-col>
<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.rescueCost }}</span>
<span>利润额{{ formobj.rescuePrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="4">
<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>
@ -255,12 +291,18 @@ export default {
aitemVos: [],
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: [],
taskId: '',
@ -271,7 +313,7 @@ export default {
},
methods: {
showInfo(row) {
this.viewTitle = '结算申请详情'
this.viewTitle = '维修单结算申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -324,12 +366,18 @@ export default {
aitemVos: [],
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: [],
taskId: '',

47
yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue

@ -2,7 +2,7 @@
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>选择维修</div>
<div>选择维修单</div>
<div>
<el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@ -12,8 +12,11 @@
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="工单编号" class="searchlist">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="维修单类型" class="searchlist">
<el-input v-model="listQuery.params.billType" placeholder="" clearable/>
</el-form-item>
<el-form-item label="维修单编号" class="searchlist">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户名称" class="searchlist">
@ -22,10 +25,13 @@
<el-form-item label="车牌号" class="searchlist">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable />
</el-form-item>
<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>
<el-form-item label="车架号" class="searchlist">
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="结算日期">
<el-date-picker v-model="listQuery.params.settleTimeStart" 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-date-picker v-model="listQuery.params.settleTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -41,14 +47,19 @@
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50" type="selection" align="center"/>
<el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="billNo" label="工单编号" align="center" width="170" />
<el-table-column prop="billType" label="工单类型" align="center" width="120" />
<el-table-column prop="isGoOut" label="是否外出" align="center" width="100" />
<el-table-column prop="billType" label="维修单类型" align="center" width="140" />
<el-table-column prop="billNo" label="维修单编号" align="center" width="170" />
<el-table-column prop="customerName" label="客户名称" align="center" min-width="120" />
<el-table-column prop="mobile" label="联系电话" align="center" width="120" />
<el-table-column prop="vinNo" label="车架号" align="center" width="130" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="130" />
<el-table-column prop="entryTime" label="进厂日期" align="center" width="120" />
<el-table-column prop="vinNo" label="车架号" align="center" width="130" />
<el-table-column prop="taxItems" label="加税点项目" align="center" width="130" />
<el-table-column prop="hourAmount" label="工时费" align="center" width="130" />
<el-table-column prop="goodsAmount" label="材料费" align="center" width="130" />
<el-table-column prop="rescueAmount" label="施救费" align="center" width="130" />
<el-table-column prop="outAmount" label="外出费" align="center" width="130" />
<el-table-column prop="otherAmount" label="其它费用" align="center" width="130" />
<el-table-column prop="settleTime" label="结算日期" align="center" width="120" />
<el-table-column prop="totalAmount" label="结算金额合计" align="center" width="150" />
</el-table>
</div>
<div class="pages">
@ -83,11 +94,13 @@ export default {
current: 1,
size: 5,
params: {
billType: '',
billNo: '',
customerName: '',
vehMark: '',
entryTimeStart: '',
entryTimeEnd: '',
vinNo: '',
settleTimeStart: '',
settleTimeEnd: '',
deptSid: ''
},
total: 0
@ -133,11 +146,13 @@ export default {
this.listQuery.current = 1
this.listQuery.size = 5
this.listQuery.total = 0
this.listQuery.params.billType = ''
this.listQuery.params.billNo = ''
this.listQuery.params.customerName = ''
this.listQuery.params.vehMark = ''
this.listQuery.params.entryTimeStart = ''
this.listQuery.params.entryTimeEnd = ''
this.listQuery.params.vinNo = ''
this.listQuery.params.settleTimeStart = ''
this.listQuery.params.settleTimeEnd = ''
this.getList()
},
handleSelectionChange(row) {

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

@ -4,7 +4,6 @@
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="chooseGd()">选择工单</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@ -26,6 +25,16 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty"><span class="icon">*</span>开票单位</div>
<el-form-item prop="purchaseSystemName">
<el-select class="addinputInfo" v-model="formobj.purchaseSystemName" placeholder="请选择" @change="changePurchase" filterable clearable>
<el-option v-for="item in purchase_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>开票名称</div>
@ -58,9 +67,18 @@
</el-form-item>
</el-col>
</el-row>
<div class="title">维修单列表</div>
<div class="title titleOne">
<div>维修单列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="chooseGd()">选择工单</el-button>
</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 label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="handleDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="billType" label="维修单类型" align="center" width="140" />
<el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />
<el-table-column prop="customerName" label="客户名称" align="center" min-width="120" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="150" />
@ -73,6 +91,7 @@
<el-table-column prop="rescueAmount" label="施救费" align="center" width="120" />
<el-table-column prop="outAmount" label="外出费" align="center" width="120" />
<el-table-column prop="otherAmount" label="其它费用" align="center" width="120" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="totalAmount" label="费用合计" align="center" width="120" />
</el-table>
</el-form>
@ -87,7 +106,7 @@
import req from '@/api/operation/workorderinvoicing'
import chooseRepairbill from './relation/chooseRepairbill'
import uploadImg from '@/components/uploadFile/uploadImg'
import { typeValues } from '@/api/Common/dictcommons'
import { typeValues, fetchDetailsByUseOrgSid, getOrgSidByPath } from '@/api/Common/dictcommons'
export default {
name: 'WorkOrderInvoicingAdd',
@ -102,6 +121,7 @@ export default {
submitdisabled: false,
tableKey: 1,
index: 0,
purchase_list: [],
invoiceType_list: [],
formobj: {
sid: '',
@ -123,10 +143,13 @@ export default {
taskId: '',
nodeId: '',
nodeState: '',
purchaseSystemName: '',
purchaseSystemSid: '',
fileList: [],
asBwinvoiceapplyDetailList: []
},
rules: {
purchaseSystemName: [{ required: true, message: '开票单位不能为空', trigger: 'change' }],
invoiceTitle: [{ required: true, message: '开票名称不能为空', trigger: 'blur' }],
invoiceTypeValue: [{ required: true, message: '开票类型不能为空', trigger: 'change' }],
invoiceMoney: [{ required: true, message: '开票金额不能为空', trigger: 'blur' }]
@ -140,6 +163,15 @@ export default {
this.invoiceType_list = res.data
}
})
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
fetchDetailsByUseOrgSid(res.data).then((resp) => {
if (resp.success) {
this.purchase_list = resp.data
}
})
}
})
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
@ -190,6 +222,14 @@ export default {
}
})
},
changePurchase(value) {
const choose = this.purchase_list.filter((item) => item.purchaseSystemName === value)
if (choose.length > 0 && choose !== null) {
this.formobj.purchaseSystemSid = choose[0].deptSid
} else {
this.formobj.purchaseSystemSid = ''
}
},
invoiceTypeChange(value) {
const choose = this.invoiceType_list.filter((item) => item.dictValue === value)
if (choose.length > 0 && choose !== null) {
@ -203,6 +243,9 @@ export default {
const aa = []
this.$refs['divGD'].showData(aa, this.formobj.deptSid)
},
handleDelete(index) {
this.formobj.asBwinvoiceapplyDetailList.splice(index, 1)
},
backData(value) {
this.viewState = 1
if (value.length > 0) {
@ -210,6 +253,8 @@ export default {
this.formobj.asBwinvoiceapplyDetailList.push({
sid: '',
mainSid: '',
billType: e.billType,
billTypeKey: e.billTypeKey,
sourceBillSid: e.sid,
sourceBillNo: e.billNo,
customerSid: e.customerSid,
@ -291,6 +336,8 @@ export default {
taskId: '',
nodeId: '',
nodeState: '',
purchaseSystemName: '',
purchaseSystemSid: '',
fileList: [],
asBwinvoiceapplyDetailList: []
}
@ -311,4 +358,11 @@ export default {
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

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

@ -23,6 +23,12 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</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.purchaseSystemName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">开票名称</div>
@ -52,18 +58,20 @@
<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="billType" label="维修单类型" align="center" width="140" />
<el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />
<el-table-column prop="customerName" label="客户名称" align="center" min-width="120" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="settleTime" label="结算日期" align="center" width="120" />
<el-table-column prop="taxItems" label="加税点项目" align="center" min-width="140" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="hourAmount" label="工时费" align="center" width="120" />
<el-table-column prop="goodsAmount" label="材料费" align="center" width="120" />
<el-table-column prop="outAmount" label="材料费" align="center" width="120" />
<el-table-column prop="rescueAmount" label="施救费" align="center" width="120" />
<el-table-column prop="outAmount" label="外出费" align="center" width="120" />
<el-table-column prop="otherAmount" label="其它费用" align="center" width="120" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="totalAmount" label="费用合计" align="center" width="120" />
</el-table>
</el-form>
@ -103,6 +111,8 @@ export default {
taskId: '',
nodeId: '',
nodeState: '',
purchaseSystemName: '',
purchaseSystemSid: '',
fileList: [],
asBwinvoiceapplyDetailList: []
},
@ -150,6 +160,8 @@ export default {
taskId: '',
nodeId: '',
nodeState: '',
purchaseSystemName: '',
purchaseSystemSid: '',
fileList: [],
asBwinvoiceapplyDetailList: []
}

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

@ -31,7 +31,7 @@
<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="维修单类型">
@ -87,7 +87,7 @@
<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="190" />
<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" />

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

@ -91,29 +91,33 @@
<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="serviceType" 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="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="sitemReceivableAmount" 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="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>
<div class="title">商品</div>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<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="count" label="数量" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
<el-table-column prop="amount" label="金额" width="100" align="center" />
<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>
<div class="title">附加项目</div>
@ -127,7 +131,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.outCost = getNumber(formobj.outCost, 2)" v-model="formobj.outCost" clearable placeholder="" />
<span>利润额{{ formobj.outPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
@ -142,7 +155,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.subsidyCost = getNumber(formobj.subsidyCost, 2)" v-model="formobj.subsidyCost" clearable placeholder="" />
<span>利润额{{ formobj.subsidyPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
@ -158,10 +180,19 @@
</el-form-item>
</el-col>
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.rescueCost = getNumber(formobj.rescueCost, 2)" v-model="formobj.rescueCost" clearable placeholder="" />
<span>利润额{{ formobj.rescuePrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="4">
<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>
@ -172,7 +203,9 @@
<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="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>
@ -237,12 +270,18 @@ export default {
actualAmount: '',
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: []
},
@ -250,8 +289,26 @@ export default {
}
},
methods: {
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
showAdd(sid) {
this.viewTitle = '【新增】反结算申请'
this.viewTitle = '【新增】维修单反结算申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -269,7 +326,7 @@ export default {
})
},
showEdit(row) {
this.viewTitle = '【编辑】反结算申请'
this.viewTitle = '【编辑】维修单反结算申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -279,6 +336,9 @@ export default {
}
})
},
handleOpen(value) {
window.open(value, '_blank')
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
@ -351,7 +411,23 @@ export default {
goodsAmount: '',
addAmount: '',
discountAmount: '',
actualAmount: ''
actualAmount: '',
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: []
}
this.$emit('doback')
}

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

@ -89,29 +89,33 @@
<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="serviceType" 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="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="sitemReceivableAmount" 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="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>
<div class="title">商品</div>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<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="count" label="数量" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
<el-table-column prop="amount" label="金额" width="100" align="center" />
<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>
<div class="title">附加项目</div>
@ -125,7 +129,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.outCost }}</span>
<span>利润额{{ formobj.outPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
@ -140,7 +153,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.subsidyCost }}</span>
<span>利润额{{ formobj.subsidyPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
@ -156,10 +178,19 @@
</el-form-item>
</el-col>
<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.rescueCost }}</span>
<span>利润额{{ formobj.rescuePrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="4">
<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>
@ -170,7 +201,9 @@
<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="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>
@ -235,12 +268,18 @@ export default {
actualAmount: '',
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: []
},
@ -249,7 +288,7 @@ export default {
},
methods: {
showInfo(row) {
this.viewTitle = '反结算申请详情'
this.viewTitle = '维修单反结算申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -266,6 +305,9 @@ export default {
}
})
},
handleOpen(value) {
window.open(value, '_blank')
},
handleReturn() {
this.formobj = {
sid: '',
@ -304,7 +346,23 @@ export default {
goodsAmount: '',
addAmount: '',
discountAmount: '',
actualAmount: ''
actualAmount: '',
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: []
}
this.$emit('doback')
}

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

@ -92,29 +92,33 @@
<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="serviceType" 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="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="sitemReceivableAmount" 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="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>
<div class="title">商品</div>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<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="count" label="数量" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
<el-table-column prop="amount" label="金额" width="100" align="center" />
<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>
<div class="title">附加项目</div>
@ -128,7 +132,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.outCost }}</span>
<span>利润额{{ formobj.outPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
@ -143,7 +156,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.subsidyCost }}</span>
<span>利润额{{ formobj.subsidyPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
@ -159,10 +181,19 @@
</el-form-item>
</el-col>
<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.rescueCost }}</span>
<span>利润额{{ formobj.rescuePrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="4">
<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>
@ -173,7 +204,9 @@
<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="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>
@ -277,12 +310,18 @@ export default {
actualAmount: '',
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: []
},
@ -355,7 +394,7 @@ export default {
},
methods: {
showInfo(sid) {
this.viewTitle = '工单反结算详情'
this.viewTitle = '维修单反结算申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -377,6 +416,9 @@ export default {
}
})
},
handleOpen(value) {
window.open(value, '_blank')
},
//
openCountersign(val) {
this.operation = val

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

@ -90,29 +90,33 @@
<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="serviceType" 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="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="sitemReceivableAmount" 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="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>
<div class="title">商品</div>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<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="count" label="数量" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
<el-table-column prop="amount" label="金额" width="100" align="center" />
<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>
<div class="title">附加项目</div>
@ -126,7 +130,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.outCost = getNumber(formobj.outCost, 2)" v-model="formobj.outCost" clearable placeholder="" />
<span>利润额{{ formobj.outPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
@ -141,7 +154,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.subsidyCost = getNumber(formobj.subsidyCost, 2)" v-model="formobj.subsidyCost" clearable placeholder="" />
<span>利润额{{ formobj.subsidyPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
@ -157,10 +179,19 @@
</el-form-item>
</el-col>
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.rescueCost = getNumber(formobj.rescueCost, 2)" v-model="formobj.rescueCost" clearable placeholder="" />
<span>利润额{{ formobj.rescuePrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="4">
<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>
@ -171,7 +202,9 @@
<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="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>
@ -236,12 +269,18 @@ export default {
actualAmount: '',
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: []
},
@ -267,7 +306,7 @@ export default {
},
methods: {
showInfo(sid) {
this.viewTitle = '【编辑】工单反结算'
this.viewTitle = '【编辑】维修单反结算申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -277,6 +316,9 @@ export default {
}
})
},
handleOpen(value) {
window.open(value, '_blank')
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {

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

@ -89,29 +89,33 @@
<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="serviceType" 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="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="sitemReceivableAmount" 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="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>
<div class="title">商品</div>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<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="count" label="数量" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
<el-table-column prop="amount" label="金额" width="100" align="center" />
<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>
<div class="title">附加项目</div>
@ -125,7 +129,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.outCost }}</span>
<span>利润额{{ formobj.outPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
@ -140,7 +153,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.subsidyCost }}</span>
<span>利润额{{ formobj.subsidyPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
@ -156,10 +178,19 @@
</el-form-item>
</el-col>
<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.rescueCost }}</span>
<span>利润额{{ formobj.rescuePrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="4">
<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>
@ -170,7 +201,9 @@
<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="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>
@ -235,12 +268,18 @@ export default {
actualAmount: '',
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: []
},
@ -284,7 +323,7 @@ export default {
},
methods: {
showInfo(sid) {
this.viewTitle = '工单反结算详情'
this.viewTitle = '维修单反结算申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -301,6 +340,9 @@ export default {
}
})
},
handleOpen(value) {
window.open(value, '_blank')
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {

49
yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue

@ -2,7 +2,7 @@
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>选择维修</div>
<div>选择维修单</div>
<div>
<el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@ -12,8 +12,11 @@
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="工单编号" class="searchlist">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="维修单类型" class="searchlist">
<el-input v-model="listQuery.params.billType" placeholder="" clearable/>
</el-form-item>
<el-form-item label="维修单编号" class="searchlist">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户名称" class="searchlist">
@ -22,10 +25,13 @@
<el-form-item label="车牌号" class="searchlist">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable />
</el-form-item>
<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>
<el-form-item label="车架号" class="searchlist">
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="结算日期">
<el-date-picker v-model="listQuery.params.settleTimeStart" 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-date-picker v-model="listQuery.params.settleTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -41,14 +47,19 @@
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50" type="selection" align="center"/>
<el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="billNo" label="工单编号" align="center" width="170" />
<el-table-column prop="billType" label="工单类型" align="center" width="120" />
<el-table-column prop="isGoOut" label="是否外出" align="center" width="100" />
<el-table-column prop="billType" label="维修单类型" align="center" width="140" />
<el-table-column prop="billNo" label="维修单编号" align="center" width="170" />
<el-table-column prop="customerName" label="客户名称" align="center" min-width="120" />
<el-table-column prop="mobile" label="联系电话" align="center" width="120" />
<el-table-column prop="vinNo" label="车架号" align="center" width="130" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="130" />
<el-table-column prop="entryTime" label="进厂日期" align="center" width="120" />
<el-table-column prop="vinNo" label="车架号" align="center" width="130" />
<el-table-column prop="taxItems" label="加税点项目" align="center" width="130" />
<el-table-column prop="hourAmount" label="工时费" align="center" width="130" />
<el-table-column prop="goodsAmount" label="材料费" align="center" width="130" />
<el-table-column prop="rescueAmount" label="施救费" align="center" width="130" />
<el-table-column prop="outAmount" label="外出费" align="center" width="130" />
<el-table-column prop="otherAmount" label="其它费用" align="center" width="130" />
<el-table-column prop="settleTime" label="结算日期" align="center" width="120" />
<el-table-column prop="totalAmount" label="结算金额合计" align="center" width="150" />
</el-table>
</div>
<div class="pages">
@ -83,11 +94,13 @@ export default {
current: 1,
size: 5,
params: {
billType: '',
billNo: '',
customerName: '',
vehMark: '',
entryTimeStart: '',
entryTimeEnd: '',
vinNo: '',
settleTimeStart: '',
settleTimeEnd: '',
deptSid: ''
},
total: 0
@ -119,7 +132,7 @@ export default {
this.list = response.data.records
} else {
this.listQuery.total = 0
this.list = []
this.list = []
}
})
},
@ -133,11 +146,13 @@ export default {
this.listQuery.current = 1
this.listQuery.size = 5
this.listQuery.total = 0
this.listQuery.params.billType = ''
this.listQuery.params.billNo = ''
this.listQuery.params.customerName = ''
this.listQuery.params.vehMark = ''
this.listQuery.params.entryTimeStart = ''
this.listQuery.params.entryTimeEnd = ''
this.listQuery.params.vinNo = ''
this.listQuery.params.settleTimeStart = ''
this.listQuery.params.settleTimeEnd = ''
this.getList()
},
handleSelectionChange(row) {

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

@ -26,6 +26,12 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</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.purchaseSystemName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">开票名称</div>
@ -55,6 +61,7 @@
<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="billType" label="维修单类型" align="center" width="140" />
<el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />
<el-table-column prop="customerName" label="客户名称" align="center" min-width="120" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="150" />
@ -63,12 +70,15 @@
<el-table-column prop="taxItems" label="加税点项目" align="center" min-width="140" />
<el-table-column prop="hourAmount" label="工时费" align="center" width="120" />
<el-table-column prop="goodsAmount" label="材料费" align="center" width="120" />
<el-table-column prop="outAmount" label="材料费" align="center" width="120" />
<el-table-column prop="rescueAmount" label="施救费" align="center" width="120" />
<el-table-column prop="outAmount" label="外出费" align="center" width="120" />
<el-table-column prop="otherAmount" label="其它费用" align="center" width="120" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="totalAmount" label="费用合计" align="center" width="120" />
</el-table>
</el-form>
</el-form>
</div>
</div>
<!-- 选择待办人 的弹出框-->
@ -144,6 +154,8 @@ export default {
taskId: '',
nodeId: '',
nodeState: '',
purchaseSystemName: '',
purchaseSystemSid: '',
fileList: [],
asBwinvoiceapplyDetailList: []
},

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

@ -4,7 +4,6 @@
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="chooseGd()">选择工单</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
</div>
@ -25,6 +24,16 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty"><span class="icon">*</span>开票单位</div>
<el-form-item prop="purchaseSystemName">
<el-select class="addinputInfo" v-model="formobj.purchaseSystemName" placeholder="请选择" @change="changePurchase" filterable clearable>
<el-option v-for="item in purchase_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>开票名称</div>
@ -57,9 +66,18 @@
</el-form-item>
</el-col>
</el-row>
<div class="title">维修单列表</div>
<div class="title titleOne">
<div>维修单列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="chooseGd()">选择工单</el-button>
</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 label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="handleDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="billType" label="维修单类型" align="center" width="140" />
<el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />
<el-table-column prop="customerName" label="客户名称" align="center" min-width="120" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="150" />
@ -68,9 +86,11 @@
<el-table-column prop="taxItems" label="加税点项目" align="center" min-width="140" />
<el-table-column prop="hourAmount" label="工时费" align="center" width="120" />
<el-table-column prop="goodsAmount" label="材料费" align="center" width="120" />
<el-table-column prop="outAmount" label="材料费" align="center" width="120" />
<el-table-column prop="rescueAmount" label="施救费" align="center" width="120" />
<el-table-column prop="outAmount" label="外出费" align="center" width="120" />
<el-table-column prop="otherAmount" label="其它费用" align="center" width="120" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="totalAmount" label="费用合计" align="center" width="120" />
</el-table>
</el-form>
@ -85,7 +105,7 @@
import req from '@/api/operation/workorderinvoicing'
import chooseRepairbill from './relation/chooseRepairbill'
import uploadImg from '@/components/uploadFile/uploadImg'
import { typeValues } from '@/api/Common/dictcommons'
import { typeValues, fetchDetailsByUseOrgSid } from '@/api/Common/dictcommons'
export default {
name: 'WorkOrderInvoicingEdit',
@ -100,6 +120,7 @@ export default {
submitdisabled: false,
tableKey: 1,
index: 0,
purchase_list: [],
invoiceType_list: [],
formobj: {
sid: '',
@ -121,10 +142,13 @@ export default {
taskId: '',
nodeId: '',
nodeState: '',
purchaseSystemName: '',
purchaseSystemSid: '',
fileList: [],
asBwinvoiceapplyDetailList: []
},
rules: {
purchaseSystemName: [{ required: true, message: '开票单位不能为空', trigger: 'change' }],
invoiceTitle: [{ required: true, message: '开票名称不能为空', trigger: 'blur' }],
invoiceTypeValue: [{ required: true, message: '开票类型不能为空', trigger: 'change' }],
invoiceMoney: [{ required: true, message: '开票金额不能为空', trigger: 'blur' }]
@ -184,9 +208,22 @@ export default {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
fetchDetailsByUseOrgSid(this.formobj.useOrgSid).then((resp) => {
if (resp.success) {
this.purchase_list = resp.data
}
})
}
})
},
changePurchase(value) {
const choose = this.purchase_list.filter((item) => item.purchaseSystemName === value)
if (choose.length > 0 && choose !== null) {
this.formobj.purchaseSystemSid = choose[0].deptSid
} else {
this.formobj.purchaseSystemSid = ''
}
},
invoiceTypeChange(value) {
const choose = this.invoiceType_list.filter((item) => item.dictValue === value)
if (choose.length > 0 && choose !== null) {
@ -200,6 +237,9 @@ export default {
const aa = []
this.$refs['divGD'].showData(aa, this.formobj.deptSid)
},
handleDelete(index) {
this.formobj.asBwinvoiceapplyDetailList.splice(index, 1)
},
backData(value) {
this.viewState = 1
if (value.length > 0) {
@ -207,6 +247,8 @@ export default {
this.formobj.asBwinvoiceapplyDetailList.push({
sid: '',
mainSid: '',
billType: e.billType,
billTypeKey: e.billTypeKey,
sourceBillSid: e.sid,
sourceBillNo: e.billNo,
customerSid: e.customerSid,
@ -294,4 +336,11 @@ export default {
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

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

@ -23,6 +23,12 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</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.purchaseSystemName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">开票名称</div>
@ -52,6 +58,7 @@
<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="billType" label="维修单类型" align="center" width="140" />
<el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />
<el-table-column prop="customerName" label="客户名称" align="center" min-width="120" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="150" />
@ -60,9 +67,11 @@
<el-table-column prop="taxItems" label="加税点项目" align="center" min-width="140" />
<el-table-column prop="hourAmount" label="工时费" align="center" width="120" />
<el-table-column prop="goodsAmount" label="材料费" align="center" width="120" />
<el-table-column prop="outAmount" label="材料费" align="center" width="120" />
<el-table-column prop="rescueAmount" label="施救费" align="center" width="120" />
<el-table-column prop="outAmount" label="外出费" align="center" width="120" />
<el-table-column prop="otherAmount" label="其它费用" align="center" width="120" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="totalAmount" label="费用合计" align="center" width="120" />
</el-table>
</el-form>
@ -102,6 +111,8 @@ export default {
taskId: '',
nodeId: '',
nodeState: '',
purchaseSystemName: '',
purchaseSystemSid: '',
fileList: [],
asBwinvoiceapplyDetailList: []
},

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

@ -47,7 +47,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.billType !== ''">
<el-row>
<el-col :span="8">
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
@ -75,7 +75,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.billType !== ''">
<el-row>
<el-col :span="8">
<div class="span-sty">是否开票</div>
<el-form-item><span class="addinputInfo">{{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }}</span></el-form-item>
@ -111,29 +111,38 @@
<el-form-item><span class="addinputInfo">{{ formobj.profit }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.sitemVos.length > 0">
<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="sitemReceivableAmount" label="应收金额" align="center" width="150" />
<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="remarks" label="备注" align="center" min-width="300" />
</el-table>
</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="serviceType" label="工种" align="center" width="150" />
<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="sitemReceivableAmount" 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="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>
<div class="title">商品</div>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<el-table-column prop="count" label="数量" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="goodsReceivableAmount" 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="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>
<div class="title">附加项目</div>
@ -147,7 +156,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.outCost }}</span>
<span>利润额{{ formobj.outPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
@ -162,7 +180,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.subsidyCost }}</span>
<span>利润额{{ formobj.subsidyPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
@ -178,10 +205,19 @@
</el-form-item>
</el-col>
<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.rescueCost }}</span>
<span>利润额{{ formobj.rescuePrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="4">
<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>
@ -297,12 +333,18 @@ export default {
aitemVos: [],
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: [],
taskId: '',
@ -377,7 +419,7 @@ export default {
},
methods: {
showInfo(sid) {
this.viewTitle = '结算申请详情'
this.viewTitle = '维修单结算申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})

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

@ -45,7 +45,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.billType !== ''">
<el-row>
<el-col :span="8">
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
@ -73,7 +73,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.billType !== ''">
<el-row>
<el-col :span="8">
<div class="span-sty">是否开票</div>
<el-form-item><span class="addinputInfo">{{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }}</span></el-form-item>
@ -109,29 +109,38 @@
<el-form-item><span class="addinputInfo">{{ formobj.profit }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.sitemVos.length > 0">
<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="sitemReceivableAmount" label="应收金额" align="center" width="150" />
<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="remarks" label="备注" align="center" min-width="300" />
</el-table>
</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="serviceType" label="工种" align="center" width="150" />
<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="sitemReceivableAmount" 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="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>
<div class="title">商品</div>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<el-table-column prop="count" label="数量" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="goodsReceivableAmount" 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="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>
<div class="title">附加项目</div>
@ -145,7 +154,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.outCost = getNumber(formobj.outCost, 2)" v-model="formobj.outCost" clearable placeholder="" />
<span>利润额{{ formobj.outPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
@ -160,7 +178,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.subsidyCost = getNumber(formobj.subsidyCost, 2)" v-model="formobj.subsidyCost" clearable placeholder="" />
<span>利润额{{ formobj.subsidyPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
@ -176,10 +203,19 @@
</el-form-item>
</el-col>
<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">
<el-input class="addinputInfo" style="width: 20%" @keyup.native="formobj.rescueCost = getNumber(formobj.rescueCost, 2)" v-model="formobj.rescueCost" clearable placeholder="" />
<span>利润额{{ formobj.rescuePrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="4">
<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>
@ -256,12 +292,18 @@ export default {
aitemVos: [],
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: [],
taskId: '',
@ -288,8 +330,26 @@ export default {
}, '*')
},
methods: {
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
showInfo(sid) {
this.viewTitle = '【编辑】结算申请'
this.viewTitle = '【编辑】维修单结算申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})

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

@ -44,7 +44,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.billType !== ''">
<el-row>
<el-col :span="8">
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
@ -72,7 +72,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.billType !== ''">
<el-row>
<el-col :span="8">
<div class="span-sty">是否开票</div>
<el-form-item><span class="addinputInfo">{{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }}</span></el-form-item>
@ -108,29 +108,38 @@
<el-form-item><span class="addinputInfo">{{ formobj.profit }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.sitemVos.length > 0">
<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="sitemReceivableAmount" label="应收金额" align="center" width="150" />
<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="remarks" label="备注" align="center" min-width="300" />
</el-table>
</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="serviceType" label="工种" align="center" width="150" />
<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="sitemReceivableAmount" 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="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>
<div class="title">商品</div>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="200" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<el-table-column prop="count" label="数量" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="goodsReceivableAmount" 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="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>
<div class="title">附加项目</div>
@ -144,7 +153,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.outCost }}</span>
<span>利润额{{ formobj.outPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
@ -159,7 +177,16 @@
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<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.subsidyCost }}</span>
<span>利润额{{ formobj.subsidyPrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
@ -175,10 +202,19 @@
</el-form-item>
</el-col>
<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.rescueCost }}</span>
<span>利润额{{ formobj.rescuePrint }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="4">
<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>
@ -255,12 +291,18 @@ export default {
aitemVos: [],
outAmount: '',
outKPAmount: '',
outCost: '',
outPrint: '',
outRemarks: '',
subsidyAmount: '',
subsidyKPAmount: '',
subsidyCost: '',
subsidyPrint: '',
subsidyRemarks: '',
rescueAmount: '',
rescueKPAmount: '',
rescueCost: '',
rescuePrint: '',
rescueRemarks: '',
fileName: [],
taskId: '',
@ -306,7 +348,7 @@ export default {
},
methods: {
showInfo(sid) {
this.viewTitle = '结算申请详情'
this.viewTitle = '维修单结算申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})

Loading…
Cancel
Save