lining 6 lat temu
rodzic
commit
7cc0670f37

+ 2 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/annualaudit.go

@@ -362,7 +362,8 @@ func (this *AnnualAuditController) AddEntityDirect() {
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	//启动工作流
 	businessKey := utils.ToStr(annualId) + "-" + strconv.Itoa(model.AuditIndex)
-	processInstanceId := svcActiviti.StartProcess(workflow.OIL_AUDIT_APPLY, businessKey, this.User.Id)
+	result := strconv.Itoa(this.User.IsCompanyUser)
+	processInstanceId := svcActiviti.StartProcess2(workflow.OIL_AUDIT_APPLY, businessKey, this.User.Id, result)
 	var auditmodel annualaudit.OilAnnualAudit
 	auditmodel.WorkflowId = processInstanceId
 	auditmodel.FirstAudit, _ = strconv.Atoi(firstAudit)

+ 84 - 6
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -21,7 +21,11 @@
             </el-steps>
             <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="addshow =true" v-if="Status <= 0">提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
+                     v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办
+          </el-button>
+          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="addshow =true" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0">
+            提交审核</el-button>
           <router-link :to="'/oilsupplier/annualaudit/basicindex'">
             <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>
           </router-link>
@@ -244,8 +248,33 @@
       </span>
       <br>
     </el-dialog>
+    <el-dialog title="分办" :visible.sync="ComAuditdialogShow" width="520px">
+      <el-form ref="searchForm" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="分办人员">
+              <el-input ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="ComAuditdialogShow = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="SubpEntity">确定</el-button>
+      </span>
+    </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
+    <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
+                        :visible="chooseAuditorVisibleFen" typeCode="04"></choose-auditor-fen>
   </div>
 </template>
 
@@ -269,6 +298,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import SubfileList from '@/components/oilsupplier/subfilelist'
+  import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
 
   export default {
     computed: {
@@ -288,12 +318,15 @@ import apiCert from '@/api/oilsupplier/suppliercert'
       AuditbusList, // 待审核业务
       BasisInfo,
       WfHistory,
-      ChooseAuditor
+      ChooseAuditor,
+      ChooseAuditorFen
     },
     name: 'oiltechnologyserviceEdit',
 
     data () {
       return {
+        chooseAuditorVisibleFen: false,
+        ComAuditdialogShow: false,
         savebtn: true,
         visbtn: '1',
         fushenauditer: '', // 复审人员
@@ -458,7 +491,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
     },
     created () {
       this.serviceId = this.$route.params.opera
-    if (this.$route.query.certid) {
+      if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
       this.Status = this.$route.query.Status + ''
@@ -479,11 +512,56 @@ import apiCert from '@/api/oilsupplier/suppliercert'
       this.orgtreeChange(this.majorDept)
     },
     methods: {
+      SubpEntity () {
+        if (this.auditer === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择分办人!'
+          })
+          return
+        }
+        this.entityForm.SupplierId = parseInt(this.certId)
+        this.entityForm.SupplierTypeName = this.formData.SupplierTypeCode
+        this.auditform.FirstAuditName = this.auditer
+        this.auditform.AnnualId = this.annualId
+        annualapi.commitauditEntity(this.entityForm, this.auditform, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后,初始化数据,变成修改
+            this.Status = res.data.item
+            this.entityForm.Status = this.Status
+            // this.initDatas();
+            this.getstatus(this.annualId)
+            this.ComAuditdialogShow = false
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      chooseAuditorShowFen () {
+        this.$refs['chooseAuditorFen'].getorgtreelist('04')
+        this.chooseAuditorVisibleFen = true
+      },
+      setAuditerFen (val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisibleFen = false
+      },
+      commitfenban () {
+        this.ComAuditdialogShow = true
+      },
       getstatus (annid) {
         annualapi.getEntity(annid, this.$axios)
           .then(res => {
             this.formannData = res.data
-          console.log('--forann-', this.formannData)
             this.Status = this.formannData.Status
             this.entrydetail.business = this.formannData.Id
             this.entrydetail.instance = this.formannData.WorkflowId
@@ -491,8 +569,8 @@ import apiCert from '@/api/oilsupplier/suppliercert'
           })
           .catch(err => {
             console.error(err)
-        })
-    },
+          })
+      },
       inputCompany (val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {

+ 86 - 7
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -21,7 +21,10 @@
             </el-steps>
             <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="addshow =true" v-if="Status <= 0">
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
+                     v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办
+          </el-button>
+          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="addshow =true" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0">
             提交审核</el-button>
           <router-link :to="'/oilsupplier/annualaudit/techindex'">
             <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>
@@ -249,8 +252,33 @@
       </span>
       <br>
     </el-dialog>
+    <el-dialog title="分办" :visible.sync="ComAuditdialogShow" width="520px">
+      <el-form ref="searchForm" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="分办人员">
+              <el-input ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="ComAuditdialogShow = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="SubpEntity">确定</el-button>
+      </span>
+    </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
+    <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
+                        :visible="chooseAuditorVisibleFen" typeCode="04"></choose-auditor-fen>
   </div>
 </template>
 
@@ -260,7 +288,7 @@
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier'
   import annualapi from '@/api/oilsupplier/annualaudit'
-import apiCert from '@/api/oilsupplier/suppliercert'
+  import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
@@ -274,6 +302,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import SubfileList from '@/components/oilsupplier/subfilelist'
+  import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
 
   export default {
     computed: {
@@ -293,12 +322,15 @@ import apiCert from '@/api/oilsupplier/suppliercert'
       BusinessList, // 选择准入范围
       AuditbusList, // 待审核业务
       TechInfo,
-      ChooseAuditor
+      ChooseAuditor,
+      ChooseAuditorFen
     },
     name: 'oiltechnologyserviceEdit',
 
     data () {
       return {
+        chooseAuditorVisibleFen: false,
+        ComAuditdialogShow: false,
         savebtn: true,
         visbtn: '1',
         fushenauditer: '', // 复审人员
@@ -462,7 +494,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
     },
     created () {
       this.serviceId = this.$route.params.opera
-    if (this.$route.query.certid) {
+      if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
       this.annualId = this.$route.query.annualId
@@ -483,19 +515,66 @@ import apiCert from '@/api/oilsupplier/suppliercert'
       this.orgtreeChange(this.majorDept)
     },
     methods: {
+      chooseAuditorShowFen () {
+        this.$refs['chooseAuditorFen'].getorgtreelist('04')
+        this.chooseAuditorVisibleFen = true
+      },
+      setAuditerFen (val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisibleFen = false
+      },
+      SubpEntity () {
+        if (this.auditer === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择分办人!'
+          })
+          return
+        }
+        this.entityForm.SupplierId = parseInt(this.certId)
+        this.entityForm.SupplierTypeName = this.formData.SupplierTypeCode
+        this.auditform.FirstAuditName = this.auditer
+        this.auditform.AnnualId = this.annualId
+        annualapi.commitauditEntity(this.entityForm, this.auditform, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后,初始化数据,变成修改
+            this.Status = res.data.item
+            this.entityForm.Status = this.Status
+            // this.initDatas();
+            this.getstatus(this.annualId)
+            this.ComAuditdialogShow = false
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      commitfenban () {
+        this.ComAuditdialogShow = true
+      },
+
       getstatus (annid) {
         annualapi.getEntity(annid, this.$axios)
           .then(res => {
             this.formannData = res.data
-          this.Status = this.formannData.Status
+            this.Status = this.formannData.Status
             this.entrydetail.business = this.formannData.Id
             this.entrydetail.instance = this.formannData.WorkflowId
             this.entrydetail.Status = this.formannData.Status
           })
           .catch(err => {
             console.error(err)
-        })
-    },
+         })
+      },
       inputCompany (val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {