Kaynağa Gözat

middle merge work 代码

jiayufei 3 yıl önce
ebeveyn
işleme
b002d909eb

+ 4 - 1
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -310,6 +310,8 @@
 
 <script>
 import moment from 'moment';
+import {mapGetters} from 'vuex';
+
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 // import { JeecgListMixin } from '@/mixins/ipagination'
 import editableCell from './editableCell'
@@ -683,6 +685,7 @@ export default {
         },
     },
     methods: {
+        ...mapGetters(['userInfo']),
         // 点击跳转
         goNextPage(item){
             console.log(item);
@@ -1520,7 +1523,7 @@ export default {
         accountHttp(){
             this.treeData=[];
             this.accountID=undefined;
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
             if(res.success){
                     // console.log(res);
                     if(res.result){

+ 1 - 1
src/views/modules/BatchCreate/components/Treeselect.vue

@@ -178,7 +178,7 @@
         // })
         this.options=[];
         this.accountID=undefined;
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
                 if(res.success){
                     // console.log(res);
                     if(res.result){

+ 4 - 1
src/views/modules/BatchCreate/directedPackage.vue

@@ -80,6 +80,8 @@
 
 <script>
 import moment from 'moment';
+import {mapGetters} from 'vuex';
+
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 import { JeecgListMixin } from '@/mixins/ipagination'
 import qs from 'qs'
@@ -143,6 +145,7 @@ export default {
         }
     }, 
     methods: {
+        ...mapGetters(['userInfo']),
         openDirectionalPackage(){
             this.$router.push({path:'/BatchCreate/newDirectedPackage'})
         },
@@ -167,7 +170,7 @@ export default {
         accountHttp(){
             this.treeData=[];
             this.accountID=undefined;
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
             if(res.success){
                     // console.log(res);
                 if(res.result){

+ 4 - 1
src/views/modules/BatchCreate/newGroup.vue

@@ -99,6 +99,8 @@
 <script>
 
 import moment from 'moment';
+import {mapGetters} from 'vuex';
+
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 import qs from 'qs'
 const formItemLayout = {
@@ -123,6 +125,7 @@ export default {
         }
     },
     methods: {
+        ...mapGetters(['userInfo']),
         tabChange(key){
             console.log(key);
             this.tabKey=key;
@@ -174,7 +177,7 @@ export default {
         accountHttp(){
             this.treeData=[];
             this.accountID=undefined;
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
             if(res.success){
                     // console.log(res);
                     if(res.result){

+ 1 - 1
src/views/modules/LaunchHousekeeper/LaunchHousekeeperList.vue

@@ -410,7 +410,7 @@ export default {
         accountHttp(){
             this.treeData=[];
             this.accountIds=[];
-            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+            getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
             if(res.success){
                     // console.log(res);
                     if(res.result){

+ 4 - 2
src/views/modules/Statistics/accountReport.vue

@@ -259,6 +259,8 @@
 
 <script>
 import moment from 'moment';
+import {mapGetters} from 'vuex';
+
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 
 import { TreeSelect } from 'ant-design-vue';
@@ -523,7 +525,7 @@ export default {
     },
   },
   methods: {
-
+    ...mapGetters(['userInfo']),
     //项目改变后的事件
     treeChange(val) {
       // console.log(this.treeData)
@@ -836,7 +838,7 @@ export default {
    accountHttp(){
      this.treeData=[];
      this.treeValue=[];
-     getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
+     getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1&userId=' + this.userInfo().id, {}).then(res => {
        if(res.success){
             // console.log(res);
             if(res.result){

+ 1 - 0
src/views/modules/Statistics/components/Treeselect.vue

@@ -230,6 +230,7 @@ export default {
       } else if (this.reqUrl == '/ctop/projectMember/getProjectAccountByUserId') {
         getAction(this.reqUrl, {
           mediaType: this.request,
+          userId: this.userInfo().id
         }).then((res) => {
           if (res.code == 0) {
             if (res.result.length > 0) {

+ 5 - 0
src/views/modules/Statistics/components/datePick.vue

@@ -126,6 +126,11 @@ export default {
   },
   directives: { clickoutside },
   watch: {
+    type(newVal) {
+      if (newVal) {
+        this.active = newVal;
+      }
+    },
     parentDate(n,o){
         if(n[0].format('YYYY-MM-DD')!=this.mydateValue[0].format('YYYY-MM-DD')){
               this.mydateValue=n

Dosya farkı çok büyük olduğundan ihmal edildi
+ 889 - 893
src/views/modules/Statistics/newPlanStatic/newPlanStatic.vue


+ 46 - 11
src/views/modules/account-config/components/configuration-copy.vue

@@ -185,14 +185,25 @@
                             <a-radio-button value="EXTERNAL_URL">落地页</a-radio-button>
                         </a-radio-group>
                     </a-form-model-item>
-                    <a-form-model-item v-if="configForm.adDownloadType === 'EXTERNAL_URL'" label="落地页链接" prop="adExternalUrl">
+                    <div v-if="configForm.adDownloadType === 'EXTERNAL_URL'">
+                        <a-form-model-item label="落地页链接" prop="adExternalUrl" key="arr">
+                            <a-input
+                                class="common-input-long"
+                                :disabled="modalTitle === 'edit'"
+                                v-model="configForm.adExternalUrl"
+                                placeholder="请输入落地页链接"
+                                allow-clear
+                            />
+                        </a-form-model-item>
+                    </div>
+                    <!-- <a-form-model-item v-if="configForm.adDownloadType === 'EXTERNAL_URL'" label="落地页链接" prop="adExternalUrl">
                         <a-input
                             class="common-input-long"
                             v-model="configForm.adExternalUrl"
                             placeholder="请输入落地页链接"
                             allow-clear
                         />
-                    </a-form-model-item>
+                    </a-form-model-item> -->
                     <!-- <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="下载链接" prop="adDownloadUrl">
                         <a-input
                             class="common-input-long"
@@ -218,7 +229,7 @@
                             allow-clear
                         />
                     </a-form-model-item>
-                    <a-form-model-item v-if="platformLoadingType === 'APP_ANDROID'" label="应用下载详情页" prop="creativeWebUrl">
+                    <a-form-model-item v-if="platformLoadingType === 'APP_ANDROID' && configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用下载详情页" prop="creativeWebUrl">
                         <a-input
                             class="common-input-long"
                             v-model="configForm.creativeWebUrl"
@@ -228,7 +239,7 @@
                         />
                         <span style="margin-left: 10px;"><a @click="handleHaveWebUrl">使用已有</a></span>
                     </a-form-model-item>
-                    <div v-if="platformLoadingType === 'APP_ANDROID'" class="adver-position-radio">
+                    <div v-if="platformLoadingType === 'APP_ANDROID' && configForm.adDownloadType === 'DOWNLOAD_URL'" class="adver-position-radio">
                         <div class="create-web-url-class">
                             <div class="web-url-img">
                                 <img v-if="landingPageShowData.thumbnail" :src="landingPageShowData.thumbnail"/>
@@ -842,6 +853,14 @@
                                 allow-clear
                             />
                         </a-form-model-item>
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName26">
+                            <a-input
+                                class="common-input-long"
+                                placeholder="请输入应用名"
+                                v-model="configForm.creativeAppName"
+                                allow-clear
+                            />
+                        </a-form-model-item>
                         <a-form-model-item label="搭配试玩">
                             <a-radio-group v-model="configForm.collocationPlay" button-style="solid" disabled>
                                 <a-radio-button value="a">不启用</a-radio-button>
@@ -905,6 +924,14 @@
                                 allow-clear
                             />
                         </a-form-model-item>
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName27">
+                            <a-input
+                                class="common-input-long"
+                                placeholder="请输入应用名"
+                                v-model="configForm.creativeAppName"
+                                allow-clear
+                            />
+                        </a-form-model-item>
                         <a-form-model-item label="创意展现">
                             <a-radio-group v-model="configForm.creativeDisplayMode" button-style="solid">
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_CTR">优选模式</a-radio-button>
@@ -946,6 +973,14 @@
                                 allow-clear
                             />
                         </a-form-model-item>
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName28">
+                            <a-input
+                                class="common-input-long"
+                                placeholder="请输入应用名"
+                                v-model="configForm.creativeAppName"
+                                allow-clear
+                            />
+                        </a-form-model-item>
                         <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="自动生成视频素材">
                             <a-radio-group v-model="configForm.creativeIsPresentedVideo" button-style="solid">
                                 <a-radio-button :value="0">不启用</a-radio-button>
@@ -1079,7 +1114,7 @@
                                 allow-clear
                             />
                         </a-form-model-item>
-                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName29">
                             <a-input
                                 class="common-input-long"
                                 placeholder="请输入应用名"
@@ -2479,20 +2514,20 @@ export default {
             this.optimizationOption = [];
             this.landingPageShowData = {};
             this.configForm.creativeWebUrl = '';
-            this.platformLoadingType = '';
+            // this.platformLoadingType = '';
             const defaultValue = e.target.value;
             if (defaultValue === 'DOWNLOAD_URL') {
                 this.configForm.adExternalUrl = '';
                 this.configForm.adOpenUrl = '';
-                this.$refs.ruleForm.clearValidate(['adExternalUrl']);
+                // this.$refs.ruleForm.clearValidate(['adExternalUrl']);
             }
             else if (defaultValue === 'EXTERNAL_URL') {
-                this.configForm.adDownloadUrl = '';
-                this.configForm.adPackage = '';
+                // this.configForm.adDownloadUrl = '';
+                // this.configForm.adPackage = '';
                 this.configForm.adConvertId = '';
                 this.configForm.adAppType = '';
-                this.$refs.ruleForm.clearValidate(['adDownloadUrl']);
-                this.$refs.ruleForm.clearValidate(['adPackage']);
+                // this.$refs.ruleForm.clearValidate(['adDownloadUrl']);
+                // this.$refs.ruleForm.clearValidate(['adPackage']);
             }
         },
         handleCampaignCnt(e) {

+ 44 - 18
src/views/modules/account-config/components/configuration-modal.vue

@@ -187,15 +187,17 @@
                             <a-radio-button value="EXTERNAL_URL">落地页</a-radio-button>
                         </a-radio-group>
                     </a-form-model-item>
-                    <a-form-model-item v-if="configForm.adDownloadType === 'EXTERNAL_URL'" label="落地页链接" prop="adExternalUrl">
-                        <a-input
-                            class="common-input-long"
-                            :disabled="modalTitle === 'edit'"
-                            v-model="configForm.adExternalUrl"
-                            placeholder="请输入落地页链接"
-                            allow-clear
-                        />
-                    </a-form-model-item>
+                    <div v-if="configForm.adDownloadType === 'EXTERNAL_URL'">
+                        <a-form-model-item label="落地页链接" prop="adExternalUrl" key="arr">
+                            <a-input
+                                class="common-input-long"
+                                :disabled="modalTitle === 'edit'"
+                                v-model="configForm.adExternalUrl"
+                                placeholder="请输入落地页链接"
+                                allow-clear
+                            />
+                        </a-form-model-item>
+                    </div>
                     <!-- <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="下载链接" prop="adDownloadUrl">
                         <a-input
                             class="common-input-long"
@@ -223,7 +225,7 @@
                             allow-clear
                         />
                     </a-form-model-item>
-                    <a-form-model-item v-if="platformLoadingType === 'APP_ANDROID'" label="应用下载详情页" prop="creativeWebUrl">
+                    <a-form-model-item v-if="platformLoadingType === 'APP_ANDROID' && configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用下载详情页" prop="creativeWebUrl">
                         <a-input
                             class="common-input-long"
                             v-model="configForm.creativeWebUrl"
@@ -234,7 +236,7 @@
                         />
                         <span style="margin-left: 10px;"><a :disabled="modalTitle === 'edit'" @click="handleHaveWebUrl">使用已有</a></span>
                     </a-form-model-item>
-                    <div v-if="platformLoadingType === 'APP_ANDROID'" class="adver-position-radio">
+                    <div v-if="platformLoadingType === 'APP_ANDROID' && configForm.adDownloadType === 'DOWNLOAD_URL'" class="adver-position-radio">
                         <div class="create-web-url-class">
                             <div class="web-url-img">
                                 <img v-if="landingPageShowData.thumbnail" :src="landingPageShowData.thumbnail"/>
@@ -854,6 +856,14 @@
                                 allow-clear
                             />
                         </a-form-model-item>
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName24">
+                            <a-input
+                                class="common-input-long"
+                                placeholder="请输入应用名"
+                                v-model="configForm.creativeAppName"
+                                allow-clear
+                            />
+                        </a-form-model-item>
                         <a-form-model-item label="搭配试玩">
                             <a-radio-group v-model="configForm.collocationPlay" button-style="solid" disabled>
                                 <a-radio-button value="a">不启用</a-radio-button>
@@ -917,6 +927,14 @@
                                 allow-clear
                             />
                         </a-form-model-item>
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName23">
+                            <a-input
+                                class="common-input-long"
+                                placeholder="请输入应用名"
+                                v-model="configForm.creativeAppName"
+                                allow-clear
+                            />
+                        </a-form-model-item>
                         <a-form-model-item label="创意展现">
                             <a-radio-group v-model="configForm.creativeDisplayMode" button-style="solid">
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_CTR">优选模式</a-radio-button>
@@ -958,6 +976,14 @@
                                 allow-clear
                             />
                         </a-form-model-item>
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName25">
+                            <a-input
+                                class="common-input-long"
+                                placeholder="请输入应用名"
+                                v-model="configForm.creativeAppName"
+                                allow-clear
+                            />
+                        </a-form-model-item>
                         <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="自动生成视频素材">
                             <a-radio-group v-model="configForm.creativeIsPresentedVideo" button-style="solid">
                                 <a-radio-button :value="0">不启用</a-radio-button>
@@ -1091,7 +1117,7 @@
                                 allow-clear
                             />
                         </a-form-model-item>
-                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName26">
                             <a-input
                                 class="common-input-long"
                                 placeholder="请输入应用名"
@@ -2478,20 +2504,20 @@ export default {
             this.optimizationOption = [];
             this.landingPageShowData = {};
             this.configForm.creativeWebUrl = '';
-            this.platformLoadingType = '';
+            // this.platformLoadingType = '';
             const defaultValue = e.target.value;
             if (defaultValue === 'DOWNLOAD_URL') {
                 this.configForm.adExternalUrl = '';
                 this.configForm.adOpenUrl = '';
-                this.$refs.ruleForm.clearValidate(['adExternalUrl']);
+                // this.$refs.ruleForm.clearValidate(['adExternalUrl']);
             }
             else if (defaultValue === 'EXTERNAL_URL') {
-                this.configForm.adDownloadUrl = '';
-                this.configForm.adPackage = '';
+                // this.configForm.adDownloadUrl = '';
+                // this.configForm.adPackage = '';
                 this.configForm.adConvertId = '';
                 this.configForm.adAppType = '';
-                this.$refs.ruleForm.clearValidate(['adDownloadUrl']);
-                this.$refs.ruleForm.clearValidate(['adPackage']);
+                // this.$refs.ruleForm.clearValidate(['adDownloadUrl']);
+                // this.$refs.ruleForm.clearValidate(['adPackage']);
             }
         },
         handleCampaignCnt(e) {

+ 1 - 1
src/views/modules/autoLaunch/createStrategy.vue

@@ -177,8 +177,8 @@ export default {
         }
     },
     methods: {
-    
         ...mapGetters(['userInfo']),
+
         //获取表单的某一个属性值
         getFormData(className) {
         return this.form.getFieldValue(className)

+ 4 - 0
src/views/modules/autoLaunch/material-test/creatMaterialTest.vue

@@ -1352,6 +1352,8 @@ li.chouzhen.first:before {
 <script>
 //   import UserMenu from '../tools/UserMenu'
 //   import SMenu from '../menu/'
+import { mapGetters } from 'vuex'
+
 import Logo from '@/components/tools/Logo.vue'
 import pick from 'lodash.pick'
 import { mixin } from '@/utils/mixin.js'
@@ -1860,6 +1862,7 @@ export default {
         }
     },
     methods: {
+        ...mapGetters(['userInfo']),
         moment,
         tongbuClick() {
             this.tongbuLoading = true
@@ -2496,6 +2499,7 @@ export default {
                     if (this.$route.query.id) {
                         params.id = this.$route.query.id
                     }
+                    params.userId = this.userInfo().id;
                     this.postDataAction('/dimension/kuaiShouDimensionStrategy/insertOrUpdate', params).then(res => {
                         if (res.success) {
                             this.sumbitLoading = false

+ 4 - 2
src/views/modules/autoLaunch/material-test/treeSelectAccount.vue

@@ -210,7 +210,8 @@ export default {
                 if (this.options.length > 0) {
                     return
                 }
-                getAction('/ctop/projectMember/projectList').then(res => {
+                // 2021/9/1 蒙蒙让修改 接口增加 userId 原来的url链接并没有使用声明好的params
+                getAction('/ctop/projectMember/projectList', {userId: this.userInfo().id}).then(res => {
                     if (res.success) {
                         this.options = res.data.map(item => {
                             return {
@@ -231,7 +232,8 @@ export default {
                 })
             } else if (this.reqUrl == '/ctop/projectMember/getProjectAccountByUserId') {
                 getAction(this.reqUrl, {
-                    mediaType: this.request
+                    mediaType: this.request,
+                    userId: this.userInfo().id
                 }).then(res => {
                     if (res.code == 0) {
                         if (res.result.length > 0) {

+ 2 - 0
src/views/modules/autoLaunch/newAppId.vue

@@ -105,6 +105,8 @@
 </template>
 
 <script>
+import {mapGetters} from 'vuex';
+
 import Vue from 'vue'
 import {mapGetters} from 'vuex';
 

+ 241 - 13
src/views/modules/material/videoMaterial.vue

@@ -1,4 +1,7 @@
 <style lang="scss">
+/deep/ .usage-details-modal {
+	width: 750px !important;
+}
 .is-disabled .el-checkbox__inner {
   display: none !important;
 }
@@ -814,8 +817,8 @@ a {
                         </a-menu-item>
                       </a-menu>
                     </a-dropdown>
+					<a v-show="active === '0' || active === '1'" style="margin-right: 20px" @click="handleUsageDetails(items)">使用详情</a>
                     <a-checkbox :value="items.id" style="float: right" v-show="active == '1'"></a-checkbox>
-
                     <br />
                     {{ items.createTime }}
                   </span>
@@ -2012,13 +2015,13 @@ a {
     <accountCheckBytedance ref="accountCheckBytedance" @synchro="implement" />
     <permission-modal ref="modalForm" @ok="modalFormOkElse"></permission-modal>
     <!-- 换脸模块 -->
-		<change-face
-			:status="faceTypeStatus"
-			:defaultList="faceChangeList"
-			@closeface="handleFaceCloseModal"
-			@sureface="handleFaceSureModal"
-		>
-		</change-face>
+	<change-face
+		:status="faceTypeStatus"
+		:defaultList="faceChangeList"
+		@closeface="handleFaceCloseModal"
+		@sureface="handleFaceSureModal"
+	>
+	</change-face>
     <a-modal
         v-if="faceShowStatus"
         title="换脸操作"
@@ -2070,6 +2073,90 @@ a {
           @showSizeChange="onShowSizeChange"
       />
     </a-modal>
+	<a-modal
+        v-if="usageDetailsStatus"
+        title="使用详情"
+		:width="750"
+        :visible="usageDetailsStatus"
+        dialog-class="usage-details-modal change-face-modal change-list-modal-show"
+		:footer="null"
+		@cancel="handleProfitModalnCancel"
+    >
+		<div style="overflow: hidden;">	
+			<a-tabs v-model="materiaModalType" @change="handleMateriaTabsChange">
+				<a-tab-pane key="1" tab="头条">
+					<a-table
+						class="face-right-table"
+						ref="table"
+						size="middle"
+						bordered
+						:columns="materiaColumnsToutiao"
+						:dataSource="materiaDataToutiao"
+						:pagination="false"
+						:loading="toutiaoMateriaLoading"
+					>
+						<span slot="accountStatus" slot-scope="text">
+							<span>{{ text === 0 ? '投放中' : '已暂停' }}</span>
+						</span>
+					</a-table>
+					<a-pagination
+						class="pagin-table-class"
+						:total="materiaDataTotalToutiao"
+						:show-total="total => `共 ${materiaDataTotalToutiao} 条`"
+						size="small"
+						:current="defaultCurrentToutiao"
+						:defaultPageSize="10"
+						@change="materiaDataSizeChange"
+						@showSizeChange="materiaDataSizeChange"
+					/>
+				</a-tab-pane>
+				<a-tab-pane key="2" tab="快手">
+					<a-table
+						class="face-right-table"
+						ref="table"
+						size="middle"
+						bordered
+						:columns="materiaColumnsKuaishou"
+						:dataSource="materiaDataKuaishou"
+						:pagination="false"
+						:loading="kuaishouMateriaLoading"
+					>
+						<span slot="accountStatus" slot-scope="text">
+							<span>{{ text === 0 ? '投放中' : '已暂停' }}</span>
+						</span>
+						<span slot="refuseCount" slot-scope="text, record">
+							<span>{{ record.refuseInfo.refuseCount }}</span>
+						</span>
+						<span slot="refuseDetail" slot-scope="text, record">
+							<a :disabled="!record.refuseInfo.refuseDetail" @click="handleRejectReason(record)">拒绝原因</a>
+						</span>
+					</a-table>
+					<a-pagination
+						class="pagin-table-class"
+						:total="materiaDataTotalKuaishou"
+						:show-total="total => `共 ${materiaDataTotalKuaishou} 条`"
+						size="small"
+						:current="defaultCurrentKuaishou"
+						:defaultPageSize="10"
+						@change="materiaDataSizeChangeKuaishou"
+						@showSizeChange="materiaDataSizeChangeKuaishou"
+					/>
+				</a-tab-pane>
+			</a-tabs>
+		</div>
+    </a-modal>
+	<a-modal
+        v-if="rejectReasonStatus"
+        title="审核拒绝原因"
+		:width="750"
+        :visible="rejectReasonStatus"
+		:footer="null"
+		@cancel="handleRejectReasonCancel"
+    >
+		<div>
+			<p v-for="(item, index) in rejectReasonList" :key="index + 1">{{index + 1}}:{{ item }}</p>
+		</div>
+	</a-modal>
   </a-card>
 </template>
 
@@ -2107,9 +2194,88 @@ export default {
     selectTableProject,
     changeFace
   },
-
   data() {
     return {
+		rejectReasonStatus: false,
+		defaultCurrentKuaishou: 1,
+		materiaDataTotalKuaishou: 0,
+		kuaishouMateriaLoading: false,
+		materiaDataKuaishou: [],
+		materiaColumnsKuaishou: [
+			{
+				title: '账户ID',
+				align: 'center',
+				dataIndex: 'accountId'
+			},
+			{
+				title: '账户所属人',
+				align: 'center',
+				dataIndex: 'userName'
+			},
+			{
+				title: '账户状态',
+				align: 'center',
+				dataIndex: 'accountStatus',
+				scopedSlots: {customRender: 'accountStatus'}
+			},
+			{
+				title: '视频ID',
+				align: 'center',
+				dataIndex: 'photoId'
+			},
+			{
+				title: '关联创意总数(自定义创意)',
+				align: 'center',
+				dataIndex: 'relationCount'
+			},
+			{
+				title: '审核拒绝创意数',
+				align: 'center',
+				dataIndex: 'refuseCount',
+				scopedSlots: {customRender: 'refuseCount'}
+			},
+			{
+				title: '审核拒绝原因',
+				align: 'center',
+				dataIndex: 'refuseDetail',
+				scopedSlots: {customRender: 'refuseDetail'}
+			},
+		],
+		toutiaoMateriaLoading: false,
+		defaultCurrentToutiao: 1,
+		materiaDataTotalToutiao: 0,
+		materiaDataToutiao: [],
+		materiaColumnsToutiao: [
+			{
+				title: '账户ID',
+				align: 'center',
+				dataIndex: 'accountId'
+			},
+			{
+				title: '账户归属人',
+				align: 'center',
+				dataIndex: 'userName'
+			},
+			{
+				title: '账户状态',
+				align: 'center',
+				dataIndex: 'accountStatus',
+				scopedSlots: {customRender: 'accountStatus'}
+			},
+			{
+				title: '素材ID',
+				align: 'center',
+				dataIndex: 'materialId'
+			},
+			{
+				title: '素材关联创意数',
+				align: 'center',
+				dataIndex: 'relationCount'
+			}
+		],
+		materiaModalType: '1',
+		materialUseDetailList: {},
+		usageDetailsStatus: false,
       ruleForm:{
         projectId:'',
         urlList:[],
@@ -2473,10 +2639,72 @@ export default {
     }
   },
   methods: {
-            //     :checkFile="ruleFormFile"
-            // :value.sync="ruleForm.urlList"
-            // @overUpload="ruleFormOverUpload"
-            // @removeUpload="ruleFormRemoveUpload"
+	  handleMateriaTabsChange(e) {
+		  const defaultData = this.materialUseDetailList;
+		  this.defaultCurrentToutiao = 1;
+		  this.materiaDataToutiao = defaultData['byteDance'] ? defaultData['byteDance'].slice(0, 10) : [];
+		  this.defaultCurrentKuaishou = 1;
+		  this.materiaDataKuaishou = defaultData['kuaishou'] ? defaultData['kuaishou'].slice(0, 10) : [];
+	  },
+	  handleRejectReasonCancel() {
+		this.rejectReasonStatus = false;
+	  },
+	  handleRejectReason(data) {
+		  this.rejectReasonList = data.refuseInfo.refuseDetail.split('@#');
+		  this.rejectReasonStatus = true;
+	  },
+	materiaDataSizeChange(current, pageSize) {
+		this.materiaDataToutiao = [];
+        this.defaultCurrentToutiao = current;
+        const defaultData = this.materialUseDetailList['byteDance'];
+        this.materiaDataToutiao = [...defaultData.slice(10 * current - 10, 10 * current)];
+	},
+	materiaDataSizeChangeKuaishou(current, pageSize) {
+		this.materiaDataKuaishou = [];
+        this.defaultCurrentKuaishou = current;
+        const defaultData = this.materialUseDetailList['kuaishou'];
+        this.materiaDataKuaishou = [...defaultData.slice(10 * current - 10, 10 * current)];
+	},
+	handleProfitModalnCancel() {
+		this.materialUseDetailList = {};
+		this.materiaDataToutiao = [];
+		this.materiaDataTotalToutiao = 0;
+		this.defaultCurrentToutiao = 1;
+		this.materiaDataKuaishou = [];
+		this.materiaDataTotalKuaishou = 0;
+		this.defaultCurrentKuaishou = 1;
+		this.materiaModalType = '1';
+		this.usageDetailsStatus = false;
+	},
+	handleUsageDetails(data) {
+		this.handleGetMaterialUseDetail(data.code);
+		this.usageDetailsStatus = true;
+		this.toutiaoMateriaLoading = true;
+		this.kuaishouMateriaLoading = true;
+	},
+	handleGetMaterialUseDetail(id) {
+		// 测试code '7b676546bfb50f1b992d44bd479a1536'
+		getAction('/materialUse/getMaterialUseDetail', {code: id}).then(result => {
+			if (result.success) {
+				const defaultData = result.result;
+				this.materialUseDetailList = defaultData;
+				// 头条处理数据
+				this.materiaDataToutiao = defaultData['byteDance'] ? defaultData['byteDance'].slice(0, 10) : [];
+				this.materiaDataTotalToutiao = defaultData['byteDance'] ? defaultData['byteDance'].length : 0;
+				// 快手处理数据 
+				this.materiaDataKuaishou = defaultData['kuaishou'] ? defaultData['kuaishou'].slice(0, 10) : [];
+				this.materiaDataTotalKuaishou = defaultData['kuaishou'] ? defaultData['kuaishou'].length : 0;
+			}
+			else {
+				this.$message.error(result.message);
+			}
+		}).catch(error => {
+			console.log(error, 'eeee');
+		}).finally(() => {
+			this.toutiaoMateriaLoading = false;
+			this.kuaishouMateriaLoading = false;
+		});
+	},
     ruleFormFile(file){
       var bmf = new BMF()
       var that = this

+ 1 - 1
src/views/modules/settlement-account/settlement-account.vue

@@ -362,7 +362,7 @@ export default {
                     width: 250,
                     fixed: 'right',
                     scopedSlots: {customRender: 'action'}
-                },
+                }
             ],
             configForm: {
                 advertiserName: '',

+ 18 - 2
src/views/modules/settlement-information/settlement-information.vue

@@ -246,6 +246,7 @@
             v-if="settlementModalStatus"
             title="下载结算单"
             :visible="settlementModalStatus"
+            :confirmLoading="settlementConfirmLoad"
             dialog-class="information-modal-class"
             @ok="handleSettlementModalSure"
             @cancel="handleSettlementModalnCancel"
@@ -325,6 +326,7 @@
             v-if="profitModalStatus"
             title="下载利润单"
             :visible="profitModalStatus"
+            :confirmLoading="profitConfirmLoad"
             dialog-class="information-modal-class"
             @ok="handleProfitModalSure"
             @cancel="handleProfitModalnCancel"
@@ -375,6 +377,8 @@ export default {
         return {
             userOperateList: ['快手运营总监', '运营助理', '运营专员', '头条运营经理', '外部运营经理', '快手运营', '商务运营', '运营总经理', '直播运营', '头条运营总监', '快手运营助理', '快手运营经理', '头条运营', '头条运营助理'],
             userSaleList: ['外部销售', '销售总监', '销售', '销售助理', '销售支持经理', '销售AM'],
+            settlementConfirmLoad: false,
+            profitConfirmLoad: false,
             profitBtnStatus: false,
             settlementBtnStatus: false,
             accountBtnStatus: false,
@@ -528,7 +532,9 @@ export default {
             this.mode2 = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
         },
         handleProductIdChange(e) {
-            this.handleGetDownLoadAllNum();
+            if (this.settlementModalForm.uploadYears) {
+                this.handleGetDownLoadAllNum();
+            }
         },
         handlePolicyUploadChange(e) {
             this.policyOperationForm.advertiserId = undefined;
@@ -662,6 +668,7 @@ export default {
         handleProfitModalSure() {
             this.$refs.profitModalForm.validate(valid => {
                 if (valid) {
+                    this.profitConfirmLoad = true;
                     const {mediaId, launchDateRange} = this.profitModalForm;
                     const paramsData = {
                         mediaId,
@@ -678,11 +685,12 @@ export default {
                             this.handleProfitModalnCancel();
                             this.$message.success('正在下载利润表,请稍后...', 4);
                             window.location.href = `${urlAcount}${urlData}?startTime=${paramsData.startTime}&endTime=${paramsData.endTime}`;
-
                             // this.handleDownUpdate(url);
                         }
                     }).catch(error => {
                         console.log(error, 'eeee');
+                    }).finally(() => {
+                        this.profitConfirmLoad = false;
                     });
                 }
                 else {
@@ -727,6 +735,7 @@ export default {
         handleSettlementModalSure() {
             this.$refs.settlementModalForm.validate(valid => {
                 if (valid) {
+                    this.settlementConfirmLoad = true;
                     const {advertiserId, productId, mediaId, uploadYears} = this.settlementModalForm;
                     const paramsData = {
                         advertiserId,
@@ -747,6 +756,8 @@ export default {
                         }
                     }).catch(error => {
                         console.log(error, 'eeee');
+                    }).finally(() => {
+                        this.settlementConfirmLoad = false;
                     });
                 }
                 else {
@@ -761,6 +772,7 @@ export default {
                 mediaId: 1,
                 uploadYears: ''
             };
+            this.allProductListOption = [];
             this.downLoadAccountNum = 0;
             this.downLoadImgNum = 0;
             this.settlementModalStatus = false;
@@ -774,6 +786,10 @@ export default {
             if (this.settlementModalForm.productId) {
                 this.handleGetDownLoadAllNum();
             }
+            if (!dateString) {
+                this.downLoadAccountNum = 0;
+                this.downLoadImgNum = 0;
+            }
         },
         // 查询的按钮
         handleQueryList() {

+ 1 - 1
vue.config.js

@@ -118,7 +118,7 @@ module.exports = {
         // target: 'http://192.168.1.8:8806', // 学超
         target:'http://gateway.tjyourong.com.cn', //测试
         // target:'http://apipre.tjyourong.com.cn', //预生产
-        // target: 'http://192.168.1.134:8080', //请求本地 需要jeecg-boot后台项目  周泽宇
+        target: 'http://192.168.1.134:7001', //请求本地 需要jeecg-boot后台项目  周泽宇
 
         // target:'http://gateway.tjyourong.com.cn/',//测试