bug徐福

src/views/bank_account/edit.vue

@@ -6,17 +6,21 @@
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
                     <el-col :span="24">
-                        <el-form-item label="组织名称" prop="org_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="组织名称" prop="org_id"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-select v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
-                                <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
+                                <el-option v-for="(item, index) in list1" :key="index" :label="item.name"
+                                    :value="item.id" />
                             </el-select>
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="24">
-                        <el-form-item label="部门名称" prop="dept_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="部门名称" prop="dept_id"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-select v-model="formData.dept_id" clearable placeholder="请选择部门">
-                                <el-option v-for="( item, index ) in  list2 " :key="index" :label="item.name" :value="item.id" />
+                                <el-option v-for="( item, index ) in  list2 " :key="index" :label="item.name"
+                                    :value="item.id" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -26,33 +30,39 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                        <el-form-item label="开户银行" prop="deposit_bank" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="开户银行" prop="deposit_bank"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.deposit_bank" clearable placeholder="请输入开户银行" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="24">
-                        <el-form-item label="开户名称" prop="account_name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="开户名称" prop="account_name"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.account_name" clearable placeholder="请输入开户名称" />
                         </el-form-item>
                     </el-col>
 
 
                     <el-col :span="24">
-                        <el-form-item label="账号" prop="account" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="账号" prop="account"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.account" clearable placeholder="请输入账号" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="24">
-                        <el-form-item label="开户日期" prop="account_opening_date" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="开户日期" prop="account_opening_date"
-                            <el-date-picker class="flex-1 !flex" v-model="formData.account_opening_date" clearable type="date" value-format="YYYY-MM-DD" placeholder="选择开户日期">
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.account_opening_date" clearable
+                                type="date" value-format="YYYY-MM-DD" placeholder="选择开户日期">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="24">
-                        <el-form-item label="期初金额" prop="opening_amount" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="期初金额" prop="opening_amount"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.opening_amount" type="number" clearable placeholder="请输入期初金额" />
                         </el-form-item>
                     </el-col>

src/views/finance_payment_apply/edit.vue

@@ -157,7 +157,7 @@
                 <el-row :gutter="10">
 
                     <el-col :span="8">
-                        <el-form-item label="开户银行" prop="bank" @click="showDialog2 = true">
+                        <el-form-item label="开户银行" prop="bank" @click="showDialog3 = true">
                             <el-input v-model="formData.bank" clearable placeholder="请输入开户银行" />
                         </el-form-item>
 
@@ -187,7 +187,9 @@
                 <el-dialog v-model="showDialog2" title="选择待付款计划" width="70%">
                     <paylistDialog @customEvent="customEvent2"></paylistDialog>
                 </el-dialog>
-
+                <el-dialog v-model="showDialog3" title="选择收款人信息" width="70%">
+                    <bankaccountDialog @customEvent="customEvent3"></bankaccountDialog>
+                </el-dialog>
             </el-form>
         </popup>
 
@@ -203,6 +205,7 @@ import subcontractingDialog from '@/components/procurementsubcontracting_selecto
 import paylistDialog from '@/components/paylist/index.vue'
 
 const active = ref(0)
+import bankaccountDialog from '@/components/bankaccount/index.vue'
 
 import { paymentapplyAdd, paymentapplyEdit, paymentapplyDetail } from '@/api/paymentrequest'
 import { toChinesNum } from "@/utils/util";
@@ -284,6 +287,7 @@ const amount_daxie = ref('')
 const showDialog = ref(false)
 const showDialog1 = ref(false)
 const showDialog2 = ref(false)
+const showDialog3 = ref(false)
 const customEvent = (e: any) => {
     formData.supplier_id = e.id;
 
@@ -310,6 +314,12 @@ const customEvent2 = (e: any) => {
     showDialog2.value = false;
 };
 
+const customEvent3 = (e: any) => {
+    formData.bank = e.deposit_bank
+    formData.account_name = e.account_name
+    formData.account = e.account
+    showDialog3.value = false;
+};
 
 //监听输入
 const amountinput = (e) => {

src/views/finance_receipt_record/index.vue

@@ -9,7 +9,8 @@
                 <el-form-item label="发票类型" prop="invoice_type">
                     <el-select class="w-[280px]" v-model="queryParams.invoice_type" clearable placeholder="请选择发票类型">
 
-                        <el-option v-for="(item, index) in dictData.invoice_type" :key="index" :label="item.name" :value="item.value" />
+                        <el-option v-for="(item, index) in dictData.invoice_type" :key="index" :label="item.name"
+                            :value="item.value" />
                     </el-select>
                 </el-form-item>
                 <el-form-item>

src/views/finance_refund_record/detail.vue

@@ -7,11 +7,9 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
+                                {{ formData.contract_name }}
                             </el-form-item>
                         </el-col>
-
-
                         <el-col :span="12">
                             <el-form-item label="项目名称">
                                 {{ formData.project ? formData.project.name : '暂无数据'
@@ -21,17 +19,10 @@
 
                         <el-col :span="12">
                             <el-form-item label="项目编码">
-                                {{ formData.project.project_code
+                                {{ formData.project_code
                                 }}
                             </el-form-item>
                         </el-col>
-
-                        <!-- <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-form-item>
-                        </el-col> -->
                         <el-col :span="12">
                             <el-form-item label="退款日期">
                                 {{ formData.reason
@@ -115,15 +106,45 @@ const datas = reactive({
 
 
 // 表单数据
-const formData = reactive({
+const formData = reactive({}
+    // {
+    //     "id": 0,
+    //     "supplier_id": 1,
+    //     "project_id": 1,
+    //     "contract_type": 1,
+    //     "contract_id": 2,
+    //     "refund_amount": "",
+    //     "refund_date": "2024-01-16",
+    //     "refund_type": 1,
+    //     "reason": "",
+    //     "remark": "",
+    //     "annex": [
 
-})
+    //     ],
+    //     "bank_account_id": 3,
+    //     "supplier_name": "某某供应商",
+    //     "supplier_code": "SC-20240108-564041",
+    //     "project_name": "测试工程test",
+    //     "project_code": "P-20240113-600036",
+    //     "contract_no": "CGHT-20240110-412306",
+    //     "contract_name": "11",
+    //     "contract_type_text": "采购合同",
+    //     "refund_type_text": "支票",
+    //     "bank_account_info": {
+    //         "account_sn": "BANK-20240116-881909",
+    //         "deposit_bank": "邮政",
+    //         "account_name": "龙马邮政支行",
+    //         "account": "26263515351565"
+    //     }
+    // }
+)
 
 
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
+    console.log(formData, 'formdata')
 
 
 
@@ -145,8 +166,9 @@ const handleSubmit = async () => {
 
 //打开弹窗
 const open = () => {
-    console.log('1111111')
     popupRef.value?.open()
+    console.log('1111111')
+
 }
 
 // 关闭回调

src/views/finance_refund_record/edit.vue

@@ -20,7 +20,7 @@
                     <el-col :span="8">
                         <el-form-item label="退款日期" prop="refund_date">
                             <el-date-picker class="flex-1 !flex" v-model="formData.refund_date" clearable type="datetime"
-                                value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+                                value-format="YYYY-MM-DD" placeholder="选择日期">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -144,7 +144,7 @@
                         <el-form-item label="开始计息日期" prop="interest_calculation_start_date">
 
                             <el-date-picker class="flex-1 !flex" v-model="formData.interest_calculation_start_date"
-                                clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+                                clearable type="datetime" value-format="YYYY-MM-DD" placeholder="选择日期">
                             </el-date-picker>
 
                         </el-form-item>
@@ -273,6 +273,14 @@ const customEvent1 = (e: any) => {
 
 
 
+const customEvent2 = (e) => {
+    formData.invoicing_company_name = e.account_sn
+    formData.deposit_bank = e.deposit_bank
+    formData.bank_accnout = e.account_name
+    formData.bank_account_id = e.id
+    showDialog2.value = false
+}
+
 //监听输入
 const amountinput = (e) => {
     // console.log(e)
@@ -299,7 +307,9 @@ const formData = reactive({
     annex: [],
     bank_account_id: 0,
     is_calculate_interest: '',
-    interest_calculation_start_date: ""
+    interest_calculation_start_date: "",
+    "contract_cate": 1,
+
 })
 
 

src/views/project/components/budget.vue

@@ -14,7 +14,7 @@ const props = defineProps({
 
 const baseData = reactive({
     fetchFun: subpackagdetailLists,
-    tit: "竞争对手",
+    tit: "竞争SDSD对手",
     queryParams: { project_id: props.project_id },
     columnList: [
         { label: '工作类型', prop: 'work_type' },