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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liulujia@meswork.com
2020-02-05 18:31:41 +08:00
parent 9d4d389ed1 ce72eec588
commit b3d7495132
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip
View File

Binary file not shown.

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

@@ -39,7 +39,7 @@ export function searchTable(num1, num2, num3, num4, num5, num6, check, num7, pag
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新',
name: '车间生产管理工艺_序间外协_查询零件',
param: '项目流水号_check=' + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&组件流水号_check=' + num5 + '&组件流水号=' + num6 + '&零件图号_check=' + check + '&零件图号=' + num7 + '&考核状态_check=0&考核状态=0&单件是否外协_check=1&单件是否外协=1&时间=0&机加工开始时间=0&机加工结束时间=0&零件类型=0',
Pagination: pageCurrent + '&' + pageSize
}

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

@@ -43,6 +43,14 @@
<el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>
</el-tooltip>
<!--<<<<<<< HEAD-->
<!--&lt;!&ndash;<<<<<<< HEAD&ndash;&gt;-->
<!--&lt;!&ndash; &lt;!&ndash; <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;=======&ndash;&gt;-->
<!--&lt;!&ndash; &lt;!&ndash;<el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&gt;>>>>>> d828757fc0d137c09d0339446a35ae8651355ce7&ndash;&gt;-->
<!--=======-->
<!--&gt;>>>>>> 75e884a0fca545b1a478c0a0dcaf498a46cbe009-->
</div>
</el-card>
<el-row>
@@ -73,7 +81,7 @@
</el-table-column>
<el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="100">
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
{{ scope.row.合同签订日期.substring(0,10) }}
</template>
</el-table-column>
<el-table-column align="center" label="合同信息备注" min-width="150">

21
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -21,7 +21,7 @@
</el-select>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:150px"/>
<el-button size="small" icon="el-icon-search" type="primary" plain @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button>
<el-table v-loading="loading1" :data="tableData1" size="mini" highlight-current-row height="550px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName2" size="mini" highlight-current-row height="550px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column label="零件图号" prop="零件图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -235,6 +235,12 @@ export default {
return 'XJWXywc'
}
},
tableData1ClassName2({ row, rowIndex }) {
row.index = rowIndex
if (row.状态 === 1 || row.状态 === '1') {
return 'XJWXwx'
}
},
// 修改外协状态
edit(index, row) {
this.count = 0
@@ -245,21 +251,20 @@ export default {
}
}
if (this.count === this.tableData2.length) {
this.tableData1[this.index2].状态 = 0
edit2(row.工序流水号, row.工艺计划流水号, 0)
}
if (this.checkBox[index] === true) {
this.InOut = 2
this.tableData2[this.index].工序间是否外协 = 2
this.tableData1[this.index2].状态 = 1
edit(row.工序流水号, this.InOut).then(response => {
edit2(row.工序流水号, row.工艺计划流水号, 1).then(response => {
this.tableData2[this.index].工序间是否外协 = 2
this.tableData1[this.index2].工序间是否外协 = 2
})
edit2(row.工序流水号, row.工艺计划流水号, 1)
})
} else {
this.InOut = 1
edit(row.工序流水号, this.InOut).then(response => {
this.tableData2[this.index].工序间是否外协 = 1
})
this.tableData2[this.index].工序间是否外协 = 1
edit(row.工序流水号, this.InOut)
}
},
// 保存行价格