打样申请

src/components/routesProcessSelect/index.vue

+<template>
+  <el-dialog
+    title="工艺路线选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal="true"
+    width="80%"
+    center
+  >
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="110px"
+    >
+      <el-form-item label="工艺路线编号" prop="routeCode">
+        <el-input
+          v-model="queryParams.routeCode"
+          placeholder="请输入工艺路线编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工艺路线名称" prop="routeName">
+        <el-input
+          v-model="queryParams.routeName"
+          placeholder="请输入工艺路线名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="enableFlag">
+        <el-input
+          v-model="queryParams.enableFlag"
+          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="processRoutesList"
+      highlight-current-row
+      @current-change="handleCurrent"
+      @row-dblclick="handleRowDbClick"
+      height="400"
+    >
+      <el-table-column width="50" align="center">
+        <template v-slot="scope">
+          <el-radio
+            v-model="selectedRouteId"
+            :label="scope.row.routeId"
+            @change="handleRowChange(scope.row)"
+            >{{ "" }}</el-radio
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="工艺路线编号" align="center" prop="routeCode" />
+
+      <el-table-column label="工艺路线名称" align="center" prop="routeName" />
+      <el-table-column label="工艺路线说明" align="center" prop="routeDesc" />
+      <el-table-column label="是否启用" align="center" prop="enableFlag" />
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <el-tabs type="border-card" style="margin-top: 30px">
+      <el-tab-pane label="工序">
+        <el-table v-loading="processLoading" :data="processList">
+          <el-table-column
+            label="工序编码"
+            width="120px"
+            fixed
+            align="center"
+            prop="processCode"
+          />
+          <el-table-column
+            label="工序名称"
+            width="150px"
+            fixed
+            align="center"
+            prop="processName"
+          />
+          <el-table-column
+            label="下一道工序"
+            width="150px"
+            align="center"
+            prop="nextProcessName"
+          />
+          <el-table-column
+            label="与下一道工序关系"
+            width="150px"
+            align="center"
+            prop="linkType"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.mes_link_type"
+                :value="scope.row.linkType"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="关键工序"
+            width="100px"
+            align="center"
+            prop="keyFlag"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.sys_yes_no"
+                :value="scope.row.keyFlag"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="质检确认"
+            width="100px"
+            align="center"
+            prop="isCheck"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.sys_yes_no"
+                :value="scope.row.isCheck"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="准备时间"
+            align="center"
+            prop="defaultPreTime"
+          />
+          <el-table-column
+            label="等待时间"
+            align="center"
+            prop="defaultSufTime"
+          />
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    <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 { listProroute } from "@/api/mes/pro/proroute";
+import { listRouteprocess } from "@/api/mes/pro/routeprocess";
+
+export default {
+  name: "RoutesProcessSelectSingle",
+  components: {},
+  dicts: ["sys_yes_no", "mes_link_type", "sys_yes_no"],
+  data() {
+    return {
+      showFlag: false,
+      // 选中数组
+      selectedRouteId: undefined,
+      selectedRows: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      processList: [],
+      // 品牌表格数据
+      processRoutesList: [],
+      // // 品牌名称
+      // brandName: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      processLoading: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        routeCode: null,
+        routeName: null,
+        routeDesc: null,
+        enableFlag: null,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询工厂列表 */
+    getList() {
+      this.loading = true;
+      listProroute(this.queryParams).then((response) => {
+        this.processRoutesList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleCurrent(row) {
+      const params = {
+        pageNum: 1,
+        pageSize: 1000,
+        routeId: row.routeId,
+      };
+      this.processLoading = true;
+      listRouteprocess(params)
+        .then(({ rows }) => {
+          this.processList = rows;
+          this.processLoading = false;
+        })
+        .catch(() => {
+          this.processLoading = false;
+        });
+      if (row) {
+        this.selectedRows = row;
+      }
+    },
+    getProcess() {},
+    // 单选选中数据
+    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.selectedRouteId == null || this.selectedRouteId == 0) {
+        this.$notify({
+          title: "提示",
+          type: "warning",
+          message: "请至少选择一条数据!",
+        });
+        return;
+      }
+      this.$emit("onSelected", this.selectedRows);
+      this.showFlag = false;
+    },
+  },
+};
+</script>

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

@@ -117,9 +117,9 @@
                 <el-form-item label="与下一道工序关系" prop="linkType">
                     <el-tooltip effect="dark" placement="right">
                     <div slot="content">
-                        S-to-S：当前工序开始生产，下一道工序才可开始生产 </br>
-                        F-to-F：当前工序结束生产，下一道工序才可结束生产 </br>
-                        S-to-F：当前工序开始生产，下一道工序才可结束生产 </br>
+                        S-to-S：当前工序开始生产，下一道工序才可开始生产</br>
+                        F-to-F：当前工序结束生产，下一道工序才可结束生产</br>
+                        S-to-F：当前工序开始生产，下一道工序才可结束生产</br>
                         F-to-S：当前工序结束生产，下一道工序才可开始生产
                     </div>
                     <el-select v-model="form.linkType" placeholder="请选择与下一道工序关系">
@@ -144,10 +144,7 @@
             <el-col :span="7">
               <el-form-item label="是否关键工序" prop="keyFlag">
                     <el-tooltip effect="dark" placement="right">
-                    <div slot="content">
-                        是：整个工单的生产进度将根据当前工序的生产报工数量进行更新</br>
-                        每个工艺流程只能有一个关键工序                        
-                    </div>
+                    <div slot="content">是：整个工单的生产进度将根据当前工序的生产报工数量进行更新</br>每个工艺流程只能有一个关键工序</div>
                     <el-select v-model="form.keyFlag">
                         <el-option
                         v-for="dict in dict.type.sys_yes_no"

src/views/mes/proofing/components/ProcessProd.vue

+<template>
+  <div class="process-prod">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-table :data="tableData">
+      <el-table-column label="物料名称" prop="itemName" align="center" />
+      <el-table-column label="单位" prop="unitOfMeasure" align="center" />
+      <el-table-column label="用料比例" prop="quantity" align="center" />
+      <el-table-column label="备注" prop="remark" align="center" />
+      <el-table-column label="操作" align="center" width="150">
+        <template slot-scope="{ row, index }">
+          <el-button
+            type="text"
+            icon="el-icon-edit"
+            size="small"
+            @click="updateRow(row)"
+            >修改</el-button
+          >
+          <el-button
+            type="text"
+            icon="el-icon-delete"
+            size="small"
+            @click="deleteRow(index)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog
+      :visible.sync="showFlag"
+      title="skkskks"
+      width="800px"
+      append-to-body
+    >
+      <el-table :data="bomList" @selection-change="handleSelectionChange">
+        <el-table-column width="50" align="center">
+          <template v-slot="scope">
+            <el-radio
+              v-model="selectedItemId"
+              :label="scope.row.itemId"
+              @change="handleRowChange(scope.row)"
+              >{{ "" }}</el-radio
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="物料名称" prop="itemName" />
+        <el-table-column label="单位" prop="unitOfMeasure" />
+        <el-table-column label="用料比例" prop="quantity" />
+      </el-table>
+      <div slot="footer">
+        <el-button>确认</el-button>
+        <el-button @click="showFlag = false">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    bomList: {
+      type: Array,
+      default: () => [],
+    },
+    processId: {
+      type: Number | undefined,
+      default: undefined,
+    },
+  },
+  data() {
+    return {
+      tableData: [],
+      selectedItemId: undefined,
+      showFlag: false,
+    };
+  },
+  methods: {
+    handleSelectionChange() {},
+    handleRowChange() {},
+    handleAdd() {
+      this.showFlag = true;
+    },
+    updateRow() {},
+    deleteRow() {},
+  },
+};
+</script>
+
+<style>
+.process-prod {
+  padding: 0 20px;
+}
+</style>

src/views/mes/proofing/components/ProogingBom.vue

@@ -22,11 +22,7 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-delete"
-          size="mini"
+        <el-button type="primary" plain icon="el-icon-delete" size="mini"
           >产品分类导入</el-button
         >
       </el-col>
@@ -45,6 +41,12 @@
 
     <el-table :data="tableData" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="物料名称"
+        align="center"
+        prop="itemName"
+        width="120"
+      />
       <el-table-column
         label="组件数量"
         align="center"
@@ -91,13 +93,13 @@
         label="BOM行备注"
         align="center"
         prop="bomItemRemark"
-        width="120"
+        min-width="120"
       />
       <el-table-column
         label="物料备注"
         align="center"
         prop="itemRemark"
-        width="120"
+        min-width="120"
       />
       <el-table-column label="操作" align="center" width="120">
         <template slot-scope="{ row, index }">
@@ -128,6 +130,24 @@
         label-width="100px"
         size="small"
       >
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="产品" prop="itemId">
+              <el-input
+                v-model="form.itemName"
+                readonly
+                placeholder="请选择产品"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="$refs['ItemSelectRef'].showFlag = true"
+                ></el-button>
+              </el-input>
+              <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="组件数量" prop="quantity">
@@ -214,9 +234,10 @@
 
 <script>
 import ItemBomSelect from "@/components/itemBomSelect/single.vue";
+import ItemSelect from "@/components/itemSelect/single.vue";
 export default {
-  components: { ItemBomSelect },
-  inject: ['mode'],
+  components: { ItemBomSelect, ItemSelect },
+  inject: ["mode"],
   data() {
     return {
       /**弹窗状态 */
@@ -230,6 +251,8 @@ export default {
       /**表单初始化数据 */
       form: {
         quantity: "",
+        itemName: "",
+        itemId: "",
         unitOfMeasure: "",
         scrapPercentage: "",
         alternativeGroup: "",
@@ -241,9 +264,7 @@ export default {
       },
     };
   },
-  created() {
-
-  },
+  created() {},
   methods: {
     /**多选 */
     handleSelectionChange(val) {
@@ -270,6 +291,13 @@ export default {
       //   this.tableData.unshift({...row})
       // }
     },
+    onItemSelect(row) {
+      if (row != undefined && row != null) {
+        this.form.itemId = row.itemId;
+        this.form.itemName = row.itemName;
+        this.form.unit = row.unitOfMeasure;
+      }
+    },
     /**表单提交 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
@@ -282,6 +310,8 @@ export default {
     /**重置表单 */
     resetForm() {
       this.form = {
+        itemName: "",
+        itemId: "",
         quantity: "",
         unitOfMeasure: "",
         scrapPercentage: "",
@@ -295,8 +325,8 @@ export default {
     },
     /**获取组件数据 */
     getComData() {
-      return this.tableData
-    }
+      return this.tableData;
+    },
   },
 };
 </script>

src/views/mes/proofing/components/ProogingProcess.vue

 <template>
   <div>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          >新增</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete"
-          >删除</el-button
-        >
-      </el-col>
-    </el-row>
-
     <el-table :data="tableData" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="工序名称" prop="processName" width="120" align="center" />
-      <el-table-column label="工序编码" prop="processCode" width="120" align="center" />
-      <el-table-column label="与下一道工序关系" prop="linkType" width="160" align="center" />
-      <el-table-column label="工作站" prop="workstationId" width="120" align="center" />
-      <el-table-column label="甘特图显示颜色" prop="colorCode" width="120" align="center" />
-      <el-table-column label="操作" align="center" width="120">
+      <el-table-column type="expand" width="55" align="center">
         <template slot-scope="{ row, index }">
+          <ProcessProd :processId="row.processId" :bomList="bomList" />
+        </template>
+      </el-table-column>
+      <el-table-column label="工序名称" prop="processName" align="center" />
+      <el-table-column label="工序编码" prop="processCode" align="center" />
+      <el-table-column
+        label="与下一道工序关系"
+        prop="linkType"
+        align="center"
+      />
+      <el-table-column label="工作站" prop="workstationId" align="center" />
+      <el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
+      <el-table-column label="操作" align="center" width="150">
+        <template slot-scope="{ row }">
           <el-button
             type="text"
             icon="el-icon-edit"
@@ -39,18 +24,16 @@
             @click="updateRow(row)"
             >修改</el-button
           >
-          <el-button
-            type="text"
-            icon="el-icon-delete"
-            size="small"
-            @click="deleteRow(index)"
-            >删除</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
 
-    <el-dialog :visible.sync="showFlag" width="700px" title="添加工艺">
+    <el-dialog
+      v-dialogDrag
+      :visible.sync="showFlag"
+      width="800px"
+      title="添加工序"
+    >
       <el-form
         ref="form"
         :model="form"
@@ -145,14 +128,22 @@
 
 <script>
 import ItemBomSelect from "@/components/itemBomSelect/single.vue";
+import ProcessProd from "./ProcessProd.vue";
 export default {
-  components: { ItemBomSelect },
+  components: { ItemBomSelect, ProcessProd },
+  props: {
+    bomList: {
+    type: Array,
+    default: () => [],
+  },
+  },
   data() {
     return {
       /**弹窗状态 */
       showFlag: false,
       /**表格数据 */
       tableData: [],
+      bomData: [],
       /**表单规则 */
       rules: {},
       /**多选 */
@@ -171,7 +162,19 @@ export default {
       },
     };
   },
+  watch: {
+    bomList: {
+      handler(val) {
+        console.log(val, "000000000");
+        this.bomData = val;
+      },
+      deep: true,
+    },
+  },
   methods: {
+    setList(rows) {
+      this.tableData = rows;
+    },
     /**多选 */
     handleSelectionChange(val) {
       this.selection = val;

src/views/mes/proofing/proofingInfo.vue

@@ -14,7 +14,7 @@
         ref="form"
         size="small"
         :inline="true"
-        label-width="100px"
+        label-width="8em"
       >
         <el-row>
           <el-col :md="8" :xs="12">
@@ -29,7 +29,11 @@
 
           <el-col :md="8" :xs="12" style="height: 50.5px">
             <el-form-item label="产品" prop="itemId">
-              <el-input v-model="form.itemName" readonly placeholder="请选择产品">
+              <el-input
+                v-model="form.itemName"
+                readonly
+                placeholder="请选择产品"
+              >
                 <el-button
                   slot="append"
                   icon="el-icon-search"
@@ -41,11 +45,25 @@
           </el-col>
           <el-col :md="8" :xs="12" style="height: 50.5px">
             <el-form-item label="工艺路线" prop="routeId">
-              <el-input v-model="form.routeId" placeholder="请选择工艺路线">
-                <el-button slot="append" icon="el-icon-search"></el-button>
+              <el-input
+                v-model="form.routeName"
+                readonly
+                placeholder="请选择工艺路线"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="$refs['RoutesProcessSelectRef'].showFlag = true"
+                ></el-button>
               </el-input>
+              <RoutesProcessSelect
+                ref="RoutesProcessSelectRef"
+                @onSelected="onRoutesProcessSelect"
+              />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :md="8" :xs="12">
             <el-form-item label="简称" prop="abbreviation">
               <el-input
@@ -64,10 +82,9 @@
           </el-col>
           <el-col :md="8" :xs="12">
             <el-form-item label="样品数量" prop="num">
-              <el-input
-                v-model="form.num"
-                placeholder="请输入样品数量"
-              ></el-input>
+              <el-input v-model="form.num" placeholder="请输入样品数量">
+                <template slot="suffix">{{ form.unit }}</template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :md="8" :xs="12">
@@ -143,12 +160,12 @@
         </el-row>
       </el-form>
 
-      <el-tabs type="border-card">
+      <el-tabs type="border-card" @tab-click="tabClick">
         <el-tab-pane label="BOM">
           <ProogingBom ref="ProogingBomRef" />
         </el-tab-pane>
         <el-tab-pane label="工艺">
-          <ProogingProcess ref="ProogingProcessRef" />
+          <ProogingProcess ref="ProogingProcessRef" :bomList="bomList" />
         </el-tab-pane>
       </el-tabs>
     </PageWrapper>
@@ -159,9 +176,11 @@
 import ProogingBom from "./components/ProogingBom.vue";
 import ProogingProcess from "./components/ProogingProcess.vue";
 import ItemSelect from "@/components/itemSelect/single.vue";
+import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
+import { listRouteprocess } from "@/api/mes/pro/routeprocess";
 
 export default {
-  components: { ProogingBom, ProogingProcess, ItemSelect },
+  components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect },
   dicts: [],
   provide() {
     return {
@@ -170,12 +189,15 @@ export default {
   },
   data() {
     return {
+      bomList: [],
       // 表单参数
       form: {
         prototypeRequestCode: "",
         itemId: "",
         itemName: "",
+        unit: "",
         routeId: "",
+        routeName: "",
         abbreviation: "",
         enName: "",
         num: "",
@@ -209,21 +231,44 @@ export default {
   },
   created() {},
   methods: {
+    /** 点击tab 获取bom的数据,将参数传递给后面的组件 */
+    tabClick(val) {
+      if (val.index != 0) {
+        this.bomList = this.$refs["ProogingBomRef"].getComData();
+        console.log(this.bomList, "7777777");
+      }
+    },
     onItemSelect(row) {
       if (row != undefined && row != null) {
         this.form.itemId = row.itemId;
         this.form.itemName = row.itemName;
+        this.form.unit = row.unitOfMeasure;
+      }
+    },
+    onRoutesProcessSelect(row) {
+      if (row != undefined && row != null) {
+        this.form.routeId = row.routeId;
+        this.form.routeName = row.routeName;
+
+        const params = {
+          pageNum: 1,
+          pageSize: 1000,
+          routeId: row.routeId,
+        };
+        listRouteprocess(params).then(({ rows }) => {
+          this.$refs["ProogingProcessRef"].setList(rows);
+        });
       }
     },
     /**提交 */
     saveForm() {
-      const bomData = this.$refs.ProogingBomRef.getComData()
-      const processData = this.$refs.ProogingProcess.getComData()
+      const bomData = this.$refs.ProogingBomRef.getComData();
+      const processData = this.$refs.ProogingProcess.getComData();
       const params = {
         ...this.form,
         bomList: bomData,
-        processList: processData
-      }
+        processList: processData,
+      };
     },
     /**重置表单 */
     resetForm() {