diff --git a/package-lock.json b/package-lock.json
index c53c208..eec3ebe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3201,6 +3201,7 @@
"thread-loader": "^2.1.3",
"url-loader": "^2.2.0",
"vue-loader": "^15.9.2",
+ "vue-loader-v16": "npm:vue-loader@^16.1.0",
"vue-style-loader": "^4.1.2",
"webpack": "^4.0.0",
"webpack-bundle-analyzer": "^3.8.0",
@@ -16945,6 +16946,75 @@
}
}
},
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.8.3",
+ "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+ "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"vue-router": {
"version": "3.0.7",
"resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.0.7.tgz",
diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index d4dcc55..91bf96c 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -646,57 +646,9 @@ t.code.uploaded = '已上传'
t.code.notUploaded = '未上传'
t.code.Examiner = '检验人'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
t.dictionary = {}
t.dictionary.name = ' 名称'
t.dictionary.code = ' 编码'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
export default t
diff --git a/src/views/modules/basic/components/control-add.vue b/src/views/modules/basic/components/control-add.vue
index 5bfd3e3..c1a5ed2 100644
--- a/src/views/modules/basic/components/control-add.vue
+++ b/src/views/modules/basic/components/control-add.vue
@@ -1,7 +1,7 @@
@@ -20,7 +20,7 @@
-
+
@@ -32,8 +32,8 @@
-
-
+
+
@@ -49,8 +49,8 @@ export default {
data() {
return {
urlOptions: {
- submitURL: "/basic/qmsCustomerType",
- infoURL: "/basic/qmsCustomerType/{id}",
+ submitURL: "/basic/qmsControlMode",
+ infoURL: "/basic/qmsControlMode/{id}",
getCodeURL: '/basic/qmsControlMode/getCode'
},
options: [{
@@ -66,7 +66,7 @@ export default {
id: "",
controlCode:null,
controlName:null,
- customerTypeStatus: null,
+ controlStatus: null,
finishInspection: null,
incomingInspection: null,
outInspection: null,
@@ -106,13 +106,14 @@ export default {
methods: {
init(id, ) {
this.dataForm.id = id || ""
- this.getControlCode()
// this.dataForm.dictTypeId = dictTypeId || "";
this.visible = true
this.$nextTick(() => {
this.$refs["dataForm"].resetFields();
if (this.dataForm.id) {
this.getInfo();
+ } else {
+ this.getControlCode()
}
});
},
diff --git a/src/views/modules/basic/components/customerSearch.vue b/src/views/modules/basic/components/customerSearch.vue
index 2679c7d..f96d874 100644
--- a/src/views/modules/basic/components/customerSearch.vue
+++ b/src/views/modules/basic/components/customerSearch.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-01-04 10:29:40
* @LastEditors: zhp
- * @LastEditTime: 2023-02-20 08:52:46
+ * @LastEditTime: 2023-06-29 16:59:18
* @Description:
-->
@@ -126,7 +126,7 @@ export default {
})
},
handleConditionSearch() {
- this.$emit("successSubmit", this.dataForm.key);
+ this.$emit("successSubmit", this.dataForm);
},
// dataFormSubmitHandle: debounce(
// function () {
diff --git a/src/views/modules/basic/components/planBtn.vue b/src/views/modules/basic/components/planBtn.vue
index 60fe5df..d5d3773 100644
--- a/src/views/modules/basic/components/planBtn.vue
+++ b/src/views/modules/basic/components/planBtn.vue
@@ -1,7 +1,7 @@
@@ -22,6 +22,7 @@ export default {
},
data() {
return {
+ // injectData:{},
urlOptions: {
syncURL: "/basic/qmsProduct/connectAllProduct"
},
@@ -30,21 +31,23 @@ export default {
methods: {
// 子级
emitClick() {
+ console.log(this.injectData)
const data = {
id: this.injectData.id,
finishInspection: this.injectData.finishInspection,
incomingInspection: this.injectData.incomingInspection,
outInspection: this.injectData.outInspection,
- processInspection: this.injectData.outInspection
+ processInspection: this.injectData.processInspection
}
- this.$http.put(this.urlOptions.syncURL, { data }).then(({ data }) => {
+ this.$http.put(this.urlOptions.syncURL, data ).then(({ data }) => {
if (data && data.code === 0) {
this.$message({
message: "操作成功",
type: "success",
duration: 1500,
onClose: () => {
- this.$message.error(data.msg);
+ this.$message.error(data.msg)
+ // this.$parent.$parent.$parent.$parent.getDataList()
},
});
} else {
diff --git a/src/views/modules/basic/components/product-add.vue b/src/views/modules/basic/components/product-add.vue
index fdece86..6a28333 100644
--- a/src/views/modules/basic/components/product-add.vue
+++ b/src/views/modules/basic/components/product-add.vue
@@ -1,7 +1,7 @@
@@ -42,8 +42,8 @@ export default {
data() {
return {
urlOptions: {
- submitURL: "/basic/qmsProductType",
- infoURL: "/basic/qmsProductType/{id}",
+ submitURL: "/basic/qmsProduct",
+ infoURL: "/basic/qmsProduct/{id}",
getCodeURL: '/basic/qmsProduct/getCode',
getTypeListURL: '/basic/qmsProductType/page'
},
@@ -111,7 +111,7 @@ export default {
.then(({ data: res }) => {
if (res.code === 0) {
console.log(res);
- this.dataForm.productTypeCode = res.data
+ this.dataForm.productCode = res.data
}
})
.catch(() => {
@@ -130,7 +130,7 @@ export default {
// 获取信息
getInfo() {
this.$http
- .get(`/basic/qmsProductType/${this.dataForm.id}`)
+ .get(`/basic/qmsProduct/${this.dataForm.id}`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
diff --git a/src/views/modules/basic/components/radio.vue b/src/views/modules/basic/components/radio.vue
index ffc6ea6..87db89e 100644
--- a/src/views/modules/basic/components/radio.vue
+++ b/src/views/modules/basic/components/radio.vue
@@ -1,16 +1,16 @@
{{ $t('basic.stock') }}
- {{ $t('basic.course') }}
{{ $t('basic.finishedProduct') }}
{{ $t('basic.shipment') }}
+ {{ $t('basic.course') }}
diff --git a/src/views/modules/basic/components/showProductList.vue b/src/views/modules/basic/components/showProductList.vue
index f102a2a..9d78cd9 100644
--- a/src/views/modules/basic/components/showProductList.vue
+++ b/src/views/modules/basic/components/showProductList.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-01-04 10:29:40
* @LastEditors: zhp
- * @LastEditTime: 2023-02-14 14:12:11
+ * @LastEditTime: 2023-06-30 16:39:46
* @Description:
-->
@@ -122,7 +122,7 @@ export default {
},
methods: {
init(data) {
- console.log();
+ console.log(data)
// this.dataForm.id = id || "";
this.productData = data? data: {}
this.visible = true;
@@ -130,23 +130,28 @@ export default {
this.listQuery.controllerModeId = data ? data.id : null;
// this.$refs["dataForm"].resetFields();
// if (this.dataForm.id) {
- this.getDataList();
+ this.getDataList()
// }
});
},
- handleClick() {
+ handleClick(val) {
+ console.log(val)
if (val.type === "synchronous") {
- if (!this.listQuery.controllerModeId) {
+ console.log(val)
+ console.log(this.listQuery.controllerModeId)
+ if (!this.listQuery.controllerModeId === null) {
this.$message({
message: '请先选择控制模式',
type: 'warning'
});
} else {
- const data={
- controlCodeId: this.listQuery.controlCodeId,
+ const data = {
+ id:val.data.id,
+ controlCodeId: this.listQuery.controllerModeId,
finishInspection: this.productData.finishInspection,
- incomingInspection: this.productData.finishInspection,
- processInspection: this.productData.processInspection
+ incomingInspection: this.productData.incomingInspection,
+ processInspection: this.productData.processInspection,
+ outInspection: this.productData.outInspection
}
this.$http['put']('/basic/qmsProduct',data).then(({ data: res }) => {
if (res.code !== 0) {
@@ -157,8 +162,9 @@ export default {
type: 'success',
duration: 500,
onClose: () => {
- this.visible = false
- this.$emit('refreshDataList')
+ this.$nextTick(() => {
+ this.getDataList()
+ })
}
})
}).catch(() => { })
@@ -170,10 +176,12 @@ export default {
// });
} else if (val.type === 'cancel') {
const data = {
- controlCodeId: null,
- finishInspection: null,
- incomingInspection: null,
- processInspection: null
+ id: val.data.id,
+ controlCodeId: 0,
+ finishInspection: 0,
+ incomingInspection: 0,
+ processInspection: 0,
+ outInspection:0
}
this.$http['put']('/basic/qmsProduct', data).then(({ data: res }) => {
if (res.code !== 0) {
@@ -184,8 +192,10 @@ export default {
type: 'success',
duration: 500,
onClose: () => {
- this.visible = false
- this.$emit('refreshDataList')
+ this.$nextTick(() => {
+ this.getDataList()
+ })
+ // this.$emit('refreshDataList')
}
})
}).catch(() => { })
diff --git a/src/views/modules/basic/components/teamMember-add.vue b/src/views/modules/basic/components/teamMember-add.vue
index ac36b72..2b4b93b 100644
--- a/src/views/modules/basic/components/teamMember-add.vue
+++ b/src/views/modules/basic/components/teamMember-add.vue
@@ -1,7 +1,7 @@
@@ -33,9 +33,6 @@ export default {
chooseData: [],
urlOptions: {
submitURL: "/basic/qmsCustomer",
- getCustomerPageListURL: "/basic/qmsCustomerType/page",
- infoURL: "/basic/qmsCustomer/{id}",
- getCodeURL: '/basic/qmsCustomer/getCode',
getTeamMemberURL: '/basic/qmsTeamMember/page',
getUserListURL: '/sys/user/page',
editTeamMemberListURL: '/basic/qmsTeamMember'
@@ -84,10 +81,40 @@ export default {
};
},
},
+ destroyed() {
+ this.notChooseData = []
+ this.chooseData = []
+ },
methods: {
init(id,) {
this.teamId = id || ""
+ this.notChooseData = []
+ this.chooseData = []
// this.dataForm.dictTypeId = dictTypeId || "";
+ // this.$http
+ // .get(this.urlOptions.getTeamMemberURL, {
+ // params: {
+ // teamId: id
+ // }
+ // })
+ // .then(({ data: res }) => {
+ // console.log(res)
+ // this.dataListLoading = false;
+ // if (res.code === 0) {
+ // var data = res.data.memberDTOS
+ // for (let i = 0; i < data.length; i++) {
+ // this.chooseData.push(data[i].userId)
+ // }
+ // this.notChooseData = res.data.undefinedUserDTOS.map((item) => {
+ // return {
+ // key: item.id,
+ // label: item.userName
+ // }
+ // })
+ // console.log(this.chooseData)
+ // console.log(this.notChooseData)
+ // }
+ // })
this.$http
.get(this.urlOptions.getTeamMemberURL, {
params: {
@@ -179,6 +206,8 @@ export default {
duration: 500,
onClose: () => {
this.visible = false
+ this.notChooseData = []
+ this.chooseData = []
this.$emit("refreshDataList")
},
});
diff --git a/src/views/modules/basic/qmsControlMode.vue b/src/views/modules/basic/qmsControlMode.vue
index ab8fa43..4d6ee9d 100644
--- a/src/views/modules/basic/qmsControlMode.vue
+++ b/src/views/modules/basic/qmsControlMode.vue
@@ -21,12 +21,12 @@
-
+
-
+
@@ -189,12 +189,10 @@ export default {
// },
// conditionSearchSubmit() {},
conditionSearchSubmit(key) {
- // console.log(key);
- console.log(key);
- this.listQuery.key = key;
- this.listQuery.page = 1;
- this.getDataList(key);
- this.searchOrUpdateVisible = false;
+ this.listQuery.key = key
+ this.listQuery.page = 1
+ this.getDataList(key)
+ this.searchOrUpdateVisible = false
// console.log(11111);
// this.conditionSearchSubmit();
},
@@ -247,14 +245,14 @@ export default {
this.getDataList();
break;
case "correlation":
- this.productOrEditTitle = "产品";
- this.productOrUpdateVisible = true;
+ this.productOrEditTitle = "产品"
+ this.productOrUpdateVisible = true
// this.searchOrUpdateHandle(this.productData);
// this.searchOrUpdateVisible = true;
this.$nextTick(() => {
- this.$refs.productOrUpdate.init(this.productData);
+ this.$refs.productOrUpdate.init(this.productData)
});
- console.log(this.productId);
+ // console.log(this.productId);
break;
case "add":
this.addOrEditTitle = '新增'
diff --git a/src/views/modules/basic/qmsCustomer.vue b/src/views/modules/basic/qmsCustomer.vue
index 5747d1f..329b269 100644
--- a/src/views/modules/basic/qmsCustomer.vue
+++ b/src/views/modules/basic/qmsCustomer.vue
@@ -83,7 +83,7 @@ export default {
return {
urlOptions: {
getDataListURL: "/basic/qmsCustomer/page",
- deleteURL: "/basic/qmsCustomerType",
+ deleteURL: "/basic/qmsCustomer",
exportURL: '/basic/qmsCustomer/export'
},
tableProps,
@@ -166,7 +166,7 @@ export default {
// console.log(11111);
// this.conditionSearchSubmit();
},
- handleClick() {
+ handleClick(val) {
console.log(val);
if (val.type === "delete") {
this.$confirm(`确定对[名称=${val.data.customerName}]进行删除操作?`, "提示", {
diff --git a/src/views/modules/basic/qmsCustomerType.vue b/src/views/modules/basic/qmsCustomerType.vue
index 779c264..37f705c 100644
--- a/src/views/modules/basic/qmsCustomerType.vue
+++ b/src/views/modules/basic/qmsCustomerType.vue
@@ -21,7 +21,7 @@
-
+
diff --git a/src/views/modules/basic/qmsFailureType.vue b/src/views/modules/basic/qmsFailureType.vue
index 918f03b..9ad0c8f 100644
--- a/src/views/modules/basic/qmsFailureType.vue
+++ b/src/views/modules/basic/qmsFailureType.vue
@@ -1,7 +1,7 @@
@@ -27,7 +27,7 @@
-
+
diff --git a/src/views/modules/basic/qmsProduct.vue b/src/views/modules/basic/qmsProduct.vue
index 02a74f2..bf41786 100644
--- a/src/views/modules/basic/qmsProduct.vue
+++ b/src/views/modules/basic/qmsProduct.vue
@@ -158,7 +158,7 @@ export default {
this.searchOrEditTitle = "搜索";
this.searchOrUpdateVisible = true;
this.$nextTick(() => {
- this.$refs.searchOrUpdate.init();
+ this.$refs.searchOrUpdate.init()
});
},
// handleConfirm() {
@@ -171,7 +171,7 @@ export default {
this.listQuery.productName = dataForm.productName
this.listQuery.productCode = dataForm.productCode
this.listQuery.page = 1;
- this.getDataList();
+ this.getDataList()
this.searchOrUpdateVisible = false;
// console.log(11111);
// this.conditionSearchSubmit();
@@ -219,7 +219,8 @@ export default {
switch (val.btnName) {
case "search":
// this.listQuery.paramCode = val.paramCode;
- this.listQuery.key = null;
+ this.listQuery.productName = null
+ this.listQuery.productCode = null
// console.log(i18n);
this.listQuery.page = 1;
this.getDataList();
diff --git a/src/views/modules/gage/components/gageGrs-add.vue b/src/views/modules/gage/components/gageGrs-add.vue
index 40820d3..7e56b93 100644
--- a/src/views/modules/gage/components/gageGrs-add.vue
+++ b/src/views/modules/gage/components/gageGrs-add.vue
@@ -1,7 +1,7 @@
@@ -126,13 +126,96 @@
{{ $t('gage.tabularComputations') }}
-
+
+
diff --git a/src/views/modules/gage/qmsGageGrr.vue b/src/views/modules/gage/qmsGageGrr.vue
index d22f1a4..7816876 100644
--- a/src/views/modules/gage/qmsGageGrr.vue
+++ b/src/views/modules/gage/qmsGageGrr.vue
@@ -1,7 +1,7 @@
@@ -327,34 +327,3 @@ export default {
}
};
-