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

02-11

Browse Source
This commit is contained in:
zhangdingyu
2019-02-11 10:18:47 +08:00
parent d7e8fab01c
commit 39787dcea3
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/Outsourcing/OutsourcingTaskExecution.js
View File

@@ -1,6 +1,6 @@
import request from '@/utils/request' import request from '@/utils/request'
// 初始化获取已生成的外协加工任务单初始化获取已生成的外协加工任务单 // 初始化获取已生成的外协加工任务单
export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize) { export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize) {
return request({ return request({
url: '', url: '',

2
src/utils/request.js
View File

@@ -19,7 +19,7 @@ const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间

5
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -24,7 +24,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="分组"> <el-form-item label="分组">
<el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组"> <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组" @change="total = 0;pageSize = 10;pageList = 1;getTable()">
<el-option <el-option
v-for="item in Num" v-for="item in Num"
:key="item.value" :key="item.value"
@@ -321,7 +321,7 @@
<el-col :span="14"/> <el-col :span="14"/>
<el-form-item > <el-form-item >
<el-button size="small" @click="callOff('form')">取消</el-button> <el-button size="small" @click="callOff('form')">取消</el-button>
<el-button size="small" type="primary" @click="submit('form')">确 定</el-button> <el-button size="small" type="primary" @click="submit('form')">确定</el-button>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
@@ -531,6 +531,7 @@ export default {
this.tableData = [] this.tableData = []
this.tableData1 = [] this.tableData1 = []
getTable(this.NumValue, this.pageList, this.pageSize).then(response => { getTable(this.NumValue, this.pageList, this.pageSize).then(response => {
console.log(this.NumValue, this.pageList, this.pageSize)
this.total = parseInt(response.data.total) this.total = parseInt(response.data.total)
for (let i = 0; i < response.data.rows.length; i++) { for (let i = 0; i < response.data.rows.length; i++) {
this.tableData.push({ this.tableData.push({

3
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -1436,7 +1436,8 @@ export default {
handleSelectionChange(val) { handleSelectionChange(val) {
this.processNum = val this.processNum = val
}, },
getSpareParts() { // 选入零件 // 选入零件
getSpareParts() {
if (this.Number !== null) { if (this.Number !== null) {
this.result = 0 this.result = 0
for (let i = 0; i < this.processNum.length; i++) { for (let i = 0; i < this.processNum.length; i++) {