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
2018-12-29 12:12:07 +08:00
parent d441411fa9 7f61f3e091
commit afbc241d2d
5 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
index.html
View File

@@ -8,6 +8,31 @@
<body> <body>
<script src=<%= BASE_URL %>/tinymce4.7.5/tinymce.min.js></script> <script src=<%= BASE_URL %>/tinymce4.7.5/tinymce.min.js></script>
<div id="app"></div> <div id="app"></div>
<script>
if (window.console) {
console.log(`%c
_ooOoo_
o8888888o
88" . "88
(| -_- |)
O\\ = /O
____/\`---'\\____
.' \\\\| |// \`.
/ \\\\||| : |||// \\
/ _||||| -:- |||||- \\
| | \\\\\\ - /// | |
| \\_| ''\\---/'' | |
\\ .-\\__ \`-\` ___/-. /
___\`. .' /--.--\\ \`. . __
."" '< \`.___\\_<|>_/___.' >'"".
| | : \`- \\\`.;\`\\ _ /\`;.\`/ - \` : | |
\\ \\ \`-. \\_ __\\ /__ _/ .-\` / /
======\`-.____\`-.___\\_____/___.-\`____.-'======
\`=---='
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
佛祖保佑 永无BUG`, 'color:#fcaf17')
}
</script>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
</html> </html>

10
src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
View File

@@ -59,6 +59,7 @@ import { searchtable, searchtable2, edit, handlechange } from '@/api/Manufacturi
export default { export default {
data() { data() {
return { return {
num: 0,
arrest: [], arrest: [],
all: false, all: false,
partName: '', partName: '',
@@ -114,9 +115,12 @@ export default {
this.$message.warning('请选择零件') this.$message.warning('请选择零件')
} else { } else {
for (let i = 0; i < this.arrest.length; i++) { for (let i = 0; i < this.arrest.length; i++) {
edit(this.arrest[i].工艺计划流水号) edit(this.arrest[i].工艺计划流水号).then(() => {
handlechange(this.arrest[i].工序流水号, '0000') handlechange(this.arrest[i].工序流水号, '0000').then(response => {
if (i === this.arrest.length - 1) { this.num = this.num + response.data[0].result
})
})
if (this.num === this.arrest.length) {
this.searchTable() this.searchTable()
} }
} }

5
src/views/MarketingCenter/DeliveryManagement/index.vue
View File

@@ -255,7 +255,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="随即技术文件" name="third"> <el-tab-pane label="随机技术文件" name="third">
<el-table <el-table
v-loading="tableData3Loading" v-loading="tableData3Loading"
:data="tableData3" :data="tableData3"
@@ -1279,6 +1279,7 @@ export default {
this.invoiceNum = row.发货单编号 this.invoiceNum = row.发货单编号
this.DeliveryVisiable = true this.DeliveryVisiable = true
selectDelivery(this.invoiceNum).then(response => { selectDelivery(this.invoiceNum).then(response => {
console.log(response)
this.table = response.data this.table = response.data
this.装箱单名称 = response.data[0].装箱单名称 this.装箱单名称 = response.data[0].装箱单名称
this.发货单号 = response.data[0].发货单号 this.发货单号 = response.data[0].发货单号
@@ -1318,7 +1319,7 @@ export default {
const printNode = $(htmlNode) const printNode = $(htmlNode)
body.append(printNode) body.append(printNode)
window.print() window.print()
body.children().show() body.children().not('script').show()
printNode.remove() printNode.remove()
}, },
callOffDownLoadDelivery() { callOffDownLoadDelivery() {

5
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -143,7 +143,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.离线合同状态)===1" type="warning" size="small">编辑中</el-tag> <el-tag v-if="Number(scope.row.离线合同状态)===1" type="warning" size="small">编辑中</el-tag>
<el-tag v-if="Number(scope.row.离线合同状态)===2&&Number(scope.row.总采购数量)!==Number(scope.row.总到货数量)" type="primary" size="small">已采购</el-tag> <el-tag v-if="Number(scope.row.离线合同状态)===2&&Number(scope.row.总采购数量)!==Number(scope.row.总到货数量)" type="primary" size="small">已采购</el-tag>
<el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)" type="success" size="small">全部到货</el-tag> <el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)&&Number(scope.row.总采购数量)!==0" type="success" size="small">全部到货</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="离线合同编号" align="center" min-width="170"> <el-table-column label="离线合同编号" align="center" min-width="170">
@@ -755,6 +755,7 @@ export default {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('删除成功') this.$message.success('删除成功')
this.searchTable2() this.searchTable2()
this.disable = true
searchMateriel(this.offlineContractNum).then(response => { searchMateriel(this.offlineContractNum).then(response => {
this.tableData3 = response.data this.tableData3 = response.data
}) })
@@ -973,7 +974,7 @@ export default {
const printNode = $(htmlNode) const printNode = $(htmlNode)
body.append(printNode) body.append(printNode)
window.print() window.print()
body.children().show() body.children().not('script').show()
printNode.remove() printNode.remove()
}).catch(res => { }).catch(res => {
console.log(res) console.log(res)

2
src/views/PurchasingCenter/PurchaseContractSearch/index.vue
View File

@@ -254,7 +254,7 @@ export default {
const printNode = $(htmlNode) const printNode = $(htmlNode)
body.append(printNode) body.append(printNode)
window.print() window.print()
body.children().show() body.children().not('script').show()
printNode.remove() printNode.remove()
} else { } else {
this.$message.error('请选择合同') this.$message.error('请选择合同')