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

解决冲突

Browse Source
This commit is contained in:
liushuai
2019-01-04 17:03:12 +08:00
parent af7a5b116b cf8c0ddc46
commit f4120aaa1c
15 changed files with 54 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/Inventory/InventoryManagement.js
View File

@@ -12,14 +12,14 @@ export function initWarehouse() {
})
}
// 增加仓库
export function addWarehouse(num0, num1, num2, num3, num4) {
export function addWarehouse(num0, num1, num2, num3, num4, num5) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_货位仓库_仓库_增加数据',
param: '仓库编号=' + num0 + '&仓库名称=' + num1 + '&仓库描述=' + num2 + '&地址=' + num3 + '&联系人=' + num4 + '&备注=' + num4
param: '仓库编号=' + num0 + '&仓库名称=' + num1 + '&仓库描述=' + num2 + '&地址=' + num3 + '&联系人=' + num4 + '&备注=' + num5
}
})
}

4
src/api/Inventory/OfflinePurchase.js
View File

@@ -74,14 +74,14 @@ export function addRequestCardDetail(data1, data2) {
})
}
// 请购单明细修改
export function alterNumber(data1, data2, data3) {
export function alterNumber(data2, data3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_离线请购单_请购单明细修改',
param: '离线请购单流水号=' + data1 + '&离线请购单明细流水号组=' + data2 + '&数量组=' + data3
param: '离线请购单明细流水号组=' + data2 + '&数量组=' + data3
}
})
}

4
src/api/Inventory/PartOut.js
View File

@@ -98,14 +98,14 @@ export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8,
})
}
// 交换出库
export function ExchangePartOut(data1, data2, data3, data4, data5) {
export function ExchangePartOut(data0, data1, data2, data3, data4, data5) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_交换件出库_修改数据',
param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
param: '交换单流水号=' + data0 + '&采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
}
})
}

4
src/api/ManufacturingCenter/ProcessPlanning.js
View File

@@ -209,8 +209,8 @@ export function gongyiCopy(num1, num2) {
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_工艺拷贝_工艺流水号',
param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int'
name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号',
param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int'
}
})
}

16
src/utils/request.js
View File

@@ -3,17 +3,17 @@ import axios from 'axios'
// import store from '../store'
// import { getToken } from '@/utils/auth'
export const wsuri = `ws://192.168.0.2:61101//WebMoudule//websocket`
export const wsuri = `ws://192.168.1.212:61101//WebMoudule//websocket`
export const name = `OP8888`
// 创建axios实例
export const readFile = `http://192.168.0.2:8411/webpage/file/` // invoice
export const readImg = `http://192.168.0.2:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `http://192.168.0.2:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://192.168.0.2:8411/submit/upload2.ashx` // delivery
export const upload3 = `http://192.168.0.2:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://192.168.0.2:8411/submit/uploadInvoiceScan.ashx` // invoice
export const download = `http://192.168.0.2:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const readFile = `http://192.168.1.212:8411/webpage/file/` // invoice
export const readImg = `http://192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `http://192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://192.168.1.212:8411/submit/upload2.ashx` // delivery
export const upload3 = `http://192.168.1.212:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice
export const download = `http://192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement
const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,

2
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -1734,6 +1734,7 @@ export default {
})
},
AlterNumber(row) {
this.form2 = []
this.project = row.项目流水号
this.machinenumber = row.机床流水号
this.partnumber = row.组件流水号
@@ -1752,6 +1753,7 @@ export default {
this.material = row.材料
},
AlterBasicNumber(row) {
this.form2 = []
this.project = row.项目流水号
this.machinenumber = row.机床流水号
this.partnumber = row.组件流水号

2
src/views/Inventory/OfflinePurchase/index.vue
View File

@@ -568,7 +568,7 @@ export default {
this.partGroup.push(this.tableData3[i].离线请购单明细流水号)
this.numGroup.push(this.tableData3[i].数量)
}
alterNumber(this.purchasecardnumber, this.partGroup, this.numGroup).then(response => {
alterNumber(this.partGroup, this.numGroup).then(response => {
if (response.data[0].result === '1') {
this.$message.success('请购单生成成功')
this.searchTable2()

5
src/views/Inventory/PartOut/index.vue
View File

@@ -289,10 +289,9 @@ export default {
// 查询交换单
searchExchange() {
ExchangeOut(this.pickingListNumberx).then(response => {
console.log(response.data, 2233455)
const data = response.data
for (let i = 0; i < data.length; i++) {
data[i].审批通过 === 0 ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].是否出库 === 1 ? data[i].是否禁用 = true : data[i].是否禁用 = false
}
this.tableDataExchange = data
})
@@ -364,7 +363,7 @@ export default {
this.dialogFormVisible = false
},
execExchangePartOut(row) {
ExchangePartOut(row.采购合同明细流水号, row.申请人, row.交换数量, row.被交换货位流水号, row.备注).then(response => {
ExchangePartOut(row.交换单流水号, row.被交换件采购合同明细流水号, row.申请人, row.交换数量, row.被交换货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.dialogFormVisible = false

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

@@ -5,13 +5,13 @@
<el-col :span="12">
<el-form label-width="270px" label-position="right" class="Time">
<el-form-item>
<el-form-item v-show="false">
<el-radio-group v-model="radio" size="small">
<el-radio :label="0">正常件投产</el-radio>
<el-radio :label="1">整改件投产</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="项目名称">
<el-form-item label="项目名称" style="margin-top:28px">
<el-select v-model="entryNameValue" filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
<el-option
v-for="item in entryName"

25
src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
View File

@@ -4,8 +4,8 @@
<span>零件号：</span>
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px"/>
<el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoadCjn('cjn')">导出工艺定额卡</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoadCjn1('cjn1')">导出加工路线单</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoaddek('dek')">导出工艺定额卡</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoadlxd('lxd')">导出加工路线单</el-button>
</el-card>
<el-card>
@@ -45,7 +45,7 @@
</div>
</el-card>
<el-card>
<table id="cjn" style="width: 975px;" border="2px" cellspacing="0px" align="center">
<table id="dek" style="width: 975px;" border="2px" cellspacing="0px" align="center">
<thead>
<tr height="25px">
<td colspan="4" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
@@ -238,7 +238,7 @@
</table>
</el-card>
<el-card>
<table id="cjn1" style="width: 800px;" border="2px" cellspacing="0px" align="center">
<table id="lxd" style="width: 800px;" border="2px" cellspacing="0px" align="center">
<thead>
<tr height="60px">
<td colspan="6" style="text-align:center;width: 33%">江苏高精机电<br>装备有限公司</td>
@@ -688,12 +688,12 @@ export default {
})
}
},
downLoadCjn(tableid) { // 下载工艺定额卡
downLoaddek(tableid) { // 下载工艺定额卡
getExplorer()
method5(tableid)
Cleanup()
},
downLoadCjn1(tableid) { // 下载零件加工路线单
downLoadlxd(tableid) { // 下载零件加工路线单
getExplorer()
method5(tableid)
Cleanup()
@@ -701,13 +701,7 @@ export default {
}
}
</script>
<style>
td{
width: 100px;
height: 30px;
text-align:center;
}
</style>
<style scoped>
span{
margin: 10px 0 10px 10px;
@@ -719,4 +713,9 @@ export default {
max-height: 250px;
overflow: auto;
}
td{
width: 100px;
height: 30px;
text-align:center;
}
</style>

22
src/views/ManufacturingCenter/ProcessPlanning/index.vue
View File

@@ -43,9 +43,10 @@
</el-select>
<el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询
</el-button>
<el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
</el-button>
<el-button v-show="!isShow2" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
</el-button>
<div v-show="isShow">
<span>种类:</span>
@@ -57,9 +58,8 @@
<el-button slot="prepend" icon="el-icon-search" @click="dialogMaterial=true"/>
<el-button slot="append" icon="el-icon-cjn-09" @click="saveMaterial"/>
</el-input>
<el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
<span>规格:</span>
<el-input v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
<el-input v-show="false" v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
<span>投产总数量:</span>
<el-input v-model="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
</div>
@@ -81,8 +81,6 @@
<el-input v-model="tolerance" size="small" style="width:150px" placeholder="公差"/>
<el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
<el-button-group v-if="isShow1" style="margin: 10px">
<el-button v-if="isShow1" type="info" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
</el-button>
<el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴</el-button>
<el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">典艺
</el-button>
@@ -90,7 +88,9 @@
</el-button>
<el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
</el-button>
<el-button :disabled="disabled" type="primary" size="small" icon="el-icon-cjn-09" @click="saveApprove">保存
<el-button v-if="isShow1" type="primary" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
</el-button>
<el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">保存
</el-button>
</el-button-group>
</el-row>
@@ -353,10 +353,9 @@
</el-col>
<el-col :span="10">
<el-form-item label="零件号">
<el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" @change="inputChange"/>
<el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" clearable @change="inputChange"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
@@ -834,6 +833,8 @@ export default {
},
WYbtn() { // 完艺按钮
this.tableData4 = []
this.tuhaoValue = ''
this.remark1 = ''
this.dialogFormVisible1 = true
},
selectPerson(row) { // 选择工艺员
@@ -1218,20 +1219,15 @@ export default {
.doing-row4 {
background: #f0f9eb;
}
.el-card {
margin-bottom: 15px;
}
.el-date-editor {
width: 150px
}
span {
margin: 10px 0 10px 10px;
}
</style>
<style>
.el-table .change {
background: oldlace;
}

3
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -47,8 +47,7 @@
<el-table
ref="multipleTable"
:data="tableData"
style="width: 100%;max-height: 440px;"
height="440"
style="width: 100%;height: 550px;"
highlight-current-row
border
@selection-change="handleSelectionChange">

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

@@ -201,11 +201,11 @@
{{ 机加工结束时间[scope.$index] }}
</template>
</el-table-column>
<el-table-column label="是否预计外协" align="center" width="110">
<template slot-scope="scope">
{{ 预计外协[scope.$index] }}
</template>
</el-table-column>
<!--<el-table-column label="是否预计外协" align="center" width="110">-->
<!--<template slot-scope="scope">-->
<!--{{ 预计外协[scope.$index] }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="零件加工计划进度（工艺名称、计划日期、工序工时）" align="">
<el-table-column label="[1]" align="center" width="120px">
<template slot-scope="scope">

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

@@ -969,11 +969,12 @@ export default {
this.useqrcode(row.离线合同流水号) // 显示二维码
}).then(() => {
const htmlNode = $('#offlineContract').html()
const body = $('body')
const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.removeAttr('style')
body.children().not('script').show()
body.children().not('#app').hide()
printNode.remove()

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

@@ -249,11 +249,12 @@ export default {
if (this.contractValue) {
// exportExcelMethod('print', '采购合同', '采购合同sheet1')
const htmlNode = $('#print').html()
const body = $('body')
const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.removeAttr('style')
body.children().not('script').show()
body.children().not('#app').hide()
printNode.remove()