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
2020-05-06 08:44:51 +08:00
parent 1df919eab0
commit b7bb7d031e
15 changed files with 357 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,10 +147,10 @@
<el-radio-button label="模板1"/>
<el-radio-button label="模板2" disabled/>
</el-radio-group>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<span>递交审核：</span>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同并提交审核" placement="top">
<el-button v-positive="'loading'" :disabled="openDeal" type="primary" plain size="small" @click="generateContract()">递交</el-button>
<el-button :disabled="openDeal" type="primary" plain size="small" @click="generateContract()">递交</el-button>
</el-tooltip>
<hr>
<!--html代码-->
@@ -397,7 +397,8 @@ export default {
},
// 价格实时保存
priceChange(price, num1, num2, row, num3, num4, num5) {
if (!this.quickChangePrice) {
console.log(123132123)
if (this.quickChangePrice) {
this.tableData1.map(v => {
v.物料流水号 = v.物料流水号 || ''
v.零件名称 = v.零件名称 || ''
@@ -879,7 +880,7 @@ export default {
this.hasTax === '含税' ? this.单价是否含税 = 1 : this.单价是否含税 = 0
const inquiryDetailNum_old = [] // 需要转移到新询价单的物料的询价单明细流水号
this.tableData1.map(v => {
if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
if ((this.hasTax === '含税' && v.含税单价 !== '') || (this.hasTax === '未税' && v.未税单价 !== '')) { // 筛掉未询到价格的物料
this.组件零件流水号组.push(v.组件零件流水号)
this.组件零件基本件流水号组.push(v.组件零件基本件流水号)
this.数量组.push(v.数量)

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

@@ -329,9 +329,9 @@ export default {
let total = 0
for (let j = 0; j < this.contractDetail.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.contractDetail[j].物料名称
document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.contractDetail[j].物料规格
document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.contractDetail[j].物料型号
document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.contractDetail[j].物料名称 ? this.contractDetail[j].物料名称 : this.contractDetail[j].零件名称
document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.contractDetail[j].物料规格 ? this.contractDetail[j].物料规格 : this.contractDetail[j].规格
document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.contractDetail[j].物料型号 ? this.contractDetail[j].物料型号 : this.contractDetail[j].零件图号
document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.contractDetail[j].数量
document.getElementsByClassName('tableData')[j].children[5].innerHTML = Number(this.contractDetail[j].单价).toFixed(2)
document.getElementsByClassName('tableData')[j].children[6].innerHTML = (this.contractDetail[j].数量 * this.contractDetail[j].单价).toFixed(2)

81
src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
View File

@@ -92,7 +92,7 @@
<!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>-->
<!--<div style="float:right;">-->
<!--<span style="margin-left: 0">采购员:</span>-->
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 210px">
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 100px">
<el-option
v-for="item in person"
:key="item.value"
@@ -107,12 +107,12 @@
style="margin-left: 10px"
@click="allocateTask1">分配</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
<el-tooltip :open-delay="100" effect="dark" content="打回制造部重新分配" placement="top">
<el-button
type="repulse"
size="small"
icon="el-icon-back"
style="margin-left: 50px"
style="margin-left: 170px"
@click="executeReturn1">打回</el-button>
</el-tooltip>
<!--</div>-->
@@ -124,11 +124,10 @@
:header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
size="mini"
height="740px"
style="width: 1363px"
style="width: 1650px"
border
stripe
highlight-current-row
@sort-change="sortChange"
@selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" label="进程" prop="询价状态编号" width="60px">
@@ -189,7 +188,7 @@
{{ scope.row.接收日期 }}
</template>
</el-table-column>
<el-table-column v-if="radio===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
<el-table-column v-if="radio===2" align="center" prop="任务分配时间" label="分配日期" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间 }}
</template>
@@ -329,7 +328,7 @@
style="margin-left: 10px"
@click="allocateTask1">分配</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
<el-tooltip :open-delay="100" effect="dark" content="打回制造部重新分配" placement="top">
<el-button
type="repulse"
size="small"
@@ -341,7 +340,7 @@
<!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn1">打回</el-button>-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1365px" border stripe @sort-change="sortChange1" @selection-change="handleSelectionChange1">
<el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1650px" border stripe @selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" prop="询价状态编号" label="进程" min-width="100px" width="60px">
<template slot-scope="scope">
@@ -366,7 +365,7 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="数量" min-width="80px">
<el-table-column align="center" label="数量" min-width="70px">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
@@ -396,7 +395,7 @@
{{ scope.row.接收日期 }}
</template>
</el-table-column>
<el-table-column v-if="radio===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
<el-table-column v-if="radio1===2" align="center" prop="任务分配时间" label="分配日期" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间 }}
</template>
@@ -509,7 +508,7 @@
style="margin-left: 10px"
@click="allocateTask2">分配</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
<el-tooltip :open-delay="100" effect="dark" content="打回制造部重新分配" placement="top">
<el-button
type="repulse"
size="small"
@@ -521,7 +520,7 @@
<!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1355px" border stripe @sort-change="sortChange2" @selection-change="handleSelectionChange2">
<el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 16505px" border stripe @selection-change="handleSelectionChange2">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" prop="询价状态编号" label="进程" min-width="80px" width="60px">
<template slot-scope="scope">
@@ -576,7 +575,7 @@
{{ scope.row.操作日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column v-if="radio2===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
<el-table-column v-if="radio2===2" align="center" prop="任务分配时间" label="分配日期" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
@@ -612,11 +611,11 @@
<!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio2===2" align="center" label="撤回分配" width="100px" fixed="right">
<el-table-column v-if="radio2===2" align="center" label="撤回分配" width="80px" fixed="right">
<template slot-scope="scope">
<el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
type="repulse"
type="text"
plain
size="mini"
icon="el-icon-back"
@@ -939,21 +938,6 @@ export default {
this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
}
},
sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '任务分配时间') {
this.partName = 1
} else {
this.partName = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable0()
},
searchTable0() { // 查询标准件
this.checked ? this.radio = 2 : this.radio = 1
console.log(this.checked, this.radio, 991)
@@ -968,27 +952,12 @@ export default {
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
// this.dateRange ? check4 = 0 : (check4 = 0, this.dateRange = '')
searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '', this.partName, this.order).then(response => {
searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.loading = false
})
},
sortChange1(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '任务分配时间') {
this.partName = 1
} else {
this.partName = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable1()
},
searchTable1() { // 查询外购件
this.loading = true
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
@@ -1001,28 +970,12 @@ export default {
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
this.checked2 ? this.radio1 = 2 : this.radio1 = 1
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio1), check2, this.materialSpec, check3, this.materialModel, 2, 0, '', '', this.partName, this.order).then(response => {
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio1), check2, this.materialSpec, check3, this.materialModel, 2, 0, '', '').then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
this.loading = false
})
},
sortChange2(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '任务分配时间') {
this.partName = 1
} else {
this.partName = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable2()
},
searchTable2() { // 查询基本件
this.loading = true
this.projectValue ? this.check3 = 1 : this.check3 = 0
@@ -1034,7 +987,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.checked3 ? this.radio2 = 2 : this.radio2 = 1
searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio2), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial, this.partName, this.order).then(response => {
searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio2), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
this.loading = false