|
|
@@ -24,12 +24,12 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-col :span="6">
|
|
|
- <span>{{ deptBudgetList.warehouseName }}（{{deptBudgetList.warehouseNo}}仓位）</span
|
|
|
- ><span>现有储量：{{deptBudgetList.nowWeight}}吨</span>
|
|
|
- </el-col>
|
|
|
- <el-col :span="18">
|
|
|
- <el-date-picker
|
|
|
+ <div class="span_css">
|
|
|
+ <span>{{ deptBudgetList.warehouseName }}（{{deptBudgetList.warehouseNo}}仓位）</span><span>现有储量：{{deptBudgetList.nowWeight}}吨</span>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-date-picker
|
|
|
v-model="value2"
|
|
|
type="daterange"
|
|
|
align="right"
|
|
|
@@ -38,13 +38,13 @@
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
:picker-options="pickerOptions"
|
|
|
+ @change="find"
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
- </el-col>
|
|
|
</el-col>
|
|
|
- <el-col :span="12" class="bg-right">
|
|
|
+ <el-col :span="4" class="bg-right">
|
|
|
<el-button
|
|
|
- class="bg-bottom"
|
|
|
+ class="bg-bottom bottom_css"
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
@click="adjustmentchange()"
|
|
|
@@ -52,7 +52,7 @@
|
|
|
调整</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
- class="bg-bottom"
|
|
|
+ class="bg-bottom bottom_css"
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
@click="print()"
|
|
|
@@ -97,7 +97,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="inOutDate" label="出入库日期"> </el-table-column>
|
|
|
</el-table>
|
|
|
- <el-dialog :visible.sync="isShowadjustment" title="收款截图">
|
|
|
+ <el-dialog :visible.sync="isShowadjustment" title="调整">
|
|
|
<div>
|
|
|
<el-input
|
|
|
v-model="adjustment"
|
|
|
@@ -113,6 +113,7 @@
|
|
|
<div class="print-type" v-show="isShowPrintType">
|
|
|
<div class="print-type-content">
|
|
|
<div class="print-type-title">打印凭证</div>
|
|
|
+ <div class="count">打印共{{selection.length}}条</div>
|
|
|
<div class="print-type-checkbox">
|
|
|
<el-checkbox-group v-model="ruleForm.type">
|
|
|
<el-checkbox
|
|
|
@@ -415,7 +416,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
recordList: [],
|
|
|
- value2: '',
|
|
|
+ value2: [],
|
|
|
customerList: {},
|
|
|
isShowadjustment: false,
|
|
|
adjustment: '',
|
|
|
@@ -444,6 +445,8 @@ export default {
|
|
|
printList1: [],
|
|
|
newList:[],
|
|
|
count:0,
|
|
|
+ startDate:"",
|
|
|
+ endDate:"",
|
|
|
}
|
|
|
},
|
|
|
activated() {
|
|
|
@@ -455,6 +458,15 @@ export default {
|
|
|
this.getList()
|
|
|
},
|
|
|
methods: {
|
|
|
+ find(){
|
|
|
+ this.startDate = ""
|
|
|
+ this.endDate = ""
|
|
|
+ if(this.value2){
|
|
|
+ this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
|
|
|
+ this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
|
|
|
+ }
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
getList() {
|
|
|
getrecord({
|
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
@@ -462,6 +474,8 @@ export default {
|
|
|
positionId: this.deptBudgetList.positionId,
|
|
|
warehouseName: this.deptBudgetList.warehouseName,
|
|
|
searchType: this.searchType,
|
|
|
+ startDate:this.startDate,
|
|
|
+ endDate:this.endDate,
|
|
|
currentPage: this.currentPage,
|
|
|
pageSize: this.pageSize,
|
|
|
})
|
|
|
@@ -494,6 +508,28 @@ export default {
|
|
|
this.deptBudgetTotal = res.total
|
|
|
})
|
|
|
},
|
|
|
+ dateFormat(fmt, date) {
|
|
|
+ let ret
|
|
|
+ const opt = {
|
|
|
+ 'Y+': date.getFullYear().toString(), // 年
|
|
|
+ 'm+': (date.getMonth() + 1).toString(), // 月
|
|
|
+ 'd+': date.getDate().toString(), // 日
|
|
|
+ 'H+': date.getHours().toString(), // 时
|
|
|
+ // "M+": date.getMinutes().toString(), // 分
|
|
|
+ // "S+": date.getSeconds().toString() // 秒
|
|
|
+ // 有其他格式化字符需求可以继续添加，必须转化成字符串
|
|
|
+ }
|
|
|
+ for (let k in opt) {
|
|
|
+ ret = new RegExp('(' + k + ')').exec(fmt)
|
|
|
+ if (ret) {
|
|
|
+ fmt = fmt.replace(
|
|
|
+ ret[1],
|
|
|
+ ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
|
|
|
+ )
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return fmt
|
|
|
+ },
|
|
|
handleSizeChange(val) {
|
|
|
console.log(`每页 ${val} 条`)
|
|
|
this.pageSize = val
|
|
|
@@ -567,7 +603,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
async printSettlementSheet(list){
|
|
|
- for(let i = 0 ; i < list.length ; i++ ){
|
|
|
+ for(let i = 0 ; i < list.length ; i++){
|
|
|
getpaymentexamine({ id: list[i].paymentId })
|
|
|
.toPromise()
|
|
|
.then((res) => {
|
|
|
@@ -650,6 +686,9 @@ export default {
|
|
|
.bg-bottom {
|
|
|
margin: 15px 0px;
|
|
|
}
|
|
|
+.bottom_css{
|
|
|
+ margin: 0 0 15px 15px;
|
|
|
+}
|
|
|
.bg-left.title::before {
|
|
|
content: '';
|
|
|
display: inline-block;
|
|
|
@@ -668,6 +707,10 @@ export default {
|
|
|
z-index: 99;
|
|
|
opacity: 0.3;
|
|
|
}
|
|
|
+.count{
|
|
|
+ text-align: center;
|
|
|
+ margin-bottom: 10px;
|
|
|
+}
|
|
|
|
|
|
.print-type {
|
|
|
position: absolute;
|
|
|
@@ -685,7 +728,8 @@ export default {
|
|
|
.print-type-title {
|
|
|
text-align: center;
|
|
|
font-size: 18px;
|
|
|
- margin: 20px;
|
|
|
+ // margin: 20px;
|
|
|
+ margin: 20px 20px 10px;
|
|
|
}
|
|
|
.print-type-checkbox {
|
|
|
padding-left: 20px;
|
|
|
@@ -845,4 +889,11 @@ table tr td {
|
|
|
/deep/.el-table .cell{
|
|
|
text-align: center;
|
|
|
}
|
|
|
+
|
|
|
+ .span_css{
|
|
|
+ width: 600px;
|
|
|
+ margin-left: 30px;
|
|
|
+ line-height: 30px;
|
|
|
+ }
|
|
|
+
|
|
|
</style>
|
