前:年审审核入库取消二次确认框

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -2739,50 +2739,38 @@ export default {
       },
       confirm () {
         this.btnLoading = true
-        this.$confirm('确认提交入库', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          let params = {
-            Status: '1',
-            SupplierId: this.formData.Id
-          }
-          let _this = this
-          annualapi.updateIsStorage(this.$route.query.annualId, params, this.$axios).then(res => {
-            if (res.data.code === 0) {
-              if (this.is_todo === '1') {
-                this.$router.push('/')
-              } else {
-                this.initDatas()
-                if (_this.$refs['WfHistory']) {
-                  _this.$refs['WfHistory'].getHistoryTask()
-                }
-                _this.getstatus(this.$route.query.annualId)
-                _this.isAccess()
-              }
-              // console.log('已强制刷新历史审批流程')
-              this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
-              this.btnLoading = false
+        let params = {
+          Status: '1',
+          SupplierId: this.formData.Id
+        }
+        let _this = this
+        annualapi.updateIsStorage(this.$route.query.annualId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            if (this.is_todo === '1') {
+              this.$router.push('/')
             } else {
-              this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
-              this.btnLoading = false
+              this.initDatas()
+              if (_this.$refs['WfHistory']) {
+                _this.$refs['WfHistory'].getHistoryTask()
+              }
+              _this.getstatus(this.$route.query.annualId)
+              _this.isAccess()
             }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消'
-          })
-          this.btnLoading = false
+            // console.log('已强制刷新历史审批流程')
+            this.$message({
+              duration: 10000,
+              type: 'success',
+              message: res.data.message
+            })
+            this.btnLoading = false
+          } else {
+            this.$message({
+              duration: 10000,
+              type: 'warning',
+              message: res.data.message
+            })
+            this.btnLoading = false
+          }
         })
       },
       commonAuditClick () {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/basicauditoperation.vue

@@ -2283,51 +2283,39 @@
       },
       confirm () {
         this.btnLoading = true
-        this.$confirm('确认提交入库', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          let params = {
-            Status: '1',
-            SupplierId: this.formData.Id
-          }
-          let _this = this
-          // console.log(this.$route.query.annualId, 'QWE')
-          annualapi.updateIsStorage(this.$route.query.annualId, params, this.$axios).then(res => {
-            if (res.data.code === 0) {
-              if (this.is_todo === '1') {
-                _this.$router.push('/')
-              } else {
-                this.initDatas()
-                if (_this.$refs['WfHistory']) {
-                  _this.$refs['WfHistory'].getHistoryTask()
-                }
-                _this.getstatus(this.$route.query.annualId)
-                _this.isAccess()
-                // console.log('已强制刷新历史审批流程')
-              }
-              this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
-              this.btnLoading = false
+        let params = {
+          Status: '1',
+          SupplierId: this.formData.Id
+        }
+        let _this = this
+        // console.log(this.$route.query.annualId, 'QWE')
+        annualapi.updateIsStorage(this.$route.query.annualId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            if (this.is_todo === '1') {
+              _this.$router.push('/')
             } else {
-              this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
-              this.btnLoading = false
+              this.initDatas()
+              if (_this.$refs['WfHistory']) {
+                _this.$refs['WfHistory'].getHistoryTask()
+              }
+              _this.getstatus(this.$route.query.annualId)
+              _this.isAccess()
+              // console.log('已强制刷新历史审批流程')
             }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消'
-          })
-          this.btnLoading = false
+            this.$message({
+              duration: 10000,
+              type: 'success',
+              message: res.data.message
+            })
+            this.btnLoading = false
+          } else {
+            this.$message({
+              duration: 10000,
+              type: 'warning',
+              message: res.data.message
+            })
+            this.btnLoading = false
+          }
         })
       },
       commonAuditClick () {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/techoperation.vue

@@ -2434,50 +2434,38 @@
       },
       confirm () {
         this.btnLoading = true
-        this.$confirm('确认提交入库', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          let params = {
-            Status: '1',
-            SupplierId: this.formData.Id
-          }
-          let _this = this
-          annualapi.updateIsStorage(this.$route.query.annualId, params, this.$axios).then(res => {
-            if (res.data.code === 0) {
-              if (this.is_todo === '1') {
-                this.$router.push('/')
-              } else {
-                this.initDatas()
-                if (_this.$refs['WfHistory']) {
-                  _this.$refs['WfHistory'].getHistoryTask()
-                }
-                _this.getstatus(this.$route.query.annualId)
-                _this.isAccess()
-                // console.log('已强制刷新历史审批流程')
-              }
-              this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
-              this.btnLoading = false
+        let params = {
+          Status: '1',
+          SupplierId: this.formData.Id
+        }
+        let _this = this
+        annualapi.updateIsStorage(this.$route.query.annualId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            if (this.is_todo === '1') {
+              this.$router.push('/')
             } else {
-              this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
-              this.btnLoading = false
+              this.initDatas()
+              if (_this.$refs['WfHistory']) {
+                _this.$refs['WfHistory'].getHistoryTask()
+              }
+              _this.getstatus(this.$route.query.annualId)
+              _this.isAccess()
+              // console.log('已强制刷新历史审批流程')
             }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消'
-          })
-          this.btnLoading = false
+            this.$message({
+              duration: 10000,
+              type: 'success',
+              message: res.data.message
+            })
+            this.btnLoading = false
+          } else {
+            this.$message({
+              duration: 10000,
+              type: 'warning',
+              message: res.data.message
+            })
+            this.btnLoading = false
+          }
         })
       },
       commonAuditClick () {
@@ -2729,6 +2717,8 @@
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
           return '----'
+        } else if (val === '0001-01-01T00:00:00Z') {
+          return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {
           return '永久'
         } else {