hurx 2 dias atrás
pai
commit
da4e9b7f93

+ 4 - 4
src/views/bill/statementInvoice/addDrawer.vue

@@ -16,13 +16,13 @@
 
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="客户名称" prop="customerId">
+            <el-form-item label="伙伴商名称" prop="customerId">
               <el-select
                 v-model="form.customerId"
                 filterable
                 remote
                 reserve-keyword
-                placeholder="请输入客户名称"
+                placeholder="请输入伙伴商名称"
                 :remote-method="remoteSearchCustomer"
                 :loading="customerLoading"
                 clearable
@@ -192,7 +192,7 @@ const buttonLoading = ref(false);
 const form = ref<StatementInvoiceForm>({ ...initFormData });
 
 const rules = reactive({
-  customerId: [{ required: true, message: '请选择客户', trigger: 'change' }],
+  customerId: [{ required: true, message: '请选择伙伴商', trigger: 'change' }],
   invoiceTime: [{ required: true, message: '请选择开票日期', trigger: 'change' }]
 } as any);
 
@@ -330,7 +330,7 @@ const handleCustomerChange = (value: string | number) => {
 /** 选择对账单 */
 const handleSelectStatement = () => {
   if (!form.value.customerId) {
-    proxy?.$modal.msgWarning('请先选择客户');
+    proxy?.$modal.msgWarning('请先选择伙伴商');
     return;
   }
 

+ 2 - 2
src/views/bill/statementInvoice/detailDrawer.vue

@@ -26,7 +26,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="客户名称:" prop="customerName">
+            <el-form-item label="伙伴商名称:" prop="customerName">
               <el-input v-model="form.customerName" disabled />
             </el-form-item>
           </el-col>
@@ -173,7 +173,7 @@ const buttonLoading = ref(false);
 const form = ref<StatementInvoiceForm>({ ...initFormData });
 
 const rules = reactive({
-  customerId: [{ required: true, message: '请选择客户', trigger: 'change' }],
+  customerId: [{ required: true, message: '请选择伙伴商', trigger: 'change' }],
   invoiceTime: [{ required: true, message: '请选择开票日期', trigger: 'change' }]
 } as any);
 

+ 5 - 5
src/views/bill/statementInvoice/index.vue

@@ -17,13 +17,13 @@
                 value-format="YYYY-MM-DD"
               />
             </el-form-item>
-            <el-form-item label="客户名称" prop="customerId">
+            <!-- <el-form-item label="伙伴商名称" prop="customerId">
               <el-select
                 v-model="queryParams.customerId"
                 filterable
                 remote
                 reserve-keyword
-                placeholder="请输入客户名称"
+                placeholder="请输入伙伴商名称"
                 :remote-method="remoteSearchCustomer"
                 :loading="customerLoading"
                 clearable
@@ -32,7 +32,7 @@
               >
                 <el-option v-for="item in customerOptions" :key="item.id" :label="item.customerName" :value="item.id" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="订单编号" prop="orderNo">
               <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -59,7 +59,7 @@
         <el-row :gutter="10" class="mb8" type="flex" justify="space-between" align="middle">
           <span style="font-size: 16px; font-weight: 500">销售发票信息列表</span>
           <div style="display: flex; flex-wrap: nowrap; gap: 10px">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['bill:statementInvoice:add']">新增</el-button>
+            <!-- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['bill:statementInvoice:add']">新增</el-button> -->
           </div>
         </el-row>
       </template>
@@ -72,7 +72,7 @@
             <span>{{ parseTime(scope.row.invoiceTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="客户名称" align="center" prop="customerName" />
+        <el-table-column label="伙伴商名称" align="center" prop="customerName" />
         <el-table-column label="开票金额" align="center" prop="invoiceAmount">
           <template #default="scope">
             <span>{{ Number(scope.row.invoiceAmount).toFixed(2) }}</span>

+ 6 - 5
src/views/bill/statementOrder/addDrawer.vue

@@ -26,13 +26,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="客户名称" prop="customerId">
+            <el-form-item label="伙伴商名称" prop="customerId">
               <el-select
                 v-model="form.customerId"
                 filterable
                 remote
                 reserve-keyword
-                placeholder="请输入客户名称"
+                placeholder="请输入伙伴商名称"
                 :remote-method="remoteSearchCustomer"
                 :loading="customerLoading"
                 clearable
@@ -254,6 +254,7 @@ const initFormData: StatementOrderForm = {
   statementDate: undefined,
   annexAddress: undefined,
   rejectRemark: undefined,
+  statementType: '',
   remark: undefined,
   detailList: [],
   productList: []
@@ -275,7 +276,7 @@ const form = ref<
 >({ ...initFormData });
 
 const rules = reactive({
-  customerName: [{ required: true, message: '请输入客户名称', trigger: 'blur' }],
+  customerName: [{ required: true, message: '请输入伙伴商名称', trigger: 'blur' }],
   statementSelfId: [{ required: true, message: '请选择对账人', trigger: 'blur' }],
   statementSelfPhone: [
     { required: true, message: '请输入对账人手机号', trigger: 'blur' },
@@ -435,7 +436,7 @@ const preloadOrders = async (customerId: string | number) => {
 /** 选择订单 */
 const handleSelectOrder = () => {
   if (!form.value.customerId) {
-    proxy?.$modal.msgWarning('请先选择客户');
+    proxy?.$modal.msgWarning('请先选择伙伴商');
     return;
   }
   // 传递当前已选中的订单、产品列表、预加载的订单列表和总数
@@ -522,7 +523,7 @@ const handleOrderSelected = (data: any) => {
 /** 添加对账明细 */
 const handleAddDetail = () => {
   if (!form.value.customerId) {
-    proxy?.$modal.msgWarning('请先选择客户');
+    proxy?.$modal.msgWarning('请先选择伙伴商');
     return;
   }
   // 传递当前已选中的订单、产品列表、预加载的订单列表和总数

+ 3 - 2
src/views/bill/statementOrder/detailDrawer.vue

@@ -25,7 +25,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="客户名称:" prop="customerName">
+            <el-form-item label="伙伴商名称:" prop="customerName">
               <el-input v-model="form.customerName" disabled />
             </el-form-item>
           </el-col>
@@ -211,6 +211,7 @@ const initFormData: StatementOrderForm = {
   statementDate: undefined,
   annexAddress: undefined,
   rejectRemark: undefined,
+  statementType: '2',
   remark: undefined,
   detailList: [],
   productList: []
@@ -232,7 +233,7 @@ const form = ref<
 >({ ...initFormData });
 
 const rules = reactive({
-  customerName: [{ required: true, message: '请输入客户名称', trigger: 'blur' }],
+  customerName: [{ required: true, message: '请输入伙伴商名称', trigger: 'blur' }],
   statementSelfId: [{ required: true, message: '请选择对账人', trigger: 'blur' }],
   statementSelfPhone: [
     { required: true, message: '请输入对账人手机号', trigger: 'blur' },

+ 1 - 1
src/views/bill/statementOrder/orderMainDrawer.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 客户订单抽屉 -->
+  <!-- 伙伴商订单抽屉 -->
   <el-drawer v-model="drawer.visible" title="对账单信息" size="68%" direction="rtl" :before-close="handleDrawerClose" :close-on-click-modal="true">
     <div class="drawer-content">
       <el-table ref="tableRef" v-loading="loading" :data="orderList" border @selection-change="handleSelectionChange">