Selaa lähdekoodia

fix(ad): media resources audit

Casper Dai 2 vuotta sitten
vanhempi
sitoutus
5c034d4c03

+ 1 - 1
src/components/service/external/player.js

@@ -205,7 +205,7 @@ export default {
               : '数据量太小无法继续播放,请稍后重试'
           )
         }
-      }, 60000)
+      }, 120000)
     },
     onVideoPlaying () {
       console.log('onVideoPlaying')

+ 8 - 12
src/views/ad/applet/history/index.vue

@@ -40,18 +40,14 @@ export default {
           ] }
         ],
         cols: [
-          { type: 'expand', refresh: true, render: (data, h) => h('div', {
-            staticClass: 'o-info'
-          }, [
-            h('div', null, `时段:${data.range}`),
-            h('div', null, `频率:${data.freq}`)
-          ]) },
-          { prop: 'deviceName', label: '设备', 'min-width': 100 },
-          { prop: 'startDate', label: '上刊日期', align: 'right', 'min-width': 100 },
-          { prop: 'price', label: '总价(元)', 'min-width': 100, align: 'right' },
-          { prop: 'statusTag', type: 'tag' },
-          { prop: 'createTime', label: '提交时间', align: 'right', 'min-width': 120 },
-          { prop: 'auditTime', label: '审核时间', align: 'right', 'min-width': 120 },
+          { prop: 'statusTag', type: 'tag', 'align': 'center' },
+          { prop: 'startDate', label: '上刊日期', width: 100 },
+          { prop: 'range', label: '时段', width: 140 },
+          { prop: 'deviceName', label: '设备' },
+          { prop: 'freq', label: '频率', 'min-width': 100 },
+          { prop: 'price', label: '总价(元)', width: 100, align: 'right' },
+          { prop: 'createTime', label: '提交时间', width: 160, align: 'right' },
+          { prop: 'auditTime', label: '审核时间', width: 160, align: 'right' },
           { type: 'invoke', render: [
             { label: '上播内容', on: this.onView }
           ] }

+ 2 - 1
src/views/ad/applet/review-asset/index.vue

@@ -72,7 +72,7 @@ export default {
           { prop: 'size', label: '文件大小', align: 'right' },
           { prop: 'ratio', label: '分辨率', align: 'right' },
           { prop: 'diff', label: '其他', align: 'right' },
-          { prop: 'createTime', label: '提交时间', align: 'right', 'min-width': 120 },
+          { prop: 'createTime', label: '提交时间', width: 160, align: 'right' },
           { type: 'invoke', width: 160, render: [
             { label: '查看', on: this.onViewAsset },
             { label: '通过', on: this.onResolve },
@@ -105,6 +105,7 @@ export default {
         data.diff = parseDuration(duration)
         data.createTime = createTime
       }
+      data.keyName = asset.keyName
       return data
     },
     onResolve (asset) {

+ 6 - 6
src/views/ad/applet/review-order/index.vue

@@ -69,12 +69,12 @@ export default {
         condition: { status: State.SUBMITTED },
         cols: [
           { type: 'refresh' },
-          { prop: 'deviceName', label: '设备', 'min-width': 100 },
-          { prop: 'startDate', label: '上刊日期', align: 'right', 'min-width': 100 },
-          { prop: 'range', label: '时段', align: 'right', 'min-width': 100 },
-          { prop: 'freq', label: '频率', align: 'right', 'min-width': 140 },
-          { prop: 'price', label: '总价(元)', 'min-width': 100, align: 'right' },
-          { prop: 'createTime', label: '提交时间', 'min-width': 140, align: 'right' },
+          { prop: 'startDate', label: '上刊日期', width: 100 },
+          { prop: 'range', label: '时段', width: 140 },
+          { prop: 'deviceName', label: '设备' },
+          { prop: 'freq', label: '频率' },
+          { prop: 'price', label: '总价(元)', width: 100, align: 'right' },
+          { prop: 'createTime', label: '提交时间', width: 160, align: 'right' },
           { type: 'invoke', width: 180, render: [
             { label: '上播内容', on: this.onView },
             { label: '通过', on: this.onResolve },

+ 1 - 1
src/views/ad/automation/task/ScreenTask.vue

@@ -210,7 +210,7 @@ export default {
           { prop: 'tag', type: 'tag', on: canAudit && this.onAudit },
           { type: 'invoke', render: [
             { label: '查看', allow: ({ canView }) => canView, on: this.onViewTask },
-            { label: '删除', allow: ({ from }) => from !== TaskFromType.ORDER, on: this.onDel }
+            { label: '删除', allow: !canAudit && (({ from, enable }) => from !== TaskFromType.ORDER && !enable), on: this.onDel }
           ], width: 92 }
         ]
       },