feat: 商品管理、厂家管理页面修改

src/views/mall/goodsinfo.vue

@@ -46,11 +46,11 @@
             @click="modifyGoodsState(scope.row.id, 1)"
         >上架
         </el-button>
-        <el-button v-if="scope.row.auditStatus == 0"
-                   type="text"
-                   size="small"
-                   @click="openAuditBox(scope.row.id)"
-        >审核</el-button>
+<!--        <el-button v-if="scope.row.auditStatus == 0"-->
+<!--                   type="text"-->
+<!--                   size="small"-->
+<!--                   @click="openAuditBox(scope.row.id)"-->
+<!--        >审核</el-button>-->
         <el-button
                    type="text"
                    size="small"
@@ -59,13 +59,13 @@
       </template>
 
 
-      <template slot-scope="scope" slot="menuLeft">
-        <el-button type="success"
-                   icon="el-icon-upload"
-                   size="small"
-                   plain
-                   @click.stop="batchImportHandle()">批量导入</el-button>
-      </template>
+<!--      <template slot-scope="scope" slot="menuLeft">-->
+<!--        <el-button type="success"-->
+<!--                   icon="el-icon-upload"-->
+<!--                   size="small"-->
+<!--                   plain-->
+<!--                   @click.stop="batchImportHandle()">批量导入</el-button>-->
+<!--      </template>-->
     </avue-crud>
 
     <el-dialog title="商品审核" @close="refreshChange"
@@ -121,8 +121,8 @@
             <div slot="tip" class="el-upload__tip">只能上传xlsx文件</div>
           </el-upload>
         </el-form-item>
-        <el-form-item label="供应商:">
-          <el-select v-model="fileDa.storeId" placeholder="请选择供应商">
+        <el-form-item label="厂家:">
+          <el-select v-model="fileDa.storeId" placeholder="请选择厂家">
             <el-option
                 v-for="item in storeList"
                 :key="item.id"
@@ -221,7 +221,7 @@
               }]
             },
             {
-              label: "供应商",
+              label: "厂家",
               prop: "supplierId",
               editDisplay: true,
               viewDisplay: false,
@@ -238,12 +238,12 @@
               },
               rules: [{
                 required: true,
-                message: "请选择供应商",
+                message: "请选择厂家",
                 trigger: "blur"
               }]
             },
             {
-              label: "供应商",
+              label: "厂家",
               prop: "supplierName",
               search: true,
               addDisplay: false,
@@ -333,7 +333,7 @@
             //   },{ validator: validatePass, trigger: 'blur' }],
             // },
             {
-              label: "供货价",
+              label: "出厂价",
               prop: "costPrice",
               precision: 2,
               type: "number",
@@ -342,24 +342,24 @@
               },
               rules: [{
                 required: true,
-                message: "请输入供货价",
-                trigger: "blur"
-              }],
-            },
-            {
-              label: "划线价",
-              prop: "salePrice",
-              precision: 2,
-              type: "number",
-              formatter:(val,value)=>{
-                return Number(value).toFixed(2);
-              },
-              rules: [{
-                required: true,
-                message: "请输入划线价",
+                message: "请输入出厂价",
                 trigger: "blur"
               }],
             },
+            // {
+            //   label: "划线价",
+            //   prop: "salePrice",
+            //   precision: 2,
+            //   type: "number",
+            //   formatter:(val,value)=>{
+            //     return Number(value).toFixed(2);
+            //   },
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入划线价",
+            //     trigger: "blur"
+            //   }],
+            // },
             {
               label: "状态",
               prop: "isSale",
@@ -378,19 +378,19 @@
               },
               dataType: "number",
             },
-            {
-              label: "审核状态",
-              prop: "auditStatus",
-              search: true,
-              slot:true,
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=AuditStatusEnum",
-              props: {
-                label: "name",
-                value: "value"
-              },
-              dataType: "number",
-            },
+            // {
+            //   label: "审核状态",
+            //   prop: "auditStatus",
+            //   search: true,
+            //   slot:true,
+            //   type: "select",
+            //   dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=AuditStatusEnum",
+            //   props: {
+            //     label: "name",
+            //     value: "value"
+            //   },
+            //   dataType: "number",
+            // },
             {
               label: "上架时间",
               prop: "saleTime",
@@ -864,7 +864,7 @@
       },
       batchImport() {
         if (!this.fileDa.storeId) {
-          this.$message.warning("请选择供应商");
+          this.$message.warning("请选择厂家");
           return;
         }
         if (this.$refs.upload.uploadFiles.length < 1) {

src/views/mall/store.vue

@@ -57,14 +57,14 @@
           dialogClickModal: false,
           column: [
             {
-              label: "供应商名称",
+              label: "厂家名称",
               labelWidth: 130,
               search: true,
               searchLabelWidth: 130,
               prop: "name",
               rules: [{
                 required: true,
-                message: "请输入供应商名称",
+                message: "请输入厂家名称",
                 trigger: "blur"
               }]
             },
@@ -79,17 +79,17 @@
               }]
             },
             {
-              label: "供应商地址",
+              label: "厂家地址",
               labelWidth: 130,
               prop: "storeAddress",
               rules: [{
                 required: true,
-                message: "请输入供应商地址",
+                message: "请输入厂家地址",
                 trigger: "blur"
               }]
             },
             {
-              label: "营业状态",
+              label: "状态",
               labelWidth: 130,
               prop: "state",
               type: "select",
@@ -108,26 +108,26 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "审核状态",
-              prop: "auditState",
-              labelWidth: 130,
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_state",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: false,
-              display: true,
-              rules: [{
-                required: true,
-                message: "选择状态",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "审核状态",
+            //   prop: "auditState",
+            //   labelWidth: 130,
+            //   type: "select",
+            //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_state",
+            //   props: {
+            //     label: "dictValue",
+            //     value: "dictKey"
+            //   },
+            //   dataType: "number",
+            //   search: true,
+            //   hide: false,
+            //   display: true,
+            //   rules: [{
+            //     required: true,
+            //     message: "选择状态",
+            //     trigger: "blur"
+            //   }]
+            // },
           ]
         },
         data: []