人员关联作业单元

src/api/system/user.js

@@ -186,3 +186,12 @@ export function listByUser(query) {
     params: query
   })
 }
+
+// 修改人工作单元
+export function updateWorkunituserList(query) {
+  return request({
+    url: '/mes/md/workunitWorker/workunit',
+    method: 'put',
+    data: query
+  })
+}

src/views/mes/tm/warehouse/itemIndex.vue

@@ -24,7 +24,7 @@
          </template>
       </el-table-column>
       <el-table-column  width="120px" v-else label="入库位置" align="center" prop="local" />
-      <el-table-column width="240px" v-if="$attrs.optType === 'add'" label="入库方式" align="center" prop="warehouseDesc">
+      <el-table-column width="300px" v-if="$attrs.optType === 'add'" label="入库方式" align="center" prop="warehouseDesc">
          <template slot-scope="scope">
             <el-radio-group v-model="scope.row.warehouseDesc">
               <el-radio v-for="dict in dict.type.warehouse_desc"

src/views/system/user/index.vue

@@ -143,7 +143,7 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
-
+        <workunitSelect   :userId="form.userId" :id="id" ref="workunitSelectRef" @reflash="workerFlash"  />
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
@@ -320,7 +320,7 @@
             <span>工作单元</span>
             <el-button
               style="float: right; padding: 3px 0"
-              @click="handlePostAdd"
+              @click="onworkunitSelectRefs"
               type="text"
               >新增</el-button
             >
@@ -328,6 +328,7 @@
           <Workstationworker
             ref="postList"
             :userId="form.userId"
+
           ></Workstationworker>
         </el-card>
       </div>
@@ -376,10 +377,11 @@ import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Workstationworker from "./profile/worker";
+import workunitSelect from "./profile/workunitSelect.vue"
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { Treeselect, Workstationworker },
+  components: { Treeselect, Workstationworker,workunitSelect },
   data() {
     return {
       // 遮罩层
@@ -500,9 +502,9 @@ export default {
     });
   },
   methods: {
-    handlePostAdd() {
-      this.$refs.postList.handleAdd();
-    },
+    // handlePostAdd() {
+    //   this.$refs.postList.onworkunitSelectRef();
+    // },
     /** 查询用户列表 */
     getList() {
       this.loading = true;
@@ -513,11 +515,17 @@ export default {
         }
       );
     },
+    workerFlash(){
+      this.$refs.postList.getList();
+    },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       treeselect().then(response => {
         this.deptOptions = response.data;
       });
+    },
+    onworkunitSelectRefs(){
+      this.$refs['workunitSelectRef'].showFlag = true
     },
       /** 同步bpm人员管理 */
       handleSynchronism() {

src/views/system/user/profile/worker.vue

 <template>
   <div class="app-container">
+    <el-col></el-col>
+    <!-- <el-button
+      type="primary"
+      plain
+      icon="el-icon-plus"
+      size="mini"
+      @click="onworkunitSelectRef()"
+    >新增</el-button> -->
+    <!-- <workunitSelect   :userId="userId" :id="id" ref="workunitSelectRef" @onSelected="onworkunitSelecteds" /> -->
     <el-table v-loading="loading" :data="workstationworkerList" @selection-change="handleSelectionChange" :max-height="tableHeight">
       <!-- <el-table-column label="岗位名称" align="center" prop="postName" /> -->
       <!-- <el-table-column label="数量" align="center" prop="quantity" /> -->
@@ -41,11 +50,11 @@
                   @click="$refs.WorkunitSelect.showFlag = true"
                   ></el-button>
               </el-input>
-              <workunitSelect
+              <workunitSelects
                 ref="WorkunitSelect"
                 :userId="userId"
                 @onSelected="onworkunitSelected"
-              ></workunitSelect>
+              ></workunitSelects>
             </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -58,11 +67,12 @@
 
 <script>
 import { listWorkunituser, getWorkunituser, delWorkunituser, addWorkunituser, updateWorkunituser } from "@/api/system/user";
-import workunitSelect from "./workunitSelect.vue"
+//import workunitSelect from "./workunitSelect.vue"
+import workunitSelects from "./workunitSelect1.vue"
 // "@/views/mes/cal/team/calTeamSelect/multi.vue"
 export default {
   name: "Workunitworker",
-   components: {workunitSelect},
+   components: {workunitSelects},
   data() {
     return {
       // 遮罩层
@@ -177,6 +187,10 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    
+    handleWorkunitSelect(){
+      this.$refs.WorkunitSelect.showFlag = true
+    },
     onworkunitSelected(row){
       console.log(45456, row);
       if (row != undefined && row != null) {
@@ -185,6 +199,26 @@ export default {
         console.log(111111, this.form);
       }
     },
+
+
+    selectworkunit(){
+      this.getList();
+    },
+
+    // onworkunitSelectRef(){
+    //   this.$refs['workunitSelectRef'].showFlag = true
+    // },
+    // onworkunitSelecteds(list){
+    //   console.log(45456, row);
+    //   this.workstationworkerList = list.map(item =>{
+    //     return{
+    //     workunitId:item.workunitId,
+    //     workunitName:item.workunitName,
+    //     }
+    //   })
+    // },
+
+
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();

src/views/system/user/profile/workunitSelect1.vue

+<template>
+    <el-dialog
+      title="工作单元选择"
+      v-if="showFlag"
+      :visible.sync="showFlag"
+      :modal="false"
+      width="80%"
+    >
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="100px"
+      >
+        <el-form-item label="工作单元编码" prop="workunitCode">
+          <el-input
+            v-model="queryParams.workunitCode"
+            placeholder="请输入工单编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="工作单元名称" prop="workunitName">
+          <el-input
+            v-model="queryParams.workunitName"
+            placeholder="请输入工作单元名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item v-if="!workstationId" label="工作中心" prop="workstationName">
+          <el-input
+            v-model="queryParams.workstationName"
+            placeholder="请输入工作中心名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="loading"
+        :data="workunitList"
+        @current-change="handleCurrent"
+        @row-dblclick="handleRowDbClick"
+        height="500px"
+      >
+        <el-table-column width="55" align="center">
+          <template v-slot="scope">
+            <el-radio
+              v-model="selectedWorkunitId"
+              :label="scope.row.workunitId"
+              @change="handleRowChange(scope.row)"
+              >{{ "" }}</el-radio
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="工作中心名称" width="180" prop="workstationName" />
+        <el-table-column
+          label="工作单元编码"
+          width="200"
+          align="center"
+          prop="workunitCode"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column label="工作单元名称" align="center" prop="workunitName" />
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showFlag = false">取 消</el-button>
+        <el-button type="primary" @click="confirmSelect">确 定</el-button>
+      </div>
+    </el-dialog>
+  </template>
+  <script>
+  import { listWorkunituser } from "@/api/system/user";
+  import { listWorkunit } from "@/api/mes/md/workunit";
+  export default {
+    name: "WorkunitSelectSingle",
+    components: {},
+    dicts: [],
+    props: {
+      userId: undefined,
+      workstationName: {
+        type: String,
+        default: "",
+      },
+      workstationId: {
+        type: String | Number,
+        default: "",
+      },
+      workunitId: {
+        type: Number | undefined,
+        default: undefined,
+      }, //外部传入的工单过滤信息
+    },
+    data() {
+      return {
+        showFlag: false,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        selectedWorkunitId: undefined,
+        selectedRows: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 生产工单表格数据
+        workunitList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          workunitCode: null,
+          userId: this.userId,
+          pageNum: 1,
+          pageSize: 10,
+          workunitName: null,
+          workstationId: null,
+          workstationName: this.workstationName,
+          workstationId: this.workstationId,
+          workunitId: null,
+          enableFlag: "Y",
+        },
+      };
+    },
+    watch: {
+      showFlag: {
+        handler(newName) {
+          this.selectedWorkunitId = null
+          this.selectedRows = []
+          this.queryParams.workstationName = this.workstationName;
+          this.queryParams.userId = this.userId;
+          this.queryParams.workstationId = this.workstationId;
+          this.getList();
+        },
+        immediate: true
+      }
+    },
+    created() {
+  
+    },
+    methods: {
+      /** 查询生产工单列表 */
+      getList() {
+        this.loading = true;
+        listWorkunit(this.queryParams).then((response) => {
+          this.workunitList = response.rows;
+          this.loading = false;
+          this.total = response.total
+        });
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      handleCurrent(row) {
+          console.log(row);
+        if (row) {
+          this.selectedRows = row;
+        }
+      },
+      // 单选选中数据
+      handleRowChange(row) {
+        if (row) {
+          this.selectedRows = row;
+        }
+      },
+      //双击选中
+      handleRowDbClick(row) {
+        if (row) {
+          this.selectedRows = row;
+          this.$emit("onSelected", this.selectedRows);
+          this.showFlag = false;
+        }
+      },
+      //确定选中
+      confirmSelect() {
+        if (this.selectedWorkunitId == null || this.selectedWorkunitId == 0) {
+          this.$notify({
+            title: "提示",
+            type: "warning",
+            message: "请至少选择一条数据!",
+          });
+          return;
+        }
+        this.$emit("onSelected", this.selectedRows);
+        this.showFlag = false;
+      },
+    },
+  };
+  </script>
+  
\ No newline at end of file