no message
WINDOWS-DN6K5JD\EDY
parent
5fa6b58a69
commit
c62071abd0
File diff suppressed because it is too large
Load Diff
|
|
@ -26,6 +26,7 @@
|
|||
"@vue/cli-service": "~5.0.0",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-plugin-vue": "^8.0.3",
|
||||
"less": "^4.2.0",
|
||||
"vue-template-compiler": "^2.6.14"
|
||||
},
|
||||
"eslintConfig": {
|
||||
|
|
|
|||
|
|
@ -2,40 +2,144 @@
|
|||
<div class="div1">
|
||||
|
||||
<div class="div2" style="padding-bottom: 10px">
|
||||
<div style="float: right">
|
||||
<el-select v-model="xb" clearable filterable placeholder="请选择性别" style="width: 100px">
|
||||
|
||||
<el-form ref="form" :model="param" label-width="80px">
|
||||
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="4">
|
||||
<el-form-item label="采购单号:">
|
||||
|
||||
<el-input type="textarea" v-model="param.sourceId" :rows="1"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="收货凭证:" >
|
||||
<el-input type="textarea" v-model="param.strBill7" :rows="1"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="料号:">
|
||||
<el-input type="textarea" v-model="param.code" :rows="1"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="工厂:">
|
||||
<el-select v-model="param.PROP_C9" multiple filterable placeholder="请选择工厂" style="width: 100%;">
|
||||
<el-option
|
||||
v-for="item in xbs"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
v-for="item in PROP_C9S"
|
||||
:key="item.label"
|
||||
:label="item.value"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-input v-model="name"
|
||||
placeholder="请输入姓名"
|
||||
style="width: 200px;margin-left: 5px"
|
||||
<el-col :span="4">
|
||||
<el-form-item label="LOC:">
|
||||
<el-select v-model="param.PROP_C2" multiple placeholder="请选择LOC" style="width: 100%;">
|
||||
<el-option
|
||||
v-for="item in PROP_C2S"
|
||||
:key="item.label"
|
||||
:label="item.value"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
class="input-with-select"
|
||||
@keyup.enter.native="queryUser">
|
||||
<el-col :span="4">
|
||||
<el-form-item label="批次号:">
|
||||
<el-input type="textarea" v-model="param.PROP_C2" :rows="1"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-button class="el-input-group__prepend" slot="append" icon="el-icon-search" @click="queryUser"></el-button>
|
||||
</el-input>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="收货日期:">
|
||||
<el-date-picker style="width: 325px"
|
||||
v-model="ORDER_DATE"
|
||||
type="daterange"
|
||||
align="right"
|
||||
unlink-panels
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:picker-options="pickerOptions">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-button type="success" icon="el-icon-refresh-left" style="margin-left: 5px;" @click="rest">重置</el-button>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="整理日期:">
|
||||
<el-date-picker style="width: 325px"
|
||||
v-model="RECEIVE_DATE"
|
||||
type="daterange"
|
||||
align="right"
|
||||
unlink-panels
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:picker-options="pickerOptions">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="特殊标记:">
|
||||
<el-input type="text" v-model="param.PROP_C3"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="SAP接口:">
|
||||
<el-input type="text" v-model="param.CODE"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="4">
|
||||
<el-form-item label="加急标记">
|
||||
<el-input type="text" v-model="param.strBill11"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-checkbox v-model="checked" @change="Allquesr">是否显示全部</el-checkbox>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-button type="success" @click="find">查找</el-button>
|
||||
<el-button type="success" @click="rest">重置</el-button>
|
||||
</el-form>
|
||||
|
||||
<!-- <el-input v-model="param.sourceId"-->
|
||||
<!-- placeholder="请输入姓名"-->
|
||||
<!-- style="width: 200px;margin-left: 5px"-->
|
||||
|
||||
<!-- class="input-with-select"-->
|
||||
<!-- @keyup.enter.native="queryUser">-->
|
||||
|
||||
<!-- <el-button class="el-input-group__prepend" slot="append" icon="el-icon-search" @click="queryUser"></el-button>-->
|
||||
<!-- </el-input>-->
|
||||
|
||||
<!-- <el-button type="success" icon="el-icon-refresh-left" style="margin-left: 5px;" @click="rest">重置</el-button>-->
|
||||
|
||||
|
||||
|
||||
<!-- <div class="div3" style="">-->
|
||||
<!-- <el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>-->
|
||||
<!-- <el-button type="success" icon="el-icon-edit" @click="mod">编辑</el-button>-->
|
||||
<!-- <el-button type="danger" icon="el-icon-delete" @click="del">删除</el-button>-->
|
||||
<!-- <el-button type="warning" icon="el-icon-download" @click="exportExcel">导出</el-button>-->
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
|
||||
|
||||
<div class="div3" style="">
|
||||
<el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
|
||||
<el-button type="success" icon="el-icon-edit" @click="mod">编辑</el-button>
|
||||
<el-button type="danger" icon="el-icon-delete" @click="del">删除</el-button>
|
||||
<el-button type="warning" icon="el-icon-download" @click="exportExcel">导出</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<el-dialog :title="title"
|
||||
:visible.sync="centerDialogVisible"
|
||||
width="30%"
|
||||
|
|
@ -46,25 +150,29 @@
|
|||
:rules="rules"
|
||||
label-width="80px">
|
||||
|
||||
<el-form-item label="账号" prop="userNo">
|
||||
<el-input v-model="form.userNo" style="width: 300px;"></el-input>
|
||||
<el-form-item label="id" prop="id">
|
||||
<el-input v-model="form.id" style="width: 300px;"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="姓名" prop="userName">
|
||||
<el-input v-model="form.userName" style="width: 300px;"></el-input>
|
||||
<el-form-item label="sourceId" prop="sourceId">
|
||||
<el-input v-model="form.sourceId" style="width: 300px;"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="年龄" prop="age">
|
||||
<el-input v-model.number="form.age" style="width: 300px;" autocomplete="off"></el-input>
|
||||
<el-form-item label="strBill7" prop="strBill7">
|
||||
<el-input v-model.number="form.strBill7" style="width: 300px;" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="性别">
|
||||
<el-radio-group v-model="form.sex">
|
||||
<el-radio label='1'>男</el-radio>
|
||||
<el-radio label='0'>女</el-radio>
|
||||
</el-radio-group>
|
||||
<el-form-item label="strBill8" prop="age">
|
||||
<el-input v-model.number="form.strBill8" style="width: 300px;" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<!-- <el-form-item label="性别">-->
|
||||
<!-- <el-radio-group v-model="form.sex">-->
|
||||
<!-- <el-radio label='1'>男</el-radio>-->
|
||||
<!-- <el-radio label='0'>女</el-radio>-->
|
||||
<!-- </el-radio-group>-->
|
||||
<!-- </el-form-item>-->
|
||||
|
||||
<el-form-item label="电话" prop="phone">
|
||||
<el-input v-model="form.phone" style="width: 300px;"></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -99,94 +207,261 @@
|
|||
<span style="margin-left: 10px">{{ scope.row.id }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column-->
|
||||
<!-- fixed-->
|
||||
<!-- label="账号"-->
|
||||
<!-- width="180">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-popover trigger="hover" placement="top">-->
|
||||
<!-- <p>账号: {{ scope.row.userNo }}</p>-->
|
||||
<!-- <p>电话: {{ scope.row.phone }}</p>-->
|
||||
<!-- <div slot="reference" class="name-wrapper">-->
|
||||
<!-- <el-tag size="medium">{{ scope.row.userNo }}</el-tag>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-popover>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column
|
||||
fixed
|
||||
label="账号"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<el-popover trigger="hover" placement="top">
|
||||
<p>账号: {{ scope.row.userNo }}</p>
|
||||
<p>电话: {{ scope.row.phone }}</p>
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<el-tag size="medium">{{ scope.row.userNo }}</el-tag>
|
||||
</div>
|
||||
</el-popover>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="姓名"
|
||||
label="ID"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.userName }}</span>
|
||||
<span>{{ scope.row.id}}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="年龄"
|
||||
label="采购单号"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.age }}</span>
|
||||
<span>{{ scope.row.sourceId }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="电话"
|
||||
label="凭证号"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.phone }}</span>
|
||||
<span>{{ scope.row.strBill7 }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="性别"
|
||||
label="行号"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<el-tag size="medium" :type="scope.row.sex ===0 ? 'primary' : 'success'">
|
||||
{{ scope.row.sex === 0 ? '女' : '男' }}
|
||||
</el-tag>
|
||||
<span>{{ scope.row.strBill8 }}</span>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="角色"
|
||||
label="料号"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<el-tag size="medium"
|
||||
:type="scope.row.roleId ===0 ? 'danger' : (scope.row.roleId ===1 ? 'primary':'success') ">
|
||||
{{ scope.row.roleId === 0 ? '超级管理员' : (scope.row.roleId === 1 ? '管理员' : '用户') }}
|
||||
</el-tag>
|
||||
|
||||
<span>{{ scope.row.CODE }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="描述"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.NAME }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="单位"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.UNIT }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="收货日期"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.ORDER_DATE }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="整理日期"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.RECEIVE_DATE }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="OPERATOR"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.OPERATOR }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="z_name"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.z_name }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="LP"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.LP }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="批次"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.PROP_C1 }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="LOC"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.PROP_C2 }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="特殊标记"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.PROP_C3 }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="供应商编号"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.PROP_C5 }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="区域"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.PROP_C8 }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="工厂"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.PROP_C9 }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="BAR_CODE"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.BAR_CODE }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="BE_MOVED"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.BE_MOVED }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="备注"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.description }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
label="操作"
|
||||
width="100">
|
||||
<template slot-scope="scope">
|
||||
<!-- <el-button
|
||||
size="small"
|
||||
@click="handleEdit(scope.$index, scope.row)">编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
type="danger"
|
||||
@click="handleDelete(scope.$index, scope.row)">删除
|
||||
</el-button>-->
|
||||
<el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
|
||||
<el-button type="text" size="small" @click="editUser(scope.row)">编辑</el-button>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="性别"-->
|
||||
<!-- width="180">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
|
||||
<!-- <div slot="reference" class="name-wrapper">-->
|
||||
<!-- <el-tag size="medium" :type="scope.row.sex ===0 ? 'primary' : 'success'">-->
|
||||
<!-- {{ scope.row.sex === 0 ? '女' : '男' }}-->
|
||||
<!-- </el-tag>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="角色"-->
|
||||
<!-- width="180">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <div slot="reference" class="name-wrapper">-->
|
||||
<!-- <el-tag size="medium"-->
|
||||
<!-- :type="scope.row.roleId ===0 ? 'danger' : (scope.row.roleId ===1 ? 'primary':'success') ">-->
|
||||
<!-- {{ scope.row.roleId === 0 ? '超级管理员' : (scope.row.roleId === 1 ? '管理员' : '用户') }}-->
|
||||
<!-- </el-tag>-->
|
||||
|
||||
<!-- </div>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
|
||||
|
||||
<!-- <el-table-column-->
|
||||
<!-- fixed="right"-->
|
||||
<!-- label="操作"-->
|
||||
<!-- width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <!– <el-button-->
|
||||
<!-- size="small"-->
|
||||
<!-- @click="handleEdit(scope.$index, scope.row)">编辑-->
|
||||
<!-- </el-button>-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="small"-->
|
||||
<!-- type="danger"-->
|
||||
<!-- @click="handleDelete(scope.$index, scope.row)">删除-->
|
||||
<!-- </el-button>–>-->
|
||||
<!-- <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>-->
|
||||
<!-- <el-button type="text" size="small" @click="editUser(scope.row)">编辑</el-button>-->
|
||||
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
</el-table>
|
||||
<el-pagination
|
||||
@size-change="handleSizeChange"
|
||||
|
|
@ -230,21 +505,75 @@ export default {
|
|||
|
||||
};
|
||||
return {
|
||||
pickerOptions: {
|
||||
shortcuts: [{
|
||||
text: '最近一周',
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
||||
picker.$emit('pick', [start, end]);
|
||||
}
|
||||
}, {
|
||||
text: '最近一个月',
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
||||
picker.$emit('pick', [start, end]);
|
||||
}
|
||||
}, {
|
||||
text: '最近三个月',
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
||||
picker.$emit('pick', [start, end]);
|
||||
}
|
||||
}]
|
||||
},
|
||||
value1: '',
|
||||
value2: '',
|
||||
tableData: [],
|
||||
pageSize: 10,
|
||||
pageNum: 1,
|
||||
total: 3,
|
||||
name: '',
|
||||
xb: '',
|
||||
param: {
|
||||
sourceId: '',
|
||||
strBill7: '',
|
||||
code: '',
|
||||
PROP_C1: '',
|
||||
PROP_C3: '',
|
||||
CODE: '',
|
||||
PROP_C2: [],
|
||||
PROP_C9: [],
|
||||
},
|
||||
//整理日期
|
||||
RECEIVE_DATE: [],
|
||||
//收货日期
|
||||
ORDER_DATE: [],
|
||||
checked: false,
|
||||
zh:'',
|
||||
xbs: [
|
||||
|
||||
PROP_C2S: [
|
||||
{
|
||||
value: '1',
|
||||
label: '男'
|
||||
label: '1',
|
||||
value: 'LOC1'
|
||||
},
|
||||
{
|
||||
value: '0',
|
||||
label: '女'
|
||||
label: '2',
|
||||
value: 'LOC2'
|
||||
}
|
||||
],
|
||||
|
||||
PROP_C9S: [
|
||||
{
|
||||
label: '1',
|
||||
value: '马云'
|
||||
},
|
||||
{
|
||||
label: '0',
|
||||
value: '阿里'
|
||||
}
|
||||
],
|
||||
form: {
|
||||
|
|
@ -294,14 +623,19 @@ export default {
|
|||
this.queryUser();
|
||||
},
|
||||
queryUser() {
|
||||
|
||||
console.log(this.RECEIVE_DATE[0]);
|
||||
console.log(this.ORDER_DATE[0]);
|
||||
|
||||
//列表数据加载
|
||||
this.$axios.post(this.$httpUrl + '/user/queryUser', {
|
||||
pageSize: this.pageSize,
|
||||
pageNum: this.pageNum,
|
||||
param: {
|
||||
name: this.name,
|
||||
xb: this.xb
|
||||
}
|
||||
param: this.param,
|
||||
PROP_C2: this.PROP_C2,
|
||||
PROP_C9: this.PROP_C9,
|
||||
RECEIVE_DATE: this.RECEIVE_DATE,
|
||||
ORDER_DATE: this.ORDER_DATE
|
||||
}).then(res => res.data)
|
||||
.then(res => {
|
||||
if (res.code == 200) {
|
||||
|
|
@ -317,10 +651,22 @@ export default {
|
|||
console.log(err);
|
||||
})
|
||||
},
|
||||
find(){
|
||||
if(this.checked){
|
||||
this.checked=false;
|
||||
}
|
||||
this.queryUser();
|
||||
},
|
||||
Allquesr(){
|
||||
//查询按钮
|
||||
if(this.checked){
|
||||
this.rest();
|
||||
this.queryUser();
|
||||
}
|
||||
},
|
||||
rest() {
|
||||
//表单重置
|
||||
this.name = '',
|
||||
this.xb = ''
|
||||
this.param={};
|
||||
},
|
||||
add() {
|
||||
//点击新增按弹窗
|
||||
|
|
@ -465,6 +811,7 @@ export default {
|
|||
}
|
||||
</script>
|
||||
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ import VueRouter from "vue-router";
|
|||
import router from "@/router/router";
|
||||
import store from "@/store/store";
|
||||
Vue.prototype.$axios=axios;
|
||||
Vue.prototype.$httpUrl='http://192.168.56.147:8081';
|
||||
// Vue.prototype.$httpUrl='http://192.168.56.147:8081';
|
||||
Vue.prototype.$httpUrl='http://127.0.0.1:8081';
|
||||
Vue.config.productionTip = false;
|
||||
Vue.use(VueRouter)
|
||||
Vue.use(ElementUI,{size:'small'});
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
package com.yc.wms.bean;
|
||||
|
||||
public class DcxBean1 {
|
||||
public String [] PROP_C9;
|
||||
|
||||
public String sourceId;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
package com.yc.wms.controller;
|
||||
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.yc.wms.bean.DcxBean1;
|
||||
import com.yc.wms.service.DcxService;
|
||||
import com.yc.wms.until.QueryPageUtil;
|
||||
import com.yc.wms.until.Result;
|
||||
|
|
@ -32,6 +34,7 @@ public class UserController {
|
|||
@Autowired
|
||||
private DcxService dcxService;
|
||||
|
||||
|
||||
/**
|
||||
* @return
|
||||
* 登录
|
||||
|
|
@ -100,28 +103,27 @@ public class UserController {
|
|||
* @param查询用户
|
||||
*/
|
||||
@PostMapping("/queryUser")
|
||||
public Result queryUser(@RequestBody QueryPageUtil query) {
|
||||
// HashMap map = query.getParam();
|
||||
// String name = (String) map.get("name");
|
||||
// String sex = (String) map.get("xb");
|
||||
// Page<User> page = new Page<User>();
|
||||
// page.setCurrent(query.getPageNum());
|
||||
// page.setSize(query.getPageSize());
|
||||
// System.out.println("当前页：" + query.getPageNum());
|
||||
// System.out.println("条数：" + query.getPageSize());
|
||||
// LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper();
|
||||
// if (name != null && name.length() > 0) {
|
||||
// lambdaQueryWrapper.like(User::getUserName, name);
|
||||
// }
|
||||
// if (sex != null && sex.length() > 0) {
|
||||
// lambdaQueryWrapper.like(User::getSex, sex);
|
||||
// }
|
||||
// IPage iPage = userService.QueryUser(page, lambdaQueryWrapper);
|
||||
//
|
||||
// System.out.println(iPage.getTotal());
|
||||
// System.out.println(iPage.getRecords());
|
||||
// return Result.success(iPage.getTotal(), iPage.getRecords());
|
||||
return dcxService.readJson(query);
|
||||
public Result queryUser(@RequestBody String json) {
|
||||
|
||||
QueryPageUtil query =new QueryPageUtil();
|
||||
|
||||
System.out.println(json);
|
||||
|
||||
JSONObject jsonObject=JSONUtil.parseObj(json);
|
||||
query.setPageSize((int)jsonObject.get("pageSize"));
|
||||
query.setPageNum((int)jsonObject.get("pageNum"));
|
||||
|
||||
JSONObject param= (JSONObject)jsonObject.get("param");
|
||||
DcxBean1 dcxBean1 = JSONUtil.toBean(param.toString(), DcxBean1.class);
|
||||
|
||||
|
||||
for (String s:dcxBean1.PROP_C9) {
|
||||
System.out.println("c9:"+s);
|
||||
}
|
||||
|
||||
|
||||
|
||||
return dcxService.readJson(query,dcxBean1);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package com.yc.wms.service;
|
||||
|
||||
|
||||
import com.yc.wms.bean.DcxBean1;
|
||||
import com.yc.wms.until.QueryPageUtil;
|
||||
import com.yc.wms.until.Result;
|
||||
|
||||
|
|
@ -13,5 +14,11 @@ import com.yc.wms.until.Result;
|
|||
* @since 2023-03-04
|
||||
*/
|
||||
public interface DcxService {
|
||||
Result readJson(QueryPageUtil query);
|
||||
Result readJson(QueryPageUtil query, DcxBean1 bean1);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.yc.wms.service.impl;
|
|||
|
||||
import cn.hutool.json.JSONArray;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import com.yc.wms.bean.DcxBean1;
|
||||
import com.yc.wms.service.DcxService;
|
||||
import com.yc.wms.until.QueryPageUtil;
|
||||
import com.yc.wms.until.Result;
|
||||
|
|
@ -12,6 +13,8 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
|
|||
import org.springframework.jdbc.object.SqlQuery;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
|
@ -26,51 +29,55 @@ public class DcxServiceImpl implements DcxService {
|
|||
private NamedParameterJdbcTemplate jdbcTemplate;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public Result readJson(QueryPageUtil query) {
|
||||
HashMap map = query.getParam();
|
||||
// String methodType = (String) map.get("methodType");
|
||||
// if(methodType.equals("kchzcx")){//库存汇总查询
|
||||
// return queryKchz(query);
|
||||
// }
|
||||
return queryKchz(query);
|
||||
}
|
||||
public Result readJson(QueryPageUtil query,DcxBean1 dcxBean1) {
|
||||
|
||||
public Result queryKchz(QueryPageUtil query) {
|
||||
|
||||
HashMap map = query.getParam();
|
||||
// String itemCode = (String) map.get("itemCode");
|
||||
int pageNum = query.getPageNum();//当前页
|
||||
int pageSize = query.getPageSize();//条数
|
||||
System.out.println("当前页：" + pageNum);
|
||||
System.out.println("条数：" + pageSize);
|
||||
String sql = " from (SELECT ROW_NUMBER() OVER(ORDER BY it.id) AS RowNum, it.id ,"
|
||||
+ "it.code,"
|
||||
+ "it.name"
|
||||
+ " from Item it ";
|
||||
sql += ") AS subquery ";
|
||||
String sqlCount = "select count(id) as nums " + sql;
|
||||
sql = "select * " + sql + " WHERE RowNum BETWEEN " + (pageNum-1) * pageSize + " AND " + (pageNum) * pageSize;
|
||||
//这里到时候记得自己加 判空
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
//System.out.println(map);
|
||||
|
||||
// String startDate = simpleDateFormat.format(query.getStartDate());
|
||||
|
||||
String sql_bz = "SELECT ROW_NUMBER() OVER(ORDER BY rd.id) AS Row_Num,rd.id,ad.sourceId,ad.strBill7,ad.strBill8,\n" +
|
||||
"i.CODE,i.NAME,i.UNIT,a.ORDER_DATE,rd.RECEIVE_DATE,\n" +
|
||||
"rd.OPERATOR,z.NAME z_name,s.LP,ik.PROP_C1,ik.PROP_C2,\n" +
|
||||
"ik.PROP_C3,ik.PROP_C5,ik.PROP_C8,ik.PROP_C9,\n" +
|
||||
"rd.BAR_CODE,rd.BE_MOVED,ad.description\n" +
|
||||
"FROM RECEIVED_RECORD rd \n" +
|
||||
"LEFT JOIN ASN_DETAIL ad ON ad.id = rd.ASN_DETAIL_ID\n" +
|
||||
"LEFT JOIN asn a ON a.ID = ad.ASN_ID\n" +
|
||||
"LEFT JOIN ITEM_KEY ik ON ik.id = rd.ITEM_KEY_ID\n" +
|
||||
"LEFT JOIN ITEM i ON i.id = ad.ITEM_ID\n" +
|
||||
"LEFT JOIN stock s ON s.id = rd.SRC_LP\n" +
|
||||
"LEFT JOIN WORKER w ON w.id = rd.WORKER_ID\n" +
|
||||
"LEFT JOIN [ZONE] z ON z.id = rd.WAREHOUSE_AREA_ID " +
|
||||
" where 1=1";
|
||||
|
||||
//查询条件
|
||||
//采购订单
|
||||
if(map.get("sourceId")!=null&&!map.get("sourceId").toString().equals("")){
|
||||
sql_bz+=" and ad.sourceId ="+"'"+map.get("sourceId").toString()+"'";
|
||||
}
|
||||
//收货凭证
|
||||
if(map.get("strBill7")!=null&&!map.get("strBill7").toString().equals("")){
|
||||
sql_bz+=" and ad.strBill7 ="+"'"+map.get("strBill7").toString()+"'";
|
||||
}
|
||||
|
||||
String sqlCount = "select count(t.id) as nums from(" + sql_bz+") t";
|
||||
String sqlFy = "select t.* from(" + sql_bz+") t";
|
||||
sqlFy+= " WHERE Row_Num BETWEEN " + (pageNum-1) * pageSize + " AND " + (pageNum) * pageSize;
|
||||
//查询单数据
|
||||
Map<String,Object> listCount = jdbcTemplate.queryForMap(sqlCount, new HashMap<>());
|
||||
//查询多条数据据
|
||||
List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql, new HashMap<>());
|
||||
JSONArray data = new JSONArray();
|
||||
for(Map<String,Object> m:maps){
|
||||
int i=0;
|
||||
JSONObject d = new JSONObject();
|
||||
d.put("id",m.get("id"));
|
||||
d.put("userNo",m.get("code"));
|
||||
d.put("userName", m.get("name"));
|
||||
d.put("passWord","123456");
|
||||
d.put("age",19);
|
||||
d.put("sex",1);
|
||||
d.put("phone", "123");
|
||||
d.put("roleId", 2);
|
||||
d.put("isValid", false);
|
||||
data.add(d);
|
||||
}
|
||||
return Result.success(Long.parseLong(listCount.get("nums").toString()),data);
|
||||
List<Map<String,Object>> maps = jdbcTemplate.queryForList(sqlFy, new HashMap<>());
|
||||
System.out.println(maps);
|
||||
|
||||
return Result.success(Long.parseLong(listCount.get("nums").toString()),maps);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
package com.yc.wms.until;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
|
||||
@Data
|
||||
|
|
@ -11,5 +15,6 @@ public class QueryPageUtil {
|
|||
private int pageSize=PAGE_SIZE;
|
||||
private int pageNum=PAGE_NUM;
|
||||
|
||||
private HashMap param=new HashMap();
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue