Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 1 year ago
parent
commit
f390a25796
  1. 28
      anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue
  2. 57
      yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue
  3. 2
      yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
  4. 146
      yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue
  5. 2
      yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue
  6. 4
      yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue

28
anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue

@ -266,25 +266,27 @@ export default {
},
toEdit() {
if (this.sids.length === 1) {
if (this.multipleSelection[0].handleBtn) {
this.viewState = 2
this.$refs['divAdd'].showEdit(this.sids[0])
} else {
this.$message({ showClose: true, type: 'error', message: '该记录资方合同号为空或已生成还款计划表且已存在还款记录' })
// if (this.multipleSelection[0].handleBtn) {
// this.viewState = 2
// this.$refs['divAdd'].showEdit(this.sids[0])
// } else {
// this.$message({ showClose: true, type: 'error', message: '' })
// }
if (this.state_list.length > 0) {
for (var i = 0; i < this.state_list.length; i++) {
if (this.state_list[i] === '是') {
this.$message({ showClose: true, type: 'error', message: '请选择是否已生成还款计划表状态为否的记录进行操作' })
return
}
}
}
this.viewState = 2
this.$refs['divAdd'].showEdit(this.sids[0])
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
}
},
downloadRepaymentPlan() {
if (this.state_list.length > 0) {
for (var i = 0; i < this.state_list.length; i++) {
if (this.state_list[i] === '是') {
this.$message({ showClose: true, type: 'error', message: '请选择是否已生成还款计划表状态为否的记录进行操作' })
return
}
}
}
if (this.sids.length > 0) {
req.createRepaymentVoucher(this.sids).then((res) => {
if (res.success) {

57
yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue

@ -12,22 +12,26 @@
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="12">
<div class="span-sty">开户银行</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankName" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>开户银行</div>
<el-form-item prop="bankName"><el-input class="addinputInfo addinputw" v-model="formobj.bankName" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">银行账号</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>银行账号</div>
<el-form-item prop="bankAccount"><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">账号名称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.accountName" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>账号名称</div>
<el-form-item prop="accountName"><el-input class="addinputInfo addinputw" v-model="formobj.accountName" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">账号类型</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.dueBankValue" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>账号类型</div>
<el-form-item prop="dueBankKey">
<el-select v-model="formobj.dueBankKey" class="addinputInfo" placeholder="" @change="dueBankChange">
<el-option v-for="item in dueBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -63,12 +67,15 @@
</template>
<script>
import { typeValues } from '@/api/Common/dictcommons'
export default {
name: 'OpeningBank',
data() {
return {
viewTitle: '',
viewState: 1,
dueBank_list: [],
formobj: {
sid: '',
supplierSid: '',
@ -83,27 +90,51 @@ export default {
swiftCode: '',
currency: ''
},
rules: {}
index: '',
rules: {
bankName: [{ required: true, message: '开户银行不能为空', trigger: 'blur' }],
bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }],
accountName: [{ required: true, message: '账号名称不能为空', trigger: 'blur' }],
dueBankKey: [{ required: true, message: '账号类型不能为空', trigger: 'change' }]
}
}
},
methods: {
init() {
typeValues({ type: 'dueBank' }).then((res) => {
if (res.success) {
this.dueBank_list = res.data
}
})
},
showAdd() {
this.viewTitle = '【新增】开户行信息'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
},
showEdit(value) {
showEdit(value, index) {
this.viewTitle = '【编辑】开户行信息'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
this.formobj = JSON.parse(JSON.stringify(value))
this.index = index
},
dueBankChange(value) {
const choose = this.dueBank_list.filter((item) => item.dictKey === value)
if (choose !== null && choose.length > 0) {
this.formobj.dueBankValue = choose[0].dictValue
} else {
this.formobj.dueBankValue = ''
}
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.$emit('backData', this.formobj)
this.$emit('backData', this.formobj, this.index)
this.handleReturn()
}
})
@ -123,6 +154,7 @@ export default {
swiftCode: '',
currency: ''
}
this.index = ''
this.$emit('doback')
}
}
@ -136,4 +168,7 @@ export default {
.addinputInfo {
margin-left: 130px !important;
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
</style>

2
yxt-as-ui/src/views/basicinformation/supplier/supplier.vue

@ -30,7 +30,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 主页面主要部分 -->

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

@ -13,30 +13,30 @@
<div class="title">基本信息</div>
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">供应商名称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierName" clearable placeholder=""/></el-form-item>
<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-col>
<el-col :span="8">
<div class="span-sty">供应商简称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierPY" clearable placeholder=""/></el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商简称</div>
<el-form-item prop="supplierPY"><el-input class="addinputInfo addinputw" v-model="formobj.supplierPY" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">供应商编码</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierCode" clearable placeholder=""/></el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商编码</div>
<el-form-item prop="supplierCode"><el-input class="addinputInfo addinputw" v-model="formobj.supplierCode" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">供应商类型</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商类型</div>
<el-form-item prop="supplierTypeSid">
<el-select class="addinputInfo" v-model="formobj.supplierTypeSid" filterable placeholder="" @change="supplierTypeChange">
<el-option v-for="item in supplierType_list" :key="item.supplierTypeSid" :label="item.supplierTypeName" :value="item.supplierTypeSid"/>
<el-option v-for="item in supplierType_list" :key="item.sid" :label="item.supplierTypeName" :value="item.sid"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">供应商电话</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.contactTelePhone" clearable placeholder=""/></el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商电话</div>
<el-form-item prop="contactTelePhone"><el-input class="addinputInfo addinputw" v-model="formobj.contactTelePhone" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">传真</div>
@ -48,14 +48,14 @@
<div class="span-sty">详细地址</div>
<el-form-item>
<div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
<el-select v-model="formobj.provinceSid" filterable placeholder="请选择省" style="width:160px" @change="provinceChange">
<el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.sid"/>
<el-select v-model="formobj.province" filterable clearable placeholder="请选择省" style="width:160px" @change="provinceChange">
<el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
<el-select v-model="formobj.citySid" filterable placeholder="请选择市" style="width:160px" @change="cityChange">
<el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.sid"/>
<el-select v-model="formobj.city" filterable placeholder="请选择市" style="width:160px" @change="cityChange">
<el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
<el-select v-model="formobj.countySid" filterable placeholder="请选择县" style="width:160px" @change="countyChange">
<el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.sid"/>
<el-select v-model="formobj.county" filterable placeholder="请选择县" style="width:160px" @change="countyChange">
<el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
<el-input style="width: 30%" v-model="formobj.address" clearable placeholder=""/>
</div>
@ -90,8 +90,8 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">开票公司名称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.billingCompanyName" clearable placeholder=""/></el-form-item>
<div class="span-sty"><span class="icon">*</span>开票公司名称</div>
<el-form-item prop="billingCompanyName"><el-input class="addinputInfo addinputw" v-model="formobj.billingCompanyName" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">税号</div>
@ -108,16 +108,16 @@
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.purchaser" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开票类型</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>开票类型</div>
<el-form-item prop="billingTypeValue">
<el-select class="addinputInfo" v-model="formobj.billingTypeValue" filterable placeholder="" @change="billingTypeChange">
<el-option v-for="item in billingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">税率</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
<div class="span-sty"><span class="icon">*</span>税率</div>
<el-form-item prop="taxRate"><el-input class="addinputInfo addinputw" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<el-row>
@ -134,7 +134,7 @@
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed width="150" label="操作" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleEdit(scope.row)">编辑</el-button>
<el-button type="primary" size="mini" @click="handleEdit(scope.row, scope.$index)">编辑</el-button>
<el-button type="danger" size="mini" @click="handleDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
@ -212,7 +212,16 @@ export default {
remarks: '',
pmsSupplierBankList: []
},
rules: {}
rules: {
supplierName: [{ required: true, message: '供应商名称不能为空', trigger: 'blur' }],
supplierPY: [{ required: true, message: '供应商简称不能为空', trigger: 'blur' }],
supplierCode: [{ required: true, message: '供应商编码不能为空', trigger: 'blur' }],
supplierTypeSid: [{ required: true, message: '供应商类型不能为空', trigger: 'change' }],
contactTelePhone: [{ required: true, message: '供应商电话不能为空', trigger: 'blur' }],
billingCompanyName: [{ required: true, message: '开票公司名称不能为空', trigger: 'blur' }],
billingTypeValue: [{ required: true, message: '开票类型不能为空', trigger: 'change' }],
taxRate: [{ required: true, message: '税率不能为空', trigger: 'blur' }]
}
}
},
methods: {
@ -258,10 +267,18 @@ export default {
}
},
provinceChange(value) {
const choose = this.province_list.filter((item) => item.sid === value)
const choose = this.province_list.filter((item) => item.name === value)
if (choose !== null && choose.length > 0) {
this.formobj.province = choose[0].name
this.getCity(value)
this.formobj.provinceSid = choose[0].sid
this.getCity(this.formobj.provinceSid)
} else {
this.formobj.provinceSid = ''
this.formobj.citySid = ''
this.formobj.city = ''
this.city_list = []
this.formobj.county = ''
this.formobj.countySid = ''
this.county_list = []
}
},
getCity(val) {
@ -272,10 +289,10 @@ export default {
})
},
cityChange(value) {
const choose = this.city_list.filter((item) => item.sid === value)
const choose = this.city_list.filter((item) => item.name === value)
if (choose !== null && choose.length > 0) {
this.formobj.city = choose[0].name
this.getCounty(value)
this.formobj.citySid = choose[0].sid
this.getCounty(this.formobj.citySid)
}
},
getCounty(val) {
@ -286,9 +303,9 @@ export default {
})
},
countyChange(value) {
const choose = this.county_list.filter((item) => item.sid === value)
const choose = this.county_list.filter((item) => item.name === value)
if (choose !== null && choose.length > 0) {
this.formobj.county = choose[0].name
this.formobj.countySid = choose[0].sid
}
},
showAdd() {
@ -320,29 +337,47 @@ export default {
this.viewState = 2
this.$refs['divOpen'].showAdd()
},
handleEdit(row) {
handleEdit(row, index) {
this.viewState = 3
this.$refs['divOpen'].showEdit(row)
this.$refs['divOpen'].showEdit(row, index)
},
handleDelete(index) {
this.formobj.pmsSupplierBankList.splice(index, 1)
},
backData(value) {
backData(value, index) {
this.viewState = 1
this.formobj.pmsSupplierBankList.push({
sid: value.sid,
supplierSid: value.supplierSid,
bankName: value.bankName,
bankAccount: value.bankAccount,
accountName: value.accountName,
dueBankKey: value.dueBankKey,
dueBankValue: value.dueBankValue,
bankingOutlets: value.bankingOutlets,
bankAddress: value.bankAddress,
paymentLines: value.paymentLines,
swiftCode: value.swiftCode,
currency: value.currency
})
value = JSON.parse(JSON.stringify(value))
if (index !== '' && index !== null) {
this.formobj.pmsSupplierBankList[index] = {
sid: value.sid,
supplierSid: value.supplierSid,
bankName: value.bankName,
bankAccount: value.bankAccount,
accountName: value.accountName,
dueBankKey: value.dueBankKey,
dueBankValue: value.dueBankValue,
bankingOutlets: value.bankingOutlets,
bankAddress: value.bankAddress,
paymentLines: value.paymentLines,
swiftCode: value.swiftCode,
currency: value.currency
}
} else {
this.formobj.pmsSupplierBankList.push({
sid: '',
supplierSid: value.supplierSid,
bankName: value.bankName,
bankAccount: value.bankAccount,
accountName: value.accountName,
dueBankKey: value.dueBankKey,
dueBankValue: value.dueBankValue,
bankingOutlets: value.bankingOutlets,
bankAddress: value.bankAddress,
paymentLines: value.paymentLines,
swiftCode: value.swiftCode,
currency: value.currency
})
}
},
resetState() {
this.viewState = 1
@ -419,6 +454,9 @@ export default {
margin-left: 120px !important;
width: calc(100% - 115px);
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.titleOne {
padding: 7px;
display: flex;
@ -426,4 +464,12 @@ export default {
justify-content: space-between;
align-items: center;
}
/*表格列设置fixed后固定列出现下边框的设置*/
/deep/ .el-table__fixed {
height: 100% !important;
}
/*表格列设置fixed后固定列出现下边框的设置*/
/deep/ .el-table__fixed-right {
height: 100% !important;
}
</style>

2
yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue

@ -41,7 +41,7 @@
<el-row>
<el-col :span="24">
<div class="span-sty">详细地址</div>
<el-form-item><span class="addinputInfo">{{ formobj.address }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.province }}{{ formobj.city }}{{ formobj.county }}{{ formobj.address }}</span></el-form-item>
</el-col>
</el-row>
<el-row>

4
yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue

@ -54,11 +54,11 @@
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty">供应商类型</div>
<div class="span-sty"><span class="icon">*</span>供应商类型</div>
<el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeName" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">供应商编码</div>
<div class="span-sty"><span class="icon">*</span>供应商编码</div>
<el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeCode" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>

Loading…
Cancel
Save