提交

1

src/views/oms/order/index.vue

@@ -132,8 +132,23 @@
             scope.row.createTime | formatCreateTime
           }}</template>
         </el-table-column>
-        <el-table-column label="用户账号" align="center">
-          <template slot-scope="scope">{{ scope.row.memberUsername }}</template>
+        <el-table-column label="用户类型" align="center">
+          <template slot-scope="scope">
+            <p v-if="scope.row.userType=='STUDENT'">学生</p>
+            <p v-else-if="scope.row.userType=='TEACHER'">老师</p>
+            <p v-else>--</p>
+
+
+            </template>
+        </el-table-column>
+               <el-table-column label="用户编号" align="center">
+          <template slot-scope="scope">{{ scope.row.userId }}</template>
+        </el-table-column>
+        <el-table-column label="用户名" align="center">
+          <template slot-scope="scope">{{ scope.row.username }}</template>
+        </el-table-column>
+            <el-table-column label="手机号" align="center">
+          <template slot-scope="scope">{{ scope.row.phone }}</template>
         </el-table-column>
         <el-table-column label="订单金额" width="120" align="center">
           <template slot-scope="scope">￥{{ scope.row.totalAmount }}</template>
@@ -407,7 +422,7 @@ export default {
     },
     handleCloseOrder(index, row) {
       this.closeOrder.dialogVisible = true;
-      this.closeOrder.content = ''
+      this.closeOrder.content = "";
       this.closeOrder.orderIds = [row.id];
     },
     handleDeliveryOrder(index, row) {

src/views/pms/brand/components/BrandDetail.vue

@@ -10,16 +10,16 @@
       <el-form-item label="品牌LOGO：" prop="logo">
         <single-upload v-model="brand.logo"></single-upload>
       </el-form-item>
-      <el-form-item label="品牌专区大图：">
+      <!-- <el-form-item label="品牌专区大图：">
         <single-upload v-model="brand.bigPic"></single-upload>
-      </el-form-item>
-      <el-form-item label="品牌故事：">
+      </el-form-item> -->
+      <!-- <el-form-item label="品牌故事：">
         <el-input
           placeholder="请输入内容"
           type="textarea"
           v-model="brand.brandStory"
           :autosize="true"></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="排序：" prop="sort">
         <el-input v-model.number="brand.sort"></el-input>
       </el-form-item>
@@ -29,12 +29,12 @@
           <el-radio :label="0">否</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="品牌制造商：">
+      <!-- <el-form-item label="品牌制造商：">
         <el-radio-group v-model="brand.factoryStatus">
           <el-radio :label="1">是</el-radio>
           <el-radio :label="0">否</el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" @click="onSubmit('brandFrom')">提交</el-button>
         <el-button v-if="!isEdit" @click="resetForm('brandFrom')">重置</el-button>

src/views/pms/brand/index.vue

@@ -50,7 +50,7 @@
         <el-table-column label="排序" width="100" align="center">
           <template slot-scope="scope">{{scope.row.sort}}</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="handleFactoryStatusChange(scope.$index, scope.row)"
@@ -59,7 +59,7 @@
               v-model="scope.row.factoryStatus">
             </el-switch>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="是否显示" width="100" align="center">
           <template slot-scope="scope">
             <el-switch
@@ -70,7 +70,7 @@
             </el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="相关" width="220" align="center">
+        <!-- <el-table-column label="相关" width="220" align="center">
           <template slot-scope="scope">
             <span>商品：</span>
             <el-button
@@ -85,7 +85,7 @@
               @click="getProductCommentList(scope.$index, scope.row)">1000
             </el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="操作" width="200" align="center">
           <template slot-scope="scope">
             <el-button

src/views/pms/product/components/ProductInfoDetail.vue

@@ -19,9 +19,9 @@
       <el-form-item label="商品名称：" prop="name">
         <el-input v-model="value.name" :disabled="!isEdit"></el-input>
       </el-form-item>
-      <el-form-item label="副标题：" prop="subTitle">
+      <!-- <el-form-item label="副标题：" prop="subTitle">
         <el-input v-model="value.subTitle" :disabled="!isEdit"></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="商品品牌：" prop="brandId">
         <el-select
           v-model="value.brandId"
@@ -38,7 +38,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="商品介绍：">
+      <!-- <el-form-item label="商品介绍：">
         <el-input
           :autoSize="true"
           v-model="value.description"
@@ -46,7 +46,7 @@
           type="textarea"
           placeholder="请输入内容"
         ></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="商品货号：">
         <el-input v-model="value.productSn" :disabled="!isEdit"></el-input>
       </el-form-item>
@@ -80,13 +80,13 @@
           :disabled="!isEdit"
         ></el-input-number>
       </el-form-item>
-      <el-form-item label="计量单位：">
+      <!-- <el-form-item label="计量单位：">
         <el-input-number
           v-model="value.unit"
           :disabled="!isEdit"
         ></el-input-number>
-      </el-form-item>
-      <el-form-item label="商品重量：">
+      </el-form-item> -->
+      <!-- <el-form-item label="商品重量：">
         <el-input-number
           v-model="value.weight"
           type="number"
@@ -97,7 +97,7 @@
           :disabled="!isEdit"
         ></el-input-number>
         <span style="margin-left: 20px">克</span>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="排序">
         <el-input-number
           v-model="value.sort"

src/views/pms/productAttr/components/ProductAttrDetail.vue

@@ -20,13 +20,13 @@
           <el-radio :label="1">颜色</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="能否进行检索:">
+      <!-- <el-form-item label="能否进行检索:">
         <el-radio-group v-model="productAttr.searchType">
           <el-radio :label="0">不需要检索</el-radio>
           <el-radio :label="1">关键字检索</el-radio>
           <el-radio :label="2">范围检索</el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="商品属性关联:">
         <el-radio-group v-model="productAttr.relatedStatus">
           <el-radio :label="1">是</el-radio>

src/views/pms/productCate/components/ProductCateDetail.vue

@@ -18,9 +18,9 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="数量单位：">
+      <!-- <el-form-item label="数量单位：">
         <el-input v-model="productCate.productUnit"></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="排序：">
         <el-input v-model="productCate.sort"></el-input>
       </el-form-item>
@@ -39,7 +39,7 @@
       <el-form-item label="分类图标：" prop="icon">
         <single-upload v-model="productCate.icon"></single-upload>
       </el-form-item>
-      <el-form-item v-for="(filterProductAttr, index) in filterProductAttrList"
+      <!-- <el-form-item v-for="(filterProductAttr, index) in filterProductAttrList"
                     :label="index | filterLabelFilter"
                     :key="filterProductAttr.key"
       >
@@ -49,16 +49,16 @@
           :options="filterAttrs">
         </el-cascader>
         <el-button style="margin-left: 20px" @click.prevent="removeFilterAttr(filterProductAttr)">删除</el-button>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button size="small" type="primary" @click="handleAddFilterAttr()">新增</el-button>
       </el-form-item>
-      <el-form-item label="关键词：">
+      <!-- <el-form-item label="关键词：">
         <el-input v-model="productCate.keywords"></el-input>
-      </el-form-item>
-      <el-form-item label="分类描述：">
+      </el-form-item> -->
+      <!-- <el-form-item label="分类描述：">
         <el-input type="textarea" :autosize="true" v-model="productCate.description"></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" @click="onSubmit('productCateFrom')">提交</el-button>
         <el-button v-if="!isEdit" @click="resetForm('productCateFrom')">重置</el-button>

src/views/pms/productCate/index.vue

@@ -29,9 +29,9 @@
         <el-table-column label="商品数量" width="100" align="center">
           <template slot-scope="scope">{{ scope.row.productCount }}</template>
         </el-table-column>
-        <el-table-column label="数量单位" width="100" align="center">
+        <!-- <el-table-column label="数量单位" width="100" align="center">
           <template slot-scope="scope">{{ scope.row.productUnit }}</template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="导航栏" width="100" align="center">
           <template slot-scope="scope">
             <el-switch
@@ -65,11 +65,11 @@
               @click="handleShowNextLevel(scope.$index, scope.row)"
               >查看下级
             </el-button>
-            <el-button
+            <!-- <el-button
               size="mini"
               @click="handleTransferProduct(scope.$index, scope.row)"
               >转移商品
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
         <el-table-column label="操作" width="200" align="center">
@@ -96,7 +96,7 @@
         @current-change="handleCurrentChange"
         layout="total, sizes,prev, pager, next,jumper"
         :page-size="listQuery.pageSize"
-        :page-sizes="[5, 10, 15]"
+        :page-sizes="[ 10, 15,20]"
         :current-page.sync="listQuery.pageNum"
         :total="total"
       >
@@ -122,7 +122,7 @@ export default {
       listLoading: true,
       listQuery: {
         pageNum: 1,
-        pageSize: 5,
+        pageSize: 10,
       },
       parentId: 0,
     };