yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 2 weeks ago
parent
e126324125 835515c3f8
commit
2ba3ae066e
11 changed files with 96 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
  2. 12
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue
  3. 1
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
  4. 12
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue
  5. 22
      yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
  6. 16
      yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
  7. 4
      yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
  8. 4
      yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
  9. 16
      yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
  10. 4
      yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
  11. 22
      yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue

1
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
View File

@ -620,6 +620,7 @@ export default {
this.formobj.eveList.push({
sid: '', // sid
applySid: '', // 付款申请sid
eveSid: e.sid, // 平仓款Sid
costTitleValue: e.costTitleValue, // 平仓款名称
openDate: e.openDate, // 融资付款开通日期
period: e.period, // 期(台)数

12
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue
View File

@ -136,13 +136,11 @@ export default {
this.listQuery.params.useOrgSid = createOrgSid
this.listQuery.params.payCompanySid = payCompanySid
const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// for (var j = 0; j < value[i].vehRebateSids.length; j++) {
// aa.push(value[i].vehRebateSids[j])
// }
// }
// }
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
aa.push(value[i].eveSid)
}
}
this.listQuery.params.sidList = aa
this.listQuery.current = 1
this.getList()

1
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
View File

@ -611,6 +611,7 @@ export default {
this.formobj.eveList.push({
sid: '', // sid
applySid: '', // 付款申请sid
eveSid: e.sid, // 平仓款sid
costTitleValue: e.costTitleValue, // 平仓款名称
openDate: e.openDate, // 融资付款开通日期
period: e.period, // 期(台)数

12
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue
View File

@ -136,13 +136,11 @@ export default {
this.listQuery.params.useOrgSid = createOrgSid
this.listQuery.params.payCompanySid = payCompanySid
const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// for (var j = 0; j < value[i].vehRebateSids.length; j++) {
// aa.push(value[i].vehRebateSids[j])
// }
// }
// }
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
aa.push(value[i].eveSid)
}
}
this.listQuery.params.sidList = aa
this.listQuery.current = 1
this.getList()

22
yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
View File

@ -32,7 +32,7 @@
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item>
<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>
@ -338,13 +338,27 @@ export default {
}
},
computed: {
// 开票金额 = 开票索赔单列表(工时费 + 材料费 + 厂家补助 + 施救费 + 外出费 + 其它费用) + 调增当月收入项目列表中金额合计 - 调减当月收入项目列表中金额合计
kpjeTtotal() {
let kpje = '0'
let kpje = 0
// 开票索赔单列表(工时费 + 材料费 + 厂家补助 + 施救费 + 外出费 + 其它费用)
if (this.formobj.detailList.length > 0) {
this.formobj.detailList.forEach((e) => {
kpje = Math.round((parseFloat(kpje) + parseFloat(e.claimHourAmount) + parseFloat(e.claimGoodsAmount) + parseFloat(e.claimOutAmount) + parseFloat(e.claimSubsidyAmount) + parseFloat(e.claimRescueAmount) + parseFloat(e.claimOtherAmount)) * 100) / 100
})
}
// 调增当月收入项目列表中金额合计
if (this.formobj.supplementaryItems.length > 0) {
this.formobj.supplementaryItems.forEach((e) => {
kpje = Math.round((parseFloat(kpje) + parseFloat(e.amount)) * 100) / 100
})
}
// 调减当月收入项目列表中金额合计
if (this.formobj.deductionItems.length > 0) {
this.formobj.deductionItems.forEach((e) => {
kpje = Math.round((parseFloat(kpje) - parseFloat(e.amount)) * 100) / 100
})
}
return kpje
}
},
@ -768,6 +782,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 {
font-weight: bold;
font-size: 16px;

16
yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
View File

@ -139,6 +139,10 @@
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
<el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="billObjName" label="供应商" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="100" />
<el-table-column prop="count" label="数量" align="center" width="100" />
@ -191,6 +195,10 @@
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
<el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="billObjName" label="供应商" align="center" width="100" />
<el-table-column prop="price" label="销售单价" align="center" width="100" />
<el-table-column prop="currentCount" label="总数量" align="center" width="100" />
@ -513,6 +521,14 @@ export default {
goodsSkuTitle: row.goodsSpuName,
goodsSkuCode: row.goodsSkuCode,
unit: row.unit,
warehouseName: row.warehouseName,
warehouseSid: row.warehouseSid,
wareZoneName: row.wareZoneName,
wareZoneSid: row.wareZoneSid,
wareAreaName: row.wareAreaName,
wareAreaSid: row.wareAreaSid,
warehouseRackCode: row.warehouseRackCode,
warehouseRackSid: row.warehouseRackSid,
goodsSkuOwnSpec: row.goodsSkuOwnSpec,
currentCount: row.count,
returnedCount: row.returnedCount,

4
yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
View File

@ -128,6 +128,10 @@
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
<el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="billObjName" label="供应商" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="100" />
<el-table-column prop="currentCount" label="总数量" align="center" width="100" />

4
yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
View File

@ -131,6 +131,10 @@
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
<el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="billObjName" label="供应商" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="100" />
<el-table-column prop="currentCount" label="总数量" align="center" width="100" />

16
yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
View File

@ -138,6 +138,10 @@
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
<el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="billObjName" label="供应商" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="100" />
<el-table-column prop="count" label="数量" align="center" width="100" />
@ -191,6 +195,10 @@
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
<el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="billObjName" label="供应商" align="center" width="100" />
<el-table-column prop="price" label="销售单价" align="center" width="100" />
<el-table-column prop="currentCount" label="总数量" align="center" width="100" />
@ -506,6 +514,14 @@ export default {
goodsSkuTitle: '',
goodsSkuCode: row.goodsSkuCode,
unit: row.unit,
warehouseName: row.warehouseName,
warehouseSid: row.warehouseSid,
wareZoneName: row.wareZoneName,
wareZoneSid: row.wareZoneSid,
wareAreaName: row.wareAreaName,
wareAreaSid: row.wareAreaSid,
warehouseRackCode: row.warehouseRackCode,
warehouseRackSid: row.warehouseRackSid,
goodsSkuOwnSpec: row.goodsSkuOwnSpec,
currentCount: row.count,
returnedCount: row.returnedCount,

4
yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
View File

@ -128,6 +128,10 @@
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
<el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="billObjName" label="供应商" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="100" />
<el-table-column prop="currentCount" label="总数量" align="center" width="100" />

22
yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
View File

@ -31,7 +31,7 @@
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item>
<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>
@ -337,13 +337,27 @@ export default {
}
},
computed: {
// 开票金额 = 开票索赔单列表(工时费 + 材料费 + 厂家补助 + 施救费 + 外出费 + 其它费用) + 调增当月收入项目列表中金额合计 - 调减当月收入项目列表中金额合计
kpjeTtotal() {
let kpje = '0'
let kpje = 0
// 开票索赔单列表(工时费 + 材料费 + 厂家补助 + 施救费 + 外出费 + 其它费用)
if (this.formobj.detailList.length > 0) {
this.formobj.detailList.forEach((e) => {
kpje = Math.round((parseFloat(kpje) + parseFloat(e.claimHourAmount) + parseFloat(e.claimGoodsAmount) + parseFloat(e.claimOutAmount) + parseFloat(e.claimSubsidyAmount) + parseFloat(e.claimRescueAmount) + parseFloat(e.claimOtherAmount)) * 100) / 100
})
}
// 调增当月收入项目列表中金额合计
if (this.formobj.supplementaryItems.length > 0) {
this.formobj.supplementaryItems.forEach((e) => {
kpje = Math.round((parseFloat(kpje) + parseFloat(e.amount)) * 100) / 100
})
}
// 调减当月收入项目列表中金额合计
if (this.formobj.deductionItems.length > 0) {
this.formobj.deductionItems.forEach((e) => {
kpje = Math.round((parseFloat(kpje) - parseFloat(e.amount)) * 100) / 100
})
}
return kpje
}
},
@ -728,6 +742,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 {
font-weight: bold;
font-size: 16px;

Write Preview
Loading…
Cancel
Save