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

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

Browse Source
This commit is contained in:
liushuai
2019-01-04 20:50:03 +08:00
parent ec1727c693 89666b9283
commit b66b3cd65c
3 changed files with 201 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
<el-checkbox v-model="all" size="mini">查询全部</el-checkbox>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="downLoad('BL')">导出备料单</el-button>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportTable('BL')">导出备料单</el-button>
<el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">导出完成</el-button>
</el-row>
</el-card>
@@ -52,7 +52,8 @@
</div>
</el-card>
<table id="BL" border cellspacing="0px" style="table-layout: fixed; width: 600px;display: none">
<div v-show="false" id="BL">
<table border cellspacing="0px" style="table-layout: fixed; width: 600px;">
<colgroup>
<col style="width: 100px">
<col style="width: 150px">
@@ -73,6 +74,7 @@
<td>{{ list.工艺要求 }}</td>
</tr>
</table>
</div>
</div>
</template>
@@ -80,6 +82,7 @@
<script>
import { searchtable, searchtable2, edit } from '@/api/ManufacturingCenter/CreatePreparationBill'
import { exportExcelMethod } from './exportExcel'
import $ from 'jquery'
export default {
data() {
return {
@@ -99,6 +102,16 @@ export default {
this.searchTable()
},
methods: {
exportTable() {
const htmlNode = $('#BL').html()
const body = $('body')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().not('script').show()
printNode.remove()
},
// 查询表格数据
searchTable() {
this.loading = true

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

@@ -329,12 +329,13 @@
<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>
<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="confirmPrice">确定价格</el-button>
<el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 15px" @click="Deal">成交</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 15px" @click="downLoadRWD('RWD')">导出外协加工任务单</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 15px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
</div>
</el-card>
<el-card v-show="card">
<table id="RWD" cellspacing="0px" align="center" width="100%" style="">
<div id="RWD">
<table cellspacing="0px" align="center" width="100%" style="">
<tbody id="1">
<tr>
<td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>
@@ -398,6 +399,7 @@
</tr>
</tfoot>
</table>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
@@ -457,6 +459,7 @@ import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
import { convertCurrency } from '@/vendor/int2Chinese'
import { mapGetters } from 'vuex'
import elInput from 'element-ui/packages/input'
import $ from 'jquery'
export default {
components: {
@@ -574,6 +577,20 @@ export default {
this.getList()
},
methods: {
exportTable() {
if (this.List3.length === 0) {
this.$message.warning('暂无数据')
} else {
const htmlNode = $('#RWD').html()
const body = $('body')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().not('script').show()
printNode.remove()
}
},
fetchData() {
this.loading2 = true
var day3 = new Date(this.time)

29
src/views/Outsourcing/OutsourcingTaskQuery/index.vue
View File

@@ -15,7 +15,7 @@
size="small"
placeholder="选择日期"/>
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downLoadCjn('cjn')">导出外协加工任务单</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
</el-card>
<el-card>
@@ -77,7 +77,8 @@
</el-card>
<el-card>
<table id="cjn" cellspacing="0px" align="center" width="100%" style="">
<div id="RWD">
<table cellspacing="0px" align="center" width="100%" style="">
<tbody id="1">
<tr>
<td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>
@@ -141,6 +142,7 @@
</tr>
</tfoot>
</table>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
@@ -169,6 +171,7 @@ import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
import { convertCurrency } from '@/vendor/int2Chinese'
import { mapGetters } from 'vuex'
import elInput from 'element-ui/packages/input'
import $ from 'jquery'
export default {
components: {
@@ -288,6 +291,20 @@ export default {
this.getList()
},
methods: {
exportTable() {
if (this.List3.length === 0) {
this.$message.warning('暂无数据')
} else {
const htmlNode = $('#RWD').html()
const body = $('body')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().not('script').show()
printNode.remove()
}
},
shouhuo(row) {
this.$confirm('此操作将不可更改, 是否继续?', '提示', {
confirmButtonText: '确定',
@@ -460,7 +477,7 @@ export default {
}
this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
this.大写金额 = convertCurrency(this.总计)
// cjn end
// RWD end
if (response.data.length === 0) {
this.loading = false
}
@@ -762,7 +779,7 @@ export default {
if (response.data.length === 0) {
this.loading = false
}
// cjn end
// RWD end
if (response.data.length === 0) {
this.loading = false
}
@@ -886,7 +903,7 @@ export default {
}
this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
this.大写金额 = convertCurrency(this.总计)
// cjn end
// RWD end
if (response.data.length === 0) {
this.loading = false
}
@@ -1279,7 +1296,7 @@ export default {
this.$message.warning('请选择订单')
}
},
downLoadCjn(tableid) {
downLoadRWD(tableid) {
if (this.List3.length === 0) {
this.$message.warning('暂无数据')
} else {