业务模块页面增加组织机构搜索条件

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');
+  }
 }

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>

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"

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 = {

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"

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"
       >

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

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"

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'

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

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

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

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

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"

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

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="创建人:">

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>

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>

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>

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>

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="开始结束时间:">

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

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

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: {

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

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"

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" >

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>
-  

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">

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