Explorar o código

企业用户页面查看,角色列表查看权限

huahaiyan %!s(int64=6) %!d(string=hai) anos
pai
achega
639de03cd9

+ 2 - 3
src/dashoo.cn/backend/api/business/role/roleService.go

@@ -23,9 +23,8 @@ func GetRoleService(xormEngine *xorm.Engine) *RoleService {
 func (s *RoleService) GetRoleList(pageIndex, itemsPerPage int64, order, userid string, entitiesPtr *[]userRole.Base_Role, where ...string) (total int64) {
 	var resultsSlice []map[string][]byte
 	var search string = "1=1"
-	rids := s.GetRoleids(userid)
-
-	search = search + " and Id in (" + strings.Join(rids, ",") + ")"
+	//rids := s.GetRoleids(userid)
+	//search = search + " and Id in (" + strings.Join(rids, ",") + ")"
 
 	if len(where) > 0 {
 		search = search + " and " + where[0]

+ 11 - 0
src/dashoo.cn/backend/api/controllers/casbin/role.go

@@ -52,6 +52,17 @@ func (this *RoleController) RoleList() {
 	if searchkey != "" {
 		where = where + " and Realname like '%" + searchkey + "%'"
 	}
+	svrUser := userRole.GetUserService(utils.DBE)
+	rids := svrUser.GetUserRoleIds(this.User.Id)
+	permisvc := permission.GetPermissionService(utils.DBE)
+	if permisvc.IsAdmin(this.User.Id) == false{
+		var roleofrole string
+		for i:=0; i<len(rids); i++ {
+			roleofrole += permisvc.GetManRoleForRole(rids[i])+ ","
+		}
+		roleofrole = strings.Trim(roleofrole, ",")
+		where = where + " and Id in (" + roleofrole + ")"
+	}
 	total := svc.GetRoleList(page.CurrentPage, page.Size, "CreateOn", utils.ToStr(this.User.Id), &roles, where)
 	var datainfo DataInfo
 	datainfo.Items = roles

+ 188 - 160
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -1,155 +1,161 @@
 <template>
   <div>
-    <el-breadcrumb class="heading">
-      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
-    </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 115px);">
-      <div slot="header">
-        <span>
-          <i class="icon icon-table2"></i> 年审申请表
-        </span>
-        <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
-          </el-button>
-        </span>
-        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="年审日期">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-          <!-- <el-form-item label="准入类别">
+    <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
+      <el-breadcrumb class="heading">
+        <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-card class="box-card" style="height: calc(100vh - 115px);">
+        <div slot="header">
+          <span>
+            <i class="icon icon-table2"></i> 年审申请表
+          </span>
+          <span style="float: right;">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
+            </el-button>
+          </span>
+          <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+            <el-form-item label="年审日期">
+              <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+            <!-- <el-form-item label="准入类别">
             <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
               <el-option label="物资类" value="01"></el-option>
               <el-option label="技术服务类" value="03"></el-option>
               <el-option label="基建类" value="02"></el-option>
             </el-select>
           </el-form-item> -->
-          <el-form-item>
-            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
-              查询
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="search">高级查询</el-dropdown-item>
-                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="180" align="center" fixed="right">
-          <template slot-scope="scope">
-            <router-link
-              :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/' + (scope.row.SupplierTypeName === '01' ? 'goodsoperation' : (scope.row.SupplierTypeName === '02' ? 'bassicoperation' : 'operation'))+'?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&Status='+scope.row.Status+'&Step='+scope.row.Step+'&annualId='+scope.row.Id">
-              <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
-            </router-link>
-            <el-dropdown @command="MoreCmdClick">
-              <el-button size="mini" type="primary" plain style="margin-left:5px;">
-                更多<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
-                <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0" divided>
-                  删除数据</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-        </el-table-column>
+            <el-form-item>
+              <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+                查询
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                  <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </el-form-item>
+          </el-form>
+        </div>
+        <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%"
+          @sort-change="orderby">
+          <el-table-column label="操作" min-width="180" align="center" fixed="right">
+            <template slot-scope="scope">
+              <router-link
+                :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/' + (scope.row.SupplierTypeName === '01' ? 'goodsoperation' : (scope.row.SupplierTypeName === '02' ? 'bassicoperation' : 'operation'))+'?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&Status='+scope.row.Status+'&Step='+scope.row.Step+'&annualId='+scope.row.Id">
+                <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
+              </router-link>
+              <el-dropdown @command="MoreCmdClick">
+                <el-button size="mini" type="primary" plain style="margin-left:5px;">
+                  更多<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
+                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0"
+                    divided>
+                    删除数据</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
 
-        <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
+          <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
-        <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
-          show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
+          <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
-        <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
-          <template slot-scope="scope">
-            <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
-            <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
-            <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
-            <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
-            <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
-            <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
-            <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
-            <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
-            <span v-if="scope.row.Status=='5'" style="color:#67C23A">审核通过</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.ApplyTime+'') }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="CreateOn" sortable min-width="130" label="申请日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
-        :total="currentItemCount">
-      </el-pagination>
-    </el-card>
+          <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
+              <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+              <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+              <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+              <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+              <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+              <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
+              <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
+              <span v-if="scope.row.Status=='5'" style="color:#67C23A">审核通过</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ApplyTime+'') }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="CreateOn" sortable min-width="130" label="申请日期" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.CreateOn+'') }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :total="currentItemCount">
+        </el-pagination>
+      </el-card>
 
-    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form ref="searchForm" label-width="110px">
-        <el-row>
+      <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+        <el-form ref="searchForm" label-width="110px">
+          <el-row>
 
-          <el-col :span="12">
-            <el-form-item label="推荐单位编码">
-              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="推荐单位编码">
+                <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="准入证号">
-              <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="准入证号">
+                <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="准入类别">
-              <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="准入类别">
+                <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="企业名称">
-              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog title="年审申请添加" :visible.sync="addshow" width="360px">
-      <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="企业名称" prop="SupplierId" required>
-              <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
-                placeholder="请选择" @change="supplierchange" style="width: 100%">
-                <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
+            <el-col :span="12">
+              <el-form-item label="企业名称">
+                <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+          <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog title="年审申请添加" :visible.sync="addshow" width="360px">
+        <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="企业名称" prop="SupplierId" required>
+                <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
+                  placeholder="请选择" @change="supplierchange" style="width: 100%">
+                  <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="准入类别" prop="SupplierTypeName" required>
               <el-select filterable default-first-option v-model="entityForm.SupplierTypeName" placeholder="请选择"
@@ -161,33 +167,35 @@
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row>
-          <!-- <el-col :span="24">
+          <el-row>
+            <!-- <el-col :span="24">
             <el-form-item label="审批人">
               <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择审批人">
                 <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
               </el-input>
             </el-form-item>
           </el-col> -->
-          <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="addshow = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
-      </span>
-      <br>
-    </el-dialog>
-    <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
-      <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
-    </el-dialog>
-    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
-      :visible="chooseAuditorVisible"></choose-auditor>
+            <el-col :span="24">
+              <el-form-item label="说明">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span style="float: right;margin-top:-10px;">
+          <el-button size="small" @click="addshow = false">取 消</el-button>
+          <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
+        </span>
+        <br>
+      </el-dialog>
+      <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
+        <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+      </el-dialog>
+      <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+        :visible="chooseAuditorVisible"></choose-auditor>
+    </div>
+    <page401 v-if="IsCompanyUser == 1 && suplen == 0"></page401>
   </div>
 </template>
 <script>
@@ -198,11 +206,13 @@
   import supplierapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/annualaudit'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import page401 from '@/components/error/401.vue'
 
   export default {
     components: {
       WfHistory,
-      ChooseAuditor
+      ChooseAuditor,
+      page401
     },
     computed: {
       ...mapGetters({
@@ -313,7 +323,10 @@
             message: '请选择审批人',
             trigger: 'blur'
           }]
-        }
+        },
+        IsCompanyUser: 0,
+        supplierList: [],
+        suplen: 0,
       }
     },
     created() {
@@ -324,6 +337,7 @@
       this.getselectsupplier()
       this.getorgtreelist()
       this.getDictOptions()
+      this.getSupplierList()
     },
     methods: {
       initDatas() {
@@ -348,12 +362,26 @@
         //访问接口
         api.getList(myCreateOn.join(','), 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)
         })
       },
+      getSupplierList() {
+        let _this = this
+        _this.supplierList = []
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '02', {})
+          .then(res => {
+            _this.supplierList = res.data
+            if (_this.supplierList) {
+              _this.suplen = _this.supplierList.length
+            }
+            console.log("this.suplen", this.suplen)
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
       getorgtreelist() {
         let _this = this
         let params = {

+ 187 - 160
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -1,155 +1,161 @@
 <template>
   <div>
-    <el-breadcrumb class="heading">
-      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
-    </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 115px);">
-      <div slot="header">
-        <span>
-          <i class="icon icon-table2"></i> 年审申请表
-        </span>
-        <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
-          </el-button>
-        </span>
-        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="年审日期">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-          <!-- <el-form-item label="准入类别">
+    <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
+      <el-breadcrumb class="heading">
+        <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-card class="box-card" style="height: calc(100vh - 115px);">
+        <div slot="header">
+          <span>
+            <i class="icon icon-table2"></i> 年审申请表
+          </span>
+          <span style="float: right;">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
+            </el-button>
+          </span>
+          <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+            <el-form-item label="年审日期">
+              <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+            <!-- <el-form-item label="准入类别">
             <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
               <el-option label="物资类" value="01"></el-option>
               <el-option label="技术服务类" value="03"></el-option>
               <el-option label="基建类" value="02"></el-option>
             </el-select>
           </el-form-item> -->
-          <el-form-item>
-            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
-              查询
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="search">高级查询</el-dropdown-item>
-                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="180" align="center" fixed="right">
-          <template slot-scope="scope">
-            <router-link
-              :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/' + (scope.row.SupplierTypeName === '01' ? 'goodsoperation' : (scope.row.SupplierTypeName === '02' ? 'bassicoperation' : 'operation'))+'?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&Status='+scope.row.Status+'&Step='+scope.row.Step+'&annualId='+scope.row.Id">
-              <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
-            </router-link>
-            <el-dropdown @command="MoreCmdClick">
-              <el-button size="mini" type="primary" plain style="margin-left:5px;">
-                更多<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
-                <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0" divided>
-                  删除数据</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-        </el-table-column>
+            <el-form-item>
+              <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+                查询
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                  <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </el-form-item>
+          </el-form>
+        </div>
+        <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%"
+          @sort-change="orderby">
+          <el-table-column label="操作" min-width="180" align="center" fixed="right">
+            <template slot-scope="scope">
+              <router-link
+                :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/' + (scope.row.SupplierTypeName === '01' ? 'goodsoperation' : (scope.row.SupplierTypeName === '02' ? 'bassicoperation' : 'operation'))+'?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&Status='+scope.row.Status+'&Step='+scope.row.Step+'&annualId='+scope.row.Id">
+                <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
+              </router-link>
+              <el-dropdown @command="MoreCmdClick">
+                <el-button size="mini" type="primary" plain style="margin-left:5px;">
+                  更多<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
+                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0"
+                    divided>
+                    删除数据</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
 
-        <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
+          <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
-        <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
-          show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
+          <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
-        <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
-          <template slot-scope="scope">
-            <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
-            <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
-            <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
-            <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
-            <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
-            <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
-            <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
-            <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
-            <span v-if="scope.row.Status=='5'" style="color:#67C23A">审核通过</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.ApplyTime+'') }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="CreateOn" sortable min-width="130" label="申请日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
-        :total="currentItemCount">
-      </el-pagination>
-    </el-card>
+          <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
+              <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+              <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+              <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+              <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+              <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+              <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
+              <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
+              <span v-if="scope.row.Status=='5'" style="color:#67C23A">审核通过</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ApplyTime+'') }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="CreateOn" sortable min-width="130" label="申请日期" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.CreateOn+'') }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :total="currentItemCount">
+        </el-pagination>
+      </el-card>
 
-    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form ref="searchForm" label-width="110px">
-        <el-row>
+      <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+        <el-form ref="searchForm" label-width="110px">
+          <el-row>
 
-          <el-col :span="12">
-            <el-form-item label="推荐单位编码">
-              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="推荐单位编码">
+                <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="准入证号">
-              <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="准入证号">
+                <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="准入类别">
-              <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="准入类别">
+                <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="企业名称">
-              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog title="年审申请添加" :visible.sync="addshow" width="360px">
-      <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="企业名称" prop="SupplierId" required>
-              <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
-                placeholder="请选择" @change="supplierchange" style="width: 100%">
-                <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
+            <el-col :span="12">
+              <el-form-item label="企业名称">
+                <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+          <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog title="年审申请添加" :visible.sync="addshow" width="360px">
+        <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="企业名称" prop="SupplierId" required>
+                <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
+                  placeholder="请选择" @change="supplierchange" style="width: 100%">
+                  <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="准入类别" prop="SupplierTypeName" required>
               <el-select filterable default-first-option v-model="entityForm.SupplierTypeName" placeholder="请选择"
@@ -161,33 +167,35 @@
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row>
-          <!-- <el-col :span="24">
+          <el-row>
+            <!-- <el-col :span="24">
             <el-form-item label="审批人">
               <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择审批人">
                 <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
               </el-input>
             </el-form-item>
           </el-col> -->
-          <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="addshow = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
-      </span>
-      <br>
-    </el-dialog>
-    <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
-      <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
-    </el-dialog>
-    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
-      :visible="chooseAuditorVisible"></choose-auditor>
+            <el-col :span="24">
+              <el-form-item label="说明">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span style="float: right;margin-top:-10px;">
+          <el-button size="small" @click="addshow = false">取 消</el-button>
+          <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
+        </span>
+        <br>
+      </el-dialog>
+      <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
+        <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+      </el-dialog>
+      <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+        :visible="chooseAuditorVisible"></choose-auditor>
+    </div>
+    <page401 v-if="IsCompanyUser == 1 && suplen == 0"></page401>
   </div>
 </template>
 <script>
@@ -198,11 +206,13 @@
   import supplierapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/annualaudit'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import page401 from '@/components/error/401.vue'
 
   export default {
     components: {
       WfHistory,
-      ChooseAuditor
+      ChooseAuditor,
+      page401
     },
     computed: {
       ...mapGetters({
@@ -313,7 +323,10 @@
             message: '请选择审批人',
             trigger: 'blur'
           }]
-        }
+        },
+        IsCompanyUser: 0,
+        supplierList: [],
+        suplen: 0,
       }
     },
     created() {
@@ -324,6 +337,7 @@
       this.getselectsupplier()
       this.getorgtreelist()
       this.getDictOptions()
+      this.getSupplierList()
     },
     methods: {
       initDatas() {
@@ -348,12 +362,25 @@
         //访问接口
         api.getList(myCreateOn.join(','), 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)
         })
       },
+      getSupplierList() {
+        let _this = this
+        _this.supplierList = []
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '01', {})
+          .then(res => {
+            _this.supplierList = res.data
+            if (_this.supplierList) {
+              _this.suplen = _this.supplierList.length
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
       getorgtreelist() {
         let _this = this
         let params = {

+ 204 - 174
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -1,193 +1,202 @@
 <template>
   <div>
-    <el-breadcrumb class="heading">
-      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
-    </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 115px);">
-      <div slot="header">
-        <span>
-          <i class="icon icon-table2"></i> 年审申请表
-        </span>
-        <!-- <span style="float: right;">
+    <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
+      <el-breadcrumb class="heading">
+        <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-card class="box-card" style="height: calc(100vh - 115px);">
+        <div slot="header">
+          <span>
+            <i class="icon icon-table2"></i> 年审申请表
+          </span>
+          <!-- <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
           </el-button>
         </span> -->
-        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="年审日期">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="准入类别">
-            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
-              <el-option label="物资类" value="01"></el-option>
-              <el-option label="技术服务类" value="03"></el-option>
-              <el-option label="基建类" value="02"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
-              查询
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="search">高级查询</el-dropdown-item>
-                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="180" align="center" fixed="right">
-          <template slot-scope="scope">
-            <router-link
-              :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/' + (scope.row.SupplierTypeName === '01' ? 'goodsoperation' : (scope.row.SupplierTypeName === '02' ? 'bassicoperation' : 'operation'))+'?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&Status='+scope.row.Status+'&Step='+scope.row.Step+'&annualId='+scope.row.Id">
-              <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
-            </router-link>
-            <el-dropdown @command="MoreCmdClick">
-              <el-button size="mini" type="primary" plain style="margin-left:5px;">
-                更多<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
-                <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0" divided>
-                  删除数据</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
-          show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column> -->
-        <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
-          <template slot-scope="scope">
-            <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
-            <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
-            <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
-            <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
-            <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
-            <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
-            <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
-            <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
-            <span v-if="scope.row.Status=='5'" style="color:#67C23A">审核通过</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.ApplyTime+'') }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="CreateOn" sortable min-width="130" label="申请日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
-        :total="currentItemCount">
-      </el-pagination>
-    </el-card>
-
-    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form ref="searchForm" label-width="110px">
-        <el-row>
-
-          <el-col :span="12">
-            <el-form-item label="推荐单位编码">
-              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+          <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+            <el-form-item label="年审日期">
+              <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="准入证号">
-              <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
             <el-form-item label="准入类别">
-              <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="企业名称">
-              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog title="年审申请添加" :visible.sync="addshow" width="360px">
-      <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="企业名称" prop="SupplierId" required>
-              <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
-                placeholder="请选择" @change="supplierchange" style="width: 100%">
-                <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="准入类别" prop="SupplierTypeName" required>
-              <el-select filterable default-first-option v-model="entityForm.SupplierTypeName" placeholder="请选择"
-                style="width: 100%">
+              <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
                 <el-option label="物资类" value="01"></el-option>
                 <el-option label="技术服务类" value="03"></el-option>
                 <el-option label="基建类" value="02"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <!-- <el-col :span="24">
+            <el-form-item>
+              <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+                查询
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                  <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </el-form-item>
+          </el-form>
+        </div>
+        <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%"
+          @sort-change="orderby">
+          <el-table-column label="操作" min-width="180" align="center" fixed="right">
+            <template slot-scope="scope">
+              <router-link
+                :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/' + (scope.row.SupplierTypeName === '01' ? 'goodsoperation' : (scope.row.SupplierTypeName === '02' ? 'bassicoperation' : 'operation'))+'?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&Status='+scope.row.Status+'&Step='+scope.row.Step+'&annualId='+scope.row.Id">
+                <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
+              </router-link>
+              <el-dropdown @command="MoreCmdClick">
+                <el-button size="mini" type="primary" plain style="margin-left:5px;">
+                  更多<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
+                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0"
+                    divided>
+                    删除数据</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column> -->
+          <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
+              <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+              <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+              <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+              <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+              <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+              <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
+              <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
+              <span v-if="scope.row.Status=='5'" style="color:#67C23A">审核通过</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ApplyTime+'') }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="CreateOn" sortable min-width="130" label="申请日期" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.CreateOn+'') }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :total="currentItemCount">
+        </el-pagination>
+      </el-card>
+
+      <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+        <el-form ref="searchForm" label-width="110px">
+          <el-row>
+
+            <el-col :span="12">
+              <el-form-item label="推荐单位编码">
+                <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="准入证号">
+                <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="准入类别">
+                <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="企业名称">
+                <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+          <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog title="年审申请添加" :visible.sync="addshow" width="360px">
+        <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="企业名称" prop="SupplierId" required>
+                <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
+                  placeholder="请选择" @change="supplierchange" style="width: 100%">
+                  <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="准入类别" prop="SupplierTypeName" required>
+                <el-select filterable default-first-option v-model="entityForm.SupplierTypeName" placeholder="请选择"
+                  style="width: 100%">
+                  <el-option label="物资类" value="01"></el-option>
+                  <el-option label="技术服务类" value="03"></el-option>
+                  <el-option label="基建类" value="02"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <!-- <el-col :span="24">
             <el-form-item label="审批人">
               <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择审批人">
                 <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
               </el-input>
             </el-form-item>
           </el-col> -->
-          <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="addshow = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
-      </span>
-      <br>
-    </el-dialog>
-    <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
-      <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
-    </el-dialog>
-    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
-      :visible="chooseAuditorVisible"></choose-auditor>
+            <el-col :span="24">
+              <el-form-item label="说明">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span style="float: right;margin-top:-10px;">
+          <el-button size="small" @click="addshow = false">取 消</el-button>
+          <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
+        </span>
+        <br>
+      </el-dialog>
+      <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
+        <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+      </el-dialog>
+      <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+        :visible="chooseAuditorVisible"></choose-auditor>
+    </div>
+    <page401 v-if="IsCompanyUser == 1 && suplen == 0"></page401>
   </div>
 </template>
 <script>
@@ -198,11 +207,13 @@
   import supplierapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/annualaudit'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import page401 from '@/components/error/401.vue'
 
   export default {
     components: {
       WfHistory,
-      ChooseAuditor
+      ChooseAuditor,
+      page401
     },
     computed: {
       ...mapGetters({
@@ -313,10 +324,14 @@
             message: '请选择审批人',
             trigger: 'blur'
           }]
-        }
+        },
+        IsCompanyUser: 0,
+        supplierList: [],
+        suplen: 0,
       }
     },
     created() {
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
       //查询列表
@@ -324,6 +339,7 @@
       this.getselectsupplier()
       this.getorgtreelist()
       this.getDictOptions()
+      this.getSupplierList()
     },
     methods: {
       initDatas() {
@@ -354,6 +370,20 @@
           console.error(err)
         })
       },
+      getSupplierList() {
+        let _this = this
+        _this.supplierList = []
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '02', {})
+          .then(res => {
+            _this.supplierList = res.data
+            if (_this.supplierList) {
+              _this.suplen = _this.supplierList.length
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
       getorgtreelist() {
         let _this = this
         let params = {

+ 187 - 160
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -1,155 +1,161 @@
 <template>
   <div>
-    <el-breadcrumb class="heading">
-      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
-    </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 115px);">
-      <div slot="header">
-        <span>
-          <i class="icon icon-table2"></i> 年审申请表
-        </span>
-        <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
-          </el-button>
-        </span>
-        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="年审日期">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-          <!-- <el-form-item label="准入类别">
+    <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
+      <el-breadcrumb class="heading">
+        <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-card class="box-card" style="height: calc(100vh - 115px);">
+        <div slot="header">
+          <span>
+            <i class="icon icon-table2"></i> 年审申请表
+          </span>
+          <span style="float: right;">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
+            </el-button>
+          </span>
+          <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+            <el-form-item label="年审日期">
+              <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+            <!-- <el-form-item label="准入类别">
             <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
               <el-option label="物资类" value="01"></el-option>
               <el-option label="技术服务类" value="03"></el-option>
               <el-option label="基建类" value="02"></el-option>
             </el-select>
           </el-form-item> -->
-          <el-form-item>
-            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
-              查询
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="search">高级查询</el-dropdown-item>
-                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="180" align="center" fixed="right">
-          <template slot-scope="scope">
-            <router-link
-              :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/' + (scope.row.SupplierTypeName === '01' ? 'goodsoperation' : (scope.row.SupplierTypeName === '02' ? 'bassicoperation' : 'operation'))+'?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&Status='+scope.row.Status+'&Step='+scope.row.Step+'&annualId='+scope.row.Id">
-              <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
-            </router-link>
-            <el-dropdown @command="MoreCmdClick">
-              <el-button size="mini" type="primary" plain style="margin-left:5px;">
-                更多<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
-                <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0" divided>
-                  删除数据</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-        </el-table-column>
+            <el-form-item>
+              <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+                查询
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                  <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </el-form-item>
+          </el-form>
+        </div>
+        <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%"
+          @sort-change="orderby">
+          <el-table-column label="操作" min-width="180" align="center" fixed="right">
+            <template slot-scope="scope">
+              <router-link
+                :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/' + (scope.row.SupplierTypeName === '01' ? 'goodsoperation' : (scope.row.SupplierTypeName === '02' ? 'bassicoperation' : 'operation'))+'?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&Status='+scope.row.Status+'&Step='+scope.row.Step+'&annualId='+scope.row.Id">
+                <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
+              </router-link>
+              <el-dropdown @command="MoreCmdClick">
+                <el-button size="mini" type="primary" plain style="margin-left:5px;">
+                  更多<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
+                  <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0"
+                    divided>
+                    删除数据</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
 
-        <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
+          <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
-        <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
-          show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
+          <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
-        <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
-          <template slot-scope="scope">
-            <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
-            <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
-            <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
-            <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
-            <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
-            <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
-            <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
-            <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
-            <span v-if="scope.row.Status=='5'" style="color:#67C23A">审核通过</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.ApplyTime+'') }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="CreateOn" sortable min-width="130" label="申请日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
-        :total="currentItemCount">
-      </el-pagination>
-    </el-card>
+          <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
+              <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+              <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+              <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+              <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+              <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+              <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
+              <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
+              <span v-if="scope.row.Status=='5'" style="color:#67C23A">审核通过</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ApplyTime+'') }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="CreateOn" sortable min-width="130" label="申请日期" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.CreateOn+'') }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :total="currentItemCount">
+        </el-pagination>
+      </el-card>
 
-    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form ref="searchForm" label-width="110px">
-        <el-row>
+      <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+        <el-form ref="searchForm" label-width="110px">
+          <el-row>
 
-          <el-col :span="12">
-            <el-form-item label="推荐单位编码">
-              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="推荐单位编码">
+                <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="准入证号">
-              <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="准入证号">
+                <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="准入类别">
-              <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="准入类别">
+                <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="企业名称">
-              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog title="年审申请添加" :visible.sync="addshow" width="360px">
-      <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="企业名称" prop="SupplierId" required>
-              <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
-                placeholder="请选择" @change="supplierchange" style="width: 100%">
-                <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
+            <el-col :span="12">
+              <el-form-item label="企业名称">
+                <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+          <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog title="年审申请添加" :visible.sync="addshow" width="360px">
+        <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="企业名称" prop="SupplierId" required>
+                <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
+                  placeholder="请选择" @change="supplierchange" style="width: 100%">
+                  <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="准入类别" prop="SupplierTypeName" required>
               <el-select filterable default-first-option v-model="entityForm.SupplierTypeName" placeholder="请选择"
@@ -161,33 +167,35 @@
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row>
-          <!-- <el-col :span="24">
+          <el-row>
+            <!-- <el-col :span="24">
             <el-form-item label="审批人">
               <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择审批人">
                 <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
               </el-input>
             </el-form-item>
           </el-col> -->
-          <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="addshow = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
-      </span>
-      <br>
-    </el-dialog>
-    <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
-      <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
-    </el-dialog>
-    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
-      :visible="chooseAuditorVisible"></choose-auditor>
+            <el-col :span="24">
+              <el-form-item label="说明">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span style="float: right;margin-top:-10px;">
+          <el-button size="small" @click="addshow = false">取 消</el-button>
+          <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
+        </span>
+        <br>
+      </el-dialog>
+      <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
+        <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+      </el-dialog>
+      <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+        :visible="chooseAuditorVisible"></choose-auditor>
+    </div>
+    <page401 v-if="IsCompanyUser == 1 && suplen == 0"></page401>
   </div>
 </template>
 <script>
@@ -198,11 +206,13 @@
   import supplierapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/annualaudit'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import page401 from '@/components/error/401.vue'
 
   export default {
     components: {
       WfHistory,
-      ChooseAuditor
+      ChooseAuditor,
+      page401
     },
     computed: {
       ...mapGetters({
@@ -313,7 +323,10 @@
             message: '请选择审批人',
             trigger: 'blur'
           }]
-        }
+        },
+        IsCompanyUser: 0,
+        supplierList: [],
+        suplen: 0,
       }
     },
     created() {
@@ -324,6 +337,7 @@
       this.getselectsupplier()
       this.getorgtreelist()
       this.getDictOptions()
+      this.getSupplierList()
     },
     methods: {
       initDatas() {
@@ -348,12 +362,25 @@
         //访问接口
         api.getList(myCreateOn.join(','), 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)
         })
       },
+      getSupplierList() {
+        let _this = this
+        _this.supplierList = []
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '03', {})
+          .then(res => {
+            _this.supplierList = res.data
+            if (_this.supplierList) {
+              _this.suplen = _this.supplierList.length
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
       getorgtreelist() {
         let _this = this
         let params = {

+ 166 - 139
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/index.vue

@@ -1,155 +1,161 @@
 <template>
   <div>
-    <el-breadcrumb class="heading">
-      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/infochange' }">企业信息表</el-breadcrumb-item>
-    </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 115px);">
-      <div slot="header">
-        <span>
-          <i class="icon icon-table2"></i> 企业信息表
-        </span>
-        <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addinfochange">添加变更
-          </el-button>
-        </span>
-        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="年审日期">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="准入类别">
-            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
-              <el-option label="物资类" value="01"></el-option>
-              <el-option label="技术服务类" value="03"></el-option>
-              <el-option label="基建类" value="02"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
-              查询
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="search">高级查询</el-dropdown-item>
-                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="90" align="center" fixed="right">
-          <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/infochangech/' + scope.row.Id + '/operation?InfoStatus='+ scope.row.Status +'&infoId='+scope.row.InfoId">
-              <el-button type="primary" plain title="信息变更" size="mini">变更</el-button>
-            </router-link>
-          </template>
-        </el-table-column>
+    <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
+      <el-breadcrumb class="heading">
+        <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/oilsupplier/infochange' }">企业信息表</el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-card class="box-card" style="height: calc(100vh - 115px);">
+        <div slot="header">
+          <span>
+            <i class="icon icon-table2"></i> 企业信息表
+          </span>
+          <span style="float: right;">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addinfochange">
+              添加变更
+            </el-button>
+          </span>
+          <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+            <el-form-item label="年审日期">
+              <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="准入类别">
+              <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
+                <el-option label="物资类" value="01"></el-option>
+                <el-option label="技术服务类" value="03"></el-option>
+                <el-option label="基建类" value="02"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+                查询
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                  <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </el-form-item>
+          </el-form>
+        </div>
+        <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%"
+          @sort-change="orderby">
+          <el-table-column label="操作" min-width="90" align="center" fixed="right">
+            <template slot-scope="scope">
+              <router-link
+                :to="'/oilsupplier/infochangech/' + scope.row.Id + '/operation?InfoStatus='+ scope.row.Status +'&infoId='+scope.row.InfoId">
+                <el-button type="primary" plain title="信息变更" size="mini">变更</el-button>
+              </router-link>
+            </template>
+          </el-table-column>
 
-        <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"
-          :label="column.label" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
-          <template slot-scope="scope">
-            <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
-            <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
-            <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
-            <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
-            <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待法规处审核</span>
-            <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">审核未通过</span>
-            <span v-if="scope.row.Status=='4'" style="color:#67C23A">审核通过</span>
-          </template> 
-        </el-table-column>
-        <el-table-column prop="ConmmitTime" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.ConmmitTime+'') }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
-        :total="currentItemCount">
-      </el-pagination>
-    </el-card>
+          <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"
+            :label="column.label" align="center" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+              <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+              <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+              <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+              <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待法规处审核</span>
+              <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">审核未通过</span>
+              <span v-if="scope.row.Status=='4'" style="color:#67C23A">审核通过</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ConmmitTime" sortable min-width="100" label="申请日期" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ConmmitTime+'') }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :total="currentItemCount">
+        </el-pagination>
+      </el-card>
 
-    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form ref="searchForm" label-width="110px">
-        <el-row>
+      <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+        <el-form ref="searchForm" label-width="110px">
+          <el-row>
 
-          <!-- <el-col :span="12">
+            <!-- <el-col :span="12">
             <el-form-item label="生成时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                 start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col> -->
-          <!-- 
+            <!-- 
           <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col> -->
 
-          <el-col :span="12">
-            <el-form-item label="推荐单位编码">
-              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="推荐单位编码">
+                <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="准入证号">
-              <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="准入证号">
+                <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="准入类别">
-              <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="准入类别">
+                <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="企业名称">
-              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-         
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
-      </span>
-    </el-dialog>
-     <el-dialog title="信息变更添加" :visible.sync="addshow" width="360px">
-      <el-form label-width="90px" :model="entityForm" ref="EntityFormref">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="企业名称" prop="SupplierId" required>
-              <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
-                placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="addshow = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="addInfoChange()">确 定</el-button>
-      </span>
-      <br>
-    </el-dialog>
-   
+            <el-col :span="12">
+              <el-form-item label="企业名称">
+                <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+          <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog title="信息变更添加" :visible.sync="addshow" width="360px">
+        <el-form label-width="90px" :model="entityForm" ref="EntityFormref">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="企业名称" prop="SupplierId" required>
+                <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
+                  placeholder="请选择" style="width: 100%">
+                  <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="说明">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span style="float: right;margin-top:-10px;">
+          <el-button size="small" @click="addshow = false">取 消</el-button>
+          <el-button type="primary" size="small" @click="addInfoChange()">确 定</el-button>
+        </span>
+        <br>
+      </el-dialog>
+    </div>
+    <page401 v-if="IsCompanyUser == 1 && suplen == 0"></page401>
   </div>
 </template>
 <script>
@@ -159,8 +165,12 @@
   import supplierapi from '@/api/oilsupplier/supplier';
   import api from '@/api/oilsupplier/infochange';
   import annapi from '@/api/oilsupplier/annualaudit'
+  import page401 from '@/components/error/401.vue'
 
   export default {
+    components: {
+      page401
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -172,7 +182,7 @@
       return {
         addshow: false,
         dialogVisible: false,
-        delevisble:false,
+        delevisble: false,
         //列表数据
         selectsupplierlist: [],
         entityList: [],
@@ -255,7 +265,7 @@
           //   sort: true
           // },
 
-          
+
           // {
           //   prop: "MgrUnit",
           //   label: '管理单位',
@@ -298,15 +308,20 @@
           },
 
         ],
+        IsCompanyUser: 0,
+        supplierList: [],
+        suplen: 0,
       }
     },
     created() {
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
       //查询列表
       this.initDatas()
       this.getselectsupplier()
       //this.getDictOptions()
+      this.getSupplierList()
     },
     methods: {
       initDatas() {
@@ -331,15 +346,27 @@
         //访问接口
         api.getSuppList(myCreateOn.join(','), 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)
         })
       },
+      getSupplierList() {
+        let _this = this
+        _this.supplierList = []
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '02', {})
+          .then(res => {
+            _this.supplierList = res.data
+            if (_this.supplierList) {
+              _this.suplen = _this.supplierList.length
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
       getselectsupplier() {
         api.getAddSupList(this.$axios).then(res => {
-          console.log("-------res",res.data)
           if (res.data.items.length != 0) {
             for (var i = 0; i < res.data.items.length; i++) {
               this.selectsupplierlist.push({
@@ -358,7 +385,7 @@
       addInfoChange() {
         this.$refs['EntityFormref'].validate((valid) => {
           if (valid) {
-            console.log("---this.entityForm--",this.entityForm)
+            console.log("---this.entityForm--", this.entityForm)
             this.entityForm.SupplierId = this.entityForm.SupplierId + ""
             api.addInfoChMain(this.entityForm, this.$axios).then(res => {
               if (res.data.code === 0) {
@@ -383,7 +410,7 @@
             });
           }
         })
-        
+
       },
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {

+ 167 - 136
src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/index.vue

@@ -1,144 +1,154 @@
 <template>
   <div>
-    <el-breadcrumb class="heading">
-      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/qualchange' }">企业资质表</el-breadcrumb-item>
-    </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 115px);">
-      <div slot="header">
-        <span>
-          <i class="icon icon-table2"></i> 企业资质表
-        </span>
-        <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addqualchange">添加变更
-          </el-button>
-        </span>
-        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="年审日期">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="准入类别">
-            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
-              <el-option label="物资类" value="01"></el-option>
-              <el-option label="技术服务类" value="03"></el-option>
-              <el-option label="基建类" value="02"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
-              查询
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="search">高级查询</el-dropdown-item>
-                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="90" align="center" fixed="right">
-          <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/qualchange/' + scope.row.Id + '/operation?certid=' + scope.row.CertId +'&classId='+ scope.row.SupplierTypeCode +'&QualStatus='+scope.row.Status+'&QualId='+scope.row.QualId">
-              <el-button type="primary" plain title="资质变更" size="mini">资质变更</el-button>
-            </router-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="SupplierName" label="企业名称" sortable min-width="110" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="CommercialNo" label="工商注册号" sortable min-width="110" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
-          <template slot-scope="scope">
-            <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
-            <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
-            <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
-            <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
-            <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待法规处审核</span>
-            <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">审核未通过</span>
-            <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="ConmmitTime" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.ConmmitTime+'') }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
-        :total="currentItemCount">
-      </el-pagination>
-    </el-card>
+    <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
+      <el-breadcrumb class="heading">
+        <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/oilsupplier/qualchange' }">企业资质表</el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-card class="box-card" style="height: calc(100vh - 115px);">
+        <div slot="header">
+          <span>
+            <i class="icon icon-table2"></i> 企业资质表
+          </span>
+          <span style="float: right;">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addqualchange">
+              添加变更
+            </el-button>
+          </span>
+          <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+            <el-form-item label="年审日期">
+              <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="准入类别">
+              <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
+                <el-option label="物资类" value="01"></el-option>
+                <el-option label="技术服务类" value="03"></el-option>
+                <el-option label="基建类" value="02"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+                查询
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                  <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </el-form-item>
+          </el-form>
+        </div>
+        <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%"
+          @sort-change="orderby">
+          <el-table-column label="操作" min-width="90" align="center" fixed="right">
+            <template slot-scope="scope">
+              <router-link
+                :to="'/oilsupplier/qualchange/' + scope.row.Id + '/operation?certid=' + scope.row.CertId +'&classId='+ scope.row.SupplierTypeCode +'&QualStatus='+scope.row.Status+'&QualId='+scope.row.QualId">
+                <el-button type="primary" plain title="资质变更" size="mini">资质变更</el-button>
+              </router-link>
+            </template>
+          </el-table-column>
+          <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="SupplierName" label="企业名称" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="CommercialNo" label="工商注册号" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+              <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+              <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+              <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+              <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待法规处审核</span>
+              <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">审核未通过</span>
+              <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ConmmitTime" sortable min-width="100" label="申请日期" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ConmmitTime+'') }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :total="currentItemCount">
+        </el-pagination>
+      </el-card>
 
-    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form ref="searchForm" label-width="110px">
-        <el-row>
+      <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+        <el-form ref="searchForm" label-width="110px">
+          <el-row>
 
 
-          <el-col :span="12">
-            <el-form-item label="推荐单位编码">
-              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="推荐单位编码">
+                <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="准入证号">
-              <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="准入证号">
+                <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="准入类别">
-              <el-input size="mini" v-model="searchForm.SupplierTypeCode" style="width:100%" placeholder="请输入">
-              </el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="准入类别">
+                <el-input size="mini" v-model="searchForm.SupplierTypeCode" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="企业名称">
-              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+            <el-col :span="12">
+              <el-form-item label="企业名称">
+                <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
 
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
-      </span>
-    </el-dialog>
-     <el-dialog title="资质变更添加" :visible.sync="addshow" width="360px">
-      <el-form label-width="90px" :model="entityForm" ref="EntityFormref">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="企业名称" prop="SupplierId" required>
-              <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
-                placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="addshow = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="addQualChange()">确 定</el-button>
-      </span>
-      <br>
-    </el-dialog>
+          </el-row>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+          <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog title="资质变更添加" :visible.sync="addshow" width="360px">
+        <el-form label-width="90px" :model="entityForm" ref="EntityFormref">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="企业名称" prop="SupplierId" required>
+                <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
+                  placeholder="请选择" style="width: 100%">
+                  <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="说明">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span style="float: right;margin-top:-10px;">
+          <el-button size="small" @click="addshow = false">取 消</el-button>
+          <el-button type="primary" size="small" @click="addQualChange()">确 定</el-button>
+        </span>
+        <br>
+      </el-dialog>
+    </div>
+    <page401 v-if="IsCompanyUser == 1 && suplen == 0"></page401>
   </div>
 </template>
 <script>
@@ -149,8 +159,12 @@
   import supplierapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/annualaudit'
   import qualapi from '@/api/oilsupplier/qualchange'
+  import page401 from '@/components/error/401.vue'
 
   export default {
+    components: {
+      page401
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -218,15 +232,20 @@
           ModifiedBy: '',
 
         },
+        IsCompanyUser: 0,
+        supplierList: [],
+        suplen: 0,
       }
     },
     created() {
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
       //查询列表
       this.initDatas()
       this.getselectsupplier()
       //this.getDictOptions()
+      this.getSupplierList()
     },
     methods: {
       initDatas() {
@@ -252,17 +271,29 @@
         this.$axios.get('qualchange/list?CreateOn=' + myCreateOn.join(','), {
           params
         }).then(res => {
-          console.log("----res.data---", res.data)
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
         })
       },
+      getSupplierList() {
+        let _this = this
+        _this.supplierList = []
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '02', {})
+          .then(res => {
+            _this.supplierList = res.data
+            if (_this.supplierList) {
+              _this.suplen = _this.supplierList.length
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
 
       getselectsupplier() {
         infoapi.getAddSupList(this.$axios).then(res => {
-          console.log("-------res",res.data)
           if (res.data.items.length != 0) {
             for (var i = 0; i < res.data.items.length; i++) {
               this.selectsupplierlist.push({
@@ -283,7 +314,7 @@
       addQualChange() {
         this.$refs['EntityFormref'].validate((valid) => {
           if (valid) {
-            console.log("---this.entityForm--",this.entityForm)
+            console.log("---this.entityForm--", this.entityForm)
             this.entityForm.SupplierId = this.entityForm.SupplierId + ""
             qualapi.addQualChMain(this.entityForm, this.$axios).then(res => {
               if (res.data.code === 0) {
@@ -308,7 +339,7 @@
             });
           }
         })
-        
+
       },
 
       getDictOptions() {

+ 3 - 2
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -272,7 +272,6 @@
         //访问接口
         api.getList(myCreateOn.join(','), 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)
@@ -285,7 +284,9 @@
         _this.$axios.get('/suppliercertappend/getsupplier/' + '02', {})
           .then(res => {
             _this.supplierList = res.data
-            _this.suplen = _this.supplierList.length
+            if (_this.supplierList) {
+              _this.suplen = _this.supplierList.length
+            }
           })
           .catch(err => {
             console.error(err)

+ 3 - 2
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -272,7 +272,6 @@
         //访问接口
         api.getList(myCreateOn.join(','), 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)
@@ -285,7 +284,9 @@
         _this.$axios.get('/suppliercertappend/getsupplier/' + '01', {})
           .then(res => {
             _this.supplierList = res.data
-            _this.suplen = _this.supplierList.length
+            if (_this.supplierList) {
+              _this.suplen = _this.supplierList.length
+            }
           })
           .catch(err => {
             console.error(err)

+ 3 - 2
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -273,7 +273,6 @@
         //访问接口
         api.getList(myCreateOn.join(','), 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)
@@ -286,7 +285,9 @@
         _this.$axios.get('/suppliercertappend/getsupplier/' + '03', {})
           .then(res => {
             _this.supplierList = res.data
-            _this.suplen = _this.supplierList.length
+            if (_this.supplierList) {
+              _this.suplen = _this.supplierList.length
+            }
           })
           .catch(err => {
             console.error(err)