yinq
/
aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 字段修改

Browse Source
master
yinq 11 months ago
parent a5772364f6
commit 4ea8d10381
7 changed files with 80 additions and 90 deletions
Show Stats Download Patch File Download Diff File

28
src/views/base/inStore/index.vue
Unescape Escape View File

@ -132,11 +132,11 @@
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible"> <!-- <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/> <!-- <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
</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
@ -217,15 +217,15 @@
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="启用标识" prop="isFlag"> <!-- <el-form-item label="启用标识" prop="isFlag">-->
<el-radio-group v-model="form.isFlag"> <!-- <el-radio-group v-model="form.isFlag">-->
<el-radio <!-- <el-radio-->
v-for="dict in dict.type.is_flag" <!-- v-for="dict in dict.type.is_flag"-->
:key="dict.value" <!-- :key="dict.value"-->
:label="parseInt(dict.value)" <!-- :label="parseInt(dict.value)"-->
>{{dict.label}}</el-radio> <!-- >{{dict.label}}</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>

20
src/views/base/materialInfo/index.vue
Unescape Escape View File

@ -259,15 +259,15 @@
placeholder="请选择增量日期"> placeholder="请选择增量日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="启用标识" prop="isFlag"> <!-- <el-form-item label="启用标识" prop="isFlag">-->
<el-radio-group v-model="form.isFlag"> <!-- <el-radio-group v-model="form.isFlag">-->
<el-radio <!-- <el-radio-->
v-for="dict in dict.type.is_flag" <!-- v-for="dict in dict.type.is_flag"-->
:key="dict.value" <!-- :key="dict.value"-->
:label="parseInt(dict.value)" <!-- :label="parseInt(dict.value)"-->
>{{dict.label}}</el-radio> <!-- >{{dict.label}}</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
@ -343,7 +343,7 @@ export default {
{ key: 8, label: `物料规格`, visible: true }, { key: 8, label: `物料规格`, visible: true },
{ key: 9, label: `所属工厂`, visible: true }, { key: 9, label: `所属工厂`, visible: true },
{ key: 10, label: `产线工位`, visible: false }, { key: 10, label: `产线工位`, visible: false },
{ key: 11, label: `启用标识`, visible: true }, { key: 11, label: `启用标识`, visible: false },
{ key: 12, label: `创建人`, visible: false }, { key: 12, label: `创建人`, visible: false },
{ key: 13, label: `创建时间`, visible: false }, { key: 13, label: `创建时间`, visible: false },
{ key: 14, label: `更新人`, visible: false }, { key: 14, label: `更新人`, visible: false },

14
src/views/base/monitorWorkUnit/index.vue
Unescape Escape View File

@ -182,7 +182,7 @@
</el-row> </el-row>
<!-- 添加或修改统计计量信息对话框 --> <!-- 添加或修改统计计量信息对话框 -->
<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="monitorCode"> <el-form-item label="计量设备" prop="monitorCode">
<treeselect v-model="form.monitorCode" :options="monitorInfoOptions" :normalizer="normalizer" placeholder="请选择计量设备" /> <treeselect v-model="form.monitorCode" :options="monitorInfoOptions" :normalizer="normalizer" placeholder="请选择计量设备" />
</el-form-item> </el-form-item>
@ -314,7 +314,7 @@ export default {
], ],
}, },
columns: [ columns: [
{ key: 0, label: `主键标识`, visible: true }, { key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `计量设备编号`, visible: true }, { key: 1, label: `计量设备编号`, visible: true },
{ key: 2, label: `统计单元编号`, visible: true }, { key: 2, label: `统计单元编号`, visible: true },
{ key: 3, label: `计量设备状态`, visible: true }, { key: 3, label: `计量设备状态`, visible: true },
@ -322,11 +322,11 @@ export default {
{ key: 5, label: `计算方式`, visible: true }, { key: 5, label: `计算方式`, visible: true },
{ key: 6, label: `比率`, visible: true }, { key: 6, label: `比率`, visible: true },
{ key: 7, label: `备注`, visible: true }, { key: 7, label: `备注`, visible: true },
{ key: 8, label: `启用标识`, visible: true }, { key: 8, label: `启用标识`, visible: false },
{ key: 9, label: `创建人`, visible: true }, { key: 9, label: `创建人`, visible: false },
{ key: 10, label: `创建时间`, visible: true }, { key: 10, label: `创建时间`, visible: false },
{ key: 11, label: `修改人`, visible: true }, { key: 11, label: `修改人`, visible: false },
{ key: 12, label: `修改时间`, visible: true }, { key: 12, label: `修改时间`, visible: false },
] ]
}; };
}, },

14
src/views/base/orderBomInfo/childIndex.vue
Unescape Escape View File

@ -43,6 +43,15 @@
@click="toggleExpandAll" @click="toggleExpandAll"
>展开/折叠</el-button> >展开/折叠</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-close"
size="mini"
@click="handleClose"
>关闭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
@ -314,6 +323,11 @@ export default {
this.open = true; this.open = true;
this.title = "添加订单BOM"; this.title = "添加订单BOM";
}, },
/** 返回按钮操作 */
handleClose() {
const obj = { path: "/product/orderBomInfo" };
this.$tab.closeOpenPage(obj);
},
/** 展开/折叠操作 */ /** 展开/折叠操作 */
toggleExpandAll() { toggleExpandAll() {
this.refreshTable = false; this.refreshTable = false;

32
src/views/base/orderBomInfo/index.vue
Unescape Escape View File

@ -185,33 +185,9 @@
<el-form-item label="父级编号" prop="parentId"> <el-form-item label="父级编号" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入父级编号"/> <el-input v-model="form.parentId" placeholder="请输入父级编号"/>
</el-form-item> </el-form-item>
<el-form-item label="是否标识" prop="isFlag"> <!-- <el-form-item label="是否标识" prop="isFlag">-->
<el-input v-model="form.isFlag" placeholder="请输入是否标识"/> <!-- <el-input v-model="form.isFlag" placeholder="请输入是否标识"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="创建人" prop="createdBy">
<el-input v-model="form.createdBy" placeholder="请输入创建人"/>
</el-form-item>
<el-form-item label="创建时间" prop="createdTime">
<el-date-picker clearable
v-model="form.createdTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="更新人" prop="updatedBy">
<el-input v-model="form.updatedBy" placeholder="请输入更新人"/>
</el-form-item>
<el-form-item label="更新时间" prop="updatedTime">
<el-date-picker clearable
v-model="form.updatedTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择更新时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="工厂编号" prop="factoryCode"> <el-form-item label="工厂编号" prop="factoryCode">
<el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/> <el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/>
</el-form-item> </el-form-item>
@ -297,7 +273,7 @@ export default {
{ key: 4, label: `物料类别`, visible: true }, { key: 4, label: `物料类别`, visible: true },
{ key: 5, label: `标准数量`, visible: true }, { key: 5, label: `标准数量`, visible: true },
{ key: 6, label: `父级编号`, visible: true }, { key: 6, label: `父级编号`, visible: true },
{ key: 7, label: `是否标识`, visible: true }, { key: 7, label: `是否标识`, visible: false },
{ key: 8, label: `创建人`, visible: false }, { key: 8, label: `创建人`, visible: false },
{ key: 9, label: `创建时间`, visible: false }, { key: 9, label: `创建时间`, visible: false },
{ key: 10, label: `更新人`, visible: false }, { key: 10, label: `更新人`, visible: false },

28
src/views/base/outStore/index.vue
Unescape Escape View File

@ -107,11 +107,11 @@
<dict-tag :options="dict.type.entry_or_exit" :value="scope.row.exitPattern"/> <dict-tag :options="dict.type.entry_or_exit" :value="scope.row.exitPattern"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[8].visible"> <!-- <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[8].visible">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/> <!-- <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[9].visible"/> <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[9].visible"/>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[10].visible"> <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[10].visible">
<template slot-scope="scope"> <template slot-scope="scope">
@ -203,15 +203,15 @@
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="是否标识" prop="isFlag"> <!-- <el-form-item label="是否标识" prop="isFlag">-->
<el-radio-group v-model="form.isFlag"> <!-- <el-radio-group v-model="form.isFlag">-->
<el-radio <!-- <el-radio-->
v-for="dict in dict.type.is_flag" <!-- v-for="dict in dict.type.is_flag"-->
:key="dict.value" <!-- :key="dict.value"-->
:label="parseInt(dict.value)" <!-- :label="parseInt(dict.value)"-->
>{{dict.label}}</el-radio> <!-- >{{dict.label}}</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

34
src/views/base/workUnit/index.vue
Unescape Escape View File

@ -82,23 +82,23 @@
<dict-tag :options="dict.type.work_unit_type" :value="scope.row.workUnitType"/> <dict-tag :options="dict.type.work_unit_type" :value="scope.row.workUnitType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="启用标识" align="center" prop="isFlag"> <!-- <el-table-column label="启用标识" align="center" prop="isFlag">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/> <!-- <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="创建人" align="center" prop="createdBy" /> <!-- <el-table-column label="创建人" align="center" prop="createdBy" />-->
<el-table-column label="创建时间" align="center" prop="createdTime" width="180"> <!-- <el-table-column label="创建时间" align="center" prop="createdTime" width="180">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span> <!-- <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="更新人" align="center" prop="updatedBy" /> <!-- <el-table-column label="更新人" align="center" prop="updatedBy" />-->
<el-table-column label="更新时间" align="center" prop="updatedTime" width="180"> <!-- <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span> <!-- <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
</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

Write Preview
Loading…
Cancel
Save