huojin
/
Byd_Dg_Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-11-25 16:45:43 +08:00
parent c76576efe4
commit c8d976c554
8 changed files with 102 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/app-update/index.vue
View File

@ -128,6 +128,7 @@ import {getToken} from '@/utils/auth'
const defaultForm = {id: null, name: '', versionCode: '', versionName: '', modifyContent: ''} const defaultForm = {id: null, name: '', versionCode: '', versionName: '', modifyContent: ''}
export default { export default {
name: 'SysAppUpdate',
components: {pagination, crudOperation, udOperation}, components: {pagination, crudOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() { cruds() {

1
src/views/base-data/baseZcjxb/zcjxb/index.vue
View File

@ -200,6 +200,7 @@ const defaultForm = {
readValue: null, errorTxt: null readValue: null, errorTxt: null
} }
export default { export default {
name: 'ZcJxb',
components: {pagination, crudOperation, rrOperation, udOperation}, components: {pagination, crudOperation, rrOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() { cruds() {

2
src/views/base-data/box/smallLine.vue
View File

@ -201,7 +201,7 @@ const defaultForm = {
lampCode: null lampCode: null
} }
export default { export default {
name: 'Box', name: 'SmallLine',
components: {pagination, crudOperation, rrOperation, udOperation, BindOrderNumber}, components: {pagination, crudOperation, rrOperation, udOperation, BindOrderNumber},
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['base_staus', 'lamp_status', 'lamp_code'], dicts: ['base_staus', 'lamp_status', 'lamp_code'],

1
src/views/base-data/item/index.vue
View File

@ -220,6 +220,7 @@ export default {
crud.toQuery() crud.toQuery()
}, },
handleErr(err, file, fileList) { handleErr(err, file, fileList) {
console.log(err)
this.crud.notify(err.toString(), CRUD.NOTIFICATION_TYPE.ERROR) this.crud.notify(err.toString(), CRUD.NOTIFICATION_TYPE.ERROR)
}, },
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据

1
src/views/base-data/stock/index.vue
View File

@ -306,7 +306,6 @@ export default {
}, },
methods: { methods: {
handleSuccess(response, file, fileList, crud) { handleSuccess(response, file, fileList, crud) {
let myError = response.toString()//转字符串
this.crud.notify(response['message'], CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify(response['message'], CRUD.NOTIFICATION_TYPE.SUCCESS)
crud.toQuery() crud.toQuery()
}, },

2
src/views/business-data/businessTask/asnTask.vue
View File

@ -159,7 +159,7 @@ const defaultForm = {
updateTime: null updateTime: null
} }
export default { export default {
name: 'asnTask', name: 'AsnTask',
components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation}, components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['task_status'], dicts: ['task_status'],

64
src/views/business-data/inventory/index.vue
View File

@ -3,17 +3,6 @@
<!--工具栏--> <!--工具栏-->
<div class="head-container"> <div class="head-container">
<div v-if="crud.props.searchToggle" type="flex"> <div v-if="crud.props.searchToggle" type="flex">
<label class="el-form-item-label" v-show="false">物料编码</label>
<el-select v-show="false" v-model="query.itemCode" @focus="getItem" value-key="id" filterable multiple
placeholder="请选择物料" style="width: 150px;" class="filter-item"
@keyup.enter.native="crud.toQuery">
<el-option
v-for="item in items"
:key="item.id"
:label="item.code"
:value="item.code"
/>
</el-select>
<label class="el-form-item-label">物料编码</label> <label class="el-form-item-label">物料编码</label>
<el-input v-model="query.itemCodeOne" clearable placeholder="请输入物料编码" style="width: 150px;" <el-input v-model="query.itemCodeOne" clearable placeholder="请输入物料编码" style="width: 150px;"
@ -30,6 +19,10 @@
<el-input v-model="query.stockName" clearable placeholder="请输入容器号" style="width: 150px;" <el-input v-model="query.stockName" clearable placeholder="请输入容器号" style="width: 150px;"
class="filter-item" class="filter-item"
@keyup.enter.native="crud.toQuery"/> @keyup.enter.native="crud.toQuery"/>
<label class="el-form-item-label">箱号</label>
<el-input v-model="query.orderNumber" clearable placeholder="请输入箱号" style="width: 150px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<rrOperation :crud="crud"/> <rrOperation :crud="crud"/>
<el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置 <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置
@ -47,9 +40,24 @@
</div> </div>
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" :tableKey="this.$options.name"/> <crudOperation :permission="permission" :tableKey="this.$options.name">
<el-upload
class="upload-demo"
slot="right"
style="float: right;padding-left: 5px"
:action="baseApi+'/api/inventory/import_inventory'"
:file-list="fileList"
:on-error="handleErr"
:on-success=" (response, file, fileList) => {
return handleSuccess(response, file, fileList,crud);}"
:headers="headers"
:show-file-list="true"
>
<el-button size="mini" type="success" v-if="this.radio3=='大件'" icon="el-icon-upload2">大件批量入库
</el-button>
</el-upload>
</crudOperation>
<!--表单组件--> <!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
:title="crud.status.title" width="500px"> :title="crud.status.title" width="500px">
@ -166,6 +174,8 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation' import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
import {mapGetters} from "vuex";
import {getToken} from "@/utils/auth";
const defaultForm = { const defaultForm = {
id: null, id: null,
@ -199,7 +209,8 @@ export default {
cruds() { cruds() {
return CRUD({ return CRUD({
query: { query: {
quantity: 0 quantity: 0,
areaName: '小件存储区'
}, },
title: '库存信息', title: '库存信息',
url: 'api/inventory', url: 'api/inventory',
@ -215,8 +226,15 @@ export default {
} }
}) })
}, },
computed: {
...mapGetters([
'baseApi'
])
},
data() { data() {
return { return {
headers: {'Authorization': getToken()},
fileList: [],
radio3: '小件', radio3: '小件',
points: [], points: [],
stocks: [], stocks: [],
@ -230,6 +248,16 @@ export default {
} }
}, },
methods: { methods: {
handleSuccess(response, file, fileList, crud) {
this.crud.notify(response['message'], CRUD.NOTIFICATION_TYPE.SUCCESS)
crud.toQuery()
},
handleErr(err, file, fileList) {
let myError = err.toString()//转字符串
myError = myError.replace('Error: ', '') // 去掉前面的" Error: "
myError = JSON.parse(myError)//转对象
this.crud.notify(myError['message'], CRUD.NOTIFICATION_TYPE.ERROR)
},
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
return true return true
@ -244,7 +272,8 @@ export default {
}) })
}) })
}, },
deleteDataM(id) {//删除数据的方法 //删除数据的方法
deleteDataM(id) {
let ids = []; let ids = [];
ids.push(id); ids.push(id);
crudInventory.del(ids).then(res => { crudInventory.del(ids).then(res => {
@ -288,7 +317,7 @@ export default {
}, },
clickChange(lab) { clickChange(lab) {
if (lab === '全部') { if (lab === '全部') {
this.query.status = '' this.query.areaName = ''
this.crud.toQuery() this.crud.toQuery()
} else if (lab === '小件') { } else if (lab === '小件') {
this.query.areaName = '小件存储区' this.query.areaName = '小件存储区'
@ -300,10 +329,11 @@ export default {
this.query.areaName = ['小件翻包区', '大件翻包区'] this.query.areaName = ['小件翻包区', '大件翻包区']
this.crud.toQuery() this.crud.toQuery()
} else if (lab === '叫料') { } else if (lab === '叫料') {
this.query.areaName = ['小件翻包存储区', '小件翻包存储区'] this.query.areaName = ['小件翻包存储区', '大件翻包存储区']
this.crud.toQuery() this.crud.toQuery()
} }
} }
} }
} }

89
src/views/business-data/inventoryLog/index.vue
View File

@ -2,45 +2,51 @@
<div class="app-container"> <div class="app-container">
<!--工具栏--> <!--工具栏-->
<div class="head-container"> <div class="head-container">
<!-- <el-input v-model="query.itemCode" clearable placeholder="物料代码" style="width: 140px;" class="filter-item"--> <div v-if="crud.props.searchToggle" type="flex">
<!-- @keyup.enter.native="crud.toQuery"/>--> <label class="el-form-item-label">物料</label>
<el-select v-model="query.itemCode" placeholder="物料代码" filterable clearable style="width: 140px;" class="filter-item"> <el-input v-model="query.itemCodeOne" clearable placeholder="请输入物料编码" style="width: 150px;"
<el-option class="filter-item" @keyup.enter.native="crud.toQuery"/>
@keyup.enter.native="crud.toQuery"
v-for="item in this.items" <label class="el-form-item-label">物料名称</label>
:key="item.code" <el-input v-model="query.itemName" clearable placeholder="请输入物料名称" style="width: 150px;"
:label="item.code" class="filter-item" @keyup.enter.native="crud.toQuery"/>
:value="item.code"> <label class="el-form-item-label">操作类型</label>
<span style="float: left">{{ item.code }}</span> <el-select v-model="query.logType" clearable placeholder="操作类型" style="width: 150px;" class="filter-item"
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span> @keyup.enter.native="crud.toQuery">
</el-option> <el-option
</el-select> v-for="logtype in dict.inv_log_type"
<el-input v-model="query.itemName" clearable placeholder="物料名称" style="width: 140px;" class="filter-item" :key="logtype.id"
@keyup.enter.native="crud.toQuery"/> :label="logtype.label"
<el-select v-model="query.logType" clearable placeholder="操作类型" class="filter-item" :value="logtype.value"
@keyup.enter.native="crud.toQuery"> @change="crud.toQuery"
<el-option />
v-for="logtype in dict.inv_log_type" </el-select>
:key="logtype.id" <label class="el-form-item-label">增减类型</label>
:label="logtype.label" <el-select v-model="query.incDec" clearable placeholder="增加/减少" style="width: 150px;" class="filter-item"
:value="logtype.value" @keyup.enter.native="crud.toQuery">
@change="crud.toQuery" <el-option
/> v-for="incdec in dict.inc_dec"
</el-select> :key="incdec.id"
<el-select v-model="query.incDec" clearable placeholder="增加/减少" class="filter-item" :label="incdec.label"
@keyup.enter.native="crud.toQuery"> :value="incdec.value"
<el-option @change="crud.toQuery"
v-for="incdec in dict.inc_dec" />
:key="incdec.id" </el-select>
:label="incdec.label" <label class="el-form-item-label">批次号</label>
:value="incdec.value" <el-input v-model="query.propC1" clearable placeholder="请输入批次号" style="width: 150px;" class="filter-item"
@change="crud.toQuery" @keyup.enter.native="crud.toQuery"/>
/> <div>
</el-select> <label class="el-form-item-label">箱号</label>
<el-input v-model="query.propC1" clearable placeholder="请输入批次号" style="width: 140px;" class="filter-item" <el-input v-model="query.orderNumber" clearable placeholder="请输入箱号" style="width: 150px;"
@keyup.enter.native="crud.toQuery"/> class="filter-item"
<date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/> @keyup.enter.native="crud.toQuery"/>
<rrOperation :crud="crud"/> <label class="el-form-item-label">发生日期</label>
<date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/>
<rrOperation :crud="crud"/>
</div>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" :tableKey="this.$options.name"/> <crudOperation :permission="permission" :tableKey="this.$options.name"/>
<!--表单组件--> <!--表单组件-->
@ -70,6 +76,11 @@
<div>{{ scope.row.itemKey.propC1 }}</div> <div>{{ scope.row.itemKey.propC1 }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="orderNumber" label="箱号">
<template slot-scope="scope">
<div>{{ scope.row.itemKey.orderNumber }}</div>
</template>
</el-table-column>
<el-table-column prop="logType" label="操作类型"> <el-table-column prop="logType" label="操作类型">
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.inv_log_type[scope.row.logType] }} {{ dict.label.inv_log_type[scope.row.logType] }}