魏志佳 преди 4 години
родител
ревизия
fc6972121a

+ 2 - 2
src/views/modules/autoRules/newBlankRule.vue

@@ -20,8 +20,8 @@
                              <a-form-model-item ref="eventRuleLevel"  prop="eventRuleLevel">
                                 <a-radio-group v-model="form.eventRuleLevel" @change="applyObjChange">
                                     <a-radio-button value="ACCOUNT">账户</a-radio-button>
-                                    <!-- <a-radio-button value="CAMPAIGN">计划</a-radio-button>
-                                    <a-radio-button value="UNIT">组</a-radio-button> -->
+                                    <a-radio-button value="CAMPAIGN">计划</a-radio-button>
+                                    <a-radio-button value="UNIT">组</a-radio-button>
                                     <!-- <a-radio-button value="CREATE">创意</a-radio-button> -->
                                 </a-radio-group>
                             </a-form-model-item>

+ 57 - 14
src/views/modules/workBench/orderDetail.vue

@@ -72,6 +72,8 @@
                 text-align: right;
                 .btnBody{
                     margin-bottom: 10px;
+                    display: flex;
+                    justify-content: space-between;
                 }
                 .orderInfo{
                     display: flex;
@@ -299,15 +301,11 @@
                
                 <div class="optBody">
                     <div class="btnBody">
-                        <a-button type='default' style="margin-right:15px" @click="withdrawOrder">撤回订单</a-button>
-                        <a-dropdown>
-                            <a-menu slot="overlay" @click="handleMenuClick">
-                                <a-menu-item key="1">1</a-menu-item>
-                                <a-menu-item key="2">2</a-menu-item>
-                                <a-menu-item key="3">3</a-menu-item>
-                            </a-menu>
-                            <a-button> 更多 <a-icon type="down" /> </a-button>
-                        </a-dropdown>
+                        <a-button type='primary' @click="confirmOrder" v-if="roleCode=='designTeamLeader'|| roleCode=='admin'">确认订单</a-button>
+                        <!-- <a-button type='primary' style="margin-right:15px" @click="withdrawOrder" v-if="roleCode=='designTeamLeader'|| roleCode=='admin'">撤回订单</a-button> -->
+                        <a-button type='default'  @click="withdrawOrder" v-if="roleCode=='designTeamLeader'|| roleCode=='admin'">驳回订单</a-button>
+                        <!-- <a-button type='primary' style="margin-right:15px" @click="withdrawOrder" v-if="roleCode=='designTeamLeader'|| roleCode=='admin'">修改订单</a-button> -->
+                        
                     </div>
                     <div class="orderInfo">
                         <div>
@@ -658,6 +656,8 @@ let marterialData=[
 export default {
     data() {
         return {
+            userInfo:{},
+            roleCode:'',
             tabKey:1,
 
             columns:[...materialColumns],
@@ -697,9 +697,27 @@ export default {
             size: "4",
 
             currentOrderId:'',
+            currentOrderInfo:{},
+            url:{
+                orderDetail:'',
+                confirmOrder:'/platform/designer/accept',
+                rejectOrder:'/platform/designer/reject'
+            }
         }
     },
     methods: {
+        // 确认订单
+        confirmOrder(){
+            postAction(this.url.confirmOrder,{
+                id:this.currentOrderId.id,
+                orderCode:this.currentOrderInfo.orderCode,
+            }).then(res=>{
+                console.log(res)
+                if(res.success){
+                    this.orderDetailHttp()
+                }
+            })
+        },
         // 查看详情
         viewDetails(record){
             console.log(record)
@@ -713,10 +731,7 @@ export default {
         withdrawOrder(){
 
         },
-        // 更多操作
-        handleMenuClick(e) {
-            console.log('click', e);
-        },
+        
 
         // 催一下
         hurryUp(){
@@ -789,14 +804,38 @@ export default {
 
         // 请求order详情数据
         orderDetailHttp(){
-            postAction('',{
 
+            getAction(this.url.orderDetail,{
+                id:this.currentOrderId
             }).then(res=>{
                 console.log(res)
             })
         },
+        // 请求物料列表数据
+        
+
+        roleJudgement(role){
+            // 1 运营(不区分运营经理)
+            // 2 设计组长
+            // 3 设计
+            // 4 管理员
+            if(role.indexOf('operator')!=-1||role.indexOf('Operation')!=-1||role.indexOf('operation')!=-1){
+                return 1
+            }else if(rolethis.roleCode=='designTeamLeader'){
+                return 2
+            }else if(role=='planeLeader'||role=='production'||role=='plane'||role=='shot'||role=='clip'||role=='plan'){
+                return 3
+            }else if(role=='admin'){
+                return 4
+            }
+        },
     },
     created(){
+        let userInfo=localStorage.getItem('pro__Login_Userinfo');
+        if(userInfo){
+            this.userInfo=JSON.parse(userInfo).value
+        }
+        this.roleCode=localStorage.getItem('roleCode')
         getAction('/ctop/videoWatermarkTemplate/list').then(res => {
             if (res.success) {
                 this.sizeType = res.result.records
@@ -805,7 +844,11 @@ export default {
         console.log(this.$route.query.orderId)
         this.currentOrderId=this.$route.query.orderId;
         if(this.currentOrderId){
+            postAction(this.url.orderDetail,{
+
+            }).then(res=>{
 
+            })
         }
     }
 }

+ 4 - 2
src/views/modules/workBench/orderList.vue

@@ -613,7 +613,7 @@ export default {
         // 查看详情
         viewDetails(record){
             console.log(record)
-            this.$route.push(`/workBench/orderDetail?orderId=${record.id}`)
+            this.$router.push(`/workBench/orderDetail?orderId=${record.id}`)
         },
         
         
@@ -635,7 +635,9 @@ export default {
         checkAccept(record){
             console.log(record)
         },
-
+        onClose() {
+            this.visible = false;
+        },
         // 上传素材
         uploadMaterial(){
 

+ 1 - 4
src/views/modules/workBench/placeOrder.vue

@@ -263,10 +263,7 @@
                         </div>
                         <div class="input-item"> 
                             <a-form-model-item ref="sysPackage"  prop="sysPackage">
-                                <a-input
-                                    v-model="form.sysPackage"
-                                    
-                                />
+                                <a-input v-model="form.sysPackage"/>
                             </a-form-model-item>
                         </div>
                     </div>