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

fixed bug

Browse Source
This commit is contained in:
chenjianan
2019-05-16 08:20:54 +08:00
parent 0bf46d4138
commit acbdb79084
2 changed files with 14 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/utils/request.js
View File

@@ -8,16 +8,16 @@ export const name = `OP8888`
export const name1 = `OP1000` export const name1 = `OP1000`
// 创建axios实例 // 创建axios实例
export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice export const readFile = `http://localhost:8411/webpage/file/` // invoice
export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond export const readImg = `http://localhost:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement export const upload = `http://localhost:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery export const upload2 = `http://localhost:8411/submit/upload2.ashx` // delivery
export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond export const upload3 = `http://localhost:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice export const uploadInvoiceScan = `http://localhost:8411/submit/uploadInvoiceScan.ashx` // invoice
export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoiceScan1.ashx` // invoice(workshop) export const uploadInvoiceScan1 = `http://localhost:8411/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const download = `http://localhost:8411/submit/downloadFile.ashx` // ContractInformationManagement
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })

44
src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
View File

@@ -252,12 +252,12 @@
</el-table-column> </el-table-column>
<el-table-column prop="singleton" label="单件" width="100" align="center"> <el-table-column prop="singleton" label="单件" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.单件定额工时" :disabled="!scope.row.工艺名称" style="width:100%" placeholder="" @change="singleChange(scope.row)"/> <el-input v-model="scope.row.单件定额工时" style="width:100%" placeholder="" @change="singleChange(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Settlement" label="准结" width="100" align="center"> <el-table-column prop="Settlement" label="准结" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.准结定额工时" :disabled="!scope.row.工艺名称" style="width:100%" placeholder="" @change="readyChange(scope.row)"/> <el-input v-model="scope.row.准结定额工时" style="width:100%" placeholder="" @change="readyChange(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="300" align="center" fixed="right"> <el-table-column label="操作" width="300" align="center" fixed="right">
@@ -407,47 +407,16 @@
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px"> <el-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
<el-form ref="form1" :model="form1" label-position="left" label-width="140px" class="demo-ruleForm"> <el-form ref="form1" :model="form1" label-position="left" label-width="80px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="10">
<el-form-item label="工艺员">
<el-input v-model="CraftmanValue" clearable size="small" readonly style="width: 150px;">
<el-button slot="append" icon="el-icon-search" @click="dialogFormVisible3=true"/>
</el-input>
</el-form-item>
</el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="零件号"> <el-form-item label="零件号">
<el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" clearable @change="inputChange"/> <el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" clearable @change="inputChange"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="工艺定制开始日期"> <el-button size="small" type="success" icon="el-icon-search" @click="searchProcess1()">查询</el-button>
<el-date-picker <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
v-model="date01"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
size="small"
placeholder="选择开始日期"/>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="工艺定制结束日期">
<el-date-picker
v-model="date02"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
size="small"
placeholder="选择结束日期"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-button size="small" type="success" icon="el-icon-search" @click="searchProcess1()">查询
</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
@@ -473,9 +442,6 @@
<el-input v-model="remark1" size="small" readonly style="width: 150px;"/> <el-input v-model="remark1" size="small" readonly style="width: 150px;"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
</el-col>
</el-row> </el-row>
<el-table :data="tableData4" style="width: 97%;max-height: 250px;margin-top: 15px" size="mini" border height="250px"> <el-table :data="tableData4" style="width: 97%;max-height: 250px;margin-top: 15px" size="mini" border height="250px">
<el-table-column align="center" label="工艺序号" width="80"> <el-table-column align="center" label="工艺序号" width="80">