From 6a961ef4aeb6034e55bc0f90eb094c2d6ed58c4e Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 15 Jan 2024 15:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/income.js                     | 15 ++++----
 src/views/quality/qcProduce/index.vue         |  3 +-
 .../quality/qcProduce/selectWorkOrder.vue     |  4 +--
 src/views/quality/qcTableXJ/index.vue         | 12 +++----
 src/views/quality/unqualified/index.vue       | 35 ++++++++++---------
 5 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/api/quality/income.js b/src/api/quality/income.js
index 50a717a..ce130e4 100644
--- a/src/api/quality/income.js
+++ b/src/api/quality/income.js
@@ -92,19 +92,20 @@ export function getCkeckProjectList(query) {
 	});
   }
 
-//合格不合格 
-export function changeCheckDetailStatus(recordId, status,defectCode) {
+//合格不合格
+export function changeCheckDetailStatus(recordId, status,defectCode,remark) {
 	const data = {
 		recordId,
 		status,
-		defectCode
+		defectCode,
+		remark
 	}
 	return request({
 		url: '/quality/qcIncome/changeCheckDetailStatus',
 		method: 'put',
 		data: data
 	})
-} 
+}
 
 //测量值提交
 export function commitActualValue(recordId, actualValues) {
@@ -117,7 +118,7 @@ export function commitActualValue(recordId, actualValues) {
 		method: 'put',
 		data: data
 	})
-} 
+}
 
 //审核结果提交
 export function commitCheckResult(recordId,typeCode,checkType,orderNo) {
@@ -132,7 +133,7 @@ export function commitCheckResult(recordId,typeCode,checkType,orderNo) {
 		method: 'put',
 		data: data
 	})
-} 
+}
 
 export function getDefectList(defectType) {
 	const data = {
@@ -169,4 +170,4 @@ export function getProductWorkOrder(query) {
 	  method: 'get',
 	  params: query
 	});
-  }
\ No newline at end of file
+  }
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index d19dd88..8974b43 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -428,6 +428,7 @@ export default {
 	dicts: ["unit","check_status","check_result"],
 	data() {
 		return {
+			showFlag:false,
 			// 遮罩层
 			loading: true,
 			// 选中数组
@@ -698,7 +699,7 @@ export default {
 		},
 		//工单选择确认
 		onSelectWorkOrder(obj) {
-           this.form.orderNo = obj.orderNo;
+           this.form.orderNo = obj.workorderCode;
 		   this.form.materialName = obj.materialName;
 		   this.form.materialCode = obj.materialCode;
            this.form.quality = obj.quality;
diff --git a/src/views/quality/qcProduce/selectWorkOrder.vue b/src/views/quality/qcProduce/selectWorkOrder.vue
index 7d7fee1..162388a 100644
--- a/src/views/quality/qcProduce/selectWorkOrder.vue
+++ b/src/views/quality/qcProduce/selectWorkOrder.vue
@@ -31,8 +31,8 @@
           <el-table-column label="产品编码"  align="left" prop="materialCode" width="180" />
           <el-table-column label="产品名称"  align="left" prop="materialName" width="180"/>
           <el-table-column label="排产数量"  align="left" prop="quality" width="100" />
-          <el-table-column label="单位"  align="left" prop="unit" :show-overflow-tooltip="true" width="80"/>
-          <el-table-column label="生产日期"  align="left" prop="incomeTime" :show-overflow-tooltip="true" >
+          <el-table-column label="单位"  align="left" prop="unit" width="80"/>
+          <el-table-column label="生产日期"  align="left" prop="incomeTime" width="100" >
           			<template slot-scope="scope">
                   <span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d}') }}</span>
                 </template>
diff --git a/src/views/quality/qcTableXJ/index.vue b/src/views/quality/qcTableXJ/index.vue
index 1fb1a67..7f8312c 100644
--- a/src/views/quality/qcTableXJ/index.vue
+++ b/src/views/quality/qcTableXJ/index.vue
@@ -88,13 +88,13 @@
 					<el-table-column prop="column110120" label="11:00-12:00" width="100" align="center"/>
 				</el-table-column>
 				<el-table-column label="下午" align="center" >
-					<el-table-column prop="column123133" label="13:30-14:30" width="100" align="center"/>
-					<el-table-column prop="column133143" label="14:30-15:30" width="100" align="center"/>
+					<el-table-column prop="column133143" label="13:30-14:30" width="100" align="center"/>
+					<el-table-column prop="column13column1431533143" label="14:30-15:30" width="100" align="center"/>
 					<el-table-column prop="column143153" label="15:30-16:30" width="100" align="center"/>
-					<el-table-column prop="column153163" label="16:30-17:30" width="100" align="center"/>
+					<el-table-column prop="column163173" label="16:30-17:30" width="100" align="center"/>
 				</el-table-column>
 				<el-table-column label="加班" align="center" >
-					<el-table-column prop="column163173" label="12:30-13:30" width="100" align="center"/>
+					<el-table-column prop="column123133" label="12:30-13:30" width="100" align="center"/>
 					<el-table-column prop="column180190" label="18:00-19:00" width="100" align="center"/>
 					<el-table-column prop="column190200" label="19:00-20:00" width="100" align="center"/>
 					<el-table-column prop="column200210" label="20:00-21:00" width="100" align="center"/>
@@ -221,7 +221,7 @@ export default {
 			var m = dd.getMonth() + 1;//获取当前月份的日期
 			var d = dd.getDate();
 			return y + "-" + m +"-"+d;
-		},	
+		},
 
 		indexMethod(index){
 			return index+1 ;
@@ -328,7 +328,7 @@ export default {
 		handleDetail(row) {
 			this.reset();
 			let sr = row;
-     
+
 			this.queryParams.orderNo = sr.orderNo;
 			getXJCheckTableDetail(this.queryParams).then(response => {
 				this.pOrderTableList = response;
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index b6bcc7c..fa9c0e6 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -89,12 +89,23 @@
 				<el-button
 					type="success"
 					plain
-					icon="el-icon-edit"
+					icon="el-icon-plus"
 					size="mini"
 					:disabled="single"
 					@click="handleUpdate"
 					v-hasPermi="['quality:unqualified:edit']"
-				>处理</el-button>
+				>提交OA</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-s-check"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['quality:unqualified:edit']"
+				>OA审批查看</el-button>
 			</el-col>
 			<el-col :span="1.5">
 				<el-button
@@ -136,17 +147,6 @@
 			    </template>
 			</el-table-column>
 			<el-table-column label="不合格描述" align="center" prop="remark" width="120"/>
-			<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="['quality:unqualified:edit']"
-					>处理</el-button>
-				</template>
-			</el-table-column>
 		</el-table>
 
 		<pagination
@@ -225,15 +225,15 @@
 				</el-row>
 				<el-row>
 					<el-col :span="8">
-						<el-form-item label="供应商名称" prop="supplierName">
-							<el-input v-model="form.supplierName" placeholder="请选择供应商名称">
+						<el-form-item label="组织名称" prop="supplierName">
+							<el-input v-model="form.supplierName" placeholder="请选择组织名称">
 							<el-button slot="append" @click="handleSelectSupplier" icon="el-icon-search"></el-button>
 							</el-input>
 						</el-form-item>
 					</el-col>
 				   <el-col :span="8">
-						<el-form-item label="供应商编码" prop="supplierCode">
-							<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/>
+						<el-form-item label="组织编码" prop="supplierCode">
+							<el-input v-model="form.supplierCode" placeholder="请输入组织编码" disabled/>
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
@@ -285,6 +285,7 @@
 <script>
 import { listUnqualified, getUnqualified, delUnqualified, addUnqualified, updateUnqualified } from "@/api/quality/unqualified";
 import { getCheckTypeList} from "@/api/quality/qcTable";
+import { getCheckTypes } from "@/api/quality/qcProduce";
 import moment from 'moment';
 export default {
 	name: "Unqualified",