工作单元添加产线、序列号字段

src/api/mes/md/workunit.js

@@ -17,6 +17,14 @@ export function listWorkunits(query) {
   })
 }
 
+export function listLines(query) {
+  return request({
+    url: '/md/workunit/selectGroupLineName',
+    method: 'get',
+    params: query
+  })
+}
+
 // 根据工作单元查询上机明细
 export function listWorkTmToolRequestList(query) {
   return request({

src/i18n/lang/th_TH.json

@@ -2991,5 +2991,6 @@
 	", 不允许修改": ", ไม่อนุญาตให้แก้ไข",
 	"是否故障": "ไม่ว่าจะเป็นความล้มเหลว",
 	"排程日期": "วันที ่ กําหนดการ",
-  "该工序已添加，请勿重复添加": "มีการเพิ่มขั้นตอนห้ามเพิ่มซ้ำ"
+	"该工序已添加，请勿重复添加": "มีการเพิ่มขั้นตอนห้ามเพิ่มซ้ำ",
+	"所属产线": "สายการผลิต"
 }

src/i18n/lang/zh_CN.json

@@ -2991,5 +2991,6 @@
 	", 不允许修改": ", 不允许修改",
 	"是否故障": "是否故障",
     "排程日期": "排程日期",
-  "该工序已添加，请勿重复添加": "该工序已添加，请勿重复添加"
+	"该工序已添加，请勿重复添加": "该工序已添加，请勿重复添加",
+	"所属产线": "所属产线"
 }

src/views/mes/md/product/index.vue

@@ -73,11 +73,7 @@
           <el-table-column :label="$t('单位')" align="center" key="unitOfMeasure" prop="unitOfMeasure" v-if="columns[3].visible"
             :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column :label="$t('物料/产品')" align="center" key="itemOrProduct" prop="itemOrProduct"
-            v-if="columns[4].visible" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.mes_item_product" :value="scope.row.itemOrProduct" />
-            </template>
+          <el-table-column :label="$t('所属产线')" align="center" key="lineName" prop="lineName" v-if="columns[4].visible" :show-overflow-tooltip="true" >
           </el-table-column>
 
           <el-table-column :label="$t('所属分类')" align="center" key="itemTypeName" prop="itemTypeName" v-if="columns[5].visible"

src/views/mes/md/workunit/index.vue

@@ -23,6 +23,16 @@
           <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('所属产线')" prop="lineName">
+        <el-select v-model="queryParams.lineName">
+          <el-option
+              v-for="line in lines"
+              :key="line"
+              :label="line"
+              :value="line"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
@@ -59,6 +69,8 @@
       </el-table-column>
       <el-table-column :label="$t('common.workstation')" align="center" prop="workstationName" />
       <el-table-column :label="$t('common.workunit_name')" align="center" prop="workunitName" />
+      <el-table-column :label="$t('序列号')" align="center" prop="serial" />
+      <el-table-column :label="$t('所属产线')" align="center" prop="lineName" />
       <el-table-column :label="$t('是否启用')" align="center" prop="enableFlag">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag" />
@@ -121,7 +133,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('序列号')" label-width="120px" prop="workunitName">
+              <el-input v-model="form.serial" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('所属产线')" label-width="120px">
+              <el-select v-model="form.lineName">
+                <el-option
+                    v-for="line in lines"
+                    :key="line"
+                    :label="line"
+                    :value="line"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('是否故障')" label-width="120px">
@@ -208,9 +238,10 @@
 <script>
 
 
-import { listWorkunit, getWorkunit, delWorkunit, addWorkunit, updateWorkunit } from "@/api/mes/md/workunit";
+import { listWorkunit, getWorkunit, delWorkunit, addWorkunit, updateWorkunit, listLines } from "@/api/mes/md/workunit";
 import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
 import { genCode } from "@/api/system/autocode/rule"
+import {listAllWorkshop} from "@/api/mes/md/workshop";
 
 export default {
   name: "Workunit",
@@ -233,6 +264,7 @@ export default {
       total: 0,
       // 工作单元表格数据
       workunitList: [],
+      lines:[],
       autoGenFlag: false,
       // 弹出层标题
       title: "",
@@ -293,6 +325,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getLines();
   },
   methods: {
     /** 查询工作单元列表 */
@@ -324,6 +357,8 @@ export default {
         treatingThicknessMax: '',
         treatingWidthMin: '',
         treatingWidthMax: '',
+        serial:'',
+        lineName:'',
         dieSunkOffsetOilTankNum: '',
         printingMethod: '',
         sacmForEdgeOpening: '',
@@ -360,6 +395,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getLines();
       this.handleAutoGenChange(true);
       this.open = true;
       this.title = this.$t('common.add_workunit');
@@ -367,6 +403,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.getLines();
       const workunitId = row.workunitId || this.ids
       getWorkunit(workunitId).then(response => {
         this.form = response.data;
@@ -374,6 +411,11 @@ export default {
         this.title = this.$t('修改工作单元');
       });
     },
+    getLines() {
+      listLines().then((response) => {
+        this.lines = response.data;
+      });
+    },
     // 查询明细按钮操作
     handleView(row) {
       this.reset();