ysy há 2 anos atrás
pai
commit
ebeec06a7d
38 ficheiros alterados com 604 adições e 347 exclusões
  1. 3 0
      qiankun_config/store.js
  2. 12 0
      src/api/system/organization/index.js
  3. 60 0
      src/components/authSelection/index.vue
  4. 22 20
      src/layout/index.vue
  5. 2 0
      src/main.js
  6. 22 10
      src/store/modules/user.js
  7. 8 2
      src/views/documentManagement/certificateManagement/components/certificate-search.vue
  8. 11 2
      src/views/documentManagement/docManagement/components/doc-search.vue
  9. 6 0
      src/views/factoryModel/factoryManagement/components/search.vue
  10. 1 0
      src/views/factoryModel/factoryManagement/index.vue
  11. 6 2
      src/views/factoryModel/jobManagement/components/user-search.vue
  12. 8 3
      src/views/factoryModel/plant/components/search.vue
  13. 3 2
      src/views/factoryModel/plant/index.vue
  14. 5 0
      src/views/factoryModel/productionLine/components/search.vue
  15. 6 2
      src/views/factoryModel/qualificationManagement/components/user-search.vue
  16. 5 0
      src/views/factoryModel/station/components/search.vue
  17. 9 4
      src/views/factoryModel/workshop/components/search.vue
  18. 1 1
      src/views/login/index.vue
  19. 6 1
      src/views/material/materialBOM/components/BOM-search.vue
  20. 11 4
      src/views/material/product/components/index-search.vue
  21. 4 0
      src/views/rulesManagement/earlyWarningRules/components/matter-search.vue
  22. 11 1
      src/views/rulesManagement/inspectionPoint/components/patrol-search.vue
  23. 10 1
      src/views/rulesManagement/maintenance/components/maintain-search.vue
  24. 5 1
      src/views/rulesManagement/matterRules/components/matter-search.vue
  25. 11 1
      src/views/rulesManagement/measuringSubmit/components/patrol-search.vue
  26. 3 0
      src/views/rulesManagement/planRules/components/inventory-search.vue
  27. 4 2
      src/views/system/role/components/role-data-auth.vue
  28. 5 1
      src/views/technology/control/components/user-search.vue
  29. 5 1
      src/views/technology/parameter/components/user-search.vue
  30. 6 2
      src/views/technology/productParam/components/user-search.vue
  31. 13 9
      src/views/technology/production/components/user-search.vue
  32. 13 6
      src/views/technology/route/components/user-search.vue
  33. 221 203
      src/views/technology/route/components/user-taskinstance.vue
  34. 5 1
      src/views/technology/stepManagement/components/user-search.vue
  35. 10 7
      src/views/technology/stepManagement/components/workCenter-search.vue
  36. 5 1
      src/views/technology/version/components/user-search.vue
  37. 5 1
      src/views/technology/work/components/user-search.vue
  38. 61 56
      src/views/workforceManagement/schedule/components/use-search.vue

+ 3 - 0
qiankun_config/store.js

@@ -18,4 +18,7 @@ export default function (state) {
   if (state.user?.info) {
     store.commit('user/setUserInfo', state.user.info);
   }
+  if (state.user?.authorityDept) {
+    store.dispatch('user/getCurrentUserAuthorityDept');
+  }
 }

+ 12 - 0
src/api/system/organization/index.js

@@ -144,3 +144,15 @@ export async function listAllUserBind () {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 获取当前登陆用户数据权限部门数据
+ * @param
+ */
+export async function getCurrentUserAuthorityDeptAPI () {
+  const res = await request.post('/main/user/getCurrentUserAuthorityDepts');
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 60 - 0
src/components/authSelection/index.vue

@@ -0,0 +1,60 @@
+<template>
+  <div>
+    <ele-tree-select
+      clearable
+      :data="deptTreeList"
+      v-model="selectVal"
+      valueKey="id"
+      labelKey="name"
+      :show-checkbox="true"
+      :check-strictly="true"
+      multiple
+      collapseTags
+      filterable
+      placeholder="请选择"
+      default-expand-all
+    />
+  </div>
+</template>
+<script>
+  import { mapGetters } from 'vuex';
+
+  export default {
+    name: 'index',
+    model: {
+      prop: 'value',
+      event: 'updateVal'
+    },
+    props: {
+      value: {
+        type: String,
+        default: ''
+      }
+    },
+    data() {
+      return {
+        deptTreeList: []
+      };
+    },
+    computed: {
+      ...mapGetters(['user']),
+      selectVal: {
+        set(val) {
+          this.$emit('updateVal', val.join(','));
+        },
+        get() {
+          return this.value ? this.value.split(',') : [];
+        }
+      }
+    },
+    mounted() {
+      this.deptTreeList = this.$util.toTreeData({
+        data: this.user.authorityDept.groupList,
+        idField: 'id',
+        parentIdField: 'parentId'
+      });
+    }
+  };
+</script>
+
+<style scoped lang="scss"></style>

+ 22 - 20
src/layout/index.vue

@@ -52,9 +52,9 @@
     <!-- 路由出口 -->
     <router-layout />
     <!-- logo 图标 -->
-    <template v-slot:logo>
-      <img src="@/assets/logo.png" alt="logo" />
-    </template>
+    <!--    <template v-slot:logo>-->
+    <!--      <img src="@/assets/logo.png" alt="logo" />-->
+    <!--    </template>-->
     <!-- 顶栏右侧区域 -->
     <template v-slot:right>
       <header-tools :fullscreen="fullscreen" @fullscreen="onFullscreen" />
@@ -121,7 +121,7 @@
       HeaderTools,
       PageFooter
     },
-    data () {
+    data() {
       return {
         PROJECT_NAME,
         HIDE_SIDEBARS,
@@ -136,15 +136,15 @@
       };
     },
     computed: {
-      isQianKun () {
+      isQianKun() {
         return window.__POWERED_BY_QIANKUN__;
       },
       // 当前语言
-      locale () {
+      locale() {
         return this.$i18n.locale;
       },
       // 菜单数据
-      menus () {
+      menus() {
         return this.$store.state.user.menus;
       },
       // 主题状态
@@ -152,29 +152,29 @@
     },
     methods: {
       /* 侧栏折叠切换 */
-      updateCollapse (value) {
+      updateCollapse(value) {
         // console.log('value:', this.$store.state.user.menus);
         this.$store.dispatch('theme/setCollapse', value);
       },
       /* 双侧栏一级折叠切换 */
-      updateSideNavCollapse (value) {
+      updateSideNavCollapse(value) {
         this.$store.dispatch('theme/setSideNavCollapse', value);
       },
       /* 内容区域全屏切换 */
-      updateBodyFullscreen (value) {
+      updateBodyFullscreen(value) {
         this.$store.dispatch('theme/setBodyFullscreen', value);
       },
       /* logo 点击事件 */
-      onLogoClick (isHome) {
+      onLogoClick(isHome) {
         isHome || this.$router.push(LAYOUT_PATH);
       },
       /* 监听屏幕尺寸改变 */
-      screenSizeChange () {
+      screenSizeChange() {
         this.$store.dispatch('theme/updateScreenSize');
         this.fullscreen = isFullscreen();
       },
       /* 全屏切换 */
-      onFullscreen () {
+      onFullscreen() {
         try {
           this.fullscreen = toggleFullscreen();
         } catch (e) {
@@ -182,7 +182,7 @@
         }
       },
       /* 页签右键菜单点击事件 */
-      onTabContextMenu ({ key, tabKey, item, active }) {
+      onTabContextMenu({ key, tabKey, item, active }) {
         switch (key) {
           case 'reload': // 刷新
             reloadPageTab({
@@ -217,7 +217,7 @@
         }
       },
       /* 菜单标题国际化 */
-      i18n (_path, key) {
+      i18n(_path, key) {
         if (!I18N_ENABLE || !key) {
           return;
         }
@@ -245,12 +245,14 @@
   .ele-admin-layout {
     .ele-admin-logo {
       font-size: 18px !important;
+
       img {
         width: 50px !important;
         height: auto !important;
       }
     }
   }
+
   // 侧栏菜单徽章样式,定位在右侧垂直居中并调小尺寸
   .ele-menu-badge {
     position: absolute;
@@ -341,10 +343,10 @@
     }
   }
 
-  .ele-admin-layout .ele-admin-logo img  {
-    height: auto !important;
-    width: 80px !important;
-    margin-right: 5px;
-    max-height: 35px
+  .ele-admin-layout .ele-admin-logo {
+    background-image: url('@/assets/logo.png') !important;
+    background-size: cover !important;
+    background-repeat: no-repeat !important;
+    background-position: center center !important;
   }
 </style>

+ 2 - 0
src/main.js

@@ -16,7 +16,9 @@ import DictSelection from '@/components/Dict/DictSelection';
 import TinymceEditor from '@/components/TinymceEditor/index.vue';
 // import SvgIcon from '@/components/FormGenerator/components/SvgIcon'; // svg component
 import HeaderTitle from '@/components/header-title';
+import authSelection from '@/components/authSelection';
 Vue.component('HeaderTitle', HeaderTitle);
+Vue.component('authSelection', authSelection);
 
 // // register globally
 Vue.component('tinymce', TinymceEditor);

+ 22 - 10
src/store/modules/user.js

@@ -4,6 +4,7 @@
 import { formatMenus, toTreeData, formatTreeData } from 'ele-admin';
 import { USER_MENUS } from '@/config/setting';
 import { getResourcesTree } from '@/api/layout';
+import { getCurrentUserAuthorityDeptAPI } from '@/api/system/organization';
 
 const formatRouter = (list) => {
   let menuList = []; // menuType
@@ -47,31 +48,42 @@ export default {
     // 当前登录用户的权限路由
     authoritiesRouter: [],
     // 当前登录用户的角色
-    roles: []
+    roles: [],
+    // 当前登录用户的数据权限部门数据
+    authorityDept: {}
   },
   mutations: {
     // 设置登录用户的信息
-    setUserInfo (state, info) {
+    setUserInfo(state, info) {
       state.info = info;
     },
     // 设置登录用户的菜单
-    setMenus (state, menus) {
+    setMenus(state, menus) {
       state.menus = menus;
     },
     // 设置登录用户的权限
-    setAuthorities (state, authorities) {
+    setAuthorities(state, authorities) {
       state.authorities = authorities;
     },
     // 设置登录用户的权限路由
-    setAuthoritiesRouter (state, authoritiesRouter) {
+    setAuthoritiesRouter(state, authoritiesRouter) {
       state.authoritiesRouter = authoritiesRouter;
     },
     // 设置登录用户的角色
-    setRoles (state, roles) {
+    setRoles(state, roles) {
       state.roles = roles;
+    },
+    // 当前登录用户的数据权限部门数据
+    setAuthorityDept(state, info) {
+      state.authorityDept = info;
     }
   },
   actions: {
+    async getCurrentUserAuthorityDept({ commit }) {
+      const info = await getCurrentUserAuthorityDeptAPI();
+      commit('setAuthorityDept', info);
+    },
+
     /**
      * 请求用户信息、权限、角色、菜单
      */
@@ -105,7 +117,7 @@ export default {
     //   return { menus, homePath };
     // },
     //动态路由
-    async fetchUserInfo ({ commit }) {
+    async fetchUserInfo({ commit }) {
       const result = await getResourcesTree().catch(() => {});
       const list = result?.filter((i) => i.path === '/page-main-data');
       if (!list?.length) {
@@ -157,19 +169,19 @@ export default {
     /**
      * 更新用户信息
      */
-    setInfo ({ commit }, value) {
+    setInfo({ commit }, value) {
       commit('setUserInfo', value);
     },
     /**
      * 更新菜单数据
      */
-    setMenus ({ commit }, value) {
+    setMenus({ commit }, value) {
       commit('setMenus', value);
     },
     /**
      * 更新菜单的badge
      */
-    setMenuBadge ({ commit, state }, { path, value, color }) {
+    setMenuBadge({ commit, state }, { path, value, color }) {
       const menus = formatTreeData(state.menus, (m) => {
         if (path === m.path) {
           return {

+ 8 - 2
src/views/documentManagement/certificateManagement/components/certificate-search.vue

@@ -7,9 +7,10 @@
     @submit.native.prevent
   >
     <el-row :gutter="10">
-      <el-col v-bind="styleResponsive ? { md:7 } : { span: 7 }">
+      <el-col v-bind="styleResponsive ? { md:6 } : { span: 6 }">
         <el-form-item label="有效期至">
           <el-date-picker
+            style="width: 100%"
             type="daterange"
             class="ele-fluid"
             end-placeholder="结束日期"
@@ -42,7 +43,12 @@
           </DictSelection>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 24 } : { span: 24 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label-width="0">
           <el-button
             type="primary"

+ 11 - 2
src/views/documentManagement/docManagement/components/doc-search.vue

@@ -32,7 +32,15 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+
+    </el-row>
+    <el-row>
+      <el-col v-bind="styleResponsive ? { md: 24 } : { span: 24 }" style="display: flex;justify-content: flex-end">
         <el-form-item>
           <el-button
             type="primary"
@@ -48,7 +56,7 @@
             icon="el-icon-refresh"
             class="ele-btn-icon"
             size="medium"
-            >重置</el-button
+          >重置</el-button
           >
         </el-form-item>
       </el-col>
@@ -58,6 +66,7 @@
 
 <script>
   export default {
+    components: {},
     data () {
       // 默认表单数据
       const defaultWhere = {

+ 6 - 0
src/views/factoryModel/factoryManagement/components/search.vue

@@ -20,6 +20,7 @@
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="状态:">
           <el-select
+            style="width: 100%;"
             v-model="where.enable"
             class="m-2"
             placeholder="请选择"
@@ -35,6 +36,11 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"

+ 1 - 0
src/views/factoryModel/factoryManagement/index.vue

@@ -5,6 +5,7 @@
       <ele-pro-table
         ref="table"
         :columns="columns"
+        height="calc(100vh - 400px)"
         :datasource="datasource"
         cache-key="systemRoleTable1"
       >

+ 6 - 2
src/views/factoryModel/jobManagement/components/user-search.vue

@@ -9,7 +9,7 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="类型:" prop="type">
-          <el-select clearable v-model="where.type">
+          <el-select clearable v-model="where.type" style="width: 100%">
             <el-option
               v-for="item in typeList"
               :key="item.dictCode"
@@ -30,7 +30,11 @@
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <div class="ele-form-actions">
           <el-button

+ 8 - 3
src/views/factoryModel/plant/components/search.vue

@@ -7,17 +7,22 @@
     @submit.native.prevent
   >
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="厂房编码:">
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="厂房名称:">
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 3, md: 12 } : { span: 4}">
         <div class="ele-form-actions">
           <el-button
             type="primary"

+ 3 - 2
src/views/factoryModel/plant/index.vue

@@ -10,6 +10,7 @@
       <ele-pro-table
         ref="table"
         :columns="columns"
+        height="calc(100vh - 350px)"
         :datasource="datasource"
         cache-key="systemRoleTable2"
       >
@@ -110,14 +111,14 @@
             label: '工厂编码',
             prop: 'parentCode',
             slot: 'parent'
-           
+
           },
           {
             label: '所属工厂',
             prop: 'extInfo.parentId',
             slot: 'factory'
           },
-       
+
           {
             label: '省/市/区',
             prop: 'extInfo.location'

+ 5 - 0
src/views/factoryModel/productionLine/components/search.vue

@@ -17,6 +17,11 @@
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button

+ 6 - 2
src/views/factoryModel/qualificationManagement/components/user-search.vue

@@ -9,7 +9,7 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="类型:" prop="type">
-          <el-select clearable v-model="where.type">
+          <el-select clearable v-model="where.type" style="width: 100%">
             <el-option
               v-for="item in typeList"
               :key="item.dictCode"
@@ -30,7 +30,11 @@
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <div class="ele-form-actions">
           <el-button

+ 5 - 0
src/views/factoryModel/station/components/search.vue

@@ -35,6 +35,11 @@
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button

+ 9 - 4
src/views/factoryModel/workshop/components/search.vue

@@ -7,17 +7,17 @@
     @submit.native.prevent
   >
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="车间编码:">
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="车间名称:">
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="所属公司:">
           <ele-tree-select
             clearable
@@ -30,7 +30,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="所属工厂:">
           <el-select
             v-model="where.parentId"
@@ -48,6 +48,11 @@
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button

+ 1 - 1
src/views/login/index.vue

@@ -145,7 +145,7 @@ export default {
             } else {
               localStorage.removeItem('accountInfo');
             }
-
+            this.$store.dispatch('user/getCurrentUserAuthorityDept');
             this.goHome();
           })
           .catch((e) => {

+ 6 - 1
src/views/material/materialBOM/components/BOM-search.vue

@@ -52,7 +52,12 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 18 } : { span: 18 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { md: 12 } : { span: 12 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"

+ 11 - 4
src/views/material/product/components/index-search.vue

@@ -2,14 +2,14 @@
 <template>
   <el-form
     size="small"
-    label-width="60px"
+    label-width="80px"
     class="ele-form-search"
     @keyup.enter.native="search"
     @submit.native.prevent
   >
     <el-row :gutter="10">
 
-      
+
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="关键词">
           <el-input
@@ -44,9 +44,16 @@
         </el-form-item>
       </el-col>
 
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
 
 
-      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 4 }">
+    </el-row>
+    <el-row>
+      <el-col v-bind="styleResponsive ? { md: 24} : { span: 24 }" style="display: flex;justify-content: flex-end">
         <el-form-item>
           <el-button
             size="small"
@@ -63,7 +70,7 @@
             icon="el-icon-refresh"
             class="ele-btn-icon"
             size="medium"
-            >重置</el-button
+          >重置</el-button
           >
 
           <el-button

+ 4 - 0
src/views/rulesManagement/earlyWarningRules/components/matter-search.vue

@@ -22,6 +22,7 @@
         </el-form-item>
         <el-form-item label="创建时间:">
           <el-date-picker
+            style="width: 100%;"
             v-model="time"
             type="daterange"
             range-separator="至"
@@ -38,6 +39,9 @@
           <DictSelection dictName="规则类型" clearable v-model="where.type">
           </DictSelection>
         </el-form-item>
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="创建人:">

+ 11 - 1
src/views/rulesManagement/inspectionPoint/components/patrol-search.vue

@@ -30,6 +30,7 @@
         </el-form-item>
         <el-form-item label="创建时间:">
           <el-date-picker
+            style="width: 100%"
             v-model="time"
             type="daterange"
             range-separator="至"
@@ -45,6 +46,14 @@
         <el-form-item label="设备分类:">
           <equipmentSelect v-model="where.categoryLevelId" />
         </el-form-item>
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }" style="display: flex;justify-content: flex-end">
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -60,10 +69,11 @@
             icon="el-icon-refresh-left"
             size="small"
             type="primary"
-            >重置</el-button
+          >重置</el-button
           >
         </div>
       </el-col>
+
     </el-row>
   </el-form>
 </template>

+ 10 - 1
src/views/rulesManagement/maintenance/components/maintain-search.vue

@@ -30,6 +30,7 @@
         </el-form-item>
         <el-form-item label="创建时间:">
           <el-date-picker
+            style="width: 100%"
             v-model="time"
             type="daterange"
             range-separator="至"
@@ -45,6 +46,13 @@
         <el-form-item label="设备分类:">
           <equipmentSelect v-model="where.categoryLevelId" />
         </el-form-item>
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }" style="display: flex;justify-content: flex-end">
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -60,10 +68,11 @@
             icon="el-icon-refresh-left"
             size="small"
             type="primary"
-            >重置</el-button
+          >重置</el-button
           >
         </div>
       </el-col>
+
     </el-row>
   </el-form>
 </template>

+ 5 - 1
src/views/rulesManagement/matterRules/components/matter-search.vue

@@ -22,6 +22,7 @@
         </el-form-item>
         <el-form-item label="创建时间:">
             <el-date-picker
+              style="width: 100%;"
                 v-model="time"
                 type="daterange"
                 range-separator="至"
@@ -38,6 +39,9 @@
           <DictSelection dictName="规则类型" clearable v-model="where.type">
           </DictSelection>
         </el-form-item>
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="创建人:">
@@ -117,4 +121,4 @@
 		align-items: center;
 		justify-content: flex-end;
 	}
-</style>
+</style>

+ 11 - 1
src/views/rulesManagement/measuringSubmit/components/patrol-search.vue

@@ -30,6 +30,7 @@
         </el-form-item>
         <el-form-item label="创建时间:">
           <el-date-picker
+            style="width: 100%"
             v-model="time"
             type="daterange"
             range-separator="至"
@@ -45,6 +46,14 @@
         <el-form-item label="设备分类:">
           <equipmentSelect v-model="where.categoryLevelId" />
         </el-form-item>
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }" style="display: flex;justify-content: flex-end">
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -60,10 +69,11 @@
             icon="el-icon-refresh-left"
             size="small"
             type="primary"
-            >重置</el-button
+          >重置</el-button
           >
         </div>
       </el-col>
+
     </el-row>
   </el-form>
 </template>

+ 3 - 0
src/views/rulesManagement/planRules/components/inventory-search.vue

@@ -60,6 +60,9 @@
             @changeGroup="changeExecuteGroupId"
           />
         </el-form-item>
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="开始结束时间:">

+ 4 - 2
src/views/system/role/components/role-data-auth.vue

@@ -116,8 +116,10 @@ export default {
     /* 保存权限分配 */
     save() {
       this.loading = true;
-      const ids = this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys());
-      this.form.dataScopeDeptIds = ids.join(',');
+      if(this.form.dataScope=='2'){
+        const ids = this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys());
+        this.form.dataScopeDeptIds = ids.join(',');
+      }
       putRoles(this.form)
         .then((msg) => {
           this.loading = false;

+ 5 - 1
src/views/technology/control/components/user-search.vue

@@ -17,7 +17,11 @@
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button

+ 5 - 1
src/views/technology/parameter/components/user-search.vue

@@ -43,7 +43,11 @@
           </el-select>
         </el-form-item>
       </el-col>
-
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button

+ 6 - 2
src/views/technology/productParam/components/user-search.vue

@@ -26,7 +26,11 @@
           />
         </el-form-item>
       </el-col>
-
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <div class="ele-form-actions">
@@ -56,7 +60,7 @@
       return {
         // 表单数据
         where: { ...defaultWhere },
- 
+
       };
     },
     computed: {

+ 13 - 9
src/views/technology/production/components/user-search.vue

@@ -7,20 +7,20 @@
     @submit.native.prevent
   >
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="工序编码:">
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="工序名称:">
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="控制码:" prop="controlId">
-            <el-select v-model="where.controlId" >
+            <el-select v-model="where.controlId" style="width: 100%">
               <el-option
                 v-for="item in controlList"
                 :key="item.id"
@@ -31,10 +31,14 @@
             </el-select>
           </el-form-item>
         </el-col>
-     
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <div class="ele-form-actions">
+      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
+        <div>
           <el-button
             type="primary"
             icon="el-icon-search"
@@ -54,7 +58,7 @@
   import control from '@/api/technology/control';
   export default {
 
-  
+
     data() {
       // 默认表单数据
       const defaultWhere = {
@@ -89,7 +93,7 @@
         this.search();
       },
 
-      
+
       getControlList(){
          const params = {
            pageNum: 1, size: -1

+ 13 - 6
src/views/technology/route/components/user-search.vue

@@ -7,17 +7,17 @@
     @submit.native.prevent
   >
     <el-row>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="工艺路线组编码:">
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="工艺路线名称:">
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="生产版本:">
           <el-select v-model="where.produceVersionId" filterable placeholder="请选择" :style="{ width: '100%' }">
               <el-option v-for="item in versionList" :key="item.code" :label="item.code + '-' + item.name"
@@ -26,9 +26,9 @@
             </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="状态:" label-width="70px">
-          <el-select v-model="where.status" filterable placeholder="请选择">
+          <el-select v-model="where.status" filterable placeholder="请选择" style="width: 100%">
             <el-option
               v-for="item in statusList"
               :key="item.value"
@@ -40,7 +40,14 @@
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
+    </el-row>
+    <el-row>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 18, md: 12 } : { span: 18 }" style="display: flex;justify-content: flex-end">
         <el-form-item label-width="20px">
           <el-button
             type="primary"

+ 221 - 203
src/views/technology/route/components/user-taskinstance.vue

@@ -2,31 +2,49 @@
 <template>
   <div>
     <div class="ele-body">
-
-      <ele-pro-table ref="table" :needPage="false" :columns="columns" :datasource="datasource" row-key="id">
+      <ele-pro-table
+        ref="table"
+        :needPage="false"
+        :columns="columns"
+        :datasource="datasource"
+        row-key="id"
+      >
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
-          <el-button size="small" type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="showAddLog">
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-plus"
+            class="ele-btn-icon"
+            @click="showAddLog"
+          >
             添加工序
           </el-button>
         </template>
 
         <template v-slot:orderNum="{ row }">
-
           <el-input v-model="row.orderNum" placeholder="请输入排序"></el-input>
-
         </template>
 
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
-          <el-link type="primary" :underline="false" icon="el-icon-edit" @click="openEdit(row)">
+          <el-link
+            type="primary"
+            :underline="false"
+            icon="el-icon-edit"
+            @click="openEdit(row)"
+          >
             修改
           </el-link>
           <!-- <el-link :type="row.id ? 'primary' : 'info'" :underline="false" icon="el-icon-setting"
             @click="openSetting(row)">
             配置工艺参数
           </el-link> -->
-          <el-popconfirm class="ele-action" title="删除数据操作立即生效!!!确定要删除当前工序吗?" @confirm="remove(row)">
+          <el-popconfirm
+            class="ele-action"
+            title="删除数据操作立即生效!!!确定要删除当前工序吗?"
+            @confirm="remove(row)"
+          >
             <template v-slot:reference>
               <el-link type="danger" :underline="false" icon="el-icon-delete">
                 删除
@@ -35,14 +53,15 @@
           </el-popconfirm>
         </template>
       </ele-pro-table>
-
-
-
     </div>
 
-
-    <ele-modal width="1720px" :visible="addDialog" :append-to-body="true" :close-on-click-modal="false"
-      @update:visible="closeAdd">
+    <ele-modal
+      width="1720px"
+      :visible="addDialog"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+      @update:visible="closeAdd"
+    >
       <Production :tableData="tableData" ref="ProductionCom" />
       <template v-slot:footer>
         <el-button @click="closeAdd">取消</el-button>
@@ -52,210 +71,209 @@
       </template>
     </ele-modal>
     <!-- 编辑弹窗 -->
-    <user-edit :visible.sync="showEdit" :controlList="controlList" :data="current" @done="reload" ref="userEdit" />
+    <user-edit
+      :visible.sync="showEdit"
+      :controlList="controlList"
+      :data="current"
+      @done="reload"
+      ref="userEdit"
+    />
     <!-- 配置工艺参数 -->
-    <user-setting :visible.sync="showSetting" :data="current" ref="userSetting" />
+    <user-setting
+      :visible.sync="showSetting"
+      :data="current"
+      ref="userSetting"
+    />
   </div>
 </template>
 
 <script>
-import route from '@/api/technology/route';
-import Production from './production';
-import UserEdit from './production/components/user-edit.vue';
-import UserSetting from './production/components/user-setting.vue';
-import control from '@/api/technology/control';
-export default {
-  components: { Production, UserEdit, UserSetting },
-  props: {
-
-    // 修改回显的数据
-    taskInfo: Object,
-    isEdit: Boolean
-
-  },
-  data() {
-    return {
-
-      // 表格列配置
-      columns: [
-
-
-        {
-          prop: 'orderNum',
-          label: '排序',
-          align: 'center',
-          slot: 'orderNum',
-          minWidth: 120
-        },
-        {
-          prop: 'code',
-          label: '工序编码',
-          // sortable: 'custom',
-          showOverflowTooltip: true,
-          align: 'center',
-          minWidth: 110
-        },
-
-
-        {
-          prop: 'name',
-          label: '工序名称',
-          showOverflowTooltip: true,
-          align: 'center',
-          minWidth: 110
-        },
-        {
-          align: 'center',
-          prop: 'controlName',
-          label: '工序控制码',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-        {
-          prop: 'workCenterName',
-          label: '所属工作中心',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-
-        {
-          columnKey: 'action',
-          label: '操作',
-          width: 260,
-          align: 'center',
-          resizable: false,
-          slot: 'action',
-          showOverflowTooltip: true
-        }
-      ],
-
-      tableList: [],
-
-      loading: false,
-      addDialog: false,
-      showSetting: false,
-      showEdit: false,
-      current: {},
-      removeList: [],
-      tableData: [],
-      controlList: [],
-
-      visible: true,
-
-
-    };
-  },
-
-  methods: {
-    addParamrter() {
-      // console.log(this.$refs.ProductionCom?.selection);
-      let arr = this.$refs.ProductionCom.selection;
-     let len =    this.$refs.table.getData().length + 1 
-      let arrM = arr.map((item, index) => {
-        return { ...item.detail, orderNum: len + index  };
-      });
-      arrM.forEach((element) => {
-        if (element.id) {
-          this.$set(element, 'sourceTaskId', element.id);
-          delete element.id;
-        }
-      });
-
-      this.$refs.table.setData([ ...this.$refs.table.getData(), ...arrM,]);
-      this.$emit('taskList', this.$refs.table.getData())
-      this.closeAdd();
-    },
-    showAddLog() {
-      this.tableData = this.$refs.table.getData();
-      this.addDialog = true;
-    },
-    /* 打开编辑弹窗 */
-    openEdit(row) {
-      this.getControlList()
-      this.current = row;
-      this.showEdit = true;
-      this.$refs.userEdit.$refs.form &&
-        this.$refs.userEdit.$refs.form.clearValidate();
+  import route from '@/api/technology/route';
+  import Production from './production';
+  import UserEdit from './production/components/user-edit.vue';
+  import UserSetting from './production/components/user-setting.vue';
+  import control from '@/api/technology/control';
+  export default {
+    components: { Production, UserEdit, UserSetting },
+    props: {
+      // 修改回显的数据
+      taskInfo: Object,
+      isEdit: Boolean
     },
-
-    getControlList() {
-      control.list().then(res => {
-        this.controlList = res.list
-      })
-    },
-    /*配置工艺参数 */
-    openSetting(row) {
-      if (!row.id) {
-        this.$message.warning('新增的数据需要保存之后才能配置工艺参数');
-        return;
-      }
-      this.current = row;
-      this.showSetting = true;
+    data() {
+      return {
+        // 表格列配置
+        columns: [
+          {
+            prop: 'orderNum',
+            label: '排序',
+            align: 'center',
+            slot: 'orderNum',
+            minWidth: 120
+          },
+          {
+            prop: 'code',
+            label: '工序编码',
+            // sortable: 'custom',
+            showOverflowTooltip: true,
+            align: 'center',
+            minWidth: 110
+          },
+
+          {
+            prop: 'name',
+            label: '工序名称',
+            showOverflowTooltip: true,
+            align: 'center',
+            minWidth: 110
+          },
+          {
+            align: 'center',
+            prop: 'controlName',
+            label: '工序控制码',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'workCenterName',
+            label: '所属工作中心',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 260,
+            align: 'center',
+            resizable: false,
+            slot: 'action',
+            showOverflowTooltip: true
+          }
+        ],
+
+        tableList: [],
+
+        loading: false,
+        addDialog: false,
+        showSetting: false,
+        showEdit: false,
+        current: {},
+        removeList: [],
+        tableData: [],
+        controlList: [],
+
+        visible: true
+      };
     },
 
-    /*关闭选择参数*/
-    closeAdd() {
-      this.$refs.ProductionCom.$refs.table.setSelectedRows([]);
-      this.addDialog = false;
-    },
-    /* 刷新表格 */
-    reload() {
-      this.$refs.table.reload();
-    },
-    remove(row) {
-      const data = this.$refs.table.getData();
-      if(row.id) {
-        this.removeList.push(row.id)
-      }
-   
-      this.$refs.table.setData(data.filter((d) => this.isEdit ?  d.id !== row.id : d.sourceTaskId !== row.sourceTaskId));
-
-      this.$emit('taskList', this.$refs.table.getData())
-      this.$emit('remove', this.removeList)
-    },
-    /* 表格数据源 */
-
-    datasource({ page, limit, where, order }) {
-      return []
-    },
-
-    async getList() {
-      this.removeList =[]
-      if (this.isEdit) {
-        const res = await route.taskinstanceList({
-          routingId: this.taskInfo.id,
-          isDetail: true,
-          pageNum: 1,
-          size: -1
+    methods: {
+      addParamrter() {
+        // console.log(this.$refs.ProductionCom?.selection);
+        let arr = this.$refs.ProductionCom.selection;
+        let len = this.$refs.table.getData().length + 1;
+        let arrM = arr.map((item, index) => {
+          return { ...item.detail, orderNum: len + index };
         });
-
-        let arr = res.list.map((it) => {
-          it.detail.orderNum = it.orderNum
-
-          return it.detail
+        arrM.forEach((element) => {
+          if (element.id) {
+            this.$set(element, 'sourceTaskId', element.id);
+            delete element.id;
+          }
         });
-        this.$refs.table.setData([...arr]);
-      }
-    },
 
+        this.$refs.table.setData([...this.$refs.table.getData(), ...arrM]);
+        this.$emit('taskList', this.$refs.table.getData());
+        this.closeAdd();
+      },
+      showAddLog() {
+        this.tableData = this.$refs.table.getData();
+        this.addDialog = true;
+      },
+      /* 打开编辑弹窗 */
+      openEdit(row) {
+        this.getControlList();
+        this.current = row;
+        this.showEdit = true;
+        this.$refs.userEdit.$refs.form &&
+          this.$refs.userEdit.$refs.form.clearValidate();
+      },
+
+      getControlList() {
+        control.list().then((res) => {
+          this.controlList = res.list;
+        });
+      },
+      /*配置工艺参数 */
+      openSetting(row) {
+        if (!row.id) {
+          this.$message.warning('新增的数据需要保存之后才能配置工艺参数');
+          return;
+        }
+        this.current = row;
+        this.showSetting = true;
+      },
+
+      /*关闭选择参数*/
+      closeAdd() {
+        this.$refs.ProductionCom.$refs.table.setSelectedRows([]);
+        this.addDialog = false;
+      },
+      /* 刷新表格 */
+      reload() {
+        this.$refs.table.reload();
+      },
+      remove(row) {
+        const data = this.$refs.table.getData();
+        if (row.id) {
+          this.removeList.push(row.id);
+        }
 
-    getTaskList() {
-      this.$emit('taskList', this.$refs.table.getData())
-    },
-
-  },
-
+        this.$refs.table.setData(
+          data.filter((d) =>
+            this.isEdit ? d.id !== row.id : d.sourceTaskId !== row.sourceTaskId
+          )
+        );
+
+        this.$emit('taskList', this.$refs.table.getData());
+        this.$emit('remove', this.removeList);
+      },
+      /* 表格数据源 */
+
+      datasource({ page, limit, where, order }) {
+        return [];
+      },
+
+      async getList() {
+        this.removeList = [];
+        if (this.isEdit) {
+          const res = await route.taskinstanceList({
+            routingId: this.taskInfo.id,
+            isDetail: true,
+            pageNum: 1,
+            size: -1
+          });
+
+          let arr = res.list.map((it) => {
+            it.detail.orderNum = it.orderNum;
+
+            return it.detail;
+          });
+          this.$refs.table.setData([...arr]);
+        }
+      },
 
-};
+      getTaskList() {
+        this.$emit('taskList', this.$refs.table.getData());
+      }
+    }
+  };
 </script>
 
 <style lang="scss" scoped>
-.btn_box {
-  width: 100%;
-  margin-top: 10px;
-
-
-
-}
+  .btn_box {
+    width: 100%;
+    margin-top: 10px;
+  }
 </style>

+ 5 - 1
src/views/technology/stepManagement/components/user-search.vue

@@ -17,7 +17,11 @@
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
       <!-- <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="控制码:" prop="controlId">
             <el-select v-model="where.controlId" >

+ 10 - 7
src/views/technology/stepManagement/components/workCenter-search.vue

@@ -8,19 +8,23 @@
     >
       <el-row :gutter="24">
 
-        <el-col v-bind="styleResponsive ? { sm: 10 } : { span: 10 }">
+        <el-col v-bind="styleResponsive ? { sm: 6 } : { span: 6 }">
           <el-form-item label="工作中心编码:">
             <el-input clearable v-model="where.code" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col v-bind="styleResponsive ? { sm: 10 } : { span: 10 }">
+        <el-col v-bind="styleResponsive ? { sm: 6 } : { span: 6 }">
           <el-form-item label="工作中心名称:">
             <el-input clearable v-model="where.name" placeholder="请输入" />
           </el-form-item>
         </el-col>
-  
 
-  
+        <el-col v-bind="styleResponsive ? { sm: 6 } : { span: 6 }">
+          <el-form-item label="组织机构:">
+            <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          </el-form-item>
+        </el-col>
+
         <el-col v-bind="styleResponsive ? { sm: 4 } : { span: 4 }">
           <div class="ele-form-actions">
             <el-button
@@ -37,7 +41,7 @@
       </el-row>
     </el-form>
   </template>
-  
+
   <script>
     export default {
       data() {
@@ -45,7 +49,7 @@
         const defaultWhere = {
           code: '',
           name: '',
-    
+
         };
         return {
           // 表单数据
@@ -74,4 +78,3 @@
       }
     };
   </script>
-  

+ 5 - 1
src/views/technology/version/components/user-search.vue

@@ -35,7 +35,11 @@
           />
         </el-form-item>
       </el-col>
-
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
         <el-form-item label="" label-width="20px">
            <div class="ele-form-actions">

+ 5 - 1
src/views/technology/work/components/user-search.vue

@@ -44,7 +44,11 @@
           </el-select>
         </el-form-item>
       </el-col>
-
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button

+ 61 - 56
src/views/workforceManagement/schedule/components/use-search.vue

@@ -1,67 +1,72 @@
 <!-- 搜索表单 -->
 <template>
-    <el-form label-width="77px" size="small" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
-        <el-row :gutter="10">
-            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-                <el-form-item label="名称:">
-                    <el-input clearable size="small" v-model="where.name" placeholder="请输入排班组名称" />
-                </el-form-item>
-            </el-col>
+  <el-form label-width="77px" size="small" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
+    <el-row :gutter="10">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="名称:">
+          <el-input clearable size="small" v-model="where.name" placeholder="请输入排班组名称"/>
+        </el-form-item>
+      </el-col>
 
-            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-                <el-form-item label="状态:">
-                    <el-select v-model="where.status">
-                        <el-option label="发布" :value="1" />
-                        <el-option label="草稿" :value="0" />
-                    </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-                <el-form-item>
-                    <el-button size="small" type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
-                        查询
-                    </el-button>
-                    <el-button size="small" type="primary" icon="el-icon-refresh-left" class="ele-btn-icon" @click="reset">
-                        重置
-                    </el-button>
-                    <slot></slot>
-                </el-form-item>
-            </el-col>
-        </el-row>
-    </el-form>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="状态:">
+          <el-select v-model="where.status" style="width: 100%">
+            <el-option label="发布" :value="1"/>
+            <el-option label="草稿" :value="0"/>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:" label-width="100px">
+          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item>
+          <el-button size="small" type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
+            查询
+          </el-button>
+          <el-button size="small" type="primary" icon="el-icon-refresh-left" class="ele-btn-icon" @click="reset">
+            重置
+          </el-button>
+          <slot></slot>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
 </template>
-  
+
 <script>
 export default {
-    data() {
-        // 默认表单数据
-        const defaultWhere = {
-            name: '',
-            status: '',
+  data() {
+    // 默认表单数据
+    const defaultWhere = {
+      name: '',
+      status: '',
+      deptIds: '',
 
-        };
-        return {
-            // 表单数据
-            where: { ...defaultWhere }
-        };
-    },
-    computed: {
-        // 是否开启响应式布局
-        styleResponsive() {
-            return this.$store.state.theme.styleResponsive;
-        }
+    };
+    return {
+      // 表单数据
+      where: {...defaultWhere}
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
+  },
+  methods: {
+    /* 搜索 */
+    search() {
+      this.$emit('search', this.where);
     },
-    methods: {
-        /* 搜索 */
-        search() {
-            this.$emit('search', this.where);
-        },
-        /*  重置 */
-        reset() {
-            this.where = { ...this.defaultWhere };
-            this.search();
-        }
+    /*  重置 */
+    reset() {
+      this.where = {...this.defaultWhere};
+      this.search();
     }
+  }
 };
 </script>
-