Skip to content

M
mes-ui
Commit cdfb1354 authored by 张海景's avatar 张海景
Browse files
Options

update:修改生产管理和质量管理页面样式

parent 1c30fec9
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 183 deletions
src/views/mes/pro/arrange/index.vue
View file @ cdfb1354
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="组合单号" prop="arrangeCode"> <el-form-item label="组合单号" prop="arrangeCode">
<el-input <el-input
v-model="queryParams.arrangeCode" v-model="queryParams.arrangeCode"
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
<!-- 添加或修改生产编排单对话框 --> <!-- 添加或修改生产编排单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="组合单号" prop="arrangeCode"> <el-form-item label="组合单号" prop="arrangeCode">
<el-input v-model="form.arrangeCode" placeholder="请输入组合单号"/> <el-input v-model="form.arrangeCode" placeholder="请输入组合单号"/>
</el-form-item> </el-form-item>
......
src/views/mes/pro/combination/index.vue
View file @ cdfb1354
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="组合单号" prop="combinationCode"> <el-form-item label="组合单号" prop="combinationCode">
<el-input <el-input
v-model="queryParams.combinationCode" v-model="queryParams.combinationCode"
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<!-- 添加或修改生产组合单对话框 --> <!-- 添加或修改生产组合单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="组合单号" prop="combinationCode"> <el-form-item label="组合单号" prop="combinationCode">
<el-input v-model="form.combinationCode" placeholder="请输入组合单号"/> <el-input v-model="form.combinationCode" placeholder="请输入组合单号"/>
</el-form-item> </el-form-item>
......
src/views/mes/pro/process/index.vue
View file @ cdfb1354
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -127,18 +127,17 @@ ...@@ -127,18 +127,17 @@
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="11">
<el-form-item label="工序编码" prop="processCode"> <el-form-item label="工序编码" prop="processCode">
<el-input v-model="form.processCode" placeholder="请输入工序编码" /> <div style="display:flex;align-items: center;">
</el-form-item> <el-input v-model="form.processCode" placeholder="请输入工序编码" />
</el-col> <el-switch v-model="autoGenFlag"
<el-col :span="3"> active-color="#13ce66"
<el-form-item label-width="80"> style="width:175px;margin-left:10px;"
<el-switch v-model="autoGenFlag" active-text="自动生成"
active-color="#13ce66" @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
active-text="自动生成" </el-switch>
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'"> </div>
</el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
...@@ -270,7 +269,7 @@ export default { ...@@ -270,7 +269,7 @@ export default {
processId: null, processId: null,
processCode: null, processCode: null,
processName: null, processName: null,
attention: null, attention: null,
enableFlag: 'Y', enableFlag: 'Y',
remark: null, remark: null,
createBy: null, createBy: null,
......
src/views/mes/pro/proroute/index.vue
View file @ cdfb1354
...@@ -171,24 +171,23 @@ ...@@ -171,24 +171,23 @@
> >
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="11">
<el-form-item label="编号" prop="routeCode"> <el-form-item label="编号" prop="routeCode">
<el-input <div style="display:flex;align-items: center;">
v-model="form.routeCode" <el-input
placeholder="请输入工艺路线编号" v-model="form.routeCode"
/> placeholder="请输入工艺路线编号"
</el-form-item> />
</el-col> <el-switch
<el-col :span="3"> v-model="autoGenFlag"
<el-form-item label-width="80"> style="width:175px;margin-left:10px;"
<el-switch active-color="#13ce66"
v-model="autoGenFlag" active-text="自动生成"
active-color="#13ce66" @change="handleAutoGenChange(autoGenFlag)"
active-text="自动生成" v-if="optType != 'view'"
@change="handleAutoGenChange(autoGenFlag)" >
v-if="optType != 'view'" </el-switch>
> </div>
</el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
......
src/views/mes/pro/usage/index.vue
View file @ cdfb1354
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -127,18 +127,16 @@ ...@@ -127,18 +127,16 @@
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="11">
<el-form-item label="用途编码" prop="usageCode"> <el-form-item label="用途编码" prop="usageCode">
<el-input v-model="form.usageCode" placeholder="请输入用途编码" /> <div style="display: flex;align-items: center;">
</el-form-item> <el-input v-model="form.usageCode" placeholder="请输入用途编码" />
</el-col> <el-switch style="margin-left:10px;width:175px;" v-model="autoGenFlag"
<el-col :span="3"> active-color="#13ce66"
<el-form-item label-width="80"> active-text="自动生成"
<el-switch v-model="autoGenFlag" @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
active-color="#13ce66" </el-switch>
active-text="自动生成" </div>
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
...@@ -258,7 +256,7 @@ export default { ...@@ -258,7 +256,7 @@ export default {
this.form = { this.form = {
usageId: null, usageId: null,
usageCode: null, usageCode: null,
usageName: null, usageName: null,
enableFlag: 'Y', enableFlag: 'Y',
remark: null, remark: null,
createBy: null, createBy: null,
......
src/views/mes/pro/workorder/indexApply.vue
View file @ cdfb1354
...@@ -293,6 +293,15 @@ ...@@ -293,6 +293,15 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag
:options="dict.type.mes_workorder_status"
:value="scope.row.status"
/>
</template>
</el-table-column>
<el-table-column <el-table-column
label="组合单号" label="组合单号"
width="180" width="180"
...@@ -311,34 +320,10 @@ ...@@ -311,34 +320,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="工单名称" label="编排单号"
width="200"
align="center"
prop="workorderName"
:show-overflow-tooltip="true"
/>
<el-table-column label="工单类型" align="center" prop="workorderType">
<template slot-scope="scope">
<dict-tag
:options="dict.type.mes_workorder_type"
:value="scope.row.workorderType"
/>
</template>
</el-table-column>
<!-- <el-table-column label="工单来源" align="center" prop="orderSource">
<template slot-scope="scope">
<dict-tag
:options="dict.type.mes_workorder_sourcetype"
:value="scope.row.orderSource"
/>
</template>
</el-table-column> -->
<el-table-column
label="工艺名称"
width="160"
align="center" align="center"
prop="routeName" width="100px"
show-overflow-tooltip prop="arrangeCode"
/> />
<el-table-column <el-table-column
label="订单编号" label="订单编号"
...@@ -346,7 +331,7 @@ ...@@ -346,7 +331,7 @@
align="center" align="center"
prop="sourceCode" prop="sourceCode"
/> />
<el-table-column <el-table-column
label="产品编号" label="产品编号"
width="120" width="120"
align="center" align="center"
...@@ -365,6 +350,16 @@ ...@@ -365,6 +350,16 @@
prop="productSpc" prop="productSpc"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column
label="需求日期"
align="center"
prop="requestDate"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unitOfMeasure"/> <el-table-column label="单位" align="center" prop="unitOfMeasure"/>
<el-table-column label="工单数量" align="center" prop="quantity"/> <el-table-column label="工单数量" align="center" prop="quantity"/>
<el-table-column label="调整数量" align="center" prop="quantityChanged"/> <el-table-column label="调整数量" align="center" prop="quantityChanged"/>
...@@ -380,37 +375,44 @@ ...@@ -380,37 +375,44 @@
width="100px" width="100px"
prop="batchCode" prop="batchCode"
/> />
<el-table-column <el-table-column label="客户编码" align="center" prop="clientCode"/>
label="编排单号"
align="center"
width="100px"
prop="arrangeCode"
/>
<!-- <el-table-column label="客户编码" align="center" prop="clientCode"/>
<el-table-column <el-table-column
label="客户名称" label="客户名称"
align="center" align="center"
prop="clientName" prop="clientName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> --> />
<el-table-column <!-- <el-table-column
label="需求日期" label="工单名称"
width="200"
align="center" align="center"
prop="requestDate" prop="workorderName"
width="180" :show-overflow-tooltip="true"
> />
<el-table-column label="工单类型" align="center" prop="workorderType">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span> <dict-tag
:options="dict.type.mes_workorder_type"
:value="scope.row.workorderType"
/>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="单据状态" align="center" prop="status" fixed="right"> <!-- <el-table-column label="工单来源" align="center" prop="orderSource">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.mes_workorder_status" :options="dict.type.mes_workorder_sourcetype"
:value="scope.row.status" :value="scope.row.orderSource"
/> />
</template> </template>
</el-table-column> </el-table-column> -->
<!-- <el-table-column
label="工艺名称"
width="160"
align="center"
prop="routeName"
show-overflow-tooltip
/> -->
<el-table-column <el-table-column
label="操作" label="操作"
width="150px" width="150px"
......
src/views/mes/qc/abnormal/index.vue
View file @ cdfb1354
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<!-- <el-form-item label="异常类型" prop="abnormalType"> <!-- <el-form-item label="异常类型" prop="abnormalType">
<el-input <el-input
v-model="queryParams.abnormalType" v-model="queryParams.abnormalType"
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -128,14 +128,14 @@ ...@@ -128,14 +128,14 @@
<!-- 添加或修改异常信息对话框 --> <!-- 添加或修改异常信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="100px">
<!-- <el-form-item label="异常类型" prop="abnormalType"> <!-- <el-form-item label="异常类型" prop="abnormalType">
<el-select v-model="form.abnormalType" placeholder="请选择异常类型"> <el-select v-model="form.abnormalType" placeholder="请选择异常类型">
<el-option label="请选择字典生成" value="" /> <el-option label="请选择字典生成" value="" />
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="异常类型" prop="abnormalType"> <el-form-item label="异常类型" prop="abnormalType">
<el-select v-model="form.abnormalType" placeholder="请选择异常类型"> <el-select style="width:100%;" v-model="form.abnormalType" placeholder="请选择异常类型">
<el-option <el-option
v-for="dict in dict.type.pc_abnormal_type" v-for="dict in dict.type.pc_abnormal_type"
:key="dict.value" :key="dict.value"
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<el-input v-model="form.abnormalReason" placeholder="请输入异常原因" /> <el-input v-model="form.abnormalReason" placeholder="请输入异常原因" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -218,13 +218,13 @@ export default { ...@@ -218,13 +218,13 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
abnormalId: null, abnormalId: null,
abnormalType: null, abnormalType: null,
abnormalReason: null, abnormalReason: null,
remark: null, remark: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null }; updateTime: null };
this.resetForm("form"); this.resetForm("form");
}, },
......
src/views/mes/qc/ipqc/index.vue
View file @ cdfb1354
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
v-hasPermi="['mes:qc:ipqc:query']" v-hasPermi="['mes:qc:ipqc:query']"
>{{scope.row.ipqcCode}}</el-button> >{{scope.row.ipqcCode}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验类型" align="center" prop="ipqcType"> <el-table-column label="检验类型" align="center" prop="ipqcType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_ipqc_type" :value="scope.row.ipqcType"/> <dict-tag :options="dict.type.mes_ipqc_type" :value="scope.row.ipqcType"/>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/> <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -178,18 +178,17 @@ ...@@ -178,18 +178,17 @@
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="检验单编号" prop="ipqcCode"> <el-form-item label="检验单编号" prop="ipqcCode">
<el-input v-model="form.ipqcCode" placeholder="请输入检验单编号" /> <div style="display:flex;align-items: center;">
</el-form-item> <el-input v-model="form.ipqcCode" placeholder="请输入检验单编号" />
</el-col> <el-switch v-model="autoGenFlag"
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'"> style="width:175px;margin-left:10px;"
</el-switch> @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -217,9 +216,9 @@ ...@@ -217,9 +216,9 @@
<el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
</el-input> </el-input>
<!--保存过则不允许修改工单，需要修改则删除重做--> <!--保存过则不允许修改工单，需要修改则删除重做-->
<el-input v-else v-model="form.workorderCode" > <el-input v-else v-model="form.workorderCode" >
</el-input> </el-input>
</el-form-item> </el-form-item>
<WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect> <WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -310,7 +309,7 @@ ...@@ -310,7 +309,7 @@
<el-input v-model="form.quantityQualified" placeholder="请输入合格品数量" /> <el-input v-model="form.quantityQualified" placeholder="请输入合格品数量" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="致命缺陷数量" prop="crQuantity"> <el-form-item label="致命缺陷数量" prop="crQuantity">
...@@ -330,7 +329,7 @@ ...@@ -330,7 +329,7 @@
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="检测日期" prop="inspectDate"> <el-form-item label="检测日期" prop="inspectDate">
...@@ -368,7 +367,7 @@ ...@@ -368,7 +367,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-divider v-if="form.ipqcId !=null" content-position="center">检测项</el-divider> <el-divider v-if="form.ipqcId !=null" content-position="center">检测项</el-divider>
<el-card shadow="always" v-if="form.ipqcId !=null" class="box-card"> <el-card shadow="always" v-if="form.ipqcId !=null" class="box-card">
<Ipqcline ref=line :ipqcId="form.ipqcId" :optType="optType"></Ipqcline> <Ipqcline ref=line :ipqcId="form.ipqcId" :optType="optType"></Ipqcline>
</el-card> </el-card>
...@@ -471,7 +470,7 @@ export default { ...@@ -471,7 +470,7 @@ export default {
workstationCode: [ workstationCode: [
{ required: true, message: "请选择工作站", trigger: "blur" } { required: true, message: "请选择工作站", trigger: "blur" }
], ],
quantityCheck: [ quantityCheck: [
{ required: true, message: "检测数量不能为空", trigger: "blur" } { required: true, message: "检测数量不能为空", trigger: "blur" }
], ],
......
src/views/mes/qc/qcindex/index.vue
View file @ cdfb1354
...@@ -137,18 +137,17 @@ ...@@ -137,18 +137,17 @@
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="检测项编码" prop="indexCode"> <el-form-item label="检测项编码" prop="indexCode">
<el-input v-model="form.indexCode" placeholder="请输入检测项编码" /> <div style="display:flex;align-items: center;">
</el-form-item> <el-input v-model="form.indexCode" placeholder="请输入检测项编码" />
</el-col> <el-switch v-model="autoGenFlag"
<el-col :span="4"> active-color="#13ce66"
<el-form-item label-width="80"> active-text="自动生成"
<el-switch v-model="autoGenFlag" style="width:175px;margin-left:10px;"
active-color="#13ce66" @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
active-text="自动生成" </el-switch>
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'"> </div>
</el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -160,7 +159,7 @@ ...@@ -160,7 +159,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检测项类型" prop="indexType"> <el-form-item label="检测项类型" prop="indexType">
<el-select v-model="form.indexType" placeholder="请选择检测项类型"> <el-select style="width:100%;" v-model="form.indexType" placeholder="请选择检测项类型">
<el-option <el-option
v-for="dict in dict.type.mes_index_type" v-for="dict in dict.type.mes_index_type"
:key="dict.value" :key="dict.value"
...@@ -172,7 +171,7 @@ ...@@ -172,7 +171,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="输入类型" prop="inputType"> <el-form-item label="输入类型" prop="inputType">
<el-select v-model="form.inputType" placeholder="请选择输入类型"> <el-select style="width:100%;" v-model="form.inputType" placeholder="请选择输入类型">
<el-option key="1" label="文本框" :value="1"></el-option> <el-option key="1" label="文本框" :value="1"></el-option>
<el-option key="2" label="选择框" :value="2"></el-option> <el-option key="2" label="选择框" :value="2"></el-option>
</el-select> </el-select>
......
src/views/mes/qc/qctemplate/index.vue
View file @ cdfb1354
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<el-table-column label="检测模板名称" align="center" prop="templateName" /> <el-table-column label="检测模板名称" align="center" prop="templateName" />
<el-table-column label="检测种类" align="center" prop="qcTypesParam" > <el-table-column label="检测种类" align="center" prop="qcTypesParam" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_qc_type" :value="scope.row.qcTypesParam"/> <dict-tag :options="dict.type.mes_qc_type" :value="scope.row.qcTypesParam"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否启用" align="center" prop="enableFlag"> <el-table-column label="是否启用" align="center" prop="enableFlag">
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -137,18 +137,18 @@ ...@@ -137,18 +137,18 @@
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="模板编号" prop="templateCode"> <el-form-item label="模板编号" prop="templateCode">
<el-input v-model="form.templateCode" placeholder="请输入模板编号" /> <div style="display:flex;align-items: center;">
</el-form-item> <el-input v-model="form.templateCode" placeholder="请输入模板编号" />
</el-col> <el-switch v-model="autoGenFlag"
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'"> style="width:175px;margin-left:10px;"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="检测种类" prop="qcTypesParam"> <el-form-item label="检测种类" prop="qcTypesParam">
<el-checkbox-group v-model="form.qcTypesParam"> <el-checkbox-group v-model="form.qcTypesParam">
<el-checkbox v-for="dict in dict.type.mes_qc_type" <el-checkbox v-for="dict in dict.type.mes_qc_type"
:key="dict.value" :key="dict.value"
......
src/views/mes/qc/report/index.vue
View file @ cdfb1354
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<dict-tag :options="dict.type.qc_submit_status" :value="scope.row.abnormalStatus"/> <dict-tag :options="dict.type.qc_submit_status" :value="scope.row.abnormalStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="300" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -141,9 +141,10 @@ ...@@ -141,9 +141,10 @@
@click="handleComplete(scope.row)" @click="handleComplete(scope.row)"
v-hasPermi="['qc:report:edit']" v-hasPermi="['qc:report:edit']"
>完成</el-button> >完成</el-button>
<el-button <el-button
size="mini" size="mini"
type="primary" type="text"
icon="el-icon-upload2"
@click="0" @click="0"
>提交</el-button> >提交</el-button>
<el-button <el-button
...@@ -163,7 +164,7 @@ ...@@ -163,7 +164,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -216,7 +217,7 @@ ...@@ -216,7 +217,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
...@@ -287,16 +288,16 @@ export default { ...@@ -287,16 +288,16 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
batchNumber: null, batchNumber: null,
processId: null, processId: null,
processCode: null, processCode: null,
processName: null, processName: null,
workstationId: null, workstationId: null,
workstationCode: null, workstationCode: null,
workstationName: null, workstationName: null,
abnormalType: null, abnormalType: null,
abnormalReason: null, abnormalReason: null,
abnormalTime: null, abnormalTime: null,
abnormalStatus: null, }, abnormalStatus: null, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -332,21 +333,21 @@ export default { ...@@ -332,21 +333,21 @@ export default {
reset() { reset() {
this.daterangePurchaseDate = []; this.daterangePurchaseDate = [];
this.form = { this.form = {
abnormalReportId: null, abnormalReportId: null,
batchNumber: null, batchNumber: null,
processId: null, processId: null,
processCode: null, processCode: null,
processName: null, processName: null,
workstationId: null, workstationId: null,
workstationCode: null, workstationCode: null,
workstationName: null, workstationName: null,
abnormalType: null, abnormalType: null,
abnormalReason: null, abnormalReason: null,
abnormalTime: null, abnormalTime: null,
abnormalStatus: null, abnormalStatus: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null }; updateTime: null };
this.resetForm("form"); this.resetForm("form");
}, },
......
src/views/mes/qc/templateProcess/index.vue
View file @ cdfb1354
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="检测模板" prop="templateName"> <el-form-item label="检测模板" prop="templateName">
<el-input <el-input
v-model="queryParams.templateName" v-model="queryParams.templateName"
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<!-- 添加或修改检测模板-工序对话框 --> <!-- 添加或修改检测模板-工序对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="检测模板" prop="templateId"> <el-form-item label="检测模板" prop="templateId">
<el-input v-model="form.templateName" placeholder="请选择检测模板" > <el-input v-model="form.templateName" placeholder="请选择检测模板" >
<el-button slot="append" @click="handleSelectTemplate" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectTemplate" icon="el-icon-search"></el-button>
...@@ -153,13 +153,13 @@ ...@@ -153,13 +153,13 @@
<el-input v-model="form.maxNum" placeholder="请输入最大数量" /> <el-input v-model="form.maxNum" placeholder="请输入最大数量" />
</el-form-item> </el-form-item>
<el-form-item label="是否质检确认" prop="isConfirm"> <el-form-item label="是否质检确认" prop="isConfirm">
<el-select v-model="form.isConfirm" placeholder="请选择是否质检确认"> <el-select style="width:100%;" v-model="form.isConfirm" placeholder="请选择是否质检确认">
<el-option label="是" :value="1"></el-option> <el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option> <el-option label="否" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否新品" prop="isNewProduct"> <el-form-item label="是否新品" prop="isNewProduct">
<el-select v-model="form.isNewProduct" placeholder="请选择是否新品"> <el-select style="width:100%;" v-model="form.isNewProduct" placeholder="请选择是否新品">
<el-option label="是" :value="1"></el-option> <el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option> <el-option label="否" :value="0"></el-option>
</el-select> </el-select>
......
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