年审审批

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

@@ -38,7 +38,7 @@ func (s *InfoChangeService) GetInfoforItem(supname, item, where string) string {
 func (s *InfoChangeService) GetSupplierList(supname,where string) []annualaudit.Suppliername {
 	var sql string
 	//sql = `select * from  `+ supname +` where Id not in ( select SupplierId  from `+ auditname +` where  YEAR(CreateOn)=YEAR(NOW()))`
-	sql = `select * from  `+ supname + ` where ` + where
+	sql = `select * from  `+ supname + ` a left join OilSupplierCert b on a.Id = b.SupplierId  where ` + where
 	List := make([]annualaudit.Suppliername, 0)
 	utils.DBE.Sql(sql).Find(&List)
 	return List

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

@@ -204,20 +204,22 @@ func (this *AnnualAuditController) GetMyTaskEntityList() {
 // @Success 200 {object} annualaudit.OilAnnualAudit
 // @router /supplierlist [get]
 func (this *AnnualAuditController) GetSupplierList() {
+	code := this.GetString("code")
 	svc := infochange.GetInfoChangeService(utils.DBE)
 	var supplierlist []annualaudit.Suppliername
 	where := "1=1"
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
-		where = where + " and CreateUserId = '" + this.User.Id + "'"
+		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
 	} else {
 		//超级管理员和有查看所有数据权限的用户不加条件
 		svcPerm := permission.GetPermissionService(utils.DBE)
 		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
 		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
-			where = where + " and CreateUserId = '" + this.User.Id + "'"
+			where = where + " and a.CreateUserId = '" + this.User.Id + "'"
 		}
 	}
+	where = where + " and b.SupplierTypeCode='" + code + "' and b.Status='8'"
 	supplierlist = svc.GetSupplierList(""+OilSupplierName, where)
 	var datainfo DataInfo
 	datainfo.Items = supplierlist
@@ -310,7 +312,7 @@ func (this *AnnualAuditController) AddEntity() {
 		this.ServeJSON()
 		return
 	}
-	supwhere := "a.Id = " + utils.ToStr(model.SupplierId) + " and b.SupplierTypeCode = " + model.SupplierTypeName+ " and b.Status = 8 "
+	supwhere := "a.Id = " + utils.ToStr(model.SupplierId) + " and b.SupplierTypeCode = '" + model.SupplierTypeName+ "' and b.Status = '8' "
 	supsvc := supplier.GetOilSupplierService(utils.DBE)
 	var list []supplier.OilSupplierView
 	total := supsvc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, 1, 1, "a.Id", true, &list, supwhere)
@@ -654,19 +656,6 @@ func (this *AnnualAuditController) AnnualAudit() {
 				"AuditDate",
 			}
 			svc.UpdateEntityByIdCols(list.CerId, certmodel, certcols)
-		}else {
-			auditmodel.ApplyTime = oldaplydate
-		}
-		auditmodel.Step = step
-		if receiveVal == "true" {
-			cols := []string{
-				"Id",
-				"Status",
-				"Step",
-				"ApplyTime",
-			}
-			svc.UpdateEntityByIdCols(dataother.AnnualId, auditmodel, cols)
-
 			paysvc := paymentinfo.GetPaymentService(utils.DBE)
 			var Amount float64
 			if list.SupplierTypeName == "01" {
@@ -686,6 +675,19 @@ func (this *AnnualAuditController) AnnualAudit() {
 			payinfo.CreateBy = list.CreateBy
 			payinfo.CreateOn = time.Now()
 			paysvc.InsertEntity(&payinfo)
+		}else {
+			auditmodel.ApplyTime = oldaplydate
+		}
+		auditmodel.Step = step
+		if receiveVal == "true" {
+			cols := []string{
+				"Id",
+				"Status",
+				"Step",
+				"ApplyTime",
+			}
+			svc.UpdateEntityByIdCols(dataother.AnnualId, auditmodel, cols)
+
 			//paysvc.AddPaymentinfo(list.SupplierId, list.Id, Amount, "2")
 			errinfo.Message = "提交成功！"
 			errinfo.Code = 0

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

@@ -20,12 +20,12 @@ export default {
       params: params
     })
   },
-  getSupList (myAxios) {
+  getSupList (code, myAxios) {
     return myAxios({
-      url: '/annualaudit/supplierlist/',
+      url: '/annualaudit/supplierlist?code=' + code,
       method: 'GET'
     })
-  }, 
+  },
   getDictList (myAxios) {
     return myAxios({
       url: '/annualaudit/dictlist/',

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

@@ -216,7 +216,7 @@
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="ProfAuditThen" 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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>

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

@@ -220,7 +220,7 @@
             <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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -224,7 +224,7 @@
             <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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -225,7 +225,7 @@
             <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 v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -265,7 +265,6 @@
   import annualapi from '@/api/oilsupplier/annualaudit';
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
-  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -276,7 +275,7 @@
   import TechInfo from '@/components/oilsupplier/techinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
+  import WfBackHistory from '@/components/workflow/wfmultihistory.vue'
   import SubfileList from '@/components/oilsupplier/subfilelist'
 
 
@@ -498,7 +497,6 @@
         annualapi.getEntity(annid, this.$axios)
           .then(res => {
             this.formannData = res.data;
-            console.log("--forann-", this.formannData.Status)
             this.Status = this.formannData.Status
           })
           .catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -479,7 +479,7 @@
       },
 
       getselectsupplier() {
-        api.getSupList(this.$axios).then(res => {
+        api.getSupList('02', this.$axios).then(res => {
           if (res.data.items.length != 0) {
             for (var i = 0; i < res.data.items.length; i++) {
               this.selectsupplierlist.push({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -481,7 +481,7 @@
       },
 
       getselectsupplier() {
-        api.getSupList(this.$axios).then(res => {
+        api.getSupList('01', this.$axios).then(res => {
           if (res.data.items.length != 0) {
             for (var i = 0; i < res.data.items.length; i++) {
               this.selectsupplierlist.push({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -336,7 +336,7 @@
       Object.assign(this.searchFormReset, this.searchForm)
       //查询列表
       this.initDatas()
-      this.getselectsupplier()
+      //this.getselectsupplier()
       this.getorgtreelist()
       this.getDictOptions()
       this.getSupplierList()

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -479,7 +479,7 @@
       },
 
       getselectsupplier() {
-        api.getSupList(this.$axios).then(res => {
+        api.getSupList('03', this.$axios).then(res => {
           if (res.data.items.length != 0) {
             for (var i = 0; i < res.data.items.length; i++) {
               this.selectsupplierlist.push({

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

@@ -371,6 +371,7 @@
 
     data() {
       return {
+        chooseAuditorVisible: false,
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         equipmentList: [], // 企业主要装备情况
         performanceList: [], // 近三年主要工程业绩
@@ -632,9 +633,6 @@
             } else if (this.formData.Status === '5') {
               this.auditTitle = '集中审批'
               this.auditstepcode = 'PROF_REGULATION'
-            } else if (this.formData.Status === '10') {
-              this.auditTitle = '分办'
-              this.auditstepcode = 'FEN_TRIAL'
               if (this.inStyle == '1') {
                 this.shenheForm.AuditorRemark = '集中评审通过'
               } else if (this.inStyle == '2') {
@@ -644,6 +642,9 @@
               } else if (this.inStyle == '4') {
                 this.shenheForm.AuditorRemark = '战略合作准入'
               }
+            } else if (this.formData.Status === '10') {
+              this.auditTitle = '分办'
+              this.auditstepcode = 'FEN_TRIAL'
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)