Просмотр исходного кода

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

朱鑫波 4 лет назад
Родитель
Сommit
54993ec569

+ 10 - 5
src/views/modules/workBench/designLeader/platForm.vue

@@ -90,8 +90,8 @@
                             订单进度
                              <!-- <a-button type="link" class="allOrder" @click="goOrderList(4)">全部订单</a-button> -->
                         </div>
-                        <div class="orderProgress">
-                            <a-spin :spinning="orderProgressSpinning">
+                        <a-spin :spinning="orderProgressSpinning">
+                        <div class="orderProgress">                            
                             <ul class="orderProgress-list" v-if="orderProgressList.length>0">
                                 <li v-for="(item,index) in orderProgressList" :key="index"  >
                                     
@@ -119,9 +119,9 @@
                                 <img src="@/assets/nodata.png" alt="" style="width:300px;text-align:center">
                             </div>
                             <!-- hideOnSinglePage -->
-                            <a-pagination size="small" :total="totalPage" :current='currentPage' class="fenye" :change='pageChange'  show-size-changer show-quick-jumper hideOnSinglePage />
-                            </a-spin>
+                            <a-pagination size="small" :total="totalPage" :current='currentPage' class="fenye" :pageSize='8' @change='pageChange'   show-quick-jumper hideOnSinglePage />                            
                         </div>
+                        </a-spin>
                     </div>
                 </div>
                 <div class="sectionRightBox">
@@ -225,7 +225,8 @@ export default {
         },
         // 分页页码改变
         pageChange(page, pageSize){
-             this.currentPage=page;
+            // console.log(page,pageSize)
+            this.currentPage=page;
             this.getOrderList()
         },
         // 全部订单
@@ -548,6 +549,7 @@ export default {
                     .orderProgress{
                         padding: 0 20px;
                         height: 585px;
+                        position: relative;
                         .orderProgress-list-item{
                             padding: 10px 0;
                             display: flex;
@@ -595,6 +597,9 @@ export default {
                         .fenye{
                             padding: 20px 0;
                             text-align: right;
+                            position: absolute;
+                            right: 20px;
+                            bottom: 0;
                         }
                     }
                 }

+ 13 - 5
src/views/modules/workBench/designPeople/platForm.vue

@@ -69,8 +69,9 @@
                             订单进度
                              <!-- <a-button type="link" class="allOrder" @click="goOrderList(4)">全部订单</a-button> -->
                         </div>
+                        <a-spin :spinning="orderProgressSpinning">
                         <div class="orderProgress">
-                            <a-spin :spinning="orderProgressSpinning">
+                            
                             <ul class="orderProgress-list" v-if="orderProgressList.length>0">
                                 <li v-for="(item,index) in orderProgressList" :key="index"  >
                                     
@@ -99,9 +100,10 @@
                                 <img src="@/assets/nodata.png" alt="" style="width:300px;text-align:center">
                             </div>
                             <!-- hideOnSinglePage -->
-                            <a-pagination size="small" :total="totalPage" :current='currentPage' class="fenye" :change='pageChange'  show-size-changer show-quick-jumper hideOnSinglePage />
-                            </a-spin>
+                            <a-pagination size="small" :total="totalPage" :current='currentPage' :pageSize='8' class="fenye" @change='pageChange'   show-quick-jumper hideOnSinglePage />
+                            
                         </div>
+                        </a-spin>
                     </div>
                 </div>
                 <div class="sectionRightBox">
@@ -205,7 +207,9 @@ export default {
         },
         // 分页页码改变
         pageChange(page, pageSize){
-
+            this.currentPage=page;
+            // console.log(page,pageSize)
+            this.getOrderList()
         },
         // 全部订单
         allOrder() {
@@ -222,7 +226,7 @@ export default {
             let params={
                 design:this.userInfo.id,
                 pageNo:this.currentPage,
-                pageSize:10,
+                pageSize:8,
             }
             getAction('/platform/order/listByCreatorOrDesignLeader',params).then(res=>{
                 console.log(res);
@@ -531,6 +535,7 @@ export default {
                     .orderProgress{
                         padding: 0 20px;
                         height: 585px;
+                        position: relative;
                         .orderProgress-list-item{
                             padding: 10px 0;
                             display: flex;
@@ -578,6 +583,9 @@ export default {
                         .fenye{
                             padding: 20px 0;
                             text-align: right;
+                            position: absolute;
+                            right: 20;
+                            bottom: 0px;
                         }
                     }
                 }

+ 1 - 1
src/views/modules/workBench/operator/materialList.vue

@@ -786,7 +786,7 @@ export default {
             this.ipagination.current=pagination.current;
 
             this.ipagination.pageSize=pagination.pageSize;
-            this.tableHttp(this.$parent.materialStatus)
+            this.tableHttp(this.activeKey)
         },
        
         

+ 12 - 4
src/views/modules/workBench/operator/platForm.vue

@@ -82,8 +82,9 @@
                             订单进度
                              <!-- <a-button type="link" class="allOrder" @click="goOrderList(1)">全部订单</a-button> -->
                         </div>
+                        <a-spin :spinning="orderProgressSpinning">
                         <div class="orderProgress">
-                            <a-spin :spinning="orderProgressSpinning">
+                            
                             <ul class="orderProgress-list" v-if="orderProgressList.length>0">
                                 <li v-for="(item,index) in orderProgressList" :key="index"  >
                                     <!-- <span  style="display:block;width:100%"> -->
@@ -112,9 +113,10 @@
                                 <img src="@/assets/nodata.png" alt="" style="width:300px;text-align:center">
                             </div>
                             <!-- hideOnSinglePage -->
-                            <a-pagination size="small" :total="totalPage" :current='currentPage' class="fenye" :change='pageChange'  show-size-changer show-quick-jumper hideOnSinglePage />
-                            </a-spin>
+                            <a-pagination size="small" :total="totalPage" :current='currentPage' :pageSize='8' class="fenye" @change='pageChange'  show-quick-jumper  />
+                            
                         </div>
+                        </a-spin>
                     </div>
                 </div>
                 <div class="sectionRightBox">
@@ -196,6 +198,7 @@ export default {
             // 分页参数
             totalPage:0,
             currentPage:1,
+
             userInfo:{},
             roleCode:'',
 
@@ -224,6 +227,7 @@ export default {
         // 分页页码改变
         pageChange(page, pageSize){
             this.currentPage=page;
+            // console.log(page,pageSize)
             this.getOrderList()
         },
         
@@ -238,7 +242,7 @@ export default {
             let params={
                 createBy:this.userInfo.id,
                 pageNo:this.currentPage,
-                pageSize:10,
+                pageSize:8,
             }
             this.orderProgressSpinning=true;
             getAction('/platform/order/listByCreatorOrDesignLeader',params).then(res=>{
@@ -555,6 +559,7 @@ export default {
                     .orderProgress{
                         padding: 0 20px;
                         height: 585px;
+                        position: relative;
                         .orderProgress-list-item{
                             padding: 10px 0;
                             display: flex;
@@ -602,6 +607,9 @@ export default {
                         .fenye{
                             padding: 20px 0;
                             text-align: right;
+                            position: absolute;
+                            right: 20px;
+                            bottom: 0px;
                         }
                     }
                 }

+ 15 - 13
src/views/modules/workBench/orderDetail.vue

@@ -1525,18 +1525,19 @@ export default {
         // shipin通过审核
         approved(){
             postAction(this.url.videoAccept,{
-                id:this.currentMaterial.materialId,
-                videoReject:this.videoReject,
+                id:this.currentMaterial.id,
+                orderCode:this.currentMaterial.orderCode,
                 materialCode:this.currentMaterial.materialCode,
                 videoId:this.currentVideo.videoId
             }).then(res=>{
                 console.log(res);
 
-                this.vsible=false;
+                this.visible=false;
                 this.videoAdvise=''
                 if(res.success){
                     this.$message.success(res.message);
-                    this.tableHttp(this.$parent.materialStatus)
+                    // this.tableHttp(this.$parent.materialStatus)
+                    this.materialHttp()
                 }else{
                     this.$message.error(res.message)
                 }
@@ -1545,16 +1546,17 @@ export default {
         // 视频驳回
         reject(){           
             postAction(this.url.videoReject,{
-                id:this.currentMaterial.materialId,
-                scriptAdvise:this.scriptAdvise,
+                id:this.currentMaterial.id,
+                videoAdvise:this.videoAdvise,
                 materialCode:this.currentMaterial.materialCode
+                
             }).then(res=>{
                 console.log(res);
-
-                this.scriptVisible=false;
+                this.videoAdvise=''
+                this.visible=false;
                 if(res.success){
                     this.$message.success(res.message);
-                    this.tableHttp(this.$parent.materialStatus)
+                    this.materialHttp()
                 }else{
                     this.$message.error(res.message)
                 }
@@ -1564,7 +1566,7 @@ export default {
         // 脚本通过审核
         scriptApproved(){
             postAction(this.url.scriptAccept,{
-                id:this.currentMaterial.materialId,
+                id:this.currentMaterial.id,
                  orderCode:this.currentMaterial.orderCode,
                  materialCode:this.currentMaterial.materialCode
             }).then(res=>{
@@ -1573,7 +1575,7 @@ export default {
                 this.scriptVisible=false;
                 if(res.success){
                     this.$message.success(res.message);
-                    this.tableHttp(this.$parent.materialStatus)
+                    this.materialHttp()
                 }else{
                     this.$message.error(res.message)
                 }
@@ -1582,7 +1584,7 @@ export default {
         // 脚本驳回
         scriptReject(){
             postAction(this.url.scriptReject,{
-                id:this.currentMaterial.materialId,
+                id:this.currentMaterial.id,
                 scriptAdvise:this.scriptAdvise,
                 materialCode:this.currentMaterial.materialCode
             }).then(res=>{
@@ -1592,7 +1594,7 @@ export default {
                 this.scriptReject=''
                 if(res.success){
                     this.$message.success(res.message);
-                    this.tableHttp(this.$parent.materialStatus)
+                    this.materialHttp()
                 }else{
                     this.$message.error(res.message)
                 }

+ 3 - 76
src/views/modules/workBench/orderList.vue

@@ -363,63 +363,7 @@
 
                         </a-table>
                     </div>
-                    <!-- <a-drawer
-                    title="素材详情"
-                    width="640"
-                    :placement="placement"
-                    :closable="false"
-                    :visible="visible"
-                    @close="onClose"
-                    >
-                        <div class="videoBody">
-                            <div class="videoBox">
-                                <video :src="currentMaterial.src" ></video>
-                            </div>
-                            
-                            <div class="imgBox">
-                                <img src="" alt="">
-                                <img src="" alt="">
-                            </div>
-                        </div>
-                        <div class="marterialInfo">
-                            <div class="info-item">
-                                <span>素材状态:</span>
-                                <p>未审核</p>
-                            </div>
-                            <div class="info-item">
-                                <span>生成水印:</span>
-                                <a-select :defaultValue="4" v-model="size" style="width:70%;">
-                                    <a-select-option :value="item.id" :key="item.id" v-for="item of sizeType">{{
-                                        item.name
-                                    }}</a-select-option>
-                                </a-select>
-                                
-                            </div>
-                            <div class="info-item">
-                                <span>视频标签:</span>
-                                <a-tag>Tag 1</a-tag>
-                                <a-tag>Tag 1</a-tag>
-                            </div>
-                            <div class="info-item info">
-                                <ul>
-                                    <li><span>视频时长:</span> 17秒 </li>
-                                    <li><span>视频尺寸:</span> 1080*1920 </li>
-                                    <li><span>视频大小:</span> 31.42M </li>
-                                    <li><span>策划:</span> 吴永前 </li>
-                                    <li><span>拍摄:</span> 吴永前 </li>
-                                    <li><span>剪辑:</span> 吴永前 </li>                                    
-                                </ul>
-                            </div>
-                            <div class="info-item">
-                                <span>广告语:</span>
-                                <p>14354534324454354水电费水电费方式手动</p>
-                            </div>
-                            <div class="bottom-btn">
-                                <a-button type='primary' @click="approved" style="margin-right:20px">通过审核</a-button>
-                                <a-button type='default' @click="reject">驳回</a-button>
-                            </div>
-                        </div>
-                    </a-drawer> -->
+                    
                 </div>
             </div>
         </div>
@@ -612,27 +556,10 @@ export default {
             this.ipagination.current=pagination.current;
 
             this.ipagination.pageSize=pagination.pageSize;
-            this.materialHttp()
-        },
-        // 请求素材
-        materialHttp(){
-            // this.loading=true;           
-            this.data=[];
-        },
-
-        
-
-        
-
-        // 素材通过审核
-        approved(){
-
+            this.tableHttp(this.activeKey)
         },
-        // 素材驳回
-        reject(){
 
-        },
-        
+       
         search(){
             this.tableHttp(this.activeKey)
         },