From cd5386d56e7aab75b197b858facfb358df4d3cd0 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sat, 11 Nov 2023 00:53:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/reportWork.js                     |   1 -
 src/api/mes/reportWorkConsume.js              |   9 +
 src/api/quality/qcTable.js                    |  19 +
 .../repairOrder/selectSparePartsLedger.vue    |  16 +-
 src/views/mes/reportWork/index.vue            |   7 +-
 .../mes/reportWork/reportWorkConsume.vue      |  29 +-
 src/views/mes/reportWork/selectMaterial.vue   |  51 ++-
 src/views/plan/order/index.vue                |  20 +-
 src/views/plan/workorder/index.vue            |  10 +-
 src/views/quality/qcTableIncome/index.vue     | 289 +++++++++++++
 src/views/quality/qcTableProduce/index.vue    | 384 ++++++++++++++++++
 11 files changed, 791 insertions(+), 44 deletions(-)
 create mode 100644 src/api/quality/qcTable.js
 create mode 100644 src/views/quality/qcTableIncome/index.vue
 create mode 100644 src/views/quality/qcTableProduce/index.vue

diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index 87f6037..bcd8254 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -163,4 +163,3 @@ export function getMesListBom(query) {
 // 		method: 'get'
 // 	});
 // }
-  
\ No newline at end of file
diff --git a/src/api/mes/reportWorkConsume.js b/src/api/mes/reportWorkConsume.js
index e948085..a7126dc 100644
--- a/src/api/mes/reportWorkConsume.js
+++ b/src/api/mes/reportWorkConsume.js
@@ -26,6 +26,15 @@ export function addReportWorkConsume(data) {
 	});
 }
 
+// 新增生产报工物料消耗
+export function addConsumes(data) {
+	return request({
+		url: '/mes/reportWorkConsume/addConsumes',
+		method: 'post',
+		data: data
+	});
+}
+
 // 修改生产报工物料消耗
 export function updateReportWorkConsume(data) {
 	return request({
diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js
new file mode 100644
index 0000000..92d331b
--- /dev/null
+++ b/src/api/quality/qcTable.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 来料质量报表
+export function getIncomeTableList(query) {
+	return request({
+		url: '/quality/staticTable/getIncomeTableList',
+		method: 'get',
+		params: query
+	});
+}
+
+// 生产过程质量报表
+export function getProduceTableList(query) {
+	return request({
+		url: '/quality/staticTable/getProduceTableList',
+		method: 'get',
+		params: query
+	});
+}
diff --git a/src/views/device/repairOrder/selectSparePartsLedger.vue b/src/views/device/repairOrder/selectSparePartsLedger.vue
index 2ff0dd6..2df199a 100644
--- a/src/views/device/repairOrder/selectSparePartsLedger.vue
+++ b/src/views/device/repairOrder/selectSparePartsLedger.vue
@@ -43,15 +43,15 @@
 			<el-table-column label="库存总数量" align="center" prop="amount" />
 			<el-table-column label="库存冻结数量" align="center" prop="storageAmount" />
 			<el-table-column label="库存可用数量" align="center" prop="availableQuantity" >
-			<template slot-scope="scope">
-      <span>{{ scope.row.amount-scope.row.storageAmount}}</span>
-      </template>
-      </el-table-column>
+				<template slot-scope="scope">
+				<span>{{ scope.row.amount-scope.row.storageAmount}}</span>
+				</template>
+			</el-table-column>
 			<el-table-column label="领用数量" align="center" prop="spareQuantity">
-			  <template slot-scope="scope">
-          <el-input size="small" v-model="scope.row.spareQuantity" @change="handleEdit(scope.$index,scope.row)"></el-input>
-        </template>
-      </el-table-column>
+				<template slot-scope="scope">
+				<el-input size="small" v-model="scope.row.spareQuantity" @change="handleEdit(scope.$index,scope.row)"></el-input>
+				</template>
+			</el-table-column>
 		</el-table>
 
 		<pagination
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index e304b9d..5b4056b 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -181,14 +181,15 @@
 			</el-table-column>-->
 			<el-table-column label="报工人" align="center" prop="nickName" />
 			<el-table-column label="工号" align="center" prop="userName" />
-			<el-table-column label="报工状态" align="center" prop="uploadStatus" width="100"/>
+			<!--
+			<el-table-column label="报工状态" align="center" prop="uploadStatus" width="100"/>-->
 			<el-table-column label="SAP报工时间" align="center" prop="uploadTime" width="150"/>
-			<el-table-column label="报工信息" align="center" prop="uploadMsg" width="100"/>
+			<!--<el-table-column label="报工信息" align="center" prop="uploadMsg" width="100"/>-->
 			<el-table-column label="工时" align="center" prop="workTime" />
 			<el-table-column label="线体编码" align="center" prop="machineCode" />
 			<el-table-column label="线体名称" align="center" prop="machineName" />
 			<el-table-column label="班组编码" align="center" prop="teamCode" />
-			<el-table-column label="班次编码" align="center" prop="shiftId" />
+			<el-table-column label="班次编码" align="center" prop="shiftCode" />
 			<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
 		</el-table>
 
diff --git a/src/views/mes/reportWork/reportWorkConsume.vue b/src/views/mes/reportWork/reportWorkConsume.vue
index 134e6d2..498d0ad 100644
--- a/src/views/mes/reportWork/reportWorkConsume.vue
+++ b/src/views/mes/reportWork/reportWorkConsume.vue
@@ -7,7 +7,7 @@
 					plain
 					icon="el-icon-plus"
 					size="mini"
-					@click="handleAdd"
+					@click="handleSelectMaterial"
 				>新增</el-button>
 			</el-col>
 			<el-col :span="1.5">
@@ -87,8 +87,7 @@
 					<el-input v-model="form.reportCode" placeholder="请输入物料编号" disabled/>
 				</el-form-item>
 			    <el-form-item label="物料名称" prop="materialName">
-					<el-input v-model="form.materialName" placeholder="请选择物料名称">
-						<el-button slot="append" @click="handleSelectMaterial" icon="el-icon-search"></el-button>
+					<el-input v-model="form.materialName" placeholder="请选择物料名称" disabled>
 					</el-input>
 				</el-form-item>
 				<el-form-item label="物料编号" prop="materialCode">
@@ -116,16 +115,17 @@
 				<el-button type="primary" @click="submitForm">确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
 			</div>
+		</el-dialog>
 			<!--物料选择弹窗-->
 			<ItemSelectMaterail
 				ref="itemSelectMaterial"
 				@onSelected="onSelectMaterial"
 			></ItemSelectMaterail>
-		</el-dialog>
 	</div>
 </template>
 
 <script>
+import { addConsumes } from "@/api/mes/reportWorkConsume";
 import { listReportWorkConsume, getReportWorkConsume, delReportWorkConsume, addReportWorkConsume, updateReportWorkConsume } from "@/api/mes/reportWorkConsume";
 import ItemSelectMaterail from "./selectMaterial.vue";
 export default {
@@ -312,13 +312,24 @@ export default {
 		/**物料选择弹出框**/
 		handleSelectMaterial() {
 		  this.$refs.itemSelectMaterial.showFlag = true;
-		  this.$refs.itemSelectMaterial.init(this.productCode);
+		  this.$refs.itemSelectMaterial.init(this.productCode,this.workorderCode);
 		},
 		//物料选择确认
-		onSelectMaterial(obj) {
-          this.form.materialCode = obj.component;
-		  this.form.materialName = obj.componentName;
-		  this.form.unit = obj.unit;
+		onSelectMaterial(objs) {
+		    let _this = this;
+            objs.forEach(function(item,index,arr){
+			    item.reportCode=_this.reportCode,
+				item.productCode= _this.productCode,
+				item.workorderCode= _this.workorderCode,
+				item.materialCode =  item.component,
+				item.materialName =  item.componentName
+			})
+
+			addConsumes(objs).then(response => {
+				this.$modal.msgSuccess("新增成功");
+				this.open = false;
+				this.getList();
+			});
 		},
 	}
 };
diff --git a/src/views/mes/reportWork/selectMaterial.vue b/src/views/mes/reportWork/selectMaterial.vue
index 7eb84d8..5275418 100644
--- a/src/views/mes/reportWork/selectMaterial.vue
+++ b/src/views/mes/reportWork/selectMaterial.vue
@@ -45,11 +45,27 @@
           <el-table-column width="50" align="center" type="selection">
           </el-table-column>
           <!-- 序号 -->
-          <el-table-column label="物料编码"  align="left" prop="component" :show-overflow-tooltip="true" />
-          <el-table-column label="物料名称"  align="left" prop="componentName" :show-overflow-tooltip="true" />
-          <el-table-column label="物料单位"  align="left" prop="unit" :show-overflow-tooltip="true" />
-          <el-table-column label="物料组"  align="left" prop="productGroup" :show-overflow-tooltip="true" /> 
-          <el-table-column label="物料组名称"  align="left" prop="productGroupName" :show-overflow-tooltip="true" /> 
+          <el-table-column label="物料编码" width="100" align="left" prop="component" :show-overflow-tooltip="true" />
+          <el-table-column label="物料名称" width="200" align="left" prop="componentName" :show-overflow-tooltip="true" />
+          <el-table-column label="物料组" width="80" align="left" prop="productGroup" :show-overflow-tooltip="true" /> 
+          <el-table-column label="物料组名称" width="100" align="left" prop="productGroupName" :show-overflow-tooltip="true" /> 
+          <el-table-column label="损耗数量" align="center" prop="quantity">
+            <template slot-scope="scope">
+                <el-input type="number" size="small" v-model="scope.row.quantity" @change="handleEdit(scope.$index,scope.row)"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="单位" align="center" prop="unit">
+            <template slot-scope="scope">
+                <el-select v-model="scope.row.unit" placeholder="请选择单位" width="50%" @change="handleEdit(scope.$index,scope.row)">
+                  <el-option
+                    v-for="dict in dict.type.unit"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+            </template>
+          </el-table-column>
         </el-table>
 
         <pagination
@@ -72,6 +88,7 @@
 import { getMesListBom } from "@/api/mes/reportWork";
 export default {
   name: "itemSelectMaterial",
+  dicts: ["unit"],
   data() {
     return {
       showFlag:false,
@@ -99,11 +116,12 @@ export default {
         pageNum: 1,
         pageSize: 10,
         productCode: '',
+        workorderCode:'',
         component : '',
         componentName : '',
         productGroupName:''
       },
-      selectionRow:{}
+      selectionRows:[]
     };
   },
   created() {
@@ -111,8 +129,9 @@ export default {
   },
 
   methods: {
-    init(productCode){
+    init(productCode,workorderCode){
       this.queryParams.productCode = productCode;
+      this.queryParams.workorderCode = workorderCode;
       this.getList();
     },
     /** 查询表格列表*/
@@ -141,16 +160,18 @@ export default {
     
     // 多选框选中数据
 		handleBomSelectionChange(selection) {
-
-      if(selection.length>1){
-        this.$modal.msgSuccess("只能选一个");
-      }
-
-		  this.selectionRow = selection[0]
+		  this.selectionRows = selection
 		},
-
+    handleEdit(index, row) {
+     console.log('row:',index, row);
+    },
     submitBomForm() {
-      this.$emit('onSelected', this.selectionRow);
+        if ( this.selectionRows==0) {
+          this.$modal.msgError(`请选择数据`);
+          return false;
+        }
+
+      this.$emit('onSelected', this.$refs.myTable.selection);
       this.showFlag = false;
     },
   }
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index dcd085e..984250d 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -130,7 +130,9 @@
     >
 
       <el-table-column width="150" label="订单号" align="center" prop="orderCode"/>
-      <el-table-column width="180" label="物料号" align="center" prop="prodCode"/>
+      <el-table-column width="180" label="物料号" align="center" prop="prodCode"
+        :formatter="productCodeFormate"
+      />
       <el-table-column width="200" label="物料名称" align="center" prop="prodDesc"/>
       <el-table-column width="90" label="订单数量" align="center" prop="quantity"/>
       <el-table-column width="70" label="单位" align="center" prop="unit"/>
@@ -467,15 +469,15 @@
         default-expand-all
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       >
-        <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
-        <el-table-column width="200" align="center" prop="workorderCode" label="工单号"></el-table-column>
+        <el-table-column width="160" align="center" prop="workorderCode" label="工单号"></el-table-column>
         <el-table-column width="100" align="center" prop="productDate" label="工单日期"></el-table-column>
         <el-table-column width="150" align="center" prop="prodLineCode" label="生产线体设备"></el-table-column>
-        <el-table-column width="80" align="center" prop="quantitySplit" label="数量"></el-table-column>
+        <el-table-column width="70" align="center" prop="quantitySplit" label="数量"></el-table-column>
         <el-table-column width="60" label="单位" align="center" prop="unit"/>
         <el-table-column width="90" label="工艺编码" align="center" prop="routeCode"/>
-        <el-table-column width="90" label="班次" align="center" prop="shiftDesc"/>
-        <el-table-column align="center" prop="batchCodeList" label="批次号"></el-table-column>
+        <el-table-column width="70" label="班次" align="center" prop="shiftDesc"/>
+        <el-table-column width="160" align="center" prop="batchCodeList" label="批次号"></el-table-column>
+        <el-table-column width="100" align="center" prop="batchNumList" label="批次数量"></el-table-column>
       </el-table>
       <!-- 测试 -->
       <!-- 操作按钮 -->
@@ -628,6 +630,11 @@ export default {
     })
   },
   methods: {
+		//产品编码格式化
+		productCodeFormate(row, column, cellValue){
+			return cellValue.slice(7,18);  //返回值
+		},
+
     // 新增-校验车数
     changeCarNum(num) {
       if (num <= 0) {
@@ -785,6 +792,7 @@ export default {
     },
     // 导入-文件上传成功处理
     handleFileSuccess(response, file, fileList) {
+      debugger
       this.upload.open = false;
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index 0434ccf..dd93e77 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -159,11 +159,12 @@
       </el-table-column>
       <el-table-column label="工单ID" align="center" prop="workorderId" v-if="false"/>
       <el-table-column width="150" label="子工单编号" align="center" prop="workorderCode"/>
-      <el-table-column label="工单名称" align="center" prop="workorderName" v-if="false"/>
       <el-table-column label="订单id" align="center" prop="orderId" v-if="false"/>
       <el-table-column width="150" label="子订单编码" align="center" prop="orderCode"/>
       <el-table-column label="产品ID" align="center" prop="productId" v-if="false"/>
-      <el-table-column width="180" label="产品编码" align="center" prop="productCode"/>
+      <el-table-column width="180" label="产品编码" align="center" prop="productCode"
+      :formatter="productCodeFormate"
+      />
       <el-table-column width="300" label="产品名称" align="center" prop="productName"/>
       <el-table-column label="规格型号" align="center" prop="productSpc" v-if="false"/>
       <el-table-column width="50" label="单位" align="center" prop="unit"/>
@@ -708,6 +709,11 @@ export default {
     })
   },
   methods: {
+		//产品编码格式化
+		productCodeFormate(row, column, cellValue){
+			return cellValue.slice(7,18);  //返回值
+		},
+
     // 变更-车数数量校验
     changeCarNum(num) {
 
diff --git a/src/views/quality/qcTableIncome/index.vue b/src/views/quality/qcTableIncome/index.vue
new file mode 100644
index 0000000..8f6ce9a
--- /dev/null
+++ b/src/views/quality/qcTableIncome/index.vue
@@ -0,0 +1,289 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+			<el-form-item label="来料时间" prop="incomeTimeArray">
+                <el-date-picker
+				v-model="queryParams.incomeTimeArray"
+				format="yyyy-MM-dd HH:mm:ss"
+				type="datetimerange"
+				range-separator="至"
+				start-placeholder="开始日期"
+				end-placeholder="结束日期">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="供应商" prop="incomeTimeArray1">
+			<!--
+				<el-select v-model="form.mtart" placeholder="请选择物料类别" style="width:320px">
+					<el-option
+					v-for="dict in dict.type.material_type"
+					:key="dict.value"
+					:label="dict.label"
+					:value="dict.value"
+					></el-option>
+				</el-select>-->
+			</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-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['mes:rfidProcess:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="rfidProcessList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<!-- 序号 -->
+			<el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
+			<el-table-column label="工单编号" align="center" prop="workorderCode" width="200" fixed/>
+			<el-table-column label="订单编号" align="center" prop="orderCode" width="200"/>
+			<el-table-column label="产品编码" align="center" prop="productCode" width="200"/>
+			<el-table-column label="产品名称" align="center" prop="productName" width="200"/>
+			<el-table-column label="生产时间" align="center" prop="productDate" width="200"/>
+			<el-table-column label="班次" align="center" prop="shiftId" >
+				<template slot-scope="scope">
+				<span v-if="scope.row.shiftId == 5">白班</span>
+				<span v-else>夜班</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="rfid号" align="center" prop="rfid" width="180"/>
+			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
+			<el-table-column label="机台编码" align="center" prop="machineCode" />
+			<el-table-column label="当前步工序编码" align="center" prop="nowProcessCode" width="150"/>
+			<el-table-column label="当前步工序名称" align="center" prop="nowProcessName" width="150"/>
+			<el-table-column label="下一步工序编码" align="center" prop="nextProcessCode" width="150"/>
+			<el-table-column label="下一步工序名称" align="center" prop="nextProcessName" width="150"/>
+			<el-table-column label="工序步骤" align="center" prop="orderNum" />
+			<el-table-column label="入时间" align="center" prop="inTime" width="180">
+				<template slot-scope="scope">
+				<span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>
+				{{ parseTime(scope.row.inTime, '{h}:{m}:{s}') }}
+						</template>
+					</el-table-column>
+					<el-table-column label="出时间" align="center" prop="outTime" width="180">
+						<template slot-scope="scope">
+				<span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
+				<span>{{ parseTime(scope.row.outTime, '{h}:{m}:{s}') }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="状态" align="center" prop="status">
+					<template slot-scope="scope">
+				{{ scope.row.status == "0" ? "待办" : "完成" }}
+				</template>
+			</el-table-column>
+			<el-table-column label="备注" align="center" prop="remark" />
+		</el-table>
+
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+
+	</div>
+</template>
+
+<script>
+import { getIncomeTableList,getTest} from "@/api/quality/qcTable";
+
+export default {
+	name: "RfidProcess",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 生产rfid流程表格数据
+			rfidProcessList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				incomeTimeArray: [],
+				checkTimeArray: [],
+				pageNum: 1,
+				pageSize: 10,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				shiftId: null,
+				productCode: null,
+				productName: null,
+				productDate: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+				workorderId: [
+					{ required: true, message: "工单ID不能为空", trigger: "blur" }
+				],
+				rfid: [
+					{ required: true, message: "rfid号不能为空", trigger: "blur" }
+				],
+			}
+		};
+	},
+	created() {
+		this.getDate();
+		this.getList();
+	},
+	methods: {
+        /**获取默认查询时间段**/
+		getDate() {
+			let start = this.Fungetdate (0)
+			let end = this.Fungetdate (1)
+			this.queryParams.incomeTimeArray.push(start,end)
+			//this.queryParams.checkTimeArray.push(start,end)
+		},
+		Fungetdate (num) {
+			var dd = new Date();
+			dd.setDate(dd.getDate() + num);
+			var y = dd.getFullYear();
+			var m = dd.getMonth() + 1;//获取当前月份的日期
+			var d = dd.getDate();
+			return y + "-" + m + "-" + d+" 00:00:00";
+		},
+		/** 查询生产rfid流程列表 */
+		getList() {
+			this.loading = true;
+			getIncomeTableList(this.queryParams).then(response => {
+				this.rfidProcessList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				recordId: null,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				remark: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+        shiftId: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.recordId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加生产rfid流程";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const recordId = row.recordId || this.ids
+			getRfidProcess(recordId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改生产rfid流程";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.recordId != null) {
+						updateRfidProcess(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addRfidProcess(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认删除生产rfid流程编号为"' + recordIds + '"的数据项？').then(function() {
+				return delRfidProcess(recordIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('mes/rfidProcess/export', {
+				...this.queryParams
+			}, `rfidProcess_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>
diff --git a/src/views/quality/qcTableProduce/index.vue b/src/views/quality/qcTableProduce/index.vue
new file mode 100644
index 0000000..0db5583
--- /dev/null
+++ b/src/views/quality/qcTableProduce/index.vue
@@ -0,0 +1,384 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+			<el-form-item label="工单编号" prop="workorderCode">
+				<el-input
+					v-model="queryParams.workorderCode"
+					placeholder="请输入工单编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="rfid号" prop="rfid">
+				<el-input
+					v-model="queryParams.rfid"
+					placeholder="请输入rfid号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="机台编码" prop="machineCode">
+				<el-input
+					v-model="queryParams.machineCode"
+					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-row :gutter="10" class="mb8">
+			<!-- <el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['mes:rfidProcess:add']"
+				>新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-edit"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['mes:rfidProcess:edit']"
+				>修改</el-button>
+			</el-col> -->
+			<!-- <el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="multiple"
+					@click="handleDelete"
+					v-hasPermi="['mes:rfidProcess:remove']"
+				>删除</el-button>
+			</el-col> -->
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['mes:rfidProcess:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="rfidProcessList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<!-- 序号 -->
+      <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
+			<!-- <el-table-column label="工单ID" align="center" prop="workorderId" width="180"/> -->
+			<el-table-column label="工单编号" align="center" prop="workorderCode" width="200" fixed/>
+			<!-- <el-table-column label="工单名称" align="center" prop="workorderName"/> -->
+			<!-- <el-table-column label="订单ID" align="center" prop="orderId" width="180"/> -->
+      <el-table-column label="订单编号" align="center" prop="orderCode" width="200"/>
+      <el-table-column label="产品编码" align="center" prop="productCode" width="200"/>
+      <el-table-column label="产品名称" align="center" prop="productName" width="200"/>
+      <el-table-column label="生产时间" align="center" prop="productDate" width="200"/>
+<!--      <el-table-column label="班次" align="center" prop="shiftId" width="200"/>-->
+      <el-table-column label="班次" align="center" prop="shiftId" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.shiftId == 5">白班</span>
+          <span v-else>夜班</span>
+        </template>
+      </el-table-column>
+			<el-table-column label="rfid号" align="center" prop="rfid" width="180"/>
+			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
+			<el-table-column label="机台编码" align="center" prop="machineCode" />
+			<el-table-column label="当前步工序编码" align="center" prop="nowProcessCode" width="150"/>
+			<el-table-column label="当前步工序名称" align="center" prop="nowProcessName" width="150"/>
+			<el-table-column label="下一步工序编码" align="center" prop="nextProcessCode" width="150"/>
+			<el-table-column label="下一步工序名称" align="center" prop="nextProcessName" width="150"/>
+			<el-table-column label="工序步骤" align="center" prop="orderNum" />
+			<el-table-column label="入时间" align="center" prop="inTime" width="180">
+				<template slot-scope="scope">
+          <span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>
+          {{ parseTime(scope.row.inTime, '{h}:{m}:{s}') }}
+				</template>
+			</el-table-column>
+			<el-table-column label="出时间" align="center" prop="outTime" width="180">
+				<template slot-scope="scope">
+          <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.outTime, '{h}:{m}:{s}') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="状态" align="center" prop="status">
+			  <template slot-scope="scope">
+          {{ scope.row.status == "0" ? "待办" : "完成" }}
+        </template>
+			</el-table-column>
+			<el-table-column label="备注" align="center" prop="remark" />
+			<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['mes:rfidProcess:edit']"
+					>修改</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['mes:rfidProcess:remove']"
+					>删除</el-button>
+				</template> -->
+			</el-table-column>
+		</el-table>
+
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+
+		<!-- 添加或修改生产rfid流程对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<!-- <el-form-item label="工单ID" prop="workorderId">
+					<el-input v-model="form.workorderId" placeholder="请输入工单ID" />
+				</el-form-item> -->
+				<el-form-item label="rfid号" prop="rfid">
+					<el-input v-model="form.rfid" placeholder="请输入rfid号" />
+				</el-form-item>
+				<el-form-item label="工厂编码" prop="factoryCode">
+					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
+				</el-form-item>
+				<el-form-item label="机台编码" prop="machineCode">
+					<el-input v-model="form.machineCode" placeholder="请输入机台编码" />
+				</el-form-item>
+				<el-form-item label="当前步" prop="nowProcessId">
+					<el-input v-model="form.nowProcessId" placeholder="请输入当前步" />
+				</el-form-item>
+				<el-form-item label="下一步" prop="nextProcessId">
+					<el-input v-model="form.nextProcessId" placeholder="请输入下一步" />
+				</el-form-item>
+				<el-form-item label="工序步骤" prop="orderNum">
+					<el-input v-model="form.orderNum" placeholder="请输入工序步骤" />
+				</el-form-item>
+				<el-form-item label="入时间" prop="inTime">
+					<el-date-picker clearable
+						v-model="form.inTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择入时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="出时间" prop="outTime">
+					<el-date-picker clearable
+						v-model="form.outTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择出时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import { getProduceTableList} from "@/api/quality/qcTable";
+export default {
+	name: "RfidProcess",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 生产rfid流程表格数据
+			rfidProcessList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+        shiftId: null,
+        productCode: null,
+        productName: null,
+        productDate: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+				workorderId: [
+					{ required: true, message: "工单ID不能为空", trigger: "blur" }
+				],
+				rfid: [
+					{ required: true, message: "rfid号不能为空", trigger: "blur" }
+				],
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		// 生成表头序号
+    indexMethod(index){
+        return index+1 ;
+    },
+		/** 查询生产rfid流程列表 */
+		getList() {
+			this.loading = true;
+			getProduceTableList(this.queryParams).then(response => {
+				this.rfidProcessList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				recordId: null,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				remark: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+        shiftId: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.recordId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加生产rfid流程";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const recordId = row.recordId || this.ids
+			getRfidProcess(recordId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改生产rfid流程";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.recordId != null) {
+						updateRfidProcess(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addRfidProcess(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认删除生产rfid流程编号为"' + recordIds + '"的数据项？').then(function() {
+				return delRfidProcess(recordIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('mes/rfidProcess/export', {
+				...this.queryParams
+			}, `rfidProcess_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>