瀏覽代碼

fix: order review

Casper Dai 2 年之前
父節點
當前提交
1b2264fd31

+ 1 - 2
src/constant.js

@@ -288,8 +288,7 @@ export const RoleAccess = {
 export const AlarmLevelInfo = {
   0: '提示性预警',
   1: '中级预警',
-  2: '紧急预警',
-  9999: '所有预警'
+  2: '紧急预警'
 }
 
 export const AlarmStrategies = [

+ 17 - 6
src/views/ad/applet/history/index.vue

@@ -71,18 +71,29 @@ export default {
   },
   methods: {
     transformOrder ({ id, price, status, expand, orders, assets, createTime, auditTime }) {
-      const { startDate, startTime, endTime, day, duration, count } = orders[0]
+      if (!orders.length) {
+        return {
+          id,
+          statusTag: this.getOrderTag(status, expand),
+          startDate: '异常数据',
+          price: (price / 100).toFixed(2),
+          createTime,
+          auditTime,
+          assets
+        }
+      }
+      const { name, startDate, startTime, endTime, day, duration, count } = orders[0]
       return {
         id,
-        deviceName: orders[0].name,
+        deviceName: name,
+        statusTag: this.getOrderTag(status, expand),
         startDate,
         range: `${startTime}-${endTime}`,
-        price: (price / 100).toFixed(2),
         freq: `${day}天 x ${duration}秒 x ${count}次`,
-        statusTag: this.getOrderTag(status, expand),
-        assets,
+        price: (price / 100).toFixed(2),
         createTime,
-        auditTime
+        auditTime,
+        assets
       }
     },
     getOrderTag (status, expand) {

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

@@ -77,7 +77,7 @@ export default {
           { prop: 'createTime', label: '提交时间', width: 160, align: 'right' },
           { type: 'invoke', width: 180, render: [
             { label: '上播内容', on: this.onView },
-            { label: '通过', on: this.onResolve },
+            { label: '通过', allow: ({ invalid }) => !invalid, on: this.onResolve },
             { label: '拒绝', on: this.onReject }
           ] }
         ]
@@ -108,18 +108,28 @@ export default {
     }
   },
   methods: {
-    transformOrder ({ id, price, status, createTime, expand, orders, assets }) {
-      const { startDate, startTime, endTime, day, duration, count } = orders[0]
+    transformOrder ({ id, price, createTime, orders, assets }) {
+      if (!orders.length) {
+        return {
+          id,
+          startDate: '异常数据',
+          price: (price / 100).toFixed(2),
+          createTime,
+          assets,
+          invalid: true
+        }
+      }
+      const { name, startDate, startTime, endTime, day, duration, count } = orders[0]
       return {
         id,
-        deviceName: orders[0].name,
+        deviceName: name,
         startDate,
         range: `${startTime}-${endTime}`,
         price: (price / 100).toFixed(2),
         freq: `${day}天 x ${duration}秒 x ${count}次`,
-        remark: status === State.REJECTED ? expand : '-',
         createTime,
-        assets
+        assets,
+        invalid: assets.some(({ status }) => status !== State.RESOLVED)
       }
     },
     onView (order) {

+ 4 - 4
src/views/screen/material/program/ast/index.vue

@@ -43,13 +43,13 @@ export default {
       getProgram(this.id, { custom: true }).then(
         ({ data }) => {
           try {
-            const { tenant, createBy, id, status, name, resolutionRatio, itemJsonStr, rejectIds } = data
-            if (!this.isSuperAdmin && tenant !== this.tenant) {
-              this.showMessage('warning', '无权限')
+            const { tenant, id, status, name, resolutionRatio, itemJsonStr, rejectIds } = data
+            if (tenant !== this.tenant) {
+              this.showMessage('warning', this.isSuperAdmin ? `请切换至租户【${tenant}】后再访问` : '无权限')
               return
             }
 
-            if (!this.isTenantAdmin && (!this.isOperator || createBy !== this.userId)) {
+            if (!this.isOperator) {
               this.showMessage('warning', '无编辑权限,请联系管理员')
               return
             }