kelvin/wms-dj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'gitea/master'

Browse Source
This commit is contained in:
Kelvin 2024-12-05 11:46:32 +08:00
commit 426bbcafee
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/md/PLAN/index.vue
View File

@ -73,16 +73,16 @@
>一键清退无寿命物品 >一键清退无寿命物品
</el-button> </el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5"> 调试--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="primary"--> type="primary"
<!-- plain--> plain
<!-- size="mini"--> size="mini"
<!-- @click="handleSynchronizationClick"--> @click="handleSynchronizationClick"
<!-- v-hasPermi="['md:PLAN:add']"--> v-hasPermi="['md:PLAN:add']"
<!-- >同步小型刀具库数据--> >同步小型刀具库数据
<!-- </el-button>--> </el-button>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="success"--> <!-- type="success"-->

12
src/views/md/ROUTE/index.vue
View File

@ -33,8 +33,8 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="是否默认" prop="isDefault"> <el-form-item label="是否有效" prop="isDefault">
<el-select v-model="queryParams.isDefault" placeholder="请选择是否默认" clearable> <el-select v-model="queryParams.isDefault" placeholder="请选择是否有效" clearable>
<el-option <el-option
v-for="dict in dict.type.yes_or_no" v-for="dict in dict.type.yes_or_no"
:key="dict.value" :key="dict.value"
@ -106,7 +106,7 @@
<el-table-column label="BOM名称" align="center" prop="bomName"/> <el-table-column label="BOM名称" align="center" prop="bomName"/>
<el-table-column label="BOM版本" align="center" prop="bomVersion"/> <el-table-column label="BOM版本" align="center" prop="bomVersion"/>
<!-- <el-table-column label="所属物料" align="center" prop="mdItemId"/>--> <!-- <el-table-column label="所属物料" align="center" prop="mdItemId"/>-->
<el-table-column label="是否默认" align="center" prop="isDefault"> <el-table-column label="是否有效" align="center" prop="isDefault">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.yes_or_no" :value="scope.row.isDefault"/> <dict-tag :options="dict.type.yes_or_no" :value="scope.row.isDefault"/>
</template> </template>
@ -181,8 +181,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="是否默认" prop="isDefault"> <el-form-item label="是否有效" prop="isDefault">
<el-select v-model="form.isDefault" placeholder="请选择是否默认"> <el-select v-model="form.isDefault" placeholder="请选择是否有效">
<el-option <el-option
v-for="dict in dict.type.yes_or_no" v-for="dict in dict.type.yes_or_no"
:key="dict.value" :key="dict.value"
@ -320,7 +320,7 @@ export default {
{required: true, message: "物料编码不能为空", trigger: "blur"} {required: true, message: "物料编码不能为空", trigger: "blur"}
], ],
isDefault: [ isDefault: [
{required: true, message: "是否默认不能为空", trigger: "change"} {required: true, message: "是否有效不能为空", trigger: "change"}
], ],
}, },
nowChildItemIndex: null nowChildItemIndex: null