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

Merge pull request 'zhp' (#13) from zhp into master

Browse Source 
Reviewed-on: #13
This commit is contained in:
张昊鹏 2023-07-06 16:49:16 +08:00
commit a4d6939e94
12 changed files with 239 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/i18n/zh-CN.js
View File

@ -352,6 +352,9 @@ t.quality.relaxedToNormal = '放宽转正常'
t.quality.tightenedToNormal = '加严转正常'
t.quality.productName = '检验产品'
t.quality.transferTime = '转移时间'
t.quality.inspectionType = '检验类型'
t.quality.measuringTools = '量具'

3
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-30 16:58:55
* @LastEditTime: 2023-07-06 15:25:10
* @LastEditors: zhp
* @Description:
-->
@ -71,6 +71,7 @@ export default {
incomingInspection: null,
outInspection: null,
processInspection: null,
specification:null
},
};
},

138
src/views/modules/quality/components/inspectionPositionSearch.vue Normal file
View File

@ -0,0 +1,138 @@
<!--
* @Author: zwq
* @Date: 2023-01-04 10:29:40
* @LastEditors: zhp
* @LastEditTime: 2023-07-06 16:27:59
* @Description:
-->
<template>
<el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form-item prop="name" :label="$t('basic.name')">
<el-input v-model="dataForm.name" :placeholder="$t('basic.name')"></el-input>
</el-form-item>
<el-form-item prop="code" :label="$t('basic.code')">
<el-input v-model="dataForm.code" :placeholder="$t('basic.code')"></el-input>
</el-form-item>
</el-form>
</template>
<script>
import debounce from "lodash/debounce";
import basicAdd from "@/mixins/basic-add";
export default {
mixins: [basicAdd],
data() {
return {
// urlOptions: {
// submitURL: "/sys/params/",
// infoURL: "/sys/params",
// },
urlOptions: {
getSupplierList: "/supplier/qmsSupplier/page",
getProductList: "/basic/qmsProduct/page",
},
visible: false,
customerTypeList:{},
dataForm: {
code: null,
name:null,
}
};
},
computed: {
// dataRule() {
// return {
// paramCode: [
// {
// required: true,
// message: this.$t("validate.required"),
// trigger: "blur",
// },
// ],
// paramValue: [
// {
// required: true,
// message: this.$t("validate.required"),
// trigger: "blur",
// },
// ],
// };
// },
},
methods: {
// init(id) {
// this.dataForm.id = id || "";
// this.visible = true;
// this.$nextTick(() => {
// this.$refs["dataForm"].resetFields();
// if (this.dataForm.id) {
// this.getInfo();
// }
// });
// },
// 获取信息
// getInfo() {
// this.$http
// .get(`/sys/params/${this.dataForm.id}`)
// .then(({ data: res }) => {
// if (res.code !== 0) {
// return this.$message.error(res.msg);
// }
// this.dataForm = {
// ...this.dataForm,
// ...res.data,
// };
// })
// .catch(() => {});
// },
// 表单提交
// getDict() {
// this.$http
// .get(this.urlOptions.getCustomerPageListURL, {
// params: this.listQuery,
// })
// .then(({ data: res }) => {
// this.dataListLoading = false;
// if (res.code !== 0) {
// this.customerTypeList = res.data
// }
// })
// },
handleConditionSearch() {
this.$emit("successSubmit", this.dataForm)
},
// dataFormSubmitHandle: debounce(
// function () {
// // console.log(1111);
// // this.visible = false;
// this.$emit("successSubmit", this.dataForm.key);
// // this.$refs["dataForm"].validate((valid) => {
// // if (!valid) {
// // return false;
// // }
// // this.$http[!this.dataForm.id ? "post" : "put"](
// // "/sys/params",
// // this.dataForm
// // )
// // .then(({ data: res }) => {
// // if (res.code !== 0) {
// // return this.$message.error(res.msg);
// // }
// // this.$message({
// // message: this.$t("prompt.success"),
// // type: "success",
// // duration: 500,
// // onClose: () => {
// // },
// // });
// // })
// // .catch(() => {});
// // });
// },
// 1000,
// { leading: true, trailing: false }
// ),
},
};
</script>

25
src/views/modules/quality/components/transferRecords-add.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-14 15:02:26
* @LastEditTime: 2023-05-24 16:36:43
* @LastEditTime: 2023-07-06 15:58:51
* @LastEditors: zhp
* @Description:
-->
@ -13,8 +13,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="inspectionType" :label="$t('quality.inspectionStage')">
<el-select v-model="dataForm.inspectionType" :placeholder="$t('quality.inspectionStage')">
<el-form-item prop="inspectionType" :label="$t('quality.inspectionType')">
<el-select v-model="dataForm.inspectionType" :placeholder="$t('quality.inspectionType')">
<el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@ -155,6 +155,10 @@ export default {
}
],
visible: false,
listQuery: {
limit: 999,
page:1,
},
dataForm: {
id: null,
inspectionStage:null,
@ -196,6 +200,9 @@ export default {
};
},
},
mounted () {
this.getData();
},
methods: {
init(id, ) {
this.dataForm.id = id || ""
@ -212,7 +219,9 @@ export default {
});
},
getData() {
this.$http.post(this.urlOptions.getSupplierList)
this.$http.get(this.urlOptions.getSupplierList, {
params:this.listQuery
})
.then(({ data: res }) => {
if (res.code === 0) {
console.log(res);
@ -221,7 +230,9 @@ export default {
})
.catch(() => {
})
this.$http.post(this.urlOptions.getProductList)
this.$http.get(this.urlOptions.getProductList, {
params: this.listQuery
})
.then(({ data: res }) => {
if (res.code === 0) {
console.log(res);
@ -230,7 +241,9 @@ export default {
})
.catch(() => {
})
this.$http.post(this.urlOptions.getTransferSchemeListURL)
this.$http.get(this.urlOptions.getTransferSchemeListURL, {
params: this.listQuery
})
.then(({ data: res }) => {
if (res.code === 0) {
console.log(res);

18
src/views/modules/quality/components/transferRecordsSearch.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-01-04 10:29:40
* @LastEditors: zhp
* @LastEditTime: 2023-05-24 16:39:37
* @LastEditTime: 2023-07-06 16:26:20
* @Description:
-->
<template>
@ -134,6 +134,12 @@ export default {
getSupplierList: "/supplier/qmsSupplier/page",
getProductList: "/basic/qmsProduct/page",
},
productList: [],
supplierList:[],
listQuery: {
limit: 999,
page:1
},
visible: false,
customerTypeList:{},
dataForm: {
@ -146,7 +152,7 @@ export default {
};
},
mounted () {
this.getData();
this.getData()
},
computed: {
// dataRule() {
@ -170,7 +176,9 @@ export default {
},
methods: {
getData() {
this.$http.post(this.urlOptions.getSupplierList)
this.$http.get(this.urlOptions.getSupplierList, {
params:this.listQuery
})
.then(({ data: res }) => {
if (res.code === 0) {
console.log(res);
@ -179,7 +187,9 @@ export default {
})
.catch(() => {
})
this.$http.post(this.urlOptions.getProductList)
this.$http.get(this.urlOptions.getProductList, {
params: this.listQuery
})
.then(({ data: res }) => {
if (res.code === 0) {
console.log(res);

38
src/views/modules/quality/components/transferScheme-add.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-14 15:02:26
* @LastEditTime: 2023-05-26 11:21:02
* @LastEditTime: 2023-07-06 16:12:01
* @LastEditors: zhp
* @Description:
-->
@ -22,24 +22,6 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item prop="criticalSampleSize">
(1)正常检查转入放宽检查：最近
<el-input v-model="dataForm.normalToRelaxedOne" style="width: 10%;">
</el-input>
批中的
<el-input v-model="dataForm.normalToRelaxedTwo" style="width: 10%;">
</el-input>
批检验合格
</el-form-item>
<el-form-item prop="criticalSampleSize">
(2)放宽检查恢复正常检查：最近
<el-input v-model="dataForm.relaxedToNormalOne" style="width: 10%;">
</el-input>
批中的
<el-input v-model="dataForm.relaxedToNormalTwo" style="width: 10%;">
</el-input>
批检验合格
</el-form-item>
<el-form-item prop="criticalSampleSize">
(3)正常检查转入加严检查：最近
<el-input v-model="dataForm.normalToTightenedOne" style="width: 10%;">
@ -58,6 +40,24 @@
</el-input>
批检验合格
</el-form-item>
<el-form-item prop="criticalSampleSize">
(1)正常检查转入放宽检查：最近
<el-input v-model="dataForm.normalToRelaxedOne" style="width: 10%;">
</el-input>
批中的
<el-input v-model="dataForm.normalToRelaxedTwo" style="width: 10%;">
</el-input>
批检验合格
</el-form-item>
<el-form-item prop="criticalSampleSize">
(2)放宽检查恢复正常检查：最近
<el-input v-model="dataForm.relaxedToNormalOne" style="width: 10%;">
</el-input>
批中的
<el-input v-model="dataForm.relaxedToNormalTwo" style="width: 10%;">
</el-input>
批检验合格
</el-form-item>
</el-form>
</template>

14
src/views/modules/quality/components/transferSchemeSearch.vue
View File

@ -2,16 +2,16 @@
* @Author: zwq
* @Date: 2023-01-04 10:29:40
* @LastEditors: zhp
* @LastEditTime: 2023-05-24 16:01:06
* @LastEditTime: 2023-07-06 16:32:10
* @Description:
-->
<template>
<el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form-item prop="transferSchemeCode" :label="$t('basic.code')">
<el-input v-model="dataForm.transferSchemeCode" :placeholder="$t('basic.code')"></el-input>
<el-form-item prop="name" :label="$t('basic.name')">
<el-input v-model="dataForm.transferSchemeName" :placeholder="$t('basic.name')"></el-input>
</el-form-item>
<el-form-item prop="transferSchemeName" :label="$t('basic.code')">
<el-input v-model="dataForm.transferSchemeName" :placeholder="$t('basic.code')"></el-input>
<el-form-item prop="code" :label="$t('basic.code')">
<el-input v-model="dataForm.transferSchemeCode" :placeholder="$t('basic.code')"></el-input>
</el-form-item>
</el-form>
</template>
@ -33,8 +33,8 @@ export default {
visible: false,
customerTypeList:{},
dataForm: {
transferSchemeName: null,
transferSchemeCode:null
name: null,
code:null
}
};
},

6
src/views/modules/quality/qmsCustomSampling.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-06-02 13:54:08
* @LastEditTime: 2023-07-06 15:37:26
* @LastEditors: zhp
* @Description:
-->
@ -220,7 +220,7 @@ export default {
// console.log(key);
// console.log(key);
// this.listQuery.key = key;
this.listQuery.customSamplingCode = dataForm.customSamplingCode
this.listQuery.key = dataForm.customSamplingCode
// this.listQuery.name = dataForm.name
// this.listQuery.failureTypeStatus = dataForm.failureTypeStatus
this.listQuery.page = 1
@ -267,7 +267,7 @@ export default {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.page = 1;
this.listQuery.failureTypeStatus = null
this.listQuery.key = null
this.getDataList();
break;
case "add":

14
src/views/modules/quality/qmsDisposalMethod.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-06-02 13:53:56
* @LastEditTime: 2023-07-06 15:39:55
* @LastEditors: zhp
* @Description:
-->
@ -23,12 +23,12 @@
<base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
@confirm="handleConfirm" :before-close="handleCancel">
<disposalMethod-add ref="addOrUpdate" @refreshDataList="successSubmit">
</disposalMethod-add>
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
</disposalMethod-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">
<disposalMethod-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit"></disposalMethod-search>
<disposalMethod-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></disposalMethod-search>
<el-row slot="footer" type="flex" justify="end">
<el-col :span="12">
<el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
@ -145,11 +145,11 @@ export default {
this.searchOrEditTitle = "搜索";
this.searchOrUpdateVisible = true;
this.$nextTick(() => {
this.$refs.searchOrUpdate.init();
this.$refs.searchOrUpdate.init()
});
},
conditionSearchSubmit(dataForm) {
this.listQuery.disposalMethodStatus = dataForm.disposalMethodStatus
this.listQuery.key = dataForm.disposalMethodStatus
this.listQuery.page = 1;
this.getDataList();
this.searchOrUpdateVisible = false;
@ -194,7 +194,7 @@ export default {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.page = 1;
this.listQuery.failureTypeStatus = null
this.listQuery.key = null
this.getDataList();
break;
case "add":

21
src/views/modules/quality/qmsInspectionPosition.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-06-02 13:53:49
* @LastEditTime: 2023-07-06 16:28:17
* @LastEditors: zhp
* @Description:
-->
@ -9,9 +9,9 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__user">
<SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
<!-- <el-badge :value="1" class="item">
<el-badge :value="2" class="item">
<el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
</el-badge> -->
</el-badge>
</SearchBar>
<base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
@ -23,12 +23,13 @@
<base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
@confirm="handleConfirm" :before-close="handleCancel">
<InspectionPosition-add ref="addOrUpdate" @refreshDataList="successSubmit">
</InspectionPosition-add>
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
</InspectionPosition-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">
<!-- <failureType-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit"></failureType-search> -->
<inspectionPosition-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit">
</inspectionPosition-search>
<el-row slot="footer" type="flex" justify="end">
<el-col :span="12">
<el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
@ -50,7 +51,7 @@
import basicPage from "@/mixins/basic-page"
import InspectionPositionAdd from "./components/InspectionPosition-add"
// import AddOrUpdate from './params-add-or-update'
// import failureTypeSearch from "./components/failureTypeSearch"
import inspectionPositionSearch from "./components/inspectionPositionSearch"
// import available from "./components/available.vue"
import basicSearch from "@/mixins/basic-search"
import i18n from "@/i18n"
@ -85,6 +86,7 @@ export default {
mixins: [basicPage, basicSearch],
components: {
// failureTypeSearch,
inspectionPositionSearch,
InspectionPositionAdd
},
data() {
@ -144,6 +146,8 @@ export default {
},
conditionSearchSubmit(dataForm) {
this.listQuery.code = dataForm.code
this.listQuery.name = dataForm.name
this.listQuery.page = 1;
this.getDataList();
this.searchOrUpdateVisible = false;
@ -188,7 +192,8 @@ export default {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.page = 1;
this.listQuery.failureTypeStatus = null
this.listQuery.name = null
this.listQuery.code = null
this.getDataList();
break;
case "add":

11
src/views/modules/quality/qmsTransferRecords.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-06-02 13:53:38
* @LastEditTime: 2023-07-06 16:33:15
* @LastEditors: zhp
* @Description:
-->
@ -28,7 +28,7 @@
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
@confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<transferRecords-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
<transferRecords-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit">
</transferRecords-search>
<el-row slot="footer" type="flex" justify="end">
<el-col :span="12">
@ -215,7 +215,12 @@ export default {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.page = 1;
this.listQuery.failureTypeStatus = null
this.listQuery.startTime = null
this.listQuery.endTime = null
this.listQuery.inspectionStage = null
this.listQuery.inspectionTypeId = null
this.listQuery.productId = null
this.listQuery.supplierId = null
this.getDataList();
break;
case "add":

12
src/views/modules/quality/qmsTransferScheme.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-06-02 13:53:32
* @LastEditTime: 2023-07-06 16:32:40
* @LastEditors: zhp
* @Description:
-->
@ -28,7 +28,7 @@
</base-dialog>
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
@confirm="handleSearchConfirm" :before-close="handleSearchCancel">
<transferScheme-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
<transferScheme-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit">
</transferScheme-search>
<el-row slot="footer" type="flex" justify="end">
<el-col :span="12">
@ -168,9 +168,8 @@ export default {
});
},
conditionSearchSubmit(dataForm) {
this.listQuery.transferSchemeCode = dataForm.transferSchemeCode
this.listQuery.transferSchemeName = dataForm.transferSchemeName
this.listQuery.name = dataForm.name
this.listQuery.code = dataForm.code
this.listQuery.page = 1;
this.getDataList();
this.searchOrUpdateVisible = false;
@ -215,7 +214,8 @@ export default {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.page = 1;
this.listQuery.failureTypeStatus = null
this.listQuery.code = null
this.listQuery.name = null
this.getDataList();
break;
case "add":