jufubao-admin-library 1.1.119 → 1.1.121

package/library/pageComponents/modules/JfbProductSku.vue

@@ -23,17 +23,17 @@
 			<template slot="volume" slot-scope="inScope">
 				{{$xdHelper.divisionFloatNumber(inScope.row.volume, 100)}}m³
 			</template>
-      <template slot="purchase_price" slot-scope="inScope">
-        <div v-if="inScope.row.purchase_price!==-1">货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_price, 100)}}</span>元</div>
-        <div v-if="inScope.row.dist_price!==-1">平台：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_price, 100)}}</span>元</div>
+       <template slot="purchase_price" slot-scope="inScope">
+        <div v-if="inScope.row.purchase_price!==-1&&$setting['system']!=='open-dist'">货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_price, 100)}}</span>元</div>
+        <div v-if="inScope.row.dist_price!==-1">{{$setting['system']==='open-dist'?'分销':'平台'}}：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_price, 100)}}</span>元</div>
       </template>
       <template slot="jfb_price_ratio" slot-scope="inScope">
         <div v-if="inScope.row.purchase_div_jfb_discount_ratio">货源：<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>
+        <div v-if="inScope.row.dist_div_jfb_discount_ratio">{{$setting['system']==='open-dist'?'分销':'平台'}}：<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 v-if="inScope.row.purchase_div_market_discount_ratio">货源：<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>
+        <div v-if="inScope.row.dist_div_market_discount_ratio">{{$setting['system']==='open-dist'?'分销':'平台'}}：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_market_discount_ratio, 1000)}}</span>折</div>
       </template>
 		</xd-table>
     <xd-dialog
@@ -94,7 +94,7 @@
             minWidth: 140,
             label: "日期",
           },
-          {
+          this.$setting['system'] !== 'open-dist'&&{
             type: "price",
             prop: "purchase_price",
             align: "center",
@@ -106,7 +106,7 @@
             prop: "dist_price",
             align: "center",
             minWidth: 100,
-            label: "平台进货价",
+            label: this.$setting['system'] !== 'open-dist'?"平台进货价":'分销价',
           },
           {
             type: "price",
@@ -122,14 +122,14 @@
             minWidth: 100,
             label: "建议零售价",
           },
-          {
+          this.$setting['system'] !== 'open-dist'&&{
             type: "price",
             prop: "min_sale_price",
             align: "center",
             minWidth: 100,
             label: "最低售价",
           },
-          this.$setting['system'] !== 'partner'&&{
+          this.$setting['system'] !== 'partner'&&xdCookie.get('app_type')&&xdCookie.get('app_type')==='H'&&{
             type: "price",
             prop: "sale_price",
             align: "center",
@@ -139,7 +139,7 @@
         ].filter(i=>i)
       },
       uiSkusHeaders(){
-        let purchase_price_name = this.$setting['system'] === 'supplier' ? '供货商' : '进货价';
+        let purchase_price_name = this.$setting['system'] === 'supplier' ? '供货商' :this.$setting['system'] === 'open-dist' ?'分销价':'进货价';
         return [
           {"type": "normal", "prop": "stands", "align": "left", "min-width": 200, "label": "规格"},
           this.isShowPurchasePrice && {"type": "price", "prop": "purchase_price", "align": "center", "min-width": 80, "label": purchase_price_name},

package/library/viewModules/viewTask/schemas/tasks.js

@@ -12,6 +12,9 @@ module.exports = {
       // #ifdef admin partner partner-stat oa-finance supplier saas-admin saas-admin partner-saas partner-wholesale
       path: '/@@@@/v1/async/list',
       // #endif
+      // #ifdef open-dist
+      path: '/open-dist-dist/v2/async/list',
+      // #endif
       //#ifdef partner-gift partner-mall partner-movie partner-market
       path: '/@@@@/v1/:xsiteid/:xnamespace/async/list',
       // #endif
@@ -39,6 +42,9 @@ module.exports = {
       // #ifdef admin partner partner-stat oa-finance supplier saas-admin partner-saas partner-wholesale
       path: '/@@@@/v1/async/retry',
       // #endif
+      // #ifdef open-dist
+      path: '/open-dist-dist/v2/async/retry',
+      // #endif
       // #ifdef partner-gift partner-mall partner-movie partner-market
       path: '/@@@@/v1/:xsiteid/:xnamespace/async/retry',
       // #endif
@@ -56,7 +62,12 @@ module.exports = {
       mapFn: 'getDownloadUrl',
       isRule: false,
       title: '任务query',
+      // #ifdef open-dist
+      path: '/open-dist-dist/v2/async/real-url',
+      // #endif
+      // #ifndef open-dist
       path: '/@@@@/v1/async/real-url',
+      // #endif
       params: {
         serial_no: ['id', 'String', '必选'],
         // #ifdef  admin
@@ -65,7 +76,7 @@ module.exports = {
         // #ifdef  supplier
         from: ['项目标识', 'String', '必选', 'supplier'],
         // #endif
-        // #ifndef  admin supplier
+        // #ifndef  admin supplier open-dist
         from: ['项目标识', 'String', '必选', 'partner'],
         // #endif
       },

package/library/viewModules/viewTask/viewTask/list.vue

@@ -144,6 +144,9 @@ export default {
         page_token: this.pageSize,
         page_size: this.limit,
         ...this.searchParams,
+        // #ifdef open-dist
+        app_id:xdCookie.get('app_value'),
+        // #endif
       }
       let loading = this.$loading({})
       this.getAsyncList(params).then(res => {
@@ -244,18 +247,26 @@ export default {
             // #ifdef  partner-site
             params = {from:'site'}
             // #endif
-            // #ifndef  admin supplier partner-site
+            // #ifndef  admin supplier partner-site open-dist
             params = {from:'partner'}
             // #endif
             getOptions({
-              // #ifndef  partner-wholesale
+              // #ifndef  partner-wholesale open-dist
               server:'export-public',
               // #endif
               // #ifdef  partner-wholesale
               server:'wholesale-public',
               // #endif
+              // #ifdef  open-dist
+              server:'open-dist-dist',
+              // #endif
               fn:'data-tags',
+              // #ifdef  open-dist
+              path: 'p21',
+              // #endif
+              // #ifndef  open-dist
               path: 'p1',
+              // #endif
               params
             }).then(res => {
               //#ifdef partner-site
@@ -288,7 +299,12 @@ export default {
     handleOperate (action, serial_no, url) {
       if (action === 'retry') {
         //重新执行
-        this.asyncRetry({ serial_no: serial_no })
+        this.asyncRetry({ 
+          serial_no: serial_no,
+          // #ifdef open-dist
+          app_id:xdCookie.get('app_value'),
+          // #endif
+        })
           .then(res => {
             this.$message({
               type: 'success',

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/components/PeopleManage.vue

@@ -251,6 +251,7 @@ export default {
           tipsformet: '上传文件格式：@imageType@，不超过@size@MB.<a style="color:#409EFF" href="https://img.jufubao.cn/xlsx/mobile_user.xlsx">模版下载</a>',
           type: ['docx', 'doc', 'xlsx'],
           styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+          showType: 'name', //其值：name=>显示文件名 url=>显示路径
           uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
           size: 5, //5M
           action: 'aliyun',

package/library/viewModules/viewsDynamicForm/viewsDynamicForm/components/dialogUser.vue

@@ -51,6 +51,9 @@
           @onApiSuccessUrl="handleApiSuccessUrl"
           @onGetParamsAndHeader="handlePrivateGetParamsAndHeader"
         >
+        <template slot="download" slot-scope="scope">
+          <el-link :style="{marginLeft:scope.width}" type="primary" @click="handleDown">点击下载模板</el-link>
+        </template>
         </xd-base-dynamic-field>
       </div>
       <div slot="btn" class="xd-dialog__box-footer">
@@ -169,22 +172,33 @@ export default {
       console.log(params, "initForm")
       this.listForm = [
         {
-          label: "请上传文件:",
-          ele: "xd-saas-upload-file",
+          label: '', //label
+          ele: 'slot', //package 名称
+          slot: 'download',
+        },
+        {
+          label: "文件:",
+          ele: "xd-upload",
           valueKey: "path_file",
-          value: null,
-          defaultValue: params.path_file ? { url: params.path_file} : null,
-          setting: {
-            type: ['xls', 'xlsx', 'csv'],
-          },
-          handleCustom: (action) => {
-            console.log("action", action);
-            if(action == 'download'){
-              window.open(this.download,'_self');
-            }
-          },
+          value: {},
+          defaultValue: {},
+          slot: false,
+          elinputClassName: "input40",
+          tipsformet: "上传文件格式：@imageType@，不超过@size@MB.",
+          type: ["xls", "xlsx", "csv"],
+          styleType: "one",
+          showType:'name', //显示类型 name:名称  url:地址
+          uploadType: "aliyun",
+          size: 5,
+          action: "aliyun",
+          sort: true,
+          maxlen: 100,
           rules: [
-            { required: true, message: "请上传文件", trigger: ["blur", "change"] },
+            {
+              required: true,
+              message: "请上传文件",
+              trigger: ["blur", "change"],
+            },
           ],
         },
         {
@@ -213,6 +227,9 @@ export default {
     handleCancelUpload(){
       this.dialogFormShow = false;
     },
+    handleDown() {
+      window.open(this.download,'_self');
+    },
     handleConfirmUpload(){
       this.$refs.poster.submit().then(res => {
         console.log("res", this.listValue)

package/library/viewModules/viewsMaterial/viewsMaterial/common/common.scss

@@ -17,8 +17,9 @@
 
 .material {
   flex: 1;
-  margin-left: 20px;
+  margin-left: 15px;
   padding-top: 30px;
+  margin-right: 15px;
 
   &-wrap {
     height: 560px;
@@ -47,31 +48,32 @@
       display: flex;
       flex-wrap: nowrap;
 
-      .el-button {
+      & > .el-button {
         margin-left: 15px;
       }
     }
   }
 
   &-list {
-    margin-top: 20px;
     display: flex;
     flex-wrap: wrap;
-    max-height: 460px;
-    min-height: 460px;
     overflow-y: auto;
+    margin-bottom: 10px;
+    justify-content: flex-start;
+    align-content: flex-start;
 
     &-item {
-      margin-right: 30px;
-      margin-bottom: 16px;
+      margin-right: 15px;
+      margin-bottom: 15px;
       position: relative;
-      width: 110px;
+      width: 127px;
       cursor: pointer;
 
       &-img {
         width: 110px;
         height: 110px;
         background: #f6f7f9;
+        margin: 0 auto;
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -80,9 +82,10 @@
       }
 
       &-name {
+        width: 110px;
         font-size: 16px;
         color: #666;
-        margin: 12px 0;
+        margin: 12px auto;
         text-align: left;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -94,6 +97,13 @@
         color: #999;
       }
     }
+
+    &.c5 .material-list-item:nth-child(5n) {
+      margin-right: 0;
+    }
+    &.c7 .material-list-item:nth-child(7n) {
+      margin-right: 0;
+    }
   }
 
   .active {
@@ -122,8 +132,8 @@
 }
 
 .el-empty {
-  height: 480px;
-  min-height: 480px;
+  height: 100%;
+  width: 100%;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -131,4 +141,4 @@
   text-align: center;
   box-sizing: border-box;
   padding: 40px 0;
-}
+}

package/library/viewModules/viewsMaterial/viewsMaterial/common/platform.scss

@@ -1,7 +1,5 @@
 .platform-wrap {
-  height: 570px;
-  overflow-y: auto;
-  margin-left: 20px;
+  height: 100%;
 }
 
 .platform-header {
@@ -101,4 +99,4 @@
     left: 31%;
     transform: translate(-50%, -50%);
   }
-}
+}

package/library/viewModules/viewsMaterial/viewsMaterial/components/CusUpload.vue

@@ -7,8 +7,8 @@
           <slot :image="oneItem">
             <el-button size="small" type="primary" :disabled="disabled">{{uploadName}}</el-button>
           </slot>
-          <div v-if="(oneItem && (oneItem.path || oneItem.url)) && !disabled " class="xd-upload__one-btn-del" @click.stop="delOne()">
-            <i v-if="item['slot'] || isShowDel" class="el-icon-delete"></i>
+          <div  v-if="isShowDel && (oneItem && (oneItem.path || oneItem.url)) && !disabled " class="xd-upload__one-btn-del" @click.stop="delOne()">
+            <i v-if="item['slot']" class="el-icon-delete"></i>
           </div>
           <div class="xd-upload__disabled" v-if="disabled"></div>
         </div>
@@ -61,7 +61,7 @@
             :disabled="isBtnMaterialMore || disabled"
             @click="isDialogShow=true"
           >{{materialBtnName}}</el-button></div>
-          <div v-if="showtype" slot="tip" class="xd-upload__tip">
+          <div v-if="showType" slot="tip" class="xd-upload__tip">
             <slot name="tip"><span v-html="tooltip"></span></slot>
           </div>
         </div>
@@ -95,13 +95,13 @@
             <slot :image="oneItem">
               <el-button size="small" type="primary" :disabled="disabled">{{uploadName}}</el-button>
             </slot>
-            <div v-if="(oneItem && (oneItem.path || oneItem.url)) && !disabled " class="xd-upload__one-btn-del" @click.stop="delOne()">
+            <div v-if="isShowDel && (oneItem && (oneItem.path || oneItem.url)) && !disabled " class="xd-upload__one-btn-del" @click.stop="delOne()">
               <i v-if="item['slot']" class="el-icon-delete"></i>
             </div>
             <div class="xd-upload__disabled" v-if="disabled"></div>
           </div>
         </el-upload>
-        <div v-if="showtype" slot="tip" class="xd-upload__tip">
+        <div v-if="showType" slot="tip" class="xd-upload__tip">
           <slot name="tip"><span v-html="tooltip"></span></slot>
         </div>
       </template>
@@ -177,7 +177,7 @@
               </div>
             </el-upload>
           </div>
-          <div v-if="showtype" slot="tip" class="xd-upload__tip">
+          <div v-if="showType" slot="tip" class="xd-upload__tip">
             <slot name="tip"><span v-html="tooltip"></span></slot>
           </div>
         </div>
@@ -257,7 +257,7 @@
             </div>
           </el-upload>
            <el-upload
-            v-else            
+            v-else
             :disabled="disabled"
             class="xd-upload__list-ele"
             ref="xd-upload__list"
@@ -281,7 +281,7 @@
               <div class="xd-upload__disabled" v-if="disabled&&!isRealse"></div>
             </div>
           </el-upload>
-          <div v-if="showtype" slot="tip" class="xd-upload__tip">
+          <div v-if="showType" slot="tip" class="xd-upload__tip">
             <slot name="tip"><span v-html="tooltip"></span></slot>
           </div>
         </div>
@@ -367,7 +367,7 @@
 			/**
        * @description 是否显示提示语
        */
-			showtype: {
+			showType: {
 				type: Boolean,
 				default: false
       },
@@ -1058,6 +1058,9 @@
             if(this.$xdHelper.isEmpty(this.defaultValue))  this.update('', 'init');
             else this.update(this.$xdHelper.cloneDeep(this.defaultValue), 'init');
           }
+          else if(this.$xdHelper.checkVarType(this.defaultValue) === 'string' && this.defaultValue.length > 0){
+            this.update({url: this.defaultValue}, 'init');
+          }
           else {
             this.update('', 'init');
           }
@@ -1342,7 +1345,7 @@
     &__tip {
       font-size: 10px;
       padding-top: 10px;
-      line-height: 24px;
+      line-height: 16px;
     }
 
     &__one {