增项：提交审批后页面及按钮展示的刷新，fix审批备注字段

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -662,7 +662,7 @@
           </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="备注">
-              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入备注内容">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -1223,15 +1223,16 @@
           AuditRemark: this.shenheForm.AuditorRemark
         }
         console.log('审批结果提交参数：', params)
+        let _this = this
         api2.commonAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('审批提交，成功返回')
-            // this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.$router.push('/')
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -1342,6 +1343,7 @@
           AuditRemark: this.shenheForm.AuditorRemark
         }
         console.log('二级单位分办审批结果提交参数：', params)
+        let _this = this
         api2.separateAuditEntity(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('审批提交，成功返回')
@@ -1349,9 +1351,10 @@
               type: 'success',
               message: res.data.message
             })
-            this.dialogSecUnitSeparateVisible = false
-            this.btnloading = false
-            this.initDatas()
+            _this.dialogSecUnitSeparateVisible = false
+            _this.btnloading = false
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -1444,23 +1447,24 @@
         }
         this.btnloading = true
         console.log('业务处室专业审批, 提交参数: ', params)
+        let _this = this
         api2.businessOfficeSeparateAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('审批提交，成功返回')
-            // this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.$router.push('/')
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.dialogBusinessOfficeSeparateAuditVisible = false
-          this.btnloading = false
+          _this.dialogBusinessOfficeSeparateAuditVisible = false
+          _this.btnloading = false
         }).catch(err => {
           console.error(err)
         })
@@ -1487,6 +1491,7 @@
           payStatus: this.payStatus
         }
         console.log('交费结果确认提交参数：', this.AppendId)
+        let _this = this
         api2.updatePayStatus(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('交费成功')
@@ -1494,7 +1499,8 @@
               type: 'success',
               message: res.data.message
             })
-            this.initDatas()
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -748,7 +748,7 @@
           </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="备注">
-              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入备注内容">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -1346,9 +1346,10 @@
           FirstAudit: this.auditer,
           SecondAudit: this.fushenauditer,
           ThirdAudit: this.selectDept,
-          AuditRemark: this.shenheForm.AuditRemark
+          AuditRemark: this.shenheForm.AuditorRemark
         }
         console.log('二级单位分办审批结果提交参数：', params)
+        let _this = this
         api2.separateAuditEntity(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('审批提交，成功返回')
@@ -1358,7 +1359,8 @@
             })
             this.btnloading = false
             this.dialogSecUnitSeparateVisible = false
-            this.initDatas() // TODO 弹框提示
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -1448,23 +1450,24 @@
           AuditRemark: this.shenheForm.AuditorRemark
         }
         console.log('审批结果提交参数：', params)
+        let _this = this
         api2.commonAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('审批提交，成功返回')
-            // this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.$router.push('/')
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.dialogCommonAuditMakeSureVisible = false
-          this.btnloading = false
+          _this.dialogCommonAuditMakeSureVisible = false
+          _this.btnloading = false
         }).catch(err => {
           console.error(err)
         })
@@ -1563,22 +1566,24 @@
         }
         this.btnloading = true
         console.log('业务处室专业审批, 提交参数: ', params)
+        let _this = this
         api2.businessOfficeSeparateAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('审批提交，成功返回')
-            // this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.$router.push('/')
+            _this.btnloading = false
+            _this.dialogBusinessOfficeSeparateAuditVisible = false
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.dialogBusinessOfficeSeparateAuditVisible = false
           this.btnloading = false
         }).catch(err => {
           console.error(err)
@@ -1601,16 +1606,18 @@
           result: this.shenheForm.SuccessStatus,
           AuditRemark: this.shenheForm.AuditorRemark
         }
+        let _this = this
         api2.commonAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('审批提交，成功返回')
-            // this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.dialogConcentrateAuditVisible = false
-            this.$router.push('/')
+            _this.dialogConcentrateAuditVisible = false
+            _this.btnloading = false
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -1665,6 +1672,7 @@
           payStatus: this.payStatus
         }
         console.log('交费结果确认提交参数：', this.certId, this.AppendId)
+        let _this = this
         api2.updatePayStatus(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('交费成功')
@@ -1672,15 +1680,19 @@
               type: 'success',
               message: res.data.message
             })
-            this.initDatas()
+            _this.dialogConcentrateAuditVisible = false
+            _this.loading = false
+            _this.btnloading = false
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.dialogSecUnitSeparateVisible = false
-          this.loading = false
+          _this.dialogSecUnitSeparateVisible = false
+          _this.loading = false
         }).catch(err => {
           console.error(err)
         })

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -647,7 +647,7 @@
           </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="备注">
-              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入备注内容">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -1254,15 +1254,16 @@
           AuditRemark: this.shenheForm.AuditorRemark
         }
         console.log('审批结果提交参数：', params)
+        let _this = this
         api2.commonAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('审批提交，成功返回')
-            // this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.$router.push('/')
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -1373,6 +1374,7 @@
           AuditRemark: this.shenheForm.AuditorRemark
         }
         console.log('二级单位分办审批结果提交参数：', params)
+        let _this = this
         api2.separateAuditEntity(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('审批提交，成功返回')
@@ -1382,7 +1384,8 @@
             })
             this.dialogSecUnitSeparateVisible = false
             this.btnloading = false
-            this.initDatas()
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -1473,15 +1476,16 @@
         }
         this.btnloading = true
         console.log('业务处室专业审批, 提交参数: ', params)
+        let _this = this
         api2.businessOfficeSeparateAuditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('审批提交，成功返回')
-            // this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
             })
-            this.$router.push('/')
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
@@ -1516,22 +1520,24 @@
           payStatus: this.payStatus
         }
         console.log('交费结果确认提交参数：', this.AppendId)
+        let _this = this
         api2.updatePayStatus(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('交费成功')
-            this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
             })
+            _this.getEntityById()
+            _this.isAccess()
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
           }
-          this.dialogSecUnitSeparateVisible = false
-          this.loading = false
+          _this.dialogSecUnitSeparateVisible = false
+          _this.loading = false
         }).catch(err => {
           console.error(err)
         })