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-12 12:49:13 +08:00
parent 17d72c3eae
commit 49f4eccd99
11 changed files with 152 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/PurchasingCenter/CreateInquirySheet.js
View File

@@ -88,27 +88,27 @@ export function changeNum(num, num1, num2, num3, num4) {
})
}
// 查询分配后的标准件和外购件
export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10, check8, val11) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_创建询价单',
param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}&供货商_check=${check8}&供货商=${val11}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 查询分配后的基本件
export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10, check8, val11) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_采购部采购_查询物料_基本件_分配后_创建询价单',
param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}&供货商_check=${check8}&供货商=${val11}`,
Pagination: pageCurrent + '&' + pageSize
}
})

4
src/api/PurchasingCenter/CreatePurchaseContract.js
View File

@@ -18,7 +18,7 @@ export function initSupplier11(num) {
data: {
type: '3',
name: ` SELECT distinct 供应商流水号,供应商名称
FROM 采购管理_询价单_视图
FROM 采购管理_询价单_视图_新
where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and (是否未通过 is null or 是否未通过 <> 1) and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}`
}
})
@@ -30,7 +30,7 @@ export function searchInquirySheet(check2, value2, check3, id, check4, supplier)
method: 'post',
data: {
type: '1',
name: '采购管理_询价单_查询数据',
name: '采购管理_询价单_查询数据_创建合同',
param: `询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}`
}
})

19
src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
View File

@@ -26,14 +26,14 @@ export function addMateriel2(num1, num2) {
})
}
// 保存重量和备注
export function saveWeight(num1, num2, num3, num4, num5, num6, num7) {
export function saveWeight(num1, num2, num3, num4, num8) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '备料管理_采购计划明细_保存重量和备注_9745',
param: `采购计划流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&零件图号=${num5}&材料=${num6}&零件名称=${num7}`
param: `采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&采购数量=${num8}`
}
})
}
@@ -124,15 +124,26 @@ export function searchMateriel(num) {
}
})
}
export function searchMateriel1(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_采购计划明细_查询数据_新',
param: `采购计划流水号=${num}`
}
})
}
// 增加采购计划明细
export function addMateriel(num1, num2) {
export function addMateriel(num1, num2, num3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '备料管理_采购计划明细_增加数据',
param: `采购计划流水号=${num1}&工艺计划流水号组=${num2}`
param: `采购计划流水号=${num1}&工艺计划流水号组=${num2}&数量组=${num3}`
}
})
}

21
src/views/Inventory/StockInquiry/index.vue
View File

@@ -210,21 +210,9 @@ export default {
getTableData() {
this.listLoading1 = true
this.listLoading2 = true
if (this.Machine === '') {
this.checkbox_Machine = 0
} else {
this.checkbox_Machine = 1
}
if (this.Group === '') {
this.checkbox_Group = 0
} else {
this.checkbox_Group = 1
}
if (this.number === '') {
this.checkbox_number = 0
} else {
this.checkbox_number = 1
}
this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
this.tableData1 = []
this.tableData0 = []
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
@@ -249,10 +237,13 @@ export default {
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.pageCurrent0 = 1
this.pageSize0 = val
this.getTableData()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.pageCurrent0 = val
this.getTableData()
}
}

73
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -47,6 +47,7 @@
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="materialName" placeholder="名称规格" size="small" style="width:120px" clearable @keyup.enter.native="searchTable11()"/>
<el-input v-model="supplierName" placeholder="供货商" size="small" style="width:120px" clearable/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option
v-for="item in machine"
@@ -78,8 +79,7 @@
range-separator="～"
style="width:250px"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="timeChange1()"/>
end-placeholder="结束日期"/>
<el-popover v-model="visible1" placement="top" width="140">
<div style="text-align: right; margin: 0">
<el-select v-model="PersonValue" style="width:100px" placeholder="人员" size="small" filterable clearable>
@@ -109,7 +109,7 @@
</el-row>
<el-row>
<el-table
v-loading=""
v-loading="loading"
:data="tableData11"
:row-class-name="tableRowClassName"
border
@@ -263,6 +263,7 @@
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="partNum" placeholder="图号名称规格" size="small" clearable @keyup.enter.native="searchTable12()"/>
<el-input v-model="supplierName" placeholder="供货商" size="small" style="width:120px" clearable/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option
v-for="item in machine"
@@ -290,8 +291,7 @@
range-separator="～"
style="width:250px"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="timeChange2()"/>
end-placeholder="结束日期"/>
<el-button type="success" size="small" style="float: right" @click="visible2 = false;tiaozheng2()">调整采购任务</el-button>
<el-select v-model="PersonValue" style="width:100px;float: right" placeholder="人员" size="small" filterable clearable>
<el-option
@@ -318,7 +318,7 @@
</el-row>
<el-row style="margin-bottom: 10px">
<el-table
v-loading=""
v-loading="loading"
:data="tableData12"
:row-class-name="tableRowClassName2"
border
@@ -1090,7 +1090,7 @@
</template>
<script>
import { timeSearch, timeChange1, timeChange2, tiaozheng2, tiaozheng1, getPerson, getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
import { tiaozheng2, tiaozheng1, getPerson, getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, getExport1, getExport2, searchMerge, changeNum } from '@/api/PurchasingCenter/CreateInquirySheet'
import { mapGetters } from 'vuex'
@@ -1102,8 +1102,9 @@ export default {
name: '', // 创建询价单
data() {
return {
startTime: [],
endTime: [],
startTime: '',
endTime: '',
loading: false,
标准件和外购件流水号: [],
基本件流水号: [],
visible: false,
@@ -1299,7 +1300,7 @@ export default {
}
},
created() {
this.timeSearch()
// this.timeSearch()
this.getPerson()
this.fetchData()
this.projectChange()
@@ -1315,13 +1316,13 @@ export default {
}, 500)
},
methods: {
timeSearch() {
timeSearch().then(response => {
this.startTime = [response.data[0].外购件开始时间, response.data[0].外购件结束时间]
this.endTime = [response.data[0].基本件开始时间, response.data[0].基本件结束时间]
this.searchTable11()
})
},
// timeSearch() {
// timeSearch().then(response => {
// this.startTime = [response.data[0].外购件开始时间, response.data[0].外购件结束时间]
// this.endTime = [response.data[0].基本件开始时间, response.data[0].基本件结束时间]
// this.searchTable11()
// })
// },
changeNumber(row) {
changeNum(row.物料流水号, row.使用库存数, row.机床流水号, row.组件零件流水号, row.零件数量).then(response => {
if (response.data[0].result === '1') {
@@ -1356,16 +1357,16 @@ export default {
}
})
},
timeChange1() {
if (this.startTime) {
timeChange1(this.startTime[0], this.startTime[1])
}
},
timeChange2() {
if (this.endTime) {
timeChange2(this.endTime[0], this.endTime[1])
}
},
// timeChange1() {
// if (this.startTime) {
// timeChange1(this.startTime[0], this.startTime[1])
// }
// },
// timeChange2() {
// if (this.endTime) {
// timeChange2(this.endTime[0], this.endTime[1])
// }
// },
Jump() {
window.location.hash = '#PurchasingCenter/CreateInquirySheet'
},
@@ -1747,15 +1748,17 @@ export default {
return row['供货商'].trim() === value
},
searchTable11() { // 查询外购件列表
let check1, check2, check3, check4, check5, check6, check7
this.loading = true
let check1, check2, check3, check4, check5, check6, check7, check8
this.materialName ? check1 = 1 : check1 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
this.projectValue ? check4 = 1 : check4 = 0
this.projectValue ? check4 = 0 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
searchMaterial(this.pageCurrent11, this.pageSize11, 3, check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => {
this.supplierName ? check8 = 1 : check8 = 0
searchMaterial(this.pageCurrent11, this.pageSize11, 3, check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1], check8, this.supplierName).then(response => {
this.tableData11 = response.data.rows
this.total11 = response.data.total
const remark = []
@@ -1774,6 +1777,7 @@ export default {
this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
}
})
this.loading = false
})
},
handleSizeChange11(val) { // 标准件和外购件列表分页
@@ -1786,15 +1790,17 @@ export default {
this.searchTable11()
},
searchTable12() { // 查询基本件列表
let check1, check2, check3, check4, check5, check6, check7
this.loading = true
let check1, check2, check3, check4, check5, check6, check7, check8
this.partNum ? check1 = 1 : check1 = 0
this.partName ? check2 = 1 : check2 = 0
this.partSpec ? check3 = 1 : check3 = 0
this.projectValue ? check4 = 1 : check4 = 0
this.projectValue ? check4 = 0 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
searchPart(this.pageCurrent12, this.pageSize12, 3, check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
this.supplierName ? check8 = 1 : check8 = 0
searchPart(this.pageCurrent12, this.pageSize12, 3, check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1], check8, this.supplierName).then(response => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []
@@ -1809,6 +1815,7 @@ export default {
this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
}
})
this.loading = false
})
},
handleSizeChange12(val) { // 基本件列表分页

7
src/views/PurchasingCenter/CreatePurchaseContract/index.vue
View File

@@ -56,7 +56,7 @@
<el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" placeholder="其他说明" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-row>
<el-table :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary tooltip-effect="dark">
<el-table v-loading="loading" :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary tooltip-effect="dark">
<el-table-column label="序号" align="center" width="50" type="index"/>
<el-table-column label="机床图号" align="center" min-width="100">
<template slot-scope="scope">
@@ -152,7 +152,7 @@
<div v-show="false">{{ content }}</div>
<!--富文本编辑器-->
<div v-show="!preview" id="tinymce" style="height:850px;">
<tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto"/>
<tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;pointer-events: none"/>
</div>
<!--网页预览-->
<div v-show="preview" class="editor-content" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="content"/>
@@ -174,6 +174,7 @@ export default {
data() {
return {
isShowN: false,
loading: false,
supplierValue11: '', // 供应商查询条件
supplier11: [],
quickChangePrice: true,
@@ -463,6 +464,7 @@ export default {
}
},
contractChange() { // 选择合同select
this.loading = true
searchContractHeader(this.contractNumValue).then(response => {
this.deliveryDate = response.data[0].交货日期
this.invoiceInfo = response.data[0].开票信息
@@ -515,6 +517,7 @@ export default {
备注: response.data[i].备注
})
}
this.loading = false
})
},
demoChange() { // 模板change

52
src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue
View File

@@ -24,6 +24,46 @@
<el-card>
<div id="myChart" style="width: 1000px; height: 570px; margin: auto"/>
</el-card>
<el-card style="width: 650px">
<el-table
:data="tableData"
highlight-current-row
border
stripe
size="mini"
style="width: 100%"
height="460">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column
label="采购合同编号"
align="center"
width="140px">
<template slot-scope="scope">{{ scope.row.采购合同编号 }}</template>
</el-table-column>
<el-table-column
label="采购用时"
align="center"
width="80px">
<template slot-scope="scope">{{ scope.row.平均采购时间 }}</template>
</el-table-column>
<el-table-column
label="平均分配日期"
width="170"
align="center">
<template slot-scope="scope">{{ scope.row.平均分配日期 }}</template>
</el-table-column>
<el-table-column
label="合同生成日期"
align="center"
width="170">
<template slot-scope="scope">{{ scope.row.合同生成日期 }}</template>
</el-table-column>
</el-table>
</el-card>
</div>
</template>
@@ -37,35 +77,30 @@ export default {
date2: ''
}
},
mounted() {},
methods: {
getTableData() {
async getTableData() {
this.tableData = []
getData(this.date1, this.date2).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData.push({
采购合同流水号: response.data[i].采购合同流水号,
采购合同编号: response.data[i].采购合同编号,
合同生成日期: response.data[i].操作日期,
合同生成日期: response.data[i].操作时间,
平均分配日期: '',
平均采购时间: ''
})
}
this.getTableData1(this.tableData)
}).then(() => {
this.drawLine()
})
setTimeout(this.drawLine, 2000)
},
getTableData1(row) {
console.log(row, 1)
for (let i = 0; i < row.length; i++) {
getData1(row[i].采购合同流水号).then(response => {
console.log(response.data, 2)
this.tableData[i].平均分配日期 = response.data[0].平均分配日期
this.tableData[i].平均采购时间 = response.data[0].平均采购时间
})
}
console.log(this.tableData, 3)
},
// 绘制图形
drawLine() {
@@ -73,6 +108,7 @@ export default {
const xData = []
const lineData = []
for (let i = 0; i < this.tableData.length; i++) {
console.log(this.tableData[i].采购合同编号)
xData.push(this.tableData[i].采购合同编号)
lineData.push(this.tableData[i].平均采购时间)
}

38
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -165,9 +165,9 @@
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="50">
<el-table-column label="数量" align="center" width="115">
<template slot-scope="scope">
{{ scope.row.总数量 }}
<el-input-number :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.采购数量" :min="0" size="mini" style="width: 100%" @change="saveWeight(scope.$index, scope.row)"/>
</template>
</el-table-column>
<el-table-column label="成品尺寸（长、宽、高）" align="center" min-width="120px">
@@ -284,7 +284,7 @@
<td colspan="2" style="text-align: center;width: 20%">成品尺寸（长、宽、高）</td>
<td style="text-align: center;width: 17%">备注</td>
</tr>
<tr v-for="(list, index) in tableData3" :key="index" style="height: 35px">
<tr v-for="(list, index) in tableData4" :key="index" style="height: 35px">
<td style="text-align: center;width: 7%">{{ index + 1 }}</td>
<td colspan="2" style="text-align: center;width: 20%">{{ list.物料零件编码 }}</td>
<td colspan="2" style="text-align: center;width: 10%">{{ list.零件名称 }}</td>
@@ -302,7 +302,7 @@
</template>
<script>
import { initPartDrawing, searchPurchasedMaterials, searchPurchaseOrder, addPurchaseOrder, searchSupplier, editPurchaseOrder, deletePurchaseOrder, searchMateriel,
import { initPartDrawing, searchPurchasedMaterials, searchPurchaseOrder, addPurchaseOrder, searchSupplier, editPurchaseOrder, deletePurchaseOrder, searchMateriel, searchMateriel1,
addMateriel, deleteMateriel, saveMateriel, saveMateriel1, searchRawMaterial, addMateriel2, saveWeight, edit2 } from '@/api/WorkshopProcurement/CreatingPurchasingMaterials'
import QRCode from 'qrcode'
import $ from 'jquery'
@@ -386,6 +386,7 @@ export default {
},
tableData3: [],
materielGroup: [], // 工艺计划流水号组
partNum: [], // 默认采购数量
partGroup: [], // 采购计划明细流水号组
unit: [], // 单位组
Remarks: [], // 备注组
@@ -439,6 +440,9 @@ export default {
this.searchTable1()
this.searchRawMaterial()
searchMateriel(this.purchasingOrderNumber).then(response => {
this.tableData4 = response.data
})
searchMateriel1(this.purchasingOrderNumber).then(response => {
this.tableData3 = response.data
})
} else { this.$message.error('选入失败') }
@@ -452,10 +456,10 @@ export default {
}
},
saveWeight(index, row) {
saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位, row.采购数量)
},
saveMoney(index, row) {
saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位, row.采购数量)
// var reg = /^[0-9]*$/
// if (!reg.test(row.单价)) {
// this.$message.error('请输入正确的单价')
@@ -464,7 +468,7 @@ export default {
// }
},
saveRemarks(index, row) {
saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位, row.采购数量)
},
// ///////////////////////////////////////////////////////////////////////////////////////0529新加↑
useqrcode(contractNum) {
@@ -512,8 +516,10 @@ export default {
},
handleSelectionChange(val) {
this.materielGroup = []
this.partNum = []
for (let i = 0; i < val.length; i++) {
this.materielGroup.push(val[i].工艺计划流水号)
this.partNum.push(val[i].批次数量)
}
},
searchTable2() { // 查询采购单列表
@@ -594,6 +600,9 @@ export default {
this.$message.success('删除成功')
this.searchTable2()
searchMateriel(this.purchasingOrderNumber).then(response => {
this.tableData4 = response.data
})
searchMateriel1(this.purchasingOrderNumber).then(response => {
this.tableData3 = response.data
})
} else { this.$message.error('数据占用，删除失败') }
@@ -614,7 +623,11 @@ export default {
this.计划完成日期 = row.计划完成日期.split(' ')[0]
this.下单日期 = row.下单日期.split(' ')[0]
searchMateriel(this.purchasingOrderNumber).then(response => {
this.tableData4 = response.data
})
searchMateriel1(this.purchasingOrderNumber).then(response => {
this.tableData3 = response.data
console.log(response.data)
})
},
addMateriel() { // 将材料选入请购单
@@ -623,11 +636,14 @@ export default {
} else if (this.materielGroup.length === 0) {
this.$message.warning('请勾选物料')
} else {
addMateriel(this.purchasingOrderNumber, this.materielGroup).then(response => {
addMateriel(this.purchasingOrderNumber, this.materielGroup, this.partNum).then(response => {
if (response.data[0].result === '1') {
this.$message.success('选入成功')
this.searchTable1()
searchMateriel(this.purchasingOrderNumber).then(response => {
this.tableData4 = response.data
})
searchMateriel1(this.purchasingOrderNumber).then(response => {
this.tableData3 = response.data
})
} else { this.$message.error('选入失败') }
@@ -665,6 +681,9 @@ export default {
this.$message.success('保存成功')
this.searchTable2()
searchMateriel(this.purchasingOrderNumber).then(response => {
this.tableData4 = response.data
})
searchMateriel1(this.purchasingOrderNumber).then(response => {
this.tableData3 = response.data
})
} else { this.$message.error('保存失败') }
@@ -682,6 +701,9 @@ export default {
this.$message.success('移除成功')
this.searchTable1()
searchMateriel(this.purchasingOrderNumber).then(response => {
this.tableData4 = response.data
})
searchMateriel1(this.purchasingOrderNumber).then(response => {
this.tableData3 = response.data
})
} else { this.$message.error('移除失败') }

8
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -333,7 +333,7 @@
</el-table-column>
<el-table-column label="备料件数" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
{{ scope.row.采购数量 }}
</template>
</el-table-column>
<el-table-column label="已到件数" align="center" width="70px">
@@ -343,7 +343,7 @@
</el-table-column>
<el-table-column label="到货件数" align="center" width="110px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="到货重量" align="center" width="110px" prop="到货重量">
@@ -460,7 +460,7 @@
</el-table-column>
<el-table-column label="备料件数" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
{{ scope.row.采购数量 }}
</template>
</el-table-column>
<el-table-column label="已到件数" align="center" width="70px">
@@ -470,7 +470,7 @@
</el-table-column>
<el-table-column label="到货件数" align="center" width="110px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="到货重量" align="center" width="110px">

2
src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
View File

@@ -74,7 +74,7 @@
</el-table-column>
<el-table-column label="备料件数" align="center" width="70">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
{{ scope.row.采购数量 }}
</template>
</el-table-column>
<el-table-column label="备料时间" align="center" width="100">

2
src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
View File

@@ -92,7 +92,7 @@
<el-table-column label="操作" align="center" min-width="100px">
<template slot-scope="scope">
<el-button type="warning" plain size="mini" @click="exportTable()">打印</el-button>
<el-button type="danger" plain size="mini" @click="Disable(scope.row)">禁用</el-button>
<el-button type="danger" plain size="mini" @click="Disable(scope.row)">打回</el-button>
</template>
</el-table-column>
</el-table>