mt-fe-group/qms
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
‘937886381’
2023-06-30 17:03:47 +08:00
parent ae1a9c1883
commit 3c93b8045a
17 changed files with 420 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/modules/basic/components/control-add.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-14 15:02:26
* @LastEditTime: 2023-06-26 09:44:09
* @LastEditTime: 2023-06-30 16:58:55
* @LastEditors: zhp
* @Description:
-->
@@ -20,7 +20,7 @@
<el-switch v-model="dataForm.incomingInspection" :active-value="1" :inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item prop="finishInspection" :label="$t('basic.stock')">
<el-form-item prop="finishInspection" :label="$t('basic.finishedProduct')">
<el-switch v-model="dataForm.finishInspection" :active-value="1" :inactive-value="0">
</el-switch>
</el-form-item>
@@ -32,8 +32,8 @@
<el-switch v-model="dataForm.processInspection" :active-value="1" :inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item prop="customerTypeStatus" :label="$t('basic.status')">
<el-select v-model="dataForm.customerTypeStatus" :placeholder="$t('basic.status')">
<el-form-item prop="controlStatus" :label="$t('basic.status')">
<el-select v-model="dataForm.controlStatus" :placeholder="$t('basic.status')">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -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()
}
});
},

4
src/views/modules/basic/components/customerSearch.vue
View File

@@ -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:
-->
<template>
@@ -126,7 +126,7 @@ export default {
})
},
handleConditionSearch() {
this.$emit("successSubmit", this.dataForm.key);
this.$emit("successSubmit", this.dataForm);
},
// dataFormSubmitHandle: debounce(
// function () {

11
src/views/modules/basic/components/planBtn.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-31 09:49:36
* @LastEditTime: 2023-05-17 15:00:50
* @LastEditTime: 2023-06-30 16:54:37
* @LastEditors: zhp
* @Description:
-->
@@ -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 {

10
src/views/modules/basic/components/product-add.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-14 15:02:26
* @LastEditTime: 2023-04-04 15:35:31
* @LastEditTime: 2023-06-30 08:57:14
* @LastEditors: zhp
* @Description:
-->
@@ -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);

4
src/views/modules/basic/components/radio.vue
View File

@@ -1,16 +1,16 @@
<!--
* @Author: zhp
* @Date: 2023-01-31 14:12:10
* @LastEditTime: 2023-01-31 16:47:32
* @LastEditTime: 2023-06-30 17:00:43
* @LastEditors: zhp
* @Description:
-->
<template>
<span>
<el-radio v-model="injectData.incomingInspection" :label="1">{{ $t('basic.stock') }}</el-radio>
<el-radio v-model="injectData.processInspection" :label="1">{{ $t('basic.course') }}</el-radio>
<el-radio v-model="injectData.finishInspection" :label="1">{{ $t('basic.finishedProduct') }}</el-radio>
<el-radio v-model="injectData.outInspection" :label="1">{{ $t('basic.shipment') }}</el-radio>
<el-radio v-model="injectData.processInspection" :label="1">{{ $t('basic.course') }}</el-radio>
</span>
</template>

44
src/views/modules/basic/components/showProductList.vue
View File

@@ -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:
-->
<template>
@@ -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(() => { })

37
src/views/modules/basic/components/teamMember-add.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-14 15:02:26
* @LastEditTime: 2023-06-26 15:01:44
* @LastEditTime: 2023-06-30 09:58:35
* @LastEditors: zhp
* @Description:
-->
@@ -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")
},
});

22
src/views/modules/basic/qmsControlMode.vue
View File

@@ -21,12 +21,12 @@
</base-dialog>
<base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
@confirm="handleConfirm" :before-close="handleCancel">
<control-add ref="addOrUpdate" @successSubmit="successSubmit"></control-add>
<control-add ref="addOrUpdate" @refreshDataList="successSubmit"></control-add>
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
@confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<control-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit"></control-search>
<control-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></control-search>
<el-row slot="footer" type="flex" justify="end">
<el-col :span="12">
<el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
@@ -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 = '新增'

4
src/views/modules/basic/qmsCustomer.vue
View File

@@ -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}]进行删除操作?`, "提示", {

2
src/views/modules/basic/qmsCustomerType.vue
View File

@@ -21,7 +21,7 @@
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
@confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<customerType-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit"></customerType-search>
<customerType-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></customerType-search>
<el-row slot="footer" type="flex" justify="end">
<el-col :span="12">
<el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">

4
src/views/modules/basic/qmsFailureType.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-06-20 15:37:39
* @LastEditTime: 2023-06-29 17:02:33
* @LastEditors: zhp
* @Description:
-->
@@ -27,7 +27,7 @@
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
@confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<failureType-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit"></failureType-search>
<failureType-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></failureType-search>
<el-row slot="footer" type="flex" justify="end">
<el-col :span="12">
<el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">

7
src/views/modules/basic/qmsProduct.vue
View File

@@ -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();