Merge branch 'wzq-skyh' of 121.36.198.49:zy_duanju/zhiyu_duanju_distribution_manage_front

src/views/settleManage/paymentAccountInfo/tabs/paymentInfo/form/create.vue

@@ -6,11 +6,24 @@
     <el-form :model="formData" label-width="120px" ref="ruleForm" :rules="rules" v-loading="loading" class="pr-4">
       <div class="flex flex-row justify-between">
         <div class="w-full">
+			
           <el-form-item label="商户名称" prop="owner_name">
+			  <template #label>
+			   <div class="flex items-center">
+			     <span>商户名称</span>
+			     <el-tooltip placement="top">
+			       <template #content>收款的公司名称</template>
+			       <el-icon>
+			         <InfoFilled />
+			       </el-icon>
+			     </el-tooltip>
+				 
+			   </div>
+			  </template>
             <el-input v-model="formData.owner_name" placeholder="请输入商户名称" />
           </el-form-item>
-          <el-form-item label="收款人" prop="name_of_payee">
-            <el-input v-model="formData.name_of_payee" placeholder="请输入收款人" />
+          <el-form-item label="对公账户名称" prop="name_of_payee">
+            <el-input v-model="formData.name_of_payee" placeholder="请输入对公账户名称" />
           </el-form-item>
           <el-form-item label="银行卡号" prop="card_no">
             <el-input v-model="formData.card_no" clearable size="large" placeholder="请输入银行卡号" />
@@ -23,14 +36,14 @@
           <el-form-item label="开户支行" prop="sub_bank_name">
             <el-input v-model="formData.sub_bank_name" clearable size="large" placeholder="请输入开户支行" />
           </el-form-item>
-          <el-form-item label="收款人手机号" prop="phone_of_payee">
-            <el-input v-model="formData.phone_of_payee" clearable size="large" placeholder="请输入收款人手机号" />
+          <el-form-item label="手机号" prop="phone_of_payee">
+            <el-input v-model="formData.phone_of_payee" clearable size="large" placeholder="请输入手机号" />
           </el-form-item>
-          <el-form-item label="所属商务" prop="business_id">
+          <!-- <el-form-item label="所属商务" prop="business_id">
             <el-select v-model="formData.business_id" filterable clearable placeholder="选择所属商务">
               <el-option v-for="item in businessList" :key="item.id" :label="item.username" :value="item.id" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
         </div>
       </div>
       <div class="flex justify-end">
@@ -45,6 +58,7 @@ import type { FormInstance, FormRules } from 'element-plus'
 import { jiesuanManageBankAccountListBank, jiesuanManageBankAccountListShangwu, jiesuanManageBankAccountAddCompanyCard } from '@/api/settlement/index'
 const ruleForm = ref<FormInstance>()
 import { onMounted, ref } from 'vue';
+import { InfoFilled } from '@element-plus/icons-vue';
 const props = defineProps({
   primary: Object,
 });
@@ -61,7 +75,7 @@ const rules = reactive({
   name_of_payee: [
     {
       required: true,
-      message: '请输入收款人',
+      message: '请输入对公账户名称',
       trigger: 'blur'
     }
   ],
@@ -76,7 +90,7 @@ const rules = reactive({
   phone_of_payee: [
     {
       required: true,
-      message: '请输入收款人手机号',
+      message: '请输入手机号',
       trigger: 'blur'
     },
     { pattern: /^1[3456789]\d{9}$/, message: '号码格式不正确', trigger: 'blur' }
@@ -97,9 +111,9 @@ const businessList = ref([])
 const bankList = ref([])
 
 const init = () => {
-  jiesuanManageBankAccountListShangwu().then(res => {
-    businessList.value = res.data;
-  })
+  // jiesuanManageBankAccountListShangwu().then(res => {
+  //   businessList.value = res.data;
+  // })
   jiesuanManageBankAccountListBank().then(res => {
     bankList.value = res.data;
   })

src/views/settleManage/paymentAccountInfo/tabs/paymentInfo/index.vue

@@ -5,12 +5,15 @@
 		  <el-form-item label="商户名称" prop="name">
 		    <el-input v-model="query.owner_name" name="owner_name" clearable placeholder="请输入商户名称" />
 		  </el-form-item>
-        <el-form-item label="所属商务" prop="business_id">
+		  <el-form-item label="对公账户名称" prop="name">
+		    <el-input v-model="query.name_of_payee" name="name_of_payee" clearable placeholder="请输入对公账户名称" />
+		  </el-form-item>
+	<!-- 		<el-form-item label="所属商务" prop="business_id">
           <el-select v-model="query.business_id" filterable clearable placeholder="选择所属商务">
             <el-option v-for="item in businessList" :key="item.id" :label="item.username" :value="item.id" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="申请时间">
+          </el-select> 
+        </el-form-item> -->
+        <el-form-item label="添加时间">
           <el-date-picker unlink-panels clearable @change="orderTimeChange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
             v-model="query.createTime" type="daterange" :shortcuts="shortcuts" range-separator="To"
             start-placeholder="开始时间" end-placeholder="结束时间" />
@@ -21,10 +24,10 @@
       <Operate :show="open" v-action="'jiesuan.BankAccount.addCompanyCard'" />
       <el-table :data="tableData" class="mt-3" v-loading="loading">
         <el-table-column prop="owner_name" label="商户名称" min-width="200px" />
-        <el-table-column prop="business_str" label="所属商务" min-width="200px" />
+        <!-- <el-table-column prop="business_str" label="所属商务" min-width="200px" /> -->
         <el-table-column label="收款信息" show-overflow-tooltip min-width="250px">
           <template #default="scope">
-            <div>收款人：{{ scope.row.name_of_payee }}</div>
+            <div>对公账户名称：{{ scope.row.name_of_payee }}</div>
             <div>银行卡号：{{ scope.row.card_no }}</div>
             <div>开户银行：{{ scope.row.bank_name }}</div>
             <div>开户支行：{{ scope.row.sub_bank_name }}</div>
@@ -154,9 +157,9 @@ const openType = (type: string, data: object) => {
 const tableData = computed(() => data.value?.data);
 
 onMounted(() => {
-  jiesuanManageBankAccountListShangwu().then(res => {
-    businessList.value = res.data;
-  })
+  // jiesuanManageBankAccountListShangwu().then(res => {
+  //   businessList.value = res.data;
+  // })
   console.log(rolesIdentify, 'rolesIdentifyrolesIdentify');
   search();
 });