检验报告

src/api/quality/produceReport.js

@@ -1,93 +1,45 @@
 import request from '@/utils/request'
 
 // 查询来料报告列表
-export function listIncome(query) {
+export function listProduce(query) {
 	return request({
-		url: '/quality/qcIncomeReport/list',
+		url: '/quality/qcProduceReport/list',
 		method: 'get',
 		params: query
 	});
 }
 
 // 查询来料报告详细
-export function getIncome(recordId) {
+export function getProduce(recordId) {
 	return request({
-		url: '/quality/qcIncomeReport/' + recordId,
+		url: '/quality/qcProduceReport/' + recordId,
 		method: 'get'
 		});
 }
 
 // 新增来料报告
-export function addIncome(data) {
+export function addProduce(data) {
 	return request({
-		url: '/quality/qcIncomeReport',
+		url: '/quality/qcProduceReport',
 		method: 'post',
 		data: data
 	});
 }
 
 // 修改来料报告
-export function updateIncome(data) {
+export function updateProduce(data) {
 	return request({
-		url: '/quality/qcIncomeReport',
+		url: '/quality/qcProduceReport',
 		method: 'put',
 		data: data
 	});
 }
 
 // 删除来料报告
-export function delIncome(recordId) {
+export function delProduce(recordId) {
 	return request({
-		url: '/quality/qcIncomeReport/' + recordId,
+		url: '/quality/qcProduceReport/' + recordId,
 		method: 'delete'
 	});
 }
 
-// 查询BOM物料管理列表
-export function getQcListBom(query) {
-	return request({
-	  url: '/quality/qcIncomeReport/getQcListBom',
-	  method: 'get',
-	  params: query
-	});
-  }
-
-// 查询供应商管理列表
-export function getQcListSupplier(query) {
-	return request({
-	  url: '/quality/qcIncomeReport/getQcListSupplier',
-	  method: 'get',
-	  params: query
-	});
-  }
-
-// 查询人员列表
-export function getQcListUser(query) {
-	return request({
-	  url: '/quality/qcIncomeReport/getQcListUser',
-	  method: 'get',
-	  params: query
-	});
-  }
-
-//状态修改
-export function changeIncomeStatus(recordId, status) {
-	const data = {
-		recordId,
-	    status
-	}
-	return request({
-	  url: '/quality/qcIncomeReport/changeIncomeStatus',
-	  method: 'put',
-	  data: data
-	})
-  }
-
-// 查询检测项列表
-export function getCkeckProjectList(query) {
-	return request({
-	  url: '/quality/qcIncomeReport/getCkeckProjectList',
-	  method: 'get',
-	  params: query
-	});
-  }

src/api/quality/productReport.js

@@ -1,93 +1,45 @@
 import request from '@/utils/request'
 
-// 查询来料报告列表
+// 查询生产入库报告列表
-export function listIncome(query) {
+export function listProduct(query) {
 	return request({
-		url: '/quality/qcIncomeReport/list',
+		url: '/quality/qcProductReport/list',
 		method: 'get',
 		params: query
 	});
 }
 
-// 查询来料报告详细
+// 查询生产入库报告详细
-export function getIncome(recordId) {
+export function getProduct(recordId) {
 	return request({
-		url: '/quality/qcIncomeReport/' + recordId,
+		url: '/quality/qcProductReport/' + recordId,
 		method: 'get'
 		});
 }
 
-// 新增来料报告
+// 新增生产入库报告
-export function addIncome(data) {
+export function addProduct(data) {
 	return request({
-		url: '/quality/qcIncomeReport',
+		url: '/quality/qcProductReport',
 		method: 'post',
 		data: data
 	});
 }
 
-// 修改来料报告
+// 修改生产入库报告
-export function updateIncome(data) {
+export function updateProduct(data) {
 	return request({
-		url: '/quality/qcIncomeReport',
+		url: '/quality/qcProductReport',
 		method: 'put',
 		data: data
 	});
 }
 
-// 删除来料报告
+// 删除生产入库报告
-export function delIncome(recordId) {
+export function delProduct(recordId) {
 	return request({
-		url: '/quality/qcIncomeReport/' + recordId,
+		url: '/quality/qcProductReport/' + recordId,
 		method: 'delete'
 	});
 }
 
-// 查询BOM物料管理列表
-export function getQcListBom(query) {
-	return request({
-	  url: '/quality/qcIncomeReport/getQcListBom',
-	  method: 'get',
-	  params: query
-	});
-  }
-
-// 查询供应商管理列表
-export function getQcListSupplier(query) {
-	return request({
-	  url: '/quality/qcIncomeReport/getQcListSupplier',
-	  method: 'get',
-	  params: query
-	});
-  }
-
-// 查询人员列表
-export function getQcListUser(query) {
-	return request({
-	  url: '/quality/qcIncomeReport/getQcListUser',
-	  method: 'get',
-	  params: query
-	});
-  }
-
-//状态修改
-export function changeIncomeStatus(recordId, status) {
-	const data = {
-		recordId,
-	    status
-	}
-	return request({
-	  url: '/quality/qcIncomeReport/changeIncomeStatus',
-	  method: 'put',
-	  data: data
-	})
-  }
-
-// 查询检测项列表
-export function getCkeckProjectList(query) {
-	return request({
-	  url: '/quality/qcIncomeReport/getCkeckProjectList',
-	  method: 'get',
-	  params: query
-	});
-  }

src/views/quality/incomeReport/index.vue

@@ -73,7 +73,7 @@
 					icon="el-icon-download"
 					size="mini"
 					@click="handleExport"
-					v-hasPermi="['quality:qcIncomeReport:export']"
+					v-hasPermi="['quality:incomeReport:export']"
 				>导出</el-button>
 			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -101,7 +101,7 @@
 						type="text"
 						icon="el-icon-edit"
 						@click="handleLook(scope.row)"
-						v-hasPermi="['quality:qcIncomeReport:edit']"
+						v-hasPermi="['quality:incomeReport:edit']"
 					>查看</el-button>
 				</template>
 			</el-table-column>
@@ -245,7 +245,7 @@
 </template>
 
 <script>
-import { listIncome, getIncome, delIncome, addIncome, updateIncome,getCkeckProjectList,getWorkOrders} from "@/api/quality/incomeReport";
+import { listIncome, getIncome, delIncome, addIncome, updateIncome,getCkeckProjectList} from "@/api/quality/incomeReport";
 import { getCheckTypes } from "@/api/quality/qcProduce";
 import moment from 'moment';
 export default {

src/views/quality/produceReport/index.vue

@@ -245,7 +245,8 @@
 </template>
 
 <script>
-import { listIncome, getIncome, delIncome, addIncome, updateIncome,getCkeckProjectList,getWorkOrders} from "@/api/quality/produceReport";
+import { listProduce, getProduce, delProduce, addProduce, updateIncome} from "@/api/quality/produceReport";
+import { getCkeckProjectList} from "@/api/quality/incomeReport";
 import { getCheckTypes } from "@/api/quality/qcProduce";
 import moment from 'moment';
 export default {
@@ -365,7 +366,7 @@ export default {
 				this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}
 
-			listIncome(this.queryParams).then(response => {
+			listProduce(this.queryParams).then(response => {
 				this.incomeList = response.rows;
 				this.total = response.total;
 				this.loading = false;
@@ -438,7 +439,7 @@ export default {
 			this.reset();
 			const recordId = row.recordId || this.ids
 			this.queryParams.recordId = recordId;
-			getIncome(recordId).then(response => {
+			getProduce(recordId).then(response => {
 				this.form = response.data;
 				this.form.printable = 'printFrom'; //打印时需要
 				this.form.ignore = ['no-print'];//打印时需要
@@ -458,7 +459,7 @@ export default {
 							this.getList();
 						});
 					} else {
-						addIncome(this.form).then(response => {
+						addProduce(this.form).then(response => {
 							this.$modal.msgSuccess("新增成功");
 							this.open = false;
 							this.getList();
@@ -471,7 +472,7 @@ export default {
 		handleDelete(row) {
 			const recordIds = row.recordId || this.ids;
 			this.$modal.confirm('是否确认删除来料检验编号为"' + recordIds + '"的数据项？').then(function() {
-				return delIncome(recordIds);
+				return delProduce(recordIds);
 			}).then(() => {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");

src/views/quality/productReport/index.vue

@@ -73,7 +73,7 @@
 					icon="el-icon-download"
 					size="mini"
 					@click="handleExport"
-					v-hasPermi="['quality:qcIncomeReport:export']"
+					v-hasPermi="['quality:productReport:export']"
 				>导出</el-button>
 			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -101,7 +101,7 @@
 						type="text"
 						icon="el-icon-edit"
 						@click="handleLook(scope.row)"
-						v-hasPermi="['quality:qcIncomeReport:edit']"
+						v-hasPermi="['quality:productReport:edit']"
 					>查看</el-button>
 				</template>
 			</el-table-column>
@@ -245,7 +245,8 @@
 </template>
 
 <script>
-import { listIncome, getIncome, delIncome, addIncome, updateIncome,getCkeckProjectList,getWorkOrders} from "@/api/quality/productReport";
+import { listProduct, getProduct, delProduct, addProduct, updateProduct,getWorkOrders} from "@/api/quality/productReport";
+import { getCkeckProjectList} from "@/api/quality/incomeReport";
 import { getCheckTypes } from "@/api/quality/qcProduce";
 import moment from 'moment';
 export default {
@@ -365,7 +366,7 @@ export default {
 				this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}
 
-			listIncome(this.queryParams).then(response => {
+			listProduct(this.queryParams).then(response => {
 				this.incomeList = response.rows;
 				this.total = response.total;
 				this.loading = false;
@@ -438,7 +439,7 @@ export default {
 			this.reset();
 			const recordId = row.recordId || this.ids
 			this.queryParams.recordId = recordId;
-			getIncome(recordId).then(response => {
+			getProduct(recordId).then(response => {
 				this.form = response.data;
 				this.form.printable = 'printFrom'; //打印时需要
 				this.form.ignore = ['no-print'];//打印时需要
@@ -452,13 +453,13 @@ export default {
 			this.$refs["form"].validate(valid => {
 				if (valid) {
 					if (this.form.recordId != null) {
-						updateIncome(this.form).then(response => {
+						updateProduct(this.form).then(response => {
 							this.$modal.msgSuccess("修改成功");
 							this.open = false;
 							this.getList();
 						});
 					} else {
-						addIncome(this.form).then(response => {
+						addProduct(this.form).then(response => {
 							this.$modal.msgSuccess("新增成功");
 							this.open = false;
 							this.getList();
@@ -471,7 +472,7 @@ export default {
 		handleDelete(row) {
 			const recordIds = row.recordId || this.ids;
 			this.$modal.confirm('是否确认删除来料检验编号为"' + recordIds + '"的数据项？').then(function() {
-				return delIncome(recordIds);
+				return delProduct(recordIds);
 			}).then(() => {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");