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-12-27 09:12:01 +08:00
parent 1cedb5e5c7 5a063d752d
commit d30942c89e
12 changed files with 233 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,14 +49,14 @@ export function searchdata(entryNameValue_check, entryNameValue, machineToolValu
}) })
} }
// 自制件出库 // 自制件出库
export function warehousing(processPlanSerialNumber, leader, remarks) { export function warehousing(processPlanSerialNumber, outgoingQuantity, leader, remarks) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '自制件出库_循环执行_新', name: '自制件出库_循环执行_新',
param: '工艺计划流水号组=' + processPlanSerialNumber + '&考勤编号=' + leader + '&出库备注=' + remarks param: '工艺计划流水号组=' + processPlanSerialNumber + '&出库数量组=' + outgoingQuantity + '&考勤编号=' + leader + '&出库备注=' + remarks
} }
}) })
} }

2
src/api/ManufacturingCenter/DiscardedPartsInquiry.js
View File

@@ -41,7 +41,7 @@ export function searchTable(entryValue, machineValue, check2, GroupNumValue, che
data: { data: {
type: '1', type: '1',
name: '车间生产管理工艺_传递后_零件报废补投_查询数据_综合查询', name: '车间生产管理工艺_传递后_零件报废补投_查询数据_综合查询',
param: '项目流水号_check=1&项目流水号=' + entryValue + '&机床流水号_check=1&机床流水号=' + machineValue + '&组件流水号_check=' + check2 + '&组件流水号=' + GroupNumValue + '&组件零件基本件流水号_check=0&工艺计划流水号_check=0&工艺计划流水号_补投前_check=0&零件图号_check=' + check3 + '&零件图号=' + PartDrawingNumber, param: '项目流水号_check=0&项目流水号=' + entryValue + '&机床流水号_check=1&机床流水号=' + machineValue + '&组件流水号_check=' + check2 + '&组件流水号=' + GroupNumValue + '&组件零件基本件流水号_check=0&工艺计划流水号_check=0&工艺计划流水号_补投前_check=0&零件图号_check=' + check3 + '&零件图号=' + PartDrawingNumber,
pagination: pageCurrent + '&' + pageSize pagination: pageCurrent + '&' + pageSize
} }
}) })

33
src/api/MarketingCenter/ContractCapitalManagement.js
View File

@@ -43,6 +43,39 @@ export function searchTable2(num1) {
} }
}) })
} }
export function updateMoney(num1, money) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '基础表_合同资金表明细_编辑数据',
param: '资金明细ID=' + num1 + '&金额=' + money
}
})
}
export function addMoney(num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '基础表_合同资金表明细_增加数据',
param: '资金ID=' + num1
}
})
}
export function deleteMoney(num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '基础表_合同资金表明细_删除数据',
param: '资金明细ID=' + num1
}
})
}
export function editBatchCapitalChar(num1, num2, num3, num4) { export function editBatchCapitalChar(num1, num2, num3, num4) {
return request({ return request({
url: '', url: '',

2
src/utils/request.js
View File

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.0.103:8074/submit/MESCommonBase.ashx`, baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

149
src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
View File

@@ -2,39 +2,39 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-row> <el-row>
<el-select v-model="entryNameValue" placeholder="项目名称" style="width:150px;margin: 10px 10px 0px 10px" size="small" clearable filterable @change="SearchMachine"> <!-- <el-select v-model="entryNameValue" placeholder="项目名称" style="width:150px;margin: 10px 10px 0px 10px" size="small" clearable filterable @change="SearchMachine">-->
<el-option <!-- <el-option-->
v-for="item in entryName" <!-- v-for="item in entryName"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :label="item.label"-->
:value="item.value"/> <!-- :value="item.value"/>-->
</el-select> <!-- </el-select>-->
<el-select v-model="machineToolValue" placeholder="机床号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px" @change="searchGroupList"> <!-- <el-select v-model="machineToolValue" placeholder="机床号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px" @change="searchGroupList">-->
<el-option <!-- <el-option-->
v-for="item in machineTool" <!-- v-for="item in machineTool"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :label="item.label"-->
:value="item.value"/> <!-- :value="item.value"/>-->
</el-select> <!-- </el-select>-->
<el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable style="width: 100px;margin: 10px 10px 0px 10px"> <!-- <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable style="width: 100px;margin: 10px 10px 0px 10px">-->
<el-option <!-- <el-option-->
v-for="item in groupNumber" <!-- v-for="item in groupNumber"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :label="item.label"-->
:value="item.value"/> <!-- :value="item.value"/>-->
</el-select> <!-- </el-select>-->
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px"/> <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 180px;margin: 10px 10px 0px 10px"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
<el-button type="primary" size="small" style="margin: 15px 0 0 10px" @click="wareHousing">出库</el-button> <el-button type="primary" size="small" style="margin: 15px 0 0 10px" @click="wareHousing">出库</el-button>
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>
<el-table :data="tableData" style="width: 760px" height="580" stripe size="mini" border @selection-change="handleSelectionChange"> <el-table :data="tableData" style="width: 1020px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
<el-table-column <el-table-column
type="selection" type="selection"
width="45"/> width="45"/>
<el-table-column align="center" label="序号" type="index" width="55px"/> <el-table-column align="center" label="序号" type="index" width="55px"/>
<el-table-column align="center" label="机床图号" width="110px"> <el-table-column align="center" label="机床图号" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
@@ -54,11 +54,26 @@
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="数量" width="50px"> <el-table-column align="center" label="库存数量" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.批次数量 }} {{ scope.row.出库数量1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="已出库数量" width="90px">
<template slot-scope="scope">
{{ scope.row.已出库数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="出库数量" width="140px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.出库数量" :max="scope.row.出库数量1" :min="0" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="入库数量" width="80px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.入库数量 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="状态" width="80px">--> <!-- <el-table-column align="center" label="状态" width="80px">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-tag v-if="scope.row.考核状态 === '8'">入库</el-tag>--> <!-- <el-tag v-if="scope.row.考核状态 === '8'">入库</el-tag>-->
@@ -89,7 +104,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="领料人" prop="领料人" label-width="100px" size="small"> <el-form-item label="领料人" prop="领料人" label-width="100px" size="small">
<el-select v-model="form.name" placeholder="请选择领料人" size="small" clearable style="width: 200px;"> <el-select v-model="form.name" placeholder="请选择领料人" size="small" filterable clearable style="width: 200px;">
<el-option <el-option
v-for="item in leaders" v-for="item in leaders"
:key="item.value" :key="item.value"
@@ -97,9 +112,9 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="人员编号" prop="leader" label-width="100px" size="small"> <!-- <el-form-item label="人员编号" prop="leader" label-width="100px" size="small">-->
<el-input v-model="form.leader" size="small" placeholder="请输入人员编号" style="width: 200px"/> <!-- <el-input v-model="form.leader" size="small" placeholder="请输入人员编号" style="width: 200px"/>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible=false">取消</el-button> <el-button @click="dialogFormVisible=false">取消</el-button>
@@ -138,6 +153,9 @@ export default {
rules: { rules: {
leader: [{ required: true, message: '请输入' }] leader: [{ required: true, message: '请输入' }]
}, },
shuzu: [],
keyichuku: 1,
outgoingQuantity: [],
departments: [], // 部门 departments: [], // 部门
leaders: [] // 领料人 leaders: [] // 领料人
} }
@@ -148,12 +166,27 @@ export default {
}, },
methods: { methods: {
searchData() { searchData() {
this.tableData = []
const entryNameValue_check = this.entryNameValue === '' || this.entryNameValue === null ? 0 : 1 const entryNameValue_check = this.entryNameValue === '' || this.entryNameValue === null ? 0 : 1
const machineToolValue_check = this.machineToolValue === '' || this.machineToolValue === null ? 0 : 1 const machineToolValue_check = this.machineToolValue === '' || this.machineToolValue === null ? 0 : 1
const groupNumberValue_check = this.groupNumberValue === '' ? 0 : 1 const groupNumberValue_check = this.groupNumberValue === '' ? 0 : 1
const partNumber_check = this.partNumber === '' || this.partNumber === null ? 0 : 1 const partNumber_check = this.partNumber === '' || this.partNumber === null ? 0 : 1
searchdata(entryNameValue_check, this.entryNameValue, machineToolValue_check, this.machineToolValue, groupNumberValue_check, this.groupNumberValue, partNumber_check, this.partNumber, this.pageCurrent, this.pageSize).then(response => { searchdata(entryNameValue_check, this.entryNameValue, machineToolValue_check, this.machineToolValue, groupNumberValue_check, this.groupNumberValue, partNumber_check, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
this.tableData = response.data.rows if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData.push({
机床图号: response.data.rows[i].机床图号,
组号: response.data.rows[i].组号,
零件图号: response.data.rows[i].零件图号,
零件名称: response.data.rows[i].零件名称,
已出库数量: Number(response.data.rows[i].出库数量),
入库数量: Number(response.data.rows[i].入库数量),
工艺计划流水号: response.data.rows[i].工艺计划流水号,
出库数量: Number(response.data.rows[i].入库数量) - Number(response.data.rows[i].出库数量),
出库数量1: Number(response.data.rows[i].入库数量) - Number(response.data.rows[i].出库数量)
})
}
}
this.total = response.data.total this.total = response.data.total
}) })
}, },
@@ -220,8 +253,8 @@ export default {
} }
}, // 入库 }, // 入库
wareHousing() { wareHousing() {
console.log(this.multipleSelection, 121212) console.log(this.shuzu, 121212)
if (this.multipleSelection.length === 0) { if (this.shuzu.length === 0) {
this.$message.warning('请勾选出库物料') this.$message.warning('请勾选出库物料')
} else { } else {
this.selectDepartment() this.selectDepartment()
@@ -230,26 +263,42 @@ export default {
} }
}, // 多选 }, // 多选
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = [] this.shuzu = []
val.map(v => { this.shuzu = val
this.multipleSelection.push(v.工艺计划流水号) // val.map(v => {
}) // this.multipleSelection.push(v.工艺计划流水号)
// this.outgoingQuantity.push(v.出库数量)
// })
}, },
CHUKU() { CHUKU() {
console.log(this.form.name, 909090, this.form.leader) this.keyichuku = 1
if (Number(this.form.leader) === Number(this.form.name)) { this.multipleSelection = []
warehousing(this.multipleSelection, this.form.leader, this.remarks).then(response => { this.outgoingQuantity = []
if (response.data[0].result === '1') { this.shuzu.map(v => {
this.$message.success('出库成功') if (v.出库数量 !== 0) {
this.dialogFormVisible = false this.multipleSelection.push(v.工艺计划流水号)
this.searchData() this.outgoingQuantity.push(v.出库数量)
} else { } else {
this.$message.error('出库失败') this.keyichuku = 0
this.dialogFormVisible = false }
} })
}) if (this.keyichuku === 1) {
if (this.form.name === '') {
this.$message.error('请选择领料人')
} else {
warehousing(this.multipleSelection, this.outgoingQuantity, this.form.name, this.remarks).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.dialogFormVisible = false
this.searchData()
} else {
this.$message.error('出库失败')
this.dialogFormVisible = false
}
})
}
} else { } else {
this.$message.error('人员编号错误') this.$message.error('请选择正确的出库数量')
} }
}, },
handleSizeChange(val) { handleSizeChange(val) {

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

@@ -21,7 +21,7 @@
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<span>机床图号:</span> <span>机床图号:</span>
<el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px; width: 150px" size="small" clearable @change="machineChange"> <el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px; width: 150px" size="small" filterable clearable @change="machineChange">
<el-option <el-option
v-for="item in machineName" v-for="item in machineName"
:key="item.value" :key="item.value"
@@ -326,6 +326,7 @@ export default {
this.check3 = 0 this.check3 = 0
} }
searchTable(this.entryNameValue, this.machineValue, this.check2, this.GroupNumValue, this.check3, this.PartDrawingNumber, this.pageCurrent, this.pageSize).then(response => { searchTable(this.entryNameValue, this.machineValue, this.check2, this.GroupNumValue, this.check3, this.PartDrawingNumber, this.pageCurrent, this.pageSize).then(response => {
console.log(response.data)
this.tableData = response.data.rows this.tableData = response.data.rows
this.total = response.data.total this.total = response.data.total
this.listLoading = false this.listLoading = false

0
src/views/ManufacturingCenter/Enter0therData/index.vue Normal file
View File

1
src/views/ManufacturingCenter/ManHourAnalysis/index.vue
View File

@@ -142,6 +142,7 @@ export default {
this.search2() this.search2()
this.search4() this.search4()
this.search5() this.search5()
this.search6()
}, },
methods: { methods: {
fetchData() { fetchData() {

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

@@ -69,7 +69,7 @@
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>
<el-col style="width: 670px"> <el-col style="width: 810px">
<el-card> <el-card>
<el-table <el-table
:data="tableData" :data="tableData"
@@ -90,7 +90,7 @@
{{ scope.row.跟单号 }} {{ scope.row.跟单号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件图号" show-overflow-tooltip width="130"> <el-table-column align="center" label="零件图号" show-overflow-tooltip width="180">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>

1305
src/views/MarketingCenter/ContractCapitalManagement/index.vue
View File

File diff suppressed because it is too large Load Diff

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

@@ -542,7 +542,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商名称" prop="供应商名称"> <el-form-item label="供应商名称" prop="供应商流水号">
<el-select v-model="form2.供应商流水号" style="width:150px" placeholder="供应商" size="small" filterable> <el-select v-model="form2.供应商流水号" style="width:150px" placeholder="供应商" size="small" filterable>
<el-option <el-option
v-for="item in supplierNames" v-for="item in supplierNames"
@@ -785,7 +785,7 @@ export default {
rules2: { // 离线合同表单验证规则 rules2: { // 离线合同表单验证规则
离线合同编号: [{ required: true, message: '请填写离线合同编号' }], 离线合同编号: [{ required: true, message: '请填写离线合同编号' }],
离线合同名称: [{ required: true, message: '请填写离线合同名称' }], 离线合同名称: [{ required: true, message: '请填写离线合同名称' }],
供应商名称: [{ required: true, message: '请选择供应商' }], 供应商流水号: [{ required: true, message: '请选择供应商' }],
规定到货时间: [{ required: true, message: '请选择规定到货时间' }], 规定到货时间: [{ required: true, message: '请选择规定到货时间' }],
运费: [{ required: true, message: '请填写运费' }], 运费: [{ required: true, message: '请填写运费' }],
付款方式: [{ required: true, message: '请选择付款方式' }] 付款方式: [{ required: true, message: '请选择付款方式' }]
@@ -1116,7 +1116,7 @@ export default {
if (numGroup1.indexOf(this.form2.离线合同编号) !== -1) { if (numGroup1.indexOf(this.form2.离线合同编号) !== -1) {
this.$message.error('该离线合同编号已存在') this.$message.error('该离线合同编号已存在')
} else { } else {
addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商名称, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => { addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商流水号, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('新建离线合同成功') this.$message.success('新建离线合同成功')
this.offlineContract = this.form2.离线合同编号 this.offlineContract = this.form2.离线合同编号

6
src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<el-card> <el-card>
<span>项目名称</span> <span>项目名称</span>
<el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small" style="width: 185px"> <el-select v-model="projectValue" placeholder="请选择项目名称" clearable filterable size="small" style="width: 185px">
<el-option <el-option
v-for="item in project" v-for="item in project"
:key="item.value" :key="item.value"
@@ -10,7 +10,7 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>机床图号</span> <span>机床图号</span>
<el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small" style="width: 185px"> <el-select v-model="machineValue" placeholder="请选择机床图号" clearable filterable size="small" style="width: 185px">
<el-option <el-option
v-for="item in machine" v-for="item in machine"
:key="item.value" :key="item.value"
@@ -18,7 +18,7 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>组号</span> <span>组号</span>
<el-select v-model="groupValue" placeholder="请选择组号" filterable size="small" style="width: 100px"> <el-select v-model="groupValue" placeholder="请选择组号" clearable filterable size="small" style="width: 100px">
<el-option <el-option
v-for="item in group" v-for="item in group"
:key="item.value" :key="item.value"