Merge branch 'pyq_goods' into 'dev'

Pyq goods

See merge request bp/op-web-service!17

src/pages/Goods/Retail/index.vue

 <template>
   <layout>
-    <el-card
-      class="container"
-      style="width: 100%; height: 100%"
-    >
+    <el-card class="container" style="width: 100%; height: 100%">
       <div class="retail">
-        <el-form
-          inline
-          :model="retailActivitie"
-          ref="retailActivitie"
-        >
+        <el-form inline :model="retailActivitie" ref="retailActivitie">
           <!-- 查询 -->
           <el-row>
-            <el-form-item
-              label="分销活动id"
-              prop="marketing_id"
-            >
+            <el-form-item label="分销活动id" prop="marketing_id">
               <!-- :rules="[{ type: 'number', message: '活动id必须为数字值' }]" -->
               <el-input
                 onkeyup="value=value.replace(/[^\d]/g,'')"
@@ -44,10 +34,7 @@
             </el-form-item>
             <!-- 按钮操作 -->
             <el-form-item class="search_button">
-              <el-button
-                type="primary"
-                @click="toSearch"
-              >搜索</el-button>
+              <el-button type="primary" @click="toSearch">搜索</el-button>
               <el-button @click="reset('retailActivitie')">重置</el-button>
             </el-form-item>
           </el-row>
@@ -55,14 +42,10 @@
             type="primary"
             style="margin-bottom: 10px"
             @click="createDtb"
-          >创建分销活动</el-button>
-          <!-- Tab -->
-          <el-table
-            :data="tableData"
-            type="index"
-            align="center"
-            border
+            >创建分销活动</el-button
           >
+          <!-- Tab -->
+          <el-table :data="tableData" type="index" align="center" border>
             <el-table-column
               align="center"
               prop="marketing_id"
@@ -108,13 +91,11 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              prop="online_status"
-              label="状态"
-            >
+            <el-table-column align="center" prop="online_status" label="状态">
               <template #default="scope">
-                <span :style="{ color: scope.row.online_status == 3 ? 'red' : '' }">
+                <span
+                  :style="{ color: scope.row.online_status == 3 ? 'red' : '' }"
+                >
                   {{
                     scope.row.online_status == 2
                       ? "关闭"
@@ -131,17 +112,9 @@
               label="创建人"
             >
             </el-table-column>
-            <el-table-column
-              align="center"
-              prop="create_time"
-              label="创建时间"
-            >
+            <el-table-column align="center" prop="create_time" label="创建时间">
             </el-table-column>
-            <el-table-column
-              align="center"
-              prop="update_time"
-              label="更新时间"
-            >
+            <el-table-column align="center" prop="update_time" label="更新时间">
             </el-table-column>
             <el-table-column
               align="center"
@@ -149,17 +122,14 @@
               label="分销到期时间"
             >
             </el-table-column>
-            <el-table-column
-              fixed="right"
-              align="center"
-              label="操作"
-            >
+            <el-table-column fixed="right" align="center" label="操作">
               <template #default="scope">
                 <el-button
                   @click="handleClick(scope.row)"
                   type="text"
                   size="mini"
-                >查看</el-button>
+                  >查看</el-button
+                >
                 <el-button
                   type="text"
                   size="mini"
@@ -179,7 +149,8 @@
                     scope.row.online_status !== 3
                   "
                   @click.stop="handelEnable(scope.row, 1)"
-                >启用</el-button>
+                  >启用</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -223,27 +194,26 @@
               <el-input
                 v-model="ruleForm.marketing_name"
                 autocomplete="off"
+                maxlength="50"
+                show-word-limit
                 :disabled="shopStart !== 0"
               ></el-input>
+              <div style="margin: 20px 0"></div>
             </el-form-item>
-            <el-form-item
-              label="一级佣金:"
-              prop="first_commission_value"
-            >
+            <el-form-item label="一级佣金:" prop="first_commission_value">
               <el-input
                 v-model="ruleForm.first_commission_value"
+                oninput="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)"
                 @input="changeValue($event, 'first_commission_value')"
                 :disabled="shopStart !== 0"
               >
                 <template #append>%</template>
               </el-input>
             </el-form-item>
-            <el-form-item
-              label="二级佣金: "
-              prop="second_commission_value"
-            >
+            <el-form-item label="二级佣金: " prop="second_commission_value">
               <el-input
                 v-model="ruleForm.second_commission_value"
+                oninput="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)"
                 @input="changeValue($event, 'second_commission_value')"
                 :disabled="shopStart !== 0"
               >
@@ -273,10 +243,7 @@
             ref="ruleIdForm"
             size="mini"
           >
-            <div
-              class="queryBox"
-              v-show="shopStart == 0"
-            >
+            <div class="queryBox" v-show="shopStart == 0">
               <el-form-item label="关联商品:"> </el-form-item>
               <el-form-item label="商品id:">
                 <el-input
@@ -295,7 +262,8 @@
                 size="mini"
                 style="margin-bottom: 30px"
                 @click="findProducts"
-              >查询</el-button>
+                >查询</el-button
+              >
             </div>
             <div :class="shopStart == 0 ? 'newTab' : 'readTab'">
               <el-table
@@ -308,10 +276,7 @@
                 style="width: 100%"
                 @selection-change="selectGoodsChange"
               >
-                <el-table-column
-                  align="center"
-                  type="selection"
-                >
+                <el-table-column align="center" type="selection">
                 </el-table-column>
                 <el-table-column
                   align="center"
@@ -373,7 +338,7 @@ import {
 } from "@/service/Goods/goods";
 import { ElMessage } from "element-plus";
 // 开启关闭防抖
-function debounce (callback, delay) {
+function debounce(callback, delay) {
   let timer = null;
   return function (...args) {
     if (timer) {
@@ -483,7 +448,7 @@ export default {
       else this.ruleForm[level] = "";
     },
     // 查看详情列表
-    async handleClick (row) {
+    async handleClick(row) {
       this.dialogFormVisible = true;
       this.shopStart = 1;
       this.disabled = true;
@@ -499,13 +464,13 @@ export default {
       }
     },
     // 页码变化
-    handleCurrentChange (e) {
+    handleCurrentChange(e) {
       this.retailActivitie.page = e;
       this.getMarketingList();
     },
 
     // 营销活动列表
-    async getMarketingList () {
+    async getMarketingList() {
       try {
         const res = await getMarketingList(this.retailActivitie);
         this.tableData = res.result;
@@ -533,12 +498,12 @@ export default {
       }
     }, 300),
     // 创建分销活动
-    createDtb () {
+    createDtb() {
       this.dialogFormVisible = true;
       this.shopStart = 0;
     },
     // 重置
-    reset (retailActivitie) {
+    reset(retailActivitie) {
       (this.retailActivitie = {
         marketing_id: "",
         marketing_name: "",
@@ -551,11 +516,11 @@ export default {
       this.getMarketingList({});
     },
     // 搜索
-    toSearch () {
+    toSearch() {
       this.getMarketingList();
       console.log(this.retailActivitie);
     },
-    selectTime (e) {
+    selectTime(e) {
       let date = new Date();
       if (e && e[1] < date) {
         ElMessage(`'活动结束时间不能早于当前时间'`);
@@ -563,9 +528,9 @@ export default {
       }
     },
     // 获取时间格式
-    formatTime (date) {
+    formatTime(date) {
       // 封装函数判断是否要在目标前边加 ’0‘
-      function getStr (target) {
+      function getStr(target) {
         return ("" + target).length === 1 ? "0" + target : target;
       }
       // 获取月
@@ -586,7 +551,7 @@ export default {
       return timeStr;
     },
     // 查询商品列表
-    async findProducts () {
+    async findProducts() {
       // 获取参数
       const { goods_spu_id, life_account_id } = this.ruleIdForm;
       let [start_time, end_time] = this.timeSelect;
@@ -615,10 +580,10 @@ export default {
         ElMessage.error("请求查询商品列表失败");
       }
     },
-    selectGoodsChange (e) {
+    selectGoodsChange(e) {
       this.ruleForm.goods_sku_id = e.map((item) => item.goods_sku_id);
     },
-    async getAllList () {
+    async getAllList() {
       let all = await getMarketingList({
         page: 1,
         page_size: this.retailActivitie.count,
@@ -680,7 +645,7 @@ export default {
     },
 
     // 清空
-    resetDate () {
+    resetDate() {
       (this.ruleForm = {
         marketing_name: "",
         first_commission_value: "",
@@ -699,13 +664,13 @@ export default {
         });
     },
     // 取消
-    cancel () {
+    cancel() {
       this.dialogFormVisible = false;
       this.resetDate();
       this.getMarketingList();
     },
   },
-  created () {
+  created() {
     this.getMarketingList();
     this.getAllList();
   },