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-07-13 08:35:26 +08:00
parent 3e4dd9d694
commit d6e9fc79f2
39 changed files with 1195 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/modules/quality/components/InspectionPosition-add.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-14 15:02:26
* @LastEditTime: 2023-07-10 10:58:44
* @LastEditTime: 2023-07-12 14:39:06
* @LastEditors: zhp
* @Description:
-->
@@ -73,6 +73,13 @@ export default {
trigger: "blur",
},
],
inspectionPositionName: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
],
};
},
},

37
src/views/modules/quality/components/customSampling-add.vue
View File

@@ -6,7 +6,7 @@
* @Description:
-->
<template>
<el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
<el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
<el-form-item prop="customSamplingCode" :label="$t('basic.code')">
<el-input v-model="dataForm.customSamplingCode" :placeholder="$t('basic.code')">
</el-input>
@@ -131,27 +131,20 @@ export default {
computed: {
dataRule() {
return {
// dictLabel: [
// {
// required: true,
// message: this.$t("validate.required"),
// trigger: "blur",
// },
// ],
// dictValue: [
// {
// required: true,
// message: this.$t("validate.required"),
// trigger: "blur",
// },
// ],
// sort: [
// {
// required: true,
// message: this.$t("validate.required"),
// trigger: "blur",
// },
// ],
customSamplingCode: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
],
customSamplingName: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
]
};
},
},

41
src/views/modules/quality/components/samplingPlan-add.vue
View File

@@ -1,12 +1,13 @@
<!--
* @Author: zhp
* @Date: 2023-02-14 15:02:26
* @LastEditTime: 2023-07-10 14:13:18
* @LastEditTime: 2023-07-12 14:28:44
* @LastEditors: zhp
* @Description:
-->
<template>
<el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
<el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
label-width="130px">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item prop="sampleRangeLow" :label="$t('quality.sampleRangeLow')">
@@ -22,8 +23,10 @@
</el-col>
</el-row>
<el-form-item prop="inspectionLevel" :label="$t('quality.inspectionLevel')">
<el-input v-model="dataForm.inspectionLevel" :placeholder="$t('quality.inspectionLevel')">
</el-input>
<el-select v-model="dataForm.inspectionLevel" :placeholder="$t('quality.inspectionLevel')">
<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="sampleSizeCode" :label="$t('quality.sampleSizeCode')">
<el-input v-model="dataForm.sampleSizeCode" :placeholder="$t('quality.sampleSizeCode')">
@@ -114,6 +117,36 @@ export default {
label: '可用'
}],
visible: false,
options: [
{
id: 'S-1',
name: 'S-1'
},
{
id: 'S-2',
name: 'S-2'
},
{
id: 'S-3',
name: 'S-3'
},
{
id: 'S-4',
name: 'S-4'
},
{
id: 'Ⅰ',
name: 'Ⅰ'
},
{
id: 'Ⅱ',
name: 'Ⅱ'
},
{
id: 'Ⅲ',
name: 'Ⅲ'
}
],
dataForm: {
id: undefined,
fourPointZero: null,

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

@@ -1,12 +1,12 @@
<!--
* @Author: zhp
* @Date: 2023-02-14 15:02:26
* @LastEditTime: 2023-07-11 15:33:25
* @LastEditTime: 2023-07-12 14:34:59
* @LastEditors: zhp
* @Description:
-->
<template>
<el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
<el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
<el-form-item prop="inspectionStage" :label="$t('quality.inspectionStage')">
<el-select v-model="dataForm.inspectionStage" :placeholder="$t('quality.inspectionStage')">
<el-option v-for="item in inspectionStageList" :key="item.id" :label="item.name" :value="item.id">
@@ -189,27 +189,48 @@ export default {
computed: {
dataRule() {
return {
// dictLabel: [
// {
// required: true,
// message: this.$t("validate.required"),
// trigger: "blur",
// },
// ],
// dictValue: [
// {
// required: true,
// message: this.$t("validate.required"),
// trigger: "blur",
// },
// ],
// sort: [
// {
// required: true,
// message: this.$t("validate.required"),
// trigger: "blur",
// },
// ],
inspectionStage: [
{
required: true,
message: this.$t("validate.required"),
trigger: "change",
},
],
inspectionType: [
{
required: true,
message: this.$t("validate.required"),
trigger: "change",
},
],
supplierId: [
{
required: true,
message: this.$t("validate.required"),
trigger: "change",
},
],
productId: [
{
required: true,
message: this.$t("validate.required"),
trigger: "change",
},
],
transferInId: [
{
required: true,
message: this.$t("validate.required"),
trigger: "change",
},
],
transferOutId: [
{
required: true,
message: this.$t("validate.required"),
trigger: "change",
},
],
};
},
},

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

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-07-10 14:48:12
* @LastEditTime: 2023-07-12 14:30:40
* @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="1" 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"
@@ -178,20 +178,19 @@ export default {
searchOrEditTitle: '',
searchOrUpdateVisible: false,
formConfig: [
// {
// type: "",
// label: i18n.t("params.paramCode"),
// placeholder: i18n.t("params.paramCode"),
// param: "paramCode",
// },
// {
// type: "separate",
// },
{
type: 'input',
label: i18n.t('basic.code'),
placeholder: i18n.t('basic.code'),
param: 'customSamplingCode',
clearable: true
},
{
type: "button",
btnName: "新增",
name: "add",
color: "primary",
color: "success",
plain: true
},
{
type: "button",
@@ -273,8 +272,8 @@ export default {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.page = 1;
this.listQuery.key = null
this.getDataList();
this.listQuery.key = val.customSamplingCode ? val.val.customSamplingCode :null
this.getDataList()
break;
case "add":
this.addOrEditTitle = this.$t('add')

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

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-07-06 16:28:17
* @LastEditTime: 2023-07-12 14:43:09
* @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="2" 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"
@@ -100,20 +100,26 @@ export default {
searchOrEditTitle: '',
searchOrUpdateVisible: false,
formConfig: [
// {
// type: "",
// label: i18n.t("params.paramCode"),
// placeholder: i18n.t("params.paramCode"),
// param: "paramCode",
// },
// {
// type: "separate",
// },
{
type: 'input',
label: i18n.t('quality.code'),
placeholder: i18n.t('quality.code'),
param: 'code',
clearable: true
},
{
type: 'input',
label: i18n.t('quality.name'),
placeholder: i18n.t('quality.name'),
param: 'name',
clearable: true
},
{
type: "button",
btnName: "新增",
name: "add",
color: "primary",
color: "success",
plain: true
},
{
type: "button",
@@ -147,7 +153,6 @@ export default {
conditionSearchSubmit(dataForm) {
this.listQuery.code = dataForm.code
this.listQuery.name = dataForm.name
this.listQuery.page = 1;
this.getDataList();
this.searchOrUpdateVisible = false;
@@ -192,8 +197,8 @@ export default {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.page = 1;
this.listQuery.name = null
this.listQuery.code = null
this.listQuery.code = val.code ? val.code : null
this.listQuery.name = val.name ? val.name : null
this.getDataList();
break;
case "add":

70
src/views/modules/quality/qmsSamplingPlan.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-07-10 15:21:22
* @LastEditTime: 2023-07-12 14:22:56
* @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="2" 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"
@@ -169,27 +169,67 @@ export default {
tableBtn,
searchOrEditTitle: '',
searchOrUpdateVisible: false,
searchOrUpdateVisible: false,
formConfig: [
// {
// type: "",
// label: i18n.t("params.paramCode"),
// placeholder: i18n.t("params.paramCode"),
// param: "paramCode",
// },
// {
// type: "separate",
// },
{
type: 'input',
label: i18n.t('quality.sampleSize'),
placeholder: i18n.t('quality.sampleSize'),
param: 'sampleSize',
clearable: true
},
{
type: 'select',
label: i18n.t('quality.inspectionLevel'),
placeholder: i18n.t('quality.inspectionLevel'),
param: 'inspectionLevel',
selectOptions: [
{
id: 'S-1',
name: 'S-1'
},
{
id: 'S-2',
name: 'S-2'
},
{
id: 'S-3',
name: 'S-3'
},
{
id: 'S-4',
name: 'S-4'
},
{
id: 'Ⅰ',
name: 'Ⅰ'
},
{
id: 'Ⅱ',
name: 'Ⅱ'
},
{
id: 'Ⅲ',
name: 'Ⅲ'
}
],
clearable: true,
filterable: true
},
{
type: "button",
btnName: "新增",
name: "add",
color: "primary",
color: 'success',
plain: true
// plain: true,
},
{
type: "button",
btnName: "搜索",
name: "search",
color: "primary",
// plain: true,
}
],
};
@@ -265,8 +305,8 @@ export default {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.page = 1;
this.listQuery.inspectionLevel = null
this.listQuery.sampleSize = null
this.listQuery.inspectionLevel = val.inspectionLevel ? val.inspectionLevel :null
this.listQuery.sampleSize = val.sampleSize ? val.sampleSize :null
this.getDataList();
break;
case "add":

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

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-07-10 11:17:36
* @LastEditTime: 2023-07-12 14:30:03
* @LastEditors: zhp
* @Description:
-->
@@ -133,7 +133,8 @@ export default {
type: "button",
btnName: "新增",
name: "add",
color: "primary",
color: "success",
plain: true
},
{
type: "button",

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

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-01-11 09:24:58
* @LastEditTime: 2023-07-10 11:02:37
* @LastEditTime: 2023-07-12 14:32:41
* @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="2" 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"
@@ -123,20 +123,26 @@ export default {
searchOrEditTitle: '',
searchOrUpdateVisible: false,
formConfig: [
// {
// type: "",
// label: i18n.t("params.paramCode"),
// placeholder: i18n.t("params.paramCode"),
// param: "paramCode",
// },
// {
// type: "separate",
// },
{
type: 'input',
label: i18n.t('basic.name'),
placeholder: i18n.t('basic.name'),
param: 'name',
clearable: true
},
{
type: 'input',
label: i18n.t('basic.code'),
placeholder: i18n.t('basic.code'),
param: 'code',
clearable: true
},
{
type: "button",
btnName: "新增",
name: "add",
color: "primary",
color: "success",
plain: true
},
{
type: "button",
@@ -147,10 +153,6 @@ export default {
],
};
},
deactivated() {
this.listQuery.name = null
this.listQuery.code = null
},
methods: {
//search-bar点击
handleProductCancel() {
@@ -215,8 +217,8 @@ export default {
case "search":
// this.listQuery.paramCode = val.paramCode;
this.listQuery.page = 1;
this.listQuery.code = null
this.listQuery.name = null
this.listQuery.name = val.name ? val.name : null
this.listQuery.code = val.code ? val.code : null
this.getDataList();
break;
case "add":