From 72d51a2fbfcd2928be8a5cd5d2570877827f2922 Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Thu, 18 Apr 2024 17:01:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf-ui/src/views/service/goods/index.vue | 54 +++++++++----------------
 1 file changed, 18 insertions(+), 36 deletions(-)

diff --git a/sf-ui/src/views/service/goods/index.vue b/sf-ui/src/views/service/goods/index.vue
index c8bf789..e90d841 100644
--- a/sf-ui/src/views/service/goods/index.vue
+++ b/sf-ui/src/views/service/goods/index.vue
@@ -9,8 +9,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核状态，1通过，0未通过" prop="reviewStatus">
-        <el-select v-model="queryParams.reviewStatus" placeholder="请选择审核状态，1通过，0未通过" clearable>
+      <el-form-item label="审核状态" prop="reviewStatus">
+        <el-select v-model="queryParams.reviewStatus" placeholder="请选择审核状态" clearable>
           <el-option
             v-for="dict in dict.type.goods_review_status"
             :key="dict.value"
@@ -35,8 +35,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="商品类型。     * •	0：消耗型商品     * •	1：非消耗型商品     * •	2：自动续期订阅商品" prop="goodsType">
-        <el-select v-model="queryParams.goodsType" placeholder="请选择商品类型。     * •	0：消耗型商品     * •	1：非消耗型商品     * •	2：自动续期订阅商品" clearable>
+      <el-form-item label="商品类型" prop="goodsType">
+        <el-select v-model="queryParams.goodsType" placeholder="请选择商品类型" clearable>
           <el-option
             v-for="dict in dict.type.goods_type"
             :key="dict.value"
@@ -117,7 +117,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="商品编号" align="center" prop="goodsCode" />
-      <el-table-column label="审核状态，1通过，0未通过" align="center" prop="reviewStatus">
+      <el-table-column label="审核状态" align="center" prop="reviewStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.goods_review_status" :value="scope.row.reviewStatus"/>
         </template>
@@ -130,7 +130,7 @@
       </el-table-column>
       <el-table-column label="商品原价" align="center" prop="originalPrice" />
       <el-table-column label="商品描述" align="center" prop="productDesc" />
-      <el-table-column label="商品类型。     * •	0：消耗型商品     * •	1：非消耗型商品     * •	2：自动续期订阅商品" align="center" prop="goodsType">
+      <el-table-column label="商品类型" align="center" prop="goodsType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.goods_type" :value="scope.row.goodsType"/>
         </template>
@@ -156,7 +156,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -171,10 +171,7 @@
         <el-form-item label="商品编号" prop="goodsCode">
           <el-input v-model="form.goodsCode" placeholder="请输入商品编号" />
         </el-form-item>
-        <el-form-item label="库存表编号" prop="stockId">
-          <el-input v-model="form.stockId" placeholder="请输入库存表编号" />
-        </el-form-item>
-        <el-form-item label="审核状态，1通过，0未通过" prop="reviewStatus">
+        <el-form-item label="审核状态" prop="reviewStatus">
           <el-radio-group v-model="form.reviewStatus">
             <el-radio
               v-for="dict in dict.type.goods_review_status"
@@ -195,7 +192,7 @@
         <el-form-item label="商品描述" prop="productDesc">
           <el-input v-model="form.productDesc" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="商品类型。     * •	0：消耗型商品     * •	1：非消耗型商品     * •	2：自动续期订阅商品" prop="goodsType">
+        <el-form-item label="商品类型" prop="goodsType">
           <el-radio-group v-model="form.goodsType">
             <el-radio
               v-for="dict in dict.type.goods_type"
@@ -210,18 +207,6 @@
         <el-form-item label="排序" prop="orderNum">
           <el-input v-model="form.orderNum" placeholder="请输入排序" />
         </el-form-item>
-        <el-form-item label="逻辑删除,0:未删除,1:删除" prop="isDelete">
-          <el-input v-model="form.isDelete" placeholder="请输入逻辑删除,0:未删除,1:删除" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="created">
-          <el-input v-model="form.created" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="更新人" prop="modified">
-          <el-input v-model="form.modified" placeholder="请输入更新人" />
-        </el-form-item>
-        <el-form-item label="商品名称" prop="goodsName">
-          <el-input v-model="form.goodsName" placeholder="请输入商品名称" />
-        </el-form-item>
         <el-form-item label="商品型号" prop="goodsModel">
           <el-input v-model="form.goodsModel" placeholder="请输入商品型号" />
         </el-form-item>
@@ -279,6 +264,9 @@ export default {
         goodsCode: [
           { required: true, message: "商品编号不能为空", trigger: "blur" }
         ],
+        reviewStatus: [
+          { required: true, message: "审核状态不能为空", trigger: "change" }
+        ],
         productTitle: [
           { required: true, message: "商品标题不能为空", trigger: "blur" }
         ],
@@ -289,20 +277,14 @@ export default {
           { required: true, message: "商品原价不能为空", trigger: "blur" }
         ],
         goodsType: [
-          { required: true, message: "商品类型。     * •	0：消耗型商品     * •	1：非消耗型商品     * •	2：自动续期订阅商品不能为空", trigger: "change" }
+          { required: true, message: "商品类型不能为空", trigger: "change" }
         ],
         goodsSpec: [
           { required: true, message: "商品规格不能为空", trigger: "blur" }
         ],
-        orderNum: [
-          { required: true, message: "排序不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
-        goodsName: [
-          { required: true, message: "商品名称不能为空", trigger: "blur" }
-        ],
+        goodsModel: [
+          { required: true, message: "商品型号不能为空", trigger: "blur" }
+        ]
       }
     };
   },
@@ -385,8 +367,8 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-          	let data = Object.assign({},this.form)
-          	delete data.explain
+            let data = Object.assign({},this.form)
+            delete data.explain
             updateGoods(data).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;