前端: 日常评价列表页面刷新问题及一键审批弹框判断

src/dashoo.cn/frontend_web/src/components/oilcontract/submitPopup.vue

@@ -283,7 +283,12 @@ export default {
             type: 'success',
             message: res.data.message
           })
-          this.$emit('refreshPage', {})
+          setTimeout(function () {
+            _this.$nextTick(() => {
+              _this.$emit('refreshPage', {})
+              // TODO loading
+            })
+          }, 5000)
           // _this.$refs['WfHistory'].getHistoryTask()
         } else {
           this.$message({
@@ -318,7 +323,12 @@ export default {
             type: 'success',
             message: res.data.message
           })
-          this.$emit('refreshPage', {})
+          setTimeout(function () {
+            _this.$nextTick(() => {
+              _this.$emit('refreshPage', {})
+              // TODO loading
+            })
+          }, 5000)
         } else {
           this.$message({
             type: 'warning',
@@ -372,7 +382,12 @@ export default {
             type: 'success',
             message: res.data.message
           })
-          this.$emit('refreshPage', {})
+          setTimeout(function () {
+            _this.$nextTick(() => {
+              _this.$emit('refreshPage', {})
+              // TODO loading
+            })
+          }, 5000)
         } else {
           this.$message({
             type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/index.vue

@@ -571,7 +571,7 @@ export default {
     // 一键处理确定
     onSelectAllButtonTrue () {
       if (this.eveIdList != 0 && this.eveIdList != undefined) {
-        if (this.busSepBatchPerm) {
+        if (this.busSepBatchPerm && !this.firstBatchPerm && !this.secondBatchPerm && !this.busAuditBatchPerm && !this.profRegBatchPerm) {
           this.formData.Status = '3'
           this.$refs.submitpopup.auditOrgChange()
           this.$refs.submitpopup.dialogBusinessOfficeSeparateBatchAuditVisible = true

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/index.vue

@@ -224,8 +224,6 @@ import permissionApi from '@/api/oilcontract/permission'
 import submitPopup from '@/components/oilcontract/submitPopup.vue'
 import FileSaver from 'file-saver'
 import XLSX from 'xlsx'
-import evaluationList from '../contract-basis/_opera/evaluationlist'
-import baseList from '../contract-basis/_opera/baselist'
 import util from '../../../utils/util'
 
 export default {
@@ -235,9 +233,9 @@ export default {
     }),
     columnFun: function () {
       return function (item, index) {
-        if (index == 'Status') {
-          var index = Number(item)
-          switch (index) {
+        if (index === 'Status') {
+          var indexNum = Number(item)
+          switch (indexNum) {
             case 0:
               return '已保存'
               break
@@ -279,8 +277,7 @@ export default {
               break
           }
         } else if (index === 'OpenDate' || index === 'EndDate' || index === 'PlanFinishDate' || index === 'SubmitDate') {
-          let timeString = this.timeStyle(item)
-          return timeString
+          return this.timeStyle(item)
         } else {
           return item
         }
@@ -511,6 +508,7 @@ export default {
     },
     getBatchAuditPerm () {
       permissionApi.getBatchAuditPermission(this.$axios).then(res => {
+        console.log('所以权限', res.data)
         if (res.status === 200) {
           this.firstBatchPerm = res.data[0]
           this.secondBatchPerm = res.data[1]
@@ -563,7 +561,7 @@ export default {
     // 一键处理确定
     onSelectAllButtonTrue () {
       if (this.eveIdList != 0 && this.eveIdList != undefined) {
-        if (this.busSepBatchPerm) {
+        if (this.busSepBatchPerm && !this.firstBatchPerm && !this.secondBatchPerm && !this.busAuditBatchPerm && !this.profRegBatchPerm) {
           this.formData.Status = '3'
           this.$refs.submitpopup.auditOrgChange()
           this.$refs.submitpopup.dialogBusinessOfficeSeparateBatchAuditVisible = true
@@ -626,7 +624,6 @@ export default {
     },
     // 跳转评价
     onNavigateEvaluate (item) {
-      console.log('跳转', item)
       this.$router.push({
         path: '/oilcontract/contract-goods/' + item.Id + '/evaluate',
         query: {
@@ -663,7 +660,6 @@ export default {
       // 访问接口
       api.getReviewList(myCreateOn.join(','), params, this.$axios).then(res => {
         this.tableLoading = false
-        console.log('评价接口', res)
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
       }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/index.vue

@@ -562,7 +562,7 @@ export default {
     // 一键处理确定
     onSelectAllButtonTrue () {
       if (this.eveIdList != 0 && this.eveIdList != undefined) {
-        if (this.busSepBatchPerm) {
+        if (this.busSepBatchPerm && !this.firstBatchPerm && !this.secondBatchPerm && !this.busAuditBatchPerm && !this.profRegBatchPerm) {
           this.formData.Status = '3'
           this.$refs.submitpopup.auditOrgChange()
           this.$refs.submitpopup.dialogBusinessOfficeSeparateBatchAuditVisible = true