|
|
@@ -14,13 +14,13 @@
|
|
|
<el-col :span="1.5">
|
|
|
<el-form-item label="单据日期">
|
|
|
<el-date-picker
|
|
|
- style="width: 200px"
|
|
|
- size="mini"
|
|
|
- clearable
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- v-model="queryParams.billDate"
|
|
|
- type="date">
|
|
|
- </el-date-picker>
|
|
|
+ size="mini"
|
|
|
+ v-model="dateRange"
|
|
|
+ style="width: 240px"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ type="daterange"
|
|
|
+ range-separator="-"
|
|
|
+ ></el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
@@ -57,6 +57,13 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-form-item label="制单人">
|
|
|
+ <el-select clearable size="mini" v-model="queryParams.createBy" @focus="chooseRefer('CONTACTS_PARAM', true, '制单人')" style="width: 200px">
|
|
|
+ <el-option v-for="item in manOptions" :key="item.id" :label="item.name" :value="item.code"/>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</CollapseTransition>
|
|
|
@@ -117,8 +124,8 @@
|
|
|
<el-table-column show-overflow-tooltip label="制单日期" align="center" prop="createTime" width="150px"/>
|
|
|
<!-- <el-table-column show-overflow-tooltip label="审批人" align="center" prop="code" width="150px"/> -->
|
|
|
<!-- <el-table-column show-overflow-tooltip label="审批日期" align="center" prop="code" width="150px"/> -->
|
|
|
- <el-table-column show-overflow-tooltip label="最后修改人" align="center" prop="updateByName" width="100px"/>
|
|
|
- <el-table-column show-overflow-tooltip label="最后修改时间" align="center" prop="updateTime" width="150px"/>
|
|
|
+ <!-- <el-table-column show-overflow-tooltip label="最后修改人" align="center" prop="updateByName" width="100px"/>
|
|
|
+ <el-table-column show-overflow-tooltip label="最后修改时间" align="center" prop="updateTime" width="150px"/> -->
|
|
|
<el-table-column
|
|
|
fixed="right"
|
|
|
label="操作"
|
|
|
@@ -346,13 +353,14 @@ export default {
|
|
|
page: '',
|
|
|
queryParams: {
|
|
|
deliveryInventoryOrg: '',
|
|
|
- billDate: '',
|
|
|
- billType: '',
|
|
|
storageInventoryOrg: '',
|
|
|
code: '',
|
|
|
+ createBy:'',
|
|
|
pageNum: 1,
|
|
|
pageSize: 10
|
|
|
},
|
|
|
+ //单据日期查询范围
|
|
|
+ dateRange:[],
|
|
|
referCondition: {
|
|
|
type: '',
|
|
|
isPage: true,
|
|
|
@@ -365,6 +373,7 @@ export default {
|
|
|
}],
|
|
|
chuOrgOptions: [],
|
|
|
ruOrgOptions: [],
|
|
|
+ manOptions: [],
|
|
|
tableList: [],
|
|
|
total: 0,
|
|
|
materialInfo: [],
|
|
|
@@ -445,19 +454,20 @@ export default {
|
|
|
this.getList(this.queryParams)
|
|
|
},
|
|
|
resetList() {
|
|
|
+ this.dateRange = [];
|
|
|
this.queryParams = {
|
|
|
deliveryInventoryOrg: '',
|
|
|
- billDate: '',
|
|
|
billType: '',
|
|
|
storageInventoryOrg: '',
|
|
|
code: '',
|
|
|
+ createBy:'',
|
|
|
pageNum: 1,
|
|
|
pageSize: 10
|
|
|
}
|
|
|
this.getList(this.queryParams)
|
|
|
},
|
|
|
getList(params){
|
|
|
- getOrderList(params).then(res => {
|
|
|
+ getOrderList(this.addDateRange(params, this.dateRange)).then(res => {
|
|
|
if (res.code === 200) {
|
|
|
this.tableList = res.rows
|
|
|
this.total = res.total
|
|
|
@@ -506,6 +516,10 @@ export default {
|
|
|
this.$modal.closeLoading();
|
|
|
})
|
|
|
},
|
|
|
+ //查询条件单据日期改变后
|
|
|
+ billDateAfterChange(val){
|
|
|
+ console.log('val',val);
|
|
|
+ },
|
|
|
// 选中某行
|
|
|
select(row) {
|
|
|
console.log('选中', row)
|
|
|
@@ -551,6 +565,10 @@ export default {
|
|
|
this.ruOrgOptions = selection
|
|
|
this.queryParams.storageInventoryOrg = selection[0].id
|
|
|
}
|
|
|
+ if (this.referCondition.title == '制单人') {
|
|
|
+ this.manOptions = selection
|
|
|
+ this.queryParams.createBy = selection[0].code
|
|
|
+ }
|
|
|
},
|
|
|
}
|
|
|
|
001295