From 620ce5147c1b98061255f73014735849e4ea2798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98zhengbw=E2=80=99?= <‘q59323016@qq.com’>
Date: Tue, 18 Feb 2025 14:04:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5-=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8D=95=E4=BD=8D=E7=AE=A1=E7=90=86=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=EF=BC=8C=E5=88=A0=E9=99=A4=E5=8E=9F=E5=85=88?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=8D=95=E4=BD=8D=E7=9B=B8=E5=85=B3=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=EF=BC=9B=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=B7=B3=E8=BD=AC=E9=A1=B5=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=BB=98=E8=AE=A4=E7=A9=BA=E7=99=BD=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/unit.js               |  54 ----
 src/router/index.js                 |   2 +-
 src/views/basic/unit/index.vue      | 220 --------------
 src/views/goods/goodsInfo/index.vue | 431 ++++++++++++++++------------
 src/views/system/home/index.vue     |   5 +
 5 files changed, 256 insertions(+), 456 deletions(-)
 delete mode 100644 src/api/basic/unit.js
 delete mode 100644 src/views/basic/unit/index.vue
 create mode 100644 src/views/system/home/index.vue

diff --git a/src/api/basic/unit.js b/src/api/basic/unit.js
deleted file mode 100644
index 695e262..0000000
--- a/src/api/basic/unit.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from '@/utils/request'
-
-// 创建单位
-export function createUnit(data) {
-  return request({
-    url: '/basic/unit/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新单位
-export function updateUnit(data) {
-  return request({
-    url: '/basic/unit/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除单位
-export function deleteUnit(id) {
-  return request({
-    url: '/basic/unit/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得单位
-export function getUnit(id) {
-  return request({
-    url: '/basic/unit/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得单位分页
-export function getUnitPage(query) {
-  return request({
-    url: '/basic/unit/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出单位 Excel
-export function exportUnitExcel(query) {
-  return request({
-    url: '/basic/unit/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
diff --git a/src/router/index.js b/src/router/index.js
index f42547e..423c983 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -70,7 +70,7 @@ export const constantRoutes = [
     redirect: 'index',
     children: [{
         path: 'index',
-        component: (resolve) => require(['@/views/basic/businessInfo/index'], resolve),
+        component: (resolve) => require(['@/views/system/home/index'], resolve),
         // name: '',
         // meta: {title: '', icon: 'dashboard', affix: true}
       }
diff --git a/src/views/basic/unit/index.vue b/src/views/basic/unit/index.vue
deleted file mode 100644
index f98a714..0000000
--- a/src/views/basic/unit/index.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-<template>
-  <div class="app-container">
-     <div class="app-container-search main-bgcolor main-radius">
-      <h1 class="">单位管理</h1>
-      <br />
-      <!-- 搜索工作栏 -->
-       <SearchForm
-       ref="searchForm"
-       :searchFormParam="{queryParams, dataSource}"
-       :showSearch.sync="showSearch"
-       @handleQuery="handleQuery"
-       @resetQuery="resetQuery"
-       ></SearchForm>
-    </div>
-
-    <div class="app-container-list main-bgcolor main-radius shopping">
-      <div class="shopping-top">
-        <div class="shopping-title">单位列表</div>
-        <el-button class="shopping-add-btn" type="primary" plain @click="handleAdd"
-                  v-hasPermi="['basic:unit:create']">新增</el-button>
-      </div>
-
-    <!-- 列表 -->
-     <el-table v-loading="loading" :data="list">
-        <el-table-column label="序号" align="center" type="index" width="80" >
-          <template v-slot="{ $index }">
-            <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="单位名称" align="center" prop="unitName" />
-        <el-table-column label="创建时间" align="center" prop="createTime" >
-          <template v-slot="{ row }">
-            <span>{{parseTime(row.createTime)}}</span>
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template v-slot="scope"> -->
-            <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                       v-hasPermi="['basic:unit:update']">修改</el-button> -->
-            <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                       v-hasPermi="['basic:unit:delete']">删除</el-button> -->
-          <!-- </template>
-        </el-table-column> -->
-        <div slot="empty">
-          <EmptyTable />
-        </div>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-    </div>            
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单位名称" prop="unitName">
-          <el-input v-model="form.unitName" placeholder="请输入单位名称" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { createUnit, updateUnit, deleteUnit, getUnit, getUnitPage, exportUnitExcel } from "@/api/basic/unit";
-import SearchForm from '@/components/Customer/SearchForm'
-import EmptyTable from '@/components/EmptyTable'
-export default {
-  name: "Unit",
-  components: {
-     SearchForm,
-     EmptyTable,
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 商品列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        unitName: null,
-        createTime: [],
-      },
-      dataSource:[
-        {
-          key: 'unitName',
-          itemType: 'input',
-          label: '单位名称',
-          placeholder: '请输入',
-          onEnterKeyUp: this.handleQuery,
-        },
-      ],  
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        unitName: [{ required: true, message: "单位名称不能为空", trigger: "blur" }],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getUnitPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        unitName: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加商品";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getUnit(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改商品";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateUnit(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createUnit(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id;
-      this.$modal.confirm('是否确认删除商品编号为"' + id + '"的数据项?').then(function() {
-          return deleteUnit(id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有商品数据项?').then(() => {
-          this.exportLoading = true;
-          return exportUnitExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '商品.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/goods/goodsInfo/index.vue b/src/views/goods/goodsInfo/index.vue
index 0933934..670f5bb 100644
--- a/src/views/goods/goodsInfo/index.vue
+++ b/src/views/goods/goodsInfo/index.vue
@@ -6,7 +6,7 @@
       <!-- 搜索工作栏 -->
       <SearchInfo
         ref="searchForm"
-        :searchFormParam="{ queryParams , dataSource }"
+        :searchFormParam="{ queryParams, dataSource }"
         :showSearch.sync="showSearch"
         @handleQuery="handleQuery"
         @resetQuery="resetQuery"
@@ -16,75 +16,123 @@
     <div class="app-container-list main-bgcolor main-radius shopping">
       <div class="shopping-top">
         <div class="shopping-title">商品列表</div>
-        <el-button class="shopping-add-btn" type="primary" plain @click="handleAdd"
-                  v-hasPermi="['basic:goods-info:create']">新增商品</el-button>
+        <el-button
+          class="shopping-add-btn"
+          type="primary"
+          plain
+          @click="handleAdd"
+          v-hasPermi="['basic:goods-info:create']"
+          >新增商品</el-button
+        >
       </div>
 
       <!-- 列表 -->
       <el-table v-loading="loading" :data="list">
-        <el-table-column label="编号" align="center" type="index" width="80" >
+        <el-table-column label="编号" align="center" type="index" width="80">
           <template v-slot="{ $index }">
-            <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
+            <span>{{
+              $index + 1 + (queryParams.pageNo - 1) * queryParams.pageSize
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="商品名称" prop="goodsName" width="200" />
-        <el-table-column label="商品图片" align="center" prop="goodsImgUrl" width="230" >
+        <el-table-column
+          label="商品图片"
+          align="center"
+          prop="goodsImgUrl"
+          width="230"
+        >
           <template slot-scope="{ row }">
             <template v-if="row.goodsImgUrl != '--'">
               <el-image
-                style="width: 60px; height: 60px;margin: 5px;"
-                v-for="(item,index) in row.goodsImgUrl"
+                style="width: 60px; height: 60px; margin: 5px"
+                v-for="(item, index) in row.goodsImgUrl"
                 :key="index"
                 :src="item"
                 :preview-src-list="row.goodsImgUrl"
-                fit="fill"></el-image>
+                fit="fill"
+              ></el-image>
             </template>
             <template v-else>
-              <span>{{row.goodsImgUrl}}</span>
+              <span>{{ row.goodsImgUrl }}</span>
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="商品编码" prop="goodsId" width="150" >
+        <el-table-column label="商品编码" prop="goodsId" width="150">
           <template slot-scope="{ row }">
-            <el-tooltip class="item" effect="dark" :content="row.goodsId" placement="top">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="row.goodsId"
+              placement="top"
+            >
               <div class="flex-acenter">
-                <span class="more-width-20">{{row.goodsId}}</span>
-                <el-button type="text" icon="el-icon-copy-document" @click.stop="copyContent(row.goodsId)"></el-button>
+                <span class="more-width-20">{{ row.goodsId }}</span>
+                <el-button
+                  type="text"
+                  icon="el-icon-copy-document"
+                  @click.stop="copyContent(row.goodsId)"
+                ></el-button>
               </div>
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column label="所属商户" prop="belongBusinessName" width="200" >
+        <el-table-column label="所属商户" prop="belongBusinessName" width="200">
           <template slot-scope="{ row }">
             <div>
-              <span>{{row.belongBusinessName}}</span>
-              <el-button type="text" icon="el-icon-copy-document" @click.stop="copyContent(row.belongBusinessName)"></el-button>
+              <span>{{ row.belongBusinessName }}</span>
+              <el-button
+                type="text"
+                icon="el-icon-copy-document"
+                @click.stop="copyContent(row.belongBusinessName)"
+              ></el-button>
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="品类名称" prop="goodsType" width="200" >
+        <el-table-column label="品类名称" prop="goodsType" width="200">
           <template slot-scope="{ row }">
             <div>
-              <el-tooltip class="item" effect="dark" :content="row.goodsType" placement="top">
-                <span class="more-width-full">{{row.goodsType}}</span>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="row.goodsType"
+                placement="top"
+              >
+                <span class="more-width-full">{{ row.goodsType }}</span>
               </el-tooltip>
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="商品规格" prop="goodsSpecs" width="150" />
-        <el-table-column label="商品单位" prop="goodsUnitName" width="100" />
+        <el-table-column label="商品规格" prop="goodsSpecs" width="150" show-overflow-tooltip/>
         <el-table-column label="保质期(天)" prop="shelfLife" width="100" />
         <el-table-column label="商品说明" prop="goodsRemarks" width="150" />
-        <el-table-column label="操作" fixed="right" class-name="small-padding fixed-width" width="150" >
+        <el-table-column
+          label="操作"
+          fixed="right"
+          class-name="small-padding fixed-width"
+          width="150"
+        >
           <template v-slot="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                      v-hasPermi="['basic:goods-info:update']">编辑</el-button>
-            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                      v-hasPermi="['basic:goods-info:delete']">删除</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['basic:goods-info:update']"
+              >编辑</el-button
+            >
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['basic:goods-info:delete']"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
         <div slot="empty">
-            <EmptyTable />
+          <EmptyTable />
         </div>
       </el-table>
       <!-- 分页组件 -->
@@ -98,65 +146,96 @@
     </div>
 
     <!-- 对话框(添加) -->
-    <el-dialog class="add-dialog" :title="title" :visible.sync="open" width="800px" append-to-body @open="handleDialogOpen">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="top">
+    <el-dialog
+      class="add-dialog"
+      :title="title"
+      :visible.sync="open"
+      width="800px"
+      append-to-body
+      @open="handleDialogOpen"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        label-position="top"
+      >
         <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="商品名称" prop="goodsName">
-              <el-input :disabled="isDisable" v-model="form.goodsName" placeholder="请输入商品名称" />
+              <el-input
+                :disabled="isDisable"
+                v-model="form.goodsName"
+                placeholder="请输入商品名称"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="所属商户" prop="belongBusinessId">
-             <el-select class="w100" ref="businessName" @change="handchangeBusiness" v-model="form.belongBusinessId" :placeholder=this.belongBusinessPlaceholder>
-               <el-option v-for="item in businessNameList" :key="item.id" :label="item.businessName" :value="item.id" />
-             </el-select>
+              <el-select
+                class="w100"
+                ref="businessName"
+                @change="handchangeBusiness"
+                v-model="form.belongBusinessId"
+                :placeholder="this.belongBusinessPlaceholder"
+              >
+                <el-option
+                  v-for="item in businessNameList"
+                  :key="item.id"
+                  :label="item.businessName"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="品类名称" prop="goodsType">
               <el-cascader
-                  ref="cascader"
-                  v-model="form.goodsTypeId"
-                  :options="categoryList"
-                  class="w100"
-                  :props="{
-                    label: 'name',
-                    value: 'id',
-                  }"
-                  @change="handleChange"></el-cascader>
+                ref="cascader"
+                v-model="form.goodsTypeId"
+                :options="categoryList"
+                class="w100"
+                :props="{
+                  label: 'name',
+                  value: 'id',
+                }"
+                @change="handleChange"
+              ></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="保质期(天)" prop="shelfLife">
-              <el-input v-model="form.shelfLife" placeholder="请输入保质期(天)" />
+              <el-input
+                v-model="form.shelfLife"
+                placeholder="请输入保质期(天)"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="商品说明" prop="goodsRemarks" :show-overflow-tooltip="true">
-              <el-input v-model="form.goodsRemarks" placeholder="请输入商品说明" />
+            <el-form-item
+              label="商品说明"
+              prop="goodsRemarks"
+              :show-overflow-tooltip="true"
+            >
+              <el-input
+                v-model="form.goodsRemarks"
+                placeholder="请输入商品说明"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="单位规格" prop="isBaseUnit">
-              <el-radio v-model="form.isBaseUnit" :label="true"  @change="resetConversionFields" >默认(kg)</el-radio>
-              <el-radio v-model="form.isBaseUnit" :label="false">
-                <el-input style="width: 150px;" placeholder="请输入" v-model="form.conversionValue" @input="changeConversion" type="number" min="0" step="1"></el-input>
-                <span>kg/</span>
-                <el-select style="width: 150px;" v-model="form.goodsUnitId" placeholder="请选择" @change="changeConversion">
-                  <el-option
-                    v-for="item in unitList"
-                    :key="item.id"
-                    :label="item.unitName"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-radio>
+            <el-form-item label="商品规格" prop="goodsSpecs">
+              <el-input
+                style="width: 500px"
+                placeholder="请输入"
+                v-model="form.goodsSpecs"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="商品图片(最多上传6张)" prop="goodsImgUrl">
-              <imageUpload v-model="form.goodsImgUrl" :limit="6"/>
+              <imageUpload v-model="form.goodsImgUrl" :limit="6" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -170,24 +249,29 @@
 </template>
 
 <script>
-import { createGoodsInfo, updateGoodsInfo, deleteGoodsInfo, getGoodsInfo, getGoodsInfoPage } from "@/api/basic/goodsInfo";
-import { getBusinessNameList } from '@/api/basic/businessInfo';
-import { getCategoryList } from '@/api/basic/goodsCategory';
-import { getUnitPage } from '@/api/basic/unit';
-import SearchInfo from '@/components/Customer/SearchForm'
-import EmptyTable from '@/components/EmptyTable'
-import ImageUpload from '@/components/ImageUpload';
+import {
+  createGoodsInfo,
+  updateGoodsInfo,
+  deleteGoodsInfo,
+  getGoodsInfo,
+  getGoodsInfoPage,
+} from "@/api/basic/goodsInfo";
+import { getBusinessNameList } from "@/api/basic/businessInfo";
+import { getCategoryList } from "@/api/basic/goodsCategory";
+import SearchInfo from "@/components/Customer/SearchForm";
+import EmptyTable from "@/components/EmptyTable";
+import ImageUpload from "@/components/ImageUpload";
 export default {
   name: "GoodsInfo",
   components: {
     SearchInfo,
     EmptyTable,
-    ImageUpload
+    ImageUpload,
   },
   data() {
     return {
       //所属商户下拉框提示
-      belongBusinessPlaceholder:'请选择所属商户',
+      belongBusinessPlaceholder: "请选择所属商户",
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -209,50 +293,63 @@ export default {
         goodsId: null,
         belongBusinessName: null,
       },
-      dataSource:[
+      dataSource: [
         {
-          key:'goodsName',
-          itemType:'input',
-          label:'商品名称',
-          placeholder:'请输入商品名称',
-          onEnterKeyUp:this.handleQuery
+          key: "goodsName",
+          itemType: "input",
+          label: "商品名称",
+          placeholder: "请输入商品名称",
+          onEnterKeyUp: this.handleQuery,
         },
         {
-          key:'goodsId',
-          itemType:'input',
-          label:'商品编码',
-          placeholder:'请输入商品编码',
-          onEnterKeyUp:this.handleQuery
+          key: "goodsId",
+          itemType: "input",
+          label: "商品编码",
+          placeholder: "请输入商品编码",
+          onEnterKeyUp: this.handleQuery,
         },
         {
-          key:'belongBusinessName',
-          itemType:'input',
-          label:'所属商户',
-          placeholder:'请输入所属商户名称',
-          onEnterKeyUp:this.handleQuery
+          key: "belongBusinessName",
+          itemType: "input",
+          label: "所属商户",
+          placeholder: "请输入所属商户名称",
+          onEnterKeyUp: this.handleQuery,
         },
       ],
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        goodsName: [{ required: true, message: "商品名称不能为空", trigger: "blur" }],
-        goodsId: [{ required: true, message: "商品编码不能为空", trigger: "blur" }],
-        goodsType: [{ required: true, message: "商品类型不能为空", trigger: "change" }],
-        belongBusinessId: [{ required: true, message: "所属商户不能为空", trigger: "blur" }],
-        belongBusinessName: [{ required: true, message: "所属商户不能为空", trigger: "blur" }],
-        isBaseUnit: [{ required: true, message: "商品单位不能为空", trigger: "change" }],
+        goodsName: [
+          { required: true, message: "商品名称不能为空", trigger: "blur" },
+        ],
+        goodsId: [
+          { required: true, message: "商品编码不能为空", trigger: "blur" },
+        ],
+        goodsType: [
+          { required: true, message: "商品类型不能为空", trigger: "change" },
+        ],
+        belongBusinessId: [
+          { required: true, message: "所属商户不能为空", trigger: "blur" },
+        ],
+        belongBusinessName: [
+          { required: true, message: "所属商户不能为空", trigger: "blur" },
+        ],
+        goodsSpecs: [
+          { required: true, message: "商品规格不能为空", trigger: "blur" },
+          { max: 32, message: "商品规格不能超过32个字符", trigger: "blur" },
+        ],
         shelfLife: [
           {
             required: true,
             message: "保质期天数不能为空",
-            trigger: "blur"
+            trigger: "blur",
           },
           {
             pattern: /(^[0-9]*$)/,
             message: "保质期天数只能为数字",
-            trigger: "blur"
-          }
+            trigger: "blur",
+          },
         ],
       },
       // 所属商户列表
@@ -260,68 +357,57 @@ export default {
       // 品类名称列表
       categoryList: [],
       isDisable: false,
-      // 单位列表
-      unitList: [],
     };
   },
   //刷新重新获取数据
   created() {
     // 取到路由带过来的参数
-    let businessName = this.$route.query.businessName
+    let businessName = this.$route.query.businessName;
     let name = this.$route.query.name;
-    if(businessName !== undefined && name){
-      this.queryParams.belongBusinessName = businessName
+    if (businessName !== undefined && name) {
+      this.queryParams.belongBusinessName = businessName;
     }
     this.getList();
     this.initDate();
   },
-  activated(){
+  activated() {
     // 取到路由带过来的参数
     let businessName = this.$route.query.businessName;
     let name = this.$route.query.name;
-    if(businessName !== undefined && name){
-      this.queryParams.belongBusinessName = businessName
+    if (businessName !== undefined && name) {
+      this.queryParams.belongBusinessName = businessName;
     }
     this.getList();
   },
   methods: {
-     handleDialogOpen() {
-      this.getUnitPage();
+    handleDialogOpen() {
+      // this.getUnitPage();
     },
     // 初始化数据
-    initDate(){
-      getCategoryList().then(res => {
+    initDate() {
+      getCategoryList().then((res) => {
         this.categoryList = res.data;
       });
-    },
-     getUnitPage() {
-      // 调用 getUnitPage 方法获取 unitList 数据
-      getUnitPage().then(res => {
-        this.unitList = res.data.list;
-      }).catch(error => {
-        // 处理请求错误
-        console.error(error);
-      });
     },
     /** 查询列表 */
     getList() {
       this.loading = true;
       this.list = [];
-      if(this.queryParams.goodsId == ''){
+      if (this.queryParams.goodsId == "") {
         this.queryParams.goodsId = null;
       }
       // 执行查询
-      getGoodsInfoPage(this.queryParams).then(response => {
+      getGoodsInfoPage(this.queryParams).then((response) => {
         let list = response.data.list;
-        list.map(item => {
-          if( item.goodsImgUrl ){
-            if( item.goodsImgUrl.indexOf(',') != -1 ) {
-              item.goodsImgUrl = item.goodsImgUrl.split(',');
-            }else{
+        list.map((item) => {
+          if (item.goodsImgUrl) {
+            if (item.goodsImgUrl.indexOf(",") != -1) {
+              item.goodsImgUrl = item.goodsImgUrl.split(",");
+            } else {
               item.goodsImgUrl = [item.goodsImgUrl];
             }
-          }else{
-            item.goodsImgUrl = '--';
+          } else {
+            item.goodsImgUrl = "--";
           }
         });
         this.list = response.data.list;
@@ -349,11 +435,7 @@ export default {
         shelfLife: undefined,
         belongBusinessId: undefined,
         belongBusinessName: undefined,
-        isBaseUnit: undefined,// 是否基础单位
-        goodsUnitId: undefined,// 商品单位id，是基础单位(kg)时，该字段为0
-        goodsSpecs: undefined,// 商品规格，换算之后写入的值如：5kg/袋(或者kg)
-        conversionValue: undefined,// 换算值
-        goodsUnitName: undefined,
+        goodsSpecs: undefined, // 商品规格
       };
       this.resetForm("form");
     },
@@ -364,7 +446,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      if(this.$route.query.name){
+      if (this.$route.query.name) {
         this.$router.replace({ query: {} });
       }
       this.resetForm("queryForm", "searchForm");
@@ -374,7 +456,7 @@ export default {
     handleAdd() {
       this.reset();
       this.getBusinessNameList();
-      this.belongBusinessPlaceholder = '请选择所属商户'
+      this.belongBusinessPlaceholder = "请选择所属商户";
       this.title = "添加商品";
       this.isDisable = false;
       this.open = true;
@@ -384,51 +466,42 @@ export default {
       this.reset();
       const id = row.id;
       this.getBusinessNameList();
-      getGoodsInfo(id).then(response => {
+      getGoodsInfo(id).then((response) => {
         this.form = response.data;
 
         //当商户被删除时，无法显示对应的商户名称，重新定义
         let isTip = true;
-        for(var x=0;x<this.businessNameList.length;x++){
-          if(this.businessNameList[x].id == this.form.belongBusinessId){
+        for (var x = 0; x < this.businessNameList.length; x++) {
+          if (this.businessNameList[x].id == this.form.belongBusinessId) {
             isTip = false;
           }
         }
-        if( isTip ) {
-          this.form.belongBusinessId = undefined
-          this.form.belongBusinessName = undefined
-          this.belongBusinessPlaceholder = '所属商户已删除，请重新选择'
-        }else{
-          this.belongBusinessPlaceholder = '请选择所属商户'
+        if (isTip) {
+          this.form.belongBusinessId = undefined;
+          this.form.belongBusinessName = undefined;
+          this.belongBusinessPlaceholder = "所属商户已删除，请重新选择";
+        } else {
+          this.belongBusinessPlaceholder = "请选择所属商户";
         }
 
         this.open = true;
         this.title = "修改商品";
         this.isDisable = true;
-
-         // 根据需求调用 resetConversionFields 方法
-        if (this.form.isBaseUnit) {
-          this.resetConversionFields();
-        }
       });
       //
     },
     /** 提交按钮 */
     submitForm() {
-      console.log('提交',this.form);
-      this.$refs["form"].validate(valid => {
+      console.log("提交", this.form);
+      this.$refs["form"].validate((valid) => {
         if (!valid) {
           return;
         }
         let form = JSON.parse(JSON.stringify(this.form));
         form.goodsTypeId = form.goodsTypeId[2];
-        if(!form.isBaseUnit && ( !form.conversionValue || !form.goodsUnitId )){
-          this.$message.error("单位规则非默认时，规格数量和规格单位不能为空");
-          return false;
-        }
         // 修改的提交
         if (this.form.id != null) {
-          updateGoodsInfo(form).then(response => {
+          updateGoodsInfo(form).then((response) => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
@@ -436,7 +509,7 @@ export default {
           return;
         }
         // 添加的提交
-        createGoodsInfo(form).then(response => {
+        createGoodsInfo(form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
@@ -447,46 +520,42 @@ export default {
     handleDelete(row) {
       const id = row.id;
       const goodsId = row.goodsId;
-      this.$modal.confirm('是否确认删除该商品?').then(function() {
-          return deleteGoodsInfo(id,goodsId);
-        }).then(() => {
+      this.$modal
+        .confirm("是否确认删除该商品?")
+        .then(function () {
+          return deleteGoodsInfo(id, goodsId);
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     // 获取商户列表
-    getBusinessNameList(){
-      getBusinessNameList().then(res => {
+    getBusinessNameList() {
+      getBusinessNameList().then((res) => {
         this.businessNameList = res.data;
       });
     },
     // 品类名称修改
-    handleChange(e){
-      if(!this.categoryList) return false;
-      this.form.goodsType = this.$refs["cascader"].getCheckedNodes()[0].pathLabels.join('/');
+    handleChange(e) {
+      if (!this.categoryList) return false;
+      this.form.goodsType = this.$refs["cascader"]
+        .getCheckedNodes()[0]
+        .pathLabels.join("/");
     },
-    handchangeBusiness(e){
-      this.$nextTick(()=>{
-         this.form.belongBusinessName = this.$refs.businessName.selected.label;
+    handchangeBusiness(e) {
+      this.$nextTick(() => {
+        this.form.belongBusinessName = this.$refs.businessName.selected.label;
       });
     },
-    resetConversionFields() {
-    if (this.form.isBaseUnit) {
-      this.form.conversionValue = '';
-      this.form.goodsUnitId = null;
-      }
-    },
-    changeConversion(e){
-      this.form.isBaseUnit = false;
-    },
-  }
+  },
 };
 </script>
 <style scoped lang="scss">
-  .hide {
-    ::v-deep .el-upload--picture-card {
-      display: none !important;
-    }
+.hide {
+  ::v-deep .el-upload--picture-card {
+    display: none !important;
   }
-
+}
 </style>
diff --git a/src/views/system/home/index.vue b/src/views/system/home/index.vue
new file mode 100644
index 0000000..b4fed27
--- /dev/null
+++ b/src/views/system/home/index.vue
@@ -0,0 +1,5 @@
+<template></template>
+
+<script></script>
+
+<style lang="scss" scoped></style>