Bladeren bron

修改导入的接口

zs 8 maanden geleden
bovenliggende
commit
8d67443d3b
4 gewijzigde bestanden met toevoegingen van 40 en 330 verwijderingen
  1. BIN
      public/导入模板.xlsx
  2. 10 0
      src/store/api/util.js
  3. 3 326
      src/views/center/company.vue
  4. 27 4
      src/views/center/demand.vue

BIN
public/导入模板.xlsx


+ 10 - 0
src/store/api/util.js

@@ -0,0 +1,10 @@
+import { defineStore } from 'pinia'
+import { AxiosWrapper } from '@/utils/axios-wrapper'
+const axios = new AxiosWrapper()
+export const UtilStore = defineStore('util', () => {
+  const toImport = async (payload) => {
+    const res = await axios.$post(`/util/toImport`, payload)
+    return res
+  }
+  return { toImport }
+})

+ 3 - 326
src/views/center/company.vue

@@ -1,331 +1,8 @@
 <template>
 <template>
   <div class="index">
   <div class="index">
-    <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
-        <el-col :span="24" class="one">
-          <div class="one_left">
-            <div class="button" @click="toAdd">发布成果</div>
-            <div class="button" @click="toTemplate">下载导出模板</div>
-            <div class="button" @click="toUExcel">上传Excel</div>
-            <div class="button" @click="toDownload">下载Excel</div>
-          </div>
-          <div class="one_right">
-            <el-input v-model="searchForm.name" style="width: 250px" size="large" placeholder="搜索" @change="search" :suffix-icon="Search" />
-          </div>
-        </el-col>
-        <el-col :span="24" class="two">
-          <el-table :data="list" style="width: 100%" size="large" :header-cell-style="{ backgroundColor: '#edf3ff' }">
-            <template #empty>
-              <el-empty description="暂无数据" />
-            </template>
-            <el-table-column prop="name" align="center" label="成果名称" />
-            <el-table-column prop="time" align="center" label="发布时间" width="180" />
-            <el-table-column prop="status" align="center" label="状态" width="180">
-              <template #default="scope">
-                <div>{{ getDict(scope.row.status, 'status') }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="操作" width="180">
-              <template #default="{ row }">
-                <el-link v-if="row.status == '-2'" :underline="false" type="warning" size="mini" @click="toExam(row)" style="margin-right: 10px">提交审核</el-link>
-                <el-link :underline="false" type="primary" size="mini" @click="toEdit(row)" style="margin-right: 10px">修改</el-link>
-                <el-link :underline="false" type="danger" size="mini" @click="toDelete(row)"> 删除 </el-link>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-        <el-col :span="24" class="thr">
-          <el-pagination background layout="prev, pager, next" :total="total" :page-size="limit" v-model:current-page="currentPage" @current-change="changePage" @size-change="sizeChange" />
-        </el-col>
-      </el-col>
-    </el-row>
-    <el-dialog v-model="dialog.show" :title="dialog.title" :destroy-on-close="false" @close="toClose">
-      <el-row>
-        <el-col :span="24" v-if="dialog.type == '1'">
-          <custom-form v-model="form" :fields="formFields" :rules="rules" @save="toSave" @draftSave="toDraftSave">
-            <template #is_use>
-              <el-radio v-for="i in isUseList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
-            </template>
-            <template #field>
-              <el-option v-for="i in fieldList" :key="i.id" :label="i.label" :value="i.label"></el-option>
-            </template>
-            <template #attribute>
-              <el-option v-for="i in attributeList" :key="i.id" :label="i.label" :value="i.value"></el-option>
-            </template>
-            <template #mature>
-              <el-option v-for="i in matureList" :key="i.id" :label="i.label" :value="i.value"></el-option>
-            </template>
-            <template #sell>
-              <el-option v-for="i in sellList" :key="i.id" :label="i.label" :value="i.value"></el-option>
-            </template>
-            <template #technology>
-              <el-option v-for="i in technologyList" :key="i.id" :label="i.label" :value="i.value"></el-option>
-            </template>
-            <template #area>
-              <el-cascader v-model="form.area" :props="{ value: 'name', label: 'name' }" :options="cityList" style="width: 100%" />
-            </template>
-            <template #file>
-              <custom-upload model="file" :list="form.file" :limit="1" url="/files/web/cxyy_achievement/upload" @change="onUpload"></custom-upload>
-            </template>
-            <template #industry>
-              <el-option v-for="i in sectorList" :key="i.id" :label="i.title" :value="i.title"></el-option>
-            </template>
-            <template #tags>
-              <el-select v-model="form.tags" multiple filterable allow-create default-first-option :reserve-keyword="false" placeholder="请选择标签" style="width: 100%">
-                <el-option v-for="item in tagsList" :key="item.id" :label="item.title" :value="item.title" />
-              </el-select>
-            </template>
-          </custom-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
+    <el-row> <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading"> 企业选择 </el-col> </el-row>
   </div>
   </div>
 </template>
 </template>
 
 
-<script setup>
-import { Search } from '@element-plus/icons-vue'
-import { cloneDeep, get } from 'lodash-es'
-const $checkRes = inject('$checkRes')
-import { UserStore } from '@/store/user'
-const userStore = UserStore()
-const user = computed(() => userStore.user)
-// 接口
-import { AchievementStore } from '@/store/api/platform/achievement'
-import { DictDataStore } from '@/store/api/system/dictData'
-import { TagsStore } from '@/store/api/system/tags'
-import { SectorStore } from '@/store/api/platform/sector'
-import { RegionStore } from '@/store/api/system/region'
-const regionStore = RegionStore()
-const store = AchievementStore()
-const dictDataStore = DictDataStore()
-const tagsStore = TagsStore()
-const sectorStore = SectorStore()
-// 加载中
-const loading = ref(false)
-
-const searchForm = ref({})
-// 列表
-const list = ref([])
-let skip = 0
-let limit = inject('limit')
-const total = ref(0)
-const currentPage = ref(1)
-// 字典表
-const isUseList = ref([])
-const statusList = ref([])
-const fieldList = ref([])
-const attributeList = ref([])
-const matureList = ref([])
-const sellList = ref([])
-const technologyList = ref([])
-const cityList = ref([])
-const achievementList = ref([])
-const tagsList = ref([])
-const sectorList = ref([])
-
-const form = ref({ file: [] })
-const dialog = ref({ type: '1', show: false, title: '发布成果' })
-const formFields = ref([
-  { label: '成果名称', model: 'name' },
-  { label: '标签', model: 'tags', custom: true },
-  { label: '所属产业', model: 'industry', type: 'select' },
-  { label: '专利号', model: 'patent' },
-  { label: '行业领域', model: 'field' },
-  { label: '属性', model: 'attribute', type: 'select' },
-  { label: '成熟度', model: 'mature', type: 'select' },
-  { label: '出让方式', model: 'sell', type: 'select' },
-  { label: '技术分类', model: 'technology', type: 'select' },
-  { label: '成果地区', model: 'area', custom: true },
-  { label: '发布时间', model: 'time', type: 'date' },
-  { label: '价格(万元)', model: 'money' },
-  { label: '项目来源', model: 'source' },
-  { label: '联系人', model: 'person' },
-  { label: '联系电话', model: 'tel' },
-  { label: '是否公开', model: 'is_use', type: 'radio' },
-  { label: '简介', model: 'brief', type: 'textarea' },
-  { label: '附件', model: 'file', custom: true }
-])
-const rules = reactive({ name: [{ required: true, message: '请输入成果名称', trigger: 'blur' }] })
-// 请求
-onMounted(async () => {
-  loading.value = true
-  await searchOther()
-  await search()
-  loading.value = false
-})
-const search = async (query = { skip, limit }) => {
-  skip = query.skip
-  limit = query.limit
-  const info = {
-    skip: query.skip,
-    limit: query.limit,
-    user: user.value.id,
-    ...searchForm.value
-  }
-  const res = await store.query(info)
-  if (res.errcode == '0') {
-    list.value = res.data
-    total.value = res.total
-  }
-}
-const searchOther = async () => {
-  let result
-  // 是否使用
-  result = await dictDataStore.query({ code: 'isUse', is_use: '0' })
-  if ($checkRes(result)) isUseList.value = result.data
-  // 状态
-  result = await dictDataStore.query({ code: 'examStatus', is_use: '0' })
-  if ($checkRes(result)) statusList.value = result.data
-  // 成熟度
-  result = await dictDataStore.query({ code: 'mature', is_use: '0' })
-  if ($checkRes(result)) matureList.value = result.data
-  // 出让方式
-  result = await dictDataStore.query({ code: 'sell', is_use: '0' })
-  if ($checkRes(result)) sellList.value = result.data
-  // 技术领域
-  result = await dictDataStore.query({ code: 'field', is_use: '0' })
-  if ($checkRes(result)) fieldList.value = result.data
-  // 属性
-  result = await dictDataStore.query({ code: 'attribute', is_use: '0' })
-  if ($checkRes(result)) attributeList.value = result.data
-  // 技术分类
-  result = await dictDataStore.query({ code: 'technology', is_use: '0' })
-  if ($checkRes(result)) technologyList.value = result.data
-  // 成果状态
-  result = await dictDataStore.query({ code: 'demandStatus', is_use: '0' })
-  if ($checkRes(result)) achievementList.value = result.data
-  // 标签
-  result = await tagsStore.query({ is_use: '0' })
-  if ($checkRes(result)) tagsList.value = result.data
-  // 行业
-  result = await sectorStore.query({ is_use: '0' })
-  if ($checkRes(result)) sectorList.value = result.data
-  // 城市
-  result = await regionStore.area({ level: 'province', code: 22 })
-  if ($checkRes(result)) cityList.value = result.data
-}
-// 字典数据转换
-const getDict = (data, model) => {
-  if (data) {
-    let res
-    if (model == 'status') res = statusList.value.find((f) => f.value == data)
-    return get(res, 'label')
-  }
-}
-// 添加
-const toAdd = () => {
-  dialog.value = { type: '1', show: true, title: '发布成果' }
-}
-// 修改
-const toEdit = (data) => {
-  if (!data.file) data.file = []
-  form.value = data
-  dialog.value = { type: '1', show: true, title: '修改成果' }
-}
-// 删除
-const toDelete = (data) => {
-  ElMessageBox.confirm(`您确认删除${data.name}该数据?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' })
-    .then(async () => {
-      const res = await store.del(data.id)
-      if ($checkRes(res, true)) {
-        search({ skip, limit })
-      }
-    })
-    .catch(() => {})
-}
-// 上传图片
-const onUpload = (e) => {
-  const { model, value } = e
-  form.value[model] = value
-}
-const toSave = async () => {
-  const data = cloneDeep(form.value)
-  const other = { status: '0', user: user.value.id }
-  let res
-  if (get(data, 'id')) res = await store.update({ ...data, ...other })
-  else res = await store.create({ ...data, ...other })
-  if ($checkRes(res, true)) {
-    search({ skip, limit })
-    toClose()
-  }
-}
-const toDraftSave = async () => {
-  const data = cloneDeep(form.value)
-  const other = { status: '-2', user: user.value.id }
-  let res
-  if (get(data, 'id')) res = await store.update({ ...data, ...other })
-  else res = await store.create({ ...data, ...other })
-  if ($checkRes(res, true)) {
-    search({ skip, limit })
-    toClose()
-  }
-}
-// 审核保存
-const toExam = async (row) => {
-  ElMessageBox.confirm(`您确认保存并提交审核该数据?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' })
-    .then(async () => {
-      const data = cloneDeep(row)
-      let res = await store.update({ id: data.id, status: '0', user: user.value.id })
-      if ($checkRes(res, true)) {
-        search({ skip, limit })
-        toClose()
-      }
-    })
-    .catch(() => {})
-}
-// 下载导出模板
-const toTemplate = () => {
-  console.log('下载导出模板')
-}
-// 上传Excel
-const toUExcel = () => {
-  console.log('上传Excel')
-}
-// 下载Excel
-const toDownload = () => {
-  console.log('下载Excel')
-}
-const toClose = () => {
-  form.value = { file: [] }
-  dialog.value = { show: false }
-}
-// 分页
-const changePage = (page = currentPage.value) => {
-  search({ skip: (page - 1) * limit, limit: limit })
-}
-const sizeChange = (limits) => {
-  limit = limits
-  currentPage.value = 1
-  search({ skip: 0, limit: limit })
-}
-</script>
-<style scoped lang="scss">
-.main {
-  .one {
-    height: 50px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin: 0 0 10px 0;
-    .one_left {
-      display: flex;
-      font-size: 16px;
-      .button {
-        background: #1875df;
-        padding: 0 10px;
-        height: 30px;
-        color: #fff;
-        line-height: 30px;
-        text-align: center;
-        cursor: default;
-        margin: 0 10px 0 0;
-      }
-    }
-  }
-  .thr {
-    display: flex;
-    justify-content: center;
-    margin: 20px 0 0 0;
-  }
-}
-</style>
+<script setup></script>
+<style scoped lang="scss"></style>

+ 27 - 4
src/views/center/demand.vue

@@ -6,7 +6,7 @@
           <div class="one_left">
           <div class="one_left">
             <div class="button" @click="toAdd">发布需求</div>
             <div class="button" @click="toAdd">发布需求</div>
             <div class="button" @click="toTemplate">下载导出模板</div>
             <div class="button" @click="toTemplate">下载导出模板</div>
-            <div class="button" @click="toUExcel">上传Excel</div>
+            <el-upload class="button" :action="url" :show-file-list="false" :on-error="onError" :http-request="httpRequse" accept=".xlsx"> 选择excel模板文件 </el-upload>
             <div class="button" @click="toDownload">下载Excel</div>
             <div class="button" @click="toDownload">下载Excel</div>
           </div>
           </div>
           <div class="one_right">
           <div class="one_right">
@@ -113,12 +113,14 @@ import { DictDataStore } from '@/store/api/system/dictData'
 import { TagsStore } from '@/store/api/system/tags'
 import { TagsStore } from '@/store/api/system/tags'
 import { SectorStore } from '@/store/api/platform/sector'
 import { SectorStore } from '@/store/api/platform/sector'
 import { RegionStore } from '@/store/api/system/region'
 import { RegionStore } from '@/store/api/system/region'
+import { UtilStore } from '@/store/api/util'
 const regionStore = RegionStore()
 const regionStore = RegionStore()
 const store = DemandStore()
 const store = DemandStore()
 const dictDataStore = DictDataStore()
 const dictDataStore = DictDataStore()
 const tagsStore = TagsStore()
 const tagsStore = TagsStore()
 const sectorStore = SectorStore()
 const sectorStore = SectorStore()
 const supplyStore = SupplyStore()
 const supplyStore = SupplyStore()
+const utilStore = UtilStore()
 // 加载中
 // 加载中
 const loading = ref(false)
 const loading = ref(false)
 const isLoading = ref(false)
 const isLoading = ref(false)
@@ -336,11 +338,32 @@ const toClose = () => {
 }
 }
 // 下载导出模板
 // 下载导出模板
 const toTemplate = () => {
 const toTemplate = () => {
-  console.log('下载导出模板')
+  window.open('/cxyyWeb/导入模板.xlsx')
 }
 }
 // 上传Excel
 // 上传Excel
-const toUExcel = () => {
-  console.log('上传Excel')
+const httpRequse = async (param) => {
+  const msgbox = ElMessage({ message: '正在导入中,请稍后...', center: true, duration: 0 })
+  try {
+    let fileObj = param.file
+    let fd = new FormData()
+    console.log(fileObj.name)
+    fd.append('file', fileObj, fileObj.name)
+    const res = await utilStore.toImport(fd)
+    // let list
+    console.log(res)
+    // if (res.status !== 200) {
+    //   list = [{ key: '请求发生错误' }]
+    // } else if (res.data.errcode !== 0) {
+    //   list = [{ key: '请求发生错误', num: res.data.errmsg }]
+    // } else {
+    //   list = res.data.data
+    // }
+    // console.log(list)
+  } catch (error) {
+    console.error(error)
+  } finally {
+    msgbox.close()
+  }
 }
 }
 // 下载Excel
 // 下载Excel
 const toDownload = () => {
 const toDownload = () => {