Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
ligaode 7 months ago
parent
commit
4d366576b3
  1. 9
      yxt-as-ui/src/views/operation/claimbilling/claimbilling.vue
  2. 5
      yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
  3. 3
      yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue
  4. 9
      yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue
  5. 14
      yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
  6. 3
      yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue
  7. 2
      yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingInfo.vue
  8. 2
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingDaiBan.vue
  9. 3
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue
  10. 2
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingYiBan.vue
  11. 3
      yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue
  12. 5
      yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
  13. 3
      yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue

9
yxt-as-ui/src/views/operation/claimbilling/claimbilling.vue

@ -168,7 +168,8 @@ export default {
closeDateEnd: '',
invoiceName: '',
invoiceValue: '',
createBySid: '',
menuUrl: '',
userSid: '',
orgPath: ''
}
}
@ -254,7 +255,8 @@ export default {
//
getList() {
this.listLoading = true
this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.menuUrl = this.$route.path
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
@ -289,7 +291,8 @@ export default {
closeDateEnd: '',
invoiceName: '',
invoiceValue: '',
createBySid: '',
menuUrl: '',
userSid: '',
orgPath: ''
}
}

5
yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue

@ -62,9 +62,10 @@
<el-table :key="tableKey" :data="formobj.detailList" :index="index" border style="width: 100%" :cell-style="cellStyle">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="claimBillNo" label="索赔单号" align="center" width="170" />
<el-table-column prop="repairBillNo" label="维修单号" align="center" width="170" />
<el-table-column prop="repairBillNo" label="维修单号" align="center" width="170" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="claimManufacturer" label="索赔厂家" align="center" width="120" />
<el-table-column prop="claimHourAmount" label="索赔工时费" align="center" width="120" />
<el-table-column prop="claimGoodsAmount" label="索赔材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount" label="外出费" align="center" width="120" />
@ -314,10 +315,12 @@ export default {
repairBillNo: e.billNo,
vehMark: e.vehMark,
vinNo: e.vinNo,
claimManufacturer: e.claimManufacturer,
claimHourAmount: e.claimHourAmount,
claimGoodsAmount: e.claimGoodsAmount,
claimOutAmount: e.claimOutAmount,
claimSubsidyAmount: e.claimSubsidyAmount,
claimRescueAmount: e.claimRescueAmount,
claimOtherAmount: e.claimOtherAmount,
remarks: '',
isUnanimous: e.isUnanimous

3
yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue

@ -53,9 +53,10 @@
<el-table :key="tableKey" :data="formobj.detailList" :index="index" border style="width: 100%" :cell-style="cellStyle">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="claimBillNo" label="索赔单号" align="center" width="170" />
<el-table-column prop="repairBillNo" label="维修单号" align="center" width="170" />
<el-table-column prop="repairBillNo" label="维修单号" align="center" width="170" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="claimManufacturer" label="索赔厂家" align="center" width="120" />
<el-table-column prop="claimHourAmount" label="索赔工时费" align="center" width="120" />
<el-table-column prop="claimGoodsAmount" label="索赔材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount" label="外出费" align="center" width="120" />

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

@ -339,7 +339,8 @@ export default {
auditDateEnd: '',
invoiceState: '',
adjustState: '',
createBySid: '',
menuUrl: '',
userSid: '',
orgPath: ''
}
},
@ -426,7 +427,8 @@ export default {
//
getList() {
this.listLoading = true
this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.menuUrl = this.$route.path
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
@ -465,7 +467,8 @@ export default {
auditDateEnd: '',
invoiceState: '',
adjustState: '',
createBySid: '',
menuUrl: '',
userSid: '',
orgPath: ''
}
}

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

@ -47,8 +47,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">索赔厂家及类型</div>
<el-form-item>
<div class="span-sty"><span class="icon" v-show="formobj.subject == '保内'">*</span>索赔厂家及类型</div>
<el-form-item prop="claimManufacturerAndShClaimType">
<div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
<el-select :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.claimManufacturer" placeholder="请选择" @change="changeClaimManufacturer" clearable filterable>
<el-option v-for="item in claimManufacturer_list" :key="item.sid" :label="item.claiManuName" :value="item.claiManuName"></el-option>
@ -636,6 +636,15 @@ export default {
selectCustomer
},
data() {
const claimManufacturerShClaimType = (rule, value, callback) => {
if (value === '' || value === null) {
callback(new Error('索赔厂家及类型不能为空'))
} else if ((this.formobj.claimManufacturer === '' || this.formobj.shClaimTypeValue === '') && this.formobj.subject === '保内') {
callback(new Error('索赔厂家及类型不能为空'))
} else {
callback()
}
}
return {
viewTitle: '',
viewState: 1,
@ -821,6 +830,7 @@ export default {
waitorName: [{ required: true, message: '服务顾问不能为空', trigger: 'change' }],
isSpecialSign: [{ required: true, message: '特殊标志不能为空', trigger: 'change' }],
customerName: [{ required: true, message: '客户信息不能为空', trigger: 'change' }],
claimManufacturerAndShClaimType: [{ required: true, validator: claimManufacturerShClaimType, trigger: 'change' }],
'settleVo.payerName': [{ required: true, message: '付款人姓名不能为空', trigger: 'blur' }],
'settleVo.settleValue': [{ required: true, message: '结算方式不能为空', trigger: 'change' }],
'settleVo.settleAmount': [{ required: true, message: '结算金额不能为空', trigger: 'blur' }],

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

@ -65,6 +65,8 @@
<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="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" />
@ -214,6 +216,7 @@ export default {
customerName: e.customerName,
vehMark: e.vehMark,
vinNo: e.vinNo,
taxItems: e.taxItems,
settleTime: e.entryTime,
hourAmount: e.hourAmount,
goodsAmount: e.goodsAmount,

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

@ -55,6 +55,8 @@
<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="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" />

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

@ -59,6 +59,8 @@
<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="hourAmount" label="工时费" align="center" width="120" />
<el-table-column prop="goodsAmount" label="材料费" align="center" width="120" />
<el-table-column prop="rescueAmount" label="施救费" align="center" width="120" />

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

@ -64,6 +64,8 @@
<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="hourAmount" label="工时费" align="center" width="120" />
<el-table-column prop="goodsAmount" label="材料费" align="center" width="120" />
<el-table-column prop="rescueAmount" label="施救费" align="center" width="120" />
@ -211,6 +213,7 @@ export default {
customerName: e.customerName,
vehMark: e.vehMark,
vinNo: e.vinNo,
taxItems: e.taxItems,
settleTime: e.entryTime,
hourAmount: e.hourAmount,
goodsAmount: e.goodsAmount,

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

@ -56,6 +56,8 @@
<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="hourAmount" label="工时费" align="center" width="120" />
<el-table-column prop="goodsAmount" label="材料费" align="center" width="120" />
<el-table-column prop="rescueAmount" label="施救费" align="center" width="120" />

3
yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue

@ -56,9 +56,10 @@
<el-table :key="tableKey" :data="formobj.detailList" :index="index" border style="width: 100%" :cell-style="cellStyle">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="claimBillNo" label="索赔单号" align="center" width="170" />
<el-table-column prop="repairBillNo" label="维修工号" align="center" width="170" />
<el-table-column prop="repairBillNo" label="维修工号" align="center" width="170" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="claimManufacturer" label="索赔厂家" align="center" width="120" />
<el-table-column prop="claimHourAmount" label="索赔工时费" align="center" width="120" />
<el-table-column prop="claimGoodsAmount" label="索赔材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount" label="外出费" align="center" width="120" />

5
yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue

@ -61,9 +61,10 @@
<el-table :key="tableKey" :data="formobj.detailList" :index="index" border style="width: 100%" :cell-style="cellStyle">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="claimBillNo" label="索赔单号" align="center" width="170" />
<el-table-column prop="repairBillNo" label="维修单号" align="center" width="170" />
<el-table-column prop="repairBillNo" label="维修单号" align="center" width="170" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="claimManufacturer" label="索赔厂家" align="center" width="120" />
<el-table-column prop="claimHourAmount" label="索赔工时费" align="center" width="120" />
<el-table-column prop="claimGoodsAmount" label="索赔材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount" label="外出费" align="center" width="120" />
@ -295,10 +296,12 @@ export default {
repairBillNo: e.billNo,
vehMark: e.vehMark,
vinNo: e.vinNo,
claimManufacturer: e.claimManufacturer,
claimHourAmount: e.claimHourAmount,
claimGoodsAmount: e.claimGoodsAmount,
claimOutAmount: e.claimOutAmount,
claimSubsidyAmount: e.claimSubsidyAmount,
claimRescueAmount: e.claimRescueAmount,
claimOtherAmount: e.claimOtherAmount,
remarks: '',
isUnanimous: e.isUnanimous

3
yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue

@ -53,9 +53,10 @@
<el-table :key="tableKey" :data="formobj.detailList" :index="index" border style="width: 100%" :cell-style="cellStyle">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="claimBillNo" label="索赔单号" align="center" width="170" />
<el-table-column prop="repairBillNo" label="维修工号" align="center" width="170" />
<el-table-column prop="repairBillNo" label="维修工号" align="center" width="170" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="claimManufacturer" label="索赔厂家" align="center" width="120" />
<el-table-column prop="claimHourAmount" label="索赔工时费" align="center" width="120" />
<el-table-column prop="claimGoodsAmount" label="索赔材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount" label="外出费" align="center" width="120" />

Loading…
Cancel
Save