Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe0036 4 weeks ago
parent
commit
bc957017d0
  1. 5
      yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue
  2. 2
      yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue
  3. 2
      yxt-as-ui/src/views/operation/salesticket/salesticket.vue
  4. 16
      yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue
  5. 1
      yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicing.vue
  6. 32
      yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue
  7. 4
      yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingInfo.vue
  8. 5
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingDaiBan.vue
  9. 29
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue
  10. 4
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingYiBan.vue

5
yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue

@ -14,7 +14,7 @@
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商名称</div>
<el-form-item prop="supplierName"><el-input class="addinputInfo addinputw" v-model="formobj.supplierName" clearable placeholder=""/></el-form-item>
<el-form-item prop="supplierName"><el-input class="addinputInfo addinputw" v-model="formobj.supplierName" @input="inputSupplier" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商简称</div>
@ -326,6 +326,9 @@ export default {
}
})
},
inputSupplier() {
this.formobj.billingCompanyName = this.formobj.supplierName
},
billingTypeChange(value) {
const choose = this.billingType_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {

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

@ -198,7 +198,7 @@
<el-form-item><el-date-picker class="addinputInfo" v-model="formobj.auditDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">保单时间</div>
<div class="span-sty">报单日期</div>
<el-form-item><el-date-picker class="addinputInfo" v-model="formobj.policyDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
</el-col>
</el-row>

2
yxt-as-ui/src/views/operation/salesticket/salesticket.vue

@ -142,7 +142,7 @@ export default {
size: 'small',
icon: '',
btnKey: 'toPrint',
btnLabel: '打印结算单'
btnLabel: '打印'
},
{
type: 'info',

16
yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue

@ -94,7 +94,7 @@
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item>
<el-select class="addinputInfo" :disabled="formobj.invoiceVo.isInvoicing != '1'" v-model="formobj.invoiceVo.invoiceTitleSid" placeholder="请选择" @change="changeCompanyInvoicing" clearable>
<el-select class="addinputInfo addinputw" :disabled="formobj.invoiceVo.isInvoicing != '1'" v-model="formobj.invoiceVo.invoiceTitleSid" placeholder="请选择" @change="changeCompanyInvoicing" clearable>
<el-option v-for="item in companyInvoicing_list" :key="item.companyInvoicingSid" :label="item.companyInvoicingName" :value="item.companyInvoicingSid"></el-option>
</el-select>
</el-form-item>
@ -115,13 +115,19 @@
</el-table-column>
<el-table-column label="商品名称" align="center" width="200">
<template slot-scope="scope">
<el-popover placement="right" trigger="click" width="500">
<el-popover placement="right" trigger="click" width="800">
<div>
<el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row @current-change="commodityCurrentChange($event, scope.row)">
<el-table-column fixed prop="goodsSpuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column fixed prop="goodsSpuName" label="商品名称" width="180" align="center" />
<el-table-column fixed prop="goodsSkuCode" label="商品图号" width="100" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="currentCount" label="库存数量" width="100" align="center" />
<el-table-column prop="cost" label="入库单价" width="100" align="center" />
<el-table-column prop="billObjName" label="供应商" width="200" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="goodsID" label="商品ID" width="150" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
</el-table>
<el-pagination @current-change="currentChangeCommodity($event, scope.row.goodsSpuName)" :current-page.sync="commodityQuery.current" :page-size="commodityQuery.size" layout="total, prev, pager, next" :total="commodityQuery.total" />
</div>

1
yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicing.vue

@ -74,6 +74,7 @@
<el-table-column prop="createByName" label="申请人" align="center" width="120" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
<el-table-column prop="purchaseSystemName" label="开票单位" align="center" min-width="120" />
<el-table-column prop="invoiceTitle" label="开票名称" align="center" min-width="120" />
<el-table-column prop="invoiceTypeValue" label="开票类型" align="center" width="120" />
<el-table-column prop="invoiceMoney" label="开票金额" align="center" width="120" />

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

@ -29,7 +29,7 @@
<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-select class="addinputInfo addinputw" 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>
@ -49,8 +49,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>开票金额</div>
<el-form-item prop="invoiceMoney"><el-input class="addinputInfo" style="width: 70%" @keyup.native="formobj.invoiceMoney = getNumber(formobj.invoiceMoney, 2)" v-model="formobj.invoiceMoney" clearable placeholder="" /></el-form-item>
<div class="span-sty">开票金额</div>
<el-form-item><span class="addinputInfo">{{ invoiceMoneyTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -69,7 +69,7 @@
</el-row>
<div class="title titleOne">
<div>维修单列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="chooseGd()">选择</el-button>
<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"/>
@ -83,7 +83,6 @@
<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" />
@ -92,7 +91,8 @@
<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-column prop="settleTime" label="结算日期" align="center" width="120" />
<el-table-column prop="totalAmount" label="结算费用合计" align="center" width="120" />
</el-table>
</el-form>
</div>
@ -151,9 +151,19 @@ export default {
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' }]
invoiceTypeValue: [{ required: true, message: '开票类型不能为空', trigger: 'change' }]
}
}
},
computed: {
invoiceMoneyTotal() {
let money = 0
if (this.formobj.asBwinvoiceapplyDetailList.length > 0) {
this.formobj.asBwinvoiceapplyDetailList.forEach((e) => {
money = Math.round((parseFloat(money) + parseFloat(e.totalAmount !== '' ? e.totalAmount : 0)) * 100) / 100
})
}
return money
}
},
methods: {
@ -276,6 +286,7 @@ export default {
this.viewState = 1
},
saveOrUpdate() {
this.formobj.invoiceMoney = this.invoiceMoneyTotal
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
@ -293,6 +304,7 @@ export default {
})
},
submit() {
this.formobj.invoiceMoney = this.invoiceMoneyTotal
this.$refs['form_obj'].validate((valid) => {
if (valid) {
if (this.formobj.asBwinvoiceapplyDetailList.length === 0) {
@ -357,6 +369,10 @@ export default {
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.titleOne {
padding: 7px;
display: flex;

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

@ -63,7 +63,6 @@
<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" />
@ -72,7 +71,8 @@
<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-column prop="settleTime" label="结算日期" align="center" width="120" />
<el-table-column prop="totalAmount" label="结算费用合计" align="center" width="120" />
</el-table>
</el-form>
</div>

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

@ -66,7 +66,6 @@
<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" />
@ -75,10 +74,10 @@
<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-column prop="settleTime" label="结算日期" align="center" width="120" />
<el-table-column prop="totalAmount" label="结算费用合计" align="center" width="120" />
</el-table>
</el-form>
</el-form>
</div>
</div>
<!-- 选择待办人 的弹出框-->

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

@ -28,7 +28,7 @@
<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-select class="addinputInfo addinputw" 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>
@ -48,8 +48,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>开票金额</div>
<el-form-item prop="invoiceMoney"><el-input class="addinputInfo" style="width: 70%" @keyup.native="formobj.invoiceMoney = getNumber(formobj.invoiceMoney, 2)" v-model="formobj.invoiceMoney" clearable placeholder="" /></el-form-item>
<div class="span-sty">开票金额</div>
<el-form-item><span class="addinputInfo">{{ invoiceMoneyTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -68,7 +68,7 @@
</el-row>
<div class="title titleOne">
<div>维修单列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="chooseGd()">选择</el-button>
<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"/>
@ -82,7 +82,6 @@
<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" />
@ -91,7 +90,8 @@
<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-column prop="settleTime" label="结算日期" align="center" width="120" />
<el-table-column prop="totalAmount" label="结算费用合计" align="center" width="120" />
</el-table>
</el-form>
</div>
@ -172,6 +172,17 @@ export default {
}
}, '*')
},
computed: {
invoiceMoneyTotal() {
let money = 0
if (this.formobj.asBwinvoiceapplyDetailList.length > 0) {
this.formobj.asBwinvoiceapplyDetailList.forEach((e) => {
money = Math.round((parseFloat(money) + parseFloat(e.totalAmount !== '' ? e.totalAmount : 0)) * 100) / 100
})
}
return money
}
},
methods: {
init() {
typeValues({ type: 'billingType' }).then((res) => {
@ -270,6 +281,7 @@ export default {
this.viewState = 1
},
saveOrUpdate() {
this.formobj.invoiceMoney = this.invoiceMoneyTotal
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
@ -294,6 +306,7 @@ export default {
})
},
submit() {
this.formobj.invoiceMoney = this.invoiceMoneyTotal
this.$refs['form_obj'].validate((valid) => {
if (valid) {
if (this.formobj.asBwinvoiceapplyDetailList.length === 0) {
@ -335,6 +348,10 @@ export default {
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.titleOne {
padding: 7px;
display: flex;

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

@ -63,7 +63,6 @@
<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" />
@ -72,7 +71,8 @@
<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-column prop="settleTime" label="结算日期" align="center" width="120" />
<el-table-column prop="totalAmount" label="结算费用合计" align="center" width="120" />
</el-table>
</el-form>
</div>

Loading…
Cancel
Save