Browse Source

去除一些不必要的字段

赵冬冬 4 years ago
parent
commit
e4428ee413

+ 7 - 7
src/views/pms/brand/components/BrandDetail.vue

@@ -23,12 +23,12 @@
       <el-form-item label="排序:" prop="sort">
         <el-input v-model.number="brand.sort"></el-input>
       </el-form-item>
-      <el-form-item label="是否显示:">
-        <el-radio-group v-model="brand.showStatus">
-          <el-radio :label="1">是</el-radio>
-          <el-radio :label="0">否</el-radio>
-        </el-radio-group>
-      </el-form-item>
+<!--      <el-form-item label="是否显示:">-->
+<!--        <el-radio-group v-model="brand.showStatus">-->
+<!--          <el-radio :label="1">是</el-radio>-->
+<!--          <el-radio :label="0">否</el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
       <el-form-item label="品牌制造商:">
         <el-radio-group v-model="brand.factoryStatus">
           <el-radio :label="1">是</el-radio>
@@ -53,7 +53,7 @@
     firstLetter: '',
     logo: '',
     name: '',
-    showStatus: 0,
+    showStatus: 1,
     sort: 0
   };
   export default {

+ 18 - 18
src/views/pms/brand/index.vue

@@ -61,7 +61,7 @@
             </el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="是否显示" width="100" align="center">
+        <!--<el-table-column label="是否显示" width="100" align="center">
           <template slot-scope="scope">
             <el-switch
               @change="handleShowStatusChange(scope.$index, scope.row)"
@@ -70,23 +70,23 @@
               v-model="scope.row.showStatus">
             </el-switch>
           </template>
-        </el-table-column>
-        <el-table-column label="相关" width="220" align="center">
-          <template slot-scope="scope">
-            <span>商品:</span>
-            <el-button
-              size="mini"
-              type="text"
-              @click="getProductList(scope.$index, scope.row)">100
-            </el-button>
-            <span>评价:</span>
-            <el-button
-              size="mini"
-              type="text"
-              @click="getProductCommentList(scope.$index, scope.row)">1000
-            </el-button>
-          </template>
-        </el-table-column>
+        </el-table-column>-->
+<!--        <el-table-column label="相关" width="220" align="center">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span>商品:</span>-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              @click="getProductList(scope.$index, scope.row)">100-->
+<!--            </el-button>-->
+<!--            <span>评价:</span>-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              @click="getProductCommentList(scope.$index, scope.row)">1000-->
+<!--            </el-button>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="操作" width="200" align="center">
           <template slot-scope="scope">
             <el-button

+ 11 - 9
src/views/pms/product/components/ProductInfoDetail.vue

@@ -48,7 +48,7 @@
       <el-form-item label="保质期:" prop="qualityGuaranteePeriod">
         <el-input v-model="value.qualityGuaranteePeriod"></el-input>
       </el-form-item>
-      <el-form-item label="商品介绍:">
+      <el-form-item label="商品介绍:" prop="description">
         <el-input
           :autoSize="true"
           v-model="value.description"
@@ -59,7 +59,7 @@
       <el-form-item label="商品货号:">
         <el-input v-model="value.productSn"></el-input>
       </el-form-item>
-      <el-form-item label="商品售价:">
+      <el-form-item label="商品售价:" prop="price">
         <el-input v-model="value.price"></el-input>
       </el-form-item>
       <el-form-item label="市场价:">
@@ -70,7 +70,7 @@
       </el-form-item>
       <el-form-item label="计量单位:">
         <el-input v-model="value.unit"></el-input>
-      </el-form-item>      
+      </el-form-item>
       <el-form-item label="商品重量:">
         <el-input v-model="value.weight" style="width: 300px"></el-input>
         <span style="margin-left: 20px">克</span>
@@ -120,6 +120,8 @@
           description: [{required: true, message: '请输入商品介绍', trigger: 'blur'}],
           requiredProp: [{required: true, message: '该项为必填项', trigger: 'blur'}],
           spec: [{required: true, message: '该项为必填项', trigger: 'blur'}],
+          description: [{required: true, message: '该项为必填项', trigger: 'blur'}],
+          price: [{required: true, message: '该项为必填项', trigger: 'blur'}],
           qualityGuaranteePeriod: [{required: true, message: '该项为必填项', trigger: 'blur'}],
         }
       };
@@ -152,7 +154,7 @@
           this.value.productBigCategoryName= this.getBigCateNameById(this.value.productBigCategoryId);
 
           this.value.productCategoryId = newValue[1];
-          this.value.productCategoryName= this.getCateNameById(this.value.productCategoryId);      
+          this.value.productCategoryName= this.getCateNameById(this.value.productCategoryId);
           this.cascaderPlaceholder = this.value.productBigCategoryName + " / " + this.value.productCategoryName ;
         } else {
           this.value.productCategoryId = null;
@@ -160,8 +162,8 @@
           this.value.productBigCategoryId = null;
           this.value.productBigCategoryName = null;
         }
-        
-        
+
+
       }
     },
     methods: {
@@ -169,7 +171,7 @@
       handleEditCreated(){
         if(this.value.productCategoryId!=null){
           this.selectProductCateValue.push(this.value.cateParentId);
-          this.selectProductCateValue.push(this.value.productCategoryId);          
+          this.selectProductCateValue.push(this.value.productCategoryId);
         }
         this.hasEditCreated=true;
       },
@@ -188,7 +190,7 @@
             this.productCateOptions.push({label: list[i].name, value: list[i].id, children: children});
           }
         });
-        
+
       },
       getBrandList() {
         fetchBrandList({pageNum: 1, pageSize: 100}).then(response => {
@@ -234,7 +236,7 @@
       handleNext(formName){
         this.$refs[formName].validate((valid) => {
            console.log('this.$refs[formName]',this.$refs[formName]);
-          if (valid) {           
+          if (valid) {
             this.$emit('nextStep');
           } else {
             this.$message({

+ 3 - 3
src/views/pms/product/index.vue

@@ -320,7 +320,7 @@
           productAttributeCategoryId:null,
           stockList:[],
           productAttr:[],
-          keyword:null,          
+          keyword:null,
         },
         operates: [
           {
@@ -378,9 +378,9 @@
         }, {
           value: 0,
           label: '未审核'
-        }],        
+        }],
       }
-      
+
     },
     created() {
       this.getList();

+ 14 - 14
src/views/pms/productCate/components/ProductCateDetail.vue

@@ -39,20 +39,20 @@
       <el-form-item label="分类图标:">
         <single-upload v-model="productCate.icon"></single-upload>
       </el-form-item>
-      <el-form-item v-for="(filterProductAttr, index) in filterProductAttrList"
-                    :label="index | filterLabelFilter"
-                    :key="filterProductAttr.key"
-      >
-        <el-cascader
-          clearable
-          v-model="filterProductAttr.value"
-          :options="filterAttrs">
-        </el-cascader>
-        <el-button style="margin-left: 20px" @click.prevent="removeFilterAttr(filterProductAttr)">删除</el-button>
-      </el-form-item>
-      <el-form-item>
-        <el-button size="small" type="primary" @click="handleAddFilterAttr()">新增</el-button>
-      </el-form-item>
+<!--      <el-form-item v-for="(filterProductAttr, index) in filterProductAttrList"-->
+<!--                    :label="index | filterLabelFilter"-->
+<!--                    :key="filterProductAttr.key"-->
+<!--      >-->
+<!--        <el-cascader-->
+<!--          clearable-->
+<!--          v-model="filterProductAttr.value"-->
+<!--          :options="filterAttrs">-->
+<!--        </el-cascader>-->
+<!--        <el-button style="margin-left: 20px" @click.prevent="removeFilterAttr(filterProductAttr)">删除</el-button>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item>-->
+<!--        <el-button size="small" type="primary" @click="handleAddFilterAttr()">新增</el-button>-->
+<!--      </el-form-item>-->
       <el-form-item label="关键词:">
         <el-input v-model="productCate.keywords"></el-input>
       </el-form-item>

+ 1 - 1
src/views/pms/productCate/index.vue

@@ -115,7 +115,7 @@
         listLoading: true,
         listQuery: {
           pageNum: 1,
-          pageSize: 5
+          pageSize: 10
         },
         parentId: 0
       }