root/stand_lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 换驼峰为下划线

Browse Source
This commit is contained in:
liyongde
2023-05-05 18:41:28 +08:00
parent ca6c375605
commit 5963172f13
110 changed files with 1488 additions and 1563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -2,59 +2,28 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="模糊搜索">
<el-input
v-model="query.blurry"
clearable
size="mini"
placeholder="编码/名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
>
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="物料编码">
<el-input v-model="form.materialCode" style="width: 370px;" />
<el-input v-model="form.material_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料名称 ">
<el-input v-model="form.materialName" style="width: 370px;" />
<el-input v-model="form.material_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.materialSpec" style="width: 370px;" />
<el-input v-model="form.material_spec" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料分类标识">
<el-input v-model="form.class_id" style="width: 370px;" />
</el-form-item>
<!-- <el-form-item label="物料分类标识">-->
<!-- <el-input v-model="form.classId" style="width: 370px;" />-->
<!-- </el-form-item>-->
<el-form-item label="静置时间(分钟)">
<el-input v-model="form.standingTime" style="width: 370px;" />
<el-input v-model="form.standing_time" style="width: 370px;" />
</el-form-item>
<el-form-item label="车间编码">
<el-select v-model="form.workshopCode" placeholder="请选择" style="width: 370px;" clearable >
<el-option
v-for="item in workShopList"
:key="item.workshopCode"
:label="item.workshopName"
:value="item.workshopCode">
</el-option>
</el-select>
<el-input v-model="form.workshop_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
@@ -66,55 +35,21 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column
prop="materialCode"
label="物料编码"
:min-width="flexWidth('materialCode',crud.data,'物料编码')"
/>
<el-table-column
prop="materialName"
label="物料名称 "
:min-width="flexWidth('materialName',crud.data,'物料名称 ')"
/>
<el-table-column
prop="materialSpec"
label="物料规格"
:min-width="flexWidth('materialSpec',crud.data,'物料规格')"
/>
<el-table-column
prop="standingTime"
label="静置时间(分钟)"
:width="flexWidth('standingTime',crud.data,'静置时间分钟分钟')"
/>
<el-table-column
prop="workshopCode"
label="车间编码"
:width="flexWidth('workshopCode',crud.data,'车间编码')"
/>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="isUsed" label="是否启用" :min-width="flexWidth('isUsed',crud.data,'是否启用')">
<template slot-scope="scope">
{{scope.row.isUsed?'是':'否'}}
</template>
</el-table-column>
<el-table-column prop="isDelete" label="是否删除" :min-width="flexWidth('isDelete',crud.data,'是否删除')">
<template slot-scope="scope">
{{scope.row.isDelete?'是':'否'}}
</template>
</el-table-column>
<el-table-column prop="createName" label="创建人" :min-width="flexWidth('createName',crud.data,'创建人')" />
<el-table-column prop="createTime" label="创建时间" :min-width="flexWidth('createTime',crud.data,'创建时间')" />
<el-table-column prop="updateName" label="修改人" :min-width="flexWidth('updateName',crud.data,'修改人')" />
<el-table-column prop="updateTime" label="修改时间" :min-width="flexWidth('updateTime',crud.data,'修改时间')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')"/>
<el-table-column prop="material_name" label="物料名称 " :min-width="flexWidth('material_name',crud.data,'物料名称 ')"/>
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')"/>
<el-table-column prop="class_id" label="物料分类标识" :min-width="flexWidth('class_id',crud.data,'物料分类标识')"/>
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')"/>
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')"/>
<el-table-column prop="is_delete" label="是否删除" :min-width="flexWidth('is_delete',crud.data,'是否删除')"/>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')"/>
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -131,66 +66,56 @@
</template>
<script>
import crudMaterial from './material'
import crudWorkShop from '../workshop/workshop'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import crudMdBaseMaterial from './mdBaseMaterial'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
materialId: null,
materialCode: null,
materialName: null,
materialSpec: null,
classId: null,
standingTime: null,
workshopCode: null,
material_id: null,
material_code: null,
material_name: null,
material_spec: null,
class_id: null,
standing_time: null,
workshop_code: null,
remark: null,
isUsed: true,
isDelete: false,
createId: null,
createName: null,
createTime: null,
updateId: null,
updateName: null,
updateTime: null,
extId: null
is_used: null,
is_delete: null,
create_id: null,
create_name: null,
create_time: null,
update_id: null,
update_name: null,
update_time: null,
ext_id: null
}
export default {
name: 'Material',
name: 'MdBaseMaterial',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '物料基础信息',
url: 'api/material',
idField: 'materialId',
sort: 'materialId,desc',
crudMethod: { ...crudMaterial }
url: 'api/mdBaseMaterial',
idField: 'material_id',
sort: 'material_id,desc',
crudMethod: { ...crudMdBaseMaterial }
})
},
data() {
return {
permission: {},
rules: {},
workShopList: {}
}
},
created() {
this.workShopListIni() // 初始化车间数据
permission: {
},
rules: {
} }
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
workShopListIni() {
crudWorkShop.workShopList().then(res => {
console.log(res)
this.workShopList = res
})
}
}
}

6
nladmin-ui/src/views/wms/basedata/material/material.js → nladmin-ui/src/views/wms/basedata/material/mdBaseMaterial.js
View File

@@ -2,7 +2,7 @@ import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/material',
url: 'api/mdBaseMaterial',
method: 'post',
data
})
@@ -10,7 +10,7 @@ export function add(data) {
export function del(ids) {
return request({
url: 'api/material/',
url: 'api/mdBaseMaterial/',
method: 'delete',
data: ids
})
@@ -18,7 +18,7 @@ export function del(ids) {
export function edit(data) {
return request({
url: 'api/material',
url: 'api/mdBaseMaterial',
method: 'put',
data
})

107
nladmin-ui/src/views/wms/basedata/workshop/index.vue
View File

@@ -5,23 +5,20 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
>
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="车间编码">
<el-input v-model="form.workshopCode" style="width: 370px;" />
<el-input v-model="form.workshop_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="车间名称 ">
<el-input v-model="form.workshopName" style="width: 370px;" />
<el-input v-model="form.workshop_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用">
<el-input v-model="form.is_used" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -29,40 +26,17 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column
prop="workshopCode"
label="车间编码"
:min-width="flexWidth('workshopCode',crud.data,'车间编码')"
/>
<el-table-column
prop="workshopName"
label="车间名称 "
:min-width="flexWidth('workshopName',crud.data,'车间名称 ')"
/>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="isUsed" label="是否启用" :min-width="flexWidth('isUsed',crud.data,'是否启用')">
<template slot-scope="scope">
{{scope.row.isUsed?'是':'否'}}
</template>
</el-table-column>
<el-table-column prop="isDelete" label="是否删除" :min-width="flexWidth('isDelete',crud.data,'是否删除')">
<template slot-scope="scope">
{{scope.row.isDelete?'是':'否'}}
</template>
</el-table-column>
<el-table-column prop="createName" label="创建人" :min-width="flexWidth('createName',crud.data,'创建人')" />
<el-table-column prop="createTime" label="创建时间" :min-width="flexWidth('createTime',crud.data,'创建时间')" />
<el-table-column prop="updateName" label="修改人" :min-width="flexWidth('updateName',crud.data,'修改人')" />
<el-table-column prop="updateTime" label="修改时间" :min-width="flexWidth('updateTime',crud.data,'修改时间')" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>
<el-table-column prop="workshop_name" label="车间名称 " :min-width="flexWidth('workshop_name',crud.data,'车间名称 ')"/>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')"/>
<el-table-column prop="is_delete" label="是否删除" :min-width="flexWidth('is_delete',crud.data,'是否删除')"/>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')"/>
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -79,44 +53,45 @@
</template>
<script>
import crudWorkshop from './workshop'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation.vue'
import crudOperation from '@crud/CRUD.operation.vue'
import udOperation from '@crud/UD.operation.vue'
import pagination from '@crud/Pagination.vue'
import crudMdBaseWorkshop from './mdBaseWorkshop'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
workshopCode: null,
workshopName: null,
workshop_code: null,
workshop_name: null,
remark: null,
isUsed: true,
isDelete: false,
createId: null,
createName: null,
createTime: null,
updateId: null,
updateName: null,
updateTime: null
is_used: null,
is_delete: null,
create_id: null,
create_name: null,
create_time: null,
update_id: null,
update_name: null,
update_time: null
}
export default {
name: 'Workshop',
name: 'MdBaseWorkshop',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '车间基础信息',
url: 'api/workshop',
idField: 'workshopCode',
sort: 'workshopCode,desc',
crudMethod: { ...crudWorkshop }
url: 'api/mdBaseWorkshop',
idField: 'workshop_code',
sort: 'workshop_code,desc',
crudMethod: { ...crudMdBaseWorkshop }
})
},
data() {
return {
permission: {},
rules: {}
}
permission: {
},
rules: {
} }
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据

15
nladmin-ui/src/views/wms/basedata/workshop/workshop.js → nladmin-ui/src/views/wms/basedata/workshop/mdBaseWorkshop.js
View File

@@ -2,7 +2,7 @@ import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/workshop',
url: 'api/mdBaseWorkshop',
method: 'post',
data
})
@@ -10,7 +10,7 @@ export function add(data) {
export function del(ids) {
return request({
url: 'api/workshop/',
url: 'api/mdBaseWorkshop/',
method: 'delete',
data: ids
})
@@ -18,17 +18,10 @@ export function del(ids) {
export function edit(data) {
return request({
url: 'api/workshop',
url: 'api/mdBaseWorkshop',
method: 'put',
data
})
}
export function workShopList() {
return request({
url: 'api/workshop/workShopList',
method: 'get'
})
}
export default { add, edit, del, workShopList }
export default { add, edit, del }