Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/utils/route.js

@@ -7,11 +7,36 @@ const getChildrenRoutes = (routes) => {
   const result = [];
   const { deptBizType, deptLevel } = getItem('deptId')[0]
   const roleList = getItem('roleList') ? getItem('roleList').filter(item => item.roleCode == 'JS_666666').length > 0 : false
+  const xjLsit = getItem('roleList') ? getItem('roleList').filter(item => item.roleCode == 'JS_999999').length > 0 : false
+  console.log(roleList, xjLsit);
+
   routes.forEach((route) => {
     if (route.children && route.children.length > 0) {
-      if (deptBizType == '23' && roleList) {
+      if (deptBizType == '23') {
-        // 在这个条件分支中也需要过滤掉/internalAuditor路由
+
-        result.push(...route.children);
+        if (roleList) {
+          result.push(...route.children);
+        } else if (xjLsit) {
+          if (route.path == '/JudgmentHome') {
+            route.children.splice(route.children.findIndex(item => item.path == '/internalAuditor'), 1)
+            result.push(...route.children);
+          } else {
+            result.push(...route.children);
+          }
+        } else {
+          if (route.path == '/HumanIntelligence') {
+            route.children.splice(route.children.findIndex(item => item.path == '/auditList'), 1)
+            result.push(...route.children);
+          } else {
+            result.push(...route.children);
+          }
+          if (route.path == '/JudgmentHome') {
+            route.children.splice(route.children.findIndex(item => item.path == '/internalAuditor'), 1)
+            result.push(...route.children);
+          } else {
+            result.push(...route.children);
+          }
+        }
       } else {
         if (route.path == '/HumanIntelligence') {
           route.children.splice(route.children.findIndex(item => item.path == '/auditList'), 1)
@@ -19,7 +44,6 @@ const getChildrenRoutes = (routes) => {
         } else {
           result.push(...route.children);
         }
-
         if (route.path == '/JudgmentHome') {
           route.children.splice(route.children.findIndex(item => item.path == '/internalAuditor'), 1)
           result.push(...route.children);
@@ -27,6 +51,23 @@ const getChildrenRoutes = (routes) => {
           result.push(...route.children);
         }
       }
+
+
+
+
+      // if (deptBizType == '23' && (roleList || xjLsit)) {
+      //   // 在这个条件分支中也需要过滤掉/internalAuditor路由
+      //   result.push(...route.children);
+      // } else {
+
+
+      //   if (route.path == '/JudgmentHome' && xjLsit) {
+      //     route.children.splice(route.children.findIndex(item => item.path == '/internalAuditor'), 1)
+      //     result.push(...route.children);
+      //   } else {
+      //     result.push(...route.children);
+      //   }
+      // }
     }
   });
   return result;

src/views/backOfficeSystem/HumanIntelligence/infoCollection/infomation.vue

@@ -58,28 +58,32 @@
             :disabled="butcontroll('04', row.lczt)">回退</el-link>
         </template>
         <!-- 操作 -->
-            <!-- "市情指挥人员": ["采纳", "回退", "分组", "转线索", "转合成", "转会商", "打标签", "修改", "详情", "关注部门", "送审"], -->
+        <!-- "市情指挥人员": ["采纳", "回退", "分组", "转线索", "转合成", "转会商", "打标签", "修改", "详情", "关注部门", "送审"], -->
-         <!-- "县情指人员": ["上报", "回退", "修改", "详情", "送审"], -->
+        <!-- "县情指人员": ["上报", "回退", "修改", "详情", "送审"], -->
-            <template #controls="{ row }">
+        <template #controls="{ row }">
-             <el-link v-if="isShowBtn('送审', row) && qxkz.deptLevel == '01'" :disabled="row.sldshzt != '00'||row.lczt != '04'" size="small"
+          <el-link v-if="isShowBtn('送审', row) && qxkz.deptLevel == '01'"
-            type="primary" @click="postXxcjXxcjTjsh(row)">送审</el-link>
+            :disabled="row.sldshzt != '00' || row.lczt != '04'" size="small" type="primary"
-          <el-link v-if="isShowBtn('送审', row) && qxkz.deptLevel == '02'" :disabled="row.xldshzt != '00'||row.lczt != '04'" size="small"
+            @click="postXxcjXxcjTjsh(row)">送审</el-link>
-            type="primary" @click="postXxcjXxcjTjsh(row)">送审</el-link>
+          <el-link v-if="isShowBtn('送审', row) && qxkz.deptLevel == '02'"
+            :disabled="row.xldshzt != '00' || row.lczt != '04'" size="small" type="primary"
+            @click="postXxcjXxcjTjsh(row)">送审</el-link>
           <!-- （01 提交 02 上报县局  03 上班市局 04 采纳 05 退回 06 打标签  07 转合成  08 转线索  09 转会商）v-if="qxkz.deptLevel == '01'" -->
           <!-- 在提交和退回得状态才能进行上报 -->
-          <el-link v-if="isShowBtn('上报')" size="small" type="primary" @click="appearNewspapers(row)" :disabled="row.xldshzt != '02'">上报</el-link>
+          <el-link v-if="isShowBtn('上报')" size="small" type="primary" @click="appearNewspapers(row)"
+            :disabled="row.xldshzt != '02' || (row.lczt != '02' || row.lczt != '03')">上报</el-link>
           <el-link v-if="isShowBtn('分组')" size="small" type="primary" @click="opneMsg(row)"
             :disabled="row.sldshzt != '02'">分组</el-link>
           <!-- 只有领导有肯定 -->
           <!-- <el-link v-if="isShowBtn('肯定')" size="small" type="primary" @click="affirm(row)">肯定</el-link> -->
           <el-link v-if="isShowBtn('删除')" size="small" type="primary" @clic.stopk="delDictItem(row.id)">删除</el-link>
           <el-link v-if="isShowBtn('修改', row)" size="small" type="primary" @click="addEdit('edit', row)">修改</el-link>
-          <el-link v-if="isShowBtn('续报', row)" size="small" type="primary" @click="addEdit('followUpReport', row)">续报</el-link>
+          <el-link v-if="isShowBtn('续报', row)" size="small" type="primary"
+            @click="addEdit('followUpReport', row)">续报</el-link>
 
           <el-link v-if="isShowBtn('详情')" size="small" type="primary" @click="addEdit('info', row)">详情</el-link>
           <!-- 所有状态都能进行转线索 -->
           <el-link v-if="isShowBtn('转线索')" size="small" type="primary" @click="FollowUpOnLeads(row)"
-            :disabled="row.sldshzt != '02' ">转线索</el-link>
+            :disabled="row.sldshzt != '02'">转线索</el-link>
           <!-- 所有状态都能进行转合成 -->
           <!-- <el-link v-if="isShowBtn('转合成')" size="small" type="primary" @click="openFkDialogszl(row)"
             :disabled="butcontroll('01', row.lczt)">转合成</el-link> -->
@@ -87,10 +91,11 @@
           <!-- <el-link v-if="isShowBtn('转会商')" size="small" type="primary" @click="handleTransferMerchant(row)"
             :disabled="butcontroll('01', row.lczt)">转会商</el-link> -->
 
-          <el-link v-if="isShowBtn('关注部门')"  :disabled="row.sldshzt != '02'" size="small" type="primary" @click="FollowUpOnDept(row)">关注</el-link>
+          <el-link v-if="isShowBtn('关注部门')" :disabled="row.sldshzt != '02'" size="small" type="primary"
+            @click="FollowUpOnDept(row)">关注</el-link>
           <!-- 市局能给所有数据创建标签 -->
           <el-link v-if="isShowBtn('打标签')" size="small" type="primary" @click="openCustomTag(row)"
-            :disabled="row.sldshzt != '02' ">打标签</el-link>
+            :disabled="row.sldshzt != '02'">打标签</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -166,7 +171,7 @@ const searchConfiger = ref([
   { label: "编号", prop: 'xsBh', placeholder: "请输入编号", showType: "input" },
   { label: "时间", prop: "startTime", placeholder: "请选择时间", showType: "daterange" },
   { label: "情报标题", prop: 'qbmc', placeholder: "请输入情报标题", showType: "input" },
-    { label: "标签内容", prop: 'bqdmList', placeholder: "请选择标签内容", showType: "select", options: D_XXCJ_BQLX,multiple:true},
+  { label: "标签内容", prop: 'bqdmList', placeholder: "请选择标签内容", showType: "select", options: D_XXCJ_BQLX, multiple: true },
   { label: "标签级别", prop: 'qbjb', placeholder: "请选择标签级别", showType: "select", options: D_BZ_BQJB },
   { label: "情报处置状态", prop: 'lczt', placeholder: "请选择处置状态", showType: "select", options: D_BZ_LCZT },
   { label: "关键字", prop: 'keyword', placeholder: "请输入关键字", showType: "input" },
@@ -355,7 +360,7 @@ const handleSumbit = () => {
 // <!-- [04、06、07、08、09] -->打标签
 // <!-- [03、05] -->采纳
 // <!-- [04] -->回退
-  // <!-- （01 提交 02 上报县局  03 上班市局 04 采纳 05 退回 06 打标签  07 转合成  08 转线索  09 转会商）v-if="qxkz.deptLevel == '01'" -->
+// <!-- （01 提交 02 上报县局  03 上班市局 04 采纳 05 退回 06 打标签  07 转合成  08 转线索  09 转会商）v-if="qxkz.deptLevel == '01'" -->
 const butcontroll = (val, zt) => {
   switch (val) {
     case '01':
@@ -365,20 +370,20 @@ const butcontroll = (val, zt) => {
     case '03':
       return !(['02', '03', '04'].includes(zt))
     case '04':
-      return ([ '04', '05' ,'06', '07', '08', '09'].includes(zt))
+      return (['04', '05', '06', '07', '08', '09'].includes(zt))
   }
 }
 
 // 搜索
 const onSearch = (val) => {
-console.log(val.bqdmList);
+  console.log(val.bqdmList);
 
   const promes = {
     ...pageData.pageConfiger,
     ...val,
     startTime: val.startTime ? val.startTime[0] : '',
     endTime: val.endTime ? val.endTime[1] : '',
-    bqdmList:val.bqdmList?val.bqdmList.join(','):""
+    bqdmList: val.bqdmList ? val.bqdmList.join(',') : ""
   }
 
   queryFrom.value = { ...promes }

src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue

@@ -208,8 +208,6 @@ const createProcess = (row) => {
   rowData.value = row
 }
 
-
-
 // 线索下发
 const xsxfShow = ref(false)
 const openXsxf = (row) => {