前端：年审申请驳回和待提交的可删除

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -56,7 +56,7 @@
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
-                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0"
+                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="(parseInt(scope.row.Status) || 0) > 0"
                     divided>
                     删除数据</el-dropdown-item>
                 </el-dropdown-menu>
@@ -461,22 +461,22 @@
                 this.initDatas()
                 this.addshow = false
                 this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'success',
+                  message: res.data.message
+                })
               } else if (res.data.code === -3) {
-                this.$confirm(res.data.message )
+                this.$confirm(res.data.message)
                   .then(_ => {
                     // this.addannualdirect()
                   })
                   .catch(_ => {})
               } else {
                 this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'warning',
+                  message: res.data.message
+                })
               }
             }).catch(err => {
               console.error(err)
@@ -495,16 +495,16 @@
             this.initDatas()
             this.addshow = false
             this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'success',
+              message: res.data.message
+            })
           } else {
             this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'warning',
+              message: res.data.message
+            })
           }
         }).catch(err => {
           console.error(err)
@@ -535,10 +535,10 @@
                   }
                 })
                 this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'success',
+                  message: res.data.message
+                })
                 this.addLoading = false
               } else if (res.data.code === -3) {
                 this.addLoading = false
@@ -551,10 +551,10 @@
               } else {
                 this.addLoading = false
                 this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'warning',
+                  message: res.data.message
+                })
               }
             }).catch(err => {
               console.error(err)
@@ -614,7 +614,7 @@
         this.initDatas()
       },
       clearSearch () {
-        Object.assign(this.searchForm, this.searchFormReset);
+        Object.assign(this.searchForm, this.searchFormReset)
         // this.searchForm = this.searchFormReset;
         this.CreateOn = ''
         this.initDatas()
@@ -639,17 +639,17 @@
           if (res.data.code === 0) {
             this.initDatas()
             this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'success',
+              message: res.data.message
+            })
             this.tableLoading = false
           } else {
             this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'warning',
+              message: res.data.message
+            })
             this.tableLoading = false
           }
         }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -56,7 +56,7 @@
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
-                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0"
+                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="(parseInt(scope.row.Status) || 0) > 0"
                     divided>
                     删除数据</el-dropdown-item>
                 </el-dropdown-menu>
@@ -462,10 +462,10 @@
                 this.initDatas()
                 this.addshow = false
                 this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'success',
+                  message: res.data.message
+                })
               } else if (res.data.code === -3) {
                 console.log('年审申请4444')
                 this.$confirm(res.data.message)
@@ -475,10 +475,10 @@
                   .catch(_ => {})
               } else {
                 this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'warning',
+                  message: res.data.message
+                })
               }
             }).catch(err => {
               console.error(err)
@@ -494,16 +494,16 @@
             this.initDatas()
             this.addshow = false
             this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'success',
+              message: res.data.message
+            })
           } else {
             this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'warning',
+              message: res.data.message
+            })
           }
         }).catch(err => {
           console.error(err)
@@ -538,10 +538,10 @@
                   }
                 })
                 this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'success',
+                  message: res.data.message
+                })
                 this.addLoading = false
               } else if (res.data.code === -3) {
                 this.addLoading = false
@@ -554,10 +554,10 @@
               } else {
                 this.addLoading = false
                 this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'warning',
+                  message: res.data.message
+                })
               }
             }).catch(err => {
               console.error(err)
@@ -640,17 +640,17 @@
           if (res.data.code === 0) {
             this.initDatas()
             this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'success',
+              message: res.data.message
+            })
             this.tableLoading = false
           } else {
             this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'warning',
+              message: res.data.message
+            })
             this.tableLoading = false
           }
         }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -51,7 +51,7 @@
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
-                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0"
+                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="(parseInt(scope.row.Status) || 0) > 0"
                     divided>
                     删除数据</el-dropdown-item>
                 </el-dropdown-menu>
@@ -458,16 +458,16 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
                 this.initDatas()
                 this.addshow = false
                 this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'success',
+                  message: res.data.message
+                })
               } else {
                 this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'warning',
+                  message: res.data.message
+                })
               }
             }).catch(err => {
               console.error(err)
@@ -555,17 +555,17 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
           if (res.data.code === 0) {
             this.initDatas()
             this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'success',
+              message: res.data.message
+            })
             this.tableLoading = false
           } else {
             this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'warning',
+              message: res.data.message
+            })
             this.tableLoading = false
           }
         }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -56,7 +56,7 @@
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
-                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0"
+                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="(parseInt(scope.row.Status) || 0) > 0"
                     divided>
                     删除数据</el-dropdown-item>
                 </el-dropdown-menu>
@@ -239,7 +239,7 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
     data () {
       return {
         tableLoading: false,
-        addLoading : false,
+        addLoading: false,
         chooseAuditorVisible: false,
         orgtreelist: [],
         orgtreeprops: {
@@ -463,10 +463,10 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
                 this.initDatas()
                 this.addshow = false
                 this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'success',
+                  message: res.data.message
+                })
               } else if (res.data.code === -3) {
                 this.$confirm(res.data.message)
                   .then(_ => {
@@ -476,10 +476,10 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
                   .catch(_ => {})
               } else {
                 this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'warning',
+                  message: res.data.message
+                })
               }
             }).catch(err => {
               console.error(err)
@@ -495,16 +495,16 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
             this.initDatas()
             this.addshow = false
             this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'success',
+              message: res.data.message
+            })
           } else {
             this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'warning',
+              message: res.data.message
+            })
           }
         }).catch(err => {
           console.error(err)
@@ -539,10 +539,10 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
                 })
                 this.addLoading = false
                 this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'success',
+                  message: res.data.message
+                })
               } else if (res.data.code === -3) {
                 this.addLoading = false
                 this.$confirm(res.data.message)
@@ -554,10 +554,10 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
               } else {
                 this.addLoading = false
                 this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                  duration: 10000,
+                  type: 'warning',
+                  message: res.data.message
+                })
               }
             }).catch(err => {
               console.error(err)
@@ -642,17 +642,17 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
           if (res.data.code === 0) {
             this.initDatas()
             this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'success',
+              message: res.data.message
+            })
             this.tableLoading = false
           } else {
             this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'warning',
+              message: res.data.message
+            })
             this.tableLoading = false
           }
         }).catch(err => {