前后:样式;部门编辑是否是二级功能;注册时审核单位用code

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

@@ -54,6 +54,7 @@ type Base_Organizebandparentname struct {
 	Id          int
 	Parentid    int
 	Fullname    string
+	Category    string
 	Description string
 	Createon    time.Time
 	Modifiedon  time.Time

src/dashoo.cn/backend/api/controllers/casbin/organize.go

@@ -24,6 +24,7 @@ type OrganizesController struct {
 type OrganizeModel struct {
 	Parentid        int    `json:"parentid"`
 	Fullname        string `json:"fullname"`
+	Category        string `json:"category"`
 	Description     string `json:"description"`
 	HaveChild       int    `json:"havechild"`
 	IsInnerOrganize int
@@ -205,10 +206,15 @@ func (this *OrganizesController) EditOrganize() {
 	if has {
 		entity.Fullname = model.Fullname
 		entity.Parentid = model.Parentid
+		if model.Category == "1" {
+			entity.Category = "unit"
+		} else {
+			entity.Category = ""
+		}
 		entity.Description = model.Description
 		entity.Modifieduserid, _ = utils.StrTo(this.User.Id).Int()
 		entity.Modifiedby = this.User.Realname
-		var cols []string = []string{"Fullname", "Parentid", "Description", "Modifieduserid", "Modifiedby"}
+		var cols []string = []string{"Fullname", "Parentid", "Description", "Category", "Modifieduserid", "Modifiedby"}
 		err := svc.UpdateEntityAndBackupByCols(id, &entity, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Realname)
 
 		if err == nil {

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

@@ -644,7 +644,10 @@ func (this *OilCorporateInfoController) GetDictList() {
 func (this *OilCorporateInfoController) OrgLoginList() {
 	svc := organize.GetOrganizeService(utils.DBE)
 	var org []organize.Base_Organize
-	where := "Category='unit' and ParentId in (100000128,100000176) and Id not in (100000159,100000166)"
+	//where := "Category='unit' and ParentId in (100000128,100000176) and Id not in (100000159,100000166)"
+	//00097005,100000061 直属机构 二级单位
+	//00265439,50081902,50073840 土地公路管理部 矿区服务事业部 矿区服务事业部
+	where := "Category='unit' and OuterPhone in (00097005,00097006) and Code not in (00265439,50081902,50073840)"
 	svc.GetEntities(&org, where)
 	var datainfo DataInfo
 	datainfo.Items = org

src/dashoo.cn/frontend_web/src/pages/system/businessusers.vue

@@ -27,7 +27,7 @@
           </el-form-item>
         </el-form>
       </div>
-        <el-table :data="list"  size="mini" border>
+        <el-table :data="list"  highlight-current-row stripe  size="mini" border>
           <el-table-column label="操作" align="center" fixed="right">
             <template slot-scope="scope">
               <!--<el-button size="small" @click="opendatadialog(2,scope.row,scope.$index);" type="text" icon="el-icon-edit"

src/dashoo.cn/frontend_web/src/pages/system/cost.vue

@@ -15,7 +15,7 @@
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
         </el-form>
       </div>
-        <el-table :data="list"  size="mini" border>
+        <el-table :data="list" highlight-current-row stripe   size="mini" border>
           <el-table-column label="操作" align="center" fixed="right">
             <template slot-scope="scope">
               <el-button size="small" type="text" icon="el-icon-edit"

src/dashoo.cn/frontend_web/src/pages/system/district.vue

@@ -34,7 +34,7 @@
           </el-tree>
         </el-col>
         <el-col :span="18">
-          <el-table :data="tablelist"  size="mini" border>
+          <el-table :data="tablelist" highlight-current-row stripe   size="mini" border>
             <el-table-column label="操作" width="70" align="center" fixed="right">
               <template slot-scope="scope">
                 <template v-if="scope.row.ParentId !== 0">

src/dashoo.cn/frontend_web/src/pages/system/module.vue

@@ -34,7 +34,7 @@
           </el-tree>
         </el-col>
         <el-col :span="18">
-          <el-table :data="tablelist"  size="mini" border>
+          <el-table :data="tablelist"  size="mini" border highlight-current-row stripe >
             <el-table-column label="操作" width="70" align="center" fixed="right">
               <template slot-scope="scope">
                 <template v-if="scope.row.Parentid !== 0">

src/dashoo.cn/frontend_web/src/pages/system/organize.vue

@@ -37,7 +37,7 @@
           </el-tree>
         </el-col>
         <el-col :span="18">
-          <el-table :data="tablelist"  size="mini" border>
+          <el-table :data="tablelist"  size="mini" border highlight-current-row stripe >
             <el-table-column label="操作" width="70" align="center" fixed="right">
               <template slot-scope="scope">
                 <template v-if="scope.row.Parentid !== 0">
@@ -72,6 +72,12 @@
           <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" v-model="selectedorg"
             placeholder="请选择组织"></el-cascader>
         </el-form-item>
+        <el-form-item label="二级单位" prop="category" label-width="120px" required>
+          <el-select v-model="organizeform.category" placeholder="请选择" style="width: 100%" @change="searchSelectChange">
+            <el-option key="1" label="是" value="1"></el-option>
+            <el-option key="0" label="否" value="0"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="组织名称" prop="fullname" label-width="120px">
           <el-input v-model="organizeform.fullname" auto-complete="off"></el-input>
         </el-form-item>
@@ -133,6 +139,7 @@
           parentid: 0,
           fullname: '',
           description: '',
+          category: '0',
           id: 0
         },
         rulesorganize: {
@@ -184,6 +191,9 @@
       authUser: 'authUser'
     }),
     methods: {
+      searchSelectChange() {
+        this.$forceUpdate()
+      },
       initData() {
         let _this = this
         // paginate
@@ -192,7 +202,7 @@
           _size: this.size,
           keyword: this.keyword,
           parentid: this.parentid,
-          IsInnerOrganize: this.organizeform.IsInnerOrganize
+          IsInnerOrganize: 1
         }
         // request
         this.$axios.get('organizes/listbandparentname', {
@@ -221,7 +231,7 @@
         let _this = this
         // request
         let params = {
-          IsInnerOrganize: this.organizeform.IsInnerOrganize
+          IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/list', {
             params
@@ -334,6 +344,7 @@
         return val.substring(0, 19)
       },
       opendatadialog(item, v, index) {
+        console.log(v, '22222')
         this.operatingitem = item
         this.datadialogVisible = true
         this.clearorganizeform()
@@ -372,6 +383,11 @@
                 _this.dialogtitle = `编辑组织信息（${v.Fullname}）`
                 _this.organizeform.parentid = v.Parentid
                 _this.organizeform.fullname = v.Fullname
+                if (v.Category == "unit") {
+                  _this.organizeform.category = '1'
+                } else {
+                  _this.organizeform.category = '0'
+                }
                 _this.organizeform.description = v.Description
                 _this.organizeform.id = v.Id
                 // 选中状态
@@ -415,6 +431,7 @@
               })
               return
             }
+            console.log(_this.organizeform, '789')
             if (_this.operatingitem === 1) {
               _this.organizeform.IsInnerOrganize = 1
               _this.$axios.post('organizes/', _this.organizeform)
@@ -516,6 +533,7 @@
           parentid: 0,
           fullname: '',
           description: '',
+          category: '0',
           id: 0
         }
       },

src/dashoo.cn/frontend_web/src/pages/system/permission.vue

@@ -35,7 +35,7 @@
           </el-tree>
         </el-col>
         <el-col :span="18">
-          <el-table :data="tablelist"  size="mini" border>
+          <el-table :data="tablelist" highlight-current-row stripe   size="mini" border>
             <el-table-column label="操作" width="70" align="center" fixed="right">
               <template slot-scope="scope">
                 <template v-if="scope.row.ParentId !== 0">

src/dashoo.cn/frontend_web/src/pages/system/userrole.vue

@@ -29,7 +29,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="list" size="mini" tooltip-effect="dark" border>
+      <el-table :data="list" size="mini" tooltip-effect="dark" border highlight-current-row stripe >
         <el-table-column label="操作" min-width="150px" align="center" fixed="right">
           <template slot-scope="scope">
             <el-button size="small" @click="opendialog(scope.row)" v-if="adminpermission == 1" type="text"

src/dashoo.cn/frontend_web/src/pages/system/users.vue

@@ -51,7 +51,7 @@
          </el-col>
          <el-col :span="18">
            <el-card class="box-card">
-             <el-table :data="list"  size="mini" border>
+             <el-table :data="list"  size="mini" border highlight-current-row stripe >
                <el-table-column label="操作" align="center" fixed="right">
                  <template slot-scope="scope">
                    <el-button size="small" @click="opendatadialog(2,scope.row,scope.$index);" type="text" icon="el-icon-edit"