diff --git a/package.json b/package.json
index ebeb8cf..56fdc09 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,8 @@
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
"jsencrypt": "3.0.0-rc.1",
+ "less": "^3.9.0",
+ "less-loader": "^5.0.0",
"moment": "^2.29.4",
"nprogress": "0.2.0",
"print-js": "^1.6.0",
@@ -60,9 +62,7 @@
"vue-meta": "2.4.0",
"vue-router": "3.4.9",
"vuedraggable": "2.24.3",
- "vuex": "3.6.0",
- "less": "^3.9.0",
- "less-loader": "^5.0.0"
+ "vuex": "3.6.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.6",
diff --git a/src/api/quality/income.js b/src/api/quality/income.js
index 416fdcd..177511a 100644
--- a/src/api/quality/income.js
+++ b/src/api/quality/income.js
@@ -93,10 +93,11 @@ export function getCkeckProjectList(query) {
}
//合格不合格
-export function changeCheckDetailStatus(recordId, status) {
+export function changeCheckDetailStatus(recordId, status,defectCode) {
const data = {
recordId,
- status
+ status,
+ defectCode
}
return request({
url: '/quality/qcIncome/changeCheckDetailStatus',
@@ -131,3 +132,14 @@ export function commitCheckResult(recordId,typeCode,checkType) {
data: data
})
}
+
+export function getDefectList(defectType) {
+ const data = {
+ defectType
+ }
+ return request({
+ url: '/quality/qcIncome/getDefectList',
+ method: 'put',
+ data: data
+ });
+}
\ No newline at end of file
diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js
index 30a3cb9..3d4b655 100644
--- a/src/api/quality/qcTable.js
+++ b/src/api/quality/qcTable.js
@@ -18,3 +18,10 @@ export function getProduceChartData(query) {
});
}
+
+export function getWorkcenterList() {
+ return request({
+ url: '/quality/staticTable/getWorkcenterList',
+ method: 'get'
+ });
+}
\ No newline at end of file
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index b8c723c..0b89dec 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -774,12 +774,13 @@ export default {
// 派发-工单派发按钮操作
handleUpdateDown(row) {
var statusesArray = this.statuses;
+ /**
for (var i = 0; i < statusesArray.length; i++) {
if (statusesArray[i] == 'w1') {//已经下达的不允许操作
this.$modal.msgError("已经下达的订单不允许操作");
return
}
- }
+ }**/
this.loading = true;
let _this = this;
const workorderIds = row.workorderCode || this.codes;
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 3a0a437..5c3f24e 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -33,8 +33,16 @@
>
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/quality/qcTableProduce/selectMaterial.vue b/src/views/quality/qcTableProduce/selectMaterial.vue
new file mode 100644
index 0000000..c0c52f2
--- /dev/null
+++ b/src/views/quality/qcTableProduce/selectMaterial.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+