注册添加注册单位

src/dashoo.cn/backend/api/business/register/oilcorporateinfo.go

@@ -52,6 +52,7 @@ type OilCorporateInfo struct {
 	CheckUserId      string    `xorm:"comment('审核人Id') VARCHAR(50)"`
 	CheckUserName    string    `xorm:"comment('审核人姓名') VARCHAR(50)"`
 	CheckUnitId      int       `xorm:"comment('审批二级单位Id') INT(10)"`
+	CheckUnitName    string    `xorm:"comment('审核单位') VARCHAR(50)"`
 	IsDelete         int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	UserName         string    `xorm:"comment('登录账号/用户名') VARCHAR(50)"`
 	UserRealName     string    `xorm:"comment('用户真实姓名') VARCHAR(50)"`

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

@@ -805,13 +805,6 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 					var Amount float64
 					asvc := oilcostmanage.GetOilCostManageService(utils.DBE)
 					Amount = asvc.GetAmount("APPEND",supplierCertAppendEntity.AppendType)
-					//if supplierCertAppendEntity.AppendType == "01" {
-					//	Amount = 6000
-					//} else if supplierCertAppendEntity.AppendType == "02" {
-					//	Amount = 7000
-					//} else if supplierCertAppendEntity.AppendType == "03" {
-					//	Amount = 8000
-					//}
 					var payinfo paymentinfo.OilPaymentInfo
 					payinfo.SrcId = supplierCertAppendEntity.Id
 					payinfo.SupplierId = supplierCertAppendEntity.SupplierId
@@ -839,6 +832,8 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 					msgService := msg2.GetMsgService(utils.DBE)
 					msgService.HandleMsg(toMobile,msg,"4-1",supplierCertAppendEntity.CreateBy,supplierEntity.ContactName,strconv.Itoa(supplierCertAppendEntity.CreateUserId))
 					//paysvc.AddPaymentinfo(supplierCertAppendEntity.SupplierId, supplierCertAppendEntity.Id, Amount, "3")
+				} else {
+					status = suppliercert.ALL_PASE_STATUS
 				}
 			}
 			supplierCertAppendEntity.Status = status

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -292,6 +292,9 @@ func (this *OilCorporateInfoController) ComAudit() {
 			model.CheckStatus = 1 //通过审核
 			model.CreateBy = userentity.Realname
 			model.CreateUserId = userentity.Id
+			model.ModifiedOn = time.Now()
+			model.ModifiedBy = this.User.Realname
+			model.ModifiedUserId,_ = strconv.Atoi(this.User.Id)
 			svcRegister := register.GetOilCorporateInfoService(utils.DBE)
 			//删除原有数据（由于采用 svcRegister.UpdateEntityById() 一直报错，所以采用先删除再添加的方式达到更新数据的目的！）
 			where := " Id = " + strconv.Itoa(model.Id)

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

@@ -137,6 +137,16 @@
                              align="center"
                              header-align="center"
                              show-overflow-tooltip></el-table-column>
+            <el-table-column prop="CheckUnitName"
+                             label="审核单位"
+                             align="center"
+                             header-align="center"
+                             show-overflow-tooltip></el-table-column>
+            <el-table-column prop="ModifiedBy"
+                             label="审核人"
+                             align="center"
+                             header-align="center"
+                             show-overflow-tooltip></el-table-column>
           </el-table>
           <el-pagination style="float:right;margin:10px 0 10px 0;"
                          @size-change="handleSizeChange"

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -110,7 +110,7 @@
                 <el-col :span="24">
                   <el-form-item label="审核单位"  style="width: 100%">
                     <el-select v-model="auditorg"  filterable placeholder="请选择审核单位"
-                               style="width: 100%;" @change="orgChange">
+                               ref="auditorgselect" style="width: 100%;" @change="orgChange">
                       <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
                                  style="width: 100%">
                       </el-option>
@@ -416,7 +416,8 @@
           LinkHouseNo: '',
           LinkZipCode: '',
           HseTraining: '',
-          CheckUnitId: ''
+          CheckUnitId: '',
+          CheckUnitName: ''
         },
 
         rules: {
@@ -601,7 +602,9 @@
 
               _this.formData.UserRealName= _this.formData.SupplierName
             _this.formData.CheckUnitId = this.auditorg
+            _this.formData.CheckUnitName = _this.$refs.auditorgselect.selectedLabel
               //添加注册信息
+            console.log(_this.formData)
               _this.$axios.post('/register/addentity', _this.formData)
                 .then(function (response) {
                   if (response.data.code === 0) {