From 718221a7e5b4ca25d2c1ccfbbfd3972d71692705 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 21 May 2024 13:38:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/supplier/audit/edit.vue        | 52 +++++++++----------
 src/views/data/supplier/audit/index.vue       | 26 +++++-----
 .../data/supplier/supplier/bindGoods.vue      |  8 +--
 src/views/data/supplier/supplier/detail.vue   | 18 +++----
 src/views/data/supplier/supplier/edit.vue     | 52 +++++++++----------
 src/views/opurchase/opurchaseclass/index.vue  | 10 ++++
 6 files changed, 88 insertions(+), 78 deletions(-)

diff --git a/src/views/data/supplier/audit/edit.vue b/src/views/data/supplier/audit/edit.vue
index b6e0a0d..c7fe7f3 100644
--- a/src/views/data/supplier/audit/edit.vue
+++ b/src/views/data/supplier/audit/edit.vue
@@ -4,26 +4,26 @@
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
                 <el-row>
                     <el-col :span="24">
-                        <el-form-item label="商户头像" prop="mer_avatar">
+                        <el-form-item label="供应商头像" prop="mer_avatar">
                             <material-picker v-model="formData.mer_avatar" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户名称" prop="mer_name">
-                            <el-input v-model="formData.mer_name" clearable placeholder="请输入商户名称" :readonly="false" />
+                        <el-form-item label="供应商名称" prop="mer_name">
+                            <el-input v-model="formData.mer_name" clearable placeholder="请输入供应商名称" :readonly="false" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户分类" prop="category_id">
-                            <el-select class="flex-1" v-model="formData.category_id" clearable placeholder="请选择店铺类型">
+                        <el-form-item label="供应商分类" prop="category_id">
+                            <el-select class="flex-1" v-model="formData.category_id" clearable placeholder="请选择供应商类型">
                                 <el-option v-for="(item, index) in dictData.mer_category_type" :key="index"
                                     :label="item.name" :value="parseInt(item.value)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="店铺类型" prop="type_id">
-                            <el-select class="flex-1" v-model="formData.type_id" clearable placeholder="请选择店铺类型">
+                        <el-form-item label="供应商类型" prop="type_id">
+                            <el-select class="flex-1" v-model="formData.type_id" clearable placeholder="请选择供应商类型">
                                 <el-option v-for="(item, index) in dictData.merchat_type" :key="index" :label="item.name"
                                     :value="parseInt(item.value)" />
                             </el-select>
@@ -78,13 +78,13 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户地址" prop="mer_address">
-                            <el-input v-model="formData.mer_address" clearable placeholder="请输入商户地址" :readonly="false" />
+                        <el-form-item label="供应商地址" prop="mer_address">
+                            <el-input v-model="formData.mer_address" clearable placeholder="请输入供应商地址" :readonly="false" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户是否禁用" prop="status">
-                            <el-radio-group v-model="formData.status" placeholder="请选择商户是否禁用" :disabled="false">
+                        <el-form-item label="供应商是否禁用" prop="status" label-width="160px">
+                            <el-radio-group v-model="formData.status" placeholder="请选择供应商是否禁用" :disabled="false">
                                 <el-radio v-for="(item, index) in dictData.show_status" :key="index"
                                     :label="parseInt(item.value)">
                                     {{ item.name }}
@@ -99,8 +99,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户手续费单独设置" prop="commission_switch" label-width="180px">
-                            <el-radio-group v-model="formData.commission_switch" placeholder="请选择商户手续费单独设置"
+                        <el-form-item label="供应商手续费单独设置" prop="commission_switch" label-width="180px">
+                            <el-radio-group v-model="formData.commission_switch" placeholder="请选择供应商手续费单独设置"
                                 :disabled="false">
                                 <el-radio v-for="(item, index) in dictData.show_status" :key="index"
                                     :label="parseInt(item.value)">
@@ -127,18 +127,18 @@
 
 
                     <el-col :span="8">
-                        <el-form-item label="店铺电话" prop="service_phone">
-                            <el-input v-model="formData.service_phone" clearable placeholder="请输入店铺电话" :readonly="false" />
+                        <el-form-item label="供应商电话" prop="service_phone">
+                            <el-input v-model="formData.service_phone" clearable placeholder="请输入供应商电话" :readonly="false" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户余额" prop="mer_money">
-                            <el-input v-model="formData.mer_money" clearable placeholder="请输入商户余额" :readonly="false" />
+                        <el-form-item label="供应商余额" prop="mer_money">
+                            <el-input v-model="formData.mer_money" clearable placeholder="请输入供应商余额" :readonly="false" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户备注" prop="mark">
-                            <el-input v-model="formData.mark" clearable placeholder="请输入商户备注" type="textarea"
+                        <el-form-item label="供应商备注" prop="mark">
+                            <el-input v-model="formData.mark" clearable placeholder="请输入供应商备注" type="textarea"
                                 :readonly="false" />
                         </el-form-item>
                     </el-col>
@@ -258,12 +258,12 @@ const customEvent = (e) => {
 const formRules = reactive<any>({
     category_id: [{
         required: true,
-        message: '请输入商户分类 id',
+        message: '请输入供应商分类 id',
         trigger: ['blur']
     }],
     mer_name: [{
         required: true,
-        message: '请输入商户名称',
+        message: '请输入供应商名称',
         trigger: ['blur']
     }],
     settle_cycle: [{
@@ -278,27 +278,27 @@ const formRules = reactive<any>({
     }],
     mer_address: [{
         required: true,
-        message: '请输入商户地址',
+        message: '请输入供应商地址',
         trigger: ['blur']
     }],
     mark: [{
         required: true,
-        message: '请输入商户备注',
+        message: '请输入供应商备注',
         trigger: ['blur']
     }],
     status: [{
         required: true,
-        message: '请选择商户是否禁用0锁定,1正常',
+        message: '请选择供应商是否禁用0锁定,1正常',
         trigger: ['blur']
     }],
     service_phone: [{
         required: true,
-        message: '请输入店铺电话',
+        message: '请输入供应商电话',
         trigger: ['blur']
     }],
     mer_money: [{
         required: true,
-        message: '请输入商户余额',
+        message: '请输入供应商余额',
         trigger: ['blur']
     }]
 })
diff --git a/src/views/data/supplier/audit/index.vue b/src/views/data/supplier/audit/index.vue
index cc927b8..bf6828c 100644
--- a/src/views/data/supplier/audit/index.vue
+++ b/src/views/data/supplier/audit/index.vue
@@ -4,24 +4,24 @@
             <el-form class="mb-[-16px]" :model="queryParams" label-width="120px">
                 <el-row>
                     <el-col :span="6">
-                        <el-form-item label="商户分类" prop="category_id">
-                            <el-select v-model="queryParams.category_id" clearable placeholder="请选择店铺类型">
+                        <el-form-item label="供应商分类" prop="category_id">
+                            <el-select v-model="queryParams.category_id" clearable placeholder="请选择供应商类型">
                                 <el-option v-for="(item, index) in dictData.mer_category_type" :key="index"
                                     :label="item.name" :value="parseInt(item.value)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="店铺类型" prop="type_id">
-                            <el-select v-model="queryParams.type_id" clearable placeholder="请选择店铺类型">
+                        <el-form-item label="供应商类型" prop="type_id">
+                            <el-select v-model="queryParams.type_id" clearable placeholder="请选择供应商类型">
                                 <el-option v-for="(item, index) in dictData.merchat_type" :key="index" :label="item.name"
                                     :value="parseInt(item.value)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="商户名称" prop="mer_name">
-                            <el-input v-model="queryParams.mer_name" clearable placeholder="请输入商户名称" />
+                        <el-form-item label="供应商名称" prop="mer_name">
+                            <el-input v-model="queryParams.mer_name" clearable placeholder="请输入供应商名称" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
@@ -39,37 +39,37 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <!-- <el-table-column type="selection" width="55" /> -->
-                    <!-- <el-table-column label="商户分类" prop="category_id" show-overflow-tooltip>
+                    <!-- <el-table-column label="供应商分类" prop="category_id" show-overflow-tooltip>
                         <template #default="{ row }">
                             <dict-value :options="dictData.mer_category_type" :value="row.category_id" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="店铺类型" prop="type_id" show-overflow-tooltip>
+                    <el-table-column label="供应商类型" prop="type_id" show-overflow-tooltip>
                         <template #default="{ row }">
                             <dict-value :options="dictData.merchat_type" :value="row.type_id" />
                         </template>
                     </el-table-column> -->
                     <el-table-column label="ID" prop="id" width="100" show-overflow-tooltip />
-                    <el-table-column label="商户名称" prop="supplier.mer_name" show-overflow-tooltip />
+                    <el-table-column label="供应商名称" prop="supplier.mer_name" show-overflow-tooltip />
                     <el-table-column label="联系人" prop="supplier.service_user" show-overflow-tooltip />
                     <el-table-column label="联系电话" prop="supplier.service_phone" show-overflow-tooltip />
                     <el-table-column label="创建时间" prop="supplier.create_time" show-overflow-tooltip />
                     <!-- <el-table-column label="结算周期(天)" prop="settle_cycle" show-overflow-tooltip /> -->
                     <!-- <el-table-column label="利率" prop="interest_rate" show-overflow-tooltip /> -->
                     <!-- <el-table-column label="标签" prop="sys_labels_text" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="商户地址" prop="mer_address" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="商户是否禁用" prop="status">
+                    <!-- <el-table-column label="供应商地址" prop="mer_address" show-overflow-tooltip /> -->
+                    <!-- <el-table-column label="供应商是否禁用" prop="status">
                         <template #default="{ row }">
                             <dict-value :options="dictData.show_status" :value="row.status" />
                         </template>
                     </el-table-column> -->
                     <!-- <el-table-column label="提成比例" prop="commission_rate" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="商户手续费单独设置" width="200" prop="commission_switch">
+                    <!-- <el-table-column label="供应商手续费单独设置" width="200" prop="commission_switch">
                         <template #default="{ row }">
                             {{ row.commission_switch ? "开启" : "关闭" }}
                         </template>
                     </el-table-column> -->
-                    <!-- <el-table-column label="商户余额" prop="mer_money" show-overflow-tooltip /> -->
+                    <!-- <el-table-column label="供应商余额" prop="mer_money" show-overflow-tooltip /> -->
                     <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
                             <el-button v-if="!row.status" link type="primary" @click="handleDetail(row)">
diff --git a/src/views/data/supplier/supplier/bindGoods.vue b/src/views/data/supplier/supplier/bindGoods.vue
index cb1c829..456125a 100644
--- a/src/views/data/supplier/supplier/bindGoods.vue
+++ b/src/views/data/supplier/supplier/bindGoods.vue
@@ -4,8 +4,8 @@
             <el-form class="mb-[-16px]" :model="queryParams" label-width="160px">
                 <el-row>
                     <el-col :span="6">
-                        <el-form-item label="商户分类" prop="category_id">
-                            <el-select class="w-[280px]" v-model="queryParams.category_id" clearable placeholder="请选择商户分类">
+                        <el-form-item label="供应商分类" prop="category_id">
+                            <el-select class="w-[280px]" v-model="queryParams.category_id" clearable placeholder="请选择供应商分类">
                                 <el-option label="全部" value=""></el-option>
                                 <el-option v-for="(item, index) in dictData.mer_category_type" :key="index"
                                     :label="item.name" :value="item.value" />
@@ -13,8 +13,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="店铺类型" prop="type_id">
-                            <el-select class="w-[280px]" v-model="queryParams.type_id" clearable placeholder="请选择店铺类型">
+                        <el-form-item label="供应商类型" prop="type_id">
+                            <el-select class="w-[280px]" v-model="queryParams.type_id" clearable placeholder="请选择供应商类型">
                                 <el-option label="全部" value=""></el-option>
                                 <el-option v-for="(item, index) in dictData.merchat_type" :key="index" :label="item.name"
                                     :value="item.value" />
diff --git a/src/views/data/supplier/supplier/detail.vue b/src/views/data/supplier/supplier/detail.vue
index c918c31..c2a80ba 100644
--- a/src/views/data/supplier/supplier/detail.vue
+++ b/src/views/data/supplier/supplier/detail.vue
@@ -2,16 +2,16 @@
     <div class="edit-popup">
         <popup ref="popupRef" :async="true" width="60vw" @close="handleClose" :bottom-btn="false">
             <el-descriptions class="margin-top" :title="popupTitle" :column="3" border>
-                <el-descriptions-item label="商户头像">
+                <el-descriptions-item label="供应商头像">
                     <material-picker v-model="formData.mer_avatar" disabled />
                 </el-descriptions-item>
-                <el-descriptions-item label="商户名称">
+                <el-descriptions-item label="供应商名称">
                     {{ formData.mer_name }}
                 </el-descriptions-item>
-                <el-descriptions-item label="商户分类">
+                <el-descriptions-item label="供应商分类">
                     <dict-value :options="dictData.mer_category_type" :value="formData.category_id" />
                 </el-descriptions-item>
-                <el-descriptions-item label="店铺类型">
+                <el-descriptions-item label="供应商类型">
                     <dict-value :options="dictData.merchat_type" :value="formData.type_id" />
                 </el-descriptions-item>
                 <el-descriptions-item label="结算周期(天)">
@@ -35,16 +35,16 @@
                 <el-descriptions-item label="村">
                     {{ formData.village_name }}
                 </el-descriptions-item>
-                <el-descriptions-item label="商户地址">
+                <el-descriptions-item label="供应商地址">
                     {{ formData.mer_address }}
                 </el-descriptions-item>
-                <el-descriptions-item label="商户是否禁用">
+                <el-descriptions-item label="供应商是否禁用">
                     <dict-value :options="dictData.show_status" :value="formData.status" />
                 </el-descriptions-item>
                 <el-descriptions-item label="提成比例">
                     {{ formData.commission_rate }}
                 </el-descriptions-item>
-                <el-descriptions-item label="商户手续费单独设置">
+                <el-descriptions-item label="供应商手续费单独设置">
                     <dict-value :options="dictData.show_status" :value="formData.commission_switch" />
                 </el-descriptions-item>
                 <el-descriptions-item label="经度">
@@ -53,10 +53,10 @@
                 <el-descriptions-item label="纬度">
                     {{ formData.lat }}
                 </el-descriptions-item>
-                <el-descriptions-item label="店铺电话">
+                <el-descriptions-item label="供应商电话">
                     {{ formData.service_phone }}
                 </el-descriptions-item>
-                <el-descriptions-item label="商户余额">
+                <el-descriptions-item label="供应商余额">
                     {{ formData.mer_money }}
                 </el-descriptions-item>
                 <el-descriptions-item label="银行卡转账信息">
diff --git a/src/views/data/supplier/supplier/edit.vue b/src/views/data/supplier/supplier/edit.vue
index 28a3b6b..20ae55b 100644
--- a/src/views/data/supplier/supplier/edit.vue
+++ b/src/views/data/supplier/supplier/edit.vue
@@ -4,26 +4,26 @@
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
                 <el-row>
                     <el-col :span="24">
-                        <el-form-item label="商户头像" prop="mer_avatar">
+                        <el-form-item label="供应商头像" prop="mer_avatar">
                             <material-picker v-model="formData.mer_avatar" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户名称" prop="mer_name">
-                            <el-input v-model="formData.mer_name" clearable placeholder="请输入商户名称" :readonly="false" />
+                        <el-form-item label="供应商名称" prop="mer_name">
+                            <el-input v-model="formData.mer_name" clearable placeholder="请输入供应商名称" :readonly="false" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户分类" prop="category_id">
-                            <el-select class="flex-1" v-model="formData.category_id" clearable placeholder="请选择店铺类型">
+                        <el-form-item label="供应商分类" prop="category_id">
+                            <el-select class="flex-1" v-model="formData.category_id" clearable placeholder="请选择供应商类型">
                                 <el-option v-for="(item, index) in dictData.mer_category_type" :key="index"
                                     :label="item.name" :value="parseInt(item.value)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="店铺类型" prop="type_id">
-                            <el-select class="flex-1" v-model="formData.type_id" clearable placeholder="请选择店铺类型">
+                        <el-form-item label="供应商类型" prop="type_id">
+                            <el-select class="flex-1" v-model="formData.type_id" clearable placeholder="请选择供应商类型">
                                 <el-option v-for="(item, index) in dictData.merchat_type" :key="index" :label="item.name"
                                     :value="parseInt(item.value)" />
                             </el-select>
@@ -78,13 +78,13 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户地址" prop="mer_address">
-                            <el-input v-model="formData.mer_address" clearable placeholder="请输入商户地址" :readonly="false" />
+                        <el-form-item label="供应商地址" prop="mer_address">
+                            <el-input v-model="formData.mer_address" clearable placeholder="请输入供应商地址" :readonly="false" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户是否禁用" prop="status">
-                            <el-radio-group v-model="formData.status" placeholder="请选择商户是否禁用" :disabled="false">
+                        <el-form-item label="供应商是否禁用" prop="status" label-width="160px">
+                            <el-radio-group v-model="formData.status" placeholder="请选择供应商是否禁用" :disabled="false">
                                 <el-radio v-for="(item, index) in dictData.show_status" :key="index"
                                     :label="parseInt(item.value)">
                                     {{ item.name }}
@@ -99,8 +99,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户手续费单独设置" prop="commission_switch" label-width="180px">
-                            <el-radio-group v-model="formData.commission_switch" placeholder="请选择商户手续费单独设置"
+                        <el-form-item label="供应商手续费单独设置" prop="commission_switch" label-width="180px">
+                            <el-radio-group v-model="formData.commission_switch" placeholder="请选择供应商手续费单独设置"
                                 :disabled="false">
                                 <el-radio v-for="(item, index) in dictData.show_status" :key="index"
                                     :label="parseInt(item.value)">
@@ -127,18 +127,18 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="店铺电话" prop="service_phone">
-                            <el-input v-model="formData.service_phone" clearable placeholder="请输入店铺电话" :readonly="false" />
+                        <el-form-item label="供应商电话" prop="service_phone">
+                            <el-input v-model="formData.service_phone" clearable placeholder="请输入供应商电话" :readonly="false" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户余额" prop="mer_money">
-                            <el-input v-model="formData.mer_money" clearable placeholder="请输入商户余额" :readonly="false" />
+                        <el-form-item label="供应商余额" prop="mer_money">
+                            <el-input v-model="formData.mer_money" clearable placeholder="请输入供应商余额" :readonly="false" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="商户备注" prop="mark">
-                            <el-input v-model="formData.mark" clearable placeholder="请输入商户备注" type="textarea"
+                        <el-form-item label="供应商备注" prop="mark">
+                            <el-input v-model="formData.mark" clearable placeholder="请输入供应商备注" type="textarea"
                                 :readonly="false" />
                         </el-form-item>
                     </el-col>
@@ -259,12 +259,12 @@ const customEvent = (e) => {
 const formRules = reactive<any>({
     category_id: [{
         required: true,
-        message: '请输入商户分类 id',
+        message: '请输入供应商分类 id',
         trigger: ['blur']
     }],
     mer_name: [{
         required: true,
-        message: '请输入商户名称',
+        message: '请输入供应商名称',
         trigger: ['blur']
     }],
     settle_cycle: [{
@@ -279,27 +279,27 @@ const formRules = reactive<any>({
     }],
     mer_address: [{
         required: true,
-        message: '请输入商户地址',
+        message: '请输入供应商地址',
         trigger: ['blur']
     }],
     mark: [{
         required: true,
-        message: '请输入商户备注',
+        message: '请输入供应商备注',
         trigger: ['blur']
     }],
     status: [{
         required: true,
-        message: '请选择商户是否禁用0锁定,1正常',
+        message: '请选择供应商是否禁用0锁定,1正常',
         trigger: ['blur']
     }],
     service_phone: [{
         required: true,
-        message: '请输入店铺电话',
+        message: '请输入供应商电话',
         trigger: ['blur']
     }],
     mer_money: [{
         required: true,
-        message: '请输入商户余额',
+        message: '请输入供应商余额',
         trigger: ['blur']
     }]
 })
diff --git a/src/views/opurchase/opurchaseclass/index.vue b/src/views/opurchase/opurchaseclass/index.vue
index fb19cd5..68657ec 100644
--- a/src/views/opurchase/opurchaseclass/index.vue
+++ b/src/views/opurchase/opurchaseclass/index.vue
@@ -56,6 +56,16 @@
         </template>
         打印
       </el-button>
+      <el-button
+        v-perms="['operation.opurchaseclass/add']"
+        type="success"
+        @click="onPrintOrder"
+      >
+        <template #icon>
+          <icon name="el-icon-Printer" />
+        </template>
+        测试
+      </el-button>
       <div class="mt-4">
         <el-table :data="pager.lists" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" />