Skip to content

M
mes-ui
Commit 8216ffcc authored by hiyon's avatar hiyon
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents 40aa3ca7 53799369
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1942 additions and 328 deletions
src/api/mes/qc/abnormal.js 0 → 100644
View file @ 8216ffcc
import request from '@/utils/request'
// 查询异常信息列表
export function listInformation(query) {
return request({
url: '/qc/information/list',
method: 'get',
params: query
})
}
// 查询异常信息详细
export function getInformation(abnormalId) {
return request({
url: '/qc/information/' + abnormalId,
method: 'get'
})
}
// 新增异常信息
export function addInformation(data) {
return request({
url: '/qc/information',
method: 'post',
data: data
})
}
// 修改异常信息
export function updateInformation(data) {
return request({
url: '/qc/information',
method: 'put',
data: data
})
}
// 删除异常信息
export function delInformation(abnormalId) {
return request({
url: '/qc/information/' + abnormalId,
method: 'delete'
})
}
src/api/mes/qc/templateProcess.js 0 → 100644
View file @ 8216ffcc
import request from '@/utils/request'
// 查询检测模板-工序列表
export function listTemplateProcess(query) {
return request({
url: '/mes/qc/templateProcess/list',
method: 'get',
params: query
})
}
// 查询检测模板-工序详细
export function getTemplateProcess(recordId) {
return request({
url: '/mes/qc/templateProcess/' + recordId,
method: 'get'
})
}
// 新增检测模板-工序
export function addTemplateProcess(data) {
return request({
url: '/mes/qc/templateProcess',
method: 'post',
data: data
})
}
// 修改检测模板-工序
export function updateTemplateProcess(data) {
return request({
url: '/mes/qc/templateProcess',
method: 'put',
data: data
})
}
// 删除检测模板-工序
export function delTemplateProcess(recordId) {
return request({
url: '/mes/qc/templateProcess/' + recordId,
method: 'delete'
})
}
src/api/mes/tm/tmToolRequestUse.js
View file @ 8216ffcc
......@@ -17,6 +17,15 @@ export function getTmToolRequestUse(toolRequestUseId) {
})
}
// 通过申请单id查询申请单刀模板数据
export function getTmToolRequestList(toolRequestId) {
return request({
url: 'tm/tmToolRequestUse/getToolsBytoolRequestId/' + toolRequestId,
method: 'get'
})
}
// 新增刀模板领用单
export function addTmToolRequestUse(data) {
return request({
......
src/components/qctemplateSelect/single.vue 0 → 100644
View file @ 8216ffcc
<template>
<el-dialog title="检测模板选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="60%"
center
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="检测模板编号" prop="templateCode">
<el-input
v-model="queryParams.templateCode"
placeholder="请输入检测模板编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检测模板名称" prop="templateName">
<el-input
v-model="queryParams.templateName"
placeholder="请输入检测模板名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品编码" prop="itemCode">
<el-input
v-model="queryParams.itemCode"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品名称" prop="itemName">
<el-input
v-model="queryParams.itemName"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="qctemplateList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="50" align="center" >
<template v-slot="scope">
<el-radio v-model="selectedIndexId" :label="scope.row.templateId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template>
</el-table-column>
<el-table-column label="检测模板编号" align="center" prop="templateCode" >
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:qc:qctemplate:query']"
>{{scope.row.templateCode}}</el-button>
</template>
</el-table-column>
<el-table-column label="检测模板名称" align="center" prop="templateName" />
<el-table-column label="检测种类" align="center" prop="qcTypesParam" >
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_qc_type" :value="scope.row.qcTypesParam"/>
</template>
</el-table-column>
<el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag=false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listQctemplate, getQctemplate, delQctemplate, addQctemplate, updateQctemplate } from "@/api/mes/qc/qctemplate";
export default {
name: "QcindexSelect",
dicts: ['mes_index_type','mes_qc_type'],
data() {
return {
showFlag:false,
// 遮罩层
loading: true,
// 选中数组
selectedIndexId: null,
selectedRows: undefined,
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 检测项表格数据
qcindexList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
inputTypeOptions: [{"label":"输入框","value":1},{"label":"选择框","value":2}],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
indexCode: null,
indexName: null,
indexType: null,
qcTool: null,
},
// 表单参数
form: {}
};
},
created() {
this.getList();
},
methods: {
/** 查询检测项列表 */
getList() {
this.loading = true;
listQctemplate(this.queryParams).then(response => {
this.qctemplateList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 表单重置
reset() {
this.form = {
templateId: null,
templateCode: null,
templateName: null,
qcTypesParam: [],
enableFlag: 'Y',
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.indexId)
this.single = selection.length!==1
this.multiple = !selection.length
},
handleCurrent(row){
if(row){
this.selectedRows = row;
}
},
handleRowDbClick(row){
if(row){
this.selectedRows = row;
this.$emit('onSelected',this.selectedRows);
this.showFlag = false;
}
},
// 单选选中数据
handleRowChange(row) {
debugger;
if(row){
this.selectedRows = row;
}
},
//选中确认
confirmSelect(){
if(this.selectedIndexId ==null || this.selectedIndexId==0){
this.$notify({
title:'提示',
type:'warning',
message: '请至少选择一条数据!'
});
return;
}
this.$emit('onSelected',this.selectedRows);
this.showFlag = false;
}
}
};
</script>
src/components/toolRequest/single.vue
View file @ 8216ffcc
......@@ -18,22 +18,24 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="作业单元" prop="workunitName">
<el-input
v-model="queryParams.workunitName"
placeholder="请输入作业单元"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="申请时间" prop="requestDate">
<el-date-picker clearable
v-model="queryParams.requestDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择申请时间">
</el-date-picker>
</el-form-item>
<el-form-item label="作业单元" prop="workunitName">
<el-input
v-model="queryParams.workunitName"
placeholder="请输入作业单元"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="申请时间" prop="requestDate">
<el-date-picker
clearable
v-model="queryParams.requestDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择申请时间"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type="primary"
......@@ -144,7 +146,7 @@
</template>
<script>
import { listTmToolRequestUse } from "@/api/mes/tm/tmToolRequestUse";
import { listTmToolRequest } from "@/api/mes/tm/tmToolRequest";
export default {
name: "TmRequestSelectSingle",
components: {},
......@@ -152,7 +154,7 @@ export default {
return {
showFlag: false,
// 选中数组
selectedBrandId: undefined,
selectedToolRequestId: undefined,
selectedRows: [],
// 非单个禁用
single: true,
......@@ -213,7 +215,7 @@ export default {
/** 查询品牌列表 */
getList() {
this.loading = true;
listTmToolRequestUse(this.queryParams).then((response) => {
listTmToolRequest(this.queryParams).then((response) => {
this.toolRequestList = response.rows;
this.total = response.total;
this.loading = false;
......@@ -249,7 +251,10 @@ export default {
},
//确定选中
confirmSelect() {
if (this.selectedToolRequestId == null || this.selectedToolRequestId == 0) {
if (
this.selectedToolRequestId == null ||
this.selectedToolRequestId == 0
) {
this.$notify({
title: "提示",
type: "warning",
......
src/views/mes/pro/productiorequest/requestInfoAdd.vue
View file @ 8216ffcc
......@@ -146,31 +146,6 @@
</el-form-item>
</el-col> -->
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
:rows="3"
v-model="form.remark"
placeholder="备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="鞋图" prop="shoeImg">
<ImageUpload
:limit="1"
:value="form.shoeImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="长度cm" prop="length">
......@@ -187,13 +162,13 @@
<el-input v-model="form.height" type="number" :precision="2" placeholder="请输入高度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度mm" prop="thick">
<el-input v-model="form.thick" type="number" :precision="2" placeholder="请输入厚度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="成品克重g" prop="weight">
<el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
......@@ -204,8 +179,6 @@
<el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="圆角" prop="fillet">
<el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
......@@ -222,6 +195,8 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :lg="6" :md="8" :sm="12" :xs="12" label="是否直角" prop="isRightAngle">
<el-radio-group v-model="form.isRightAngle">
......@@ -233,8 +208,6 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="角度(mm)" prop="angle">
<el-input v-model="form.angle" type="number" :precision="2" placeholder="请输入角度" />
......@@ -252,7 +225,6 @@
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="层数" prop="layerNum">
<el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
......@@ -280,13 +252,13 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="体系认证" prop="certification">
<el-input v-model="form.certification" placeholder="请输入体系认证" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状">
......@@ -305,6 +277,31 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
:rows="3"
v-model="form.remark"
placeholder="备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="鞋图" prop="shoeImg">
<ImageUpload
:limit="1"
:value="form.shoeImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" @tab-click="tabClick">
......
src/views/mes/pro/productiorequest/requestInfoEdit.vue
View file @ 8216ffcc
......@@ -154,32 +154,6 @@
</el-form-item>
</el-col> -->
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
:rows="3"
v-model="form.remark"
placeholder="备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="鞋图" prop="shoeImg">
<ImageUpload
:limit="1"
:value="form.shoeImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="长度cm" prop="length">
......@@ -196,13 +170,13 @@
<el-input v-model="form.height" type="number" :precision="2" placeholder="请输入高度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度mm" prop="thick">
<el-input v-model="form.thick" type="number" :precision="2" placeholder="请输入厚度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="成品克重g" prop="weight">
<el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
......@@ -213,8 +187,6 @@
<el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="圆角" prop="fillet">
<el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
......@@ -231,6 +203,8 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :lg="6" :md="8" :sm="12" :xs="12" label="是否直角" prop="isRightAngle">
<el-radio-group v-model="form.isRightAngle">
......@@ -242,8 +216,6 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="角度(mm)" prop="angle">
<el-input v-model="form.angle" type="number" :precision="2" placeholder="请输入角度" />
......@@ -261,7 +233,6 @@
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="层数" prop="layerNum">
<el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
......@@ -289,13 +260,13 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="体系认证" prop="certification">
<el-input v-model="form.certification" placeholder="请输入体系认证" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状">
......@@ -314,6 +285,31 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
:rows="3"
v-model="form.remark"
placeholder="备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="鞋图" prop="shoeImg">
<ImageUpload
:limit="1"
:value="form.shoeImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" @tab-click="tabClick">
......
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
View file @ 8216ffcc
......@@ -310,6 +310,137 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="长度cm" prop="length">
<el-input v-model="form.length" type="number" :precision="2" placeholder="请输入长度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="宽度cm" prop="width">
<el-input v-model="form.width" type="number" :precision="2" placeholder="请输入宽度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="高度cm" prop="height">
<el-input v-model="form.height" type="number" :precision="2" placeholder="请输入高度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度mm" prop="thick">
<el-input v-model="form.thick" type="number" :precision="2" placeholder="请输入厚度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="成品克重g" prop="weight">
<el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单重(KG)" prop="singleWeight">
<el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="圆角" prop="fillet">
<el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否异型" prop="fillet">
<el-radio-group v-model="form.isAllotype" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :lg="6" :md="8" :sm="12" :xs="12" label="是否直角" prop="isRightAngle">
<el-radio-group v-model="form.isRightAngle">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="角度(mm)" prop="angle">
<el-input v-model="form.angle" type="number" :precision="2" placeholder="请输入角度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="孔径(mm)" prop="aperture">
<el-input v-model="form.aperture" type="number" :precision="2" placeholder="请输入孔径" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单层厚(丝)" prop="singleLayerThick">
<el-input v-model="form.singleLayerThick" type="number" :precision="2" placeholder="请输入单层厚(单位丝)" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="层数" prop="layerNum">
<el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否防霉" prop="isMould">
<el-radio-group v-model="form.isMould" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否写码" prop="isCoding">
<el-radio-group v-model="form.isCoding" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="体系认证" prop="certification">
<el-input v-model="form.certification" placeholder="请输入体系认证" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状">
<el-option
v-for="dict in dict.type.product_shape"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状大小" prop="shapeSize">
<el-input v-model="form.shapeSize" type="number" :precision="4" placeholder="请输入样品形状大小" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
......@@ -322,6 +453,30 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品正面" prop="frontImg">
<ImageUpload
:limit="1"
:value="form.frontImg"
:fileSize="5"
@onUploaded="handleFrontImgUploaded"
@onRemoved="handleFrontImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品背面" prop="backImg">
<ImageUpload
:limit="1"
:value="form.backImg"
:fileSize="5"
@onUploaded="handleBackImgUploaded"
@onRemoved="handleBackImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" @tab-click="tabClick">
......@@ -363,7 +518,7 @@ export default {
RoutesProcessSelect,
ColorSelect,
},
dicts: [],
dicts: ["sys_yes_no","product_shape"],
provide() {
return {
mode: this.mode,
......@@ -410,9 +565,29 @@ export default {
printPaperwidth: null,
frontColorId: null,
oppositeColorId: null,
ngReason: null,
frontColorName: null,
oppositeColorName: null,
length: null,
width: null,
height: null,
thick: null,
weight: null,
angleType: null,
isAllotype:null,
isRightAngle:null,
fillet:null,
angle: null,
aperture: null,
singleLayerThick: null,
singleWeight: null,
layerNum: null,
isMould: null,
isCoding: null,
certification: null,
shape: null,
shapeSize: null,
frontImg:null,
backImg:null,
},
rules: {},
};
......@@ -587,6 +762,27 @@ export default {
oppositeColorId: "",
frontColorName: "",
oppositeColorName: "",
length: '',
width: '',
height: '',
thick: '',
weight: '',
angleType: '',
isAllotype:'',
isRightAngle:'',
fillet:'',
angle: '',
aperture: '',
singleLayerThick: '',
singleWeight: '',
layerNum: '',
isMould: '',
isCoding: '',
certification: '',
shape: '',
shapeSize: '',
frontImg:'',
backImg:'',
};
this.$refs["ProogingBomRef"].resetState();
this.$refs["ProogingProcessRef"].resetState();
......@@ -623,6 +819,20 @@ export default {
});
}
},
//图片上传成功
handleFrontImgUploaded(imgUrl) {
this.form.frontImg = imgUrl;
},
handleBackImgUploaded(imgUrl) {
this.form.backImg = imgUrl;
},
//图片移除
handleFrontImgRemoved(imgUrl) {
this.form.frontImg = null;
},
handleBackImgRemoved(imgUrl) {
this.form.backImg = null;
},
},
};
</script>
......
src/views/mes/proofing/proofingInfo.vue
View file @ 8216ffcc
This diff is collapsed.
src/views/mes/qc/abnormal/index.vue 0 → 100644
View file @ 8216ffcc
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="异常类型" prop="abnormalType">
<el-select v-model="queryParams.abnormalType" placeholder="请选择异常类型" clearable>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="异常原因" prop="abnormalReason">
<el-input
v-model="queryParams.abnormalReason"
placeholder="请输入异常原因"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['qc:information:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['qc:information:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['qc:information:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['qc:information:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="informationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="异常信息id" align="center" prop="abnormalId" /> -->
<!-- <el-table-column label="异常类型" align="center" prop="abnormalType" /> -->
<el-table-column label="异常类型" align="center" prop="abnormalType">
<template slot-scope="scope">
<dict-tag :options="dict.type.pc_abnormal_type" :value="scope.row.abnormalType"/>
</template>
</el-table-column>
<el-table-column label="异常原因" align="center" prop="abnormalReason" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['qc:information:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['qc:information:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改异常信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<!-- <el-form-item label="异常类型" prop="abnormalType">
<el-select v-model="form.abnormalType" placeholder="请选择异常类型">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item> -->
<el-form-item label="异常类型" prop="abnormalType">
<el-select v-model="form.abnormalType" placeholder="请选择异常类型">
<el-option
v-for="dict in dict.type.pc_abnormal_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="异常原因" prop="abnormalReason">
<el-input v-model="form.abnormalReason" placeholder="请输入异常原因" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listInformation, getInformation, delInformation, addInformation, updateInformation } from "@/api/mes/qc/abnormal";
export default {
dicts: ['pc_abnormal_type'],
name: "Information",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 异常信息表格数据
informationList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
abnormalType: null, abnormalReason: null, },
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询异常信息列表 */
getList() {
this.loading = true;
listInformation(this.queryParams).then(response => {
this.informationList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
abnormalId: null,
abnormalType: null,
abnormalReason: null,
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.abnormalId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加异常信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const abnormalId = row.abnormalId || this.ids
getInformation(abnormalId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改异常信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.abnormalId != null) {
updateInformation(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addInformation(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const abnormalIds = row.abnormalId || this.ids;
this.$modal.confirm('是否确认删除异常信息编号为"' + abnormalIds + '"的数据项？').then(function() {
return delInformation(abnormalIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('qc/information/export', {
...this.queryParams
}, `information_${new Date().getTime()}.xlsx`)
}
}
};
</script>
src/views/mes/qc/templateProcess/index.vue 0 → 100644
View file @ 8216ffcc
This diff is collapsed.
src/views/mes/tm/maintenance/index.vue
View file @ 8216ffcc
......@@ -203,7 +203,7 @@
</el-form-item>
<el-form-item label="维护类型" prop="maintenanceType">
<el-select v-model="form.maintenanceType" placeholder="请选择分配方式">
<el-select v-model="form.maintenanceType" placeholder="请选择维护类型">
<el-option
v-for="dict in dict.type.mes_course_type"
:key="dict.value"
......
src/views/mes/tm/toolrequestuse/index.vue
View file @ 8216ffcc
This diff is collapsed.
vue.config.js
View file @ 8216ffcc
......@@ -35,7 +35,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8080`,
target: `http://192.168.66.110:8080`,
// target: `http://192.168.4.122:8080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment