前后:bug

src/dashoo.cn/backend/api/business/oilsupplier/oilcatalog/oilcatalog.go

@@ -14,7 +14,7 @@ type OilCatalog struct {
 	Address        string    `xorm:"comment('注册地址') VARCHAR(255)"`
 	USCCode        string    `xorm:"comment('统一社会信息代码') VARCHAR(20)"`
 	RegCapital     float64   `xorm:"comment('注册资金') FLOAT"`
-	RecordScope    string    `xorm:"comment('企业名称') TEXT"`
+	RecordScope    string    `xorm:"comment('备案范围') TEXT"`
 	IDCode         string    `xorm:"comment('身份证号') VARCHAR(20)"`
 	Business       string    `xorm:"comment('业务范围') TEXT"`
 	ValidityFrom   time.Time `xorm:"comment('有效期起') DATETIME"`

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

@@ -1976,8 +1976,14 @@ func (this *OilSupplierController) GetFirAuditerByDept() {
 	userIds := strings.Replace(tempstr, "uid_", "", -1)
 	userIds = strings.Trim(userIds, ",")
 	if userIds != "" {
-		where := "Id in (" + userIds + ")" + "and (UnitId=" + Id + " or Departmentid in (" + alldep + ")) "
-		svc.GetEntities(&userlist, where)
+		// 企管法规处
+		if unitId == "100000517" {
+			where := "Id in (" + userIds + ")"
+			svc.GetEntities(&userlist, where)
+		} else {
+			where := "Id in (" + userIds + ")" + "and (UnitId=" + Id + " or Departmentid in (" + alldep + ")) "
+			svc.GetEntities(&userlist, where)
+		}
 	}
 
 	//svc := organize.GetOrganizeService(utils.DBE)

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

@@ -252,6 +252,8 @@ import Cookies from 'js-cookie'
           // this.$cookie.set('iamCode', iamCode)
           // this.$cookies.set('token', res.data.token)
           Cookies.remove('token')
+          localStorage.clear()
+          // localStorage.setItem('token', res.data.token)
           Cookies.set('token', res.data.token)
           // Cookies.set('iamCode', iamCode)
           this.$router.replace({ path: '/' })

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/_opera/incomeedit.vue

@@ -658,6 +658,7 @@
         this.chooseAuditorVisible = true
       },
       setAuditer (val, name) {
+        console.log(val, name, 'dd')
         this.formData.FirstAudit = val
         this.formData.FirstAuditName = name
         this.chooseAuditorVisible = false
@@ -799,6 +800,7 @@
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             this.formData.SecondAuditName = this.$refs.secondAudit.selectedLabel + ''
+            this.formData.FirstAuditName = this.$refs.selectAuditer.selectedLabel + ''
             if (!this.formData.Id) {
               this.addEntity()
             } else {
@@ -810,6 +812,7 @@
         })
       },
       addEntity () {
+        console.log(this.formData, '参数')
         api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.formData.Id = res.data.item