删除菜单

c5506751 · 高宇 · 463263b6 · c5506751 · c5506751 · c5506751
Commit c5506751 authored Aug 01, 2023 by 高宇
7 changed files
--- a/public/alicdn.css
+++ b/public/alicdn.css
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <link rel="icon" href="<%= BASE_URL %>home_logo.png">
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">
+    <link rel="stylesheet" href="./alicdn.css">
    <title><%= webpackConfig.name %></title>
  </head>
  <body>

--- a/src/api/sample/basicInformation.js
+++ b/src/api/sample/basicInformation.js
@@ -46,3 +46,12 @@ export function deleteLogical(id) {
    method: 'delete'
  })
 }
+// 导出信息接口
+export function exporTable(param) {
+  return request({
+    url: '/wbchemistrybaseinfo/export',
+    method: 'get',
+    param,
+    responseType: 'blob'
+  })
+}
--- a/src/layout/components/header.vue
+++ b/src/layout/components/header.vue
@@ -36,11 +36,12 @@
      <!--      <el-badge :value="200" :max="99" class="item">-->
      <!--        <i class="el-icon-message-solid" />-->
      <!--      </el-badge>-->
+
+      <el-dropdown class="avatar-container" trigger="click">
+        <div class="avatar-wrapper">
          <span class="username-text">
            [您好，{{ userName }}]
           </span>
-      <el-dropdown class="avatar-container" trigger="click">
-        <div class="avatar-wrapper">
 <!--          <img :src="avatar" class="user-avatar">-->
          <i class="el-icon-caret-bottom" />
        </div>
@@ -202,6 +203,10 @@ export default {
    .avatar-container {
      margin-right: 30px;

+      .avatar-wrapper :hover{
+        cursor: pointer;
+      }
+
      .avatar-wrapper {
        position: relative;
        height: 40px;

--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -50,12 +50,12 @@
          class="buttons-content"
        >
          <el-checkbox v-model="loginForm.rememberMe" class="rem-code">记住密码</el-checkbox>
-          <el-link
-            :underline="false"
-            @click="goDetail('/forgetPwd')"
-          >
-            <router-link to="/forgetPwd">忘记密码</router-link>
-          </el-link>
+<!--          <el-link-->
+<!--            :underline="false"-->
+<!--            @click="goDetail('/forgetPwd')"-->
+<!--          >-->
+<!--            <router-link to="/forgetPwd">忘记密码</router-link>-->
+<!--          </el-link>-->
        </div>
      </div>
    </el-form>

--- a/src/views/sample/basicInformation/index.vue
+++ b/src/views/sample/basicInformation/index.vue
@@ -25,7 +25,7 @@
      </el-form-item>
      <el-form-item>
        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
-        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
      </el-form-item>
      <div style="float: right">
        <el-form-item>
@@ -36,7 +36,7 @@
            @click="handleAdd"
          >新增</el-button>
          <el-button
-            style="padding: 8px 7px;"
+            style="padding: 8px 7px; width: 79px"
            type="success"
            size="small"
            icon="el-icon-download"
@@ -49,7 +49,7 @@
    <div class="placeholder" />
    <!-- 表单区   -->
    <div style="padding:5px 10px">
-      <div class="mb12 font-small-bold">基础信息列表</div>
+      <div class="mb12 font-small-bold">样品库</div>
      <el-table v-loading="loading" border :data="basicinfoMationList">
        <el-table-column type="index" label="序号" width="50" />
        <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
@@ -92,29 +92,29 @@
            {{ parseTime(scope.row.createDate,'{y}-{m}-{d} {h}:{i}') || '-' }}
          </template>
        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              style="color: #49cec9"
-              @click="handleUpdate(scope.row)"
-            >修改</el-button>
+        <!--        <el-table-column label="操作">-->
+        <!--          <template slot-scope="scope">-->
        <!--            <el-button-->
-            <!--              v-hasPermi="['sys:role:update']"-->
        <!--              size="mini"-->
        <!--              type="text"-->
-            <!--              icon="el-icon-circle-check"-->
-            <!--              @click="handleMenu(scope.row)"-->
-            <!--            >数据权限</el-button>-->
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-            >删除</el-button>
-          </template>
-        </el-table-column>
+        <!--              style="color: #49cec9"-->
+        <!--              @click="handleUpdate(scope.row)"-->
+        <!--            >修改</el-button>-->
+        <!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
+        <!--            &lt;!&ndash;              v-hasPermi="['sys:role:update']"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              size="mini"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              icon="el-icon-circle-check"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              @click="handleMenu(scope.row)"&ndash;&gt;-->
+        <!--            &lt;!&ndash;            >数据权限</el-button>&ndash;&gt;-->
+        <!--            <el-button-->
+        <!--              size="mini"-->
+        <!--              type="text"-->
+        <!--              icon="el-icon-delete"-->
+        <!--              @click="handleDelete(scope.row)"-->
+        <!--            >删除</el-button>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
      </el-table>
    </div>
    <!--  分页区-->
@@ -126,7 +126,7 @@
      @pagination="getList"
    />
    <!--  新增修改弹出  -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
+    <el-dialog title="样品库信息" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
        <el-form-item label="pn" prop="pn">
          <el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" />
@@ -156,8 +156,8 @@
 </template>

 <script>
-import { queryList, add, getDetailById, updataInfo, deleteLogical } from '@/api/sample/basicInformation'
-import { parseTime } from "@/utils";
+import { queryList, add, getDetailById, updataInfo, deleteLogical, exporTable } from '@/api/sample/basicInformation'
+import { parseTime } from '@/utils'

 export default {
  name: 'Index',
@@ -173,8 +173,7 @@ export default {
        name: [{ required: true, message: '请输入name', trigger: 'blur' }],
        qty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
        maxQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
-        minQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
-        unit: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }]
+        minQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }]
      },
      total: 0,
      loading: false,
@@ -275,7 +274,7 @@ export default {
      this.loading = true
      queryList(this.queryParams).then(res => {
        console.log('res', res)
-        res.rows.createDate = parseTime(res.rows.createDate,'{y}-{m}-{d}')
+        res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
        this.total = res.total
        this.basicinfoMationList = res.rows
        this.loading = false
@@ -301,7 +300,29 @@ export default {
      this.title = '添加基础信息表单'
    },
    handleExport() {
-
+      this.$confirm('是否确认导出所有样品库记录信息?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return exporTable(this.queryParams).then(response => {
+          const blob = new Blob([response])
+          const downloadElement = document.createElement('a')
+          // TODO: 创建下载的链接
+          const href = window.URL.createObjectURL(blob)
+          downloadElement.href = href
+          // TODO: 下载后文件名
+          downloadElement.download = '样品库记录' + '.xls'
+          document.body.appendChild(downloadElement)
+          // TODO: 点击下载
+          downloadElement.click()
+          // TODO: 下载完成移除元素
+          document.body.removeChild(downloadElement)
+          // TODO: 释放掉blob对象
+          window.URL.revokeObjectURL(href)
+          // this.download(response.msg);
+        })
+      })
    }
  }
 }

--- a/src/views/sample/correctionLibrary/index.vue
+++ b/src/views/sample/correctionLibrary/index.vue
@@ -27,29 +27,29 @@
        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
      </el-form-item>
-      <div style="float: right">
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="small"
-            icon="el-icon-plus"
-            @click="handleAdd"
-          >新增</el-button>
-          <el-button
-            style="padding: 8px 7px;"
-            type="success"
-            size="small"
-            icon="el-icon-download"
-            @click="handleExport"
-          >导出</el-button>
-        </el-form-item>
-      </div>
+      <!--      <div style="float: right">-->
+      <!--        <el-form-item>-->
+      <!--          <el-button-->
+      <!--            type="primary"-->
+      <!--            size="small"-->
+      <!--            icon="el-icon-plus"-->
+      <!--            @click="handleAdd"-->
+      <!--          >新增</el-button>-->
+      <!--          <el-button-->
+      <!--            style="padding: 8px 7px;"-->
+      <!--            type="success"-->
+      <!--            size="small"-->
+      <!--            icon="el-icon-download"-->
+      <!--            @click="handleExport"-->
+      <!--          >导出</el-button>-->
+      <!--        </el-form-item>-->
+      <!--      </div>-->
    </el-form>
    <!-- 分割线   -->
    <div class="placeholder" />
    <!-- 表单区   -->
    <div style="padding:5px 10px">
-      <div class="mb12 font-small-bold">基础样式列表</div>
+      <div class="mb12 font-small-bold">库存修正</div>
      <el-table v-loading="loading" border :data="basicinfoMationList">
        <el-table-column type="index" label="序号" width="50" />
        <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
@@ -67,14 +67,14 @@
            {{ scope.row.name || '-' }}
          </template>
        </el-table-column>
-        <el-table-column label="max_qty" prop="max_qty" :show-overflow-tooltip="true">
+        <el-table-column label="maxQty" prop="maxQty" :show-overflow-tooltip="true">
          <template slot-scope="scope">
-            {{ scope.row.max_qty || '-' }}
+            {{ scope.row.maxQty || '-' }}
          </template>
        </el-table-column>
-        <el-table-column label="min_qty" prop="min_qty" :show-overflow-tooltip="true">
+        <el-table-column label="minQty" prop="minQty" :show-overflow-tooltip="true">
          <template slot-scope="scope">
-            {{ scope.row.min_qty || '-' }}
+            {{ scope.row.minQty || '-' }}
          </template>
        </el-table-column>
        <el-table-column label="unit" prop="unit" :show-overflow-tooltip="true">
@@ -126,17 +126,55 @@
      @pagination="getList"
    />
    <!--  新增修改弹出  -->
-
+    <el-dialog title="库存修正信息" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="pn" prop="pn">
+          <el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" />
+        </el-form-item>
+        <el-form-item label="name" prop="name">
+          <el-input v-model.trim="form.name" :maxlength="30" placeholder="请输入name" />
+        </el-form-item>
+        <el-form-item label="qty" prop="qty">
+          <el-input v-model.trim="form.qty" :maxlength="30" placeholder="请输入qty" />
+        </el-form-item>
+        <el-form-item label="maxQty" prop="maxQty">
+          <el-input v-model.trim="form.maxQty" :maxlength="30" placeholder="请输入max_qty" />
+        </el-form-item>
+        <el-form-item label="minQty" prop="minQty">
+          <el-input v-model.trim="form.minQty" :maxlength="30" placeholder="请输入min_qty" />
+        </el-form-item>
+        <el-form-item label="unit" prop="unit">
+          <el-input v-model.trim="form.unit" :maxlength="30" placeholder="请输入unit" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </div>
+    </el-dialog>
  </div>
 </template>

 <script>
-import {queryList} from '@/api/sample/basicInformation'
+import { add, deleteLogical, exporTable, getDetailById, queryList, updataInfo } from '@/api/sample/basicInformation'
+import { parseTime } from '@/utils'

 export default {
  name: 'Index',
  data() {
    return {
+      title: '',
+      open: false,
+      form: {
+
+      },
+      rules: {
+        pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
+        name: [{ required: true, message: '请输入name', trigger: 'blur' }],
+        qty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
+        maxQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
+        minQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }]
+      },
      total: 0,
      loading: false,
      queryParams: {
@@ -153,17 +191,89 @@ export default {
    this.getList()
  },
  methods: {
-    handleDelete() {
-
+    // 清空表单
+    reFrom() {
+      this.form = {
+        businessId: undefined,
+        pn: '',
+        name: '',
+        qty: '',
+        maxQty: '',
+        minQty: '',
+        unit: ''
+      }
+      this.$refs.form.clearValidate()
    },
-    handleUpdate() {
-
+    // 提交
+    submitForm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          // 校验通过，提交表单或进行其他操作
+          console.log('form', this.form)
+          if (this.form.businessId !== undefined) {
+            console.log('更新')
+            updataInfo(this.form).then(res => {
+              console.log('res', res)
+              if (res.code === 200) {
+                this.open = false
+                this.$message.success('操作成功')
+                this.getList()
+                this.reFrom()
+              } else if (res.code === null) {
+                this.$message.error(res.message)
+              }
+            })
+          } else {
+            add(this.form).then(res => {
+              if (res.code === 200) {
+                this.open = false
+                this.$message.success('操作成功')
+                this.getList()
+                this.reFrom()
+              } else if (res.code === null) {
+                this.$message.error(res.message)
+              }
+            })
+          }
+        } else {
+          // 校验失败，显示错误信息或进行其他操作
+        }
+      })
+    },
+    cancel() {
+      this.open = false
+      this.reFrom()
+    },
+    handleDelete(row) {
+      const id = row.businessId
+      this.$confirm('是否确认操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(res => {
+        deleteLogical(id).then(res => {
+          console.log('res', res)
+          if (res.code === 200) {
+            this.$message.success('操作成功')
+            this.getList()
+          }
+        })
+      })
+    },
+    // 编辑
+    handleUpdate(row) {
+      const id = row.businessId
+      getDetailById(id).then(res => {
+        this.form = res.data
+        this.open = true
+      })
    },
    // 初始化获取数据
    getList() {
      this.loading = true
      queryList(this.queryParams).then(res => {
        console.log('res', res)
+        res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
        this.total = res.total
        this.basicinfoMationList = res.rows
        this.loading = false
@@ -185,10 +295,32 @@ export default {
      this.getList()
    },
    handleAdd() {
-
+      this.open = true
    },
    handleExport() {
-
+      this.$confirm('是否确认导出所有样品库记录信息?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return exporTable(this.queryParams).then(response => {
+          const blob = new Blob([response])
+          const downloadElement = document.createElement('a')
+          // TODO: 创建下载的链接
+          const href = window.URL.createObjectURL(blob)
+          downloadElement.href = href
+          // TODO: 下载后文件名
+          downloadElement.download = '样品库记录' + '.xls'
+          document.body.appendChild(downloadElement)
+          // TODO: 点击下载
+          downloadElement.click()
+          // TODO: 下载完成移除元素
+          document.body.removeChild(downloadElement)
+          // TODO: 释放掉blob对象
+          window.URL.revokeObjectURL(href)
+          // this.download(response.msg);
+        })
+      })
    }
  }
 }