diff --git a/src/api/quality/income.js b/src/api/quality/income.js
index 177511a..d8c9e08 100644
--- a/src/api/quality/income.js
+++ b/src/api/quality/income.js
@@ -120,11 +120,12 @@ export function commitActualValue(recordId, actualValues) {
}
//审核结果提交
-export function commitCheckResult(recordId,typeCode,checkType) {
+export function commitCheckResult(recordId,typeCode,checkType,orderNo) {
const data = {
recordId,
typeCode,
- checkType
+ checkType,
+ orderNo
}
return request({
url: '/quality/qcIncome/commitCheckResult',
@@ -142,4 +143,13 @@ export function getDefectList(defectType) {
method: 'put',
data: data
});
-}
\ No newline at end of file
+}
+
+// 查询人员列表
+export function getLLWorkOrder(query) {
+ return request({
+ url: '/quality/qcIncome/getLLWorkOrder',
+ method: 'get',
+ params: query
+ });
+ }
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 5c3f24e..a93c201 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -16,7 +16,14 @@
-
+
+
+
+
+
@@ -98,7 +105,7 @@
import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,commitCheckResult,getDefectList } from "@/api/quality/income";
export default {
name: "itemSelectUser",
- dicts: ["check_result"],
+ dicts: ["check_result","qc_rule_prop"],
data() {
return {
showFlag:false,
@@ -150,7 +157,7 @@ export default {
methods: {
getDefect(){
- getDefectList('defect_produce').then(response => {
+ getDefectList('defect_in').then(response => {
this.defectList = response;
});
},
@@ -160,6 +167,7 @@ export default {
this.queryParams.belongTo = this.data.recordId;
this.typeCode = typeCode;
this.checkType = this.data.checkType;
+ this.orderNo = this.data.orderNo;
this.getList();
},
@@ -188,7 +196,7 @@ export default {
//提交整体检测结果
submitBomForm() {
- commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType).then(response => {
+ commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType,this.orderNo).then(response => {
this.$modal.msgSuccess("检测完成");
this.$emit('saveCheck');
this.showFlag = false;
diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index 28c24a6..ab77a97 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -138,7 +138,7 @@
-
+
@@ -214,23 +214,30 @@
-
-
-
+
+
+
+
+
-
+
+
+
-
-
-
+
@@ -239,16 +246,9 @@
-
-
-
-
-
+
+
+
@@ -325,11 +325,11 @@
取 消
-
-
+
+
import { listIncome, getIncome, delIncome, addIncome, updateIncome ,changeIncomeStatus} from "@/api/quality/income";
import { getCheckTypes } from "@/api/quality/qcProduce";
-import ItemSelectMaterial from "./selectMaterial.vue";
+import ItemSelectWorkOrder from "./selectLLWorkOrder.vue";
import ItemSelectSupplier from "./selectSupplier.vue";
import ItemSelectUser from "./selectUser.vue";
import ItemSelectProject from "./checkProjectType.vue";
import moment from 'moment';
export default {
name: "Income",
- components: { ItemSelectMaterial,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
+ components: { ItemSelectWorkOrder,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
dicts: ["unit","check_status","check_result"],
data() {
return {
@@ -414,6 +414,9 @@ export default {
checkTypes:[],
// 表单校验
rules: {
+ checkType:[
+ { required: true, message: "检验类型不能为空", trigger: "blur" }
+ ],
incomeBatchNo: [
{ required: true, message: "来料批次号不能为空", trigger: "blur" }
],
@@ -611,14 +614,21 @@ export default {
});
},
- /**物料选择弹出框**/
- handleSelectMaterial() {
- this.$refs.itemSelectMaterial.showFlag = true;
+ /**工单选择弹出框**/
+ handleSelectWorkOrder() {
+ this.$refs.itemSelectWorkOrder.showFlag = true;
},
- //物料选择确认
- onSelectMaterial(obj) {
- this.form.materialCode = obj.code;
- this.form.materialName = obj.name;
+ //工单选择确认
+ onSelectWorkOrder(obj) {
+ this.form.orderNo = obj.orderNo;
+ this.form.materialName = obj.materialName;
+ this.form.materialCode = obj.materialCode;
+ this.form.quality = obj.quality;
+ this.form.incomeBatchNo = obj.incomeBatchNo;
+ this.form.unit = obj.unit;
+ this.form.supplierCode = obj.supplierCode;
+ this.form.supplierName = obj.supplierName;
+ this.form.incomeTime = obj.incomeTime;
},
/**供应商选择弹出框**/
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 05a92af..9c96725 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -242,56 +242,62 @@
+
-
-
+
+
+
+
-
-
+
+
-
-
-
+
-
+
-
-
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
+
+
@@ -336,13 +342,8 @@
-
-
-
+
+
@@ -371,11 +372,6 @@
取 消
-
-
import { listQcProduce, getQcProduce, delQcProduce, addQcProduce, updateQcProduce,getCheckTypes,changeProduceStatus } from "@/api/quality/qcProduce";
import moment from 'moment';
-import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
import ItemSelectWorkCenter from "./selectWorkCenter.vue";
import ItemSelectUser from "../qcIncome/selectUser.vue";
import ItemSelectProject from "../qcIncome/checkProjectType.vue";
export default {
name: "QcProduce",
- components: { ItemSelectMaterial,ItemSelectWorkCenter,ItemSelectUser,ItemSelectProject},
+ components: { ItemSelectWorkCenter,ItemSelectUser,ItemSelectProject},
dicts: ["unit","check_status","check_result"],
data() {
return {
@@ -660,16 +655,6 @@ export default {
});
},
- /**物料选择弹出框**/
- handleSelectMaterial() {
- this.$refs.itemSelectMaterial.showFlag = true;
- },
- //物料选择确认
- onSelectMaterial(obj) {
- this.form.materialCode = obj.code;
- this.form.materialName = obj.name;
- },
-
/**工作中心选择弹出框**/
handleSelectWorkCenter() {
this.$refs.itemSelectWorkCenter.showFlag = true;