优化

src/api/workforceManagement/team.js

@@ -16,8 +16,8 @@ export async function listFactoryLineByParentId(params) {
     return Promise.reject(new Error(res.data.message));
 }
 
-export async function listFactoryLine() {
-    const res = await request.get(`/main/factoryarea/listFactoryLine`);
+export async function listFactoryLine(data) {
+    const res = await request.post(`/main/factoryarea/listFactoryLine`,data);
     if (res.data.code == 0) {
         return res.data.data;
     }

src/views/factoryModel/station/components/edit.vue

@@ -454,7 +454,7 @@ export default {
     },
     // 获取产线
     getlistFactoryLineByParentId() {
-      console.log(this.form.extInfo.workshopId);
+    
       listFactoryLineByParentId(this.form.extInfo.workshopId).then((res) => {
         console.log(res);
         this.options.productionLineId = res;

src/views/material/product/components/index-search.vue

@@ -8,33 +8,37 @@
     @submit.native.prevent
   >
     <el-row :gutter="10">
+
+      
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-        <el-form-item label="编码">
+        <el-form-item label="关键词">
           <el-input
             clearable
             size="small"
-            v-model="where.code"
-            placeholder="请输入"
+            v-model="where.keyWord"
+            placeholder="型号、牌号"
           />
         </el-form-item>
       </el-col>
+
+
+
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-        <el-form-item label="名称">
+        <el-form-item label="编码">
           <el-input
             clearable
             size="small"
-            v-model="where.name"
+            v-model="where.code"
             placeholder="请输入"
           />
         </el-form-item>
       </el-col>
-
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-        <el-form-item label="型号">
+        <el-form-item label="名称">
           <el-input
             clearable
             size="small"
-            v-model="where.modelType"
+            v-model="where.name"
             placeholder="请输入"
           />
         </el-form-item>

src/views/system/organization/components/org-dept-tree.vue

@@ -1,87 +0,0 @@
-<!-- 机构编辑弹窗 -->
-<template>
-    <ele-modal width="680px" :visible="visible" :close-on-click-modal="true" custom-class="ele-dialog-form"
-        :title="isUpdate ? '修改负责部门' : '添加负责部门'" @update:visible="updateVisible">
-        <el-form ref="form" :model="form" label-width="82px">
-    
-                    <el-form-item label="负责部门:">
-                        <el-tree :data="depData" show-checkbox node-key="id" :default-expanded-keys="[2, 3]"
-                            :default-checked-keys="[5]" :props="defaultProps">
-                        </el-tree>
-                    </el-form-item>
-
-        </el-form>
-        <template v-slot:footer>
-            <el-button @click="updateVisible">取消</el-button>
-            <el-button type="primary" :loading="loading" @click="save">
-                保存
-            </el-button>
-        </template>
-    </ele-modal>
-</template>
-  
-<script>
-export default {
-    components: {},
-    props: {
-
-
-        // 弹窗是否打开
-        visible: Boolean,
-
-        depData: {
-            type: Array,
-            default: () => []
-        },
-
-    },
-    data() {
-        const defaultForm = {};
-        return {
-            defaultForm,
-            // 表单数据
-            form: { ...defaultForm },
-            // 表单验证规则
-
-            // 是否是修改
-            isUpdate: false,
-
-            loading: false,
-
-            defaultProps: {
-                children: 'children',
-                value: 'id',
-                label: 'name'
-            }
-        };
-    },
-
-    methods: {
-        updateVisible(value) {
-            this.$emit('update:visible', value);
-        },
-
-
-
-        save() { },
-    },
-    watch: {
-        visible(visible) {
-          
-            if (visible) {
-                if (this.data) {
-
-                    this.isUpdate = true;
-                } else {
-
-                    this.isUpdate = false;
-                }
-            } else {
-                this.$refs.form.clearValidate();
-                this.form = { ...this.defaultForm };
-            }
-        }
-    }
-};
-</script>
-  

src/views/system/organization/components/org-select.vue

@@ -1,6 +1,7 @@
 <!-- 机构选择下拉框 -->
 <template>
   <ele-tree-select
+    ref="tree"
     clearable
     :value="value || ''"
     :data="data"
@@ -29,6 +30,12 @@
       /* 更新选中数据 */
       updateValue(value) {
         this.$emit('input', value);
+
+        let nodesInfo = []
+         nodesInfo = this.$refs['tree'].getHalfCheckedKeys()
+        nodesInfo.push(value)
+        this.$emit('checkedKeys', nodesInfo)
+
       }
     }
   };

src/views/system/organization/components/org-user-edit.vue

@@ -6,11 +6,16 @@
       <el-row :gutter="15">
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
           <el-form-item label="所属机构:">
-            <org-select :data="organizationList" placeholder="请选择所属机构" v-model="form.groupId" />
+            <org-select :data="organizationList" placeholder="请选择所属机构" v-model="form.groupId"
+              @checkedKeys="checkedKeys" />
           </el-form-item>
 
           <el-form-item label="负责部门:">
-            <el-input v-model="form.deptId" readonly @click="openTree"></el-input>
+
+
+            <el-cascader class="ele-block" :options="organizationList" placeholder="请选择负责部门" :props="defaultProps"
+              collapse-tags v-model="deptTree" clearable></el-cascader>
+
           </el-form-item>
 
 
@@ -92,14 +97,13 @@
       </el-button>
     </template>
 
-    <orgDeptTree ref="depRef" :depData="organizationList"  :visible.sync="depVisible"></orgDeptTree>
+
   </ele-modal>
 </template>
 
 <script>
 import { emailReg, phoneReg } from 'ele-admin';
 import OrgSelect from './org-select.vue';
-import orgDeptTree from './org-dept-tree.vue'
 import RoleSelect from '@/views/system/user/components/role-select.vue';
 import RegionsSelect from '@/components/RegionsSelect/index.vue';
 import { getNotBoundAccount } from '@/api/system/user';
@@ -109,7 +113,7 @@ import {
   checkExistence
 } from '@/api/system/organization';
 export default {
-  components: { OrgSelect, RoleSelect, RegionsSelect, orgDeptTree },
+  components: { OrgSelect, RoleSelect, RegionsSelect },
   props: {
     // 弹窗是否打开
     visible: Boolean,
@@ -123,7 +127,9 @@ export default {
   data() {
     const defaultForm = {
       id: null,
-      deptId: null,
+      deptId: [
+      ],
+
       groupId: null,
       name: '',
       sex: null,
@@ -187,8 +193,10 @@ export default {
       ],
       accountList: [],
 
-      depVisible: false,
+      deptTree: [],
       defaultProps: {
+        multiple: true,
+        checkStrictly: true,
         children: 'children',
         value: 'id',
         label: 'name'
@@ -215,6 +223,18 @@ export default {
         }
         this.loading = true;
         this.form.addressId = this.city ? this.city[this.city.length - 1] : '';
+
+        if (this.deptTree.length > 0) {
+          this.deptTree.forEach(i => {
+            this.form.deptId.push(i[i.length - 1])
+          })
+
+          this.form['deptTree'] = JSON.stringify(this.deptTree)
+        }
+
+
+
+
         const data = {
           ...this.form
         };
@@ -243,11 +263,12 @@ export default {
       this.$emit('update:visible', value);
     },
 
-    openTree() {
-      this.$nextTick(() => {
-        this.depVisible = true
-      })
+    checkedKeys(value) {
+      this.deptTree = []
+      this.deptTree.push(value)
+
     },
+
   },
   watch: {
     visible(visible) {
@@ -256,6 +277,15 @@ export default {
         if (this.data) {
           getUserDetail(this.data.id).then((res) => {
             this.form = { ...res };
+
+            this.deptTree = []
+            this.form.deptId = []
+            if (this.form.deptTree) {
+              this.deptTree = JSON.parse(this.form.deptTree)
+            }
+
+
+
             this.city = res.addressId ? res.addressId.toString() : null;
             this.isUpdate = true;
           });

src/views/workforceManagement/team/components/edit.vue

@@ -16,6 +16,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
+           
             <el-form-item label="车间:" prop="workshopId" style="margin-bottom: 22px">
               <el-select v-model="form.workshopId" @change="change_workshopId" multiple placeholder="请选择"
                 style="width: 100%">
@@ -263,7 +264,7 @@ export default {
     },
     // 获取产线
     getlistFactoryLineByParentId() {
-      return listFactoryLine().then((res) => {
+      return listFactoryLine( this.form.workshopId).then((res) => {
         this.options.productionLineId = res.map((n) => {
           return {
             value: n.id,

vue.config.js

@@ -32,8 +32,8 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        target: 'http://124.71.68.31:50001',
-        // target: 'http://192.168.1.139:18086',
+        // target: 'http://124.71.68.31:50001',
+        target: 'http://192.168.1.139:18086',
         // target: 'http://192.168.1.132:18086',
               // target: 'http://124.71.21.222:50001',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域