Merge pull request 'master' (#946) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/946
2025-03-08 09:48:33 +00:00
parent e2de62e54a 97e9799b1a
commit d0dc8ba9f8
5 changed files with 330 additions and 180 deletions
--- a/src/api/user/user.js
+++ b/src/api/user/user.js
@@ -233,3 +233,19 @@ export const editAgentInfo=(data)=>{
    data
  })
 }
+
+export const addWhiteUser=(data)=>{
+  return request({
+    url:'/admin/approve/white',
+    method:'post',
+    data
+  })
+}
+
+export const delWhiteUser=(data)=>{
+  return request({
+    url:'/admin/approve/white',
+    method:'delete',
+    data
+  })
+}
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -1,56 +1,6 @@
 <template>
-  <el-form ref="formRef" :model="selectForm" class="search-form select-form" style="margin-top: 18px;margin-left: 16px">
-    <el-row>
-      <el-col :span="5">
-        <el-form-item prop="requirementName" label="征集名称">
-<!--          <el-input v-model="selectForm.requirementName" placeholder="请输入征集名称" clearable @keyup.enter.native="getList"-->
-<!--                    style="width: 100%"/>-->
-          <el-select v-model="selectForm.requirementName" placeholder="请输入征集名称"  filterable clearable remote :remote-method="getRequirementName"
-                       style="width: 100%" @change="changeName" >
-            <el-option
-                v-for="item in requirementNameOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="5" :offset="1">
-        <el-form-item prop="collectType" label="征集类型">
-          <el-select v-model="selectForm.collectType" ref="collectTypeSelectRef" placeholder="请选择征集类型" clearable
-                     filterable remote
-                     @change="getList">
-            <el-option
-                v-for="item in cacheStore.getDict('collect_type')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="5" :offset="1">
-        <el-form-item prop="state" label="状态">
-          <el-select v-model="selectForm.state" placeholder="请选择状态" clearable filterable @change="getList" remote
-                     @visible-change="selectOptionVisibleChange">
-            <el-option
-                v-for="item in stateOption"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6" :offset="1">
-        <el-form-item>
-          <el-button color="#DED0B2" @click="getList" :icon="Search">搜索</el-button>
-          <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
+  <fvSearchForm :searchConfig="searchConfig" @search="search" searchProp="state"  style="margin-left: 16px"></fvSearchForm>
+

  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
    <template #empty>
@@ -65,16 +15,13 @@ import Tag from '@/components/Tag.vue'
 import {ElNotification} from "element-plus";
 import {useCacheStore} from '@/stores/cache.js'
 import {getRequirementStatePerm,filterRequirementName,deleteDemand} from "@/api/project-demand";
-import {Refresh, Search} from '@element-plus/icons-vue'
+import {getSubCompOpt} from "@/api/user/user";
+import fvSelect from "@/fvcomponents/fvSelect/index.vue";

 const cacheStore = useCacheStore()
 const authStore = useAuthStore()
 const router = useRouter()
-const selectForm = ref({})
 const tableIns = ref()
-const formRef = ref()
-const requirementNameOptions = ref([])
-const stateOption = ref([])
 const userInfo = ref(authStore.userinfo)
 const auths = {
  edit: ['mosr:requirement:resubmit'],
@@ -195,46 +142,85 @@ const tableConfig = reactive({
  params: {}
 })

-const changeName=(val)=>{
-  selectForm.value.requirementName=val
-  getList()
+
+const searchConfig = ref([
+  {
+    label: '征集名称',
+    prop: 'requirementName',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请输入征集名称查询',
+      clearable: true,
+      filterable: true,
+      options: [],
+      remote: true,
+      remoteMethod:async (val)=>{
+        if(val){
+          const res=await filterRequirementName(val)
+          if(res.code==1000){
+            let optionObj={}
+            let options=[]
+            res.data.forEach(item=>{
+              optionObj={
+                value:item,
+                label:item
+              }
+              options.push(optionObj)
+            })
+            searchConfig.value.find(item => item.prop == 'requirementName').props.options = options
+          }
+        }
+      }
+    }
+  },
+  {
+    label: '征集类型',
+    prop: 'collectType',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择征集类型',
+      cacheKey: 'collect_type',
+      clearable: true,
+      filterable: true,
+      remote: true
+    }
+  },
+  {
+    label: '征集公司',
+    prop: 'affiliatedCompanyId',
+    component: 'el-tree-select',
+    props: {
+      placeholder: '请输入征集公司查询',
+      clearable: true,
+      data: [],
+      filterable: true,
+      checkStrictly: true,
+      remote: true
+    }
+  },
+  {
+    label: '状态',
+    prop: 'state',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择状态',
+      clearable: true,
+      filterable: true,
+      options: [],
+      remote: true,
+    }
+  },
+])
+
+const init = async () => {
+  const res = await getSubCompOpt()
+  searchConfig.value.find(item=>item.prop == 'affiliatedCompanyId').props.data = res.data
+  const res1 = await getRequirementStatePerm()
+  searchConfig.value.find(item=>item.prop == 'state').props.options = res1.data
 }

-const getRequirementName=async (val)=>{
-  if(val){
-    const res=await filterRequirementName(val)
-    if(res.code==1000){
-      let optionObj={}
-      let options=[]
-      res.data.forEach(item=>{
-        optionObj={
-          value:item,
-          label:item
-        }
-        options.push(optionObj)
-      })
-     requirementNameOptions.value= options
-    }
-  }
-}
-const selectOptionVisibleChange = (value) => {
-  console.log('value', value)
-}
-const getStatePerm = () => {
-  getRequirementStatePerm().then(res => {
-    stateOption.value = res.data
-  })
-}
-getStatePerm()
-//重置功能
-const handleReset = () => {
-  formRef.value.resetFields()
-  getList()
-}
-const getList = () => {
-  tableConfig.params = {...selectForm.value}
-  tableIns.value.refresh()
-}
+init()
+
 const search = (val) => {
  tableConfig.params = {...val}
  tableIns.value.refresh()
--- a/src/views/system/approvalWhitelist/index.vue
+++ b/src/views/system/approvalWhitelist/index.vue
@@ -0,0 +1,142 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px" ></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"
+           @selectionChange="selectionChange"></fvTable>
+  <user-picker :multiple="true" ref="whiteUserRef" title="请选择人员"
+               v-model:value="whiteUserList" @ok="whiteUserPickerOk" @cancelOrClear="whiteUserPickerOk"/>
+
+</template>
+
+<script setup lang="jsx">
+import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
+import {addWhiteUser, delWhiteUser} from "@/api/user/user";
+const tableIns = ref()
+const router = useRouter()
+const whiteUserRef = ref()
+const whiteUserList = ref([])
+const selectUser = ref([])
+const searchConfig = ref([
+  {
+    label: '名称',
+    prop: 'name',
+    component:'el-input',
+    props: {
+      placeholder: '请输入名称',
+      clearable: true,
+      filterable: true,
+    },
+  },
+  {
+    label: '电话',
+    prop: 'phone',
+    component:'el-input',
+    props: {
+      placeholder: '请输入电话',
+      clearable: true,
+      filterable: true,
+    },
+  },
+])
+const tableConfig = reactive({
+  columns: [
+    {
+      type: 'selection',
+      prop: 'selection',
+    },
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:60,
+      index: index => {
+        return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
+      }
+    },
+    {
+      prop: 'name',
+      label: '名称',
+      align: 'center'
+    },
+    {
+      prop: 'phone',
+      label: '手机号码',
+      align: 'center'
+    },
+    {
+      prop: 'companyName',
+      label: '公司名称',
+      align: 'center'
+    },
+    {
+      prop: 'accountType',
+      label: '主次账号',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => (<Tag dictType={'account_type'} value={row.accountType}/>)
+    },
+  ],
+  api: '/admin/approve/white/list',
+  params: {},
+  btns: [
+    {name: '新增', key: 'add', color: '#DED0B2'},
+    {name: '删除', key: 'del', type:'danger'},
+  ]
+})
+const whiteUserPickerOk = (userList) => {
+  whiteUserList.value = userList.map(item => item.id)
+  addUser()
+}
+const addUser=async () => {
+  const res = await addWhiteUser({
+    userIds: whiteUserList.value
+  })
+  console.log('res',res)
+  if (res.code === 1000) {
+    ElMessage.success('新增成功')
+    tableIns.value.refresh()
+  } else {
+    ElMessage.error(res.msg)
+  }
+}
+const search = (val) => {
+  tableConfig.params = val
+  tableIns.value.refresh()
+}
+const selectionChange = (data) => {
+  selectUser.value=data.map(item=>item.id)
+}
+const headBtnClick = (key) => {
+  switch (key) {
+    case 'add':
+      handleAddWhiteUser()
+      break;
+    case 'del':
+      handleDeleteWhiteUser()
+      break;
+  }
+}
+const handleAddWhiteUser = () => {
+  whiteUserRef.value.showUserPicker()
+}
+const handleDeleteWhiteUser = async () => {
+  // if (selectUser.value.length === 0) {
+  //   ElMessage.warning('请选择要删除的用户')
+  //   return
+  // }
+  const res = await delWhiteUser({
+    userIds: selectUser.value
+  })
+  console.log('res',res)
+  if (res.code === 1000) {
+    ElMessage.success('删除成功')
+    tableIns.value.refresh()
+  } else {
+    ElMessage.error(res.msg)
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -24,7 +24,7 @@
      <el-table-column prop="jobActivityDesc" label="岗位名称" align="center"/>
      <el-table-column prop="departmentName" label="部门" align="center"/>
      <el-table-column prop="mobile" label="手机号码" align="center"/>
-      <el-table-column prop="accountType" label="主子账号" align="center" width="100">
+      <el-table-column prop="accountType" label="主次账号" align="center" width="100">
        <template #default="scope">
          <Tag dictType="account_type" :value="scope.row.accountType"/>
        </template>
@@ -200,7 +200,7 @@ const tableConfig = reactive({
    },
    {
      prop: 'accountType',
-      label: '主子账号',
+      label: '主次账号',
      align: 'center',
      width: 100,
      showOverflowTooltip: false,
--- a/vite.config.js
+++ b/vite.config.js
@@ -12,90 +12,96 @@ import viteSvgIcons from 'vite-plugin-svg-icons'
 import path from 'path'
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [
-    vue(),
-    vueJsx(),
-    AutoImport({
-      //自动导入vue相关函数
-      imports: ['vue', 'vue-router'],
-      resolvers: [
-        ElementPlusResolver(),
-        //自动导入图标组件
-        IconsResolver({
-          prefix: 'Icon',
+    plugins: [
+        vue(),
+        vueJsx(),
+        AutoImport({
+            //自动导入vue相关函数
+            imports: ['vue', 'vue-router'],
+            resolvers: [
+                ElementPlusResolver(),
+                //自动导入图标组件
+                IconsResolver({
+                    prefix: 'Icon',
+                }),
+            ],
        }),
-      ],
-    }),
-    Components({
-      dirs: ['src/components', 'src/fvcomponents'],
-      resolvers: [
-        // 自动注册图标组件
-        IconsResolver({
-          enabledRequirements: ['ep'],
+        Components({
+            dirs: ['src/components', 'src/fvcomponents'],
+            resolvers: [
+                // 自动注册图标组件
+                IconsResolver({
+                    enabledRequirements: ['ep'],
+                }),
+                //自动导入组件
+                ElementPlusResolver()
+            ],
        }),
-        //自动导入组件
-        ElementPlusResolver()
-      ],
-    }),
-    Icons({
-      autoInstall: true,
-    }),
-    viteSvgIcons({
-      // 指定需要缓存的图标文件夹
-      iconDirs: [path.resolve(__dirname, 'src/assets/svg')],
-      // 指定symbolId格式
-      symbolId: 'icon-[dir]-[name]',
-    }),
-    Inspect(),
-  ],
-  resolve: {
-    alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url))
+        Icons({
+            autoInstall: true,
+        }),
+        viteSvgIcons({
+            // 指定需要缓存的图标文件夹
+            iconDirs: [path.resolve(__dirname, 'src/assets/svg')],
+            // 指定symbolId格式
+            symbolId: 'icon-[dir]-[name]',
+        }),
+        Inspect(),
+    ],
+    resolve: {
+        alias: {
+            '@': fileURLToPath(new URL('./src', import.meta.url))
+        }
+    },
+    build: {
+        minify: 'esbuild',
+        terserOptions: {
+            compress: {
+                drop_console: false, // 生产环境移除log
+                drop_debugger: true // 生产环境禁用debugger
+            }
+        }
+    },
+    server: {
+        host: '0.0.0.0',
+        port: 8888,
+        strictPort: false,
+        open: true,
+        proxy: {
+            // '/api/workflow': {
+            //   // target: 'http://frp.feashow.cn:31800/',
+            //   target: 'http://clay.frp.feashow.cn/',
+            //   // target: 'http://192.168.31.175:8000',
+            //   changeOrigin: true,
+            //   rewrite: (path) => path.replace(/^\/api/, '')
+            // },
+            // '/api/admin': {
+            //     // target: 'http://frp.feashow.cn:31800/',
+            //     target: 'http://clay.frp.feashow.cn/',
+            //     // target: 'http://192.168.31.175:8000',
+            //     changeOrigin: true,
+            //     rewrite: (path) => path.replace(/^\/api/, '')
+            // },
+            // '/api/auth': {
+            //     // target: 'http://frp.feashow.cn:31800/',
+            //     target: 'http://clay.frp.feashow.cn/',
+            //     // target: 'http://192.168.31.175:8000',
+            //     changeOrigin: true,
+            //     rewrite: (path) => path.replace(/^\/api/, '')
+            // },
+            '/api': {
+                target: 'http://mosr.feashow.cn',
+                // target: 'http://kyglweb.scgzjy.com:8080/',
+                // target: 'http://clay.frp.feashow.cn/',
+                // target: 'http://10.7.127.57:8000',
+                changeOrigin: true,
+                // rewrite: (path) => path.replace(/^\/api/, '')
+            },
+            // '/api/notice-ws': {
+            //   target: 'ws://mosr.feashow.cn/summary/notice-ws',
+            //   ws: true,
+            //   changeOrigin: true,
+            // }
+        }
    }
-  },
-  build: {
-    minify: 'esbuild',
-    terserOptions: {
-      compress: {
-        drop_console: false, // 生产环境移除log
-        drop_debugger: true // 生产环境禁用debugger
-      }
-    }
-  },
-  server: {
-    host: '0.0.0.0',
-    port: 8888,
-    strictPort: false,
-    open: true,
-    proxy: {
-      // '/api/workflow': {
-      //   target: 'http://frp.feashow.cn:31800/',
-      //   // target: 'http://clay.frp.feashow.cn/',
-      //   // target: 'http://192.168.31.175:8000',
-      //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/api/, '')
-      // },
-      // '/api/admin': {
-      //   // target: 'http://frp.feashow.cn:31800/',
-      //   target: 'http://clay.frp.feashow.cn/',
-      //   // target: 'http://192.168.31.175:8000',
-      //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/api/, '')
-      // },
-      '/api': {
-        // target: 'http://kyglweb.scgzjy.com:8080/',
-        target: 'http://mosr.feashow.cn',
-        changeOrigin: true,
-        // target: 'http://clay.frp.feashow.cn',
-        // // target: 'http://frp.feashow.cn:31800/',
-        // changeOrigin: true,
-        // rewrite: (path) => path.replace(/^\/api/, '')
-      },
-      // '/api/notice-ws': {
-      //   target: 'ws://mosr.feashow.cn/summary/notice-ws',
-      //   ws: true,
-      //   changeOrigin: true,
-      // }
-    }
-  }
 })