BOM页面及工艺路线

src/api/mes/pro/bom.js

+import request from '@/utils/request'
+
+// 查询生产BOM列表
+export function listBom(query) {
+  return request({
+    url: '/mes/pro/bom/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询所有有效生产BOM
+export function listAllBom() {
+  return request({
+    url: '/mes/pro/bom/listAll',
+    method: 'get'
+  })
+}
+
+
+// 查询生产BOM详细
+export function getBom(bomId) {
+  return request({
+    url: '/mes/pro/bom/' + bomId,
+    method: 'get'
+  })
+}
+
+// 新增生产BOM
+export function addBom(data) {
+  return request({
+    url: '/mes/pro/bom',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改生产BOM
+export function updateBom(data) {
+  return request({
+    url: '/mes/pro/bom',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除生产BOM
+export function delBom(bomId) {
+  return request({
+    url: '/mes/pro/bom/' + bomId,
+    method: 'delete'
+  })
+}

src/api/mes/pro/bomItem.js

+import request from '@/utils/request'
+
+// 查询生产BOM组件列表
+export function listBomItem(query) {
+  return request({
+    url: '/mes/pro/bomItem/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询生产BOM组件详细
+export function getBomItem(bomItemId) {
+  return request({
+    url: '/mes/pro/bomItem/' + bomItemId,
+    method: 'get'
+  })
+}
+
+// 新增生产BOM组件
+export function addBomItem(data) {
+  return request({
+    url: '/mes/pro/bomItem',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改生产BOM组件
+export function updateBomItem(data) {
+  return request({
+    url: '/mes/pro/bomItem',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除生产BOM组件
+export function delBomItem(bomItemId) {
+  return request({
+    url: '/mes/pro/bomItem/' + bomItemId,
+    method: 'delete'
+  })
+}

src/components/usageSelect/single.vue

+<template>
+  <el-dialog
+    title="用途选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal="false"
+    width="57%"
+    center
+  >
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="用途编码" prop="usageCode">
+        <el-input
+          v-model="queryParams.usageCode"
+          placeholder="请输入用途编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用途名称" prop="usageName">
+        <el-input
+          v-model="queryParams.usageName"
+          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="usageList"
+      @current-change="handleCurrent"
+      @row-dblclick="handleRowDbClick"
+    >
+      <el-table-column width="200" align="center">
+        <template v-slot="scope">
+          <el-radio
+            v-model="selectedusageId"
+            :label="scope.row.usageId"
+            @change="handleRowChange(scope.row)"
+            >{{ "" }}</el-radio
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="用途编码" width="200" prop="usageCode">
+      </el-table-column>
+      <el-table-column
+        label="用途名称"
+        width="100"
+        align="center"
+        prop="usageName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="备注" width="400" align="center" prop="remark">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.mes_usage_sourcetype"
+            :value="scope.row.orderSource"
+          />
+        </template>
+      </el-table-column>
+    </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 type="primary" @click="confirmSelect">确 定</el-button>
+      <el-button @click="showFlag = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { listUsage } from "@/api/mes/pro/usage";
+export default {
+  name: "UsageSelectSingle",
+  components: {},
+  dicts: ["mes_order_status", "mes_workorder_sourcetype"],
+  // props:{
+  //   workorder: {
+  //     type: Object,
+  //     default: function(){
+  //       return {'workorderType': 'SELF'}
+  //     }} //外部传入的用途过滤信息
+  // },
+  data() {
+    return {
+      showFlag: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      selectedUsageId: undefined,
+      selectedRows: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 生产用途表格数据
+      usageList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        usageCode: null,
+        usageName: null,
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `用途编码`, visible: true },
+        { key: 1, label: `用途名称`, visible: true },
+        { key: 2, label: `备注`, visible: true },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询生产用途列表 */
+    getList() {
+      this.loading = true;
+      listUsage(this.queryParams).then((response) => {
+        this.usageList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleCurrent(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.selectedUsageId == null || this.selectedUsageId == 0) {
+        this.$notify({
+          title: "提示",
+          type: "warning",
+          message: "请至少选择一条数据!",
+        });
+        return;
+      }
+      this.$emit("onSelected", this.selectedRows);
+      this.showFlag = false;
+    },
+  },
+};
+</script>

src/views/mes/pro/proroute/routeprocess.vue

@@ -93,17 +93,17 @@
     />
 
     <!-- 添加或修改工艺组成对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>    
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-row>
-            <el-col :span="12">
-                <el-form-item label="序号" prop="orderNum">
+            <el-col :span="8">
+                <el-form-item label="序号" width="120px" prop="orderNum">
                     <el-input-number :min="1" v-model="form.orderNum" placeholder="请输入序号" />
                 </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
                 <el-form-item label="工序" prop="processId">
-                    <el-select v-model="form.processId" placeholder="请选择工序">
+                    <el-select v-model="form.processId" placeholder="请选择工序" @change="changeProcessId">
                         <el-option
                         v-for="item in processOptions"
                         :key="item.processId"
@@ -113,9 +113,7 @@
                     </el-select>
                 </el-form-item>
             </el-col>
-        </el-row>
-        <el-row>
-            <el-col :span="12">
+            <el-col :span="8">
                 <el-form-item label="与下一道工序关系" prop="linkType">
                     <el-tooltip effect="dark" placement="right">
                     <div slot="content">
@@ -140,12 +138,10 @@
                     <el-color-picker v-model="form.colorCode"></el-color-picker>                        
                 </el-form-item>
             </el-col>
-            <el-col :span="7">
-                    <el-input v-model="form.colorCode" maxlength="7" placeholder="请输入颜色编码在左侧选择颜色" />                
+            <el-col :span="2">
+                    <el-input v-model="form.colorCode" style="left: 5px" maxlength="7" placeholder="请输入颜色编码在左侧选择颜色" />                
             </el-col>
-        </el-row>
-        <el-row>
-            <el-col :span="8">
+            <el-col :span="7">
               <el-form-item label="是否关键工序" prop="keyFlag">
                     <el-tooltip effect="dark" placement="right">
                     <div slot="content">
@@ -163,7 +159,7 @@
                     </el-tooltip>
                 </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="10">
               <el-form-item label="是否需要质检确认" prop="isCheck">
                     <el-tooltip effect="dark" placement="right">
                     <div slot="content">
@@ -181,8 +177,6 @@
                     </el-tooltip>
                 </el-form-item>
             </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
                 <el-form-item label="准备时间" prop="defaultPreTime">
                     <el-tooltip effect="dark" content="当前系统支持的最小时间粒度为1小时" placement="right">
@@ -195,8 +189,27 @@
                     <el-input-number :min="0" :step="1" v-model="form.defaultSufTime" placeholder="请输入等待时间" />
                 </el-form-item>
             </el-col>
-        </el-row>
-        <el-row>
+            <el-col :span="8">
+            <el-form-item label="工作站" prop="workstationId">
+              <el-input
+                v-model="form.workstationName"
+                disabled
+                placeholder="请选择工作站信息"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="handleWorkstationSelect"
+                ></el-button>
+              </el-input>
+              <WorkstationSelect ref="WorkstationSelect" :processId="form.processId" @onSelected="onWorkstationSelected"></WorkstationSelect>
+            </el-form-item>
+          </el-col>
+            <el-col :span="8">
+                <el-form-item label="标准工时" prop="stdWorkingTime">
+                    <el-input-number :min="0" :step="0.1" v-model="form.stdWorkingTime" placeholder="请输入标准工时" />
+                </el-form-item>
+            </el-col>
             <el-col :span="24">
                 <el-form-item label="备注" prop="remark">
                     <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -216,9 +229,12 @@
 <script>
 import { listRouteprocess, getRouteprocess, delRouteprocess, addRouteprocess, updateRouteprocess } from "@/api/mes/pro/routeprocess";
 import {listAllProcess} from "@/api/mes/pro/process";
+import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
+import { log } from 'three';
 export default {
   name: "Routeprocess",
   dicts: ['mes_link_type','sys_yes_no'],
+  components: {WorkstationSelect},
   data() {
     return {
       // 遮罩层
@@ -276,6 +292,9 @@ export default {
         ],
         isCheck: [
         { required: true, message: "请指定当前工序是否需要质检确认", trigger: "blur" }
+        ],
+        workstationId: [
+        { required: true, message: "请选择工作站", trigger: "blur" }
         ]
       }
     };
@@ -301,9 +320,22 @@ export default {
     //查询工序信息
     getProcess(){
       listAllProcess().then( response =>{
+        console.log(response.data)
         this.processOptions = response.data;
+        console.log(this.processOptions.processId)
       });
     },
+    // 查询工作站信息
+    handleWorkstationSelect() {
+      this.$refs.WorkstationSelect.showFlag = true;
+    },
+    onWorkstationSelected(row) {
+      if (row != undefined && row != null) {
+        this.form.workstationId = row.workstationId;
+        this.form.workstationName = row.workstationName;
+        this.form.stdWorkingTime = row.stdWorkingTime;
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -327,14 +359,13 @@ export default {
         defaultSufTime: 0,
         colorCode: '#00AEF3',
         remark: null,
-        attr1: null,
-        attr2: null,
-        attr3: null,
-        attr4: null,
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        workstationId: null,
+        workstationName: null,
+        stdWorkingTime: null
       };
       this.resetForm("form");
     },
@@ -389,6 +420,23 @@ export default {
           }
         }
       });
+    },
+    // 工序改变
+    changeProcessId(){
+         
+        this.form.workstationId = ''
+        this.form.workstationName = ''
+        this.form.stdWorkingTime = ''
+    // watch:{
+    //   processId(newValue){
+    //      alert("工序发生改变,请重新选择工作站");
+    //      this.form={
+    //       workstationId : null,
+    //       workstationName: null,
+    //       stdWorkingTime: null
+    //      }
+    //   }
+
     },
     /** 删除按钮操作 */
     handleDelete(row) {