mkm/engineering_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.lihaink.cn/mkm/engineering_admin

Browse Source
This commit is contained in:
zmj 2024-03-25 18:03:33 +08:00
commit 7710bb6819
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/finance_payment_plan/edit.vue
View File

@ -1,7 +1,8 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<el-row :gutter="10">
@ -78,14 +79,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="状态" prop="status">
<el-select class="flex-1" v-model="formData.status" clearable placeholder="请选择状态">
<el-option v-for="(item, index) in dictData.pay_status" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="备注" prop="remark">
@ -105,15 +106,15 @@
</el-dialog>
<div v-if="formData.contract_cate == 1 && showDialog1">
<el-dialog v-model="showDialog1" title="选择采购合同" width="70%">
<dialogTable :config="procurement_contract" :query="{ supplier_id: formData?.supplier_id || '' }"
@customEvent="customEvent1" />
<dialogTable :config="procurement_contract"
:query="{ supplier_id: formData?.supplier_id || '' }" @customEvent="customEvent1" />
</el-dialog>
</div>
<div v-if="formData.contract_cate == 2 && showDialog1">
<el-dialog v-model="showDialog1" title="选择分包合同" width="70%">
<dialogTable :config="subcontracting_contract" :query="{ supplier_id: formData?.supplier_id || '' }"
@customEvent="customEvent1" />
<dialogTable :config="subcontracting_contract"
:query="{ supplier_id: formData?.supplier_id || '' }" @customEvent="customEvent1" />
</el-dialog>
</div>
</el-form>

4
src/views/remittance/edit.vue
View File

@ -50,7 +50,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="回款状态" prop="return_status">
<el-radio-group v-model="formData.return_status" placeholder="请选择回款状态">
<el-radio v-for="(item, index) in dictData.return_status" :key="index"
@ -59,7 +59,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="回款责任人" prop="return_duty_id" @click="userclick">
<el-input v-model="return_name" readonly clearable placeholder="请输入回款责任人" />