Browse Source

Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-op-mini-web

zhoux 1 năm trước cách đây
mục cha
commit
11f2bb95c0

+ 20 - 0
src/api/pages/mst/Integral-tactic.js

@@ -0,0 +1,20 @@
+/**
+ * @desc   : 积分策略服务
+ * @author : 常皓宁
+ * @date   : 2024/5/7 14:10
+ */
+export default {
+  integralTacticService:{
+    prefix: '/mdm-server/mst/integralTactic/',
+  }
+}
+
+/**
+ * @desc   : 积分策略路由
+ * @author : 常皓宁
+ * @date   : 2024/5/7 14:10
+ */
+export const routeUrl = {
+  IntegralTactic:{
+  }
+}

+ 20 - 0
src/api/pages/mst/coupon.js

@@ -0,0 +1,20 @@
+/**
+ * @desc   : 优惠卷服务
+ * @author : 常皓宁
+ * @date   : 2024/5/7 14:10
+ */
+export default {
+  couponService:{
+    prefix: '/mdm-server/mst/coupon/',
+  }
+}
+
+/**
+ * @desc   : 优惠卷路由
+ * @author : 常皓宁
+ * @date   : 2024/5/7 14:10
+ */
+export const routeUrl = {
+  coupon:{
+  }
+}

+ 11 - 0
src/locale/lang/zh-CN.js

@@ -598,6 +598,17 @@ export const columns = {
   wxPrice:'手机端价格',
   activityItem:'活动明细',
   activity:'活动总单',
+  regIntegral:'注册积分',
+  signIntegral:'签到积分',
+  fifteenIntegral:'连续15天签到积分',
+  shareIntegral:'分享积分',
+  shareRegIntegral:'分享注册积分',
+  signDayNum:'每日签到次数',
+  couponName:'优惠券名称',
+  couponDesc:'优惠券描述',
+  discount:'折扣',
+  useValidDays:'使用有效期(天)',
+  userNum:'所需人数',
 }
 
 /**

+ 4 - 4
src/view/mst/company-init/index.vue

@@ -233,7 +233,7 @@ export default {
       if (res.code == -300) {
         console.log('asdasda',res)
         this.$Message.error("文件校验失败,已反馈错误数据")
-        //todo
+        //todo 需放开
         // window.location.href = this.$config.serviceUrl + res.message
       } else if(res.code == 200){
         this.$Message.success(this.$t('I_001', {'param':'文件校验通过,成功新建数据'}))
@@ -254,7 +254,7 @@ export default {
         }
         else{
           if(this.tableModel == 'goodSku'){
-            //todo
+            //todo this.$config.serviceUrl替换
             request('http://192.168.1.24:7001'+ '/' + 'mdm-server-' + this.formData.svcCode + '/mst/goodsSeries/list_by_nopage', {}).then(res =>{
               if (res.code === this.$config.SUCCESS_CODE) {
                 this.leftData = res.data;
@@ -293,7 +293,7 @@ export default {
           flgValidList: ["true"],
           cpId:this.formData.cpId
         }
-        //todo
+        //todo this.$config.serviceUrl替换
         request('http://192.168.1.24:7001' + '/' + 'mdm-server-' + this.formData.svcCode + '/mst/goodsSku/list_by', params).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
             this.skuTableData = res.data.list;
@@ -312,7 +312,7 @@ export default {
         let params = {
           flgValid: true,
         }
-        //todo
+        //todo this.$config.serviceUrl替换
         request('http://192.168.1.24:7001' + '/' + 'mdm-server-' + this.formData.svcCode + '/mst/customer/list_by', params).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
             this.cusTableData = res.data.list;

+ 207 - 0
src/view/mst/coupon/index.vue

@@ -0,0 +1,207 @@
+<!-- @desc:优惠卷  @auth:常皓宁  @time:2024-7-24 9:28 -->
+<template>
+  <div class="main-div" ref="mainDiv">
+    <loading :loading="loading" v-if="!modalVisible"></loading>
+    <BaseIndexButtonGroup ref="BaseIndexButtonGroup" id="BaseIndexButtonGroup">
+      <template #left>
+        <BaseIndexButton ref="search" name="search"></BaseIndexButton>
+        <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
+        <BaseIndexButton ref="edit" name="edit"></BaseIndexButton>
+        <!--    启用    -->
+        <BaseIndexButton  ref="enable" name="enable"></BaseIndexButton>
+        <!--    停用    -->
+        <BaseIndexButton  ref="disable" name="disable"></BaseIndexButton>
+      </template>
+      <template #right>
+        <BaseIndexButton ref="add" name="add"></BaseIndexButton>
+      </template>
+    </BaseIndexButtonGroup>
+    <!--  查询条件区域  -->
+    <div id="search-cond-div" ref="search-cond-div" class="search-cond-class">
+      <SearchCond ref="searchCond" v-model="searchCond"
+                  @collapse-change="collapseChange" :setFlag="false"
+                  :searchContent="searchContent"
+      ></SearchCond>
+    </div>
+
+    <!--  表格部分  -->
+    <div slot="top" style="margin-left: 5px;">
+      <DkTable ref="table-select" name="table" :data="tableData" primaryKey="couponId"
+               @pageChange="pageSizeChange"
+               :page-total="pageInfo.total"
+               :page-size="pageInfo.pageSize"
+               :page-size-opts="pageSizeOpts"
+               :current-page="pageInfo.currentPage"
+               :choose-flag="false"
+               :height="this.tableHeight" showFooter>
+        <DkTableColumn field="couponName"></DkTableColumn>
+        <DkTableColumn field="couponDesc"></DkTableColumn>
+        <DkTableColumn field="discount"/>
+        <DkTableColumn field="useValidDays"/>
+        <DkTableColumn field="userNum"></DkTableColumn>
+        <DkTableColumn field="gradeName"/>
+        <DkTableColumn field="flgValid" type="switch" ></DkTableColumn>
+      </DkTable>
+    </div>
+
+    <!--新建编辑总单-->
+    <DkModal
+      :loading="loading"
+      v-model="editAddModal"
+      ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
+      @modalOk="save"
+      :saveFlag="true"
+      :title="modalTitle"
+    >
+      <DkForm ref="formInline" v-model="formData" :col-count="1" :labelMaxWords="6">
+        <!--系统版本-->
+        <DkFormItem prop="gradeCode">
+          <SelectPop v-model="formData.gradeCode" ref="gradeCode"
+                     :options="gradeList"
+                     :multiple="false"
+                     labelKey="gradeName" valueKey="gradeCode">
+          </SelectPop>
+        </DkFormItem>
+        <!--优惠券名称-->
+        <DkFormItem prop="couponName" :required="true">
+          <InputPop v-model="formData.couponName"/>
+        </DkFormItem>
+        <!--优惠券描述-->
+        <DkFormItem prop="couponDesc">
+          <InputPop v-model="formData.couponDesc" :textareaFlag="true"/>
+        </DkFormItem>
+        <!--折扣-->
+        <DkFormItem prop="discount"  :required="true" data-type="number">
+          <InputNumberPop v-model="formData.discount" :digits="2"/>
+        </DkFormItem>
+        <!--使用有效期-->
+        <DkFormItem prop="useValidDays"  :required="true" data-type="number">
+          <InputNumberPop v-model="formData.useValidDays" :unit="'天'"/>
+        </DkFormItem>
+        <!--所需人数-->
+        <DkFormItem prop="userNum"  :required="true" data-type="number">
+          <InputNumberPop v-model="formData.userNum"/>
+        </DkFormItem>
+      </DkForm>
+    </DkModal>
+  </div>
+</template>
+
+<script>
+import {indexMixin} from '@/mixins'
+
+export default {
+  name: "coupon",
+  mixins: [indexMixin],
+  data() {
+    let self = this
+    return {
+      tableData:[],
+      gradeList:[],
+      formData: {
+        couponName:null,
+        couponDesc:null,
+        discount:null,
+        useValidDays:null,
+        userNum:null,
+        gradeCode:null,
+      },
+      searchContent: [
+        {
+          itemCode: 'couponName',
+        },
+        self.$config.flgValidSearch // 有效标识
+      ],
+    }
+  },
+  methods:{
+    /**
+     * @desc   : 查询数据
+     * @author : 常皓宁
+     * @date   : 2024/7/24 9.28
+     */
+    getData(params) {
+      this.tableData = [];
+      return this.excute(this.$service.couponService, this.$service.couponService.selectByCond, params)
+    },
+
+    /**
+     * @desc   : 提交事件
+     * @author : 常皓宁
+     * @date   : 2024/7/24 9.28
+     */
+    saveData() {
+      let params = {...this.formData}
+      console.log('this.params', this.params)
+      if (this.modalParams.button === this.$config.formMode.add) {
+        delete this.params.tacticId // 解决提示主键重复的问题,删除主键代码
+        return this.excute(this.$service.couponService, this.$service.couponService.insert, params)
+      } else {
+        return this.excute(this.$service.couponService, this.$service.couponService.update, params)
+      }
+    },
+
+    /**
+     * @desc   : 清空窗体
+     * @author : 常皓宁
+     * @date   : 2024/7/24 9.28
+     */
+    clear() {
+      this.formData = {
+        couponName:null,
+        couponDesc:null,
+        discount:null,
+        useValidDays:null,
+        userNum:null,
+        gradeCode:null,
+      }
+    },
+
+    /**
+     * @desc   : 通过id查询
+     * @author : 常皓宁
+     * @date   : 2024/7/24 9.28
+     */
+    detail(id) {
+      return this.excuteNoParam(this.$service.couponService, this.$service.couponService.selectById, [id], false).then(res => {
+        this.formData = res.data
+      })
+    },
+
+    /**
+     * @desc   : 获取版本代码
+     * @author : 常皓宁
+     * @date   : 2024/7/24 9.28
+     */
+    getGrade(){
+      // 查询数据
+      let params = {
+      }
+      this.excute(this.$service.commonService, this.$service.commonService.getGrade, params).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.gradeList = res.data
+        }
+      })
+    },
+
+    /**
+    * @desc   : 加载数据
+    * @author : 常皓宁
+    * @date   : 2024/7/24 10:09
+    */
+    initData() {
+      this.getGrade()
+    },
+  },
+  created() {
+    this.primaryKey = 'couponId' // 设置主键Id
+    this.routeObjName = 'coupon'// 设置路由名称
+    this.comHandleEnableFlag = true; // 开启启用停用功能
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

+ 169 - 0
src/view/mst/integral-tactic/index.vue

@@ -0,0 +1,169 @@
+<!-- @desc:积分策略  @auth:常皓宁  @time:2024-7-24 9:28 -->
+<template>
+  <div class="main-div" ref="mainDiv">
+    <loading :loading="loading" v-if="!modalVisible"></loading>
+    <BaseIndexButtonGroup ref="BaseIndexButtonGroup" id="BaseIndexButtonGroup">
+      <template #left>
+        <BaseIndexButton ref="search" name="search"></BaseIndexButton>
+        <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
+        <BaseIndexButton ref="edit" name="edit"></BaseIndexButton>
+      </template>
+      <template #right>
+        <BaseIndexButton ref="add" name="add"></BaseIndexButton>
+      </template>
+    </BaseIndexButtonGroup>
+    <!--  查询条件区域  -->
+    <div id="search-cond-div" ref="search-cond-div" class="search-cond-class">
+      <SearchCond ref="searchCond" v-model="searchCond"
+                  @collapse-change="collapseChange" :setFlag="false"
+                  :searchContent="searchContent"
+      ></SearchCond>
+    </div>
+
+    <!--  表格部分  -->
+    <div slot="top" style="margin-left: 5px;">
+      <DkTable ref="table-select" name="table" :data="tableData" primaryKey="tacticId"
+               @pageChange="pageSizeChange"
+               :page-total="pageInfo.total"
+               :page-size="pageInfo.pageSize"
+               :page-size-opts="pageSizeOpts"
+               :current-page="pageInfo.currentPage"
+               :choose-flag="false"
+               :height="this.tableHeight" showFooter>
+        <DkTableColumn field="regIntegral"></DkTableColumn>
+        <DkTableColumn field="signIntegral"></DkTableColumn>
+        <DkTableColumn field="fifteenIntegral"/>
+        <DkTableColumn field="shareIntegral"/>
+        <DkTableColumn field="shareRegIntegral"></DkTableColumn>
+        <DkTableColumn field="signDayNum"/>
+      </DkTable>
+    </div>
+
+    <!--新建编辑总单-->
+    <DkModal
+      :loading="loading"
+      v-model="editAddModal"
+      ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
+      @modalOk="save"
+      :saveFlag="true"
+      :title="modalTitle"
+    >
+      <DkForm ref="formInline" v-model="formData" :col-count="1" :labelMaxWords="8">
+        <!--注册积分-->
+        <DkFormItem prop="regIntegral" :required="true" data-type="number">
+          <InputNumberPop v-model="formData.regIntegral"/>
+        </DkFormItem>
+        <!--签到积分-->
+        <DkFormItem prop="signIntegral"  :required="true" data-type="number">
+          <InputNumberPop v-model="formData.signIntegral"/>
+        </DkFormItem>
+        <!--15天签到积分-->
+        <DkFormItem prop="fifteenIntegral"  :required="true" data-type="number">
+          <InputNumberPop v-model="formData.fifteenIntegral"/>
+        </DkFormItem>
+        <!--分享积分-->
+        <DkFormItem prop="shareIntegral"  :required="true" data-type="number">
+          <InputNumberPop v-model="formData.shareIntegral"/>
+        </DkFormItem>
+        <!--分享注册积分-->
+        <DkFormItem prop="shareRegIntegral"  :required="true" data-type="number">
+          <InputNumberPop v-model="formData.shareRegIntegral"/>
+        </DkFormItem>
+        <!--每日签到次数-->
+        <DkFormItem prop="signDayNum"  :required="true" data-type="number">
+          <InputNumberPop v-model="formData.signDayNum"/>
+        </DkFormItem>
+      </DkForm>
+    </DkModal>
+  </div>
+</template>
+
+<script>
+import {indexMixin} from '@/mixins'
+
+export default {
+  name: "integral-tactic",
+  mixins: [indexMixin],
+  data() {
+    let self = this
+    return {
+      tableData:[],
+      formData: {
+        regIntegral:null,
+        signIntegral:null,
+        fifteenIntegral:null,
+        shareIntegral:null,
+        shareRegIntegral:null,
+        signDayNum:null,
+      },
+      searchContent: [
+
+      ],
+    }
+  },
+  methods:{
+    /**
+     * @desc   : 查询数据
+     * @author : 常皓宁
+     * @date   : 2024/7/24 9.28
+     */
+    getData(params) {
+      this.tableData = [];
+      return this.excute(this.$service.integralTacticService, this.$service.integralTacticService.selectByCond, params)
+    },
+
+    /**
+     * @desc   : 提交事件
+     * @author : 常皓宁
+     * @date   : 2024/7/24 9.28
+     */
+    saveData() {
+      let params = {...this.formData}
+      console.log('this.params', this.params)
+      if (this.modalParams.button === this.$config.formMode.add) {
+        delete this.params.tacticId // 解决提示主键重复的问题,删除主键代码
+        return this.excute(this.$service.integralTacticService, this.$service.integralTacticService.insert, params)
+      } else {
+        return this.excute(this.$service.integralTacticService, this.$service.integralTacticService.update, params)
+      }
+    },
+
+    /**
+     * @desc   : 清空窗体
+     * @author : 常皓宁
+     * @date   : 2024/7/24 9.28
+     */
+    clear() {
+      this.formData = {
+        regIntegral:null,
+        signIntegral:null,
+        fifteenIntegral:null,
+        shareIntegral:null,
+        shareRegIntegral:null,
+        signDayNum:null,
+      }
+    },
+
+    /**
+     * @desc   : 通过id查询
+     * @author : 常皓宁
+     * @date   : 2024/7/24 9.28
+     */
+    detail(id) {
+      return this.excuteNoParam(this.$service.integralTacticService, this.$service.integralTacticService.selectById, [id], false).then(res => {
+        this.formData = res.data
+      })
+    },
+
+  },
+  created() {
+    this.primaryKey = 'tacticId' // 设置主键Id
+    this.routeObjName = 'IntegralTactic'// 设置路由名称
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

+ 0 - 1
src/view/mst/product/index.vue

@@ -121,7 +121,6 @@ export default {
       let params = {...this.formData}
       console.log('this.params', this.params)
       if (this.modalParams.button === this.$config.formMode.add) {
-        delete this.params.activityId // 解决提示主键重复的问题,删除主键代码
         return this.excute(this.$service.productService, this.$service.productService.insert, params)
       } else {
         return this.excute(this.$service.productService, this.$service.productService.update, params)