up

src/views/customer/components/Oc.vue

@@ -8,6 +8,13 @@ import { ElMessage } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { createOc, getOcById, updateOc } from '@/api/system/ocApi'
 import OcCatSelector from '@/views/customer/components/OcCatSelector.vue'
+const props = withDefaults(defineProps<{
+  ocTypeId: number
+  modelValue: number
+}>(), {
+  ocTypeId: 0,
+  modelValue: 0,
+})
 const emit = defineEmits(['success'])
 
 const formRef = ref<FormInstance>()
@@ -27,11 +34,14 @@ const state = reactive({
   title: '',
   dialogVisible: false,
   loading: false,
+  ocTypeId: props.ocTypeId,
   formData: {
     ocId: 0,
     ocName: '',
     ocTypeId: 0,
+    ocTypeTitle: '',
     ocCatId: 0,
+    ocCatTitle: '',
     ocRemark: '',
   },
   actionType: 1,
@@ -42,8 +52,8 @@ onMounted(() => {})
 const getData = async (ocId: number) => {
   state.loading = true
   const { data } = await getOcById(ocId)
-  state.loading = false
   state.formData = data
+  state.loading = false
 }
 
 function onSubmit() {
@@ -73,23 +83,25 @@ function resetFormData() {
   state.formData = {
     ocId: 0,
     ocName: '',
-    ocTypeId: 0,
+    ocTypeId: 1,
+    ocTypeTitle: '',
     ocCatId: 0,
+    ocCatTitle: '',
     ocRemark: '',
   }
 }
 
 defineExpose({
-  showAddModel(ocTypeId: number){
+  showAddModel() {
     resetFormData()
-    state.title = '新增岗位'
+    state.title = '新增单位'
     state.actionType = 1
-    state.formData.ocTypeId = ocTypeId
     state.dialogVisible = true
   },
+
   showEditModel(ocId: number) {
     resetFormData()
-    state.title = '编辑岗位'
+    state.title = '编辑单位'
     state.actionType = 2
     state.dialogVisible = true
     getData(ocId)
@@ -101,11 +113,11 @@ defineExpose({
   <el-drawer v-model="state.dialogVisible" :title="state.title" width="600px" :close-on-click-modal="false" append-to-body destroy-on-close>
     <el-form ref="formRef" :model="state.formData" :rules="formRules" label-width="120px" label-suffix="：">
       <el-form-item label="单位名称" prop="ocName">
-        <el-input v-model="state.formData.positionName" placeholder="请输入标题" />
+        <el-input v-model="state.formData.ocName" placeholder="请输入标题" />
       </el-form-item>
 
       <el-form-item label="分类" prop="ocName">
-        <OcCatSelector v-model="state.formData.ocCatId" :oc-type-id="state.formData.ocTypeId" placeholder="请输入标题" />
+        <OcCatSelector v-model="state.formData.ocCatId" :oc-type-id="state.ocTypeId" placeholder="请输入标题" />
       </el-form-item>
 
       <el-form-item label="备注" prop="ocRemark">

src/views/customer/components/OcCatSelector.vue

@@ -28,6 +28,7 @@ const state = reactive({
 const getData = async () => {
   state.loading = true
   const ocTypeId = props.ocTypeId
+  window.console.log(`ocTypeId:${ocTypeId}`)
   const { data } = await getOcCatListById(ocTypeId)
   state.loading = false
   state.dataList = data

src/views/customer/ent/index.vue

@@ -3,7 +3,6 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import OcComponent from '../components/Oc.vue'
 import OcAdminComponent from '../components/OcAdmin.vue'
 import { deleteOcById, getOcByList, resetAdminPwd, updateLicStatus, updateStatus } from '@/api/system/ocApi'
-import { ocTypeFilter } from '@/utils/tool'
 
 const state = reactive({
   loading: false,
@@ -21,7 +20,7 @@ const state = reactive({
 
 const ocRef = ref()
 
-const getDataList = async () => {
+const getData = async () => {
   state.loading = true
   const { data } = await getOcByList(state.search)
   state.dataList = data
@@ -29,16 +28,15 @@ const getDataList = async () => {
 }
 
 onMounted(() => {
-  getDataList()
+  getData()
 })
 
 function onSearch() {
-  getDataList()
+  getData()
 }
 
 function onOcAdd() {
-  const ocTypeId = state.search.ocTypeId
-  ocRef.value.showAddModel(ocTypeId)
+  ocRef.value.showAddModel()
 }
 
 function onOcEdit(row: any) {
@@ -49,11 +47,8 @@ function onOcEdit(row: any) {
 function onOcDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.ocName}」吗？`, '确认信息').then(async () => {
     await deleteOcById(row.ocId)
-    await getDataList()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
+    await getData()
+    ElMessage.success('删除成功')
   }).catch(() => {})
 }
 
@@ -128,21 +123,9 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
           </template>
         </el-table-column>
 
-        <el-table-column prop="ocTypeId" label="类型" header-align="center" align="center" width="120">
-          <template #default="scope">
-            <span>{{ ocTypeFilter(scope.row.ocTypeId) }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="ocCatId" label="分类" header-align="center" align="center" width="120">
-          <template #default="scope">
-            <span>{{ scope.row.ocCatTitle }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="ocRemark" label="备注" header-align="center" align="left">
+        <el-table-column prop="ocCatId" label="分类" header-align="center" align="center" width="250">
           <template #default="scope">
-            <span>{{ scope.row.ocRemark }}</span>
+            <span>{{ scope.row.ocTypeTitle }}</span> - <span>{{ scope.row.ocCatTitle }}</span>
           </template>
         </el-table-column>
 
@@ -193,7 +176,13 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" header-align="center" align="center" width="220">
+        <el-table-column prop="ocRemark" label="备注" header-align="center" align="left">
+          <template #default="scope">
+            <span>{{ scope.row.ocRemark }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" header-align="center" align="center" width="160">
           <template #default="scope">
             <div>
               <el-button type="primary" size="small" plain @click="onOcEdit(scope.row)">
@@ -210,8 +199,8 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
         </el-table-column>
       </el-table>
     </page-main>
-    <OcComponent ref="ocRef" @success="getDataList" />
-    <OcAdminComponent ref="ocAdminRef" @success="getDataList" />
+    <OcComponent ref="ocRef" :oc-type-id="state.search.ocTypeId" @success="getData" />
+    <OcAdminComponent ref="ocAdminRef" @success="getData" />
   </div>
 </template>
 

src/views/customer/org/index.vue

@@ -3,7 +3,6 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import OcComponent from '../components/Oc.vue'
 import OcAdminComponent from '../components/OcAdmin.vue'
 import { deleteOcById, getOcByList, resetAdminPwd, updateLicStatus, updateStatus } from '@/api/system/ocApi'
-import { ocTypeFilter } from '@/utils/tool'
 
 const state = reactive({
   loading: false,
@@ -20,7 +19,7 @@ const state = reactive({
 
 const ocRef = ref()
 
-const getDataList = async () => {
+const getData = async () => {
   state.loading = true
   const { data } = await getOcByList(state.search)
   state.dataList = data
@@ -28,16 +27,15 @@ const getDataList = async () => {
 }
 
 onMounted(() => {
-  getDataList()
+  getData()
 })
 
 function onSearch() {
-  getDataList()
+  getData()
 }
 
 function onOcAdd() {
-  const ocTypeId = state.search.ocTypeId
-  ocRef.value.showAddModel(ocTypeId)
+  ocRef.value.showAddModel()
 }
 
 function onOcEdit(row: any) {
@@ -48,7 +46,7 @@ function onOcEdit(row: any) {
 function onOcDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.ocName}」吗？`, '确认信息').then(async () => {
     await deleteOcById(row.ocId)
-    await getDataList()
+    await getData()
     ElMessage.success({
       message: '删除成功',
       center: true,
@@ -124,21 +122,9 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
           </template>
         </el-table-column>
 
-        <el-table-column prop="ocTypeId" label="类型" header-align="center" align="center" width="120">
+        <el-table-column prop="ocCatId" label="类别" header-align="center" align="center" width="260">
           <template #default="scope">
-            <span>{{ ocTypeFilter(scope.row.ocTypeId) }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="ocCatId" label="分类" header-align="center" align="center" width="120">
-          <template #default="scope">
-            <span>{{ scope.row.ocCatTitle }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="ocRemark" label="备注" header-align="center" align="left">
-          <template #default="scope">
-            <span>{{ scope.row.ocRemark }}</span>
+            <span>{{ scope.row.ocTypeTitle }}</span>-<span>{{ scope.row.ocCatTitle }}</span>
           </template>
         </el-table-column>
 
@@ -189,7 +175,13 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" header-align="center" align="center" width="220">
+        <el-table-column prop="ocRemark" label="备注" header-align="center" align="left">
+          <template #default="scope">
+            <span>{{ scope.row.ocRemark }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" header-align="center" align="center" width="160">
           <template #default="scope">
             <div>
               <el-button type="primary" size="small" plain @click="onOcEdit(scope.row)">
@@ -206,8 +198,8 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
         </el-table-column>
       </el-table>
     </page-main>
-    <OcComponent ref="ocRef" @success="getDataList" />
-    <OcAdminComponent ref="ocAdminRef" @success="getDataList" />
+    <OcComponent ref="ocRef" :oc-type-id="state.search.ocTypeId" @success="getData" />
+    <OcAdminComponent ref="ocAdminRef" @success="getData" />
   </div>
 </template>
 

src/views/customer/partner/index.vue

@@ -3,7 +3,6 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import OcComponent from '../components/Oc.vue'
 import OcAdminComponent from '../components/OcAdmin.vue'
 import { deleteOcById, getOcByList, resetAdminPwd, updateLicStatus, updateStatus } from '@/api/system/ocApi'
-import { ocTypeFilter } from '@/utils/tool'
 
 const state = reactive({
   loading: false,
@@ -20,7 +19,7 @@ const state = reactive({
 
 const ocRef = ref()
 
-const getDataList = async () => {
+const getData = async () => {
   state.loading = true
   const { data } = await getOcByList(state.search)
   state.dataList = data
@@ -28,16 +27,15 @@ const getDataList = async () => {
 }
 
 onMounted(() => {
-  getDataList()
+  getData()
 })
 
 function onSearch() {
-  getDataList()
+  getData()
 }
 
 function onOcAdd() {
-  const ocTypeId = state.search.ocTypeId
-  ocRef.value.showAddModel(ocTypeId)
+  ocRef.value.showAddModel()
 }
 
 function onOcEdit(row: any) {
@@ -49,7 +47,7 @@ function onOcDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.ocName}」吗？`, '确认信息').then(async () => {
     const { msg } = await deleteOcById(row.ocId)
     ElMessage.success(msg)
-    await getDataList()
+    await getData()
   }).catch(() => {})
 }
 
@@ -121,21 +119,9 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
           </template>
         </el-table-column>
 
-        <el-table-column prop="ocTypeId" label="类型" header-align="center" align="center" width="120">
+        <el-table-column prop="ocCatId" label="分类" header-align="center" align="center" width="260">
           <template #default="scope">
-            <span>{{ ocTypeFilter(scope.row.ocTypeId) }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="ocCatId" label="分类" header-align="center" align="center" width="120">
-          <template #default="scope">
-            <span>{{ scope.row.ocCatTitle }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="ocRemark" label="备注" header-align="center" align="left">
-          <template #default="scope">
-            <span>{{ scope.row.ocRemark }}</span>
+            <span>{{ scope.row.ocTypeTitle }}</span> - <span>{{ scope.row.ocCatTitle }}</span>
           </template>
         </el-table-column>
 
@@ -186,7 +172,13 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" header-align="center" align="center" width="220">
+        <el-table-column prop="ocRemark" label="备注" header-align="center" align="left">
+          <template #default="scope">
+            <span>{{ scope.row.ocRemark }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" header-align="center" align="center" width="160">
           <template #default="scope">
             <div>
               <el-button type="primary" size="small" plain @click="onOcEdit(scope.row)">
@@ -203,8 +195,8 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
         </el-table-column>
       </el-table>
     </page-main>
-    <OcComponent ref="ocRef" @success="getDataList" />
-    <OcAdminComponent ref="ocAdminRef" @success="getDataList" />
+    <OcComponent ref="ocRef" :oc-type-id="state.search.ocTypeId" @success="getData" />
+    <OcAdminComponent ref="ocAdminRef" @success="getData" />
   </div>
 </template>