fix: 修改合作加盟

src/pages/index/contact_us/join_apply/components/DetailJoinApplyDialog.vue

@@ -1,100 +1,39 @@
 <template>
-  <el-dialog
+  <el-dialog v-model="props.modelValue" title="加盟申请详情" width="900px" @closed="closeDialog" @open="openDialog">
-    v-model="props.modelValue"
-    title="加盟申请详情"
-    width="900px"
-    @closed="closeDialog"
-    @open="openDialog"
-  >
     <el-form ref="formRef" :model="formData" :disabled="true">
       <el-row>
+
         <el-col :span="12">
-          <el-form-item
+          <el-form-item :label-width="labelWidth" label="名字" prop="join_apply_user_name">
-            :label-width="labelWidth"
+            <el-input v-model="formData.join_apply_user_name" type="text"></el-input>
-            label="加盟申请用户名字"
+          </el-form-item>
-            prop="join_apply_user_name"
+        </el-col>
-          >
+
-            <el-input
+        <el-col :span="12">
-              v-model="formData.join_apply_user_name"
+          <el-form-item :label-width="labelWidth" label="电话" prop="join_apply_user_phone">
-              type="text"
+            <el-input v-model="formData.join_apply_user_phone" type="text"></el-input>
-              placeholder="请输入加盟申请用户名字"
+          </el-form-item>
-            ></el-input>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item :label-width="labelWidth" label="所在地区" prop="join_apply_user_area">
+            <el-input v-model="formData.join_apply_user_area" type="text"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item :label-width="labelWidth" label="所属机构名称" prop="join_apply_user_org">
+            <el-input v-model="formData.join_apply_user_org" type="text"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
+          <el-form-item :label-width="labelWidth" label="职位" prop="join_apply_user_position">
-            :label-width="labelWidth"
+            <el-input v-model="formData.join_apply_user_position" type="text"></el-input>
-            label="加盟申请用户电话"
-            prop="join_apply_user_phone"
-          >
-            <el-input
-              v-model="formData.join_apply_user_phone"
-              type="text"
-              placeholder="请输入加盟申请用户电话"
-            ></el-input>
-          </el-form-item>
-     
-        <el-col :span="12">
-          <el-form-item
-            :label-width="labelWidth"
-            label="加盟申请用户所在地区"
-            prop="join_apply_user_area"
-          >
-            <el-input
-              v-model="formData.join_apply_user_area"
-              type="text"
-              placeholder="请输入加盟申请用户所在地区"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-      </el-col>
-  
-        <el-col :span="12">
-          <el-form-item
-            :label-width="labelWidth"
-            label="加盟申请用户所属机构名称"
-            prop="join_apply_user_org"
-          >
-            <el-input
-              v-model="formData.join_apply_user_org"
-              type="text"
-              placeholder="请输入加盟申请用户所属机构名称"
-            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
+          <el-form-item :label-width="labelWidth" label="受理状态" prop="join_apply_status">
-            label="加盟申请用户职位"
+            <dict-tag :options="processing_state" :value="formData.join_apply_status" />
-            prop="join_apply_user_position"
-          >
-            <el-select
-              v-model="formData.join_apply_user_position"
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in join_apply_user_position"
-                :key="item.dictionary_guid"
-                :label="item.dictionary_name"
-                :value="item.dictionary_value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="加盟申请受理状态" prop="join_apply_status">
-            <el-select
-              v-model="formData.join_apply_status"
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in processing_state"
-                :key="item.dictionary_guid"
-                :label="item.dictionary_name"
-                :value="item.dictionary_value"
-              ></el-option>
-            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -104,22 +43,12 @@
 
 <script setup>
 import { reactive, ref, watch } from 'vue';
-import { isEmptyObject } from '~/utils/index';
 import { getDictionary } from '~/service/join_apply';
 
 // --业务参数
 
 // --业务方法
 
-// 字典获取
-const join_apply_user_position = ref([]);
-async function get_join_apply_user_position() {
-  await getDictionary({ dictionary_value: 'join_apply_user_position' }).then(
-    res => {
-      join_apply_user_position.value = res;
-    }
-  );
-}
 // 字典获取
 const processing_state = ref([]);
 async function get_processing_state() {
@@ -149,7 +78,6 @@ watch(props, v => {
 
 // 打开弹窗时执行
 const openDialog = () => {
-  get_join_apply_user_position();
   get_processing_state();
 };
 

src/pages/index/contact_us/join_apply/index.vue

@@ -6,36 +6,16 @@
   </el-breadcrumb>
   <!-- 搜索 -->
   <el-form inline :model="params">
-    <el-form-item label="加盟申请用户名字">
+    <el-form-item label="用户名字">
-      <el-input
+      <el-input v-model="params.join_apply_user_name" placeholder="请输入用户名字"></el-input>
-        v-model="params.join_apply_user_name"
-        placeholder="请输入加盟申请用户名字"
-      ></el-input>
     </el-form-item>
-    <el-form-item label="加盟申请用户电话">
+    <el-form-item label="用户电话">
-      <el-input
+      <el-input v-model="params.join_apply_user_phone" placeholder="请输入用户电话"></el-input>
-        v-model="params.join_apply_user_phone"
-        placeholder="请输入加盟申请用户电话"
-      ></el-input>
     </el-form-item>
-    <el-form-item label="加盟申请职位">
+    <el-form-item label="受理状态">
-      <el-input
+      <el-select v-model="params.join_apply_status" clearable placeholder="请选择">
-        v-model="params.join_apply_user_position"
+        <el-option v-for="item in processing_state" :key="item.dictionary_guid" :label="item.dictionary_name"
-        placeholder="请输入加盟申请职位"
+          :value="item.dictionary_value"></el-option>
-      ></el-input>
-    </el-form-item>
-    <el-form-item label="加盟申请受理状态">
-      <el-select
-        v-model="params.join_apply_status"
-        clearable
-        placeholder="请选择"
-      >
-        <el-option
-          v-for="item in processing_state"
-          :key="item.dictionary_guid"
-          :label="item.dictionary_name"
-          :value="item.dictionary_value"
-        ></el-option>
       </el-select>
     </el-form-item>
     <el-form-item>
@@ -45,7 +25,7 @@
     </el-form-item>
   </el-form>
   <el-space style="margin-bottom: 10px">
-    <!-- 添加加盟申请 -->
+    <!-- 添加 -->
     <!-- <el-col :span="1">
       <el-button type="primary" @click="addJoinApplyDialogVisible = true">
         添加
@@ -53,9 +33,7 @@
     </el-col> -->
 
     <!-- 导出 -->
-    <el-button icon="ElIconDocument" @click="exportExcel(params)"
+    <el-button icon="ElIconDocument" @click="exportExcel(params)">导出</el-button>
-      >导出</el-button
-    >
 
     <!-- 下拉操作 -->
     <el-dropdown v-if="selectionData.length">
@@ -72,21 +50,12 @@
     </el-dropdown>
   </el-space>
   <!-- 数据表格 -->
-  <DataTable
+  <DataTable ref="tableRef" style="width: 100%" :onSelectionChange="data => (selectionData = data)" :column="column"
-    ref="tableRef"
+    :params="params" :request="params => getJoinApplyList(params)">
-    style="width: 100%"
-    :onSelectionChange="data => (selectionData = data)"
-    :column="column"
-    :params="params"
-    :request="params => getJoinApplyList(params)"
-  >
 
 
     <template #join_apply_status="scope">
-      <dict-tag
+      <dict-tag :options="processing_state" :value="scope.row.join_apply_status" />
-        :options="processing_state"
-        :value="scope.row.join_apply_status"
-      />
     </template>
 
     <template #chaoz="scope">
@@ -117,21 +86,12 @@
   </DataTable>
 
   <!-- 添加加盟申请 -->
-  <AddJoinApplyDialog
+  <AddJoinApplyDialog v-model="addJoinApplyDialogVisible" :done="() => tableRef.reload()"></AddJoinApplyDialog>
-    v-model="addJoinApplyDialogVisible"
-    :done="() => tableRef.reload()"
-  ></AddJoinApplyDialog>
   <!-- 编辑加盟申请 -->
-  <EditJoinApplyDialog
+  <EditJoinApplyDialog v-model="EditJoinApplyDialogVisible" :data="EditJoinApplyDialogRow"
-    v-model="EditJoinApplyDialogVisible"
+    :done="() => tableRef.reload()"></EditJoinApplyDialog>
-    :data="EditJoinApplyDialogRow"
-    :done="() => tableRef.reload()"
-  ></EditJoinApplyDialog>
   <!-- 加盟申请详情 -->
-  <DetailJoinApplyDialog
+  <DetailJoinApplyDialog v-model="DetailJoinApplyDialogVisible" :data="DetailJoinApplyDialogRow"></DetailJoinApplyDialog>
-    v-model="DetailJoinApplyDialogVisible"
-    :data="DetailJoinApplyDialogRow"
-  ></DetailJoinApplyDialog>
 </template>
 <script setup>
 import { ArrowDown } from '@element-plus/icons-vue';
@@ -167,7 +127,6 @@ const headers = {
 const params = reactive({
   join_apply_user_name: '',
   join_apply_user_phone: '',
-  join_apply_user_position: '',
   join_apply_status: ''
 });
 const column = [
@@ -177,32 +136,32 @@ const column = [
   },
   {
     prop: 'join_apply_user_name',
-    label: '加盟申请用户名字',
+    label: '用户名字',
     width: '150'
   },
   {
     prop: 'join_apply_user_phone',
-    label: '加盟申请用户电话',
+    label: '用户电话',
     width: '150'
   },
   {
     prop: 'join_apply_user_position',
-    label: '加盟申请用户职位',
+    label: '用户职位',
     width: '150'
   },
   {
     prop: 'join_apply_user_area',
-    label: '加盟申请用户所在地区',
+    label: '用户所在地区',
     width: '150'
   },
   {
     prop: 'join_apply_user_org',
-    label: '加盟申请用户所属机构名称',
+    label: '用户所属机构名称',
     width: '150'
   },
   {
     prop: 'join_apply_status',
-    label: '加盟申请受理状态',
+    label: '受理状态',
     width: '150'
   },
   {
@@ -237,7 +196,7 @@ const HandleLoading = () => {
 };
 const closeUploadLoading = () => loadingHandle.close();
 const handleStatusUpdate = (data) => {
-  ElMessageBox.confirm(`您确定已对所选的在线报名处理了吗？`).then(async () => {
+  ElMessageBox.confirm(`您确定已对所选的合作加盟受理了吗？`).then(async () => {
     HandleLoading()
     const { code, msg } = await handlejoin_applyStatus({
       join_apply_guid: data.map(v => v.join_apply_guid).join()