Merge pull request 'yyw提交' (#20) from yyw into master

Reviewed-on: #20
This commit is contained in:
vivanlina 2025-10-25 09:29:52 +00:00
commit e126df1c80

View File

@ -4,7 +4,7 @@
<el-button type="primary" v-print="printOption"><el-icon><Printer /></el-icon>&nbsp;打印</el-button> <el-button type="primary" v-print="printOption"><el-icon><Printer /></el-icon>&nbsp;打印</el-button>
</div> </div>
<div id="printBox" class="printBox" :class="isPrint ? 'print' : ''"> <div id="printBox" class="printBox" :class="isPrint ? 'print' : ''">
<el-form label-position="right" label-width="110px" v-loading="loading" :disabled="true"> <el-form label-position="right" label-width="140px" v-loading="loading" :disabled="true">
<el-form-item label="公司名称:"> <el-form-item label="公司名称:">
<el-select v-model="itemInfo.company_id" placeholder="请选择" clearable filterable style="width: 320px;"> <el-select v-model="itemInfo.company_id" placeholder="请选择" clearable filterable style="width: 320px;">
<el-option v-for="it in companyList" :key="it.id" :label="it.name" :value="it.id" /> <el-option v-for="it in companyList" :key="it.id" :label="it.name" :value="it.id" />
@ -20,6 +20,11 @@
<el-option v-for="it in supplierList" :key="it.id" :label="it.supplier_name" :value="it.id" /> <el-option v-for="it in supplierList" :key="it.id" :label="it.supplier_name" :value="it.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<div v-if="Type == 1">
<el-form-item label="银行账户:"><span>{{ itemInfo.bank_account }}</span></el-form-item>
<el-form-item label="银行开户名:"><span>{{ itemInfo.bank_account_holder }}</span></el-form-item>
<el-form-item label="开户银行支行名称:"><span>{{ itemInfo.bank_branch_name }}</span></el-form-item>
</div>
<!-- <template v-if="Type == 1"> <!-- <template v-if="Type == 1">
<el-form-item label="商品信息:"> <el-form-item label="商品信息:">
<el-table :data="itemInfo.products" style="width: 100%;margin-top: 15px;" border> <el-table :data="itemInfo.products" style="width: 100%;margin-top: 15px;" border>
@ -366,6 +371,13 @@ export default {
function getSupplier() { function getSupplier() {
get(`/api/purchaseSupplier`, {page: 1, pageSize: 1000}).then((res) => { get(`/api/purchaseSupplier`, {page: 1, pageSize: 1000}).then((res) => {
data.supplierList = res.data data.supplierList = res.data
res.data.forEach((item) => {
if(item.id == data.itemInfo.purchase_supplier_id) {
data.itemInfo.bank_account = item.bank_account
data.itemInfo.bank_account_holder = item.bank_account_holder
data.itemInfo.bank_branch_name = item.bank_branch_name
}
})
}) })
} }