|
@@ -146,7 +146,17 @@
|
|
></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="6">
|
|
|
|
+ <el-form-item label="推送状态" prop="syncStatus">
|
|
|
|
+ <el-select v-model="screenForm.syncStatus" clearable filterable>
|
|
|
|
+ <el-option label="未推送" :value="0"> </el-option>
|
|
|
|
+ <el-option label="推送成功" :value="1"> </el-option>
|
|
|
|
+ <el-option label="失败推送" :value="-1"> </el-option>
|
|
|
|
+
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ <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"
|
|
@@ -184,6 +194,18 @@
|
|
<!-- <el-table-column align="center" type="selection" width="55"></el-table-column>-->
|
|
<!-- <el-table-column align="center" type="selection" width="55"></el-table-column>-->
|
|
<el-table-column
|
|
<el-table-column
|
|
align="left"
|
|
align="left"
|
|
|
|
+ label="推送状态"
|
|
|
|
+ prop="syncStatus"
|
|
|
|
+ min-width="100"
|
|
|
|
+ show-overflow-tooltip
|
|
|
|
+ sortable
|
|
|
|
+ >
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ {{ scope.row.syncStatus ==0 ?"未推送": scope.row.syncStatus ==1 ?"推送成功": "失败推送" }}
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ align="left"
|
|
label="状态"
|
|
label="状态"
|
|
prop="examineStatus"
|
|
prop="examineStatus"
|
|
min-width="100"
|
|
min-width="100"
|
|
@@ -551,6 +573,7 @@ export default {
|
|
printTime: "",
|
|
printTime: "",
|
|
mainOrderId: "",
|
|
mainOrderId: "",
|
|
printDesc: null,
|
|
printDesc: null,
|
|
|
|
+ syncStatus:'',
|
|
id: "",
|
|
id: "",
|
|
},
|
|
},
|
|
statusList: [
|
|
statusList: [
|
|
@@ -616,6 +639,7 @@ export default {
|
|
correspondName: this.screenForm.warehouse,
|
|
correspondName: this.screenForm.warehouse,
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : "",
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : "",
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : "",
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : "",
|
|
|
|
+ syncStatus:this.screenForm.syncStatus,
|
|
approvalStartTime: this.screenForm.approval
|
|
approvalStartTime: this.screenForm.approval
|
|
? this.screenForm.approval[0]
|
|
? this.screenForm.approval[0]
|
|
: "",
|
|
: "",
|
|
@@ -659,6 +683,8 @@ export default {
|
|
materialNumber: this.screenForm.chNum,
|
|
materialNumber: this.screenForm.chNum,
|
|
specification: this.screenForm.model,
|
|
specification: this.screenForm.model,
|
|
correspondName: this.screenForm.warehouse,
|
|
correspondName: this.screenForm.warehouse,
|
|
|
|
+ syncStatus:this.screenForm.syncStatus,
|
|
|
|
+
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : "",
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : "",
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : "",
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : "",
|
|
approvalStartTime: this.screenForm.approval
|
|
approvalStartTime: this.screenForm.approval
|