Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
ligaode 4 months ago
parent
commit
ffc6602395
  1. 24
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
  2. 4
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionAudit.vue
  3. 4
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotAdd.vue
  4. 4
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotInfo.vue
  5. 4
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue
  6. 4
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue

24
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue

@ -226,7 +226,7 @@
<el-form-item prop="payDate"><el-date-picker class="addinputInfo addinputw" v-model="formobj.payDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="请选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="showHide">
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>付款账号</div>
<el-form-item prop="payBankAccount">
@ -283,6 +283,7 @@ export default {
return {
btndisabled: false,
submitdisabled: false,
showHide: true,
btnList: [
{
type: 'primary',
@ -557,16 +558,18 @@ export default {
this.getList()
},
changePayWay(value) {
let bb = null
this.payWay_list.forEach((e) => {
if (e.dictValue === value) {
bb = {
key: e.dictKey,
value: e.dictValue
}
const choose = this.payWay_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.payWayKey = choose[0].dictKey
if (choose[0].groupName === '0') {
this.showHide = false
} else {
this.showHide = true
}
})
this.formobj.payWayKey = bb.key
} else {
this.formobj.payWayKey = ''
this.showHide = true
}
},
changerRceiveCompany(value) {
const choose = this.receiveCompany_list.filter((item) => item.name === value)
@ -788,6 +791,7 @@ export default {
}
this.disabledCost = false
this.submitdisabled = false
this.showHide = true
this.diploma_list = []
this.$refs['form_obj'].resetFields()
},

4
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionAudit.vue

@ -56,8 +56,8 @@
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="subitDate" label="提交日期" align="center" width="120" />
<el-table-column prop="shareGinExaProportion" label="分摊参考比例" align="center" width="150" />
<el-table-column prop="shareProportion" label="分摊比例" align="center" width="120" />
<el-table-column prop="shareGinExaProportion" label="分摊参考比例(%)" align="center" width="160" />
<el-table-column prop="shareProportion" label="分摊比例(%)" align="center" width="130" />
<el-table-column prop="shareRebateTotal" label="分摊返利总额" align="center" width="150" />
<el-table-column prop="num" label="车辆台数" align="center" width="120" />
</el-table>

4
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotAdd.vue

@ -37,11 +37,11 @@
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">分摊参考比例</div>
<div class="span-sty">分摊参考比例(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.shareGinExaProportion }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">分摊比例</div>
<div class="span-sty">分摊比例(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.shareProportion }}</span></el-form-item>
</el-col>
<el-col :span="6">

4
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotInfo.vue

@ -34,11 +34,11 @@
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">分摊参考比例</div>
<div class="span-sty">分摊参考比例(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.shareGinExaProportion }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">分摊比例</div>
<div class="span-sty">分摊比例(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.shareProportion }}</span></el-form-item>
</el-col>
<el-col :span="6">

4
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue

@ -57,8 +57,8 @@
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="subitDate" label="提交日期" align="center" width="120" />
<el-table-column prop="shareGinExaProportion" label="分摊参考比例" align="center" width="150" />
<el-table-column prop="shareProportion" label="分摊比例" align="center" width="120" />
<el-table-column prop="shareGinExaProportion" label="分摊参考比例(%)" align="center" width="160" />
<el-table-column prop="shareProportion" label="分摊比例(%)" align="center" width="130" />
<el-table-column prop="shareRebateTotal" label="分摊返利总额" align="center" width="150" />
<el-table-column prop="num" label="车辆台数" align="center" width="120" />
</el-table>

4
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue

@ -44,11 +44,11 @@
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">分摊参考比例</div>
<div class="span-sty">分摊参考比例(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.shareGinExaProportion }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">分摊比例</div>
<div class="span-sty">分摊比例(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.shareProportion }}</span></el-form-item>
</el-col>
<el-col :span="6">

Loading…
Cancel
Save