审核按钮

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -1,9 +1,9 @@
 package oilsupplier
 
 import (
-	msg2 "dashoo.cn/backend/api/business/msg"
 	"dashoo.cn/backend/api/business/audithistory"
 	"dashoo.cn/backend/api/business/codecsequence"
+	msg2 "dashoo.cn/backend/api/business/msg"
 	"dashoo.cn/backend/api/business/oilsupplier/oilcostmanage"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/organize"
@@ -1133,7 +1133,8 @@ func (this *OilSupplierCertController) AuditCallback() {
 // @router /isaccess [get]
 func (this *OilSupplierCertController) IsAccess() {
 	auditstepcode := this.GetString("auditstepcode")
-
+	processkey := this.GetString("processkey")
+	id := this.GetString("id")
 	//var users []userRole.Base_RoleList
 	//var auditWorkflow auditsetting.Base_OilAuditSetting
 	//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
@@ -1169,6 +1170,12 @@ func (this *OilSupplierCertController) IsAccess() {
 		svc.GetEntity(&setting, where)
 		res = svc.UserInRoleById(this.User.Id, strconv.Itoa(setting.RoleId))
 
+		if res {
+			actisvc := workflow.GetActivitiService(utils.DBE)
+			ids := actisvc.GetMyTasks(processkey, this.User.Id)
+			res = strings.Contains(ids,id)
+		}
+
 		//for _, user := range users {
 		//	if this.User.Id == strconv.Itoa(int(user.Id))  {
 		//		res = true

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -160,8 +160,8 @@ module.exports = {
     /* --------Nuxt Start发版用 END-------------- */
   },
   ignore: [
-    'pages/oilsupplier/addtionaudit/*.*',
-    'pages/oilsupplier/annualaudit/*.*',
+    // 'pages/oilsupplier/addtionaudit/*.*',
+    // 'pages/oilsupplier/annualaudit/*.*',
     'pages/oilsupplier/badrecord/*.*',
     'pages/oilsupplier/basisbuild/*.*',
     'pages/oilsupplier/compayaudit/*.*',
@@ -169,7 +169,7 @@ module.exports = {
     'pages/oilsupplier/infochange/*.*',
     'pages/oilsupplier/infochangech/*.*',
     'pages/oilsupplier/supplier/*.*',
-    'pages/oilsupplier/supplierappend/*.*',
+    // 'pages/oilsupplier/supplierappend/*.*',
     'pages/oilsupplier/supplieraudit/*.*',
     'pages/oilsupplier/suppliercert/*.*',
     'pages/oilsupplier/supplierfile/*.*',

src/dashoo.cn/frontend_web/src/api/oilsupplier/suppliercert.js

@@ -80,10 +80,11 @@ export default {
       params: audit
     })
   },
-  isAccess (auditstepcode, myAxios) {
+  isAccess (params, myAxios) {
     return myAxios({
-      url: '/suppliercert/isaccess?auditstepcode=' + auditstepcode,
-      method: 'get'
+      url: '/suppliercert/isaccess',
+      method: 'get',
+      params: params
     })
   },
   createAccessCardNo (Id, SupplierCertId, type, myAxios) {

src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -32,7 +32,7 @@
 
         <el-col :span="8" v-if="this.formData.Status == '7'||this.formData.Status == '8'||appendStatus">
           <el-form-item label="准入编码">
-            <el-input v-model="formData.AccessCardNo"  :readonly="this.formData.Status != '7'||this.formData.Status != '8'||appendStatus" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.AccessCardNo"  :readonly="this.formData.Status != '7'" placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>

src/dashoo.cn/frontend_web/src/components/oilsupplier/techinfo.vue

@@ -30,7 +30,7 @@
 
         <el-col :span="8" v-if="this.formData.Status == '7'||this.formData.Status == '8'||appendStatus">
           <el-form-item label="准入编码">
-            <el-input v-model="formData.AccessCardNo" :readonly="this.formData.Status != '7'||this.formData.Status != '8'||appendStatus" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.AccessCardNo" :readonly="this.formData.Status != '7'" placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -491,7 +491,7 @@
             }
         }
       };
-      
+
         //传真检验
        var checkFax =  (rule, value, callback) => {
         if (!value) {
@@ -631,7 +631,7 @@
             validator: checkFax,
             trigger: 'blur'
           }, ],
-          
+
           CompanyTel: [{
             required: true,
             message: '请输入财务电话',

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

@@ -418,7 +418,12 @@
       },
 
       isAccess() {
-        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+        let params = {
+          id: this.formData.Id,
+          auditstepcode: this.auditstepcode,
+          processkey: this.formData.ProcessKey
+        }
+        apiCert.isAccess(params, this.$axios).then(res => {
           this.auditBtn = res.data
         }).catch(err => {
           console.log(err)

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

@@ -422,7 +422,12 @@
       },
 
       isAccess() {
-        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+        let params = {
+          id: this.formData.Id,
+          auditstepcode: this.auditstepcode,
+          processkey: this.formData.ProcessKey
+        }
+        apiCert.isAccess(params, this.$axios).then(res => {
           this.auditBtn = res.data
         }).catch(err => {
           console.log(err)

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

@@ -438,7 +438,12 @@
       },
 
       isAccess() {
-        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+        let params = {
+          id: this.formData.Id,
+          auditstepcode: this.auditstepcode,
+          processkey: this.formData.ProcessKey
+        }
+        apiCert.isAccess(params, this.$axios).then(res => {
           this.auditBtn = res.data
         }).catch(err => {
           console.log(err)

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

@@ -478,7 +478,12 @@
         });
       },
       isAccess() {
-        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+        let params = {
+          id: this.anndata.Id,
+          auditstepcode: this.auditstepcode,
+          processkey: this.entrydetail.process
+        }
+        apiCert.isAccess(params, this.$axios).then(res => {
           this.auditBtn = res.data
         }).catch(err => {
           console.log(err)

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

@@ -305,7 +305,7 @@
       :visible="chooseAuditorVisible"></choose-auditor>
       <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
       :visible="chooseAuditorVisibleFen"></choose-auditor-fen>
-    
+
       <el-dialog title="新增文件" :visible.sync="newVisible" top="5vh">
       <el-form :model="newSubfileForm" label-width="100px">
         <el-row>
@@ -344,7 +344,7 @@
         <el-button @click="newVisible = false">取 消</el-button>
         <el-button type="primary" @click="makeNewSure()">确 定</el-button>
       </div>
-    </el-dialog>    
+    </el-dialog>
     </div>
 </template>
 
@@ -608,7 +608,7 @@
       this.getorgtreelist()
       this.orgtreeChange(this.majorDept)
       this.initTableHeader()
-      
+
     },
     methods: {
         newdeletedata(val) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -707,7 +707,12 @@
           });
       },
       isAccess() {
-        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+        let params = {
+          id: this.formData.CertId,
+          auditstepcode: this.auditstepcode,
+          processkey: this.formData.ProcessKey
+        }
+        apiCert.isAccess(params, this.$axios).then(res => {
           this.auditBtn = res.data
         }).catch(err => {
           console.log(err)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -732,7 +732,12 @@
         }
       },
       isAccess() {
-        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+        let params = {
+          id: this.formData.CertId,
+          auditstepcode: this.auditstepcode,
+          processkey: this.formData.ProcessKey
+        }
+        apiCert.isAccess(params, this.$axios).then(res => {
           this.auditBtn = res.data
           console.log("------", this.auditBtn)
         }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -705,7 +705,12 @@
           });
       },
       isAccess() {
-        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+        let params = {
+          id: this.formData.CertId,
+          auditstepcode: this.auditstepcode,
+          processkey: this.formData.ProcessKey
+        }
+        apiCert.isAccess(params, this.$axios).then(res => {
           this.auditBtn = res.data
         }).catch(err => {
           console.log(err)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/basisedit.vue

@@ -479,7 +479,7 @@
     },
     methods: {
       saveAccessCardNo () {
-        apiCert.saveAccessCardNo(this.formData.Id, this.formData.CertId, this.formData.JSAccessCardNo, '02', this.$axios).then(res => {
+        apiCert.saveAccessCardNo(this.formData.Id, this.formData.CertId, this.formData.AccessCardNo, '02', this.$axios).then(res => {
           console.log(res.data, 'res.data')
           if (res.data.code === 0) {
             this.$message({
@@ -497,6 +497,7 @@
       createWZAccessCardNo () {
         apiCert.createAccessCardNo(this.formData.Id, this.formData.CertId, '02', this.$axios).then(res => {
           this.formData.JSAccessCardNo = res.data
+          this.initDatas()
         })
       },
       confirm () {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/techedit.vue

@@ -487,7 +487,7 @@
     },
     methods: {
       saveAccessCardNo () {
-        apiCert.saveAccessCardNo(this.formData.Id, this.formData.CertId, this.formData.JFAccessCardNo, '03', this.$axios).then(res => {
+        apiCert.saveAccessCardNo(this.formData.Id, this.formData.CertId, this.formData.AccessCardNo, '03', this.$axios).then(res => {
           console.log(res.data, 'res.data')
           if (res.data.code === 0) {
             this.$message({
@@ -505,6 +505,7 @@
       createJFAccessCardNo () {
         apiCert.createAccessCardNo(this.formData.Id, this.formData.CertId, '03', this.$axios).then(res => {
           this.formData.JFAccessCardNo = res.data
+          this.initDatas()
         })
       },
       confirm () {