2022-03-16 23:45

imcs-ui/src/api/machiningClient/qualityMgr.js

@@ -1,31 +1,33 @@
-/*********************** 【质量中心-查看质检结果】API ********************/
-import axiosApi from '../AxiosApi.js'
-
-const apiList = {
-  page: {
-    method: 'POST',
-    url: `/authority/orderProduct/page`
-  }
-}
-
-export default {
-	getList (data) {
-	    return axiosApi({
-	    	...apiList.getList,
-	    	data
-	    })
-  	},
-  	page (data) {
-	    return axiosApi({
-	      	...apiList.page,
-	      	data
-	    })
-  	},
-  	download (data) {
-	    return axiosApi({
-	      	...apiList.download,
-	      	responseType: "blob",
-	     	data
-	    })
-  	}
-}
+/*********************** 【质量中心-查看质检结果】API ********************/
+import axiosApi from '../AxiosApi.js'
+
+const apiList = {
+  page: {
+    method: 'POST',
+    url: `/authority/orderProduct/page`
+  },
+  
+  // [补单]分页-列表
+  bOrderPage: {
+    method: 'POST',
+    url: `/authority/taskTestUnqualifiedBom/page`
+  },
+  
+}
+
+export default {
+	page (data) {
+	    return axiosApi({
+	      	...apiList.page,
+	      	data
+	    })
+	},
+	
+	// [补单]分页-列表
+	bOrderPage (data) {
+	    return axiosApi({
+	      	...apiList.bOrderPage,
+	      	data
+	    })
+	},
+}

imcs-ui/src/views/zuihou/qualityCenter/qualityMgr/components/View.vue

@@ -25,18 +25,23 @@
 		        </div>
 		      </template>
 	      </el-table-column>
-	      <el-table-column prop="furnaceBatchNo" label='产品名称' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="meterialCode" label='产品唯一码' :show-overflow-tooltip="true" width="200px"></el-table-column>
-		  	<el-table-column prop="factory" label='质检结果' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="meterialBatchNo" label='数量' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="bomName" label='产品名称' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="uniqueCode" label='产品唯一码' :show-overflow-tooltip="true" width="200px"></el-table-column>
+		  	<el-table-column prop="testResult" label='质检结果' :show-overflow-tooltip="true" width="150px">
+		  		<template slot-scope="{ row }">
+		      	<el-tag v-if="row.testResult == '0'" type="warning">不合格</el-tag>
+		      	<el-tag v-if="row.testResult == '1'" type="success">合格</el-tag>
+					</template>
+		  	</el-table-column>
+	      <el-table-column prop="bomNum" label='数量' :show-overflow-tooltip="true" width="150px"></el-table-column>
 	      <el-table-column prop="factoryDate" label='质检人' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="batchStand" label='补单单号' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="createUser" label='所属订单号' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="createTime" label='所属计划' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="usedNum" label='生成单据时间' :show-overflow-tooltip="true" width="150px"></el-table-column>
-        <el-table-column prop="lastNum" label='生成人' :show-overflow-tooltip="true" width="150px"></el-table-column>
-        <el-table-column prop="lastNum" label='处理时间' :show-overflow-tooltip="true" width="150px"></el-table-column>
-        <el-table-column prop="lastNum" label='处理人' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="addOrderNo" label='补单单号' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="orderNo" label='所属订单号' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="planNo" label='所属计划' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="createTime" label='生成单据时间' :show-overflow-tooltip="true" width="150px"></el-table-column>
+        <el-table-column prop="createUserName" label='生成人' :show-overflow-tooltip="true" width="150px"></el-table-column>
+        <el-table-column prop="handleTime" label='处理时间' :show-overflow-tooltip="true" width="150px"></el-table-column>
+        <el-table-column prop="handleUserName" label='处理人' :show-overflow-tooltip="true" width="150px"></el-table-column>
 	    </el-table>
 
 	    <!-- 分页组件 -->
@@ -53,8 +58,8 @@
 <script>
 	// 【分页】组件
 	import Pagination from "@/components/Pagination"
-	// 【原材料接收管理】-API
-	import ReceiveApi from "@/api/prepareProductMgr/receive"
+	// 【不合格产品管理】-API
+	import unqualifiedMgrApi from "@/api/machiningClient/qualityMgr"
 	// 【共通-工具】
 	import { initQueryParams } from '@/utils/commons'
 export default {
@@ -129,9 +134,10 @@ export default {
       this.queryParams.current = params.current ? params.current : this.queryParams.current
       this.queryParams.size = params.size ? params.size : this.queryParams.size
       // 搜索条件添加-材料的id
-      this.queryParams.model.meterialId = this.tenant.id;
-      ReceiveApi.page(this.queryParams).then(response => {
+      this.queryParams.model.bomId = this.tenant.bomId;
+      unqualifiedMgrApi.bOrderPage(this.queryParams).then(response => {
         const res = response.data
+        console.log("ddddddddd = ", res)
         if (res.isSuccess) {
           this.tableData = res.data
         }