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

as

Browse Source
This commit is contained in:
zhangdingyu
2019-09-29 11:20:31 +08:00
parent 1bffdccc77
commit 1f79de0e03
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -23,7 +23,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.103:8005/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.102:8005/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

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

@@ -9,7 +9,7 @@
<el-checkbox v-model="all" size="small">查询全部</el-checkbox> <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/> <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
<el-tooltip effect="dark" content="打印备料单" placement="top" open-delay="1200"> <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button> <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">

5
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -389,7 +389,7 @@
<td colspan="5" style="text-align: center;width: 35%">{{ 计划完成日期 }}</td> <td colspan="5" style="text-align: center;width: 35%">{{ 计划完成日期 }}</td>
</tr> </tr>
</table> </table>
<table cellspacing="0px" align="center" border="1 solid black" width="100%" style="margin-top: 20px"> <table cellspacing="0px" align="center" border="1 solid black" width="100%" style="margin-top: 0px">
<tr id="tablehead" style="height: 35px"> <tr id="tablehead" style="height: 35px">
<td style="text-align: center;width: 7%">序号</td> <td style="text-align: center;width: 7%">序号</td>
<td colspan="2" style="text-align: center;width: 20%">图号</td> <td colspan="2" style="text-align: center;width: 20%">图号</td>
@@ -397,7 +397,7 @@
<td colspan="2" style="text-align: center;width: 10%">材料</td> <td colspan="2" style="text-align: center;width: 10%">材料</td>
<td colspan="2" style="text-align: center;width: 8%">单位</td> <td colspan="2" style="text-align: center;width: 8%">单位</td>
<td colspan="2" style="text-align: center;width: 8%">数量</td> <td colspan="2" style="text-align: center;width: 8%">数量</td>
<td colspan="2" style="text-align: center;width: 20%">请购重量</td> <td colspan="2" style="text-align: center;width: 20%">成品尺寸（长、宽、高）</td>
<td style="text-align: center;width: 17%">备注</td> <td style="text-align: center;width: 17%">备注</td>
</tr> </tr>
<tr v-for="(list, index) in tableData3" :key="index" style="height: 35px"> <tr v-for="(list, index) in tableData3" :key="index" style="height: 35px">
@@ -423,6 +423,7 @@ import { initPartDrawing, searchPurchasedMaterials, searchPurchaseOrder, searchS
import QRCode from 'qrcode' import QRCode from 'qrcode'
import $ from 'jquery' import $ from 'jquery'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
name: '', // 采购计划 name: '', // 采购计划
data() { data() {