meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

页面采购查询分页

Browse Source
This commit is contained in:
bryan sun
2020-01-09 16:02:17 +08:00
parent ee622cd57c
commit 01a5a27d69
4 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/request.js
View File

@@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const url = `http://192.168.0.107:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http:/192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel export const ExcelDownLoad = 'http://192.168.0.107:8079/submit/downloadFile.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段 // 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.107:8079/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

30
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -23,7 +23,7 @@
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button> <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
</el-card> </el-card>
<el-row> <el-row>
<el-col style="width: 40%"> <el-col style="width: 37%">
<el-card> <el-card>
<el-table <el-table
:data="tableData1" :data="tableData1"
@@ -36,7 +36,7 @@
border border
@current-change="getRow"> @current-change="getRow">
<el-table-column type="index" label="序号" width="50"/> <el-table-column type="index" label="序号" width="50"/>
<el-table-column align="center" label="工艺名" show-overflow-tooltip width="70"> <el-table-column align="center" label="工艺名" show-overflow-tooltip min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
@@ -56,11 +56,11 @@
{{ scope.row.操作者 }} {{ scope.row.操作者 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="排产日期" width="95"> <!-- <el-table-column align="center" label="排产日期" width="95">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
{{ scope.row.排产日期 }} <!-- {{ scope.row.排产日期 }}-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column align="center" label="完成日期" width="95"> <el-table-column align="center" label="完成日期" width="95">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.完成日期 }} {{ scope.row.完成日期 }}
@@ -69,7 +69,7 @@
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>
<el-col style="width: 60%"> <el-col style="width: 63%">
<el-card> <el-card>
<el-table <el-table
:data="tableData" :data="tableData"
@@ -80,16 +80,16 @@
border border
height="630" height="630"
@current-change="getCurrentRow"> @current-change="getCurrentRow">
<el-table-column type="index" align="center" label="序号" width="80"> <el-table-column type="index" align="center" label="跟单号" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio :label="scope.row.序号" v-model="radio"/> <el-radio :label="scope.row.跟单号" v-model="radio"/>
</template>
</el-table-column>
<el-table-column align="center" label="跟单号" width="80">
<template slot-scope="scope">
{{ scope.row.跟单号 }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="跟单号" width="80">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.跟单号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="零件图号" show-overflow-tooltip width="200"> <el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}

8
src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
View File

@@ -37,7 +37,7 @@
{{ scope.row.设备总工时 }} {{ scope.row.设备总工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="录入准结工时" align="center" width="100px"> <el-table-column label="录入准结" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.修补准结总工时 }} {{ scope.row.修补准结总工时 }}
</template> </template>
@@ -66,7 +66,7 @@
<el-col :span="15"> <el-col :span="15">
<el-card> <el-card>
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中"> <el-table v-loading="loading2" :data="tableData2" size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip> <el-table-column label="零件图号" align="center" width="135px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
@@ -96,12 +96,12 @@
{{ scope.row.设备工时 }} {{ scope.row.设备工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="录入准结工时" align="center" width="100px"> <el-table-column label="录入准结" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.修补准结工时 }} {{ scope.row.修补准结工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加工时间" align="center" width="135px"> <el-table-column label="加工时间" align="center" width="115px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.操作时间 }} {{ scope.row.操作时间 }}
</template> </template>

10
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -233,21 +233,23 @@
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
</el-table> </el-table>
<div class="block"> <div class="block" style="display: inline-block;">
<el-pagination <el-pagination
:current-page="pageCurrent11" :current-page="pageCurrent11"
:page-sizes="[10, 50, 100, 150]" :page-sizes="[10, 50, 100, 150]"
:page-size="pageSize11" :page-size="pageSize11"
:total="total11" :total="total11"
style="display:inline-block;width:50px" style="display:inline-block;width:50px"
layout="total" layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange11" @size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/> @current-change="handleCurrentChange11"/>
</div>
<div style="display: inline-block; float: left">
<el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
<el-button <el-button
type="warning" type="warning"
size="small" size="small"
style="margin: 0px 20px" style="margin: 0px 20px; display: inline-block;"
@click="addInquirySheet">选入物料</el-button> @click="addInquirySheet">选入物料</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
@@ -1188,7 +1190,7 @@ export default {
tableData11: [], // 外购件列表 tableData11: [], // 外购件列表
total11: 0, total11: 0,
pageCurrent11: 1, pageCurrent11: 1,
pageSize11: 1000, pageSize11: 50,
tableData12: [], // 基本件列表 tableData12: [], // 基本件列表
total12: 0, total12: 0,
pageCurrent12: 1, pageCurrent12: 1,