jufubao-admin-library 1.1.31 → 1.1.33

package/library/pageComponents/modules/JfbProductSearch.vue

@@ -335,6 +335,18 @@ export default {
           multiple: false, //多选
           list: this.productTypeList,
         },
+        this.$setting.system!=='partner-wholesale'&&{
+          label: "选品来源:", //label
+          ele: "xd-select-list", //package 名称
+          valueKey: "select_source", //form[valueKey]
+          value: [], //v-model
+          placeholder: "请选择类型",
+          multiple: false, //多选
+          list: [
+            {label:'人工选品',value:'manual'},
+            {label:'选品规则',value:'policy'}
+          ],
+        },
         {
           label: "按公共类目:", //label
           ele: "slot", //package 名称
@@ -413,6 +425,7 @@ export default {
           valueKey: "discount_ratio", //form[valueKey]
           value: {},
           disabled: false,
+          labelSlot:'按大于等于最低折扣，小于最高折扣(不含)进行搜索',
           setting: {
             /**单位显示**/
             //图标优先于文字单位

package/library/pageComponents/modules/JfbProductSku.vue

@@ -4,6 +4,7 @@
 			:headers="uiSkusHeaders"
 			:list="getTableDataFromResponseData(productSkuList)"
 			style="width: 100%"
+      @onClick="handleTableClick"
 		>
 			<template slot="stands" slot-scope="inScope">
 				{{inScope.row.standards.map((ss) => `${ss.name}=${ss.value}`).join(" | ") }}
@@ -22,24 +23,40 @@
 			<template slot="volume" slot-scope="inScope">
 				{{$xdHelper.divisionFloatNumber(inScope.row.volume, 100)}}m³
 			</template>
-      <template slot="jfb_price_ratio" slot-scope="inScope">
-        <div>货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_jfb_discount_ratio, 1000)}}</span>折</div>
-        <div v-if="inScope.row.dist_div_jfb_discount_ratio">平台：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_jfb_discount_ratio, 1000)}}</span>折</div>
-      </template>
-       <template slot="market_price_ratio" slot-scope="inScope">
-        <div>货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_market_discount_ratio, 1000)}}</span>折</div>
-        <div v-if="inScope.row.dist_div_market_discount_ratio">平台：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_market_discount_ratio, 1000)}}</span>折</div>
-      </template>
 		</xd-table>
+    <xd-dialog
+      v-if="dialogSetPrices"
+      :show.sync="dialogSetPrices"
+      :z-index='9999'
+      title="查看价格日历"
+      width="50%"
+    > 
+      <div v-if="datePricesRow&&datePricesRow.sku_uniq_id">商品规格:{{ sku_name }}</div>
+      <div class="app-container__list-table">
+        <xd-table
+          :headers="setPricesHeaders"
+          :list="setPricesTables"
+          ref="myTable"
+          :key="setPricesTablesKey"
+          is-border
+        >
+        </xd-table>
+      </div>
+      <div slot="btn">
+        <el-button type="primary" @click="dialogSetPrices = false">好的</el-button>
+      </div>
+    </xd-dialog>
 	</div>
 </template>
 
 <script>
 	import XdTable from "@/components/XdTable";
+  import XdDialog from "@/components/XdDialog"
   export default {
     name: "JfbProductSku",
 		components:{
-      XdTable
+      XdTable,
+      XdDialog
 		},
 		data(){
       let purchase_price_name = this.$setting['system'] === 'supplier' ? '供货商' : '进货价';
@@ -48,17 +65,93 @@
           {"type": "normal", "prop": "stands", "align": "left", "min-width": 200, "label": "规格"},
           {"type": "price", "prop": "purchase_price", "align": "center", "min-width": 80, "label": purchase_price_name},
           {"type": "price", "prop": "jfb_price", "align": "center", "min-width": 80, "label": "建议零售价"},
-          {"type": "price", "prop": "jfb_price_ratio", "align": "left", "min-width": 120, "label": "建议售价折扣"},
           {"type": "price", "prop": "market_price", "align": "center", "min-width": 80, "label": "市场价"},
-          {"type": "price", "prop": "market_price_ratio", "align": "left", "min-width": 120, "label": "市场价折扣"},
           {"type": "normal", "prop": "init_num", "align": "left", "min-width": 80, "label": "库存"},
           {"type": "normal", "prop": "weight", "align": "left", "min-width": 80, "label": "重量"},
           {"type": "normal", "prop": "volume", "align": "left", "min-width": 80, "label": "体积"},
           {"type": "normal", "prop": "product_code", "align": "left", "min-width": 80, "label": "商品编码"},
           {"type": "normal", "prop": "product_bar_code", "align": "left", "min-width": 80, "label": "商品条码"},
-        ]
+          {
+            type: "operate",
+            align: "center",
+            width: 100,
+            label: "价格日历",
+            values: [
+              {
+                ui: "text-button",
+                target: "_blank",
+                name: "查看",
+                type: "text",
+                event: "look",
+              },]
+          }
+        ],
+        //价格日历
+        dialogSetPrices:false,
+        setPricesTables:[],
+        setPricesTablesKey:'setPricesTablesKey',
+        datePricesRow:null,
+        sku_name:'',
 			}
 		},
+    computed:{
+      setPricesHeaders(){
+        return [
+          {
+            type: "normal",
+            prop: "date",
+            align: "center",
+            minWidth: 140,
+            label: "日期",
+          },
+          {
+            type: "price",
+            prop: "purchase_price",
+            align: "center",
+            minWidth: 100,
+            label: "货源进货价",
+          },
+          {
+            type: "price",
+            prop: "dist_price",
+            align: "center",
+            minWidth: 100,
+            label: "平台进货价",
+          },
+          {
+            type: "price",
+            prop: "market_price",
+            align: "center",
+            minWidth: 100,
+            label: "市场价",
+          },
+          {
+            type: "price",
+            prop: "jfb_price",
+            align: "center",
+            minWidth: 100,
+            label: "建议零售价",
+          },
+          {
+            type: "price",
+            prop: "min_sale_price",
+            align: "center",
+            minWidth: 100,
+            label: "最低售价",
+          },
+          this.$setting['system'] !== 'partner'&&{
+            type: "price",
+            prop: "sale_price",
+            align: "center",
+            minWidth: 100,
+            label: "售价",
+          },
+        ].filter(i=>i)
+      }
+    },
+    created(){
+      console.log(this.uiSkusHeaders,'this.uiSkusHeaders')
+    },
 		methods: {
       getTableDataFromResponseData(data = []) {
         let list = this.$xdHelper.cloneDeep(data);
@@ -100,6 +193,21 @@
             standards,
           };
         });
+      },
+
+      handleTableClick ({ value, row }) {
+        console.log(value,row,'oooo')
+        if (value.event == "look") {
+          let sku_name = row.standards.find(item=>item.value!=="event_upload")
+          this.sku_name = sku_name.name+'='+sku_name.value
+          console.log(sku_name,'sku_name')
+          //价格日历查看
+          this.datePricesRow = row;
+          this.setPricesTables = row.date_prices;
+          this.setPricesTablesKey = Date.now();
+          this.dialogSetPrices = true;
+        }
+
       },
 		}
   }

package/library/pageComponents/modules/lib/JfbRuleCreate.js

@@ -21,7 +21,6 @@ export default {
         }
       }
     },
-
     'listValue.price_type' (n, o) {
       if (n && n !== o) {
         this.initForm(this.listValue)
@@ -400,6 +399,7 @@ export default {
             SPlaceholder: '最低折扣值',
             EPlaceholder: '最高折扣值',
           },
+          notice:'系统将按大于等于最低折扣，小于最高折扣(不含)进行选品',
         },
         this.checkConfig('sale_num')&&{
           label: '按销量:',

package/library/viewModules/viewCardsGift/router/greeting_card.js

@@ -10,10 +10,7 @@ const greetingCardRouter = {
   component: Layout,
   sort: 80,
   name: '贺卡管理',
-  alwaysShow: false,
-  // #ifdef  saas-admin
-  hidden: true,
-  // #endif
+  alwaysShow: true,
   redirect: '/greeting_card/list',
   meta: {
     title: '贺卡管理',
@@ -22,7 +19,6 @@ const greetingCardRouter = {
     //roles: []
   },
   children: [
-    // #ifdef  admin
     {
       path: 'list',
       name: 'GreetingCardList',
@@ -33,7 +29,6 @@ const greetingCardRouter = {
         //roles: []
       }
     },
-    // #endif
     {
       path: 'config/:material_id?/:group_id?',
       name: 'GreetingCardConfig',
@@ -42,13 +37,8 @@ const greetingCardRouter = {
       meta: {
         title: '贺卡配置',
         icon: 'el-icon-s-platform',
-        roles: [],
-        // #ifdef  admin
-        activeMenu: "/greeting_card/list",
-        // #endif
-        // #ifdef  saas-admin
-        activeMenu: '/cards/list'
-        // #endif
+       // roles: [],
+        activeMenu: "/greeting_card/list"
       }
     }
   ]

package/library/viewModules/viewCardsGift/schemas/greeting_card.js

@@ -8,6 +8,7 @@ module.exports = {
     {
       title: '贺卡管理 - 组列表',
       mapFn: "getGreetingCardGroupList",
+      isPublic: true,
       path: '/saas-admin/v1/bless_material_group/options',
       isRule: false,
       data: {},
@@ -17,6 +18,7 @@ module.exports = {
     {
       title: '贺卡管理 - 创建',
       mapFn: "AddGreetingCardGroup",
+      isPublic: true,
       path: '/saas-admin/v1/bless_material_group',
       isRule: false,
       data: {
@@ -28,6 +30,7 @@ module.exports = {
     {
       title: '贺卡管理 - 删除',
       mapFn: "delGreetingCardGroup",
+      isPublic: true,
       path: '/saas-admin/v1/bless_material_group/:group_id',
       isRule: false,
       data: {
@@ -40,6 +43,7 @@ module.exports = {
     {
       title: '贺卡管理 - 贺卡列表',
       mapFn: "getGreetingCardList",
+      isPublic: true,
       path: '/saas-admin/v1/bless_material/items',
       isRule: false,
       data: {
@@ -53,6 +57,7 @@ module.exports = {
     {
       title: '贺卡管理 - 创建贺卡',
       mapFn: "addGreetingCard",
+      isPublic: true,
       path: '/saas-admin/v1/bless_material',
       isRule: false,
       data: {
@@ -64,6 +69,7 @@ module.exports = {
     {
       title: '贺卡管理 - 编辑贺卡',
       mapFn: "updateGreetingCard",
+      isPublic: true,
       path: '/saas-admin/v1/bless_material/:material_id',
       isRule: false,
       data: {
@@ -77,6 +83,7 @@ module.exports = {
     {
       title: '贺卡管理 - 复制贺卡',
       mapFn: "copyGreetingCard",
+      isPublic: true,
       path: '/saas-admin/v1/bless_material/copy/:copy_material_id',
       isRule: false,
       data: {
@@ -89,6 +96,7 @@ module.exports = {
     {
       title: '贺卡管理 - 获取贺卡信息',
       mapFn: "getGreetingCardById",
+      isPublic: true,
       path: '/saas-admin/v1/bless_material/item/:material_id',
       isRule: false,
       data: {
@@ -97,55 +105,5 @@ module.exports = {
       disabled: true,
       role: '',
     },
-    {
-      title: '贺卡管理 - 素材配置数据',
-      mapFn: "setGreetingCardBaseConfig",
-      path: '/saas-admin/v1/bless_material/config/:material_id',
-      isRule: false,
-      data: {
-        material_id:['素材ID', 'string|number', '必填'],
-        item: ['素材配置对象', 'string|number', '必填']
-      },
-      disabled: true,
-      role: '',
-      method: 'put'
-    },
-
-    //custom
-    {
-      title: '贺卡管理 - 获取自定义素材信息',
-      mapFn: "getCustomMaterialInfo",
-      path: '/saas-company/v1/bless_x_material/item/:x_material_id',
-      isRule: false,
-      params: {
-        x_material_id:['素材ID', 'string|number', '必填'],
-      },
-      disabled: true,
-      role: '',
-    },
-    {
-      title: '贺卡管理 - 创建自定义素材',
-      mapFn: "createCustomMaterial",
-      path: '/saas-company/v1/bless_x_material',
-      isRule: false,
-      data: {
-        item: ['素材配置对象', 'string|number', '必填']
-      },
-      disabled: true,
-      role: '',
-    },
-    {
-      title: '贺卡管理 - 编辑自定义素材',
-      mapFn: "updateCustomMaterial",
-      path: '/saas-company/v1/bless_x_material/:x_material_id',
-      isRule: false,
-      data: {
-        x_material_id:['素材ID', 'string|number', '必填'],
-        item: ['素材配置对象', 'string|number', '必填']
-      },
-      disabled: true,
-      role: '',
-      method: 'put'
-    },
   ],
 }