Ver código fonte

技术服务类- 人员数量

yuedefeng 6 anos atrás
pai
commit
eeadd44e8c

+ 14 - 23
src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1071,10 +1071,10 @@ func (this *OilSupplierController) UpdateEntity() {
 // @router /updatenumber/:id [post]
 func (this *OilSupplierController) UpdateNumberEntity() {
 	idGroup := this.Ctx.Input.Param(":id")
-	id := strings.Split(idGroup, "_")[0]
+	//id := strings.Split(idGroup, "_")[0]
 	certId := strings.Split(idGroup, "_")[1]
 	var errinfo ErrorInfo
-	if id == "" {
+	if certId == "" {
 		errinfo.Message = "操作失败!请求信息不完整"
 		errinfo.Code = -2
 		this.Data["json"] = &errinfo
@@ -1082,19 +1082,20 @@ func (this *OilSupplierController) UpdateNumberEntity() {
 		return
 	}
 
-	var model supplier.OilSupplier
-	svc := supplier.GetOilSupplierService(utils.DBE)
+
+	var modelCert suppliercert.OilSupplierCert
+	svcCert := suppliercert.GetOilSupplierCertService(utils.DBE)
 
 	var jsonBlob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonBlob, &model)
-	model.ModifiedOn = time.Now()
-	model.ModifiedBy = this.User.Realname
-	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+	json.Unmarshal(jsonBlob, &modelCert)
+	modelCert.ModifiedOn = time.Now()
+	modelCert.ModifiedBy = this.User.Realname
+	modelCert.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 
-	cols := []string{
 
-		"Id",
 
+	colcerts := []string{
+		"Id",
 		"WorkerTotal",
 		"ContractNum ",
 		"UniversityNum",
@@ -1111,24 +1112,14 @@ func (this *OilSupplierController) UpdateNumberEntity() {
 		"ModifiedUserId",
 
 		"ModifiedBy",
-
-
 	}
-	err := svc.UpdateEntityBytbl(OilSupplierName, id, &model, cols)
-	//增加页面步骤
-
-	svcCert := suppliercert.GetOilSupplierCertService(utils.DBE)
-	var modelCert suppliercert.OilSupplierCert
-	svcCert.GetEntityById(certId, &modelCert)
 	if modelCert.Step <= 2 {
 		modelCert.Step = 2 //完成企业基本信息
-		colcerts := []string{
-			"Id",
-			"Step",
-		}
-		svcCert.UpdateEntityByIdCols(certId, modelCert, colcerts)
+		colcerts = append(colcerts, "Step")
 	}
 
+	err := svcCert.UpdateEntityBytbl(OilSupplierCertName, certId, &modelCert, colcerts)
+
 
 	if err == nil {
 		errinfo.Message = "保存成功!"

+ 26 - 23
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -361,74 +361,74 @@
               </span>
             </div>
 
-            <el-form label-width="220px" ref="EntityFormNumber" :model="formData">
+            <el-form label-width="220px" ref="EntityFormNumber" :model="formDataCert">
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="企业员工总数">
-                    <el-input-number v-model="formData.WorkerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.WorkerTotal" controls-position="right" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="合同化用工数量">
-                    <el-input-number v-model="formData.ContractNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.ContractNum" controls-position="right" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="大学及以上学历人员数量">
-                    <el-input-number v-model="formData.UniversityNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.UniversityNum" controls-position="right" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术、管理人员数量">
-                    <el-input-number v-model="formData.TechnicalNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.TechnicalNum" controls-position="right" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="高级及以上职称人员数量">
-                    <el-input-number v-model="formData.AboveProfNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.AboveProfNum" controls-position="right" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="中级职称人员数量">
-                    <el-input-number v-model="formData.MiddleProfNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.MiddleProfNum" controls-position="right" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格人员数量">
-                    <el-input-number v-model="formData.NationalRegNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.NationalRegNum" controls-position="right" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格证书总数">
-                    <el-input-number v-model="formData.NationalCertTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.NationalCertTotal" controls-position="right" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="设计人员总数">
-                    <el-input-number v-model="formData.DesignerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.DesignerTotal" controls-position="right" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术工人总数">
-                    <el-input-number v-model="formData.SkillerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.SkillerTotal" controls-position="right" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
@@ -568,8 +568,8 @@
     data() {
       return {
         equipmentlist: [], //企业主要装备情况
-        performanceList: [], //近三年主要工程业绩       
-        patentList: [], //拥有专利、专有技术及工法      
+        performanceList: [], //近三年主要工程业绩
+        patentList: [], //拥有专利、专有技术及工法
         winningList: [], //近三年获得省部级及以上主要技术、管理成果、获奖项目
 
         serviceId: '',
@@ -624,16 +624,7 @@
           SpecSupplier: '',
           SpecTypeCode: '',
           SpecTypeName: '',
-          WorkerTotal: 0,
-          ContractNum: 0,
-          UniversityNum: 0,
-          TechnicalNum: 0,
-          AboveProfNum: 0,
-          MiddleProfNum: 0,
-          NationalRegNum: 0,
-          NationalCertTotal: 0,
-          DesignerTotal: 0,
-          SkillerTotal: 0,
+
           Remark: '',
           IsDelete: '',
           CreateOn: '',
@@ -648,6 +639,18 @@
           Step: 0
 
         },
+        formDataCert: {
+          WorkerTotal: 0,
+          ContractNum: 0,
+          UniversityNum: 0,
+          TechnicalNum: 0,
+          AboveProfNum: 0,
+          MiddleProfNum: 0,
+          NationalRegNum: 0,
+          NationalCertTotal: 0,
+          DesignerTotal: 0,
+          SkillerTotal: 0,
+        },
         entrydetail: {
           process: 'oil_supplier_apply',
           business: '4',