@@ -293,6 +293,15 @@ t.basic.InspectionPlan = '检验计划' | |||
t.basic.customerTypeName = '客户类型' | |||
t.basic.productTypeName = '产品类型名称' | |||
t.basic.client = '服务对象' | |||
t.basic.stock = '进货检验' | |||
t.basic.finishedProduct = '成品检验' | |||
t.basic.course = '过程检验' | |||
t.basic.shipment = '出货检验' | |||
t.basic.userName = '用户名' | |||
t.basic.departName = '部门名' | |||
t.quality = {} | |||
@@ -524,16 +533,17 @@ t.gage.outsideVerify = '外部校验' | |||
t.gage.verificationFee = '校验费用' | |||
t.gage.report = '量具重复性及再现性分析报告' | |||
t.gage.model = '型号' | |||
t.gage.meanRange = '极差均值' | |||
t.gage.meanDifference = '均值差' | |||
t.gage.partAverageMean = 'Rp 零件均值极差' | |||
t.gage.measuringUnit = '测量单元分析' | |||
t.gage.totalVariation = '%总变查(TV)' | |||
t.gage.reproducibility = '再现性-实验人员变差(AV)' | |||
t.gage.repeatability = '重复性-设备变差(EV)' | |||
t.gage.repeatabilityAndReproducibility = '重复性和再现性(R&R)' | |||
t.gage.partVariation = '零件变差(TV)' | |||
t.gage.decide = '综合判定' | |||
t.gage.tabularComputations = '表格计算' | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-02-14 15:02:26 | |||
* @LastEditTime: 2023-03-29 09:09:20 | |||
* @LastEditTime: 2023-06-26 09:44:09 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -16,14 +16,21 @@ | |||
<el-form-item prop="specification" :label="$t('basic.specification')"> | |||
<el-input v-model="dataForm.specification" :placeholder="$t('basic.specification')"></el-input> | |||
</el-form-item> | |||
<el-form-item prop="controlName" :label="$t('basic.name')"> | |||
<el-input v-model="dataForm.controlName" :placeholder="$t('basic.name')"></el-input> | |||
<el-form-item prop="incomingInspection" :label="$t('basic.stock')"> | |||
<el-switch v-model="dataForm.incomingInspection" :active-value="1" :inactive-value="0"> | |||
</el-switch> | |||
</el-form-item> | |||
<el-form-item prop="controlName" :label="$t('basic.name')"> | |||
<el-input v-model="dataForm.controlName" :placeholder="$t('basic.name')"></el-input> | |||
<el-form-item prop="finishInspection" :label="$t('basic.stock')"> | |||
<el-switch v-model="dataForm.finishInspection" :active-value="1" :inactive-value="0"> | |||
</el-switch> | |||
</el-form-item> | |||
<el-form-item prop="controlName" :label="$t('basic.name')"> | |||
<el-input v-model="dataForm.controlName" :placeholder="$t('basic.name')"></el-input> | |||
<el-form-item prop="outInspection" :label="$t('basic.shipment')"> | |||
<el-switch v-model="dataForm.outInspection" :active-value="1" :inactive-value="0"> | |||
</el-switch> | |||
</el-form-item> | |||
<el-form-item prop="processInspection" :label="$t('basic.course')"> | |||
<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')"> | |||
@@ -59,7 +66,11 @@ export default { | |||
id: "", | |||
controlCode:null, | |||
controlName:null, | |||
customerTypeStatus:null | |||
customerTypeStatus: null, | |||
finishInspection: null, | |||
incomingInspection: null, | |||
outInspection: null, | |||
processInspection: null, | |||
}, | |||
}; | |||
}, | |||
@@ -7,16 +7,10 @@ | |||
--> | |||
<template> | |||
<span> | |||
<el-radio v-model="injectData.incomingInspection" :label="1" | |||
>进货检验</el-radio | |||
> | |||
<el-radio v-model="injectData.processInspection" :label="1" | |||
>过程检验</el-radio | |||
> | |||
<el-radio v-model="injectData.finishInspection" :label="1" | |||
>成品检验</el-radio | |||
> | |||
<el-radio v-model="injectData.outInspection" :label="1">出货检验</el-radio> | |||
<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> | |||
</span> | |||
</template> | |||
@@ -0,0 +1,218 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-02-14 15:02:26 | |||
* @LastEditTime: 2023-06-26 15:01:44 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
<template> | |||
<el-transfer v-model="chooseData" :titles="['用户列表', '团队成员']" :data="notChooseData"></el-transfer> | |||
</template> | |||
<script> | |||
import debounce from "lodash/debounce"; | |||
import basicAdd from "@/mixins/basic-add"; | |||
export default { | |||
mixins: [basicAdd], | |||
data() { | |||
// const generateData = _ => { | |||
// const data = []; | |||
// const cities = ['上海', '北京', '广州', '深圳', '南京', '西安', '成都']; | |||
// const pinyin = ['shanghai', 'beijing', 'guangzhou', 'shenzhen', 'nanjing', 'xian', 'chengdu']; | |||
// cities.forEach((city, index) => { | |||
// data.push({ | |||
// label: city, | |||
// key: index, | |||
// pinyin: pinyin[index] | |||
// }); | |||
// }); | |||
// return data; | |||
// } | |||
return { | |||
notChooseData:[], | |||
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' | |||
}, | |||
options: [{ | |||
value: 0, | |||
label: '不可用' | |||
}, | |||
{ | |||
value: 1, | |||
label: '可用' | |||
}], | |||
listQuery: { | |||
limit: 999, | |||
page:1 | |||
}, | |||
visible: false, | |||
customerTypeList: {}, | |||
teamId: null, | |||
}; | |||
}, | |||
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", | |||
// }, | |||
// ], | |||
}; | |||
}, | |||
}, | |||
methods: { | |||
init(id,) { | |||
this.teamId = id || "" | |||
// this.dataForm.dictTypeId = dictTypeId || ""; | |||
this.$http | |||
.get(this.urlOptions.getTeamMemberURL, { | |||
params: { | |||
limit: 999, | |||
page: 1, | |||
teamId: id | |||
} | |||
}) | |||
.then(({ data: res }) => { | |||
// this.dataListLoading = false; | |||
if (res.code === 0) { | |||
if (res.data.list.length > 0) { | |||
var data = res.data.list | |||
for (let i = 0; i < data.length; i++) { | |||
this.chooseData.push(data[i].userId) | |||
} | |||
} | |||
} | |||
}) | |||
this.$http | |||
.get(this.urlOptions.getUserListURL, { | |||
params: { | |||
limit: 999, | |||
page: 1, | |||
} | |||
}) | |||
.then(({ data: res }) => { | |||
// this.dataListLoading = false; | |||
if (res.code === 0) { | |||
this.notChooseData = res.data.list.map((item) => { | |||
return { | |||
key: item.id, | |||
label: item.username | |||
} | |||
}) | |||
} | |||
}) | |||
this.visible = true; | |||
// this.$nextTick(() => { | |||
// // this.$refs["dataForm"].resetFields(); | |||
// if (this.dataForm.id) { | |||
// // console.log(1111); | |||
// this.getInfo(); | |||
// } else { | |||
// this.getCode() | |||
// } | |||
// }); | |||
}, | |||
// getCode() { | |||
// // console.log(111111); | |||
// this.$http | |||
// .post(this.urlOptions.getCodeURL) | |||
// .then(({ data: res }) => { | |||
// if (res.code === 0) { | |||
// console.log(res); | |||
// this.dataForm.customerCode = res.data | |||
// } | |||
// }) | |||
// .catch(() => { | |||
// }); | |||
// }, | |||
// 获取信息 | |||
// getInfo() { | |||
// this.$http | |||
// .get(`/basic/qmsCustomer/${this.dataForm.id}`) | |||
// .then(({ data: res }) => { | |||
// if (res.code !== 0) { | |||
// return this.$message.error(res.msg); | |||
// } | |||
// this.dataForm = { | |||
// ...this.dataForm, | |||
// ...res.data, | |||
// }; | |||
// }) | |||
// .catch(() => { }); | |||
// }, | |||
// 表单提交 | |||
dataFormSubmit() { | |||
let ids = this.chooseData | |||
ids.unshift(this.teamId) | |||
this.$http.put(this.urlOptions.editTeamMemberListURL,ids) | |||
.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: () => { | |||
this.visible = false | |||
this.$emit("refreshDataList") | |||
}, | |||
}); | |||
}) | |||
.catch(() => { }) | |||
}, | |||
// dataFormSubmitHandle: debounce( | |||
// function () { | |||
// this.$refs["dataForm"].validate((valid) => { | |||
// if (!valid) { | |||
// return false; | |||
// } | |||
// this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, 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: () => { | |||
// this.visible = false; | |||
// console.log(1111); | |||
// this.$emit("successSubmit"); | |||
// }, | |||
// }); | |||
// }) | |||
// .catch(() => { }); | |||
// }); | |||
// }, | |||
// 1000, | |||
// { leading: true, trailing: false } | |||
// ), | |||
}, | |||
}; | |||
</script> |
@@ -223,7 +223,7 @@ export default { | |||
}) | |||
.catch(() => { }); | |||
} else if (val.type === 'edit') { | |||
this.addOrUpdateVisible = true | |||
this.addOrUpdateVisible = true | |||
this.addOrEditTitle = this.$t('edit') | |||
this.$nextTick(() => { | |||
this.$refs.addOrUpdate.init(val.data.id); | |||
@@ -16,7 +16,7 @@ | |||
<!-- 弹窗, 新增 / 修改 --> | |||
<base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel" | |||
@confirm="handleConfirm" :before-close="handleCancel"> | |||
<customer-type-add ref="addOrUpdate" @successSubmit="successSubmit"></customer-type-add> | |||
<customer-type-add ref="addOrUpdate" @refreshDataList="successSubmit"></customer-type-add> | |||
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> --> | |||
</base-dialog> | |||
<base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel" | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-02-21 14:30:17 | |||
* @LastEditTime: 2023-06-20 15:37:17 | |||
* @LastEditTime: 2023-06-26 15:32:36 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -15,8 +15,8 @@ | |||
<el-button type="primary" size="small" @click="conditionSearch">{{ $t("conditionSearch")}}}</el-button> | |||
</el-badge> | |||
</SearchBar> | |||
<base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1" | |||
:limit="listQuery.limit" :table-data="tableData"> | |||
<base-table highlight-current-row id="palletTable" :table-props="tableProps" :page="listQuery.page" | |||
@current-change="handleCurrentChange" ref="palletTable1" :limit="listQuery.limit" :table-data="tableData"> | |||
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn" | |||
@clickBtn="handleClick" /> | |||
</base-table> | |||
@@ -49,23 +49,18 @@ | |||
</el-col> | |||
<el-col :span="10"> | |||
<div class="mod-sys__user"> | |||
<SearchBar :formConfigs="formConfigMember" ref="ruleForm" @headBtnClick="buttonClick"> | |||
<SearchBar :formConfigs="formConfigMember" ref="ruleForm" @headBtnClick="teamMemberButtonClick"> | |||
</SearchBar> | |||
<base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1" | |||
:limit="listQuery.limit" :table-data="tableData"> | |||
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn" | |||
@clickBtn="handleClick" /> | |||
<base-table id="palletTable" :table-props="depProps" ref="palletTable1" :table-data="teamMemberData"> | |||
</base-table> | |||
<pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total" | |||
@pagination="getDataList" /> | |||
<!-- 弹窗, 新增 / 修改 --> | |||
<base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel" | |||
@confirm="handleConfirm" :before-close="handleCancel"> | |||
<team-add ref="addOrUpdate" @refreshDataList="successSubmit"></team-add> | |||
<base-dialog :dialogTitle="teamMemberOrEditTitle" :dialogVisible="teamMemberOrUpdateVisible" | |||
@cancel="handleTeamMemberCancel" @confirm="handleTeamMemberConfirm" :before-close="handleTeamMemberCancel"> | |||
<teamMember-add ref="teamMemberOrUpdate" @refreshDataList="successTeamMemberSubmit"></teamMember-add> | |||
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> --> | |||
</base-dialog> | |||
</div> | |||
</el-col>"" | |||
</el-col>"" | |||
</el-row> | |||
</el-card> | |||
</template> | |||
@@ -74,12 +69,12 @@ | |||
import basicPage from "@/mixins/basic-page"; | |||
import basicSearch from "@/mixins/basic-search"; | |||
import teamAdd from "./components/team-add"; | |||
import teamMemberAdd from './components/teamMember-add' | |||
import teamSearch from "./components/teamSearch.vue"; | |||
import Cookies from 'js-cookie' | |||
import qs from 'qs' | |||
// import radio from "./components/radio.vue"; | |||
import i18n from "@/i18n"; | |||
// import i18n from "@/i18n"; | |||
const tableProps = [ | |||
{ | |||
prop: "teamCode", | |||
@@ -98,6 +93,16 @@ const tableProps = [ | |||
label: i18n.t('basic.remark') | |||
}, | |||
]; | |||
const depProps = [ | |||
{ | |||
prop: "departName", | |||
label: i18n.t('basic.departName') | |||
}, | |||
{ | |||
prop: "userName", | |||
label: i18n.t('basic.userName') | |||
} | |||
]; | |||
const tableBtn = [ | |||
{ | |||
type: "edit", | |||
@@ -116,11 +121,17 @@ export default { | |||
getDataListURL: "/basic/qmsTeam/page", | |||
deleteURL: "/basic/qmsTeam", | |||
exportURL: "/basic/qmsTeam/export", | |||
teamMemberURL: '/basic/qmsTeamMember/page' | |||
}, | |||
tableProps, | |||
depProps, | |||
teamId:null, | |||
teamMemberData: [], | |||
teamMemberOrEditTitle:'', | |||
tableBtn, | |||
productData: {}, | |||
addOrUpdateVisible: false, | |||
teamMemberOrUpdateVisible:false, | |||
searchOrEditTitle: "", | |||
addOrEditTitle: '', | |||
searchOrUpdateVisible: false, | |||
@@ -156,7 +167,14 @@ export default { | |||
name: i18n.t('export'), | |||
color: "primary", | |||
// plain: true, | |||
} | |||
}, | |||
{ | |||
type: "button", | |||
btnName: "取消选中", | |||
name: "cancel", | |||
color: "primary", | |||
// plain: true, | |||
}, | |||
], | |||
formConfigMember: [ | |||
// { | |||
@@ -180,14 +198,37 @@ export default { | |||
}, | |||
components: { | |||
teamAdd, | |||
teamMemberAdd, | |||
teamSearch | |||
}, | |||
// mounted() { | |||
// this.getDepData() | |||
// }, | |||
methods: { | |||
//search-bar点击 | |||
handleProductCancel() { | |||
this.productOrUpdateVisible = false; | |||
this.productOrEditTitle = ""; | |||
}, | |||
setCurrent(index) { | |||
this.$refs.palletTable1.setCurrent("palletTable", index) | |||
console.log(index) | |||
}, | |||
handleCurrentChange(val) { | |||
this.teamId = val.newVal.id | |||
this.$http.get(this.urlOptions.teamMemberURL, { | |||
params: { | |||
limit: 999, | |||
page: 1, | |||
teamId:val.newVal.id | |||
} | |||
}).then(({ data: res } ) => { | |||
console.log(res) | |||
if (res && res.code === 0) { | |||
this.teamMemberData = res.data.list | |||
} | |||
}) | |||
}, | |||
// handleSearchCancel() { | |||
// this.searchOrEditTitle = ""; | |||
// this.searchOrUpdateVisible = false; | |||
@@ -268,7 +309,7 @@ export default { | |||
} else { | |||
this.$message.error(data.msg); | |||
} | |||
}); | |||
}) | |||
}) | |||
.catch(() => { }); | |||
} else if (val.type === 'edit') { | |||
@@ -279,6 +320,41 @@ export default { | |||
}); | |||
} | |||
}, | |||
successTeamMemberSubmit() { | |||
this.handleTeamMemberCancel() | |||
this.$http.get(this.urlOptions.teamMemberURL, { | |||
params: { | |||
limit: 999, | |||
page: 1, | |||
teamId: this.teamId | |||
} | |||
}).then(({ data: res } ) => { | |||
if (res && res.code === 0) { | |||
this.teamMemberData = res.data.list | |||
} | |||
}); | |||
}, | |||
handleTeamMemberCancel() { | |||
this.teamMemberOrUpdateVisible = false | |||
this.teamMemberOrEditTitle = '' | |||
}, | |||
teamMemberButtonClick(val) { | |||
console.log(val); | |||
switch (val.btnName) { | |||
case "change": | |||
this.teamMemberOrEditTitle = '修改团队成员' | |||
this.teamMemberOrUpdateVisible = true | |||
this.$nextTick(() => { | |||
this.$refs.teamMemberOrUpdate.init(this.teamId) | |||
}); | |||
break; | |||
default: | |||
console.log(val); | |||
} | |||
}, | |||
handleTeamMemberConfirm() { | |||
this.$refs.teamMemberOrUpdate.dataFormSubmit() | |||
}, | |||
buttonClick(val) { | |||
console.log(val); | |||
switch (val.btnName) { | |||
@@ -301,6 +377,9 @@ export default { | |||
this.$refs.addOrUpdate.init(); | |||
}); | |||
break; | |||
case "cancel": | |||
this.$refs.palletTable1.setCurrent("palletTable", -1); | |||
break; | |||
// case "correlation": | |||
// this.productOrEditTitle = "产品"; | |||
// this.productOrUpdateVisible = true; | |||
@@ -1,50 +1,26 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-01-11 09:24:58 | |||
* @LastEditTime: 2023-01-12 09:46:23 | |||
* @LastEditTime: 2023-06-26 13:39:19 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
<template> | |||
<el-card shadow="never" class="aui-card--fill"> | |||
<div class="mod-sys__user"> | |||
<SearchBar | |||
:formConfigs="formConfig" | |||
ref="ruleForm" | |||
@headBtnClick="buttonClick" | |||
> | |||
<el-button type="primary" size="small" plain>导入</el-button> | |||
</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" | |||
@clickBtn="handleClick" | |||
/> | |||
<SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick"> | |||
<!-- <el-button type="primary" size="small" plain>导入</el-button> --> | |||
</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" | |||
@clickBtn="handleClick" /> | |||
</base-table> | |||
<pagination | |||
:limit.sync="listQuery.limit" | |||
:page.sync="listQuery.page" | |||
:total="listQuery.total" | |||
@pagination="getDataList" | |||
/> | |||
<pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total" | |||
@pagination="getDataList" /> | |||
<!-- 弹窗, 新增 / 修改 --> | |||
<base-dialog | |||
:dialogTitle="addOrEditTitle" | |||
:dialogVisible="addOrUpdateVisible" | |||
@cancel="handleCancel" | |||
@confirm="handleConfirm" | |||
:before-close="handleCancel" | |||
> | |||
<!-- <add-or-update ref="addOrUpdate" @successSubmit="successSubmit"></add-or-update> --> | |||
<base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel" | |||
@confirm="handleConfirm" :before-close="handleCancel"> | |||
<teamMember-add ref="addOrUpdate" @successSubmit="successSubmit"></teamMember-add> | |||
</base-dialog> | |||
</div> | |||
</el-card> | |||
@@ -52,7 +28,7 @@ | |||
<script> | |||
import basicPage from "@/mixins/basic-page"; | |||
// import AddOrUpdate from './params-add-or-update' | |||
import teamMemberAdd from './components/teamMember-add' | |||
import i18n from "@/i18n"; | |||
const tableProps = [ | |||
{ | |||
@@ -83,7 +59,7 @@ export default { | |||
data() { | |||
return { | |||
urlOptions: { | |||
getDataListURL: "/basic/qmsControlMode/page", | |||
getDataListURL: "/basic/qmsTeamMember/page", | |||
deleteURL: "/basic/qmsControlMode", | |||
}, | |||
tableProps, | |||
@@ -103,14 +79,13 @@ export default { | |||
btnName: "新增", | |||
name: "add", | |||
color: "primary", | |||
plain: true, | |||
}, | |||
], | |||
}; | |||
}, | |||
// components: { | |||
// AddOrUpdate, | |||
// }, | |||
components: { | |||
teamMemberAdd, | |||
}, | |||
methods:{ | |||
//search-bar点击 | |||
buttonClick(val) { | |||
@@ -1,84 +1,132 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-02-14 15:02:26 | |||
* @LastEditTime: 2023-05-12 15:35:59 | |||
* @LastEditTime: 2023-06-28 14:15:42 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
<template> | |||
<el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px"> | |||
<el-form-item prop="partName" :label="$t('gage.partName')"> | |||
<el-input v-model="dataForm.partName" :placeholder="$t('gage.partName')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="gageId" :label="$t('gage.gageName')"> | |||
<el-select v-model="dataForm.gageId" :placeholder="$t('gage.gageName')" @change="getGageType"> | |||
<el-option v-for="item in gageList" :key="item.id" :label="item.name" :value="item.id"> | |||
</el-option> | |||
</el-select> | |||
</el-form-item> | |||
<el-form-item prop="corporation" :label="$t('gage.corporation')"> | |||
<el-input v-model="dataForm.corporation" :placeholder="$t('gage.corporation')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="itemNo" :label="$t('gage.itemNo')"> | |||
<el-input v-model="dataForm.itemNo" :placeholder="$t('gage.itemNo')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="gageTypeName" :label="$t('gage.gageTypeName')"> | |||
<el-input v-model="dataForm.gageTypeName" :placeholder="$t('gage.gageTypeName')" disabled> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="partNumber" :label="$t('gage.partNumber')"> | |||
<el-input v-model="dataForm.partNumber" :placeholder="$t('gage.partNumber')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="specification" :label="$t('gage.specification')"> | |||
<el-input v-model="dataForm.specification" :placeholder="$t('gage.specification')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="measuringToolSpecification" :label="$t('gage.measuringToolSpecification')"> | |||
<el-input v-model="dataForm.measuringToolSpecification" :placeholder="$t('gage.measuringToolSpecification')" | |||
disabled> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="process" :label="$t('gage.process')"> | |||
<el-input v-model="dataForm.process" :placeholder="$t('gage.process')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="measurementNumber" :label="$t('gage.measurementNumber')"> | |||
<el-input v-model="dataForm.measurementNumber" :placeholder="$t('gage.measurementNumber')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="measuringToolAccuracy" :label="$t('gage.measuringToolAccuracy')"> | |||
<el-input v-model="dataForm.measuringToolAccuracy" :placeholder="$t('gage.measuringToolAccuracy')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="fabrication" :label="$t('gage.fabrication')"> | |||
<el-input v-model="dataForm.fabrication" :placeholder="$t('gage.fabrication')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="publicErrand" :label="$t('gage.publicErrand')"> | |||
<el-input v-model="dataForm.publicErrand" :placeholder="$t('gage.publicErrand')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="precisionDecimalPlace" :label="$t('gage.precisionDecimalPlace')"> | |||
<el-input v-model="dataForm.precisionDecimalPlace" :placeholder="$t('gage.precisionDecimalPlace')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="tester" :label="$t('gage.tester')"> | |||
<el-input v-model="dataForm.tester" :placeholder="$t('gage.tester')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="precisionDecimalPlace" :label="$t('gage.precisionDecimalPlace')"> | |||
<el-input v-model="dataForm.precisionDecimalPlace" :placeholder="$t('gage.precisionDecimalPlace')"> | |||
</el-input> | |||
</el-form-item> | |||
<el-form-item prop="measurementTime" :label="$t('gage.measurementTime')"> | |||
<el-date-picker v-model="dataForm.measurementTime" type="datetime" :placeholder="$t('gage.measurementTime')" | |||
format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'> | |||
</el-date-picker> | |||
</el-form-item> | |||
<el-row> | |||
<el-col :span="8"> | |||
<el-form-item prop="partName" :label="$t('gage.partName')"> | |||
<el-input v-model="dataForm.partName" :placeholder="$t('gage.partName')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item prop="gageId" :label="$t('gage.gageName')"> | |||
<el-select v-model="dataForm.gageId" :placeholder="$t('gage.gageName')" @change="getGageType"> | |||
<el-option v-for="item in gageList" :key="item.id" :label="item.name" :value="item.id"> | |||
</el-option> | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item prop="corporation" :label="$t('gage.corporation')"> | |||
<el-input v-model="dataForm.corporation" :placeholder="$t('gage.corporation')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span="8"> | |||
<el-form-item prop="itemNo" :label="$t('gage.itemNo')"> | |||
<el-input v-model="dataForm.itemNo" :placeholder="$t('gage.itemNo')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item prop="gageTypeName" :label="$t('gage.gageTypeName')"> | |||
<el-input v-model="dataForm.gageTypeName" :placeholder="$t('gage.gageTypeName')" disabled> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item prop="partNumber" :label="$t('gage.partNumber')"> | |||
<el-input v-model="dataForm.partNumber" :placeholder="$t('gage.partNumber')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span="8"> | |||
<el-form-item prop="specification" :label="$t('gage.specification')"> | |||
<el-input v-model="dataForm.specification" :placeholder="$t('gage.specification')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item prop="measuringToolSpecification" :label="$t('gage.measuringToolSpecification')"> | |||
<el-input v-model="dataForm.measuringToolSpecification" :placeholder="$t('gage.measuringToolSpecification')" | |||
disabled> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item prop="process" :label="$t('gage.process')"> | |||
<el-input v-model="dataForm.process" :placeholder="$t('gage.process')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span="8"> | |||
<el-form-item prop="measurementNumber" :label="$t('gage.measurementNumber')"> | |||
<el-input v-model="dataForm.measurementNumber" :placeholder="$t('gage.measurementNumber')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item prop="measuringToolAccuracy" :label="$t('gage.measuringToolAccuracy')"> | |||
<el-input v-model="dataForm.measuringToolAccuracy" :placeholder="$t('gage.measuringToolAccuracy')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item prop="fabrication" :label="$t('gage.fabrication')"> | |||
<el-input v-model="dataForm.fabrication" :placeholder="$t('gage.fabrication')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span="8"> | |||
<el-form-item prop="publicErrand" :label="$t('gage.publicErrand')"> | |||
<el-input v-model="dataForm.publicErrand" :placeholder="$t('gage.publicErrand')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item prop="precisionDecimalPlace" :label="$t('gage.precisionDecimalPlace')"> | |||
<el-input v-model="dataForm.precisionDecimalPlace" :placeholder="$t('gage.precisionDecimalPlace')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item prop="tester" :label="$t('gage.tester')"> | |||
<el-input v-model="dataForm.tester" :placeholder="$t('gage.tester')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span="8"> | |||
<el-form-item prop="precisionDecimalPlace" :label="$t('gage.precisionDecimalPlace')"> | |||
<el-input v-model="dataForm.precisionDecimalPlace" :placeholder="$t('gage.precisionDecimalPlace')"> | |||
</el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item prop="measurementTime" :label="$t('gage.measurementTime')"> | |||
<el-date-picker v-model="dataForm.measurementTime" type="datetime" :placeholder="$t('gage.measurementTime')" | |||
format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'> | |||
</el-date-picker> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-button @click="getTableData()" type="primary">{{ $t('gage.tabularComputations') }}</el-button> | |||
<base-table :table-props="tableProps" :table-data="tableData" :page="1" :limit="20" /> | |||
</el-form> | |||
</template> | |||
@@ -90,17 +138,20 @@ export default { | |||
data() { | |||
return { | |||
urlOptions: { | |||
submitURL: "/gage/qmsGage", | |||
infoURL: "/gage/qmsGage/{ id }", | |||
submitURL: "/gage/qmsGageGrr", | |||
infoURL: "/gage/qmsGageGrr/{ id }", | |||
dictionaryDetailList: '/mutual/qmsDataDictionaryDetail/page', | |||
getUserList: '/sys/user/page', | |||
getGageTypeList: '/gage/qmsGageType/page', | |||
getGageList: '/gage/qmsGage/page', | |||
getCustomerListURL: '/basic/qmsCustomer/page' | |||
getCustomerListURL: '/basic/qmsCustomer/page', | |||
getTabularComputationsURL: '/gage/qmsGageGrrTester/table' | |||
}, | |||
gageList: [], | |||
userList: [], | |||
customerList:[], | |||
customerList: [], | |||
tableProps: [], | |||
tableData:[], | |||
gageTypeList:[], | |||
departmentList: [], | |||
processList: [ | |||
@@ -221,6 +272,152 @@ export default { | |||
this.getData(); | |||
}, | |||
methods: { | |||
getTableData() { | |||
this.$http.get(this.urlOptions.getTabularComputationsURL, { | |||
params: { | |||
gageGrrId:this.dataForm.id | |||
}, | |||
}) | |||
.then(({ data: res }) => { | |||
if (res.code === 0) { | |||
console.log(res) | |||
} | |||
}) | |||
.catch(() => { | |||
}) | |||
let aa = [] | |||
let moreData = [ | |||
{ | |||
process: '综合', | |||
data: [ | |||
{ | |||
equipmentName: '上片投入数量', | |||
data: aa | |||
}, | |||
{ | |||
equipmentName: '机器人投入数', | |||
data: aa | |||
}, | |||
{ | |||
equipmentName: '良品总投入数', | |||
data: aa | |||
}, | |||
{ | |||
equipmentName: '工序损耗', | |||
data: aa | |||
} | |||
] | |||
}, | |||
{ | |||
process: '上片', | |||
data: [ | |||
{ | |||
equipmentName: '上片损失', | |||
data: aa | |||
} | |||
] | |||
}, | |||
{ | |||
process: '精切', | |||
data: [ | |||
{ | |||
equipmentName: '精切损失', | |||
data: aa | |||
}, | |||
{ | |||
equipmentName: '精切抽检', | |||
data: aa | |||
} | |||
] | |||
} | |||
] | |||
for (let i = 0; i < 30; i++) { | |||
let a = { | |||
time: '2022-11-' + i, | |||
eqCT: 0.01, | |||
eqTT: 0.62, | |||
lineCT: 0.73, | |||
lineTT: 0.45 | |||
} | |||
aa.push(a) | |||
} | |||
this.numArr = [] | |||
let num = 0 | |||
const tableConfig = [] | |||
this.chartDataArr = [] | |||
const dataArr = moreData.map((item, index) => { | |||
let dataArr = [] | |||
if (item.data) { | |||
this.chartDataArr = this.chartDataArr.concat(item.data) | |||
num += item.data.length | |||
this.numArr.push(num) | |||
dataArr = item.data.map((z, idx) => { | |||
const dataArr = {} | |||
z.data.forEach((i) => { | |||
// 动态生成tableConfig | |||
if (index === 0 && idx === 0) { | |||
tableConfig.push({ | |||
label: i.time, | |||
prop: i.time, | |||
children: [ | |||
{ prop: i.time + 'eqCT', label: '设备CT' }, | |||
{ prop: i.time + 'eqTT', label: '设备TT' }, | |||
{ prop: i.time + 'lineCT', label: '产线CT' }, | |||
{ | |||
prop: i.time + 'lineTT', | |||
label: '产线TT', | |||
subcomponent: demo3Sub | |||
} | |||
] | |||
}) | |||
} | |||
// 合并数据集 | |||
dataArr[i.time + 'eqCT'] = i.eqCT | |||
dataArr[i.time + 'eqTT'] = i.eqTT | |||
dataArr[i.time + 'lineCT'] = i.lineCT | |||
dataArr[i.time + 'lineTT'] = i.lineTT | |||
dataArr.process = item.process | |||
dataArr.equipmentName = z.equipmentName | |||
}) | |||
console.log(dataArr) | |||
return dataArr | |||
}) | |||
} | |||
return dataArr | |||
}) | |||
console.log(tableConfig) | |||
this.trueTableProps = this.tableProp2.concat(tableConfig) | |||
console.log(this.trueTableProps) | |||
this.tableData = this.flatten(dataArr) | |||
console.log(this.tableData) | |||
}, | |||
// tree->[] | |||
flatten(arr) { | |||
var res = [] | |||
for (var i = 0; i < arr.length; i++) { | |||
if (Array.isArray(arr[i])) { | |||
res = res.concat(this.flatten(arr[i])) | |||
} else { | |||
res.push(arr[i]) | |||
} | |||
} | |||
return res | |||
}, | |||
spanMethod({ rowIndex, columnIndex }) { | |||
if (columnIndex === 1) { | |||
if (rowIndex === 0) { | |||
return [this.numArr[0], 1] | |||
} else if (this.numArr.indexOf(rowIndex) >= 0) { | |||
const rowNum = | |||
this.numArr[this.numArr.indexOf(rowIndex) + 1] - | |||
this.numArr[this.numArr.indexOf(rowIndex)] | |||
return [rowNum, 1] | |||
} else { | |||
return [0, 0] | |||
} | |||
} | |||
}, | |||
init(id, ) { | |||
this.dataForm.id = id || "" | |||
// console.log(11111) | |||
@@ -281,7 +478,7 @@ export default { | |||
// 获取信息 | |||
getInfo() { | |||
this.$http | |||
.get(`/gage/qmsGage/${this.dataForm.id}`) | |||
.get(`/gage/qmsGageGrr/${this.dataForm.id}`) | |||
.then(({ data: res }) => { | |||
if (res.code !== 0) { | |||
return this.$message.error(res.msg); | |||
@@ -0,0 +1,218 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-02-14 15:02:26 | |||
* @LastEditTime: 2023-06-27 15:38:27 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
<template> | |||
<el-dialog :title="$t('gage.report')" :visible.sync="dialogTableVisible"> | |||
<table align="center" width="800" height="249" style="text-align: center;" border="1" cellspacing="0"> | |||
<tbody> | |||
<tr> | |||
<td>{{ $t('gage.partName')}}</td> | |||
<td>{{ this.dataForm.partName }}</td> | |||
<td>{{ $t('gage.gageName') }}</td> | |||
<td>{{ this.dataForm.gageName }}</td> | |||
<td>{{ $t('gage.measurementTime') }}</td> | |||
<td>{{ this.dataForm.measurementTime }}</td> | |||
</tr> | |||
<tr> | |||
<td>{{ $t('gage.itemNo') }}</td> | |||
<td>{{ this.dataForm.itemNo }}</td> | |||
<td>{{ $t('gage.model') }}</td> | |||
<td>{{ this.dataForm.model }}</td> | |||
<td>{{ $t('gage.measurementTime') }}</td> | |||
<td>{{ this.dataForm.measurementTime }}</td> | |||
</tr> | |||
<tr> | |||
<td>{{ $t('gage.measuringToolSpecification') }}</td> | |||
<td>{{ this.dataForm.measuringToolSpecification }}</td> | |||
<td>{{ $t('gage.measuringToolAccuracy') }}</td> | |||
<td>{{ this.dataForm.measuringToolAccuracy }}</td> | |||
<td>{{ $t('gage.process') }}</td> | |||
<td>{{ this.dataForm.process }}</td> | |||
</tr> | |||
<tr> | |||
<td>{{ $t('gage.meanRange') }}</td> | |||
<td>{{ this.grrReportData.meanRange }}</td> | |||
<td>{{ $t('gage.meanDifference') }}</td> | |||
<td>{{ this.grrReportData.meanDifference }}</td> | |||
<td>{{ $t('gage.partAverageMean') }}</td> | |||
<td>{{ this.grrReportData.partAverageMean }}</td> | |||
</tr> | |||
<tr> | |||
<td colspan="5">{{ $t('gage.measuringUnit') }}</td> | |||
<td>{{ $t('gage.totalVariation') }}</td> | |||
</tr> | |||
<tr> | |||
<td colspan="6">{{ $t('gage.repeatability') }}</td> | |||
</tr> | |||
<tr> | |||
<td rowspan="3" colspan="3">{{ this.grrReportData.ev }}</td> | |||
<td>r</td> | |||
<td>k1</td> | |||
<td rowspan="3">{{ this.grrReportData.evpercent }}</td> | |||
</tr> | |||
<tr> | |||
<td>2</td> | |||
<td>{{ this.grrReportData.k1[0] }}</td> | |||
</tr> | |||
<tr> | |||
<td>3</td> | |||
<td>{{ this.grrReportData.k1[1] }}</td> | |||
</tr> | |||
<tr> | |||
<td colspan="6">{{ $t('gage.reproducibility') }}</td> | |||
</tr> | |||
<tr> | |||
<td rowspan="3" colspan="3">{{ this.grrReportData.av }}</td> | |||
<td>测试人员</td> | |||
<td>k2</td> | |||
<td rowspan="3">{{ this.grrReportData.avpercent }}</td> | |||
</tr> | |||
<tr> | |||
<td>2</td> | |||
<td>{{ this.grrReportData.k2[0] }}</td> | |||
</tr> | |||
<tr> | |||
<td>3</td> | |||
<td>{{ this.grrReportData.k2[1] }}</td> | |||
</tr> | |||
<tr> | |||
<td colspan="6">{{ $t('gage.repeatabilityAndReproducibility') }}</td> | |||
</tr> | |||
<tr> | |||
<td rowspan="3" colspan="3">{{ this.grrReportData.grr }}</td> | |||
<td>n</td> | |||
<td>k3</td> | |||
<td rowspan="3">{{ this.grrReportData.grrpercent }}</td> | |||
</tr> | |||
<tr> | |||
<td>2</td> | |||
<td>{{ this.grrReportData.k3[0] }}</td> | |||
</tr> | |||
<tr> | |||
<td>3</td> | |||
<td>{{ this.grrReportData.k3[1] }}</td> | |||
</tr> | |||
<tr> | |||
<td colspan="3">{{ $t('gage.partVariation') }}</td> | |||
<td>4</td> | |||
<td>{{ this.grrReportData.k3[2] }}</td> | |||
<td rowspan="4">{{ this.grrReportData.pvpercent }}</td> | |||
</tr> | |||
<tr> | |||
<td rowspan="3" colspan="3">{{ this.grrReportData.pv }}</td> | |||
<td>5</td> | |||
<td>{{ this.grrReportData.k3[3] }}</td> | |||
</tr> | |||
<tr> | |||
<td>6</td> | |||
<td>{{ this.grrReportData.k3[4] }}</td> | |||
</tr> | |||
<tr> | |||
<td>7</td> | |||
<td>{{ this.grrReportData.k3[5] }}</td> | |||
</tr> | |||
<tr> | |||
<td colspan="3">{{ $t('gage.totalVariation') }}</td> | |||
<td>8</td> | |||
<td>{{ this.grrReportData.k3[6] }}</td> | |||
<td rowspan="4">{{ this.grrReportData.ndc }}</td> | |||
</tr> | |||
<tr> | |||
<td rowspan="3" colspan="3">{{ this.grrReportData.tv }}</td> | |||
<td>9</td> | |||
<td>{{ this.grrReportData.k3[7] }}</td> | |||
</tr> | |||
<tr> | |||
<td>10</td> | |||
<td>{{ this.grrReportData.k3[8] }}</td> | |||
</tr> | |||
<tr> | |||
<td colspan="2">{{ $t('gage.decide') }}</td> | |||
<td>%GRR</td> | |||
<td rowspan="4">{{ this.grrReportData.isAccept }}</td> | |||
<td>reason</td> | |||
<td rowspan="4">{{ this.grrReportData.reason }}</td> | |||
</tr> | |||
</tbody> | |||
</table> | |||
</el-dialog> | |||
</template> | |||
<script> | |||
import debounce from "lodash/debounce"; | |||
import basicAdd from "@/mixins/basic-add"; | |||
export default { | |||
mixins: [basicAdd], | |||
data() { | |||
return { | |||
urlOptions: { | |||
submitURL: "/gage/qmsGage", | |||
infoURL: "/gage/qmsGage/{ id }", | |||
dictionaryDetailList: '/mutual/qmsDataDictionaryDetail/page', | |||
getUserList: '/sys/user/page', | |||
getGageTypeList: '/gage/qmsGageType/page', | |||
reportURL: '/gage/qmsGageGrrTester/reprot' | |||
}, | |||
grrReportData: {}, | |||
dataForm: {}, | |||
k1:[], | |||
dialogTableVisible:false, | |||
}; | |||
}, | |||
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", | |||
// }, | |||
// ], | |||
}; | |||
}, | |||
}, | |||
mounted () { | |||
}, | |||
methods: { | |||
init(data) { | |||
this.dataForm = data | |||
// console.log(11111) | |||
// this.dataForm.dictTypeId = dictTypeId || ""; | |||
this.$nextTick(() => { | |||
this.$http.get(this.urlOptions.reportURL, { | |||
params: { | |||
gageGrrId:data.id | |||
} | |||
}).then(({ data: res }) => { | |||
console.log(res) | |||
if (res && res.code === 0) { | |||
this.grrReportData = res.data | |||
// console.log(this.k1) | |||
this.dialogTableVisible = true | |||
} | |||
}) | |||
}) | |||
}, | |||
}, | |||
}; | |||
</script> |
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-01-11 09:24:58 | |||
* @LastEditTime: 2023-06-21 16:52:20 | |||
* @LastEditTime: 2023-06-27 14:51:34 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -34,25 +34,14 @@ | |||
{{ $t("close") }} | |||
</el-button> | |||
<el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{ $t("reset") | |||
}}</el-button> | |||
}}</el-button> | |||
<el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm"> | |||
{{ $t("search") }} | |||
</el-button> | |||
</el-col> | |||
</el-row> | |||
</base-dialog> | |||
<el-dialog :title="$t('gage.report')" :visible.sync="dialogTableVisible"> | |||
<el-table :show-header="false" :data="data" :span-method="objectSpanMethod" border :cell-style="columnStyle" | |||
style="width: 100%; margin-top: 20px"> | |||
<el-table-column width="180" prop="name"></el-table-column> | |||
<el-table-column prop="amount1"></el-table-column> | |||
<el-table-column width="180" prop="amount2"></el-table-column> | |||
<el-table-column prop="amount3"></el-table-column> | |||
<el-table-column prop="amount4"></el-table-column> | |||
<el-table-column prop="amount5"></el-table-column> | |||
</el-table> | |||
</el-dialog> | |||
<report-show ref="reportOrUpdate" v-if="reportShow"></report-show> | |||
</div> | |||
</el-card> | |||
</template> | |||
@@ -60,6 +49,7 @@ | |||
<script> | |||
import basicPage from "@/mixins/basic-page" | |||
import gapeGrsAdd from "./components/gageGrs-add" | |||
import reportShow from "./components/report-show" | |||
import gageSearch from "./components/gageSearch" | |||
import basicSearch from "@/mixins/basic-search" | |||
import { timeFormatter } from '@/filters' | |||
@@ -121,7 +111,8 @@ export default { | |||
mixins: [basicPage, basicSearch], | |||
components: { | |||
gageSearch, | |||
gapeGrsAdd | |||
gapeGrsAdd, | |||
reportShow | |||
}, | |||
computed: { | |||
//因为数据用到了dataform中的数据,所以写在了computed中 | |||
@@ -136,7 +127,7 @@ export default { | |||
amount5: this.dataForm.measurementTime | |||
}, | |||
{ | |||
name: i18n.t("gage.itemNo"), | |||
name: i18n.t("gage.itemNo"), | |||
amount1: this.dataForm.itemNo, | |||
amount2: i18n.t("gage.model"), | |||
amount3: this.dataForm.model, | |||
@@ -169,9 +160,11 @@ export default { | |||
deleteURL: "/gage/qmsGageGrr", | |||
exportUrl: '/gage/qmsGageGrr/export' | |||
}, | |||
grrReportData:{}, | |||
dialogTableVisible:false, | |||
tableProps, | |||
dataForm: {}, | |||
reportShow:false, | |||
tableBtn, | |||
searchOrEditTitle: '', | |||
searchOrUpdateVisible: false, | |||
@@ -303,9 +296,11 @@ export default { | |||
} | |||
}) | |||
} else if (val.type === 'report') { | |||
this.dialogTableVisible = true | |||
this.dataForm = val.data | |||
console.log(val.data) | |||
this.reportShow = true | |||
this.$nextTick(() => { | |||
this.$refs.reportOrUpdate.init(val.data) | |||
}) | |||
} | |||
}, | |||
buttonClick(val) { | |||
@@ -314,7 +309,7 @@ export default { | |||
// this.listQuery.paramCode = val.paramCode; | |||
this.listQuery.page = 1 | |||
this.getDataList(); | |||
break; | |||
break; | |||
case "export": | |||
// this.listQuery.paramCode = val.paramCode; | |||
this.listQuery.page = 1 | |||
@@ -332,3 +327,34 @@ export default { | |||
} | |||
}; | |||
</script> | |||
<style> | |||
td{ | |||
width: 400px; | |||
} | |||
table { | |||
border-collapse: collapse; | |||
margin: 0 auto; | |||
text-align: center; | |||
} | |||
table td, | |||
table th { | |||
border: 1px solid #cad9ea; | |||
color: #666; | |||
height: 30px; | |||
} | |||
table thead th { | |||
background-color: #CCE8EB; | |||
width: 100px; | |||
} | |||
table tr:nth-child(odd) { | |||
background: #fff; | |||
} | |||
table tr:nth-child(even) { | |||
background: #F5FAFA; | |||
} | |||
</style> |
@@ -2,36 +2,16 @@ | |||
<el-card shadow="never" class="aui-card--fill"> | |||
<div class="mod-sys__user"> | |||
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> | |||
<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" | |||
@clickBtn="handleClick" | |||
/> | |||
<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" | |||
@clickBtn="handleClick" /> | |||
</base-table> | |||
<pagination | |||
:limit.sync="listQuery.limit" | |||
:page.sync="listQuery.page" | |||
:total="listQuery.total" | |||
@pagination="getDataList" | |||
/> | |||
<pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total" | |||
@pagination="getDataList" /> | |||
<!-- 弹窗, 新增 / 修改 --> | |||
<base-dialog | |||
:dialogTitle="addOrEditTitle" | |||
:dialogVisible="addOrUpdateVisible" | |||
@cancel="handleCancel" | |||
@confirm="handleConfirm" | |||
:before-close="handleCancel" | |||
> | |||
<add-or-update ref="addOrUpdate" @successSubmit="successSubmit"></add-or-update> | |||
<base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel" | |||
@confirm="handleConfirm" :before-close="handleCancel"> | |||
<add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update> | |||
</base-dialog> | |||
</div> | |||
</el-card> | |||