优化

src/api/produceWord/index.js

@@ -25,3 +25,15 @@ export async function releaseWorkOrder({ id, teamId }) {
 }
 
 
+
+// 列表
+export async function getteampage(data) {
+  const res = await request.get(`/main/team/page`, {
+      params: data
+  });
+  console.log(res.data.code == 0)
+  if (res.data.code == 0) {
+      return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/workforceManagement/schedule.js

@@ -0,0 +1,14 @@
+import request from '@/utils/request';
+
+
+// 列表
+export async function teamqueuepage(data) {
+    const res = await request.get(`/main/teamqueue/page`, {
+        params: data
+    });
+    console.log(res.data.code == 0)
+    if (res.data.code == 0) {
+        return res.data.data;
+    }
+    return Promise.reject(new Error(res.data.message));
+}

src/views/produceOrder/components/produceOrder-search.vue

@@ -42,7 +42,7 @@
         <el-form-item label="工艺路线:">
           <el-input
             clearable
-            v-model="where.produceVersionName"
+            v-model="where.produceRoutingName"
             placeholder="请输入"
           />
         </el-form-item>
@@ -143,7 +143,7 @@ import { getteampage } from  '@/api/produceWord/index.js';
       const defaultWhere = {
         code: '',
         productionPlanCode: '',
-        produceVersionName: '',
+        produceRoutingName: '',
         productCode: '',
         productName: '',
         brandNo: '',

src/views/produceOrder/components/scheduleDialog.vue

@@ -0,0 +1,155 @@
+<template>
+    <el-dialog :title="title" :visible.sync="visible" v-if="visible" :before-close="handleClose"
+        :close-on-click-modal="false" :close-on-press-escape="false" append-to-body width="75%">
+        <el-card shadow="never">
+
+            <ele-pro-table ref="table" :columns="columns" :datasource="datasource" row-key="id" height="calc(100vh - 350px)"
+                class="dict-table" @cell-click="cellClick">
+                <!-- 表头工具栏 -->
+                <template v-slot:action="{ row }">
+                    <el-radio class="radio" v-model="radio" :label="row.id"><i></i></el-radio>
+                </template>
+            </ele-pro-table>
+        </el-card>
+        <div class="btns">
+            <el-button type="primary" size="small" @click="selected">选择</el-button>
+            <el-button size="small" @click="handleClose">关闭</el-button>
+        </div>
+    </el-dialog>
+</template>
+  
+<script>
+
+import {
+    teamqueuepage,
+} from '@/api/workforceManagement/schedule';
+export default {
+    components: {},
+    data() {
+        return {
+            visible: false,
+
+            // 表格列配置
+            columns: [
+                {
+                    columnKey: 'index',
+                    type: 'index',
+                    width: 45,
+                    align: 'center',
+                    reserveSelection: true
+                },
+                {
+                    prop: 'name',
+                    label: '排班组名称'
+                },
+                {
+                    label: '总人数',
+                    prop: 'totalPersonNumber'
+                },
+                {
+                    label: '创建人',
+                    prop: 'createUserName'
+                },
+                {
+                    label: '状态',
+                    prop: 'status',
+                    slot: 'status',
+                },
+
+                {
+                    action: 'action',
+                    slot: 'action',
+                    align: 'center',
+                    label: '选择'
+                }
+            ],
+            title: null,
+            categoryLevelId: null,
+            radio: null,
+            idx: null,
+
+
+        }
+    },
+
+    watch: {
+
+    },
+    methods: {
+        /* 表格数据源 */
+        datasource({ page, where, limit }) {
+            let data = teamqueuepage({
+                ...where,
+                pageNum: page,
+                size: limit
+            });
+
+            return data;
+        },
+
+        /* 刷新表格 */
+        reload(where) {
+            this.isCategory = false
+            this.$refs.table.reload({ pageNum: 1, where: where });
+        },
+        open(item, type, idx) {
+            this.visible = true
+        },
+
+
+
+
+
+        // 单击获取id
+        cellClick(row) {
+            this.current = row
+            this.radio = row.id
+        },
+        handleClose() {
+            this.visible = false
+            this.current = null
+            this.radio = ''
+        },
+        selected() {
+            if (!this.current) {
+                return this.$message.warning('请选择排班组')
+            }
+            this.$emit('changeProduct', this.title, this.current, this.idx)
+            this.handleClose()
+        },
+    }
+}
+</script>
+  
+<style lang="scss" scoped>
+.tree_col {
+    border: 1px solid #eee;
+    padding: 10px 0;
+    box-sizing: border-box;
+    height: 500px;
+    overflow: auto;
+}
+
+.table_col {
+    padding-left: 10px;
+
+    ::v-deep .el-table th.el-table__cell {
+        background: #f2f2f2;
+    }
+}
+
+.pagination {
+    text-align: right;
+    padding: 10px 0;
+}
+
+.btns {
+    text-align: center;
+    padding: 10px 0;
+}
+
+.topsearch {
+    margin-bottom: 15px;
+}
+</style>
+  

src/views/produceOrder/components/unpackDialog.vue

@@ -75,7 +75,7 @@
               trigger: 'change'
             }">
            
-
+           <el-input readonly v-model="scope.row.classeName" @click.native="openClasse(scope.row, 1, scope.$index)"></el-input>
             </el-form-item>
           </template>
 
@@ -123,7 +123,7 @@
               trigger: 'change'
             }]">
            
-           <el-input readonly v-model="scope.row.classeName" @click=""></el-input>
+           <el-input readonly v-model="scope.row.classeName" @click.native="openClasse(scope.row, 2, scope.$index)"></el-input>
 
             </el-form-item>
           </template>
@@ -148,6 +148,8 @@
 
       </el-form>
 
+      <scheduleDialog ref="scheduleRef"></scheduleDialog>
+
     </div>
     <div slot="footer">
       <el-button plain @click="cancel">取消</el-button>
@@ -159,11 +161,13 @@
 
 <script>
 import { splitWork } from '@/api/produceOrder/index.js';
-
+import scheduleDialog from './scheduleDialog.vue'
 
 import { deepClone } from '@/utils';
 export default {
-  components: {},
+  components: {
+    scheduleDialog
+  },
   data() {
     return {
       visible: false,
@@ -325,6 +329,11 @@ export default {
       this.visible = false;
       this.$refs.form.resetFields();
     },
+
+
+    openClasse(row,type, idx) {
+        this.$refs.scheduleRef.open(row,type,idx)
+    },
     confirm() {
 
 

src/views/produceOrder/index.vue

@@ -173,7 +173,7 @@ export default {
           }
         },
         {
-          prop: 'produceVersionName',
+          prop: 'produceRoutingName',
           label: '工艺路线',
           align: 'center'
         },

src/views/produceWord/components/order-search.vue

@@ -25,7 +25,7 @@
         <el-form-item label="工艺路线:">
           <el-input
             clearable
-            v-model="where.produceVersionName"
+            v-model="where.produceRoutingName"
             placeholder="请输入"
           />
         </el-form-item>
@@ -115,7 +115,7 @@ import { getteampage } from  '@/api/produceWord/index.js';
       const defaultWhere = {
         code: '',
         productionPlanCode: '',
-        produceVersionName: '',
+        produceRoutingName: '',
         productCode: '',
         productName: '',
         brandNo: '',

src/views/produceWord/index.vue

@@ -95,7 +95,7 @@
             align: 'center'
           },
           {
-            prop: 'produceVersionName',
+            prop: 'produceRoutingName',
             label: '工艺路线',
             align: 'center'
           },