信息变更

src/dashoo.cn/backend/api/business/oilsupplier/infochange/infochange.go

@@ -12,6 +12,7 @@ type OilInfoChange struct {
 	SupplierName        string    `xorm:"comment('企业名称') VARCHAR(255)"`
 	Status              string    `xorm:"comment('状态标识') VARCHAR(10)"`
 	AuditIndex          int       `xorm:"default 0 comment('审批次数') INT(11)"`
+	FenbanAudit         int       `xorm:"default 0 comment('分办') INT(11)"`
 	FirstAudit          int       `xorm:"default 0 comment('初审') INT(11)"`
 	SecondAudit         int       `xorm:"default 0 comment('复审') INT(11)"`
 	Step                int       `xorm:"comment('页面上第几步') INT(10)"`
@@ -182,8 +183,7 @@ type SuppModelInfo struct {
 	HseTraining        string    `xorm:"default '0' comment('是否需要进行HSE审查培训') VARCHAR(2)"`
 }
 
-
 type OilUsedName struct {
-	SupplierName        string    `xorm:"comment('企业名称') VARCHAR(255)"`
-	OldSupplierName     string    `xorm:"comment('曾用名') VARCHAR(255)"`
-}
+	SupplierName    string `xorm:"comment('企业名称') VARCHAR(255)"`
+	OldSupplierName string `xorm:"comment('曾用名') VARCHAR(255)"`
+}

src/dashoo.cn/backend/api/business/workflow/ActivitiService.go

@@ -33,8 +33,8 @@ func GetActivitiService(xormEngine *xorm.Engine) *ActivitiService {
 	s.DBE = xormEngine
 	//s.BaseUrl = "http://123.56.168.26:8080/activiti-rest/service"
 	//s.BaseUrl = "http://192.168.0.120:8081/api/acti"
-	s.BaseUrl = utils.Cfg.MustValue("workflow", "BaseUrl")
-	//s.BaseUrl = "http://localhost:8081/api/acti"
+	//s.BaseUrl = utils.Cfg.MustValue("workflow", "BaseUrl")
+	s.BaseUrl = "http://localhost:8081/api/acti"
 	s.AposeUrl = utils.Cfg.MustValue("workflow", "AposeUrl")
 	//s.OriginUrl = "http://localhost:8081/api"
 	s.OriginUrl = utils.Cfg.MustValue("workflow", "OriginUrl")

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

@@ -30,6 +30,8 @@ type InfoChangeController struct {
 }
 
 type InfoShenHeModel struct {
+	FirstAudit    int
+	SecondAudit   int
 	InfoId        int
 	SuccessStatus int
 	AuditorRemark string
@@ -912,7 +914,7 @@ func (this *InfoChangeController) GetAddSupplierList() {
 func (this *InfoChangeController) CommitAuditEntity() {
 	//suppId := this.Ctx.Input.Param(":id")
 	firstAudit := this.GetString("auditer")
-	fushenauditer := this.GetString("fushenauditer")
+	//fushenauditer := this.GetString("fushenauditer")
 	Remark := this.GetString("Remark")
 	InfoId := this.GetString("MInfoId")
 	//取出审批列表
@@ -939,14 +941,15 @@ func (this *InfoChangeController) CommitAuditEntity() {
 	processInstanceId := ""
 	businessKey := ""
 	businessKey = InfoId + "-" + strconv.Itoa(infochangeentity.AuditIndex)
-	processInstanceId = svcActiviti.StartProcess(workflow.OIL_INFO_CHANGE, businessKey, this.User.Id)
+	result := strconv.Itoa(this.User.IsCompanyUser)
+	processInstanceId = svcActiviti.StartProcess2(workflow.OIL_INFO_CHANGE, businessKey, this.User.Id, result)
 
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_INFO_CHANGE
 	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
-	ActiComplete.Result = "1"
+	ActiComplete.Result = result
 	ActiComplete.Remarks = Remark
 	ActiComplete.CallbackUrl = ""
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
@@ -965,9 +968,10 @@ func (this *InfoChangeController) CommitAuditEntity() {
 	}
 	//记下workflowID(首次提交时才会记录，中间状态请忽略) 及审批状态
 	infochangeentity.WorkFlowId = processInstanceId
-	infochangeentity.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
-	infochangeentity.FirstAudit, _ = strconv.Atoi(firstAudit)
-	infochangeentity.SecondAudit, _ = strconv.Atoi(fushenauditer)
+	infochangeentity.Status = suppliercert.FEN_TRIAL_STATUS //二级单位初审
+	infochangeentity.FenbanAudit, _ = strconv.Atoi(firstAudit)
+	//infochangeentity.FirstAudit, _ = strconv.Atoi(firstAudit)
+	//infochangeentity.SecondAudit, _ = strconv.Atoi(fushenauditer)
 	infochangeentity.AuditIndex = infochangeentity.AuditIndex + 1
 	infochangeentity.BusinessKey = ActiComplete.BusinessKey
 	infochangeentity.CreateOn = time.Now()
@@ -978,8 +982,9 @@ func (this *InfoChangeController) CommitAuditEntity() {
 		"WorkflowId",
 		"Status",
 		"Step",
-		"FirstAudit",
-		"SecondAudit",
+		"FenbanAudit",
+		//"FirstAudit",
+		//"SecondAudit",
 		"AuditIndex",
 		"BusinessKey",
 		"CreateOn",
@@ -1126,6 +1131,19 @@ func (this *InfoChangeController) InfoAudit() {
 	status := ""
 	backstatus := "0"
 	var userIds string
+	if infomodel.Status == suppliercert.FEN_TRIAL_STATUS {
+		userIds = utils.ToStr(dataother.FirstAudit)
+		status = suppliercert.FIRST_TRIAL_STATUS
+		step = 2
+		backstatus = suppliercert.NOPASS_STATUS
+		infomodel.FirstAudit = dataother.FirstAudit
+		infomodel.SecondAudit = dataother.SecondAudit
+		cols := []string{
+			"FirstAudit",
+			"SecondAudit",
+		}
+		svc.UpdateEntityByIdCols(infoid, infomodel, cols)
+	}
 	if infomodel.Status == suppliercert.FIRST_TRIAL_STATUS {
 		userIds = utils.ToStr(infomodel.SecondAudit)
 		status = suppliercert.SECOND_TRIAL_STATUS

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

@@ -85,7 +85,7 @@
         default: ''
       }
     },
-    /*watch: {
+    /* watch: {
       visible(val) {
         this.selfVisible = val
         if (this.visible) {
@@ -95,8 +95,8 @@
       selfVisible(val) {
         this.$emit('update:visible', val)
       }
-    },*/
-    data() {
+    }, */
+    data () {
       return {
         userOptions: [],
         selectedOptions: {},
@@ -114,17 +114,17 @@
         SupplierTypeCode: ''
       }
     },
-    created() {},
+    created () {},
     methods: {
-      getorgtreelist(SupplierTypeCode) {
+      getorgtreelist (SupplierTypeCode) {
         let _this = this
         let params = {
-          IsInnerOrganize: 1,
+          IsInnerOrganize: 1
           // ParentId: 0
         }
         _this.$axios.get('organizes/orgalllistfenban', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
             console.log("_-this.orgtreelist--",this.orgtreelist)
@@ -163,6 +163,10 @@
           auditstepcode = 'SUB_OFFICE_JS' // 分办人 基建
         } else if (this.typeCode == '03') {
           auditstepcode = 'SUB_OFFICE_JF' // 分办人 技术服务
+        } else if (this.typeCode == '04') {
+          auditstepcode = 'SUB_OFFICE_NS' // 分办人 年审
+        } else if (this.typeCode == '05') {
+          auditstepcode = 'SUB_OFFICE_BG' // 分办人 变更申请
         }
         supapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.userOptions = res.data.item

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

@@ -13,6 +13,8 @@
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="fenbanbtn"
+                     v-if="auditBtn && InfoStatus == '10'">分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="submitInfoChange"
             v-if="auditBtn && InfoStatus == '1'">初审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="submitInfoChange"
@@ -602,7 +604,38 @@
     <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
       <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
-
+    <el-dialog title="提交申请" :visible.sync="commitshowfen" width="360px">
+      <el-form label-width="90px" :model="entityForm" ref="EntityFormref">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="初审人员">
+              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="复审人员">
+              <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
+                         allow-create default-first-option>
+                <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="请输入说明内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span style="float: right;margin-top:-10px;">
+        <el-button size="small" @click="commitshowfen = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="addInfoChangeAudit()">确 定</el-button>
+      </span>
+      <br>
+    </el-dialog>
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+                    :visible="chooseAuditorVisible"></choose-auditor>
   </div>
 </template>
 
@@ -610,14 +643,17 @@
   import {
     mapGetters
   } from 'vuex'
-  import _ from 'lodash';
+  import _ from 'lodash'
   import apiCert from '@/api/oilsupplier/suppliercert'
-  import supplierapi from '@/api/oilsupplier/supplier';
-  import api from '@/api/oilsupplier/infochange';
-  import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
+  import supplierapi from '@/api/oilsupplier/supplier'
+  import api from '@/api/oilsupplier/infochange'
+  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
+  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+
   export default {
     components: {
       WfMultiHistory,
+      ChooseAuditor
     },
     computed: {
       ...mapGetters({
@@ -636,6 +672,7 @@
     },
     data() {
       return {
+        chooseAuditorVisible: false,
         myitemsshow: false,
         auditstepcode: '',
         auditBtn: false,
@@ -698,6 +735,8 @@
           label: '常规'
         }],
         shenheForm: {
+          SecondAudit: '',
+          FirstAudit: '',
           SuccessStatus: 1,
           AuditorRemark: '',
           InfoId: 0,
@@ -890,6 +929,7 @@
         supplierId: '',
         auditerOption: [],
         commitshow: false,
+        commitshowfen: false,
         InfoData: [],
         AddChangeShow: false,
         UnitRelationOptions: [],
@@ -938,10 +978,73 @@
       this.getAccessCardNo()
     },
     methods: {
-      initDatas() {
+      fenbanbtn () {
+        this.commitshowfen = true
+      },
+      addInfoChangeAudit () {
+        if (this.auditer === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择初审人！'
+          })
+          return
+        }
+        if (this.fushenauditer === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择复审人！'
+          })
+          return
+        }
+        this.shenheForm.SecondAudit = this.fushenauditer
+        this.shenheForm.FirstAudit = parseInt(this.auditer)
+        this.shenheForm.InfoId = parseInt(this.infoId)
+        this.shenheForm.SuppId = parseInt(this.SuppId)
+        api.infoAudit(this.shenheForm, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.initDatas()
+            this.commitshowfen = false
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      chooseAuditorShow () {
+        this.$refs['chooseAuditor'].getorgtreelist()
+        this.chooseAuditorVisible = true
+      },
+      setAuditer (val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+        this.auditOrgChang(this.auditer)
+      },
+      auditOrgChang (val) {
+        let auditstepcode = 'SECOND_TRIAL'
+        supplierapi.getAuditerByFirst(val, auditstepcode, this.$axios)
+          .then(res => {
+            this.secauditerOptions = res.data.item
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+
+
+      initDatas () {
         this.getMainInfo()
         let params = {
-          InfomainId : this.infoId
+          InfomainId: this.infoId
         }
         if (this.SuppId) {
           api.GetChangeEntity(this.SuppId, params, this.$axios)
@@ -971,15 +1074,15 @@
               this.infochangedata = res.data.items
               if (this.infochangedata) {
                 for (var i = 0; i < this.infochangedata.length; i++) {
-                  if (this.infochangedata[i].SelectItem != "Province" && this.infochangedata[i].SelectItem !=
-                    "City" && this.infochangedata[i].SelectItem != "Street" && this.infochangedata[i]
-                    .SelectItem != "LinkProvince" && this.infochangedata[i].SelectItem != "LinkCity" && this
-                    .infochangedata[i].SelectItem != "LinkStreet") {
+                  if (this.infochangedata[i].SelectItem != 'Province' && this.infochangedata[i].SelectItem !=
+                    'City' && this.infochangedata[i].SelectItem != 'Street' && this.infochangedata[i]
+                    .SelectItem != 'LinkProvince' && this.infochangedata[i].SelectItem != 'LinkCity' && this
+                    .infochangedata[i].SelectItem != 'LinkStreet') {
                     this.InfoData.push(this.infochangedata[i])
                   }
                 }
               }
-              console.log("-this.InfoData---",this.InfoData)
+              console.log('-this.InfoData---',this.InfoData)
             })
             .catch(err => {
               console.error(err);
@@ -993,7 +1096,7 @@
         api.GetMainInfo(this.infoId, this.$axios)
           .then(res => {
             this.Infomain = res.data.items;
-            console.log("this.Infomain", this.Infomain)
+            console.log('this.Infomain', this.Infomain)
             if (this.Infomain) {
               this.entrydetail.business = this.infoId + ''
               this.entrydetail.instance = this.Infomain[0].WorkFlowId + ''
@@ -1005,6 +1108,8 @@
                 this.auditstepcode = 'SECOND_TRIAL'
               } else if (this.Infomain[0].Status === '5') {
                 this.auditstepcode = 'PROF_REGULATION'
+              } else if (this.Infomain[0].Status === '10') {
+                this.auditstepcode = 'SUB_OFFICE_BG'
               }
             }
             this.isAccess()
@@ -1024,88 +1129,88 @@
             _this.changedForm[key] = true
             _this.infochangeForm = {}
             _this.infochangeForm.SelectItem = key
-            if (_this.infochangeForm.SelectItem == "SupplierName") {
-              _this.infochangeForm.SelectItemName = "企业名称"
-            } else if (_this.infochangeForm.SelectItem == "OperType") {
-              _this.infochangeForm.SelectItemName = "供应商类型"
-            } else if (_this.infochangeForm.SelectItem == "SpecTypeCode") {
-              _this.infochangeForm.SelectItemName = "单位关系"
-            } else if (_this.infochangeForm.SelectItem == "Country") {
-              _this.infochangeForm.SelectItemName = "国家"
-            } else if (_this.infochangeForm.SelectItem == "InStyle") {
-              _this.infochangeForm.SelectItemName = "准入方式"
-            } else if (_this.infochangeForm.SelectItem == "MgrUnit") {
-              _this.infochangeForm.SelectItemName = "管理单位"
-            } else if (_this.infochangeForm.SelectItem == "PACNumber") {
-              _this.infochangeForm.SelectItemName = "中石油准入证编号"
-            } else if (_this.infochangeForm.SelectItem == "CredentialFlag") {
-              _this.infochangeForm.SelectItemName = "证件合一"
-            } else if (_this.infochangeForm.SelectItem == "CommercialNo") {
-              _this.infochangeForm.SelectItemName = "统一社会信用代码"
-            } else if (_this.infochangeForm.SelectItem == "CountryTaxNo") {
-              _this.infochangeForm.SelectItemName = "税务登记证编号"
-            } else if (_this.infochangeForm.SelectItem == "OrganCode") {
-              _this.infochangeForm.SelectItemName = "组织机构代码"
-            } else if (_this.infochangeForm.SelectItem == "Address") {
-              _this.infochangeForm.SelectItemName = "注册地址"
-            } else if (_this.infochangeForm.SelectItem == "LinkAddress") {
-              _this.infochangeForm.SelectItemName = "通信地址-单位地址"
-            } else if (_this.infochangeForm.SelectItem == "ZipCode") {
-              _this.infochangeForm.SelectItemName = "邮编"
-            } else if (_this.infochangeForm.SelectItem == "LinkZipCode") {
-              _this.infochangeForm.SelectItemName = "通信地址-邮编"
-            } else if (_this.infochangeForm.SelectItem == "LegalPerson") {
-              _this.infochangeForm.SelectItemName = "法定代表人姓名"
-            } else if (_this.infochangeForm.SelectItem == "CompanyType") {
-              _this.infochangeForm.SelectItemName = "公司类型"
-            } else if (_this.infochangeForm.SelectItem == "SetupTime") {
-              _this.infochangeForm.SelectItemName = "成立时间"
-            } else if (_this.infochangeForm.SelectItem == "RegCapital") {
-              _this.infochangeForm.SelectItemName = "注册资本"
-            } else if (_this.infochangeForm.SelectItem == "Currency") {
-              _this.infochangeForm.SelectItemName = "币种"
-            } else if (_this.infochangeForm.SelectItem == "币种") {
-              _this.infochangeForm.SelectItemName = "开户银行"
-            } else if (_this.infochangeForm.SelectItem == "ContactName") {
-              _this.infochangeForm.SelectItemName = "联系人姓名"
-            } else if (_this.infochangeForm.SelectItem == "Mobile") {
-              _this.infochangeForm.SelectItemName = "移动电话"
-            } else if (_this.infochangeForm.SelectItem == "BankAccount") {
-              _this.infochangeForm.SelectItemName = "银行账号"
-            } else if (_this.infochangeForm.SelectItem == "Telphone") {
-              _this.infochangeForm.SelectItemName = "固定电话"
-            } else if (_this.infochangeForm.SelectItem == "Fax") {
-              _this.infochangeForm.SelectItemName = "传真"
-            } else if (_this.infochangeForm.SelectItem == "CompanyTel") {
-              _this.infochangeForm.SelectItemName = "财务电话"
-            } else if (_this.infochangeForm.SelectItem == "EMail") {
-              _this.infochangeForm.SelectItemName = "电子邮箱"
-            } else if (_this.infochangeForm.SelectItem == "BankCreditRating") {
-              _this.infochangeForm.SelectItemName = "银行信用等级"
-            } else if (_this.infochangeForm.SelectItem == "HseTraining") {
-              _this.infochangeForm.SelectItemName = "HSE审查培训"
-            } else if (_this.infochangeForm.SelectItem == "QualitySystemCert") {
-              _this.infochangeForm.SelectItemName = "质量管理体系认证情况及认证机构"
-            } else if (_this.infochangeForm.SelectItem == "ProductQualityCert") {
-              _this.infochangeForm.SelectItemName = "产品质量认证情况及认证机构"
-            } else if (_this.infochangeForm.SelectItem == "MaunLicense") {
-              _this.infochangeForm.SelectItemName = "生产/制造许可证获证情况及编号"
-            } else if (_this.infochangeForm.SelectItem == "MaunAgent") {
-              _this.infochangeForm.SelectItemName = "所代理制造商名称"
-            } else if (_this.infochangeForm.SelectItem == "SupplierCertificate") {
-              _this.infochangeForm.SelectItemName = "中石油物资供应商证书"
-            } else if (_this.infochangeForm.SelectItem == "SafetyLicense") {
-              _this.infochangeForm.SelectItemName = "安全生产许可证"
-            } else if (_this.infochangeForm.SelectItem == "SpecIndustryCert") {
-              _this.infochangeForm.SelectItemName = "行业特殊要求的认证证书"
-            } else if (_this.infochangeForm.SelectItem == "BusinessScope") {
-              _this.infochangeForm.SelectItemName = "营业范围"
-            } else if (_this.infochangeForm.SelectItem == "Remark") {
-              _this.infochangeForm.SelectItemName = "备注"
-            } else if (_this.infochangeForm.SelectItem == "AllAddress") {
-              _this.infochangeForm.SelectItemName = "注册地址"
-            } else if (_this.infochangeForm.SelectItem == "LinkAllAddress") {
-              _this.infochangeForm.SelectItemName = "通信地址"
+            if (_this.infochangeForm.SelectItem == 'SupplierName') {
+              _this.infochangeForm.SelectItemName = '企业名称'
+            } else if (_this.infochangeForm.SelectItem == 'OperType') {
+              _this.infochangeForm.SelectItemName = '供应商类型'
+            } else if (_this.infochangeForm.SelectItem == 'SpecTypeCode') {
+              _this.infochangeForm.SelectItemName = '单位关系'
+            } else if (_this.infochangeForm.SelectItem == 'Country') {
+              _this.infochangeForm.SelectItemName = '国家'
+            } else if (_this.infochangeForm.SelectItem == 'InStyle') {
+              _this.infochangeForm.SelectItemName = '准入方式'
+            } else if (_this.infochangeForm.SelectItem == 'MgrUnit') {
+              _this.infochangeForm.SelectItemName = '管理单位'
+            } else if (_this.infochangeForm.SelectItem == 'PACNumber') {
+              _this.infochangeForm.SelectItemName = '中石油准入证编号'
+            } else if (_this.infochangeForm.SelectItem == 'CredentialFlag') {
+              _this.infochangeForm.SelectItemName = '证件合一'
+            } else if (_this.infochangeForm.SelectItem == 'CommercialNo') {
+              _this.infochangeForm.SelectItemName = '统一社会信用代码'
+            } else if (_this.infochangeForm.SelectItem == 'CountryTaxNo') {
+              _this.infochangeForm.SelectItemName = '税务登记证编号'
+            } else if (_this.infochangeForm.SelectItem == 'OrganCode') {
+              _this.infochangeForm.SelectItemName = '组织机构代码'
+            } else if (_this.infochangeForm.SelectItem == 'Address') {
+              _this.infochangeForm.SelectItemName = '注册地址'
+            } else if (_this.infochangeForm.SelectItem == 'LinkAddress') {
+              _this.infochangeForm.SelectItemName = '通信地址-单位地址'
+            } else if (_this.infochangeForm.SelectItem == 'ZipCode') {
+              _this.infochangeForm.SelectItemName = '邮编'
+            } else if (_this.infochangeForm.SelectItem == 'LinkZipCode') {
+              _this.infochangeForm.SelectItemName = '通信地址-邮编'
+            } else if (_this.infochangeForm.SelectItem == 'LegalPerson') {
+              _this.infochangeForm.SelectItemName = '法定代表人姓名'
+            } else if (_this.infochangeForm.SelectItem == 'CompanyType') {
+              _this.infochangeForm.SelectItemName = '公司类型'
+            } else if (_this.infochangeForm.SelectItem == 'SetupTime') {
+              _this.infochangeForm.SelectItemName = '成立时间'
+            } else if (_this.infochangeForm.SelectItem == 'RegCapital') {
+              _this.infochangeForm.SelectItemName = '注册资本'
+            } else if (_this.infochangeForm.SelectItem == 'Currency') {
+              _this.infochangeForm.SelectItemName = '币种'
+            } else if (_this.infochangeForm.SelectItem == '币种') {
+              _this.infochangeForm.SelectItemName = '开户银行'
+            } else if (_this.infochangeForm.SelectItem == 'ContactName') {
+              _this.infochangeForm.SelectItemName = '联系人姓名'
+            } else if (_this.infochangeForm.SelectItem == 'Mobile') {
+              _this.infochangeForm.SelectItemName = '移动电话'
+            } else if (_this.infochangeForm.SelectItem == 'BankAccount') {
+              _this.infochangeForm.SelectItemName = '银行账号'
+            } else if (_this.infochangeForm.SelectItem == 'Telphone') {
+              _this.infochangeForm.SelectItemName = '固定电话'
+            } else if (_this.infochangeForm.SelectItem == 'Fax') {
+              _this.infochangeForm.SelectItemName = '传真'
+            } else if (_this.infochangeForm.SelectItem == 'CompanyTel') {
+              _this.infochangeForm.SelectItemName = '财务电话'
+            } else if (_this.infochangeForm.SelectItem == 'EMail') {
+              _this.infochangeForm.SelectItemName = '电子邮箱'
+            } else if (_this.infochangeForm.SelectItem == 'BankCreditRating') {
+              _this.infochangeForm.SelectItemName = '银行信用等级'
+            } else if (_this.infochangeForm.SelectItem == 'HseTraining') {
+              _this.infochangeForm.SelectItemName = 'HSE审查培训'
+            } else if (_this.infochangeForm.SelectItem == 'QualitySystemCert') {
+              _this.infochangeForm.SelectItemName = '质量管理体系认证情况及认证机构'
+            } else if (_this.infochangeForm.SelectItem == 'ProductQualityCert') {
+              _this.infochangeForm.SelectItemName = '产品质量认证情况及认证机构'
+            } else if (_this.infochangeForm.SelectItem == 'MaunLicense') {
+              _this.infochangeForm.SelectItemName = '生产/制造许可证获证情况及编号'
+            } else if (_this.infochangeForm.SelectItem == 'MaunAgent') {
+              _this.infochangeForm.SelectItemName = '所代理制造商名称'
+            } else if (_this.infochangeForm.SelectItem == 'SupplierCertificate') {
+              _this.infochangeForm.SelectItemName = '中石油物资供应商证书'
+            } else if (_this.infochangeForm.SelectItem == 'SafetyLicense') {
+              _this.infochangeForm.SelectItemName = '安全生产许可证'
+            } else if (_this.infochangeForm.SelectItem == 'SpecIndustryCert') {
+              _this.infochangeForm.SelectItemName = '行业特殊要求的认证证书'
+            } else if (_this.infochangeForm.SelectItem == 'BusinessScope') {
+              _this.infochangeForm.SelectItemName = '营业范围'
+            } else if (_this.infochangeForm.SelectItem == 'Remark') {
+              _this.infochangeForm.SelectItemName = '备注'
+            } else if (_this.infochangeForm.SelectItem == 'AllAddress') {
+              _this.infochangeForm.SelectItemName = '注册地址'
+            } else if (_this.infochangeForm.SelectItem == 'LinkAllAddress') {
+              _this.infochangeForm.SelectItemName = '通信地址'
             }
             _this.infochangeForm.ChangeInfo = value
             _this.infochangeForm.BeChangeInfo = _this.copyformdata[key]
@@ -1121,6 +1226,7 @@
           auditstepcode: this.auditstepcode,
           processkey: this.entrydetail.process
         }
+        console.log(this.InfoStatus, params)
         apiCert.isAccess(params, this.$axios).then(res => {
           this.auditBtn = res.data
           console.log('---this.auditBtn-',this.auditBtn)
@@ -1130,7 +1236,7 @@
       },
       fileurlcut(val, index) {
         let fileurlall = val.split('$')[index]
-        let fileurl = fileurlall.split("|")
+        let fileurl = fileurlall.split('|')
         return fileurl[0]
       },
       getAccessCardNo() {
@@ -1139,11 +1245,11 @@
             this.AccessCardNolist = res.data.items;
             if (this.AccessCardNolist) {
               for (var i = 0; i < this.AccessCardNolist.length; i++) {
-                if (this.AccessCardNolist[i].SupplierTypeCode == "01") {
+                if (this.AccessCardNolist[i].SupplierTypeCode == '01') {
                   this.AccessCardNo1 = this.AccessCardNolist[i].AccessCardNo
-                } else if (this.AccessCardNolist[i].SupplierTypeCode == "02") {
+                } else if (this.AccessCardNolist[i].SupplierTypeCode == '02') {
                   this.AccessCardNo2 = this.AccessCardNolist[i].AccessCardNo
-                } else if (this.AccessCardNolist[i].SupplierTypeCode == "03") {
+                } else if (this.AccessCardNolist[i].SupplierTypeCode == '03') {
                   this.AccessCardNo3 = this.AccessCardNolist[i].AccessCardNo
                 }
               }
@@ -1182,33 +1288,33 @@
       },
       bfdataformat(val) {
         //debugger
-        if (val.SelectItem == "SpecTypeCode") {
-          if (val.BeChangeInfo == "1") {
-            return "一般外部"
-          } else if (val.BeChangeInfo == "2") {
-            return "多元内部"
+        if (val.SelectItem == 'SpecTypeCode') {
+          if (val.BeChangeInfo == '1') {
+            return '一般外部'
+          } else if (val.BeChangeInfo == '2') {
+            return '多元内部'
           }
-        } else if (val.SelectItem == "InStyle") {
-          if (val.BeChangeInfo == "1") {
-            return "评审准入"
-          } else if (val.BeChangeInfo == "2") {
-            return "一级物资备案准入"
-          } else if (val.BeChangeInfo == "3") {
-            return "二级物资备案准入"
-          } else if (val.BeChangeInfo == "4") {
-            return "战略合作准入"
-          } else if (val.BeChangeInfo == "5") {
-            return "内部多元准入"
+        } else if (val.SelectItem == 'InStyle') {
+          if (val.BeChangeInfo == '1') {
+            return '评审准入'
+          } else if (val.BeChangeInfo == '2') {
+            return '一级物资备案准入'
+          } else if (val.BeChangeInfo == '3') {
+            return '二级物资备案准入'
+          } else if (val.BeChangeInfo == '4') {
+            return '战略合作准入'
+          } else if (val.BeChangeInfo == '5') {
+            return '内部多元准入'
           }
-        } else if (val.SelectItem == "CredentialFlag") {
-          if (val.BeChangeInfo == "1") {
-            return "三证合一"
-          } else if (val.BeChangeInfo == "2") {
-            return "五证合一"
-          } else if (val.BeChangeInfo == "3") {
-            return "常规"
+        } else if (val.SelectItem == 'CredentialFlag') {
+          if (val.BeChangeInfo == '1') {
+            return '三证合一'
+          } else if (val.BeChangeInfo == '2') {
+            return '五证合一'
+          } else if (val.BeChangeInfo == '3') {
+            return '常规'
           }
-        } else if (val.SelectItem == "SetupTime") {
+        } else if (val.SelectItem == 'SetupTime') {
           if (val.BeChangeInfo === '') {
             return '----'
           } else if (val.BeChangeInfo === '0001-01-01T08:00:00+08:00') {
@@ -1225,38 +1331,38 @@
       },
       dataformat(val) {
         //debugger
-        if (val.SelectItem == "SpecTypeCode") {
-          if (val.ChangeInfo == "1") {
-            return "一般外部"
-          } else if (val.ChangeInfo == "2") {
-            return "多元内部"
+        if (val.SelectItem == 'SpecTypeCode') {
+          if (val.ChangeInfo == '1') {
+            return '一般外部'
+          } else if (val.ChangeInfo == '2') {
+            return '多元内部'
           }
-        } else if (val.SelectItem == "InStyle") {
-          if (val.ChangeInfo == "1") {
-            return "评审准入"
-          } else if (val.ChangeInfo == "2") {
-            return "一级物资备案准入"
-          } else if (val.ChangeInfo == "3") {
-            return "二级物资备案准入"
-          } else if (val.ChangeInfo == "4") {
-            return "战略合作准入"
-          } else if (val.ChangeInfo == "5") {
-            return "内部多元准入"
+        } else if (val.SelectItem == 'InStyle') {
+          if (val.ChangeInfo == '1') {
+            return '评审准入'
+          } else if (val.ChangeInfo == '2') {
+            return '一级物资备案准入'
+          } else if (val.ChangeInfo == '3') {
+            return '二级物资备案准入'
+          } else if (val.ChangeInfo == '4') {
+            return '战略合作准入'
+          } else if (val.ChangeInfo == '5') {
+            return '内部多元准入'
           }
-        } else if (val.SelectItem == "CredentialFlag") {
-          if (val.ChangeInfo == "1") {
-            return "三证合一"
-          } else if (val.ChangeInfo == "2") {
-            return "五证合一"
-          } else if (val.ChangeInfo == "3") {
-            return "常规"
+        } else if (val.SelectItem == 'CredentialFlag') {
+          if (val.ChangeInfo == '1') {
+            return '三证合一'
+          } else if (val.ChangeInfo == '2') {
+            return '五证合一'
+          } else if (val.ChangeInfo == '3') {
+            return '常规'
           }
-        } else if (val.SelectItem == "SetupTime") {
-          if (val.ChangeInfo == "") {
+        } else if (val.SelectItem == 'SetupTime') {
+          if (val.ChangeInfo == '') {
             return '----'
-          } else if (val.ChangeInfo == "0001-01-01T08:00:00+08:00") {
+          } else if (val.ChangeInfo == '0001-01-01T08:00:00+08:00') {
             return '----'
-          } else if (val.ChangeInfo == "5000-01-01T23:59:59+08:00") {
+          } else if (val.ChangeInfo == '5000-01-01T23:59:59+08:00') {
             return '永久'
           } else {
             val = val.replace('T', ' ')

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -18,7 +18,7 @@
           </el-button>
           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
           <el-button type="primary" size="mini" @click="submitInfoChange"
-            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2) && !butnab">提交申请
+            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2) && !butnab">提交分办
           </el-button>
           <router-link :to="'/oilsupplier/infochangech'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -680,7 +680,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="说明">
-              <el-input v-model="AuditRemark" type="textarea" placeholder="请输入说明内容">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -696,6 +696,8 @@
     <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
       <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
+    <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
+                        :visible="chooseAuditorVisibleFen" typeCode="04"></choose-auditor-fen>
   </div>
 </template>
 
@@ -703,18 +705,20 @@
   import {
     mapGetters
   } from 'vuex'
-  import _ from 'lodash';
+  import _ from 'lodash'
   import axios from 'axios'
   import uploadajax from '@/assets/js//uploadajax.js'
-  import supplierapi from '@/api/oilsupplier/supplier';
-  import api from '@/api/oilsupplier/infochange';
-  import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
+  import supplierapi from '@/api/oilsupplier/supplier'
+  import api from '@/api/oilsupplier/infochange'
+  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import fileapi from '@/api/oilsupplier/supplierfile'
+  import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
   export default {
     components: {
       WfMultiHistory,
-      ChooseAuditor
+      ChooseAuditor,
+      ChooseAuditorFen
     },
     computed: {
       ...mapGetters({
@@ -744,7 +748,7 @@
         } else {
           callback()
         }
-      };
+      }
 
       var checkCommercialNo = (rule, value, callback) => {
         console.log("showorhidflag" + this.showorhidflag)
@@ -762,7 +766,7 @@
             callback()
           }
         }
-      };
+      }
       //查找是否有公司信息，若有则补全信息。
       var checkSupplierName = (rule, value, callback) => {
         if (!value) {
@@ -771,7 +775,7 @@
           //this.searchSupplierName();
           callback();
         }
-      };
+      }
       //检查邮编格式
       var checkZipCode = (rule, value, callback) => {
         if (!value) {
@@ -784,8 +788,8 @@
             callback()
           }
         }
-      };
-      //检查手机号
+      }
+      // 检查手机号
       var checkMobile = (rule, value, callback) => {
         if (!value) {
           callback(new Error('请输入手机号码'));
@@ -797,12 +801,12 @@
             callback()
           }
         }
-      };
+      }
 
-      //固话检验
+      // 固话检验
       var checkTelphone = (rule, value, callback) => {
         if (!value) {
-          callback(new Error('请输入固话号码'));
+          callback(new Error('请输入固话号码'))
         } else {
           let re = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/
           if (!re.test(value)) {
@@ -811,8 +815,10 @@
             callback()
           }
         }
-      };
+      }
       return {
+        ComAuditdialogShow: false,
+        chooseAuditorVisibleFen: false,
         waituploads: [], // 等待上传的附件列表
         AccessCardNolist: [],
         AccessCardNo1: '',
@@ -1247,12 +1253,46 @@
       this.getAccessCardNo()
     },
     methods: {
+      SubpEntity () {
+        if (this.auditer === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择分办人！'
+          })
+          return
+        }
+        this.entityForm.auditer = this.auditer
+        this.entityForm.MInfoId = this.MInfoId
+        api.commitAuditEntity(this.supplierId, this.entityForm, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.initDatas()
+            this.ComAuditdialogShow = false
+            this.butnab = true
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      setAuditerFen (val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisibleFen = false
+      },
       chooseAuditorShowFen () {
-        console.log('--this.formData.SupplierTypeCode----', this.formData.SupplierTypeCode)
-        this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.$refs['chooseAuditorFen'].getorgtreelist('04')
         this.chooseAuditorVisibleFen = true
       },
-      initDatas() {
+      initDatas () {
         this.getMainInfo()
         let params = {
           InfomainId: this.MInfoId
@@ -1982,9 +2022,10 @@
         this.linkaddress = this.$refs['cascaderAddrLink'].currentLabels
         this.formData.LinkAllAddress = this.linkaddress[0] + '/' + this.linkaddress[1] + '/' + this.linkaddress[2]
       },
-      //提交信息变更审核
-      submitInfoChange() {
-        this.commitshow = true
+      // 提交信息变更审核
+      submitInfoChange () {
+        // this.commitshow = true
+        this.ComAuditdialogShow = true
       },
       addInfoChangeAudit() {
         if (this.auditer === "") {

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/index.vue

@@ -176,6 +176,12 @@
         } else if (val.query.step == 11) {
           // 分办-基建类
           this.ACode = 'SUB_OFFICE_JS'
+        } else if (val.query.step == 12) {
+          // 分办-年审
+          this.ACode = 'SUB_OFFICE_NS'
+        } else if (val.query.step == 13) {
+          // 分办-增项
+          this.ACode = 'SUB_OFFICE_BG'
         }
         this.initData()
       }
@@ -224,6 +230,12 @@
       } else if (this.$route.query.step == 11) {
         // 分办-基建类
         this.ACode = 'SUB_OFFICE_JS'
+      } else if (this.$route.query.step == 11) {
+        // 分办-年审
+        this.ACode = 'SUB_OFFICE_NS'
+      } else if (this.$route.query.step == 11) {
+        // 分办-增项
+        this.ACode = 'SUB_OFFICE_BG'
       }
       this.initData()
       // this.getAllRole()