|
@@ -128,14 +128,14 @@
|
|
</el-date-picker>
|
|
</el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :xs="24" :sm="12" :lg="6">
|
|
|
|
|
|
+ <!-- <el-col :xs="24" :sm="12" :lg="6">
|
|
<el-form-item label="打印时间排序" prop="printDesc">
|
|
<el-form-item label="打印时间排序" prop="printDesc">
|
|
<el-select v-model="screenForm.printDesc" clearable filterable>
|
|
<el-select v-model="screenForm.printDesc" clearable filterable>
|
|
<el-option label="默认" :value="null"> </el-option>
|
|
<el-option label="默认" :value="null"> </el-option>
|
|
- <el-option label="倒叙" :value="1"> </el-option>
|
|
|
|
|
|
+ <el-option label="倒序" :value="1"> </el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- </el-col>
|
|
|
|
|
|
+ </el-col> -->
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-form-item label="打印日期" prop="printTime">
|
|
<el-form-item label="打印日期" prop="printTime">
|
|
<el-date-picker
|
|
<el-date-picker
|
|
@@ -158,7 +158,7 @@
|
|
></el-input>
|
|
></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :xs="24" :sm="12" :lg="18" class="tr">
|
|
|
|
|
|
+ <el-col :xs="24" :sm="12" :lg="24" class="tr">
|
|
<el-form-item label="">
|
|
<el-form-item label="">
|
|
<el-button @click="resetScreenForm">清空</el-button>
|
|
<el-button @click="resetScreenForm">清空</el-button>
|
|
<el-button type="primary" @click="submitScreenForm"
|
|
<el-button type="primary" @click="submitScreenForm"
|
|
@@ -665,7 +665,7 @@ export default {
|
|
printStartTime: this.screenForm.printTime
|
|
printStartTime: this.screenForm.printTime
|
|
? this.screenForm.printTime[0]
|
|
? this.screenForm.printTime[0]
|
|
: "",
|
|
: "",
|
|
- printEndtTime: this.screenForm.printTime
|
|
|
|
|
|
+ printEndTime: this.screenForm.printTime
|
|
? this.screenForm.printTime[1]
|
|
? this.screenForm.printTime[1]
|
|
: "",
|
|
: "",
|
|
mainOrderId: this.screenForm.mainOrderId,
|
|
mainOrderId: this.screenForm.mainOrderId,
|
|
@@ -723,7 +723,7 @@ export default {
|
|
printStartTime: this.screenForm.printTime
|
|
printStartTime: this.screenForm.printTime
|
|
? this.screenForm.printTime[0]
|
|
? this.screenForm.printTime[0]
|
|
: "",
|
|
: "",
|
|
- printEndtTime: this.screenForm.printTime
|
|
|
|
|
|
+ printEndTime: this.screenForm.printTime
|
|
? this.screenForm.printTime[1]
|
|
? this.screenForm.printTime[1]
|
|
: "",
|
|
: "",
|
|
printTimeDesc: this.screenForm.printDesc,
|
|
printTimeDesc: this.screenForm.printDesc,
|