|
@@ -479,16 +479,16 @@
|
|
|
<!-- </span>-->
|
|
|
<!-- </el-form-item>-->
|
|
|
<!-- </el-col>-->
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="仓储费方式" prop="fChargetype">
|
|
|
- <span>
|
|
|
- <el-select v-model="form.fChargetype" slot="prepend" :disabled="browseStatus" placeholder="请选择" style="width:80%">
|
|
|
- <el-option label="实际入库日期" value="0"></el-option>
|
|
|
- <el-option label="最早入库日期" value="1"></el-option>
|
|
|
- </el-select>
|
|
|
- </span>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
+<!-- <el-col :span="8">-->
|
|
|
+<!-- <el-form-item label="仓储费方式" prop="fChargetype">-->
|
|
|
+<!-- <span>-->
|
|
|
+<!-- <el-select v-model="form.fChargetype" slot="prepend" :disabled="browseStatus" placeholder="请选择" style="width:80%">-->
|
|
|
+<!-- <el-option label="实际入库日期" value="0"></el-option>-->
|
|
|
+<!-- <el-option label="最早入库日期" value="1"></el-option>-->
|
|
|
+<!-- </el-select>-->
|
|
|
+<!-- </span>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- </el-col>-->
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
@@ -1366,19 +1366,19 @@ export default {
|
|
|
},
|
|
|
|
|
|
created() {
|
|
|
- let date = new Date();
|
|
|
- let year = parseInt(date.getFullYear())
|
|
|
- let month = parseInt(date.getMonth() + 1)
|
|
|
- let currentMonth = date.getMonth()
|
|
|
- let nextMonth = ++currentMonth
|
|
|
- let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1) // 下个月的第一天
|
|
|
- let oneDay = 1000*60*60*24
|
|
|
- let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天,就是上个月的最后一天
|
|
|
- let day = lastTime.getDate()
|
|
|
- if (day < 10) {
|
|
|
- day = '0' + day
|
|
|
- }
|
|
|
- this.$set(this.queryParams,'timeInterval', [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59'])
|
|
|
+ // let date = new Date();
|
|
|
+ // let year = parseInt(date.getFullYear())
|
|
|
+ // let month = parseInt(date.getMonth() + 1)
|
|
|
+ // let currentMonth = date.getMonth()
|
|
|
+ // let nextMonth = ++currentMonth
|
|
|
+ // let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1) // 下个月的第一天
|
|
|
+ // let oneDay = 1000*60*60*24
|
|
|
+ // let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天,就是上个月的最后一天
|
|
|
+ // let day = lastTime.getDate()
|
|
|
+ // if (day < 10) {
|
|
|
+ // day = '0' + day
|
|
|
+ // }
|
|
|
+ // this.$set(this.queryParams,'timeInterval', [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59'])
|
|
|
|
|
|
this.getList();
|
|
|
this.getDicts("tax_rate").then((response) => {
|
|
@@ -1840,6 +1840,10 @@ export default {
|
|
|
this.title = "出库单";
|
|
|
},
|
|
|
handleUpdate_s(row, status) {
|
|
|
+ const queryParams = {pageNum: 1, pageSize: 10, fName: ''};
|
|
|
+ listGoods(queryParams).then((response) => {
|
|
|
+ this.goodsOptions = response.rows;
|
|
|
+ });
|
|
|
this.reset();
|
|
|
this.notChange = true
|
|
|
this.browseStatus = status;
|
|
@@ -1882,6 +1886,10 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
+ const queryParams = {pageNum: 1, pageSize: 10, fName: ''};
|
|
|
+ listGoods(queryParams).then((response) => {
|
|
|
+ this.goodsOptions = response.rows;
|
|
|
+ });
|
|
|
this.reset();
|
|
|
this.disappear = false
|
|
|
this.notChange = true
|