注册选择二级单位

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

@@ -49,7 +49,7 @@ type OilCorporateInfo struct {
 	CompanyUrl       string    `xorm:"comment('公司网址') VARCHAR(20)"`
 	Remark           string    `xorm:"comment('备注') VARCHAR(500)"`
 	CheckStatus      int       `xorm:"default 0 comment('二级单位审核状态，0：未通过，1：通过') INT(1)"`
-	CheckUserId      int       `xorm:"comment('审核人Id') INT(10)"`
+	CheckUserId      string       `xorm:"comment('审核人Id') VARCHAR(50)"`
 	CheckUserName    string    `xorm:"comment('审核人姓名') VARCHAR(50)"`
 	IsDelete         int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	UserName         string    `xorm:"comment('登录账号/用户名') VARCHAR(50)"`

src/dashoo.cn/backend/api/business/todolist/todolist.go

@@ -21,4 +21,5 @@ const (
 	ANNUALAUDIT string = "3" // 年审
 	INFOCHANGE  string = "4" // 信息变更
 	QUALCHANGE  string = "5" // 资质变更
+	REGISTER    string = "6" // 注册
 )

src/dashoo.cn/backend/api/controllers/base.go

@@ -296,6 +296,8 @@ func (this *BaseController) Prepare() {
 		"/api/organizes/getorglist",
 		"/api/supplier/getauditerbydeptandnologin",
 		"/api/rtx/ptrlogin",
+		"/api/register/orgloginlist",
+		"/api/register/getauditerbydept",
 	}
 	for _, v := range urls {
 		fmt.Println("**this.Ctx.Input.URL()**", this.Ctx.Input.URL())

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

@@ -294,24 +294,46 @@ func (this *SelectController) GetProcessAuditList() {
 		total = svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 		datainfo.Items = list
 	} else if tabinx == "1" {
+		whereapp := "1=1"
+		if supplierTypeCode != "" {
+			whereapp = whereapp + " and AppendType like '%" + supplierTypeCode + "%'"
+		}
+		if supplierName != "" {
+			whereapp = whereapp + " and SupplierName like '%" + supplierName + "%'"
+		}
 		var list []suppliercertappend.OilSupplierCertAppend
 		svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
-		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, whereapp)
 		datainfo.Items = list
 	} else if tabinx == "2" {
+		whereapp := "1=1"
+		if supplierTypeCode != "" {
+			whereapp = whereapp + " and SupplierTypeName like '%" + supplierTypeCode + "%'"
+		}
+		if supplierName != "" {
+			whereapp = whereapp + " and SupplierName like '%" + supplierName + "%'"
+		}
 		var list []annualaudit.OilAnnualAudit
 		svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
-		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, whereapp)
 		datainfo.Items = list
 	} else if tabinx == "3" {
+		whereapp := "1=1"
+		if supplierName != "" {
+			whereapp = whereapp + " and SupplierName like '%" + supplierName + "%'"
+		}
 		var list []infochange.OilInfoChange
 		svc := infochange.GetInfoChangeService(utils.DBE)
-		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, whereapp)
 		datainfo.Items = list
 	} else if tabinx == "4" {
+		whereapp := "1=1"
+		if supplierName != "" {
+			whereapp = whereapp + " and SupplierName like '%" + supplierName + "%'"
+		}
 		svc := qualchange.GetQualChangeService(utils.DBE)
 		var list []qualchange.OilQualChangeMain
-		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, whereapp)
 		datainfo.Items = list
 	}
 

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

@@ -6,6 +6,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
+	"dashoo.cn/backend/api/business/register"
 	"dashoo.cn/backend/api/business/todolist"
 	"dashoo.cn/backend/api/business/workflow"
 	. "dashoo.cn/backend/api/controllers"
@@ -260,7 +261,26 @@ func (this *TodoListController) GetMyTaskEntityList() {
 			}
 		}
 	}
+	if stype == "6" || stype == "" {
+		where := " CheckStatus=0 "
+		if supplierName != "" {
+			where = where + " and SupplierName like '%" + supplierName + "%' "
+		}
+
+		where = where + " and CheckUserId like '%" + this.User.Id + "%' "
 
+		svc := register.GetOilCorporateInfoService(utils.DBE)
+		var list []register.OilCorporateInfo
+		_, list = svc.GetCompanyListByWhere(page.CurrentPage, page.Size, "Id desc", "OilCorporateInfo", where)
+		for _, item := range list {
+			todo.Id = item.Id
+			todo.Type = todolist.REGISTER
+			todo.SupplierName = item.SupplierName
+			todo.UserName = this.User.Realname
+			todo.Status = strconv.Itoa(item.CheckStatus)
+			todolists = append(todolists, todo)
+		}
+	}
 	var datainfo DataInfo
 	datainfo.Items = todolists
 	this.Data["json"] = &datainfo
@@ -509,7 +529,26 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 			}
 		}
 	}
+	if stype == "6" || stype == "" {
+		where := " CheckStatus in (1,2) "
+		if supplierName != "" {
+			where = where + " and SupplierName like '%" + supplierName + "%' "
+		}
+
+		where = where + " and CheckUserId like '%" + this.User.Id + "%' "
 
+		svc := register.GetOilCorporateInfoService(utils.DBE)
+		var list []register.OilCorporateInfo
+		_, list = svc.GetCompanyListByWhere(page.CurrentPage, page.Size, "Id desc", "OilCorporateInfo", where)
+		for _, item := range list {
+			todo.Id = item.Id
+			todo.Type = todolist.REGISTER
+			todo.SupplierName = item.SupplierName
+			todo.UserName = this.User.Realname
+			todo.Status = strconv.Itoa(item.CheckStatus)
+			todolists = append(todolists, todo)
+		}
+	}
 	var datainfo DataInfo
 	datainfo.Items = todolists
 	this.Data["json"] = &datainfo

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

@@ -1,8 +1,10 @@
 package register
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"encoding/json"
 	"strconv"
+	"strings"
 	"time"
 
 	"dashoo.cn/business2/parameter"
@@ -34,12 +36,11 @@ func (this *OilCorporateInfoController) GetCompanyList() {
 	SupplierName := this.GetString("Name")
 
 	where := " 1=1 "
-
 	if SupplierName != "" {
 		where = where + " and SupplierName like '%" + SupplierName + "%' "
 	}
 
-	where = where + " and CheckUserId = " + this.User.Id
+	where = where + " and CheckUserId like '%" + this.User.Id + "%' "
 
 	svc := register.GetOilCorporateInfoService(utils.DBE)
 	var list []register.OilCorporateInfo
@@ -54,6 +55,21 @@ func (this *OilCorporateInfoController) GetCompanyList() {
 	this.ServeJSON()
 }
 
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} goodsaptitude.OilGoodsAptitude
+// @router /get/:id [get]
+func (this *OilCorporateInfoController) GetEntity() {
+	Id := this.Ctx.Input.Param(":id")
+
+	var model register.OilCorporateInfo
+	svc := register.GetOilCorporateInfoService(utils.DBE)
+	svc.GetEntityByIdBytbl("OilCorporateInfo", Id, &model)
+
+	this.Data["json"] = &model
+	this.ServeJSON()
+}
+
 // @Title 获取公司信息
 // @Description 根据公司名以及本公司的注册用户两个条件从供方信息表和公司注册表依次获取公司信息
 // @Success	200	{object} controllers.Request
@@ -133,7 +149,8 @@ func (this *OilCorporateInfoController) AddEntity() {
 
 	var jsonBlob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonBlob, &model)
-
+	model.CheckUserId = strings.Trim(model.CheckUserId, ",")
+	model.CheckUserName = strings.Trim(model.CheckUserName, ",")
 	model.CreateOn = time.Now()
 
 	svc := register.GetOilCorporateInfoService(utils.DBE)
@@ -421,3 +438,38 @@ func (this *OilCorporateInfoController) GetDictList() {
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }
+
+// @Title 注册时审核单位
+// @Description 注册时审核单位
+// @Success 200 {{object} controllers.Request
+// @router /orgloginlist [get]
+func (this *OilCorporateInfoController) OrgLoginList() {
+	svc := organize.GetOrganizeService(utils.DBE)
+	var org []organize.Base_Organize
+	where := "Category='unit' and ParentId in (100000128,100000176)"
+	svc.GetEntities(&org, where)
+	var datainfo DataInfo
+	datainfo.Items = org
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取二级单位审核人
+// @Description 获取二级单位审核人
+// @router /getauditerbydept [get]
+func (this *OilCorporateInfoController) GetAuditerByDept() {
+	Id := this.GetString("deptId")
+	auditstepcode := this.GetString("auditstepcode")
+
+	svc := organize.GetOrganizeService(utils.DBE)
+
+	ids := svc.GetAllChildById(Id)
+
+	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	var users []userRole.Base_RoleList
+	certSrv.GetAuditUser(ids, auditstepcode, &users)
+	var datainfo ErrorDataInfo
+	datainfo.Item = users
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}

src/dashoo.cn/backend/api/controllers/system/auditsetting.go

@@ -414,9 +414,10 @@ func (this *OilAuditSettingController) GetAuditerByDept() {
 
 	var users []userRole.Base_RoleList
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	organsvc := organize.GetOrganizeService(utils.DBE)
-	depids := organsvc.GetAllChildById(Id)
-	where := "DepartmentId in (" + depids + ")"
+	//organsvc := organize.GetOrganizeService(utils.DBE)
+	//depids := organsvc.GetAllChildById(Id)
+	//where := "DepartmentId in (" + depids + ")"
+	where := "DepartmentId = " + Id
 	rsvc.GetEntitysByWhere(BaseUserName, where, &users)
 
 	var datainfo ErrorDataInfo

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

@@ -50,6 +50,7 @@
               <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
               <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
               <span v-if="scope.row.Type=='5'" style="color:#E6A23C">资质变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+              <span v-if="scope.row.Type=='6'" style="color:#E6A23C">企业注册-待审批</span>
             </template>
           </el-table-column>
           <!--<el-table-column label="当前状态" prop="Status" align="center">-->
@@ -93,6 +94,7 @@
                 <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
                 <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
                 <span v-if="scope.row.Type=='5'" style="color:#E6A23C">资质变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+                <span v-if="scope.row.Type=='6'" style="color:#E6A23C">企业注册-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
               </template>
             </el-table-column>
             <el-table-column label="类别" prop="SupplierTypeCode">
@@ -119,6 +121,122 @@
       </el-tabs>
 
     </el-card>
+    <!-- 公司审核信息 -->
+    <el-dialog title="企业注册信息" :visible.sync="dialogVisible">
+      <el-form label-width="135px" ref="formData" :model="formData" size="small">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="公司名称" label-width="150px" style="width: 100%" prop="SupplierName">
+              <el-input v-model="formData.SupplierName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="统一社会信用代码" label-width="150px" style="width: 100%" prop="CommercialNo">
+              <el-input v-model="formData.CommercialNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="法定代表人姓名" label-width="150px" style="width: 100%" prop="LegalPerson">
+              <el-input v-model="formData.LegalPerson" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="法定代表人身份证号" label-width="150px" style="width: 100%" prop="LegalPersonId">
+              <el-input v-model="formData.LegalPersonId"  disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="法定代表人身份证扫描件" label-width="170px" prop="LegalPersonImg">
+              <div class="block" style="overflow: auto;">
+                <template>
+                  <el-row>
+                    <el-col :span="12" v-for="(url, index) in urlList" :key="index">
+                      <span @click="bigImg(url)">
+                        <el-image  style="width: 170px; height: 100px; cursor: pointer" :src="url"></el-image>
+                      </span>
+                    </el-col>
+                  </el-row>
+                </template>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="联系人姓名" label-width="150px" style="width: 100%" prop="ContactName">
+              <el-input v-model="formData.ContactName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="联系人身份证号" label-width="150px" style="width: 100%" prop="ContactId">
+              <el-input v-model="formData.ContactId" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="联系人身份证扫描件" label-width="170px" prop="ContactImg">
+              <div class="block" style="overflow: auto;">
+                <template>
+                  <el-row>
+                    <el-col :span="12" v-for="(url, index) in urlList2" :key="index">
+                      <span @click="bigImg(url)">
+                        <el-image style="width: 170px; height: 100px; cursor: pointer" :src="url"></el-image>
+                      </span>
+                    </el-col>
+                  </el-row>
+                </template>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="账号/Email" label-width="150px" style="width: 100%" prop="UserName">
+              <el-input v-model="formData.UserName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用户名"  label-width="150px" style="width: 100%" prop="UserRealName">
+              <el-input v-model="formData.UserRealName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="手机号"   style="width: 100%" prop="UserTelephone">
+              <el-input v-model="formData.UserTelephone" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!--<el-row style="margin-left: 35%; margin-top: 10px; margin-bottom: 20px;">-->
+          <!--<el-button size="mini" @click="cancelOption" v-if="formData.CheckStatus==0">审核未通过</el-button>-->
+          <!--<el-button size="mini" type="primary" @click="ensureOption" style="margin-left: 20%;" v-if="formData.CheckStatus==0">审核通过</el-button>-->
+        <!--</el-row>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button  type="primary" size="mini" @click="ComAudit">审核</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="审核" :visible.sync="Auditshow">
+      <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="审核状态">
+          <template>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="Auditshow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!--点击图片放大区域-->
+    <el-dialog
+      title="法定代表人身份证扫描件"
+      :visible.sync="legalPersonImgVisible"
+      width="40%">
+      <el-image :src="bigUrl"></el-image>
+    </el-dialog>
   </div>
 </template>
 
@@ -137,6 +255,12 @@
 
     data () {
       return {
+        urlList: [], // 照片地址数组
+        urlList2: [], // 照片地址数组2
+        bigUrl: '',
+        Auditshow: false,
+        dialogVisible: false,
+        legalPersonImgVisible: false,
         tabindex: '',
         activeName: 'first',
         currentDate: new Date(),
@@ -146,6 +270,10 @@
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
+        shenheForm: {
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
         // 列表排序
         Column: {
           Order: '',
@@ -166,6 +294,65 @@
           ModifiedBy: ''
 
         },
+        formData: {
+          Id: '', //int
+          UserId: '', //int
+          UserName: '', //账号/Email
+          UserRealName: '', //用户真实姓名
+          UserTelephone: '', //用户手机号
+          UserPass: '',
+          UserPass2: '',
+          SupplierName: '',
+          OilCertificateNo: '',
+          Grade: '',
+          MgrUnit: '',
+          OperType: '',
+          Country: '',
+          CommercialNo: '',
+          OrganCode: '',
+          CountryTaxNo: '',
+          LocalTaxNo: '',
+          Address: '',
+          DetailAddress: '',
+          Province: '',
+          City: '',
+          Street: '',
+          HouseNo: '',
+          ZipCode: '',
+          BusinessScope: '',
+          LegalPerson: '',
+          LegalPersonId: '',
+          LegalPersonURL: '',
+          CategoryCode: '',
+          CategoryName: '',
+          RegCapital: 0, //float32
+          Currency: '',
+          ContactName: '',
+          ContactId: '',
+          ContactURL: '',
+          CompanyType: '',
+          SetupTime: '', //time
+          DepositBank: '',
+          BankAccount: '',
+          EMail: '',
+          BankCreditRating: '',
+          Mobile: '',
+          Telphone: '',
+          Fax: '',
+          CompanyTel: '',
+          QQ: '',
+          CompanyUrl: '',
+          Remark: '',
+          CheckStatus: 0, // 二级单位审核状态，0：未通过，1：通过 默认0
+          IsDelete: 0, // 删除状态，0正常，1已删除
+          LinkAddress: '',
+          LinkProvince: '',
+          LinkCity: '',
+          LinkStreet: '',
+          LinkHouseNo: '',
+          LinkZipCode: '',
+          HseTraining: ''
+        },
         entityList: []
       }
     },
@@ -173,6 +360,34 @@
       this.initDatas()
     },
     methods: {
+      initDatas () {
+        // 分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+          Statustype: 2
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length === 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        // 查询条件
+        Object.assign(params, this.searchForm)
+        // 访问接口
+        api.getTodoList(params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       handleSearch () {
         this.currentPage = 1
         if (this.tabindex === '0') {
@@ -217,37 +432,124 @@
           this.$router.push('/oilsupplier/infochangech/' + val.Id + '/auditoperation?InfoStatus='+ val.Status+'&SupId='+val.SupplierId)
         } else if (val.Type === '5') {
           this.$router.push('oilsupplier/qualchange/' + val.SupplierId + '/auditoperation?certid=' + val.CertId + '&QualId=' + val.Id + '&QualStatus=' + val.Status)
+        } else if (val.Type === '6') {
+          this.initDataregister(val.Id)
         }
       },
-      finishedData () {
-        // 分页及列表条件
-        let params = {
-          _currentPage: this.currentPage,
-          _size: this.size,
-          Order: this.Column.Order,
-          Prop: this.Column.Prop,
-          Statustype: 2
+      bigImg (url) {
+        this.bigUrl = url
+        this.legalPersonImgVisible = true
+      },
+      initDataregister (Id) {
+        let _this = this
+        const params = {
+          _currentPage: _this.currentPage,
+          _size: _this.size,
+          Name: _this.searchForm.SupplierName
         }
-        let myCreateOn = []
-        // 解析时间
-        if (this.CreateOn.length === 2) {
-          this.CreateOn[1].setHours(23)
-          this.CreateOn[1].setMinutes(59)
-          this.CreateOn[1].setSeconds(59)
-          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
-          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        this.$axios.get("/register/get/" + Id)
+          .then(function (response) {
+            _this.formData = response.data
+            _this.dialogVisible = true
+            // 处理URL
+            _this.urlList = []
+            let urlArr = _this.formData.LegalPersonURL.split('&')
+            if (urlArr) {
+              for (let i = 0; i < urlArr.length; i++) {
+                let tempURL = urlArr[i].split('|')
+                if (tempURL[0].indexOf('/upfile') === 0) {
+                  const myDomain = window.location.host
+                  _this.urlList.push('http://' + myDomain + tempURL[0])
+                } else {
+                  _this.urlList.push('http://' + tempURL[0])
+                }
+              }
+            }
+            _this.urlList2 = []
+            let urlArr2 = _this.formData.ContactURL.split('&')
+            if (urlArr2) {
+              for (let i = 0; i < urlArr2.length; i++) {
+                let tempURL = urlArr2[i].split('|')
+                if (tempURL[0].indexOf('/upfile') === 0) {
+                  const myDomain = window.location.host
+                  _this.urlList2.push('http://' + myDomain + tempURL[0])
+                } else {
+                  _this.urlList2.push('http://' + tempURL[0])
+                }
+              }
+            }
+          })
+          .catch(function (error) {
+            console.log(error)
+          })
+      },
+      ComAudit () {
+        this.Auditshow = true
+      },
+      // 审核
+      makeSure () {
+        if (this.shenheForm.AuditorRemark.trim().length < 1) {
+          this.$message({
+            type: 'warning',
+            message: '请填写审批意见！'
+          })
+          return
         }
-        // 查询条件
-        Object.assign(params, this.searchForm)
-        api.getMyTaskFinished(params, this.$axios).then(res => {
-          this.entityList = res.data.items
-          console.log(this.entityList, 'this.entityList')
-          this.currentItemCount = res.data.currentItemCount
-        }).catch(err => {
-          console.error(err)
-        })
+        this.checkstatus()
       },
-      initDatas () {
+      // 审核未通过
+      checkstatus () {
+        let _this = this
+        const params = _this.shenheForm
+        _this.$axios.post('/register/comaudit/', _this.formData, {params})
+          .then(res => {
+            if (res.data.code === 0) {
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+              // 关闭dialog
+              _this.Auditshow = false
+              _this.dialogVisible = false
+              // 更新列表
+              _this.initDatas()
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      ensureOption() {
+        let _this = this
+        _this.$axios.post('/register/adduser/', _this.formData)
+          .then(res => {
+            if (res.data.code === 0) {
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+              // 关闭dialog
+              _this.dialogVisible = false
+              // 更新列表
+              this.initDatas()
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+
+      finishedData () {
         // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
@@ -267,10 +569,8 @@
         }
         // 查询条件
         Object.assign(params, this.searchForm)
-        // 访问接口
-        api.getTodoList(params, this.$axios).then(res => {
+        api.getMyTaskFinished(params, this.$axios).then(res => {
           this.entityList = res.data.items
-          console.log(this.entityList, 'this.entityList')
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
@@ -278,16 +578,28 @@
       },
       statusStr (val, type) {
         switch (val) {
+          case 1:
+            return '审核通过'
+          case 2:
+            return '审核未通过'
           case '':
             return '待提交'
           case '0':
             return '待提交'
           case '1':
-            return '待初审'
+            if (type == '6') {
+              return '审核通过'
+            } else {
+              return '待初审'
+            }
           case '-1':
             return '初审未通过'
           case '2':
-            return '待复审'
+            if (type == '6') {
+              return '审核未通过'
+            } else {
+              return '待复审'
+            }
           case '-2':
             return '复审未通过'
           case '3':

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

@@ -99,7 +99,7 @@
                   <el-form-item label="邮箱"  label-width="150px" style="width: 100%" prop="EMail">
                     <el-input v-model="formData.EMail" placeholder="请输入邮箱"></el-input>
                   </el-form-item>
-                </el-col> 
+                </el-col>
 
                 <el-col :span="12">
                   <el-form-item label="手机号"   style="width: 100%" prop="UserTelephone">
@@ -112,8 +112,8 @@
                     <el-input v-model="formData.UserName" placeholder="请输入登录用户名"></el-input>
                   </el-form-item>
                 </el-col>
-               
-              
+
+
                 <el-col :span="8">
                   <el-form-item label="密码" label-width="150px" style="width: 100%" prop="UserPass" >
                     <el-input type="password" v-model="formData.UserPass"  auto-complete="off" placeholder="请输入密码"></el-input>
@@ -124,11 +124,21 @@
                     <el-input type="password" v-model="formData.UserPass2" auto-complete="off" placeholder="请输入确认密码"></el-input>
                   </el-form-item>
                 </el-col>
+                <!--<el-col :span="8">-->
+                  <!--<el-form-item label="审核人"  style="width: 100%" prop="CheckUserName">-->
+                    <!--<el-input readonly v-model="formData.CheckUserName" placeholder="请选择审核人">-->
+                      <!--<el-button slot="append" icon="el-icon-search" @click="selectOpera"></el-button>-->
+                    <!--</el-input>-->
+                  <!--</el-form-item>-->
+                <!--</el-col>-->
                 <el-col :span="8">
-                  <el-form-item label="审核人"  style="width: 100%" prop="CheckUserName">
-                    <el-input readonly v-model="formData.CheckUserName" placeholder="请选择审核人">
-                      <el-button slot="append" icon="el-icon-search" @click="selectOpera"></el-button>
-                    </el-input>
+                  <el-form-item label="审核单位"  style="width: 100%">
+                    <el-select v-model="auditorg"  filterable placeholder="请选择审核单位"
+                               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>
+                    </el-select>
                   </el-form-item>
                 </el-col>
                 <!-- <el-form-item label="验证码" prop="telep"  style="width: 100%">
@@ -191,11 +201,11 @@
         if (value === '') {
           callback(new Error('请输入公司名称'));
         } else {
-          if (this.supplierNameList) {            
+          if (this.supplierNameList) {
             for (let i = 0; i < this.supplierNameList.length; i++) {
               if (value == this.supplierNameList[i].SupplierName) {
                 callback(new Error('该公司已被注册'));
-              } 
+              }
             }
             callback();
           }else {
@@ -211,11 +221,11 @@
           if (!re4.test(this.formData.CommercialNo)) {
             callback(new Error('请填写正确的18位统一社会信用代码'));
           } else {
-           if (this.supplierNameList) {            
+           if (this.supplierNameList) {
             for (let i = 0; i < this.supplierNameList.length; i++) {
               if (value == this.supplierNameList[i].CommercialNo) {
                 callback(new Error('该统一社会信用代码与其他公司重复'));
-              } 
+              }
             }
             callback();
           }else {
@@ -248,13 +258,13 @@
           }
         }
       };
-      
+
       // var checkUploadLegal = (rule, value, callback) => {
       // if(this.$refs.LegalPersonUpload.uploadFiles.length > 0){
       //     if (this.checkSuccess(this.$refs.LegalPersonUpload.uploadFiles)) {
       //       console.log("jinlaile")
       //       callback();
-      //     }else { 
+      //     }else {
       //       callback(new Error('上传照片失败，请重新上传法定代表人身份证照片'));
       //     }
       //   }else{
@@ -266,7 +276,7 @@
       //   if(this.$refs.ContactUpload.uploadFiles.length > 0){
       //      if (this.checkSuccess(this.$refs.ContactUpload.uploadFiles)) {
       //         callback();
-      //       }else { 
+      //       }else {
       //         callback(new Error('上传照片失败，请重新上传联系人身份证照片'));
       //       }
       //   }else{
@@ -331,6 +341,8 @@
         supplierNameList: [], //公司名列表
         waituploads: [], // 等待上传的文件列表
         limitNumb: 2, //文件上传限制数
+        orgOptions: [],
+        auditorg: '',
         chooseAuditorVisible: false,
         userIsExist: false, //默认新用户不存在
         legalHaspic: false,
@@ -420,7 +432,7 @@
           LegalPersonId: [
             { required: true, validator: checkLegalPersonId, trigger: 'change' }
           ],
-        
+
           ContactName: [
             { required: true, message: '请输入联系人姓名', trigger: 'change' }
           ],
@@ -445,7 +457,7 @@
               trigger: 'change'
             }
           ],
-         
+
           UserTelephone: [
             { required: true, validator: checkUserTelephone, trigger: 'change' }
           ],
@@ -464,6 +476,7 @@
 
     created () {
       this.getSupplierNameList() //获取已注册的公司
+      this.GetorgOptions()
     },
     components: {
       Sticky,
@@ -502,6 +515,35 @@
           }
         }
       },
+      orgChange (val) {
+        let auditstepcode = 'COMPONY_AUDIT' // 初审人
+        let params = {
+          deptId: val,
+          auditstepcode: auditstepcode
+        }
+        this.$axios.get('/register/getauditerbydept', {params}).then(res => {
+          if (res.data.item != null && res.data.item.length > 0) {
+            for (let i = 0; i < res.data.item.length; i++) {
+              this.formData.CheckUserName = this.formData.CheckUserName + res.data.item[i].realname + ','
+              this.formData.CheckUserId = this.formData.CheckUserId + res.data.item[i].id + ','
+            }
+          }
+          // this.userOptions = res.data.item
+          // if (res.data.item != null && res.data.item.length > 0) {
+          //   this.formData.CheckUserName = res.data.item[0].id
+          // }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      GetorgOptions () {
+        let _this = this
+        this.$axios.get('/register/orgloginlist').then(res => {
+          _this.orgOptions = res.data.items
+        }).catch(err => {
+          console.log(err)
+        })
+      },
       removeContactImage(file, fileList){
       if (typeof this.contactImages.file != "undefined") {
         if (this.contactImages.file.length > 0) {
@@ -527,9 +569,18 @@
 
       //注册
       register () {
+        // this.formData.CheckUserId = this.formData.CheckUserId.slice(0, this.formData.CheckUserId.length - 1)
+        // this.formData.CheckUserName = this.formData.CheckUserName.slice(0, this.formData.CheckUserName.length - 1)
+        if (this.formData.CheckUserId === '' || this.formData.CheckUserId === 0) {
+          this.$message({
+            type: 'warning',
+            message: '该单位没有审核人！'
+          })
+        }
+        console.log(this.formData, 'formData')
        this.$refs['RegisterFormData'].validate((valid) => {
           if(valid){
-              let _this = this 
+              let _this = this
               let URL = []
               URL = _this.getFileURL(_this.$refs.LegalPersonUpload.uploadFiles) //获取地址
               _this.formData.LegalPersonURL = URL.join("&")
@@ -541,7 +592,6 @@
               _this.formData.UserRealName= _this.formData.SupplierName
 
               //添加注册信息
-              console.log( _this.formData)
               _this.$axios.post('/register/addentity', _this.formData)
                 .then(function (response) {
                   if (response.data.code === 0) {