年审申请 入库按钮

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

@@ -32,7 +32,7 @@
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="profAudit()" v-if="auditBtn && AnnualStatus == '3'">提交专业审核</el-button> &lt;!&ndash; 未用到 &ndash;&gt;-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()" v-if="auditBtn && AnnualStatus == '4'">专业审核</el-button>&lt;!&ndash; 未用到 &ndash;&gt;-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && AnnualStatus == '5'">审批</el-button><!-- 企业法规处 -->
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && AnnualStatus == '7'">入库审批</el-button><!-- 企业法规处 -->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="confirmStorage()" v-if="auditBtn && AnnualStatus == '7'">入库审批</el-button><!-- 企业法规处 -->
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="secUnitSeparateAuditClick" v-if="auditBtn && AnnualStatus == '10'">提交</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
@@ -1848,6 +1848,42 @@ export default {
           console.error(err)
         })
       },
+      confirmStorage () {
+        this.$confirm('确认提交入库', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let _this = this
+          let params = {
+            result: 1,
+            AuditRemark: '审批通过，已入库。'
+          }
+          annualapi.commonAuditEntity(this.shenheForm.AnnualId, params, this.$axios).then(res => {
+            if (res.data.code === 0) {
+              console.log('审批提交，成功返回')
+              this.$message({
+                type: 'success',
+                message: res.data.message
+              })
+              if (_this.$refs['WfHistory']) {
+                _this.$refs['WfHistory'].getHistoryTask()
+              }
+              _this.getstatus(this.annualId)
+              _this.initDatas()
+              this.isAccess()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+            _this.loading = false
+          }).catch(err => {
+            console.error(err)
+          })
+        })
+      },
       orgtreeChange (val) {
         this.userOptions = []
         if (val) {

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

@@ -32,7 +32,7 @@
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="profAudit()" v-if="auditBtn && AnnualStatus == '3'">提交专业审核</el-button>-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()" v-if="auditBtn && AnnualStatus == '4'">专业审核</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && AnnualStatus == '5'">审批</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && AnnualStatus == '7'">入库审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="confirmStorage" v-if="auditBtn && AnnualStatus == '7'">入库审批</el-button>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="secUnitSeparateAuditClick" v-if="auditBtn && AnnualStatus == '10'">提交</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && AnnualStatus == '6'">交费</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
@@ -2265,6 +2265,42 @@
           console.error(err)
         })
       },
+      confirmStorage () {
+        this.$confirm('确认提交入库', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let _this = this
+          let params = {
+            result: 1,
+            AuditRemark: '审批通过，已入库。'
+          }
+          annualapi.commonAuditEntity(this.shenheForm.AnnualId, params, this.$axios).then(res => {
+            if (res.data.code === 0) {
+              console.log('审批提交，成功返回')
+              this.$message({
+                type: 'success',
+                message: res.data.message
+              })
+              if (_this.$refs['WfHistory']) {
+                _this.$refs['WfHistory'].getHistoryTask()
+              }
+              _this.getstatus(this.annualId)
+              _this.initDatas()
+              this.isAccess()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+            _this.loading = false
+          }).catch(err => {
+            console.error(err)
+          })
+        })
+      },
       // 二级单位分办
       secUnitSeparateAuditClick () {
         console.log('二级单位分办审批会话框')

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

@@ -32,7 +32,7 @@
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="profAudit()" v-if="auditBtn && AnnualStatus == '3'">提交专业审核</el-button>-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()" v-if="auditBtn && AnnualStatus == '4'">专业审核</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && AnnualStatus == '5'">审批</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && AnnualStatus == '7'">入库审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="confirmStorage" v-if="auditBtn && AnnualStatus == '7'">入库审批</el-button>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="secUnitSeparateAuditClick" v-if="auditBtn && AnnualStatus == '10'">提交</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && AnnualStatus == '6'">交费</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
@@ -2399,6 +2399,42 @@
           console.error(err)
         })
       },
+      confirmStorage () {
+        this.$confirm('确认提交入库', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let _this = this
+          let params = {
+            result: 1,
+            AuditRemark: '审批通过，已入库。'
+          }
+          annualapi.commonAuditEntity(this.shenheForm.AnnualId, params, this.$axios).then(res => {
+            if (res.data.code === 0) {
+              console.log('审批提交，成功返回')
+              this.$message({
+                type: 'success',
+                message: res.data.message
+              })
+              if (_this.$refs['WfHistory']) {
+                _this.$refs['WfHistory'].getHistoryTask()
+              }
+              _this.getstatus(this.annualId)
+              _this.initDatas()
+              this.isAccess()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+            _this.loading = false
+          }).catch(err => {
+            console.error(err)
+          })
+        })
+      },
       profAudit () {
         this.shenheForm.AnnualId = parseInt(this.annualId)
         this.auditOrgChange()