平台档案

.env.development

@@ -2,7 +2,7 @@
 NODE_ENV='development'
 
 # 应用端口
-VITE_APP_PORT = 8080
+VITE_APP_PORT = 8090
 
 # 代理前缀
 VITE_APP_BASE_API = '/apis'

.env.production

@@ -2,5 +2,5 @@
 NODE_ENV='production'
 
 # 代理前缀
-VITE_APP_BASE_API = '/prod-api'
+VITE_APP_BASE_API = '/apis'
 

.husky/commit-msg

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx --no-install commitlint --edit $1

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npm run lint:lint-staged

commitlint.config.cjs

@@ -1,93 +0,0 @@
-module.exports = {
-  // 继承的规则
-  extends: ["@commitlint/config-conventional"],
-  // 自定义规则
-  rules: {
-    // @see https://commitlint.js.org/#/reference-rules
-
-    // 提交类型枚举，git提交type必须是以下类型
-    "type-enum": [
-      2,
-      "always",
-      [
-        "feat", // 新增功能
-        "fix", // 修复缺陷
-        "docs", // 文档变更
-        "style", // 代码格式（不影响功能，例如空格、分号等格式修正）
-        "refactor", // 代码重构（不包括 bug 修复、功能新增）
-        "perf", // 性能优化
-        "test", // 添加疏漏测试或已有测试改动
-        "build", // 构建流程、外部依赖变更（如升级 npm 包、修改 webpack 配置等）
-        "ci", // 修改 CI 配置、脚本
-        "revert", // 回滚 commit
-        "chore", // 对构建过程或辅助工具和库的更改（不影响源文件、测试用例）
-      ],
-    ],
-    "subject-case": [0], // subject大小写不做校验
-  },
-
-  prompt: {
-    messages: {
-      type: "选择你要提交的类型 :",
-      scope: "选择一个提交范围（可选）:",
-      customScope: "请输入自定义的提交范围 :",
-      subject: "填写简短精炼的变更描述 :\n",
-      body: '填写更加详细的变更描述（可选）。使用 "|" 换行 :\n',
-      breaking: '列举非兼容性重大的变更（可选）。使用 "|" 换行 :\n',
-      footerPrefixesSelect: "选择关联issue前缀（可选）:",
-      customFooterPrefix: "输入自定义issue前缀 :",
-      footer: "列举关联issue (可选) 例如: #31, #I3244 :\n",
-      generatingByAI: "正在通过 AI 生成你的提交简短描述...",
-      generatedSelectByAI: "选择一个 AI 生成的简短描述:",
-      confirmCommit: "是否提交或修改commit ?",
-    },
-    // prettier-ignore
-    types: [
-      { value: "feat",     name: "特性:     ✨  新增功能", emoji: ":sparkles:" },
-      { value: "fix",      name: "修复:     🐛  修复缺陷", emoji: ":bug:" },
-      { value: "docs",     name: "文档:     📝  文档变更", emoji: ":memo:" },
-      { value: "style",    name: "格式:     🌈  代码格式（不影响功能，例如空格、分号等格式修正）", emoji: ":lipstick:" },
-      { value: "refactor", name: "重构:     🔄  代码重构（不包括 bug 修复、功能新增）", emoji: ":recycle:" },
-      { value: "perf",     name: "性能:     🚀  性能优化", emoji: ":zap:" },
-      { value: "test",     name: "测试:     🧪  添加疏漏测试或已有测试改动", emoji: ":white_check_mark:"},
-      { value: "build",    name: "构建:     📦️  构建流程、外部依赖变更（如升级 npm 包、修改 vite 配置等）", emoji: ":package:"},
-      { value: "ci",       name: "集成:     ⚙️  修改 CI 配置、脚本",  emoji: ":ferris_wheel:"},
-      { value: "revert",   name: "回退:     ↩️  回滚 commit",emoji: ":rewind:"},
-      { value: "chore",    name: "其他:     🛠️  对构建过程或辅助工具和库的更改（不影响源文件、测试用例）", emoji: ":hammer:"},
-    ],
-    useEmoji: true,
-    emojiAlign: "center",
-    useAI: false,
-    aiNumber: 1,
-    themeColorCode: "",
-    scopes: [],
-    allowCustomScopes: true,
-    allowEmptyScopes: true,
-    customScopesAlign: "bottom",
-    customScopesAlias: "custom",
-    emptyScopesAlias: "empty",
-    upperCaseSubject: false,
-    markBreakingChangeMode: false,
-    allowBreakingChanges: ["feat", "fix"],
-    breaklineNumber: 100,
-    breaklineChar: "|",
-    skipQuestions: [],
-    issuePrefixes: [
-      { value: "closed", name: "closed:   ISSUES has been processed" },
-    ],
-    customIssuePrefixAlign: "top",
-    emptyIssuePrefixAlias: "skip",
-    customIssuePrefixAlias: "custom",
-    allowCustomIssuePrefix: true,
-    allowEmptyIssuePrefix: true,
-    confirmColorize: true,
-    maxHeaderLength: Infinity,
-    maxSubjectLength: Infinity,
-    minSubjectLength: 0,
-    scopeOverrides: undefined,
-    defaultBody: "",
-    defaultIssues: "",
-    defaultScope: "",
-    defaultSubject: "",
-  },
-};

package.json

@@ -7,38 +7,9 @@
     "preinstall": "npx only-allow pnpm",
     "dev": "vite serve --mode development",
     "build:prod": "vite build --mode production && vue-tsc --noEmit",
-    "prepare": "husky install",
     "lint:eslint": "eslint  --fix --ext .ts,.js,.vue ./src ",
     "lint:prettier": "prettier --write \"**/*.{js,cjs,ts,json,tsx,css,less,scss,vue,html,md}\"",
-    "lint:stylelint": "stylelint  \"**/*.{css,scss,vue}\" --fix",
-    "lint:lint-staged": "lint-staged",
-    "commit": "git-cz"
-  },
-  "config": {
-    "commitizen": {
-      "path": "node_modules/cz-git"
-    }
-  },
-  "lint-staged": {
-    "*.{js,ts}": [
-      "eslint --fix",
-      "prettier --write"
-    ],
-    "*.{cjs,json}": [
-      "prettier --write"
-    ],
-    "*.{vue,html}": [
-      "eslint --fix",
-      "prettier --write",
-      "stylelint --fix"
-    ],
-    "*.{scss,css}": [
-      "stylelint --fix",
-      "prettier --write"
-    ],
-    "*.md": [
-      "prettier --write"
-    ]
+    "lint:stylelint": "stylelint  \"**/*.{css,scss,vue}\" --fix"
   },
   "dependencies": {
     "@codemirror/lang-javascript": "^6.2.1",
@@ -84,15 +55,12 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "autoprefixer": "^10.4.16",
     "commitizen": "^4.3.0",
-    "cz-git": "^1.8.0",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-vue": "^9.20.0",
     "fast-glob": "^3.3.2",
-    "husky": "^8.0.3",
-    "lint-staged": "^13.3.0",
     "postcss": "^8.4.33",
     "postcss-html": "^1.5.0",
     "postcss-scss": "^4.0.9",

src/views/baseInfo/paperBrand/compt/childDialog.vue

@@ -1,119 +0,0 @@
-<template>
-  <div class="dialog">
-    <el-dialog
-        v-model="dialogVisible"
-        :title="dialogTitle"
-        width="480px"
-        @close="closeDialog()"
-    >
-      <el-form
-          ref="formRef"
-          :model="formData"
-          :rules="rules"
-          label-width="120px"
-      >
-        <el-row>
-          <el-col :span="24">
-            <el-form-item prop="brandName" label="品牌名称">
-              <el-input v-model="formData.brandName"/>
-            </el-form-item>
-            <el-form-item prop="companyName" label="生产公司名称">
-              <el-input v-model="formData.companyName"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-      </el-form>
-
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button v-throttle type="primary" @click="handleSubmit">确 定</el-button>
-          <el-button @click="closeDialog()">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script setup lang="ts">
-import {addPaperBrand, getPaperInfoType, updatePaperInfoType} from "@/api/baseInfo";
-import type {FormInstance} from 'element-plus'
-
-let dialogVisible = ref(false)
-let dialogTitle = ref("")
-const formRef = ref<FormInstance>()
-const emit = defineEmits(['dialogChange'])
-const formData = reactive({
-  brandName: '',
-  id: ""
-})
-const rules = reactive({
-  brandName: [{required: true, message: "请输入名称", trigger: "blur"}],
-});
-
-function handleSubmit() {
-  formRef.value.validate((valid: any) => {
-    if (valid) {
-      const itemId = formData.id;
-      if (itemId) {
-        //修改
-        const postData = JSON.stringify(formData)
-        const params = {
-          "paperBrand": postData,
-        }
-        updatePaperInfoType(params).then((response) => {
-          dialogVisible.value = false
-          if (response.httpCode == 200) {
-            emit('dialogChange');
-            ElMessage.success("操作成功");
-          }
-        })
-      } else {
-        //增加
-        const postData = JSON.stringify(formData)
-        const params = {
-          "paperBrand": postData,
-        }
-        addPaperBrand(params).then((response) => {
-          dialogVisible.value = false
-          if (response.httpCode == 200) {
-            emit('dialogChange');
-            ElMessage.success("操作成功");
-          }
-        })
-      }
-    }
-  });
-}
-
-function getItemData(item) {
-  const data = {
-    id: item
-  }
-  getPaperInfoType(data).then(response => {
-    if (response.httpCode == 200) {
-      const data = response.data
-      Object.assign(formData, {...data});
-    }
-  })
-}
-
-/**  重置表单 */
-function resetForm() {
-  formRef.value.resetFields();
-  formData.id = undefined
-}
-
-/**关闭弹窗 */
-function closeDialog() {
-  dialogVisible.value = false
-  formRef.value.resetFields();
-  formData.id = undefined;
-}
-
-defineExpose({
-  dialogVisible,
-  dialogTitle,
-  getItemData,
-  resetForm
-})
-</script>

src/views/baseInfo/paperBrand/index.vue

@@ -1,170 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="filter-container">
-      <el-input @keyup.enter="handleSearch" class="w200px mr5px" v-model="queryForm.keyWord" placeholder="关键字搜索"/>
-      <el-button type="primary" @click="handleSearch">
-        <i-ep-search/>
-        搜索
-      </el-button>
-      <div class="w100px ml10px" style="display: inline-block;">
-        <el-checkbox style="position: absolute;top: 11px" v-model="disableLock" label="已禁用"
-                     border></el-checkbox>
-      </div>
-      <el-button @click="openDialog()" color="#11a983">
-        <i-ep-plus/>
-        增加纸张品牌档案
-      </el-button>
-      <el-button type="primary" @click="refreshTableInfo">
-        <i-ep-refresh/>
-      </el-button>
-    </div>
-    <div class="table-con">
-      <el-table
-          :max-height="tableHeight"
-          v-loading="loading"
-          :data="tableData"
-          highlight-current-row
-          border
-      >
-        <el-table-column label="操作" width="80">
-          <template #default="{row}">
-<!--            <el-button link @click="openDialog(row.id)" type="primary">-->
-<!--              <i-ep-edit/>-->
-<!--              编辑-->
-<!--            </el-button>-->
-            <el-button v-if="row.voidFlag==0" link @click="handleDisable(row.id,1)" type="warning">禁用</el-button>
-            <el-button v-if="row.voidFlag==1" type="success" link @click="handleDisable(row.id,0)">启用</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-            type="index"
-            label="#"
-            width="50">
-          <template #default="scope">
-            <span>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="brandName" width="250" label="品牌名称"/>
-        <el-table-column prop="companyName" width="300" label="生产公司名称"/>
-        <el-table-column
-            prop="status"
-            label="状态">
-          <template #default="{row}">
-            <el-tag v-if="row.voidFlag==0" type="success">
-              正常
-            </el-tag>
-            <el-tag v-else="row.voidFlag==1" type="danger">
-              停用
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="createTime"
-            label="创建时间"
-            width="155">
-          <template #default="{row}">
-          <span v-if="row.createTime">
-           {{ $filters.getTime(row.createTime) }}
-          </span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-          v-if="total > 0"
-          v-model:total="total"
-          v-model:page="queryPage.pageIndex"
-          v-model:limit="queryPage.pageSize"
-          @pagination="getTableData"
-      />
-    </div>
-    <child-dialog ref="childDialog" @dialogChange="dialogChange"></child-dialog>
-  </div>
-</template>
-<script setup lang="ts">
-import {getPaperBrandList, voidPaperBrand} from "@/api/baseInfo";
-import ChildDialog from './compt/ChildDialog.vue'
-import {useTable} from '@/hooks/useTable'
-
-let disableLock = ref('')
-const childDialog = ref<any>()
-
-function checkDisable() {
-
-}
-
-//增加编辑
-function openDialog(item?: any) {
-  childDialog.value.dialogVisible = true;
-  if (item) {
-    childDialog.value.dialogTitle = "编辑";
-    // nextTick(() => {
-    //   childDialog.value.getItemData(item)
-    // });
-  } else {
-      nextTick(() => {
-          childDialog.value.dialogTitle = "增加";
-          childDialog.value.resetForm()
-      })
-  }
-}
-
-//禁用删除
-function handleDisable(id, status) {
-  ElMessageBox.confirm("确认操作?", "警告", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    type: "warning",
-  }).then(() => {
-    const postData = {
-      id: id,
-      voidFlag: status
-    }
-    const params = {
-      "paperBrand": JSON.stringify(postData),
-    }
-    voidPaperBrand(params).then((response) => {
-      if (response.httpCode == 200) {
-        ElMessage.success("操作成功");
-        getTableData();
-      }
-
-    })
-  })
-}
-
-//修改成功后传递事件
-function dialogChange() {
-  getTableData()
-}
-
-const queryForm = reactive({
-  keyWord: '',
-  voidFlag: 0
-})
-watch(
-    () => disableLock.value,
-    (disableLock) => {
-      console.log(disableLock);
-      if (disableLock) {
-        queryForm.voidFlag = 1
-        getTableData()
-      } else {
-        queryForm.voidFlag = 0
-        getTableData()
-      }
-    }
-);
-const {
-  tableData,
-  queryPage,
-  total,
-  loading,
-  getTableData,
-  tableHeight,
-  handleSearch,//搜索
-  refreshTableInfo,//刷新
-} = useTable(getPaperBrandList, queryForm);
-</script>
-
-
-

src/views/baseInfo/paperInfo/compt/checkDialog.vue

@@ -1,122 +0,0 @@
-<template>
-  <div class="dialog">
-    <el-dialog
-        v-model="dialogVisible"
-        :title="dialogTitle"
-        width="1000px"
-        @close="closeDialog()"
-    >
-      <div class="app-container">
-        <div class="filter-container">
-          <el-input @keyup.enter="handleSearch" class="w200px mr5px" v-model="queryForm.keyWord" placeholder="关键字搜索"/>
-          <el-button type="primary" @click="handleSearch">
-            <i-ep-search/>
-            搜索
-          </el-button>
-        </div>
-        </div>
-      <div class="table-con">
-        <el-table
-            ref="tableRef"
-            :max-height="tableHeight"
-            v-loading="loading"
-            :data="tableData"
-            highlight-current-row
-            border
-        >
-          <el-table-column label="操作" width="90">
-            <template #default="{row}">
-              <el-button link @click="checkRow(row)" type="primary">
-                <i-ep-check/>
-                选择
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-              type="index"
-              label="#"
-              width="50">
-            <template #default="scope">
-              <span>{{ scope.$index + 1 }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="paperName" width="250" label="分类名称"/>
-          <el-table-column prop="paperTypeName" width="300" label="纸张类型名称"/>
-          <el-table-column
-              prop="status"
-              label="状态">
-            <template #default="{row}">
-              <el-tag v-if="row.voidFlag==0" type="success">
-                正常
-              </el-tag>
-              <el-tag v-else="row.voidFlag==1" type="danger">
-                停用
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="createTime"
-              label="创建时间"
-              width="155">
-            <template #default="{row}">
-          <span v-if="row.createTime">
-           {{ $filters.getTime(row.createTime) }}
-          </span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-            v-if="total > 0"
-            v-model:total="total"
-            v-model:page="queryPage.pageIndex"
-            v-model:limit="queryPage.pageSize"
-            @pagination="getTableData"
-        />
-      </div>
-    </el-dialog>
-  </div>
-</template>
-<script setup lang="ts">
-import {
-  getPaperBaseInfoList
-} from "@/api/baseInfo";
-import { ElTable } from 'element-plus'
-const tableRef = ref<InstanceType<typeof ElTable>>()
-import {useTable} from '@/hooks/useTable'
-let dialogVisible = ref(false)
-let dialogTitle = ref("")
-const emit = defineEmits(['tableChange'])
-const queryForm = reactive({
-  keyWord: '',
-  voidFlag: 0
-})
-function checkRow(row) {
-  dialogVisible.value = false
-  emit('tableChange',row);
-}
-/**关闭弹窗 */
-function closeDialog() {
-  dialogVisible.value = false
-}
-const {
-  tableData,
-  queryPage,
-  total,
-  loading,
-  getTableData,
-  tableHeight,
-  handleSearch,//搜索
-} = useTable(getPaperBaseInfoList, queryForm);
-defineExpose({
-  dialogVisible,
-  dialogTitle
-})
-
-</script>
-
-
-<style scoped lang="scss">
-:deep(.el-dialog__body){
-  padding-top: 0px !important;
-}
-</style>

src/views/baseInfo/paperInfo/compt/checkModle.vue

@@ -1,122 +0,0 @@
-<template>
-  <div class="dialog">
-    <el-dialog
-        v-model="dialogVisible"
-        :title="dialogTitle"
-        width="1000px"
-        @close="closeDialog()"
-    >
-      <div class="app-container">
-        <div class="filter-container">
-          <el-input @keyup.enter="handleSearch" class="w200px mr5px" v-model="queryForm.keyWord" placeholder="关键字搜索"/>
-          <el-button type="primary" @click="handleSearch">
-            <i-ep-search/>
-            搜索
-          </el-button>
-        </div>
-        </div>
-      <div class="table-con">
-        <el-table
-            ref="tableRef"
-            :max-height="tableHeight"
-            v-loading="loading"
-            :data="tableData"
-            highlight-current-row
-            border
-        >
-          <el-table-column label="操作" width="90">
-            <template #default="{row}">
-              <el-button link @click="checkRow(row)" type="primary">
-                <i-ep-check/>
-                选择
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-              type="index"
-              label="#"
-              width="50">
-            <template #default="scope">
-              <span>{{ scope.$index + 1 }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="brandName" width="250" label="品牌名称"/>
-          <el-table-column prop="companyName" width="160" label="生产公司名称"/>
-          <el-table-column
-              prop="status"
-              label="状态">
-            <template #default="{row}">
-              <el-tag v-if="row.voidFlag==0" type="success">
-                正常
-              </el-tag>
-              <el-tag v-else="row.voidFlag==1" type="danger">
-                停用
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="createTime"
-              label="创建时间"
-              width="155">
-            <template #default="{row}">
-          <span v-if="row.createTime">
-           {{ $filters.getTime(row.createTime) }}
-          </span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-            v-if="total > 0"
-            v-model:total="total"
-            v-model:page="queryPage.pageIndex"
-            v-model:limit="queryPage.pageSize"
-            @pagination="getTableData"
-        />
-      </div>
-    </el-dialog>
-  </div>
-</template>
-<script setup lang="ts">
-import {
-  getPaperBrandList
-} from "@/api/baseInfo";
-import { ElTable } from 'element-plus'
-const tableRef = ref<InstanceType<typeof ElTable>>()
-import {useTable} from '@/hooks/useTable'
-let dialogVisible = ref(false)
-let dialogTitle = ref("")
-const emit = defineEmits(['modleChange'])
-const queryForm = reactive({
-  keyWord: '',
-  voidFlag: 0
-})
-function checkRow(row) {
-  dialogVisible.value = false
-  emit('modleChange',row);
-}
-/**关闭弹窗 */
-function closeDialog() {
-  dialogVisible.value = false
-}
-const {
-  tableData,
-  queryPage,
-  total,
-  loading,
-  getTableData,
-  tableHeight,
-  handleSearch,//搜索
-} = useTable(getPaperBrandList, queryForm);
-defineExpose({
-  dialogVisible,
-  dialogTitle
-})
-
-</script>
-
-
-<style scoped lang="scss">
-:deep(.el-dialog__body){
-  padding-top: 0px !important;
-}
-</style>

src/views/baseInfo/paperInfo/compt/childDialog.vue

@@ -1,230 +0,0 @@
-<template>
-  <div class="dialog">
-    <el-dialog
-        v-model="dialogVisible"
-        :title="dialogTitle"
-        width="900px"
-        @close="closeDialog()"
-    >
-      <el-form
-          ref="formRef"
-          :model="formData"
-          label-width="120px"
-      >
-        <el-row>
-          <el-col :span="12">
-            <el-form-item prop="paperTypeName" label="纸张类型">
-              <el-button :disabled="formData.id!=''" v-throttle @click="paperDialog()" type="primary" link>{{basePaperName ? basePaperName : '请选择纸张类型'}}</el-button>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="mtModel" label="品牌">
-              <el-button :disabled="formData.id!=''" v-throttle @click="mtModelDialog()" type="primary" link>{{mtModelName ? mtModelName : '请选择品牌'}}</el-button>
-            </el-form-item>
-          </el-col>
-          <el-col v-show="formData.id!=''" :span="12">
-            <el-form-item  prop="paperName" label="纸张名称">
-              <el-input disabled v-model="formData.paperName"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="mtRule" label="规格">
-              <el-input :disabled="formData.id!=''" v-model="formData.mtRule"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="mtSuttle" label="克重">
-              <el-input :disabled="formData.id!=''" v-model="formData.mtSuttle"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="mtModel" label="品牌">
-              <el-input :disabled="formData.id!=''" v-model="formData.mtModel"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="byUnit" label="采购单位">
-              <el-input :disabled="formData.id!=''" v-model="formData.byUnit"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="mtUnit" label="库充单位">
-              <el-input :disabled="formData.id!=''" v-model="formData.mtUnit"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="seUnit" label="使用单位">
-              <el-input :disabled="formData.id!=''" v-model="formData.seUnit"/>
-            </el-form-item>
-          </el-col>
-          <el-col v-show="formData.id!=''" :span="12">
-            <el-form-item prop="convertUnitByToMt" label="采购=>库存">
-              <el-input  v-model="formData.convertUnitByToMt"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="计价方式">
-              <el-select v-model="formData.priceType">
-                <el-option label="吨价" :value="0"></el-option>
-                <el-option label="平方价" :value="1"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="barCode" label="条形码">
-              <el-input :disabled="formData.id!=''" v-model="formData.barCode"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="remark" label="备注">
-              <el-input  v-model="formData.remark"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button v-throttle type="primary" @click="handleSubmit">确 定</el-button>
-          <el-button @click="closeDialog()">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-    <check-dialog ref="checkDialog" @tableChange="tableChange"></check-dialog>
-    <check-modle ref="checkModle" @modleChange="modleChange"></check-modle>
-  </div>
-</template>
-<script setup lang="ts">
-import {addPaperInfo, getPaperInfo, updatePaperInfo} from "@/api/baseInfo";
-import type {FormInstance} from 'element-plus'
-import CheckDialog from './checkDialog.vue'
-import CheckModle from './checkModle.vue'
-let dialogVisible = ref(false)
-let dialogTitle = ref("")
-const formRef = ref<FormInstance>()
-const checkDialog = ref<any>()
-const checkModle = ref<any>()
-let basePaperName = ref('')
-let mtModelName = ref();
-const emit = defineEmits(['dialogChange'])
-const formData = reactive({
-  id: "",
-  idPaperType: '',
-  idPaperBaseInfo: '',
-  paperName: '',
-  mtRule: '',
-  mtSuttle: '',
-  paperCode: '',
-  mtModel: '选择品牌',
-  convertUnitByToMt: '',
-  convertUnitMtToSe: '',
-  byUnit: '吨',
-  mtUnit: '令',
-  seUnit: '张',
-  barCode: '',
-  remark: '',
-  priceType: 0,
-})
-function paperDialog() {
-  checkDialog.value.dialogVisible = true;
-  checkDialog.value.dialogTitle = '选择纸张类型';
-}
-function mtModelDialog() {
-  checkModle.value.dialogVisible = true;
-  checkModle.value.dialogTitle = '选择品牌';
-}
-function handleSubmit() {
-  formRef.value.validate((valid: any) => {
-    if (valid) {
-      const itemId = formData.id;
-      if (itemId) {
-        //修改
-        const postData = JSON.stringify(formData)
-        const params = {
-          "info": postData,
-        }
-        updatePaperInfo(params).then((response) => {
-          dialogVisible.value = false
-          if (response.httpCode == 200) {
-            emit('dialogChange');
-            ElMessage.success("操作成功");
-          }
-        })
-      } else {
-        //增加
-        if (!formData.idPaperBaseInfo) {
-          ElMessage.warning('请选择纸张类型')
-          return
-        }
-        if (!mtModelName.value) {
-          ElMessage.warning('请选择品牌')
-          return
-        }
-        const postData = JSON.stringify(formData)
-        const params = {
-          "info": postData
-        }
-        addPaperInfo(params).then((response) => {
-          dialogVisible.value = false
-          if (response.httpCode == 200) {
-            emit('dialogChange');
-            ElMessage.success("操作成功");
-          }
-        })
-      }
-    }
-  });
-}
-
-function getItemData(item) {
-  const data = {
-    id: item
-  }
-  getPaperInfo(data).then(response => {
-    if (response.httpCode == 200) {
-      const data = response.data
-      basePaperName.value = data.paperTypeName
-      mtModelName.value = data.mtModel
-      Object.assign(formData, {...data});
-    }
-  })
-}
-
-/**  重置表单 */
-function resetForm() {
-  formRef.value.resetFields();
-    formData.id = ''
-  console.log(formData.id);
-}
-
-/**关闭弹窗 */
-function closeDialog() {
-  dialogVisible.value = false
-  formRef.value.resetFields();
-  formData.id = undefined;
-}
-function tableChange(row) {
-  console.log(row);
-  formData.mtSuttle = row.mtSuttle
-  formData.idPaperBaseInfo = row.id
-  formData.idPaperType = row.idPaperType
-  basePaperName.value = row.paperName
-}
-function modleChange(row) {
-  console.log(row);
-  formData.mtModel = row.brandName;
-  mtModelName.value = row.brandName;
-}
-
-defineExpose({
-  dialogVisible,
-  dialogTitle,
-  getItemData,
-  resetForm
-})
-</script>
-
-
-<style scoped lang="scss">
-
-</style>

src/views/baseInfo/paperInfo/index.vue

@@ -1,180 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="filter-container">
-      <el-input @keyup.enter="handleSearch" class="w200px mr5px" v-model="queryForm.keyWord" placeholder="关键字搜索"/>
-      <el-button type="primary" @click="handleSearch">
-        <i-ep-search/>
-        搜索
-      </el-button>
-      <div class="w100px ml10px" style="display: inline-block;">
-        <el-checkbox style="position: absolute;top: 11px" v-model="disableLock" label="已禁用"
-                     border></el-checkbox>
-      </div>
-      <el-button @click="openDialog()" color="#11a983">
-        <i-ep-plus/>
-        增加纸张档案
-      </el-button>
-      <el-button type="primary" @click="refreshTableInfo">
-        <i-ep-refresh/>
-      </el-button>
-<!--      <el-button type="danger" @click="resetTableInfo">-->
-<!--       重置纸张入库均价-->
-<!--      </el-button>-->
-    </div>
-    <div class="table-con">
-      <el-table
-          :max-height="tableHeight"
-          v-loading="loading"
-          :data="tableData"
-          highlight-current-row
-          border
-      >
-        <el-table-column label="操作" width="140">
-          <template #default="{row}">
-            <el-button link @click="openDialog(row.id)" type="primary">
-              <i-ep-edit/>
-              编辑
-            </el-button>
-            <el-button v-if="row.voidFlag==0" link @click="handleDisable(row.id,1)" type="warning">禁用</el-button>
-            <el-button v-if="row.voidFlag==1" type="success" link @click="handleDisable(row.id,0)">启用</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-            type="index"
-            label="#"
-            width="50">
-          <template #default="scope">
-            <span>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="paperCode" width="100" label="纸张编码"/>
-        <el-table-column prop="paperName" width="250" label="纸张名称"/>
-        <el-table-column prop="mtSuttle" width="120" label="克重"/>
-        <el-table-column prop="mtRule" width="200" label="规格"/>
-        <el-table-column prop="mtModel" width="200" label="品牌"/>
-        <el-table-column prop="paperTypeName" width="200" label="纸张类型名称"/>
-        <el-table-column prop="remark" width="200" label="备注"/>
-        <el-table-column
-            prop="status"
-            label="状态">
-          <template #default="{row}">
-            <el-tag v-if="row.voidFlag==0" type="success">
-              正常
-            </el-tag>
-            <el-tag v-else="row.voidFlag==1" type="danger">
-              停用
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="createTime"
-            label="创建时间"
-            width="155">
-          <template #default="{row}">
-          <span v-if="row.createTime">
-           {{ $filters.getTime(row.createTime) }}
-          </span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-          v-if="total > 0"
-          v-model:total="total"
-          v-model:page="queryPage.pageIndex"
-          v-model:limit="queryPage.pageSize"
-          @pagination="getTableData"
-      />
-    </div>
-    <child-dialog ref="childDialog" @dialogChange="dialogChange"></child-dialog>
-  </div>
-</template>
-<script setup lang="ts">
-import {getPaperInfoList, voidPaperInfo} from "@/api/baseInfo";
-import ChildDialog from './compt/ChildDialog.vue'
-import {useTable} from '@/hooks/useTable'
-
-let disableLock = ref('')
-const childDialog = ref<any>()
-
-function checkDisable() {
-
-}
-
-//增加编辑
-function openDialog(item?: any) {
-  childDialog.value.dialogVisible = true;
-  if (item) {
-    childDialog.value.dialogTitle = "编辑";
-    nextTick(() => {
-      childDialog.value.getItemData(item)
-    });
-  } else {
-    nextTick(() => {
-
-      childDialog.value.basePaperName = "";
-      childDialog.value.dialogTitle = "增加";
-      childDialog.value.resetForm()
-    })
-
-  }
-}
-
-//禁用删除
-function handleDisable(id, status) {
-  ElMessageBox.confirm("确认操作?", "警告", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    type: "warning",
-  }).then(() => {
-    const postData = {
-      id: id,
-      voidFlag: status
-    }
-    const params = {
-      "info": JSON.stringify(postData),
-    }
-    voidPaperInfo(params).then((response) => {
-      if (response.httpCode == 200) {
-        ElMessage.success("操作成功");
-        getTableData();
-      }
-
-    })
-  })
-}
-
-//修改成功后传递事件
-function dialogChange() {
-  getTableData()
-}
-
-const queryForm = reactive({
-  keyWord: '',
-  voidFlag: 0
-})
-watch(
-    () => disableLock.value,
-    (disableLock) => {
-      console.log(disableLock);
-      if (disableLock) {
-        queryForm.voidFlag = 1
-        getTableData()
-      } else {
-        queryForm.voidFlag = 0
-        getTableData()
-      }
-    }
-);
-const {
-  tableData,
-  queryPage,
-  total,
-  loading,
-  getTableData,
-  tableHeight,
-  handleSearch,//搜索
-  refreshTableInfo,//刷新
-} = useTable(getPaperInfoList, queryForm);
-</script>
-
-

src/views/baseInfo/paperType/compt/childDialog.vue

@@ -1,121 +0,0 @@
-<template>
-  <div class="dialog">
-    <el-dialog
-        v-model="dialogVisible"
-        :title="dialogTitle"
-        width="480px"
-        @close="closeDialog()"
-    >
-      <el-form
-          ref="formRef"
-          :model="formData"
-          :rules="rules"
-          label-width="120px"
-      >
-        <el-row>
-          <el-col :span="24">
-            <el-form-item prop="paperTypeName" label="分类名称">
-              <el-input v-model="formData.paperTypeName"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-      </el-form>
-
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button v-throttle type="primary" @click="handleSubmit">确 定</el-button>
-          <el-button @click="closeDialog()">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script setup lang="ts">
-import {addPaperInfoType, getPaperInfoType, updatePaperInfoType} from "@/api/baseInfo";
-import type {FormInstance} from 'element-plus'
-
-let dialogVisible = ref(false)
-let dialogTitle = ref("")
-const formRef = ref<FormInstance>()
-const emit = defineEmits(['dialogChange'])
-const formData = reactive({
-  paperTypeName: '',
-  id: ""
-})
-const rules = reactive({
-  paperTypeName: [{required: true, message: "请输入产品分类名称", trigger: "blur"}],
-});
-
-function handleSubmit() {
-  formRef.value.validate((valid: any) => {
-    if (valid) {
-      const itemId = formData.id;
-      if (itemId) {
-        //修改
-        const postData = JSON.stringify(formData)
-        const params = {
-          "infoType": postData,
-        }
-        updatePaperInfoType(params).then((response) => {
-          dialogVisible.value = false
-          if (response.httpCode == 200) {
-            emit('dialogChange');
-            ElMessage.success("操作成功");
-          }
-        })
-      } else {
-        //增加
-        const postData = JSON.stringify(formData)
-        const params = {
-          "infoType": postData,
-        }
-        addPaperInfoType(params).then((response) => {
-          dialogVisible.value = false
-          if (response.httpCode == 200) {
-            emit('dialogChange');
-            ElMessage.success("操作成功");
-          }
-        })
-      }
-    }
-  });
-}
-
-function getItemData(item) {
-  const data = {
-    id: item
-  }
-  getPaperInfoType(data).then(response => {
-    if (response.httpCode == 200) {
-      const data = response.data
-      Object.assign(formData, {...data});
-    }
-  })
-}
-
-/**  重置表单 */
-function resetForm() {
-  formRef.value.resetFields();
-  formData.id = undefined
-}
-
-/**关闭弹窗 */
-function closeDialog() {
-  dialogVisible.value = false
-  formRef.value.resetFields();
-  formData.id = undefined;
-}
-
-defineExpose({
-  dialogVisible,
-  dialogTitle,
-  getItemData,
-  resetForm
-})
-</script>
-
-
-<style scoped lang="scss">
-
-</style>

src/views/baseInfo/paperType/index.vue

@@ -1,165 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="filter-container">
-      <el-input @keyup.enter="handleSearch"  class="w200px mr5px" v-model="queryForm.keyWord" placeholder="关键字搜索" />
-      <el-button type="primary" @click="handleSearch"><i-ep-search/>搜索</el-button>
-      <div class="w100px ml10px" style="display: inline-block;">
-        <el-checkbox style="position: absolute;top: 11px"  @change="checkDisable" v-model="disableLock" label="已禁用" border></el-checkbox>
-      </div>
-      <el-button @click="openDialog()" color="#11a983">
-        <i-ep-plus/>
-        增加纸张分类
-      </el-button>
-      <el-button type="primary" @click="refreshTableInfo">
-        <i-ep-refresh/>
-      </el-button>
-    </div>
-    <div class="table-con">
-      <el-table
-          :max-height="tableHeight"
-          v-loading="loading"
-          :data="tableData"
-          highlight-current-row
-          border
-      >
-        <el-table-column label="操作" width="140">
-          <template #default="{row}">
-            <el-button link @click="openDialog(row.id)" type="primary">
-              <i-ep-edit/>
-              编辑
-            </el-button>
-            <el-button v-if="row.voidFlag==0" link @click="handleDisable(row.id,1)" type="warning">禁用</el-button>
-            <el-button v-if="row.voidFlag==1" type="success" link @click="handleDisable(row.id,0)">启用</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-            type="index"
-            label="#"
-            width="50">
-          <template #default="scope">
-            <span>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="paperTypeName" width="250" label="分类名称"/>
-        <el-table-column prop="paperTypeCode" width="120" label="分类编码"/>
-        <el-table-column prop="paperCount" width="120" label="纸张档案数量"/>
-        <el-table-column
-            prop="status"
-            label="状态">
-          <template #default="{row}">
-            <el-tag v-if="row.voidFlag==0" type="success">
-              正常
-            </el-tag>
-            <el-tag v-else="row.voidFlag==1" type="danger">
-              停用
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="createTime"
-            label="创建时间"
-            width="155">
-          <template #default="{row}">
-          <span v-if="row.createTime">
-           {{ $filters.getTime(row.createTime) }}
-          </span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-          v-if="total > 0"
-          v-model:total="total"
-          v-model:page="queryPage.pageIndex"
-          v-model:limit="queryPage.pageSize"
-          @pagination="getTableData"
-      />
-    </div>
-    <child-dialog ref="childDialog" @dialogChange="dialogChange"></child-dialog>
-  </div>
-</template>
-<script setup lang="ts">
-import {getPaperTypeList, voidPaperInfoType} from "@/api/baseInfo";
-import ChildDialog from './compt/ChildDialog.vue'
-import {useTable} from '@/hooks/useTable'
-let disableLock = ref('')
-const childDialog = ref<any>()
-function checkDisable() {
-
-}
-//增加编辑
-function openDialog(item?: any) {
-  childDialog.value.dialogVisible = true;
-  if (item) {
-    childDialog.value.dialogTitle = "编辑";
-    nextTick(() => {
-      childDialog.value.getItemData(item)
-    });
-  } else {
-    nextTick(() => {
-      childDialog.value.dialogTitle = "增加";
-      childDialog.value.resetForm()
-    })
-
-
-  }
-}
-
-//禁用删除
-function handleDisable(id, status) {
-  ElMessageBox.confirm("确认操作?", "警告", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    type: "warning",
-  }).then(() => {
-    const postData = {
-      id: id,
-      voidFlag: status
-    }
-    const params = {
-      "infoType": JSON.stringify(postData),
-    }
-    voidPaperInfoType(params).then((response) => {
-      if (response.httpCode == 200) {
-        ElMessage.success("操作成功");
-        getTableData();
-      }
-
-    })
-  })
-}
-
-//修改成功后传递事件
-function dialogChange() {
-  getTableData()
-}
-
-const queryForm = reactive({
-  keyWord: '',
-  voidFlag:0
-})
-watch(
-    () => disableLock.value,
-    (disableLock) => {
-      console.log(disableLock);
-      if (disableLock) {
-        queryForm.voidFlag = 1
-        getTableData()
-      }else {
-        queryForm.voidFlag = 0
-        getTableData()
-      }
-    }
-);
-const {
-  tableData,
-  queryPage,
-  total,
-  loading,
-  getTableData,
-  tableHeight,
-  handleSearch,//搜索
-  refreshTableInfo,//刷新
-} = useTable(getPaperTypeList, queryForm);
-</script>
-
-

src/views/baseInfo/basePaperInfo/compt/childDialog.vue

@@ -14,33 +14,32 @@
       >
         <el-row>
           <el-col :span="24">
-            <el-form-item prop="idPaperType" label="纸张类型">
-              <el-select v-model="formData.idPaperType" filterable placeholder="请选择"
-                         :disabled="formData.id!=''">
-                <el-option
-                    v-for="item in typeOptions"
-                    :key="item.id"
-                    :label="item.paperTypeName"
-                    :value="item.id">
-                </el-option>
-              </el-select>
+            <el-form-item prop="platformName" label="平台名称">
+              <el-input v-model="formData.platformName"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item prop="priceType" label="计价方式">
-              <el-select v-model="formData.priceType" filterable placeholder="请选择">
+            <el-form-item label="平台类别">
+              <el-select v-model="formData.platformType" filterable placeholder="请选择" style="width: 320px">
                 <el-option
-                    v-for="item in priceOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
+                  v-for="item in optionsList"
+                  :key="item.id"
+                  :label="item.tagName"
+                  :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item prop="mtSuttle" label="克重">
-              <el-input :disabled="formData.id!=''" v-model="formData.mtSuttle"/>
+            <el-form-item prop="requireList" label="平台接入需求">
+              <el-select v-model="formData.requireId" placeholder="请选择" style="width: 320px">
+                <el-option
+                    v-for="type in typeOptions"
+                    :key="type.id"
+                    :label="type.requireName"
+                    :value="type.id">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -57,47 +56,50 @@
   </div>
 </template>
 <script setup lang="ts">
-import {addPaperBaseInfo, getPaperBaseInfo, updatePaperBaseInfo,getPaperTypeList} from "@/api/baseInfo";
+import {getPlatformInfo,addPlatformInfo,updatePlatformInfo,queryPlatformRequireList} from "@/api/baseInfo";
 import type {FormInstance} from 'element-plus'
-const typeOptions = ref <any> ()
+
 let dialogVisible = ref(false)
 let dialogTitle = ref("")
 const formRef = ref<FormInstance>()
 const emit = defineEmits(['dialogChange'])
 const formData = reactive({
-  paperName: '',
-  idPaperType: '',
-  paperTypeName: '',
-  priceType: 0,
-  paperPrice: '',
-  mtSuttle: '',
+  platformName: '',
+  platformType: '',//平台类别 0订单平台/1配送平台,
+  requireList:null,
+  requireId:"",
   id: ""
 })
-const priceOptions = [
-      {
-        label: '吨价',
-        value: 0
-      },
-      {
-        label: '平方单价',
-        value: 1
-      }
-    ]
 const rules = reactive({
-  paperName: [{required: true, message: "请输入基础纸张名称", trigger: "blur"}],
+  platformName: [{required: true, message: "请输入平台名称", trigger: "blur"}],
 });
-
+const typeOptions = ref<any>()
+const optionsList = [
+  {
+    id: 1,
+    tagName: '订单平台',
+    value: 0
+  },
+  {
+    id: 2,
+    tagName: '配送平台',
+    value: 1
+  }
+]
 function handleSubmit() {
   formRef.value.validate((valid: any) => {
     if (valid) {
+      console.log(formData.requireId);
+      formData.requireList =typeOptions.value.find(x=> x.id === formData.requireId)
+      console.log(formData.requireList);
       const itemId = formData.id;
       if (itemId) {
         //修改
         const postData = JSON.stringify(formData)
         const params = {
-          "info": postData,
+          "platformInfo": postData,
         }
-        updatePaperBaseInfo(params).then((response) => {
+        updatePlatformInfo(params).then((response) => {
           dialogVisible.value = false
           if (response.httpCode == 200) {
             emit('dialogChange');
@@ -108,9 +110,9 @@ function handleSubmit() {
         //增加
         const postData = JSON.stringify(formData)
         const params = {
-          "info": postData,
+          "platformInfo": postData,
         }
-        addPaperBaseInfo(params).then((response) => {
+        addPlatformInfo(params).then((response) => {
           dialogVisible.value = false
           if (response.httpCode == 200) {
             emit('dialogChange');
@@ -121,40 +123,37 @@ function handleSubmit() {
     }
   });
 }
-function getPaperTypeInfo() {
-  const page = {
-    pageIndex: 1,
-    pageSize: 10000
-  }
 
+function getItemData(item) {
   const data = {
-    'params': JSON.stringify({
-      'voidFlag': 0
-    }),
-    'page': JSON.stringify(page)
+    idPlatform: item
   }
-  getPaperTypeList(data).then((response) => {
+  getPlatformInfo(data).then(response => {
     if (response.httpCode == 200) {
-      const { data } = response
-      typeOptions.value = data
+      const data = response.data
+      Object.assign(formData, {...data});
     }
   })
 }
-onMounted(() => {
-  getPaperTypeInfo()
-})
-function getItemData(item) {
+
+function getRequireList() {
+  const page = {
+    pageIndex: 1,
+    pageSize: 100,
+  };
   const data = {
-    id: item
+    'params': JSON.stringify({
+      'voidFlag': 0
+    }),
+    "page": JSON.stringify(page)
   }
-  getPaperBaseInfo(data).then(response => {
+  queryPlatformRequireList(data).then((response) => {
     if (response.httpCode == 200) {
-      const data = response.data
-      Object.assign(formData, {...data});
+      const {data} = response
+      typeOptions.value = data
     }
   })
 }
-
 /**  重置表单 */
 function resetForm() {
   formRef.value.resetFields();
@@ -167,7 +166,9 @@ function closeDialog() {
   formRef.value.resetFields();
   formData.id = undefined;
 }
-
+onMounted(() => {
+  getRequireList()
+})
 defineExpose({
   dialogVisible,
   dialogTitle,

src/views/baseInfo/basePaperInfo/index.vue

@@ -12,7 +12,7 @@
       </div>
       <el-button @click="openDialog()" color="#11a983">
         <i-ep-plus/>
-        增加基础纸张档案
+        增加平台档案
       </el-button>
       <el-button type="primary" @click="refreshTableInfo">
         <i-ep-refresh/>
@@ -20,11 +20,11 @@
     </div>
     <div class="table-con">
       <el-table
-          :max-height="tableHeight"
-          v-loading="loading"
-          :data="tableData"
-          highlight-current-row
-          border
+        :max-height="tableHeight"
+        v-loading="loading"
+        :data="tableData"
+        highlight-current-row
+        border
       >
         <el-table-column label="操作" width="140">
           <template #default="{row}">
@@ -37,31 +37,29 @@
           </template>
         </el-table-column>
         <el-table-column
-            type="index"
-            label="#"
-            width="50">
+          type="index"
+          label="#"
+          width="50">
           <template #default="scope">
             <span>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="paperName" width="250" label="基础纸张名称"/>
-        <el-table-column prop="paperTypeName" width="300" label="纸张类型名称"/>
-        <el-table-column prop="mtSuttle" width="120" label="克重"/>
+        <el-table-column prop="platformName" width="250" label="名称"/>
         <el-table-column
-            prop="priceType"
-            label="计价方式">
+            prop="platformType"
+            label="平台类别">
           <template #default="{row}">
-        <span v-if="row.priceType==0" type="success">
-          吨价
-        </span>
-            <span v-else-if="row.priceType==1" type="danger">
-          平方单价
-        </span>
+            <el-tag v-if="row.platformType==0">
+              订单平台
+            </el-tag>
+            <el-tag v-else="row.platformType==1" type="warning">
+              配送平台
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column
-            prop="status"
-            label="状态">
+          prop="status"
+          label="状态">
           <template #default="{row}">
             <el-tag v-if="row.voidFlag==0" type="success">
               正常
@@ -72,39 +70,35 @@
           </template>
         </el-table-column>
         <el-table-column
-            prop="createTime"
-            label="创建时间"
-            width="155">
+          prop="createTime"
+          label="创建时间"
+          width="155">
           <template #default="{row}">
           <span v-if="row.createTime">
-           {{ $filters.getTime(row.createTime) }}
+           {{ $filters.getTime(row.createTime)}}
           </span>
           </template>
         </el-table-column>
       </el-table>
       <pagination
-          v-if="total > 0"
-          v-model:total="total"
-          v-model:page="queryPage.pageIndex"
-          v-model:limit="queryPage.pageSize"
-          @pagination="getTableData"
+        v-if="total > 0"
+        v-model:total="total"
+        v-model:page="queryPage.pageIndex"
+        v-model:limit="queryPage.pageSize"
+        @pagination="getTableData"
       />
     </div>
     <child-dialog ref="childDialog" @dialogChange="dialogChange"></child-dialog>
   </div>
 </template>
 <script setup lang="ts">
-import {getPaperBaseInfoList, voidPaperBaseInfo} from "@/api/baseInfo";
+import {queryPlatformList,voidPlatformInfo} from "@/api/baseInfo";
 import ChildDialog from './compt/ChildDialog.vue'
 import {useTable} from '@/hooks/useTable'
 
 let disableLock = ref('')
 const childDialog = ref<any>()
 
-function checkDisable() {
-
-}
-
 //增加编辑
 function openDialog(item?: any) {
   childDialog.value.dialogVisible = true;
@@ -135,9 +129,9 @@ function handleDisable(id, status) {
       voidFlag: status
     }
     const params = {
-      "info": JSON.stringify(postData),
+      "platformInfo": JSON.stringify(postData),
     }
-    voidPaperBaseInfo(params).then((response) => {
+    voidPlatformInfo(params).then((response) => {
       if (response.httpCode == 200) {
         ElMessage.success("操作成功");
         getTableData();
@@ -157,17 +151,16 @@ const queryForm = reactive({
   voidFlag: 0
 })
 watch(
-    () => disableLock.value,
-    (disableLock) => {
-      console.log(disableLock);
-      if (disableLock) {
-        queryForm.voidFlag = 1
-        getTableData()
-      } else {
-        queryForm.voidFlag = 0
-        getTableData()
-      }
+  () => disableLock.value,
+  (disableLock) => {
+    if (disableLock) {
+      queryForm.voidFlag = 1
+      getTableData()
+    } else {
+      queryForm.voidFlag = 0
+      getTableData()
     }
+  }
 );
 const {
   tableData,
@@ -178,7 +171,7 @@ const {
   tableHeight,
   handleSearch,//搜索
   refreshTableInfo,//刷新
-} = useTable(getPaperBaseInfoList, queryForm);
+} = useTable(queryPlatformList, queryForm);
 </script>
 
 

src/views/baseInfo/paperQuote/compt/childDialog.vue

@@ -14,8 +14,18 @@
       >
         <el-row>
           <el-col :span="24">
-            <el-form-item prop="paperTypeName" label="分类名称">
-              <el-input v-model="formData.paperTypeName"/>
+            <el-form-item prop="requireName" label="名称">
+              <el-input v-model="formData.requireName"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item prop="requireCode" label="唯一code">
+              <el-input v-model="formData.requireCode"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item prop="requireList" label="取值的选择类型">
+              <el-input v-model="formData.valueType"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -32,7 +42,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import {addPaperInfoType, getPaperInfoType, updatePaperInfoType} from "@/api/baseInfo";
+import {getPlatformRequire,addPlatformRequire,updatePlatformRequire} from "@/api/baseInfo";
 import type {FormInstance} from 'element-plus'
 
 let dialogVisible = ref(false)
@@ -40,13 +50,15 @@ let dialogTitle = ref("")
 const formRef = ref<FormInstance>()
 const emit = defineEmits(['dialogChange'])
 const formData = reactive({
-  paperTypeName: '',
+  requireName: '',
+  requireCode: '',//平台类别 0订单平台/1配送平台,
+  valueType:'',
   id: ""
 })
+
 const rules = reactive({
-  paperTypeName: [{required: true, message: "请输入产品分类名称", trigger: "blur"}],
+  requireName: [{required: true, message: "请输入名称", trigger: "blur"}],
 });
-
 function handleSubmit() {
   formRef.value.validate((valid: any) => {
     if (valid) {
@@ -55,9 +67,9 @@ function handleSubmit() {
         //修改
         const postData = JSON.stringify(formData)
         const params = {
-          "infoType": postData,
+          "platformRequire": postData,
         }
-        updatePaperInfoType(params).then((response) => {
+        updatePlatformRequire(params).then((response) => {
           dialogVisible.value = false
           if (response.httpCode == 200) {
             emit('dialogChange');
@@ -68,9 +80,9 @@ function handleSubmit() {
         //增加
         const postData = JSON.stringify(formData)
         const params = {
-          "infoType": postData,
+          "platformRequire": postData,
         }
-        addPaperInfoType(params).then((response) => {
+        addPlatformRequire(params).then((response) => {
           dialogVisible.value = false
           if (response.httpCode == 200) {
             emit('dialogChange');
@@ -84,9 +96,9 @@ function handleSubmit() {
 
 function getItemData(item) {
   const data = {
-    id: item
+    idRequire: item
   }
-  getPaperInfoType(data).then(response => {
+  getPlatformRequire(data).then(response => {
     if (response.httpCode == 200) {
       const data = response.data
       Object.assign(formData, {...data});

src/views/baseInfo/paperQuote/index.vue

@@ -12,7 +12,7 @@
       </div>
       <el-button @click="openDialog()" color="#11a983">
         <i-ep-plus/>
-        增加纸张分类
+        增加平台需求条件档案
       </el-button>
       <el-button type="primary" @click="refreshTableInfo">
         <i-ep-refresh/>
@@ -20,11 +20,11 @@
     </div>
     <div class="table-con">
       <el-table
-          :max-height="tableHeight"
-          v-loading="loading"
-          :data="tableData"
-          highlight-current-row
-          border
+        :max-height="tableHeight"
+        v-loading="loading"
+        :data="tableData"
+        highlight-current-row
+        border
       >
         <el-table-column label="操作" width="140">
           <template #default="{row}">
@@ -37,18 +37,19 @@
           </template>
         </el-table-column>
         <el-table-column
-            type="index"
-            label="#"
-            width="50">
+          type="index"
+          label="#"
+          width="50">
           <template #default="scope">
             <span>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="paperName" width="250" label="分类名称"/>
-        <el-table-column prop="paperTypeName" width="300" label="纸张类型名称"/>
+        <el-table-column prop="requireName" width="250" label="名称"/>
+        <el-table-column prop="requireCode" width="300" label="唯一code"/>
+        <el-table-column prop="valueType" width="300" label="取值的选择类型"/>
         <el-table-column
-            prop="status"
-            label="状态">
+          prop="status"
+          label="状态">
           <template #default="{row}">
             <el-tag v-if="row.voidFlag==0" type="success">
               正常
@@ -59,29 +60,29 @@
           </template>
         </el-table-column>
         <el-table-column
-            prop="createTime"
-            label="创建时间"
-            width="155">
+          prop="createTime"
+          label="创建时间"
+          width="155">
           <template #default="{row}">
           <span v-if="row.createTime">
-           {{ $filters.getTime(row.createTime) }}
+           {{ $filters.getTime(row.createTime)}}
           </span>
           </template>
         </el-table-column>
       </el-table>
       <pagination
-          v-if="total > 0"
-          v-model:total="total"
-          v-model:page="queryPage.pageIndex"
-          v-model:limit="queryPage.pageSize"
-          @pagination="getTableData"
+        v-if="total > 0"
+        v-model:total="total"
+        v-model:page="queryPage.pageIndex"
+        v-model:limit="queryPage.pageSize"
+        @pagination="getTableData"
       />
     </div>
     <child-dialog ref="childDialog" @dialogChange="dialogChange"></child-dialog>
   </div>
 </template>
 <script setup lang="ts">
-import {getPaperBaseInfoList, voidPaperInfoType} from "@/api/baseInfo";
+import {queryPlatformRequireList,voidPlatformRequire} from "@/api/baseInfo";
 import ChildDialog from './compt/ChildDialog.vue'
 import {useTable} from '@/hooks/useTable'
 
@@ -118,9 +119,9 @@ function handleDisable(id, status) {
       voidFlag: status
     }
     const params = {
-      "infoType": JSON.stringify(postData),
+      "platformInfo": JSON.stringify(postData),
     }
-    voidPaperInfoType(params).then((response) => {
+    voidPlatformRequire(params).then((response) => {
       if (response.httpCode == 200) {
         ElMessage.success("操作成功");
         getTableData();
@@ -140,16 +141,16 @@ const queryForm = reactive({
   voidFlag: 0
 })
 watch(
-    () => disableLock.value,
-    (disableLock) => {
-      if (disableLock) {
-        queryForm.voidFlag = 1
-        getTableData()
-      } else {
-        queryForm.voidFlag = 0
-        getTableData()
-      }
+  () => disableLock.value,
+  (disableLock) => {
+    if (disableLock) {
+      queryForm.voidFlag = 1
+      getTableData()
+    } else {
+      queryForm.voidFlag = 0
+      getTableData()
     }
+  }
 );
 const {
   tableData,
@@ -160,5 +161,7 @@ const {
   tableHeight,
   handleSearch,//搜索
   refreshTableInfo,//刷新
-} = useTable(getPaperBaseInfoList, queryForm);
+} = useTable(queryPlatformRequireList, queryForm);
 </script>
+
+

vite.config.ts

@@ -54,7 +54,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
           // // 线上接口地址
           // target: "http://vapi.youlai.tech",
           // 开发接口地址
-          target: "http://192.168.1.24:11991",
+          target: "http://192.168.1.44:52105",
           rewrite: (path) =>
             path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""),
         },