2
3
lining преди 6 години
родител
ревизия
c805e2b8be

+ 7 - 0
src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercert.go

@@ -163,4 +163,11 @@ const (
 	BASIS_TYPECODE string = "02" // 基建类
 	TECH_TYPECODE string = "03" // 技术服务类
 
+	PINGSHEN string = "1" // 评审准入
+	YIJIWUZI string = "2" // 一级物资备案准入
+	ERJIWUZI string = "3" // 二级物资准入
+	ZHANLUEHEZUO string = "4" // 战略合作准入
+	NEIBUDUOYUAN string = "5" // 内部多元准入
+	WAIBUSHICHANG string = "6" // 外部市场准入
+
 )

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

@@ -995,7 +995,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 		oldaplydate := list.ApplyTime
 		if list.Status == suppliercert.CENT_AUDIT_STATUS {
 
-			if certEntity.InStyle == "1" {
+			if certEntity.InStyle == suppliercert.PINGSHEN {
 				var certmodel suppliercert.OilSupplierCert
 				certmodel.AuditDate = time.Now()
 				certcols := []string{

+ 6 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappend.go

@@ -13,6 +13,7 @@ import (
 	"dashoo.cn/backend/api/business/register"
 	"dashoo.cn/business2/parameter"
 	"dashoo.cn/business2/userRole"
+	"dashoo.cn/business3/items"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -848,13 +849,16 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 
 		if receiveVal == "true" {
 			if supplierCertAppendEntity.Status == "5" {
-				if supplierCertAppendEntity.InStyle == "1" {
+				if supplierCertAppendEntity.InStyle == suppliercert.PINGSHEN { // 评审准入
 
 					wheresup := " SupplierCertAppendId=" + strconv.Itoa(supplierCertAppendEntity.Id) + " and Type='2'"
 					var sup []suppliercertsub.OilSupplierCertSub
 					total := svc.GetPagingEntitiesWithOrder(1,10,"Id",true,&sup,wheresup)
 
-					if supplierCertAppendEntity.AppendType == "01" && total <= 50 {
+					dictSvc := items.GetItemsService(utils.DBE)
+					appendAmt := dictSvc.GetKeyValueItems("SupplierAppend")
+					appendi,_ := strconv.Atoi(appendAmt[0].Value)
+					if supplierCertAppendEntity.AppendType == suppliercert.DOOGS_TYPECODE && total <= int64(appendi) { // 物资类 小于等于50条不交费
 						status = suppliercert.ALL_PASE_STATUS
 					} else {
 						paysvc := paymentinfo.GetPaymentService(utils.DBE)

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -265,7 +265,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="专业处室" v-if="allowpre">
-              <el-cascader :options="preorgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
+              <el-cascader :options="preorgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable disabled
                 style="width: 100%" v-model="majorDept" placeholder="请选择专业处室" @change="orgtreeChange">
               </el-cascader>
             </el-form-item>

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

@@ -427,7 +427,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="专业处室" v-if="allowpre">
-              <el-cascader :options="preorgtreelist" :props="preorgtreeprops" :show-all-levels="false" filterable
+              <el-cascader :options="preorgtreelist" :props="preorgtreeprops" :show-all-levels="false" filterable disabled
                 style="width: 100%" v-model="majorDept" placeholder="请选择专业处室" @change="orgtreeChange">
               </el-cascader>
             </el-form-item>