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

Merge pull request 'dy' (#31) from dy into master

Browse Source 
Reviewed-on: #31
This commit is contained in:
hellody 2023-08-25 14:50:40 +08:00
commit 4ade4b79a9
10 changed files with 152 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/index.html
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2022-08-22 14:57:50 * @Date: 2022-08-22 14:57:50
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2023-07-21 16:45:57 * @LastEditTime: 2023-08-01 14:42:59
* @Description: * @Description:
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -40,6 +40,7 @@
<script> <script>
// window.SITE_CONFIG['apiURL'] = 'http://192.168.1.76:8080/ym-pass'; // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.76:8080/ym-pass';
window.SITE_CONFIG['apiURL'] = 'http://192.168.1.23:8080/'; window.SITE_CONFIG['apiURL'] = 'http://192.168.1.23:8080/';
// window.SITE_CONFIG['apiURL'] = 'http://192.168.0.31:8080/';
</script> </script>
<% } %> <% } %>
<!-- 集成测试环境 --> <!-- 集成测试环境 -->

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

@ -13,6 +13,7 @@ t.brand.mini = 'qms'
t.public = {} t.public = {}
t.public.operation = '操作' t.public.operation = '操作'
t.public.activate = '启动'
t.add = '新增' t.add = '新增'
t.delete = '删除' t.delete = '删除'
@ -45,7 +46,10 @@ t.parameter = '台差参数'
t.configuration = '配置' t.configuration = '配置'
t.uploadFile = '上传' t.uploadFile = '上传'
t.detail = '查看详情' t.detail = '查看详情'
t.preview = '预览'
t.edit = '编辑'
t.finished = '已完成'
t.implementation = '实施中'
@ -53,9 +57,11 @@ t.detail = '查看详情'
t.prompt = {} t.prompt = {}
t.prompt.title = '提示' t.prompt.title = '提示'
t.prompt.info = '确定进行[{handle}]操作?' t.prompt.info = '确定进行[{handle}]操作?'
t.prompt.delete = '是否对[{object}]进行删除操作？'
t.prompt.success = '操作成功' t.prompt.success = '操作成功'
t.prompt.failed = '操作失败' t.prompt.failed = '操作失败'
t.prompt.deleteBatch = '请选择删除项' t.prompt.deleteBatch = '请选择删除项'
t.prompt.chooseGroup = '请选择要求分组'
t.validate = {} t.validate = {}
t.validate.required = '必填项不能为空' t.validate.required = '必填项不能为空'
@ -346,7 +352,7 @@ t.quality.judgmentMark = '判断标识'
t.quality.disposalMethodStatus = '状态' t.quality.disposalMethodStatus = '状态'
t.quality.inspectionPositionNumber = '序号' t.quality.inspectionPositionNumber = '序号'
t.quality.productName = '检验产品' t.quality.productName = '检验产品'
t.quality.supplierName = '供应商名称' t.quality.suppliername = '供应商名称'
t.quality.transferOutName = '转出' t.quality.transferOutName = '转出'
t.quality.transferInName = '转入' t.quality.transferInName = '转入'
t.quality.dataSources = '数据来源' t.quality.dataSources = '数据来源'
@ -354,6 +360,8 @@ t.quality.remark = '备注'
t.quality.userName = '创建人' t.quality.userName = '创建人'
t.quality.inspectionStage = '检验阶段' t.quality.inspectionStage = '检验阶段'
t.quality.supplierName = '供应商' t.quality.supplierName = '供应商'
t.quality.supplierList = '供应商列表'
t.quality.principal = '负责人列表'
t.quality.normalToRelaxed = '正常转放宽' t.quality.normalToRelaxed = '正常转放宽'
t.quality.normalToTightened = '正常转加严' t.quality.normalToTightened = '正常转加严'
t.quality.relaxedToNormal = '放宽转正常' t.quality.relaxedToNormal = '放宽转正常'
@ -469,13 +477,17 @@ t.supplier.projectName = '评估项目'
t.supplier.projectTypeName = '类别' t.supplier.projectTypeName = '类别'
t.supplier.requirement = '要求' t.supplier.requirement = '要求'
t.supplier.statisticalValue = '是否统计值' t.supplier.statisticalValue = '是否统计值'
t.supplier.evaluationTemplateName = '评估模板'
t.supplier.lastStartTime = '上次启动时间段' t.supplier.lastStartTime = '上次启动时间段'
t.supplier.lastStartEvaluationPeriod = '上次启动评估时间段' t.supplier.lastStartEvaluationPeriod = '上次启动评估时间段'
t.supplier.estimatedNextStartTime = '预计下次启动时间' t.supplier.estimatedNextStartTime = '预计下次启动时间'
t.supplier.offline = '下限' t.supplier.offline = '下限'
t.supplier.online = '上限' t.supplier.online = '上限'
t.supplier.supplierStatus = '供应商状态' t.supplier.supplierStatus = '供应商状态'
t.supplier.year = '年度'
t.supplier.quarter = '季度'
t.supplier.month = '月度'
t.supplier.materiel = '物料'
t.supplier.requiredGrouping = '要求分组'

23
src/views/modules/supplier/qmsEvaluationItemList.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-04-17 14:23:17 * @Date: 2023-04-17 14:23:17
* @LastEditTime: 2023-07-17 15:26:25 * @LastEditTime: 2023-08-24 09:28:35
* @LastEditors: DY * @LastEditors: DY
* @Description: * @Description:
--> -->
@ -13,7 +13,7 @@
<SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick"> <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
</SearchBar> </SearchBar>
<base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1" :limit="listQuery.limit" :table-data="tableData"> <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" <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" :label="$t('handle')" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
<pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total" <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
@ -173,7 +173,7 @@ export default {
// this.searchOrUpdateVisible = false; // this.searchOrUpdateVisible = false;
// }, // },
conditionSearch() { conditionSearch() {
this.searchOrEditTitle = "搜索"; this.searchOrEditTitle = this.$t('search');
this.searchOrUpdateVisible = true; this.searchOrUpdateVisible = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.searchOrUpdate.init(); this.$refs.searchOrUpdate.init();
@ -226,16 +226,19 @@ export default {
}, },
handleClick(val) { handleClick(val) {
if (val.type === "delete") { if (val.type === "delete") {
this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", { this.$confirm(
confirmButtonText: "确定", this.$t("prompt.delete", { object: val.data.customerTypeName }),
cancelButtonText: "取消", this.$t("prompt.title"),
type: "warning", {
}) confirmButtonText: this.$t("confirm"),
cancelButtonText: this.$t("cancel"),
type: "warning"
})
.then(() => { .then(() => {
this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => { this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({
message: "操作成功", message: this.$t("prompt.success"),
type: "success", type: "success",
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
@ -282,7 +285,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add')
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

62
src/views/modules/supplier/qmsEvaluationItemListLabel.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-04-17 14:23:17 * @Date: 2023-04-17 14:23:17
* @LastEditTime: 2023-07-12 14:17:24 * @LastEditTime: 2023-08-17 15:06:48
* @LastEditors: DY * @LastEditors: DY
* @Description: 标签设定 * @Description: 标签设定
--> -->
@ -114,19 +114,20 @@ export default {
}, },
editHandle(label) { editHandle(label) {
label.disabled = false label.disabled = false
console.log('nihc', label)
}, },
handleClose(tag) { handleClose(tag) {
console.log('你好', tag) this.$confirm(
this.$confirm(`确定对[名称=${tag.name}]进行删除操作?`, "提示", { this.$t("prompt.delete", { object: tag.name }),
confirmButtonText: "确定", this.$t("prompt.title"),
cancelButtonText: "取消", {
type: "warning", confirmButtonText: this.$t("confirm"),
cancelButtonText: this.$t("cancel"),
type: "warning"
}).then(()=> { }).then(()=> {
this.$http.delete(this.urlOptions.deleteLabelInfoURL, { data: [tag.id] }).then(({ data }) => { this.$http.delete(this.urlOptions.deleteLabelInfoURL, { data: [tag.id] }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({
message: "操作成功", message: this.$t("prompt.success"),
type: "success", type: "success",
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
@ -149,16 +150,19 @@ export default {
// }); // });
// }, // },
deleteHandle(id, name) { deleteHandle(id, name) {
this.$confirm(`确定对[名称=${name}]进行删除操作?`, "提示", { this.$confirm(
confirmButtonText: "确定", this.$t("prompt.delete", { object: name }),
cancelButtonText: "取消", this.$t("prompt.title"),
type: "warning", {
confirmButtonText: this.$t("confirm"),
cancelButtonText: this.$t("cancel"),
type: "warning"
}) })
.then(() => { .then(() => {
this.$http.delete(this.urlOptions.deleteURL, { data: [id] }).then(({ data }) => { this.$http.delete(this.urlOptions.deleteURL, { data: [id] }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({
message: "操作成功", message: this.$t("prompt.success"),
type: "success", type: "success",
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
@ -279,38 +283,6 @@ export default {
// console.log(11111); // console.log(11111);
// this.conditionSearchSubmit(); // this.conditionSearchSubmit();
}, },
handleClick(val) {
if (val.type === "delete") {
this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
if (data && data.code === 0) {
this.$message({
message: "操作成功",
type: "success",
duration: 1500,
onClose: () => {
this.getDataList();
},
});
} else {
this.$message.error(data.msg);
}
});
})
.catch(() => { });
} else if (val.type === 'edit') {
this.addOrEditTitle = '修改'
this.addOrUpdateVisible = true;
this.$nextTick(() => {
this.$refs.addOrUpdate.init(val.data.id);
});
}
},
buttonClick(val) { buttonClick(val) {
console.log(val) console.log(val)
switch (val.btnName) { switch (val.btnName) {

62
src/views/modules/supplier/qmsEvaluationPlan.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: Do not edit * @Author: Do not edit
* @Date: 2023-06-20 11:16:51 * @Date: 2023-06-20 11:16:51
* @LastEditTime: 2023-07-14 16:31:39 * @LastEditTime: 2023-08-22 11:00:34
* @LastEditors: DY * @LastEditors: DY
* @Description: 评估计划 * @Description: 评估计划
--> -->
@ -9,11 +9,11 @@
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div> <div>
<el-form :inline="true" :model="formInline" class="demo-form-inline"> <el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="供应商名称"> <el-form-item :label="$t('quality.suppliername')">
<el-input v-model="formInline.supplierName" placeholder="供应商"></el-input> <el-input v-model="formInline.supplierName" :placeholder="$t('quality.suppliername')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="评估模板"> <el-form-item :label="$t('supplier.evaluationTemplateName')">
<el-select v-model="formInline.evaluationTemplateId" filterable clearable placeholder="评估模板"> <el-select v-model="formInline.evaluationTemplateId" filterable clearable :placeholder="$t('supplier.evaluationTemplateName')">
<el-option <el-option
v-for="item in modalOptions" v-for="item in modalOptions"
:key="item.id" :key="item.id"
@ -22,8 +22,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="评估类型"> <el-form-item :label="$t('supplier.evaluationType')">
<el-select v-model="formInline.evaluationType" clearable placeholder="评估类型"> <el-select v-model="formInline.evaluationType" clearable :placeholder="$t('supplier.evaluationType')">
<el-option <el-option
v-for="item in typeOptions" v-for="item in typeOptions"
:key="item.id" :key="item.id"
@ -33,7 +33,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button> <el-button type="primary" @click="onSubmit">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -45,60 +45,60 @@
<el-table-column type="expand"> <el-table-column type="expand">
<template slot-scope="props"> <template slot-scope="props">
<el-form label-position="left" inline class="demo-table-expand"> <el-form label-position="left" inline class="demo-table-expand">
<el-form-item label="供应商列表"> <el-form-item :label="$t('quality.supplierList')">
<el-tag type="success" v-for="(item, index) in props.row.list" :key="index">{{ item.supplierName }}</el-tag> <el-tag type="success" v-for="(item, index) in props.row.list" :key="index">{{ item.supplierName }}</el-tag>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="负责人列表"> <el-form-item :label="$t('quality.principal')">
<el-tag>{{ props.row.evaluatorName }}</el-tag> <el-tag>{{ props.row.evaluatorName }}</el-tag>
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="评估类型" :label="$t('supplier.evaluationType')"
prop="evaluationType"> prop="evaluationType">
<template slot-scope="slot"> <template slot-scope="slot">
<el-tag :type="slot.row.evaluationType === 0 ? 'info' : slot.row.evaluationType === 1 ? 'success' : ''" effect="dark">{{ slot.row.evaluationType === 0 ? '年度' : slot.row.evaluationType === 1 ? '季度' : '月度' }}</el-tag> <el-tag :type="slot.row.evaluationType === 0 ? 'info' : slot.row.evaluationType === 1 ? 'success' : ''" effect="dark">{{ slot.row.evaluationType === 0 ? $t('supplier.year') : slot.row.evaluationType === 1 ? $t('supplier.quarter') : $t('supplier.month') }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="标题" :label="$t('quality.title')"
prop="title"> prop="title">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="评估模板" :label="$t('supplier.evaluationTemplateName')"
prop="evaluationTemplateName"> prop="evaluationTemplateName">
<template slot-scope="slot"> <template slot-scope="slot">
<el-tag type="danger" effect="plain">{{ slot.row.evaluationTemplateName }}</el-tag> <el-tag type="danger" effect="plain">{{ slot.row.evaluationTemplateName }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="说明" :label="$t('supplier.description')"
prop="description"> prop="description">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="上次启动时间" :label="$t('supplier.lastStartTime')"
prop="lastStartTime"> prop="lastStartTime">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="上次启动评估时间段" :label="$t('supplier.lastStartEvaluationPeriod')"
prop="lastStartEvaluationPeriod"> prop="lastStartEvaluationPeriod">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="预计下次启动时间" :label="$t('supplier.estimatedNextStartTime')"
prop="estimatedNextStartTime"> prop="estimatedNextStartTime">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="提醒人" :label="$t('supplier.reminder')"
prop="reminder"> prop="reminder">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" :label="$t('public.operation')"
width="160" width="160"
prop="desc"> prop="desc">
<template slot-scope="slot"> <template slot-scope="slot">
<el-button type="text" @click="start(slot.row)">启动</el-button> <el-button type="text" @click="start(slot.row)">{{ $('public.activate') }}</el-button>
<el-button type="text" @click="editPlan(slot.row)">edit</el-button> <el-button type="text" @click="editPlan(slot.row)">edit</el-button>
<el-button type="text" @click="deletePlan(slot.row)" style="color: red">delete</el-button> <el-button type="text" @click="deletePlan(slot.row)" style="color: red">delete</el-button>
</template> </template>
@ -118,6 +118,7 @@
<script> <script>
import addPlan from './components/addPlan.vue' import addPlan from './components/addPlan.vue'
import startPlan from './components/startPlan.vue' import startPlan from './components/startPlan.vue'
import i18n from "@/i18n"
export default { export default {
components: { addPlan, startPlan }, components: { addPlan, startPlan },
@ -132,15 +133,15 @@ export default {
addtModelVisible: false, addtModelVisible: false,
typeOptions: [ typeOptions: [
{ {
name: '年度', name: i18n.t('supplier.year'),
id: 0 id: 0
}, },
{ {
name: '季度', name: i18n.t('supplier.quarter'),
id: 1 id: 1
}, },
{ {
name: '月度', name: i18n.t('supplier.month'),
id: 2 id: 2
} }
], ],
@ -187,16 +188,19 @@ export default {
}); });
}, },
deletePlan(val) { deletePlan(val) {
this.$confirm(`确定对[名称=${val.title}]进行删除操作?`, "提示", { this.$confirm(
confirmButtonText: "确定", this.$t("prompt.delete", { object: val.title }),
cancelButtonText: "取消", this.$t("prompt.title"),
type: "warning", {
confirmButtonText: this.$t("confirm"),
cancelButtonText: this.$t("cancel"),
type: "warning"
}) })
.then(() => { .then(() => {
this.$http.delete(this.urlOptions.deleteURL, { data: [val.id] }).then(({ data }) => { this.$http.delete(this.urlOptions.deleteURL, { data: [val.id] }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({
message: "操作成功", message: this.$t("prompt.success"),
type: "success", type: "success",
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {

30
src/views/modules/supplier/qmsEvaluationTemplate.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: Do not edit * @Author: Do not edit
* @Date: 2023-06-19 10:38:41 * @Date: 2023-06-19 10:38:41
* @LastEditTime: 2023-07-20 16:14:02 * @LastEditTime: 2023-08-21 15:26:45
* @LastEditors: DY * @LastEditors: DY
* @Description: 评估模板 * @Description: 评估模板
--> -->
@ -21,21 +21,21 @@
<div :class="item.current === 1 ? 'activeCard' : 'normalCard'" @mouseenter="enterDiv(item)" @mouseleave="leaveDiv(item)" @click="seeeValuationList(item.id)"> <div :class="item.current === 1 ? 'activeCard' : 'normalCard'" @mouseenter="enterDiv(item)" @mouseleave="leaveDiv(item)" @click="seeeValuationList(item.id)">
<svg v-if="item.current" class="icon-svg" aria-hidden="true"><use xlink:href="#icon-look"></use></svg> <svg v-if="item.current" class="icon-svg" aria-hidden="true"><use xlink:href="#icon-look"></use></svg>
<svg v-else class="icon-svg" aria-hidden="true"><use xlink:href="#icon-look1"></use></svg> <svg v-else class="icon-svg" aria-hidden="true"><use xlink:href="#icon-look1"></use></svg>
<p style="font-size: 14px">预览</p> <p style="font-size: 14px">{{ $t("preview") }}</p>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div :class="item.current === 1 ? 'activeCard' : 'normalCard'" @mouseenter="enterDiv(item)" @mouseleave="leaveDiv(item)" @click="editEvaluation(item)"> <div :class="item.current === 1 ? 'activeCard' : 'normalCard'" @mouseenter="enterDiv(item)" @mouseleave="leaveDiv(item)" @click="editEvaluation(item)">
<svg v-if="item.current" class="icon-svg" aria-hidden="true"><use xlink:href="#icon-edit0"></use></svg> <svg v-if="item.current" class="icon-svg" aria-hidden="true"><use xlink:href="#icon-edit0"></use></svg>
<svg v-else class="icon-svg" aria-hidden="true"><use xlink:href="#icon-edit1"></use></svg> <svg v-else class="icon-svg" aria-hidden="true"><use xlink:href="#icon-edit1"></use></svg>
<p style="font-size: 14px">编辑</p> <p style="font-size: 14px">{{ $t("edit") }}</p>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div :class="item.current === 1 ? 'activeDelCard' : 'normalCard'" @mouseenter="enterDiv(item)" @mouseleave="leaveDiv(item)" @click="deleteEvaluation(item.id, item.name)"> <div :class="item.current === 1 ? 'activeDelCard' : 'normalCard'" @mouseenter="enterDiv(item)" @mouseleave="leaveDiv(item)" @click="deleteEvaluation(item.id, item.name)">
<svg v-if="item.current" class="icon-svg" aria-hidden="true"><use xlink:href="#icon-del1"></use></svg> <svg v-if="item.current" class="icon-svg" aria-hidden="true"><use xlink:href="#icon-del1"></use></svg>
<svg v-else class="icon-svg" aria-hidden="true"><use xlink:href="#icon-del"></use></svg> <svg v-else class="icon-svg" aria-hidden="true"><use xlink:href="#icon-del"></use></svg>
<p style="font-size: 14px">删除</p> <p style="font-size: 14px">{{ $t("delete") }}</p>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -50,7 +50,7 @@
<evaluation-template-add @refreshDataList="getDataList" :show="editModelVisible" @info="getInfo"></evaluation-template-add> <evaluation-template-add @refreshDataList="getDataList" :show="editModelVisible" @info="getInfo"></evaluation-template-add>
</div> --> </div> -->
<el-dialog <el-dialog
title="新增模板" :title="$t('add')"
:visible.sync="editModelVisible" :visible.sync="editModelVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
width="70%" width="70%"
@ -58,7 +58,7 @@
<evaluation-template-add ref="addTemplate" @refreshDataList="getDataList" :show="editModelVisible" @info="getInfo"></evaluation-template-add> <evaluation-template-add ref="addTemplate" @refreshDataList="getDataList" :show="editModelVisible" @info="getInfo"></evaluation-template-add>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="预览" :title="$t('preview')"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
width="40%" width="40%"
@ -104,7 +104,6 @@ export default ({
}, },
tableProps, tableProps,
projectsList: [], projectsList: [],
addOrEditTitle: '新增模板',
current: 0, current: 0,
addTemplateVisible: false, addTemplateVisible: false,
activeStep: 0, activeStep: 0,
@ -119,7 +118,6 @@ export default ({
}, },
methods: { methods: {
editEvaluation(obj) { editEvaluation(obj) {
console.log('编辑', obj.id)
this.templateId = obj.id this.templateId = obj.id
this.editModelVisible = true this.editModelVisible = true
this.$nextTick(() => { this.$nextTick(() => {
@ -133,16 +131,19 @@ export default ({
obj.current = 1 obj.current = 1
}, },
deleteEvaluation(id, name) { deleteEvaluation(id, name) {
this.$confirm(`确定对[名称=${name}]进行删除操作?`, "提示", { this.$confirm(
confirmButtonText: "确定", this.$t("prompt.delete", { object: name }),
cancelButtonText: "取消", this.$t("prompt.title"),
type: "warning", {
confirmButtonText: this.$t("confirm"),
cancelButtonText: this.$t("cancel"),
type: "warning"
}) })
.then(() => { .then(() => {
this.$http.delete(this.urlOptions.deleteURL, { data: [id] }).then(({ data }) => { this.$http.delete(this.urlOptions.deleteURL, { data: [id] }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({
message: "操作成功", message: this.$t("prompt.success"),
type: "success", type: "success",
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
@ -160,14 +161,13 @@ export default ({
this.editModelVisible = value this.editModelVisible = value
}, },
handleClose(done) { handleClose(done) {
this.$confirm('确认关闭？') this.$confirm(this.$t('prompt.info', { 'handle': this.$t('close') }))
.then(_ => { .then(_ => {
done(); done();
}) })
.catch(_ => {}); .catch(_ => {});
}, },
seeeValuationList(id) { seeeValuationList(id) {
console.log('啊啊啊啊', id)
this.dialogVisible = true this.dialogVisible = true
this.$http this.$http
.get(this.urlOptions.getProjectTypeURL, { .get(this.urlOptions.getProjectTypeURL, {

17
src/views/modules/supplier/qmsSupplier.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-04-17 14:23:17 * @Date: 2023-04-17 14:23:17
* @LastEditTime: 2023-07-14 15:56:32 * @LastEditTime: 2023-08-22 15:05:00
* @LastEditors: DY * @LastEditors: DY
* @Description: * @Description:
--> -->
@ -18,7 +18,7 @@
<base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1" <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
@emitFun="inputChange" :limit="listQuery.limit" @emitFun="inputChange" :limit="listQuery.limit"
:table-data="tableData" > :table-data="tableData" >
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn" <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" :label="$t('public.operation')" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
<pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total" <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
@ -296,16 +296,19 @@ export default {
}, },
handleClick(val) { handleClick(val) {
if (val.type === "delete") { if (val.type === "delete") {
this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", { this.$confirm(
confirmButtonText: "确定", this.$t("prompt.delete", { object: val.data.customerTypeName }),
cancelButtonText: "取消", this.$t("prompt.title"),
type: "warning", {
confirmButtonText: this.$t("confirm"),
cancelButtonText: this.$t("cancel"),
type: "warning"
}) })
.then(() => { .then(() => {
this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => { this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({
message: "操作成功", message: this.$t("prompt.success"),
type: "success", type: "success",
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {

49
src/views/modules/supplier/qmsSupplierProjectList.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: Do not edit * @Author: Do not edit
* @Date: 2023-06-20 11:16:51 * @Date: 2023-06-20 11:16:51
* @LastEditTime: 2023-07-21 16:37:22 * @LastEditTime: 2023-08-23 15:10:48
* @LastEditors: DY * @LastEditors: DY
* @Description: 项目清单 * @Description: 项目清单
--> -->
@ -9,11 +9,11 @@
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div> <div>
<el-form :inline="true" :model="formInline" class="demo-form-inline"> <el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="标题"> <el-form-item :label="$t('supplier.title')">
<el-input v-model="formInline.title" placeholder="标题"></el-input> <el-input v-model="formInline.title" :placeholder="$t('supplier.title')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="物料"> <el-form-item :label="$t('supplier.materiel')">
<el-select v-model="formInline.productId" filterable clearable placeholder="物料"> <el-select v-model="formInline.productId" filterable clearable :placeholder="$t('supplier.materiel')">
<el-option <el-option
v-for="item in productList" v-for="item in productList"
:key="item.id" :key="item.id"
@ -22,8 +22,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="供应商"> <el-form-item :label="$t('quality.supplierName')">
<el-select v-model="formInline.supplierId" filterable clearable placeholder="供应商"> <el-select v-model="formInline.supplierId" filterable clearable :placeholder="$t('quality.supplierName')">
<el-option <el-option
v-for="item in supplierList" v-for="item in supplierList"
:key="item.id" :key="item.id"
@ -32,25 +32,25 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="状态"> <el-form-item :label="$t('supplier.status')">
<el-radio-group v-model="formInline.status"> <el-radio-group v-model="formInline.status">
<el-radio-button :label="2">全部</el-radio-button> <el-radio-button :label="2">{{ $t('all') }}</el-radio-button>
<el-radio-button :label="1">已完成</el-radio-button> <el-radio-button :label="1">{{ $t('finished') }}</el-radio-button>
<el-radio-button :label="0">实施中</el-radio-button> <el-radio-button :label="0">{{ $t('implementation') }}</el-radio-button>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="时间"> <el-form-item :label="$t('time')">
<el-date-picker <el-date-picker
v-model="timeSlot" v-model="timeSlot"
type="daterange" type="daterange"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至" :range-separator="$t('gage.to')"
start-placeholder="开始日期" :start-placeholder="$t('gage.startTime')"
end-placeholder="结束日期"> :end-placeholder="$t('gage.endTime')">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button> <el-button type="primary" @click="onSubmit">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -63,8 +63,8 @@
</div> </div>
<div class="buttonDiv"> <div class="buttonDiv">
<el-row :gutter="0"> <el-row :gutter="0">
<el-col :span="12"><div class="bottom" @click="editProject(project)">编辑</div></el-col> <el-col :span="12"><div class="bottom" @click="editProject(project)">{{ $t('edit') }}</div></el-col>
<el-col :span="12"><div class="bottom" @click="deletePro(project)">删除</div></el-col> <el-col :span="12"><div class="bottom" @click="deletePro(project)">{{ $t('delete') }}</div></el-col>
</el-row> </el-row>
</div> </div>
</div> </div>
@ -116,16 +116,19 @@ export default {
}, },
methods: { methods: {
deletePro(val) { deletePro(val) {
this.$confirm(`确定对[名称=${val.title}]进行删除操作?`, "提示", { this.$confirm(
confirmButtonText: "确定", this.$t("prompt.delete", { object: val.title }),
cancelButtonText: "取消", this.$t("prompt.title"),
type: "warning", {
confirmButtonText: this.$t("confirm"),
cancelButtonText: this.$t("cancel"),
type: "warning"
}) })
.then(() => { .then(() => {
this.$http.delete(this.urlOptions.deleteURL, { data: [val.id] }).then(({ data }) => { this.$http.delete(this.urlOptions.deleteURL, { data: [val.id] }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({
message: "操作成功", message: this.$t("prompt.success"),
type: "success", type: "success",
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {

36
src/views/modules/supplier/qmsSupplierRequirementList.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: Do not edit * @Author: Do not edit
* @Date: 2023-06-20 11:16:51 * @Date: 2023-06-20 11:16:51
* @LastEditTime: 2023-07-21 15:18:23 * @LastEditTime: 2023-08-24 10:58:10
* @LastEditors: DY * @LastEditors: DY
* @Description: 要求清单 * @Description: 要求清单
--> -->
@ -10,7 +10,7 @@
<div style="padding: 20px 30px"> <div style="padding: 20px 30px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6"> <el-col :span="6">
<h2>要求分组</h2> <h2>{{ $t('supplier.requiredGrouping') }}</h2>
<div v-for="(item, index) in groupList" :key="index"> <div v-for="(item, index) in groupList" :key="index">
<div :class="item.actived ? 'activedDiv' : 'group'" @click="searchByGroup(item)">{{ item.name }}</div> <div :class="item.actived ? 'activedDiv' : 'group'" @click="searchByGroup(item)">{{ item.name }}</div>
</div> </div>
@ -18,10 +18,10 @@
<el-col :span="18"> <el-col :span="18">
<el-form :inline="true" :model="formInline" class="demo-form-inline"> <el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item> <el-form-item>
<el-input v-model="formInline.requirementName" placeholder="标题"></el-input> <el-input v-model="formInline.requirementName" :placeholder="$t('supplier.title')"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button> <el-button type="primary" @click="onSubmit">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="bigDiv"> <div class="bigDiv">
@ -45,14 +45,14 @@
<div v-if="addtModelVisible" style="height: 400px; width: 40%; margin: 20px auto; border: 1px solid grey; padding: 20px"> <div v-if="addtModelVisible" style="height: 400px; width: 40%; margin: 20px auto; border: 1px solid grey; padding: 20px">
<h2>要求编辑</h2> <h2>要求编辑</h2>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm">
<el-form-item label="标题" prop="title"> <el-form-item :label="$t('supplier.title')" prop="title">
<el-input v-model="ruleForm.title"></el-input> <el-input v-model="ruleForm.title"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="description"> <el-form-item :label="$t('gage.description')" prop="description">
<el-input type="textarea" v-model="ruleForm.description"></el-input> <el-input type="textarea" v-model="ruleForm.description"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所属分组" prop="requirementListGroupId"> <el-form-item :label="$t('researchquality.requirementListGroupId')" prop="requirementListGroupId">
<el-select v-model="ruleForm.requirementListGroupId" placeholder="请选择"> <el-select v-model="ruleForm.requirementListGroupId" :placeholder="$t('choose')">
<el-option <el-option
v-for="item in groupList" v-for="item in groupList"
:key="item.id" :key="item.id"
@ -63,8 +63,8 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<!-- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button> --> <!-- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button> -->
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="saveRequirement">保 存</el-button> <el-button type="primary" @click="saveRequirement">{{ $t('save') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -114,16 +114,19 @@ export default {
this.addtModelVisible = true this.addtModelVisible = true
}, },
deleteRequire(id, name) { deleteRequire(id, name) {
this.$confirm(`确定对[标题=${name}]进行删除操作?`, "提示", { this.$confirm(
confirmButtonText: "确定", this.$t("prompt.delete", { object: name }),
cancelButtonText: "取消", this.$t("prompt.title"),
type: "warning", {
confirmButtonText: this.$t("confirm"),
cancelButtonText: this.$t("cancel"),
type: "warning"
}) })
.then(() => { .then(() => {
this.$http.delete(this.urlOptions.deleteURL, { data: [id] }).then(({ data }) => { this.$http.delete(this.urlOptions.deleteURL, { data: [id] }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({
message: "操作成功", message: this.$t("prompt.success"),
type: "success", type: "success",
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
@ -164,7 +167,6 @@ export default {
}); });
}, },
searchByGroup(group) { searchByGroup(group) {
console.log('查询', group)
// this.formInline.groupId = group.id // this.formInline.groupId = group.id
group.actived = !group.actived group.actived = !group.actived
if (group.actived === true) { if (group.actived === true) {
@ -207,7 +209,7 @@ export default {
onSubmit() { onSubmit() {
console.log('submit!'); console.log('submit!');
if (this.formInline.groupId === '') { if (this.formInline.groupId === '') {
this.$message.error('请选择要求分组') this.$message.error(this.$t("prompt.chooseGroup"))
} else { } else {
this.$http this.$http
.get(this.urlOptions.getRequirementListURL, { .get(this.urlOptions.getRequirementListURL, {

4
src/views/modules/sys/dept.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2023-01-04 10:29:40 * @Date: 2023-01-04 10:29:40
* @LastEditors: zwq * @LastEditors: DY
* @LastEditTime: 2023-01-05 14:32:59 * @LastEditTime: 2023-08-01 15:14:29
* @Description: * @Description:
--> -->
<template> <template>