Yangwl
/
lanju-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
陈恒杰 8 months ago
parent ff981a9b3e caf05678e3
commit 8b3ef9bc1f
11 changed files with 1216 additions and 245 deletions
Show Stats Download Patch File Download Diff File

2
src/api/mes/reportWork.js
Unescape Escape View File

@ -306,7 +306,7 @@ export function getPrepareList(query) {
// 获取线体每月生产过程不良率 // 获取线体每月生产过程不良率
export function getLineQcData() { export function getLineQcData() {
return requestnpm({ return request({
url: '/quality/qcInterface/getLineQcData', url: '/quality/qcInterface/getLineQcData',
method: 'get' method: 'get'
}); });

32
src/api/wms/outorderfc.js
Unescape Escape View File

@ -122,7 +122,6 @@ export function listreturnderZC(query) {
method: 'post', method: 'post',
params: query params: query
}); });
} }
// //
export function addreturnderZC(data) { export function addreturnderZC(data) {
@ -167,3 +166,34 @@ export function CKlist(query) {
params: query params: query
}); });
} }
export function listckTS(query) {
return request({
url: '/wms/outorder/listckTS',
method: 'post',
params: query
});
}
// 查询物料信息列表
export function listProduct(query) {
return request({
url: '/wms/matenews/listWmsOdsMateStorageNews',
method: 'get',
params: query
});
}
// 查询报工详细列表
export function getCKList(data) {
return request({
url: '/wms/order/listCKT',
method: 'post',
params: data
});
}
export function addOdsProcureOutOrderTS(data) {
return request({
url: '/wms/outorder/addOdsProcureOutOrderTS',
method: 'post',
data: data
});
}

4
src/layout/components/Navbar.vue
Unescape Escape View File

@ -313,14 +313,14 @@ export default {
setInterval(() => this.getAlarmData(), 1000 * 60); setInterval(() => this.getAlarmData(), 1000 * 60);
this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST")); this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST"));
this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT"); this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT");
/**
//先执行一次 //先执行一次
this.getUnReadList(); this.getUnReadList();
// 实现轮询 // 实现轮询
this.timer = setInterval(() => { this.timer = setInterval(() => {
setTimeout(this.getUnReadList(), 30000); setTimeout(this.getUnReadList(), 30000);
}, 30000); }, 30000);
**/
}, },
components: { components: {

2
src/views/dashboard/QcChartLine.vue
Unescape Escape View File

@ -50,7 +50,7 @@
methods: { methods: {
getLineQcInfo(){ getLineQcInfo(){
getLineQcData().then(returnData => { getLineQcData().then((returnData) => {
const chart = this.$refs.chart const chart = this.$refs.chart
if (chart) { if (chart) {
const myChart = this.$echarts.init(chart) const myChart = this.$echarts.init(chart)

1
src/views/dashboard/crossBarChart.vue
Unescape Escape View File

@ -123,6 +123,7 @@ export default {
inverse: true, inverse: true,
axisLabel: { axisLabel: {
show: true, show: true,
interval: 0,
margin: 10, margin: 10,
textStyle: { textStyle: {
fontSize: "14", fontSize: "14",

336
src/views/energy/powerUse/RealTime/index.vue
Unescape Escape View File

@ -41,84 +41,91 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
>一键秒表</el-button> >一键秒表
</el-button>
</el-col> </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>
<!-- 用户表格 --> <!-- 用户表格 -->
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center"/>
<el-table-column label="计量设备编号" align="center" key="monitorId" prop="monitorId" v-if="columns[0].visible" /> <el-table-column label="计量设备编号" align="center" key="monitorId" prop="monitorId" v-if="columns[0].visible"/>
<el-table-column label="计量设备名称" align="center" key="monitorName" prop="monitorName" v-if="columns[1].visible" :show-overflow-tooltip="true" /> <el-table-column label="计量设备名称" align="center" key="monitorName" prop="monitorName" v-if="columns[1].visible"
<el-table-column label="采集时间" align="center" key="collectTime" prop="collectTime" v-if="columns[2].visible" :show-overflow-tooltip="true" /> :show-overflow-tooltip="true"/>
<el-table-column label="A项电压(V)" align="center" key="va" prop="va" v-if="columns[3].visible" :show-overflow-tooltip="true" /> <el-table-column label="采集时间" align="center" key="collectTime" prop="collectTime" v-if="columns[2].visible"
<el-table-column label="B项电压(V)" align="center" key="vb" prop="vb" v-if="columns[4].visible" width="120" /> :show-overflow-tooltip="true"/>
<el-table-column label="C项电压(V)" align="center" key="vc" prop="vc" v-if="columns[5].visible" width="120" /> <el-table-column label="A项电压(V)" align="center" key="va" prop="va" v-if="columns[3].visible"
<el-table-column label="A项电流(A)" align="center" key="ia" prop="ia" v-if="columns[6].visible" width="120" /> :show-overflow-tooltip="true"/>
<el-table-column label="B项电流(A)" align="center" key="ib" prop="ib" v-if="columns[7].visible" width="120" /> <el-table-column label="B项电压(V)" align="center" key="vb" prop="vb" v-if="columns[4].visible" width="120"/>
<el-table-column label="C项电流(A)" align="center" key="ic" prop="ic" v-if="columns[8].visible" width="120" /> <el-table-column label="C项电压(V)" align="center" key="vc" prop="vc" v-if="columns[5].visible" width="120"/>
<el-table-column label="功率因数" align="center" key="glys" prop="glys" v-if="columns[9].visible" width="120" /> <el-table-column label="A项电流(A)" align="center" key="ia" prop="ia" v-if="columns[6].visible" width="120"/>
<el-table-column label="正向有功(kW·h)" align="center" key="zxyg" prop="zxyg" v-if="columns[10].visible" width="120" /> <el-table-column label="B项电流(A)" align="center" key="ib" prop="ib" v-if="columns[7].visible" width="120"/>
<el-table-column label="C项电流(A)" align="center" key="ic" prop="ic" v-if="columns[8].visible" width="120"/>
<el-table-column label="功率因数" align="center" key="glys" prop="glys" v-if="columns[9].visible" width="120"/>
<el-table-column label="正向有功(kW·h)" align="center" key="zxyg" prop="zxyg" v-if="columns[10].visible"
width="120"/>
<!-- <el-table-column label="有功功率(KW)" align="center" key="activePower" prop="activePower" v-if="columns[11].visible" width="120" /> <!-- <el-table-column label="有功功率(KW)" align="center" key="activePower" prop="activePower" v-if="columns[11].visible" width="120" />
<el-table-column label="无功功率(Kvar)" align="center" key="reactivePower" prop="reactivePower" v-if="columns[12].visible" width="120" /> <el-table-column label="无功功率(Kvar)" align="center" key="reactivePower" prop="reactivePower" v-if="columns[12].visible" width="120" />
<el-table-column label="采集方式" align="center" key="collectType" prop="collectType" v-if="columns[13].visible" width="120" /> --> <el-table-column label="采集方式" align="center" key="collectType" prop="collectType" v-if="columns[13].visible" width="120" /> -->
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<pagination <!-- <pagination-->
v-show="total>0" <!-- v-show="total>0"-->
:total="total" <!-- :total="total"-->
:page.sync="queryParams.pageNum" <!-- :page.sync="queryParams.pageNum"-->
:limit.sync="queryParams.pageSize" <!-- :limit.sync="queryParams.pageSize"-->
@pagination="getList" <!-- @pagination="getList"-->
/> <!-- />-->
<el-card style="margin-top: 30px;" class="box-card"> <el-card style="margin-top: 30px;" class="box-card">
<el-table v-loading="loading" :data="userListtwo" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="userListtwo" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center"/>
<el-table-column label="计量设备编号" align="center" key="monitorId" prop="monitorId" /> <el-table-column label="计量设备编号" align="center" key="monitorId" prop="monitorId"/>
<el-table-column label="回路计量设备名称" align="center" key="monitorName" prop="monitorName" :show-overflow-tooltip="true" /> <el-table-column label="回路计量设备名称" align="center" key="monitorName" prop="monitorName"
<el-table-column label="采集时间" align="center" key="collectTime" prop="collectTime" :show-overflow-tooltip="true" /> :show-overflow-tooltip="true"/>
<el-table-column label="正向有功(kW·h)" align="center" key="zxyg" prop="zxyg" width="120" /> <el-table-column label="采集时间" align="center" key="collectTime" prop="collectTime"
</el-table> :show-overflow-tooltip="true"/>
<pagination <el-table-column label="正向有功(kW·h)" align="center" key="zxyg" prop="zxyg" width="120"/>
v-show="total>0" </el-table>
:total="total" <!-- <pagination-->
:page.sync="queryParams.pageNum" <!-- v-show="total>0"-->
:limit.sync="queryParams.pageSize" <!-- :total="total"-->
@pagination="getListtwo" <!-- :page.sync="queryParams.pageNum"-->
/> <!-- :limit.sync="queryParams.pageSize"-->
</el-card> <!-- @pagination="getListtwo"-->
<!-- />-->
</el-card>
</el-col> </el-col>
</el-row> </el-row>
<el-dialog :title="title2" :visible.sync="opentwo" @close="canceltwo" width="400px" append-to-body> <el-dialog :title="title2" :visible.sync="opentwo" @close="canceltwo" width="400px" append-to-body>
<el-form ref="form" :model="form" label-width="80px"> <el-form ref="form" :model="form" label-width="80px">
<el-col> <el-col>
<div class="head-container"> <div class="head-container">
<el-input <el-input
v-model="deptName" v-model="deptName"
placeholder="请输入计量设备名称" placeholder="请输入计量设备名称"
clearable clearable
size="small" size="small"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
style="margin-bottom: 20px" style="margin-bottom: 20px"
/> />
</div> </div>
<div class="head-container"> <div class="head-container">
<el-tree <el-tree
:data="deptOptionsselect" :data="deptOptionsselect"
:props="defaultProps" :props="defaultProps"
:expand-on-click-node="false" :expand-on-click-node="false"
:filter-node-method="filterNode" :filter-node-method="filterNode"
ref="tree" ref="tree"
node-key="id" node-key="id"
show-checkbox show-checkbox
:default-expanded-keys="[2]" :default-expanded-keys="[2]"
highlight-current highlight-current
@check-change="handleCheckChange" @check-change="handleCheckChange"
/> />
</div> </div>
</el-col> </el-col>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFormtwo">确 定</el-button> <el-button type="primary" @click="submitFormtwo">确 定</el-button>
@ -129,15 +136,15 @@
</template> </template>
<script> <script>
import { listUser,treeDat, instantLis,editMeterReading } from "@/api/energy/powerUse/RealTime"; import {listUser, treeDat, instantLis, editMeterReading} from "@/api/energy/powerUse/RealTime";
import { getToken } from "@/utils/auth"; import {getToken} from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "User", name: "User",
dicts: ['sys_normal_disable', 'sys_user_sex'], dicts: ['sys_normal_disable', 'sys_user_sex'],
components: { Treeselect }, components: {Treeselect},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -154,14 +161,14 @@ export default {
total: 0, total: 0,
// 用户表格数据 // 用户表格数据
userList: null, userList: null,
userListtwo:null, userListtwo: null,
// 弹出层标题 // 弹出层标题
title: "", title: "",
title2:'', title2: '',
formadd:{ formadd: {
monitorIds:[], monitorIds: [],
}, },
opentwo:false, opentwo: false,
// 部门树选项 // 部门树选项
deptOptions: undefined, deptOptions: undefined,
deptOptionsselect: undefined, deptOptionsselect: undefined,
@ -179,84 +186,40 @@ export default {
roleOptions: [], roleOptions: [],
// 表单参数 // 表单参数
form: {}, form: {},
params:[], params: [],
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "name" label: "name"
}, },
// 用户导入参数 monitorIddata: '',
upload: {
// 是否显示弹出层（用户导入）
open: false,
// 弹出层标题（用户导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/user/importData"
},
monitorIddata:'',
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
orderByColumn: "collectTime", orderByColumn: "collectTime",
isAsc: "desc", isAsc: "desc",
monitorSubset:'', monitorSubset: '',
collectType: undefined,
collectType: '', collectType: '',
params:{beginCollectTime:'',endCollectTime:''} params: {beginCollectTime: '', endCollectTime: ''}
}, },
// 列信息 // 列信息
columns: [ columns: [
{ key: 0, label: `计量设备编号`, visible: true }, {key: 0, label: `计量设备编号`, visible: true},
{ key: 1, label: `计量设备名称`, visible: true }, {key: 1, label: `计量设备名称`, visible: true},
{ key: 2, label: `采集时间`, visible: true }, {key: 2, label: `采集时间`, visible: true},
{ key: 3, label: `A项电压(V)`, visible: false }, {key: 3, label: `A项电压(V)`, visible: false},
{ key: 4, label: `B项电压(V)`, visible: false }, {key: 4, label: `B项电压(V)`, visible: false},
{ key: 5, label: `C项电压(V)`, visible: false }, {key: 5, label: `C项电压(V)`, visible: false},
{ key: 6, label: `A项电流(A)`, visible: false }, {key: 6, label: `A项电流(A)`, visible: false},
{ key: 7, label: `B项电流(A)`, visible: false }, {key: 7, label: `B项电流(A)`, visible: false},
{ key: 8, label: `C项电流(A)`, visible: false }, {key: 8, label: `C项电流(A)`, visible: false},
{ key: 9, label: `功率因数`, visible: false }, {key: 9, label: `功率因数`, visible: false},
{ key: 10, label: `正向有功(kW·h)`, visible: true }, {key: 10, label: `正向有功(kW·h)`, visible: true},
// { key: 11, label: `有功功率(KW)`, visible: true }, // { key: 11, label: `有功功率(KW)`, visible: true },
// { key: 12, label: `无功功率(Kvar)`, visible: true }, // { key: 12, label: `无功功率(Kvar)`, visible: true },
// { key: 13, label: `采集方式`, visible: true } // { key: 13, label: `采集方式`, visible: true }
], ],
// 表单校验
rules: {
userName: [
{ required: true, message: "用户名称不能为空", trigger: "blur" },
{ min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
],
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
],
password: [
{ required: true, message: "用户密码不能为空", trigger: "blur" },
{ min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
],
email: [
{
type: "email",
message: "请输入正确的邮箱地址",
trigger: ["blur", "change"]
}
],
phonenumber: [
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur"
}
]
}
}; };
}, },
watch: { watch: {
@ -287,7 +250,7 @@ export default {
}, },
getListtwo() { getListtwo() {
this.loading = true; this.loading = true;
instantLis( {monitorSubset: this.monitorIddata,sortOrder:"asc"}).then(response => { instantLis({monitorSubset: this.monitorIddata, sortOrder: "asc"}).then(response => {
this.userListtwo = response.rows; this.userListtwo = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -301,46 +264,45 @@ export default {
// }); // });
// }, // },
// //
tranListToTreeData(list) { tranListToTreeData(list) {
// 最终要产出的树状数据的数组 // 最终要产出的树状数据的数组
const treeList = [] const treeList = []
// 所有项都使用对象存储起来 // 所有项都使用对象存储起来
const map = {} const map = {}
// 建立一个映射关系：通过id快速找到对应的元素 // 建立一个映射关系：通过id快速找到对应的元素
list.forEach(item => { list.forEach(item => {
if (!item.children) { if (!item.children) {
item.children = [] item.children = []
} }
map[item.id] = item map[item.id] = item
}) })
list.forEach(item => { list.forEach(item => {
// 对于每一个元素来说，先找它的上级 // 对于每一个元素来说，先找它的上级
// 如果能找到，说明它有上级，则要把它添加到上级的children中去 // 如果能找到，说明它有上级，则要把它添加到上级的children中去
// 如果找不到，说明它没有上级，直接添加到 treeList // 如果找不到，说明它没有上级，直接添加到 treeList
const parent = map[item.pId] const parent = map[item.pId]
// 如果存在则表示item不是最顶层的数据 // 如果存在则表示item不是最顶层的数据
if (parent) { if (parent) {
parent.children.push(item) parent.children.push(item)
} else { } else {
// 如果不存在 则是顶层数据 // 如果不存在 则是顶层数据
treeList.push(item) treeList.push(item)
} }
}) })
// 返回出去 // 返回出去
return treeList return treeList
}, },
/** 真查询部门下拉树结构 */ /** 真查询部门下拉树结构 */
getDeptTree() { getDeptTree() {
treeDat().then(response => { treeDat().then(response => {
response.map((item,index)=>{ response.map((item, index) => {
item, item,
item.oid=item.id, item.oid = item.id,
item.lable = item.name item.lable = item.name
}) })
this.deptOptions = this.tranListToTreeData(response); this.deptOptions = this.tranListToTreeData(response);
console.log(this.deptOptions)
}); });
}, },
// 筛选节点 // 筛选节点
@ -364,43 +326,36 @@ export default {
this.opentwo = false; this.opentwo = false;
this.resettwo(); this.resettwo();
}, },
resettwo(){ resettwo() {
this.formadd={ this.formadd = {
monitorIds:[] monitorIds: []
} }
}, },
// 二次弹窗节点单击事件 // 二次弹窗节点单击事件
handleCheckChange(data, checked, indeterminat) { handleCheckChange(data, checked, indeterminat) {
console.log('data',data, checked, indeterminat); if (checked === false) {
// this.formadd.deptId = data.label; this.formadd.monitorIds.map((item, index) => {
//this.monitorIdslist.push(data.monitorId); if (data.monitorId == item) {
if(checked === false){
this.formadd.monitorIds.map((item,index)=>{
if(data.monitorId==item){
this.formadd.monitorIds.splice(index, 1) this.formadd.monitorIds.splice(index, 1)
} }
}) })
}else{ } else {
this.formadd.monitorIds.push(data.monitorId) ; this.formadd.monitorIds.push(data.monitorId);
} }
console.log('this.formadd.monitorIds',this.formadd.monitorIds)
// this.handleQuery();
}, },
//二次弹窗确认按钮 //二次弹窗确认按钮
submitFormtwo: function() { submitFormtwo: function () {
let paramsstr = this.formadd.monitorIds.join('+'); let paramsstr = this.formadd.monitorIds.join('+');
console.log('paramsstr',paramsstr); editMeterReading({monitorIds: paramsstr}).then(response => {
editMeterReading({monitorIds:paramsstr}).then(response => { if (response.msg === "操作成功") {
if(response.msg=== "操作成功"){
this.$message({ this.$message({
message: '一键秒表成功', message: '一键秒表成功',
type: 'success' type: 'success'
}); });
this.canceltwo(); this.canceltwo();
//this.getList(); //this.getList();
}else{ } else {
this.$message.error('一键秒表失败'); this.$message.error('一键秒表失败');
} }
}); });
@ -449,10 +404,10 @@ console.log('this.formadd.monitorIds',this.formadd.monitorIds)
handleExport() { handleExport() {
this.reset(); this.reset();
treeDat().then(response => { treeDat().then(response => {
response.map((item,index)=>{ response.map((item, index) => {
item, item,
item.oid=item.id, item.oid = item.id,
item.lable = item.name item.lable = item.name
}) })
this.deptOptionsselect = this.tranListToTreeData(response); this.deptOptionsselect = this.tranListToTreeData(response);
//this.deptOptionsselect = response.data; //this.deptOptionsselect = response.data;
@ -465,9 +420,10 @@ console.log('this.formadd.monitorIds',this.formadd.monitorIds)
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.tree { .tree {
width:220px; width: 220px;
::v-deep .el-tree-node {
white-space: normal;//关键代码!!!!!!!!! ::v-deep .el-tree-node {
white-space: normal; //关键代码!!!!!!!!!
.el-tree-node__content { .el-tree-node__content {
height: 100%; height: 100%;
align-items: start; align-items: start;

46
src/views/index.vue
Unescape Escape View File

@ -53,52 +53,6 @@
<QcChartLine :chart-data="qcChartLineData" ref="QcChartLine" /> <QcChartLine :chart-data="qcChartLineData" ref="QcChartLine" />
</div> </div>
</div> </div>
<!-- <el-row :gutter="20">
<el-col :sm="24" :lg="24">
<span style="font-size: 20px; margin: 40%; color: cadetblue">{{
titlename
}}</span>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<div style="border: 1px solid #cfdee4">
<line-chart :chart-data="lineChartData" ref="lineChart" />
</div>
</el-col>
</el-row> -->
<!--
<el-row :gutter="20">
<el-col :span="12">
<pie-chart ref="pieChart"/>
</el-col>
<el-col :span="12">
<pie-chart ref="pieChart2"/>
</el-col>
</el-row>-->
<!-- <el-row :gutter="20">
<el-col :span="12">
<span style="font-size: 18px; padding: 1% 39%; color: cadetblue"
>各线体设备月故障数</span
>
</el-col>
<el-col :span="12">
<span style="font-size: 18px; padding: 1% 39%; color: cadetblue"
>各车间生产不良率</span
>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<DeviceChartLine
:chart-data="deviceChartLineData"
ref="DeviceChartLine"
/>
</el-col>
<el-col :span="12">
<QcChartLine :chart-data="qcChartLineData" ref="QcChartLine" />
</el-col>
</el-row> -->
</div> </div>
</template> </template>

2
src/views/quality/qcInventory/index.vue
Unescape Escape View File

@ -391,6 +391,7 @@ export default {
getCheckTypes() { getCheckTypes() {
getCheckTypes('inventory').then(response => { getCheckTypes('inventory').then(response => {
this.checkTypes = response; this.checkTypes = response;
}); });
}, },
/**获取默认查询时间段**/ /**获取默认查询时间段**/
@ -495,6 +496,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.form.defects = this.defectTypeList; this.form.defects = this.defectTypeList;
this.form.checkType = 'checkTypeCC';
this.open = true; this.open = true;
this.title = "添加库存检验"; this.title = "添加库存检验";
}, },

25
src/views/quality/qcInventory/selectPutInOrder.vue
Unescape Escape View File

@ -27,6 +27,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!--
<el-form-item label="订单号"> <el-form-item label="订单号">
<el-input <el-input
v-model="queryParams.workorderCodeSap" v-model="queryParams.workorderCodeSap"
@ -35,6 +36,18 @@
style="width: 150px" style="width: 150px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item>
-->
<el-form-item label="入库时间">
<el-date-picker
v-model="queryParams.incomeTimeArray"
format="yyyy-MM-dd"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="仓库名称"> <el-form-item label="仓库名称">
<el-select v-model="queryParams.supplierCode" placeholder="请选择仓库" width="50%" clearable> <el-select v-model="queryParams.supplierCode" placeholder="请选择仓库" width="50%" clearable>
@ -82,7 +95,7 @@
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import moment from "moment/moment";
import { getPutInOrder,getWarehouseList } from "@/api/quality/income"; import { getPutInOrder,getWarehouseList } from "@/api/quality/income";
export default { export default {
name: "itemPutInOrder", name: "itemPutInOrder",
@ -112,7 +125,8 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
workorderCode: '' workorderCode: '',
incomeTimeArray: [],
}, },
selectionRow:{}, selectionRow:{},
cwarehouseList: [], cwarehouseList: [],
@ -127,7 +141,14 @@ export default {
/** 查询表格列表*/ /** 查询表格列表*/
getList() { getList() {
debugger
this.loading = true; this.loading = true;
if (this.queryParams.incomeTimeArray.length > 0) {
this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format("YYYY-MM-DD");
this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format("YYYY-MM-DD");
}
getPutInOrder(this.queryParams).then(response => { getPutInOrder(this.queryParams).then(response => {
this.itemList = response.rows; this.itemList = response.rows;
this.total = response.total; this.total = response.total;

3
src/views/quality/qcTableCPK/index.vue
Unescape Escape View File

@ -53,8 +53,7 @@
</el-form-item> </el-form-item>
<el-form-item label="CPK品类" prop="cpkType"> <el-form-item label="CPK品类" prop="cpkType">
<el-select <el-select v-model="queryParams.cpkType"
v-model="queryParams.cpkType"
placeholder="请选择品类" placeholder="请选择品类"
> >
<el-option <el-option

1008
src/views/wms/outorderTS/index.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save