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

57
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-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-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-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-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">导出完成</el-button>
</el-row> </el-row>
</el-card> </el-card>
@@ -52,27 +52,29 @@
</div> </div>
</el-card> </el-card>
<table id="BL" border cellspacing="0px" style="table-layout: fixed; width: 600px;display: none"> <div v-show="false" id="BL">
<colgroup> <table border cellspacing="0px" style="table-layout: fixed; width: 600px;">
<col style="width: 100px"> <colgroup>
<col style="width: 150px"> <col style="width: 100px">
<col style="width: 450px"> <col style="width: 150px">
</colgroup> <col style="width: 450px">
<tr> </colgroup>
<th height="60px">GAOJING</th> <tr>
<th colspan="2" height="60px"><span style="font-weight:bold">备料单</span></th> <th height="60px">GAOJING</th>
</tr> <th colspan="2" height="60px"><span style="font-weight:bold">备料单</span></th>
<tr> </tr>
<td align="center">零件名称</td> <tr>
<td align="center">零件图号</td> <td align="center">零件名称</td>
<td align="center">备料</td> <td align="center">零件图号</td>
</tr> <td align="center">备料</td>
<tr v-for="(list, index) in tableData2" :key="index"> </tr>
<td align="center">{{ list.零件名称 }}</td> <tr v-for="(list, index) in tableData2" :key="index">
<td align="center">{{ list.零件图号 }}</td> <td align="center">{{ list.零件名称 }}</td>
<td>{{ list.工艺要求 }}</td> <td align="center">{{ list.零件图号 }}</td>
</tr> <td>{{ list.工艺要求 }}</td>
</table> </tr>
</table>
</div>
</div> </div>
</template> </template>
@@ -80,6 +82,7 @@
<script> <script>
import { searchtable, searchtable2, edit } from '@/api/ManufacturingCenter/CreatePreparationBill' import { searchtable, searchtable2, edit } from '@/api/ManufacturingCenter/CreatePreparationBill'
import { exportExcelMethod } from './exportExcel' import { exportExcelMethod } from './exportExcel'
import $ from 'jquery'
export default { export default {
data() { data() {
return { return {
@@ -99,6 +102,16 @@ export default {
this.searchTable() this.searchTable()
}, },
methods: { 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() { searchTable() {
this.loading = true this.loading = true

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

@@ -329,75 +329,77 @@
<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="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-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="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> </div>
</el-card> </el-card>
<el-card v-show="card"> <el-card v-show="card">
<table id="RWD" cellspacing="0px" align="center" width="100%" style=""> <div id="RWD">
<tbody id="1"> <table cellspacing="0px" align="center" width="100%" style="">
<tr> <tbody id="1">
<td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td> <tr>
<td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">外协加工任务单</td> <td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>
</tr> <td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">外协加工任务单</td>
<tr class="tbodyHead"> </tr>
<td colspan="2">任务单号:</td> <tr class="tbodyHead">
<td colspan="6">{{ 任务单号 }}</td> <td colspan="2">任务单号:</td>
<td colspan="4">任务下达日期:</td> <td colspan="6">{{ 任务单号 }}</td>
<td colspan="4">{{ 任务下达日期 }}</td> <td colspan="4">任务下达日期:</td>
<td colspan="3">外协厂家:</td> <td colspan="4">{{ 任务下达日期 }}</td>
<td colspan="9">{{ 外协厂家 }}</td> <td colspan="3">外协厂家:</td>
</tr> <td colspan="9">{{ 外协厂家 }}</td>
<tr class="tbodyHead"> </tr>
<td colspan="2">外协员:</td> <tr class="tbodyHead">
<td colspan="6">{{ 外协员 }}</td> <td colspan="2">外协员:</td>
<td colspan="2">电话:</td> <td colspan="6">{{ 外协员 }}</td>
<td colspan="6">{{ 外协员电话 }}</td> <td colspan="2">电话:</td>
<td colspan="3">联系人:</td> <td colspan="6">{{ 外协员电话 }}</td>
<td colspan="3">{{ 联系人 }}</td> <td colspan="3">联系人:</td>
<td colspan="2">电话:</td> <td colspan="3">{{ 联系人 }}</td>
<td colspan="4">{{ 联系人电话 }}</td> <td colspan="2">电话:</td>
</tr> <td colspan="4">{{ 联系人电话 }}</td>
<tr id="tableHead"> </tr>
<td style="width: 2%">序号</td> <tr id="tableHead">
<td colspan="5">零件图号</td> <td style="width: 2%">序号</td>
<td colspan="2" style="width: 4%">零件名称</td> <td colspan="5">零件图号</td>
<td colspan="2" style="width: 2%">数量</td> <td colspan="2" style="width: 4%">零件名称</td>
<td colspan="9" width="30%">内容</td> <td colspan="2" style="width: 2%">数量</td>
<td colspan="1">零件类型</td> <td colspan="9" width="30%">内容</td>
<td>外协类别</td> <td colspan="1">零件类型</td>
<td>加工价格</td> <td>外协类别</td>
<td>材料价格</td> <td>加工价格</td>
<td>其他价格</td> <td>材料价格</td>
<td colspan="2">计划开始</td> <td>其他价格</td>
<td colspan="2">计划结束</td> <td colspan="2">计划开始</td>
</tr> <td colspan="2">计划结束</td>
</tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr id="tableFoot"> <tr id="tableFoot">
<td>费用</td> <td>费用</td>
<td colspan="17" style="text-align: left;">加工费：￥{{ 加工价格合计 }}元；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元；人民币大写：{{ 大写金额 }}</td> <td colspan="17" style="text-align: left;">加工费：￥{{ 加工价格合计 }}元；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元；人民币大写：{{ 大写金额 }}</td>
<td colspan="1">0</td> <td colspan="1">0</td>
<td colspan="1"/> <td colspan="1"/>
<td/> <td/>
<td>{{ 加工价格合计 }}</td> <td>{{ 加工价格合计 }}</td>
<td>{{ 材料价格合计 }}</td> <td>{{ 材料价格合计 }}</td>
<td>{{ 其他价格合计 }}</td> <td>{{ 其他价格合计 }}</td>
<td colspan="2">{{ 最早时间 }}</td> <td colspan="2">{{ 最早时间 }}</td>
<td colspan="2">{{ 最晚时间 }}</td> <td colspan="2">{{ 最晚时间 }}</td>
</tr> </tr>
<tr class="foot"> <tr class="foot">
<td colspan="4">外协员:</td> <td colspan="4">外协员:</td>
<td colspan="4">外协科长:</td> <td colspan="4">外协科长:</td>
<td colspan="4">采购二部长:</td> <td colspan="4">采购二部长:</td>
<td colspan="4">制品部长:</td> <td colspan="4">制品部长:</td>
<td colspan="4">定额科统计员:</td> <td colspan="4">定额科统计员:</td>
<td colspan="4">定额科长:</td> <td colspan="4">定额科长:</td>
<td colspan="4">外协厂:</td> <td colspan="4">外协厂:</td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
</div>
</el-card> </el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px"> <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 { convertCurrency } from '@/vendor/int2Chinese'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import elInput from 'element-ui/packages/input' import elInput from 'element-ui/packages/input'
import $ from 'jquery'
export default { export default {
components: { components: {
@@ -574,6 +577,20 @@ export default {
this.getList() this.getList()
}, },
methods: { 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() { fetchData() {
this.loading2 = true this.loading2 = true
var day3 = new Date(this.time) var day3 = new Date(this.time)

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

@@ -15,7 +15,7 @@
size="small" size="small"
placeholder="选择日期"/> 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="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>
<el-card> <el-card>
@@ -77,70 +77,72 @@
</el-card> </el-card>
<el-card> <el-card>
<table id="cjn" cellspacing="0px" align="center" width="100%" style=""> <div id="RWD">
<tbody id="1"> <table cellspacing="0px" align="center" width="100%" style="">
<tr> <tbody id="1">
<td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td> <tr>
<td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">外协加工任务单</td> <td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>
</tr> <td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">外协加工任务单</td>
<tr class="tbodyHead"> </tr>
<td colspan="2">任务单号:</td> <tr class="tbodyHead">
<td colspan="6">{{ 任务单号 }}</td> <td colspan="2">任务单号:</td>
<td colspan="4">任务下达日期:</td> <td colspan="6">{{ 任务单号 }}</td>
<td colspan="4">{{ 任务下达日期 }}</td> <td colspan="4">任务下达日期:</td>
<td colspan="3">外协厂家:</td> <td colspan="4">{{ 任务下达日期 }}</td>
<td colspan="9">{{ 外协厂家 }}</td> <td colspan="3">外协厂家:</td>
</tr> <td colspan="9">{{ 外协厂家 }}</td>
<tr class="tbodyHead"> </tr>
<td colspan="2">外协员:</td> <tr class="tbodyHead">
<td colspan="6">{{ 外协员 }}</td> <td colspan="2">外协员:</td>
<td colspan="2">电话:</td> <td colspan="6">{{ 外协员 }}</td>
<td colspan="6">{{ 外协员电话 }}</td> <td colspan="2">电话:</td>
<td colspan="3">联系人:</td> <td colspan="6">{{ 外协员电话 }}</td>
<td colspan="3">{{ 联系人 }}</td> <td colspan="3">联系人:</td>
<td colspan="2">电话:</td> <td colspan="3">{{ 联系人 }}</td>
<td colspan="4">{{ 联系人电话 }}</td> <td colspan="2">电话:</td>
</tr> <td colspan="4">{{ 联系人电话 }}</td>
<tr id="tableHead"> </tr>
<td style="width: 2%">序号</td> <tr id="tableHead">
<td colspan="5">零件图号</td> <td style="width: 2%">序号</td>
<td colspan="2" style="width: 4%">零件名称</td> <td colspan="5">零件图号</td>
<td colspan="2" style="width: 2%">数量</td> <td colspan="2" style="width: 4%">零件名称</td>
<td colspan="9" width="30%">内容</td> <td colspan="2" style="width: 2%">数量</td>
<td colspan="1">零件类型</td> <td colspan="9" width="30%">内容</td>
<td>外协类别</td> <td colspan="1">零件类型</td>
<td>加工价格</td> <td>外协类别</td>
<td>材料价格</td> <td>加工价格</td>
<td>其他价格</td> <td>材料价格</td>
<td colspan="2">计划开始</td> <td>其他价格</td>
<td colspan="2">计划结束</td> <td colspan="2">计划开始</td>
</tr> <td colspan="2">计划结束</td>
</tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr id="tableFoot"> <tr id="tableFoot">
<td>费用</td> <td>费用</td>
<td colspan="17" style="text-align: left;">加工费：￥{{ 加工价格合计 }}元；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元；人民币大写：{{ 大写金额 }}</td> <td colspan="17" style="text-align: left;">加工费：￥{{ 加工价格合计 }}元；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元；人民币大写：{{ 大写金额 }}</td>
<td colspan="1">0</td> <td colspan="1">0</td>
<td colspan="1"/> <td colspan="1"/>
<td/> <td/>
<td>{{ 加工价格合计 }}</td> <td>{{ 加工价格合计 }}</td>
<td>{{ 材料价格合计 }}</td> <td>{{ 材料价格合计 }}</td>
<td>{{ 其他价格合计 }}</td> <td>{{ 其他价格合计 }}</td>
<td colspan="2">{{ 最早时间 }}</td> <td colspan="2">{{ 最早时间 }}</td>
<td colspan="2">{{ 最晚时间 }}</td> <td colspan="2">{{ 最晚时间 }}</td>
</tr> </tr>
<tr class="foot"> <tr class="foot">
<td colspan="4">外协员:</td> <td colspan="4">外协员:</td>
<td colspan="4">外协科长:</td> <td colspan="4">外协科长:</td>
<td colspan="4">采购二部长:</td> <td colspan="4">采购二部长:</td>
<td colspan="4">制品部长:</td> <td colspan="4">制品部长:</td>
<td colspan="4">定额科统计员:</td> <td colspan="4">定额科统计员:</td>
<td colspan="4">定额科长:</td> <td colspan="4">定额科长:</td>
<td colspan="4">外协厂:</td> <td colspan="4">外协厂:</td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
</div>
</el-card> </el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px"> <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 { convertCurrency } from '@/vendor/int2Chinese'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import elInput from 'element-ui/packages/input' import elInput from 'element-ui/packages/input'
import $ from 'jquery'
export default { export default {
components: { components: {
@@ -288,6 +291,20 @@ export default {
this.getList() this.getList()
}, },
methods: { 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) { shouhuo(row) {
this.$confirm('此操作将不可更改, 是否继续?', '提示', { this.$confirm('此操作将不可更改, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@@ -460,7 +477,7 @@ export default {
} }
this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费 this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
this.大写金额 = convertCurrency(this.总计) this.大写金额 = convertCurrency(this.总计)
// cjn end // RWD end
if (response.data.length === 0) { if (response.data.length === 0) {
this.loading = false this.loading = false
} }
@@ -762,7 +779,7 @@ export default {
if (response.data.length === 0) { if (response.data.length === 0) {
this.loading = false this.loading = false
} }
// cjn end // RWD end
if (response.data.length === 0) { if (response.data.length === 0) {
this.loading = false this.loading = false
} }
@@ -886,7 +903,7 @@ export default {
} }
this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费 this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
this.大写金额 = convertCurrency(this.总计) this.大写金额 = convertCurrency(this.总计)
// cjn end // RWD end
if (response.data.length === 0) { if (response.data.length === 0) {
this.loading = false this.loading = false
} }
@@ -1279,7 +1296,7 @@ export default {
this.$message.warning('请选择订单') this.$message.warning('请选择订单')
} }
}, },
downLoadCjn(tableid) { downLoadRWD(tableid) {
if (this.List3.length === 0) { if (this.List3.length === 0) {
this.$message.warning('暂无数据') this.$message.warning('暂无数据')
} else { } else {