diff --git a/src/views/bigScreen/index_6dept.vue b/src/views/bigScreen/index_6dept.vue
index 8f1b6838..6f7b10ac 100644
--- a/src/views/bigScreen/index_6dept.vue
+++ b/src/views/bigScreen/index_6dept.vue
@@ -369,6 +369,8 @@ export default {
             let that = this;
             let obj ={};
             obj.mio__type = 'sale_out';
+            obj.mio__inout_date__gte = that.start_date;
+            obj.mio__inout_date__lte = that.end_date;
             obj.page=0;
             that.$API.inm.mioitem.list.req(obj).then((res) => {
                 console.log(res);
diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 7314a082..b89fda32 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -3,22 +3,31 @@
     <el-header>
       <div class="left-panel">
         <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button>
-        <el-select v-model="query.belong_dept" placeholder="所在车间" clearable style="margin-left: 2px;"
+        <!-- <el-select v-model="query.belong_dept" placeholder="所在车间" clearable style="margin-left: 2px;"
         @change="handleQuery">
           <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-        <el-select v-model="query.state" placeholder="设备状态" clearable style="margin-left: 2px;">
-          <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
-          @change="handleQuery"></el-option>
-        </el-select>
+        </el-select> -->
       </div>
       <div class="right-panel">
-        <el-input v-model="query.search" placeholder="设备名称/编号" clearable style="margin-right: 5px;"></el-input>
+        <el-cascader
+          v-model="query.belong_dept"
+          :options="group"
+          :props="groupsProps"
+          clearable
+          placeholder="所在车间"
+          :show-all-levels="false"
+        >
+        </el-cascader>
+        <!-- <el-select v-model="query.state" placeholder="设备状态" clearable>
+          <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
+          @change="handleQuery"></el-option>
+        </el-select> -->
+        <el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="paramsEquipment">
+      <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
         <el-table-column type="index" width="50" />
         <el-table-column label="设备名称" prop="name" show-overflow-tooltip>
         </el-table-column>
@@ -198,11 +207,12 @@ export default {
       },
       apiObj: this.$API.em.equipment.list,
       paramsEquipment:{type: 10},
-      query: {},
+      query: {type: 10},
       apiObj2: this.$API.em.einspect.list,
       query2: {
         equipment: ''
       },
+      group: [],
       selection: [],
       state_: {
         10: '完好',
@@ -210,12 +220,18 @@ export default {
         30: '在修',
         40: '禁用',
       },
-      stateOptions: [
-        { label: '完好', value: 10 },
-        { label: '限用', value: 20 },
-        { label: '在修', value: 30 },
-        { label: '禁用', value: 40 },
-      ],
+      groupsProps: {
+        // value: "id",
+        multiple: false,
+        emitPath: false,
+        checkStrictly: true,
+      },
+      // stateOptions: [
+      //   { label: '完好', value: 10 },
+      //   { label: '限用', value: 20 },
+      //   { label: '在修', value: 30 },
+      //   { label: '禁用', value: 40 },
+      // ],
       results_: {
         'pass': '合格',
         'fail': '不合格',
@@ -239,9 +255,12 @@ export default {
     this.getDept()
   },
   methods: {
-    async getDept() {
-      let res = await this.$API.system.dept.list.req({ page: 0, type: "dept" });
-      this.deptOptions = genTree(res);
+    getDept() {
+      let that = this;
+      that.$API.system.dept.list.req({ page: 0 }).then(res=>{
+        that.group = genTree(res);
+      });
+      
     },
     getReceptionist(data) {
       this.form.inspect_user = data.id;
diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 6037550f..a7da7161 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -6,13 +6,27 @@
           v-if="form.type == 10">
           <el-row>
             <el-col :md="12" :sm="24">
+              <el-form-item label="所属部门">
+                <el-cascader
+                  v-model="form.belong_dept"
+                  :options="group"
+                  :props="groupsProps"
+                  clearable
+                  :show-all-levels="false"
+                  style="width: 100%"
+                  @change="deptChange"
+                >
+                </el-cascader>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :md="12" :sm="24">
               <el-form-item label="所属部门">
                 <el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%"
                   @change="deptChange">
                   <el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :md="12" :sm="24">
               <el-form-item label="所属工段">
                 <el-select v-model="form.mgroup" placeholder="所属工段" clearable style="width: 100%">
@@ -101,12 +115,25 @@
           v-if="form.type == 20">
           <el-row>
             <el-col :md="12" :sm="24">
+              <el-form-item label="所属部门">
+                <el-cascader
+                  v-model="form.belong_dept"
+                  :options="group"
+                  :props="groupsProps"
+                  clearable
+                  :show-all-levels="false"
+                  style="width: 100%"
+                >
+                </el-cascader>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :md="12" :sm="24">
               <el-form-item label="所属部门" prop="belong_dept">
                 <el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%">
                   <el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :md="12" :sm="24">
               <el-form-item label="计量编号" prop="number">
                 <el-input v-model="form.number" placeholder="设备编号" />
@@ -188,9 +215,8 @@
     </el-container>
   </el-drawer>
 </template>
-
 <script>
-
+import {genTree} from "@/utils/verificate";
 export default {
   emits: ["success", "closed"],
   data() {
@@ -234,7 +260,13 @@ export default {
       belong_dept_options: [],
       group: [],
       mgroups: [],
-      baseInfo: {}
+      baseInfo: {},
+      groupsProps: {
+					// value: "id",
+					multiple: false,
+					emitPath: false,
+					checkStrictly: true,
+				},
     };
   },
   mounted() {
@@ -247,11 +279,17 @@ export default {
       console.log(this.baseInfo)
     },
     //部门数据
+    // getGroup() {
+    //   this.$API.system.dept.list.req({ type: 'dept' }).then(res => {
+    //     this.group = res.results;
+    //   });
+    // },
     getGroup() {
-      this.$API.system.dept.list.req({ type: 'dept' }).then(res => {
-        this.group = res.results;
+      let that = this;
+      that.$API.system.dept.list.req({page: 0 , type: 'dept'}).then(res=>{
+        that.group = genTree(res);
       });
-    },
+		},
     getReceptionist(data) {
       this.form.keeper = data.id;
       this.form.keeper_name = data.name
diff --git a/src/views/mtm/mgroup_form.vue b/src/views/mtm/mgroup_form.vue
index 00082938..668ecf22 100644
--- a/src/views/mtm/mgroup_form.vue
+++ b/src/views/mtm/mgroup_form.vue
@@ -16,9 +16,19 @@
             <el-switch v-model="form.need_enm"></el-switch>
           </el-form-item> -->
           <el-form-item label="所属部门">
-            <el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%;">
+            <el-cascader
+              v-model="form.belong_dept"
+              :options="group"
+              :props="groupsProps"
+              clearable
+              :show-all-levels="false"
+              style="width: 100%"
+              @change="deptChange"
+            >
+            </el-cascader>
+            <!-- <el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%;">
               <el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
+            </el-select> -->
           </el-form-item>
           <el-form-item label="排班规则">
             <el-select v-model="form.shift_rule" style="width: 100%">
@@ -69,6 +79,7 @@
 </template>
   
 <script>
+import {genTree} from "@/utils/verificate";
 const defaultForm = {
   name: "",
   process: '',
@@ -97,6 +108,12 @@ export default {
         // process: [{ required: true, message: "请选择工序", trigger: "blur" }],
         belong_dept: [{ required: true, message: "请选择所属部门", trigger: "blur" }]
       },
+      groupsProps: {
+        // value: "id",
+        multiple: false,
+        emitPath: false,
+        checkStrictly: true,
+      },
       visible: false,
       isSaveing: false,
       shiftOptions: [],
@@ -118,9 +135,13 @@ export default {
   methods: {
     //部门数据
     getGroup() {
-      this.$API.system.dept.list.req({ page: 0, type: 'dept' }).then(res => {
-        this.group = res;
+      let that = this;
+      that.$API.system.dept.list.req({page: 0 , type: 'dept'}).then(res=>{
+        that.group = genTree(res);
       });
+      // this.$API.system.dept.list.req({ page: 0, type: 'dept' }).then(res => {
+      //   this.group = res;
+      // });
     },
     //获取工序列表
     getProcess() {
diff --git a/src/views/wpm/mlog6_form.vue b/src/views/wpm/mlog6_form.vue
index 6cee8b02..50d707e7 100644
--- a/src/views/wpm/mlog6_form.vue
+++ b/src/views/wpm/mlog6_form.vue
@@ -51,16 +51,19 @@
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
-          <el-form-item label="生产设备">
-            <el-select 
-              v-model="form.equipment" 
-              style="width: 100%">
+          <el-form-item label="班次" prop="material">
+            <el-select
+              v-model="form.shift"
+              placeholder="班次"
+              clearable
+              style="width: 100%"
+            >
               <el-option
-                v-for="item in equipmentOptions"
+                v-for="item in shiftOptions"
                 :key="item.id"
-                :label="item.full_name"
+                :label="item.name"
                 :value="item.id"
-              />
+              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -107,19 +110,20 @@
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
-          <el-form-item label="班次" prop="material">
-            <el-select
-              v-model="form.shift"
-              placeholder="班次"
-              clearable
+          <el-form-item label="生产设备">
+            <el-select 
+              v-model="form.equipments" 
               style="width: 100%"
-            >
+              filterable 
+              multiple 
+              clearable
+              >
               <el-option
-                v-for="item in shiftOptions"
+                v-for="item in equipmentOptions"
                 :key="item.id"
-                :label="item.name"
+                :label="item.full_name"
                 :value="item.id"
-              ></el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>