Merge branch 'teasing/3.21.0' into 'release'

Teasing/3.21.0

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!353

src/views/goods/forms.js

@@ -69,7 +69,17 @@ const form = {
   expressLimitFlag: 0, //是否支持退货退款
 };
 
+const form3 = {
+  goodsName: "",
+  goodsDescription: "",
+  goodsHeaderImages: [],
+  goodsVideoList: [],
+  goodsType: "",
+  expressLimitFlag: 0, //是否支持退货退款
+};
+
 
 export const originForm1 = form1;
 export const originForm2 = form2;
+export const originForm3 = form3;
 export const originForm = form;

src/views/goods/goods-manage.vue

@@ -94,8 +94,8 @@
           </el-col>
 
           <el-col :span="12" style="text-align: right">
-            <el-button v-if="commissionFlag == 2" type="primary" size="small" @click="batchSetPrice()">批量设置分佣</el-button>
-            <el-button type="primary" size="small" @click="exportOpt">批量导出商品</el-button>
+            <el-button v-if="commissionFlag == 2" type="primary" size="small" @click="batchSetPrice()" :disabled="tableData.length == 0">批量设置分佣</el-button>
+            <el-button type="primary" size="small" @click="exportOpt" :disabled="tableData.length == 0">批量导出商品</el-button>
             <el-button v-if="isSSO" type="primary" size="small" @click="batchOpt(3)">批量导入商品</el-button>
             <el-button type="primary" size="small" @click="edit('add')">新建单个商品</el-button>
           </el-col>
@@ -121,6 +121,7 @@
             <span>{{ scope.row.goodsStatus | rangeStatus }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="goodsHisStock" label="商品总库存" width="100" align="center"></el-table-column>
         <el-table-column prop="quantityOfSale" label="有效销量" width="120" align="center">
 
         </el-table-column>
@@ -161,6 +162,16 @@
         </el-table-column>
         <el-table-column prop="saleTime" label="发布时间" width="170" align="center">
         </el-table-column>
+        <el-table-column prop="modifiedIdStr" label="最近操作人" width="170" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.modifiedIdStr || '--' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="modifiedTime" label="最近操作时间" width="170" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.modifiedTime || '--' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="200" align="center" fixed="right">
           <template slot-scope="scope">
             <div v-if="scope.row.commissionFlag == 2">
@@ -552,7 +563,6 @@
       handleRemove(){},
       beforeRemove(){},
       handleSelectionChange(val){
-        console.log(val)
         this.selectList = val
       },
 
@@ -622,8 +632,9 @@
         reader.readAsDataURL(file);
       },
       uploadTemp(){
-        // let url = "https://file.yunqueyi.com/trade/store/goods_import_template.xlsx"
-        const url = 'https://file.yunqueyi.com/trade/store/20210129/goods_import_template.xlsx';
+        // let url = "https://file.yunqueyi.com/trade/store/goods_import_template.xlsx 'https://file.yunqueyi.com/trade/store/20210129/goods_import_template.xlsx'"
+        const url = 'https://files.yunqueyi.com/template/goods_import_template_1.xlsx';
+       
         window.location.href = url
       },
       getLever(id=0){
@@ -821,7 +832,6 @@
       },
       exportOpt() {
         const { goodsIdList, goodsType, goodsName, storeId, saleType } = this.searchForm;
-
         getGoodsExportUrl({ goodsIdList, goodsType, goodsName, storeId, saleType }).then(res => {
           if (res.code != '000000') {
             this.$message({ message: res.message, type: 'error' });

src/views/goods/rules.js

@@ -89,19 +89,6 @@ const rules = {
     { required: true, message: "请输入条形码", trigger: "submit" },
     { validator: checkBarcode, trigger: "submit" }
   ],
-  goodsName: [
-    { required: true, message: "请输入商品名称", trigger: "submit" },
-    { validator: checkProjectStr, trigger: "submit" }
-  ],
-  goodsHeaderImages: [
-    { required: true, message: "请上传商品头图", trigger: "blur" }
-  ],
-  goodsType:[
-    { required: true, message: "请选择商品类型", trigger: "change" }
-  ],
-  hcd:[
-    { required: true, message: "请选择是否支持退货退款", trigger: "change" }
-  ],
   optPrice: [
     { required: true, message: "请输入价格", trigger: "blur" },
   ],
@@ -126,8 +113,22 @@ const rules = {
   // ],
 }
 
+const rules3 = {
+  goodsName: [
+    { required: true, message: "请输入商品名称", trigger: "submit" },
+    { validator: checkProjectStr, trigger: "submit" },
+  ],
+  goodsDescription: [
+    { required: true, message: "请输入商品介绍", trigger: "submit" },
+  ],
+  goodsHeaderImages: [
+    { required: true, message: "请上传商品头图", trigger: "blur" },
+  ],
+  goodsType: [{ required: true, message: "请选择商品类型", trigger: "change" }],
+};
 
 export const originRules1 = rules1;
 export const originRules2 = rules2;
+export const originRules3 = rules3;
 export const originRules = rules;