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

更新

Browse Source
This commit is contained in:
liushuai
2020-04-27 18:59:18 +08:00
parent 7a2db4cdf5
commit b3138148f6
9 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/utils/request.js
View File

@@ -8,26 +8,26 @@ export const name1 = `OP1000`
export const name3 = `OP2000` export const name3 = `OP2000`
export const name4 = `OP9999` export const name4 = `OP9999`
export const readFile = `http://123.56.95.229:8010/webpage/file/` // invoice export const readFile = `http://123.56.95.229:58010/webpage/file/` // invoice
export const readImg = `http://123.56.95.229:8010/webpage/img/` // delivery/MS/performancebond export const readImg = `http://123.56.95.229:58010/webpage/img/` // delivery/MS/performancebond
export const upload = `http://123.56.95.229:8010/submit/uploadFile.ashx` // ContractInformationManagement export const upload = `http://123.56.95.229:58010/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://123.56.95.229:8010/submit/upload2.ashx` // delivery export const upload2 = `http://123.56.95.229:58010/submit/upload2.ashx` // delivery
export const upload3 = `http://123.56.95.229:8010/submit/upload3.ashx` // performancebond export const upload3 = `http://123.56.95.229:58010/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://123.56.95.229:8010/submit/uploadInvoiceScan.ashx` // invoice export const uploadInvoiceScan = `http://123.56.95.229:58010/submit/uploadInvoiceScan.ashx` // invoice
export const uploadInvoiceScan1 = `http://123.56.95.229:8010/submit/uploadInvoiceScan1.ashx` // invoice(workshop) export const uploadInvoiceScan1 = `http://123.56.95.229:58010/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` // ContractInformationManagement export const download = `http://123.56.95.229:58010/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx` export const uploadPerson = `http://123.56.95.229:58010/submit/uploadPerson.ashx`
export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx` export const uploadOP = `http://123.56.95.229:58010/submit/uploadOP.ashx`
export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const url = `http://123.56.95.229:58010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESCommonBase.ashx' // 导出excel export const ExcelDownLoad = 'http://123.56.95.229:58010/submit/MESCommonBase.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段 // 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://123.56.95.229:8010/webpage/file/` export const ServerIP = `http://123.56.95.229:58010/webpage/file/`
export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const uploadFileMachine = `http://123.56.95.229:58010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 export const downloadFileMachine = `http://123.56.95.229:58010/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231
export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx` export const MESUploadFile = `http://123.56.95.229:58010/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://123.56.95.229:58010/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`, baseURL: `http://123.56.95.229:58010/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })

4
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -287,7 +287,7 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" prop="备注" align="center" min-width="130px"> <el-table-column label="机床" prop="备注" align="center" min-width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料单备注 }} {{ scope.row.领料单备注 }}
</template> </template>
@@ -378,7 +378,7 @@
</el-table-column> </el-table-column>
<el-table-column min-width="150" align="center" label="领料时间"> <el-table-column min-width="150" align="center" label="领料时间">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.操作日期 }} {{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column min-width="100" align="center" label="数量" prop="出库数量"> <el-table-column min-width="100" align="center" label="数量" prop="出库数量">

2
src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
View File

@@ -9,7 +9,7 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span style="margin-left: 0">审核时间:</span> <span style="margin-left: 0">提交时间:</span>
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
size="small" size="small"

10
src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
View File

@@ -84,11 +84,21 @@
{{ scope.row.报废时间 }} {{ scope.row.报废时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="报废人" width="85px">
<template slot-scope="scope">
{{ scope.row.报废人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废原因" width="100px" show-overflow-tooltip> <el-table-column align="center" label="报废原因" width="100px" show-overflow-tooltip>
<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="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废备注" width="140px" show-overflow-tooltip> <el-table-column align="center" label="报废备注" width="140px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备注 }} {{ scope.row.备注 }}

2
src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
View File

@@ -16,7 +16,7 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span style="margin-left: 0">审核时间:</span> <span style="margin-left: 0">提交时间:</span>
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
size="small" size="small"

13
src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
View File

@@ -46,6 +46,7 @@
style="width: 1390px; margin: 3px 0" style="width: 1390px; margin: 3px 0"
size="mini" size="mini"
border border
stripe
highlight-current-row highlight-current-row
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
@@ -106,16 +107,16 @@
{{ scope.row.不合格原因文本 }} {{ scope.row.不合格原因文本 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="处理结果" align="center"> <el-table-column label="处理结果" align="center" width="100px">
<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">--> <el-table-column label="操作人员" align="center">
<!--<template slot-scope="scope">--> <template slot-scope="scope">
<!--{{ scope.row.不合格处理文本 }}--> {{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
<!--</template>--> </template>
<!--</el-table-column>--> </el-table-column>
<el-table-column label="报废工时(分)" align="center" width="110"> <el-table-column label="报废工时(分)" align="center" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.报废工时 }} {{ scope.row.报废工时 }}

8
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -63,7 +63,7 @@
{{ scope.row.项目名称 }} {{ scope.row.项目名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="120px"> <el-table-column align="center" label="项目创建日期" prop="合同签订日期" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同签订日期.substring(0,10) }} {{ scope.row.合同签订日期.substring(0,10) }}
</template> </template>
@@ -128,8 +128,8 @@
</el-col> </el-col>
</el-row> </el-row>
<!--新增合同信息对话框--> <!--新增合同信息对话框-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px"> <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="450px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm"> <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="140px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目名称" prop="EntryName"> <el-form-item label="项目名称" prop="EntryName">
@@ -137,7 +137,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目下达日期" prop="contractSigningDate"> <el-form-item label="项目创建日期" prop="contractSigningDate">
<el-date-picker <el-date-picker
v-model="form.contractSigningDate" v-model="form.contractSigningDate"
style="width: 200px" style="width: 200px"

4
src/views/PurchasingCenter/PurchaseContractReview/index.vue
View File

@@ -38,7 +38,7 @@
<!-- </el-card>--> <!-- </el-card>-->
<el-card> <el-card>
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 60%;" height="210px" highlight-current-row @row-click="searchTable2"> <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 70%;" height="210px" highlight-current-row @row-click="searchTable2">
<!-- <el-table-column type="expand" label="详情">--> <!-- <el-table-column type="expand" label="详情">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-form id="table" label-position="left" inline class="demo-table-expand">--> <!-- <el-form id="table" label-position="left" inline class="demo-table-expand">-->
@@ -100,7 +100,7 @@
{{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '-' }} {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="100" fixed="right"> <el-table-column label="操作" align="center" min-width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button> <el-button type="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
<el-button type="text" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button> <el-button type="text" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>

3
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -98,7 +98,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="利用库存数" width="100px"> <el-table-column align="center" label="利用库存数" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.使用库存数 || '—' }} {{ scope.row.使用库存数 ? scope.row.使用库存数 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="采购数量" width="100px"> <el-table-column align="center" label="采购数量" width="100px">
@@ -695,6 +695,7 @@ export default {
零件数量: response.data.result[i].零件数量, 零件数量: response.data.result[i].零件数量,
数量: response.data.result[i].数量, 数量: response.data.result[i].数量,
离线采购数量: response.data.result[i].离线采购数量, 离线采购数量: response.data.result[i].离线采购数量,
使用库存数: response.data.result[i].使用库存数,
已到货数量: response.data.result[i].已到货数量, 已到货数量: response.data.result[i].已到货数量,
离线到货数量: response.data.result[i].离线到货数量, 离线到货数量: response.data.result[i].离线到货数量,
供应商名称: response.data.result[i].供应商名称, 供应商名称: response.data.result[i].供应商名称,