Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/promotion/modules/productModel/calcPrice.vue

@@ -23,10 +23,11 @@ export default {
   inject:['isEdit'],
   data() {
     var NumberSize = (rule, value, callback) => {
-      if (+value > 100 || +value < 1 && value) {
-        return callback(new Error('折扣范围(1-100)'));
+      if (+value >= 0.1 && +value < 1) {
+        callback()
+      } else {
+        return callback(new Error('折扣范围(0.1-1)'));
       }
-      callback()
     }
     return {
       drawer:false,

src/HDrpManagement/promotion/modules/productModel/productDetail.vue

@@ -25,7 +25,7 @@
           <slot name="addProduct" :data="data"></slot>
         </div>
         <div style="margin-top: 15px">
-          <tableLayout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="false"  :height="tableHieght" fixedName="operation">
+          <tableLayout :layout="tablecols" :data="list1" :opwidth="200"  :custom="true" :width="false"  :height="tableHieght" fixedName="operation">
             <template v-slot:customcol="scope">
               <!-- <div v-if="scope.column.columnname == 'amount'">
                 <el-input size="small" v-if="currentItem.sa_paybilldetailid == scope.column.data.sa_paybilldetailid" v-model="scope.column.data.amount"></el-input>
@@ -52,10 +52,10 @@
               </div>
               <div v-else-if="scope.column.columnname == 'islimit'">
                 <div v-if="currentProduct.sa_promotion_itemsid == scope.column.data.sa_promotion_itemsid">
-                  <el-checkbox v-model="scope.column.data.requard" :true-label="1" :false-label="0"></el-checkbox>
+                  <el-checkbox v-model="scope.column.data.islimit" :true-label="1" :false-label="0"></el-checkbox>
                 </div>
                 <span v-else>
-                  <span v-if="scope.column.data.requard">是</span>
+                  <span v-if="scope.column.data.islimit">是</span>
                   <span v-else>否</span>
                 </span>
               </div>
@@ -108,7 +108,7 @@ export default {
       drawer:false,
       tableHieght:"calc(100vh - 380px)",
       tablecols:[],
-      list:[],
+      list1:[],
       total:0,
       currentProduct:{},
       params:{
@@ -124,7 +124,7 @@ export default {
               "condition":""
           }
         }
-      }
+      },
     };
   },
   computed:{
@@ -136,9 +136,9 @@ export default {
       this.params.content.sa_promotionid = this.$route.query.id
       this.params.content.sa_promotion_itemgroupid = id ? id : this.data.sa_promotion_itemgroupid
       const res = await this.$api.requested(this.params)
-      this.list = res.data
+      this.list1 = res.data
       this.total = res.total
-      console.log(this.list,this.total)
+      console.log(this.list1,this.total)
     },
     async save (data) {
       let res = await this.$api.requested({

src/HDrpManagement/salerPromotion/index.vue

@@ -0,0 +1,47 @@
+
+<template>
+      <!-- :detailPath="{
+        path:'/promotionDetail'
+      }"> -->
+  <div>
+    <basicLayout 
+      ref="list" 
+      tableName="promotionTable" 
+      idName="sa_promotionid" 
+      :apiId="{query:20220103140003,del:''}"
+      :options="options">
+      <div slot="custom"></div>
+      <template v-slot:tbList="scope">
+        <div v-if="scope.data.column.data[[scope.data.column.columnname]]">
+          <span v-if="scope.data.column.columnname == 'STATUS'">
+            <span style="color:#333333" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+            <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+            <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '发布'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          </span>
+          <span v-else>
+            {{scope.data.column.data[[scope.data.column.columnname]]}}
+          </span>
+        </div>
+        <div v-if="scope.data.column.columnname != 'operation' && !scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.data[[scope.data.column.columnname]] !== 0">--</div>
+      </template>
+      <template v-slot:tbOpreation="scope">
+      </template>
+    </basicLayout>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      options:[]
+      
+    }
+  },
+  methods:{
+  }
+}
+
+</script>
+<style>
+</style>

src/router/HDrpManagement.js

@@ -564,6 +564,27 @@ const HDrpManagement = [
         component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/promotion/modules/detail')
       },
     ]
+  },{
+    path: '/salerPromotion',
+    name:'salerPromotion',
+    meta: {
+      title: '促销方案(业务端)',
+      ast_nav: true,
+      keeproute: true,
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/salerPromotion/index'),
+    // children: [
+    //   {
+    //     path: '/promotionDetail',
+    //     name:'promotion',
+    //     meta: {
+    //       title: '促销方案详情',
+    //       ast_nav: true,
+    //       keeproute: true,
+    //     },
+    //     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/promotion/modules/detail')
+    //   },
+    // ]
   },