mt-fe-group
/
qms
11
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Labels Milestones
New Pull Request

#31 dy

Merged
hellody merged 2 commits from dy into master 1 year ago
Conversation 0 Commits 2 Files Changed 10
10 changed files with 151 additions and 151 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -1
      public/index.html
  2. +15
    -3
      src/i18n/zh-CN.js
  3. +12
    -9
      src/views/modules/supplier/qmsEvaluationItemList.vue
  4. +17
    -45
      src/views/modules/supplier/qmsEvaluationItemListLabel.vue
  5. +33
    -29
      src/views/modules/supplier/qmsEvaluationPlan.vue
  6. +15
    -15
      src/views/modules/supplier/qmsEvaluationTemplate.vue
  7. +10
    -7
      src/views/modules/supplier/qmsSupplier.vue
  8. +26
    -23
      src/views/modules/supplier/qmsSupplierProjectList.vue
  9. +19
    -17
      src/views/modules/supplier/qmsSupplierRequirementList.vue
  10. +2
    -2
      src/views/modules/sys/dept.vue

+ 2
- 1
public/index.html View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2022-08-22 14:57:50
* @LastEditors: DY
* @LastEditTime: 2023-07-21 16:45:57
* @LastEditTime: 2023-08-01 14:42:59
* @Description:
-->
<!DOCTYPE html>
@@ -40,6 +40,7 @@
<script>
// 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.0.31:8080/';
</script>
<% } %>
<!-- 集成测试环境 -->


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

@@ -13,6 +13,7 @@ t.brand.mini = 'qms'
t.public = {}
t.public.operation = '操作'
t.public.activate = '启动'

t.add = '新增'
t.delete = '删除'
@@ -45,7 +46,10 @@ t.parameter = '台差参数'
t.configuration = '配置'
t.uploadFile = '上传'
t.detail = '查看详情'

t.preview = '预览'
t.edit = '编辑'
t.finished = '已完成'
t.implementation = '实施中'



@@ -53,9 +57,11 @@ t.detail = '查看详情'
t.prompt = {}
t.prompt.title = '提示'
t.prompt.info = '确定进行[{handle}]操作?'
t.prompt.delete = '是否对[{object}]进行删除操作？'
t.prompt.success = '操作成功'
t.prompt.failed = '操作失败'
t.prompt.deleteBatch = '请选择删除项'
t.prompt.chooseGroup = '请选择要求分组'

t.validate = {}
t.validate.required = '必填项不能为空'
@@ -346,7 +352,7 @@ t.quality.judgmentMark = '判断标识'
t.quality.disposalMethodStatus = '状态'
t.quality.inspectionPositionNumber = '序号'
t.quality.productName = '检验产品'
t.quality.supplierName = '供应商名称'
t.quality.suppliername = '供应商名称'
t.quality.transferOutName = '转出'
t.quality.transferInName = '转入'
t.quality.dataSources = '数据来源'
@@ -354,6 +360,8 @@ t.quality.remark = '备注'
t.quality.userName = '创建人'
t.quality.inspectionStage = '检验阶段'
t.quality.supplierName = '供应商'
t.quality.supplierList = '供应商列表'
t.quality.principal = '负责人列表'
t.quality.normalToRelaxed = '正常转放宽'
t.quality.normalToTightened = '正常转加严'
t.quality.relaxedToNormal = '放宽转正常'
@@ -469,13 +477,17 @@ t.supplier.projectName = '评估项目'
t.supplier.projectTypeName = '类别'
t.supplier.requirement = '要求'
t.supplier.statisticalValue = '是否统计值'
t.supplier.evaluationTemplateName = '评估模板'
t.supplier.lastStartTime = '上次启动时间段'
t.supplier.lastStartEvaluationPeriod = '上次启动评估时间段'
t.supplier.estimatedNextStartTime = '预计下次启动时间'
t.supplier.offline = '下限'
t.supplier.online = '上限'
t.supplier.supplierStatus = '供应商状态'
t.supplier.year = '年度'
t.supplier.quarter = '季度'
t.supplier.month = '月度'
t.supplier.materiel = '物料'
t.supplier.requiredGrouping = '要求分组'





+ 12
- 9
src/views/modules/supplier/qmsEvaluationItemList.vue View File

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


+ 17
- 45
src/views/modules/supplier/qmsEvaluationItemListLabel.vue View File

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


+ 33
- 29
src/views/modules/supplier/qmsEvaluationPlan.vue View File

@@ -1,7 +1,7 @@
<!--
* @Author: Do not edit
* @Date: 2023-06-20 11:16:51
* @LastEditTime: 2023-07-14 16:31:39
* @LastEditTime: 2023-08-22 11:00:34
* @LastEditors: DY
* @Description: 评估计划
-->
@@ -9,11 +9,11 @@
<el-card shadow="never" class="aui-card--fill">
<div>
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="供应商名称">
<el-input v-model="formInline.supplierName" placeholder="供应商"></el-input>
<el-form-item :label="$t('quality.suppliername')">
<el-input v-model="formInline.supplierName" :placeholder="$t('quality.suppliername')"></el-input>
</el-form-item>
<el-form-item label="评估模板">
<el-select v-model="formInline.evaluationTemplateId" filterable clearable placeholder="评估模板">
<el-form-item :label="$t('supplier.evaluationTemplateName')">
<el-select v-model="formInline.evaluationTemplateId" filterable clearable :placeholder="$t('supplier.evaluationTemplateName')">
<el-option
v-for="item in modalOptions"
:key="item.id"
@@ -22,8 +22,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="评估类型">
<el-select v-model="formInline.evaluationType" clearable placeholder="评估类型">
<el-form-item :label="$t('supplier.evaluationType')">
<el-select v-model="formInline.evaluationType" clearable :placeholder="$t('supplier.evaluationType')">
<el-option
v-for="item in typeOptions"
:key="item.id"
@@ -33,7 +33,7 @@
</el-select>
</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>
</div>
@@ -45,60 +45,60 @@
<el-table-column type="expand">
<template slot-scope="props">
<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-form-item>
<br>
<el-form-item label="负责人列表">
<el-form-item :label="$t('quality.principal')">
<el-tag>{{ props.row.evaluatorName }}</el-tag>
</el-form-item>
</el-form>
</template>
</el-table-column>
<el-table-column
label="评估类型"
:label="$t('supplier.evaluationType')"
prop="evaluationType">
<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>
</el-table-column>
<el-table-column
label="标题"
:label="$t('quality.title')"
prop="title">
</el-table-column>
<el-table-column
label="评估模板"
:label="$t('supplier.evaluationTemplateName')"
prop="evaluationTemplateName">
<template slot-scope="slot">
<el-tag type="danger" effect="plain">{{ slot.row.evaluationTemplateName }}</el-tag>
</template>
</el-table-column>
<el-table-column
label="说明"
:label="$t('supplier.description')"
prop="description">
</el-table-column>
<el-table-column
label="上次启动时间"
:label="$t('supplier.lastStartTime')"
prop="lastStartTime">
</el-table-column>
<el-table-column
label="上次启动评估时间段"
:label="$t('supplier.lastStartEvaluationPeriod')"
prop="lastStartEvaluationPeriod">
</el-table-column>
<el-table-column
label="预计下次启动时间"
:label="$t('supplier.estimatedNextStartTime')"
prop="estimatedNextStartTime">
</el-table-column>
<el-table-column
label="提醒人"
:label="$t('supplier.reminder')"
prop="reminder">
</el-table-column>
<el-table-column
label="操作"
:label="$t('public.operation')"
width="160"
prop="desc">
<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="deletePlan(slot.row)" style="color: red">delete</el-button>
</template>
@@ -118,6 +118,7 @@
<script>
import addPlan from './components/addPlan.vue'
import startPlan from './components/startPlan.vue'
import i18n from "@/i18n"

export default {
components: { addPlan, startPlan },
@@ -132,15 +133,15 @@ export default {
addtModelVisible: false,
typeOptions: [
{
name: '年度',
name: i18n.t('supplier.year'),
id: 0
},
{
name: '季度',
name: i18n.t('supplier.quarter'),
id: 1
},
{
name: '月度',
name: i18n.t('supplier.month'),
id: 2
}
],
@@ -187,16 +188,19 @@ export default {
});
},
deletePlan(val) {
this.$confirm(`确定对[名称=${val.title}]进行删除操作?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
this.$confirm(
this.$t("prompt.delete", { object: val.title }),
this.$t("prompt.title"),
{
confirmButtonText: this.$t("confirm"),
cancelButtonText: this.$t("cancel"),
type: "warning"
})
.then(() => {
this.$http.delete(this.urlOptions.deleteURL, { data: [val.id] }).then(({ data }) => {
if (data && data.code === 0) {
this.$message({
message: "操作成功",
message: this.$t("prompt.success"),
type: "success",
duration: 1500,
onClose: () => {


+ 15
- 15
src/views/modules/supplier/qmsEvaluationTemplate.vue View File

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


+ 10
- 7
src/views/modules/supplier/qmsSupplier.vue View File

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


+ 26
- 23
src/views/modules/supplier/qmsSupplierProjectList.vue View File

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


+ 19
- 17
src/views/modules/supplier/qmsSupplierRequirementList.vue View File

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


+ 2
- 2
src/views/modules/sys/dept.vue View File

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


Write Preview
Loading…
Cancel
Save