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-04-29 17:49:18 +08:00
parent 8edf3ea21f
commit c11f6217ce
9 changed files with 154 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,16 +144,30 @@
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<div class="block" style="margin: 10px 0 0 0;display: inline-block">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize11"
:total="total11"
style="display:inline-block;width:800px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/>
<!--<div class="block" style="margin: 10px 0 0 0;display: inline-block">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent11"-->
<!--:page-sizes="[10, 20, 30, 40, 100]"-->
<!--:page-size="pageSize11"-->
<!--:total="total11"-->
<!--style="display:inline-block;width:800px"-->
<!--layout="total, sizes, prev, pager, next, jumper"-->
<!--@size-change="handleSizeChange11"-->
<!--@current-change="handleCurrentChange11"/>-->
<!--</div>-->
<div class="block" style="display: inline-block;width:1150px;float: right;">
<div style="display: inline-block;float: right;">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize11"
:total="total11"
mini
style="display:inline-block;margin-right: 0px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/>
</div>
</div>
<!--:row-class-name="tableRowClassName2"-->
</el-tab-pane>
@@ -197,16 +211,30 @@
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 5px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<div class="block" style="display: inline-block">
<el-pagination
:current-page="pageCurrent22"
:page-sizes="[20, 50, 100, 150]"
:page-size="pageSize22"
:total="total22"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange22"
@current-change="handleCurrentChange22"/>
<!--<div class="block" style="display: inline-block">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent22"-->
<!--:page-sizes="[20, 50, 100, 150]"-->
<!--:page-size="pageSize22"-->
<!--:total="total22"-->
<!--style="display:inline-block;width:50%"-->
<!--layout="total, sizes, prev, pager, next, jumper"-->
<!--@size-change="handleSizeChange22"-->
<!--@current-change="handleCurrentChange22"/>-->
<!--</div>-->
<div class="block" style="display: inline-block;width:1150px;float: right;">
<div style="display: inline-block;float: right;">
<el-pagination
:current-page="pageCurrent22"
:page-sizes="[20, 50, 100, 150]"
:page-size="pageSize22"
:total="total22"
mini
style="display:inline-block;margin-right: 0px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange22"
@current-change="handleCurrentChange22"/>
</div>
</div>
</el-tab-pane>
</el-tabs>
@@ -324,7 +352,7 @@
</el-table-column>
<el-table-column label="采购数" align="center" width="120">
<template slot-scope="scope">
<el-input v-positive="'float'" v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:100px" type="number" @change="saveContract()"/>
<el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:100px" @change="saveContract()"/>
<b v-else>{{ scope.row.数量 }}</b>
</template>
</el-table-column>
@@ -347,7 +375,6 @@
<el-table-column label="单价(含税)元" align="center" width="120" prop="单价(含税)">
<template slot-scope="scope">
<el-input
v-positive="'float'"
v-direction="{x: 1, y: scope.$index}"
v-if="hasTax==='含税'"
v-model="scope.row.单价"
@@ -355,7 +382,6 @@
class="editWorkTime"
size="mini"
style="width:100px"
type="number"
@blur="changefixed(scope.row.单价, scope.$index, '单价')"
@change="saveContract()"/>
<b v-show="hasTax!=='含税'">{{ (scope.row.未税单价 * (1 + taxRate)).toFixed(2) }}</b>
@@ -1797,6 +1823,11 @@ export default {
width:150px;
margin-right: 10px;
}
</style>
<style>
.el-table .MistyRose {
background: #9BD7FC!important;
}
.editWorkTime input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {
-webkit-appearance: none;
text-align: center;
@@ -1805,8 +1836,3 @@ export default {
-moz-appearance: textfield;
}
</style>
<style>
.el-table .MistyRose {
background: #9BD7FC!important;
}
</style>

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

@@ -128,6 +128,7 @@
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">
@@ -188,7 +189,7 @@
{{ scope.row.接收日期 }}
</template>
</el-table-column>
<el-table-column v-if="radio===2" align="center" prop="分配日期" label="分配日期" min-width="100px" width="100px" show-overflow-tooltip>
<el-table-column v-if="radio===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间 }}
</template>
@@ -340,7 +341,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 @selection-change="handleSelectionChange1">
<el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1365px" border stripe @sort-change="sortChange1" @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">
@@ -395,7 +396,7 @@
{{ scope.row.接收日期 }}
</template>
</el-table-column>
<el-table-column v-if="radio===2" align="center" prop="分配日期" label="分配日期" min-width="100px" width="100px" show-overflow-tooltip>
<el-table-column v-if="radio===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间 }}
</template>
@@ -520,7 +521,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 @selection-change="handleSelectionChange2">
<el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1355px" border stripe @sort-change="sortChange2" @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">
@@ -575,7 +576,7 @@
{{ scope.row.操作日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column v-if="radio===2" align="center" prop="分配日期" label="分配日期" min-width="100px" width="100px" show-overflow-tooltip>
<el-table-column v-if="radio2===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
@@ -601,7 +602,7 @@
<!--{{ scope.row.操作日期.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio===2" :filters="person" :filter-method="filterHandler" align="center" label="采购员" width="80px" prop="buyer">
<el-table-column v-if="radio2===2" :filters="person" :filter-method="filterHandler" align="center" label="采购员" width="80px" prop="buyer">
<template slot-scope="scope">
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
</template>
@@ -611,7 +612,7 @@
<!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio===2" align="center" label="撤回分配" width="100px" fixed="right">
<el-table-column v-if="radio2===2" align="center" label="撤回分配" width="100px" fixed="right">
<template slot-scope="scope">
<el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
@@ -772,6 +773,7 @@ export default {
pageCurrent2: 1,
pageSize2: 50,
total2: 0,
order: '',
checked: false,
checked2: false,
checked3: false
@@ -937,6 +939,21 @@ 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)
@@ -951,12 +968,27 @@ 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, '', '').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, '', '', this.partName, this.order).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
@@ -969,12 +1001,28 @@ 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).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, '', '', this.partName, this.order).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
@@ -986,7 +1034,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).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, this.partName, this.order).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
this.loading = false