Commit eb1490ab by wangguangchao

复核任务查询优化

parent 73c0c589
...@@ -283,5 +283,20 @@ export default { ...@@ -283,5 +283,20 @@ export default {
const ds = d.split("\t") const ds = d.split("\t")
let viewurl ="/#/display/"+ds['10'].toLowerCase()+"?trn="+ds['1'] let viewurl ="/#/display/"+ds['10'].toLowerCase()+"?trn="+ds['1']
window.open(viewurl, 'newwindow', 'height=1200,width=900,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no'); window.open(viewurl, 'newwindow', 'height=1200,width=900,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
} },
async handleSearch() {
const that = this.root;
if(this.model.searchAllUsers){
that.executeRule("seajbh").then(res => {
//TODO 处理数据逻辑
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
})
}else{
that.executeRule("searow").then(res => {
//TODO 处理数据逻辑
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm;
})
}
},
} }
\ No newline at end of file
...@@ -107,7 +107,8 @@ export default class Trnrel { ...@@ -107,7 +107,8 @@ export default class Trnrel {
prtpblk: "", // XMLPanel prtp的内置block .docimm.docbol.prtpblk prtpblk: "", // XMLPanel prtp的内置block .docimm.docbol.prtpblk
}, },
}, },
pageId: "" // ctx的key pageId: "", // ctx的key
searchAllUsers: ""
} }
} }
} }
\ No newline at end of file
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
size="small" size="small"
> >
<el-row> <el-row>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Branch" prop="bchcon"> <el-form-item label="Branch" prop="bchcon">
<c-select <c-select
...@@ -22,6 +23,13 @@ ...@@ -22,6 +23,13 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12">
<el-form-item label=" " prop="searchAllUsers" >
<c-checkbox v-model="model.searchAllUsers">查询所有柜员</c-checkbox>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Reference" prop="trncorco.ownref"> <el-form-item label="Reference" prop="trncorco.ownref">
<c-input <c-input
...@@ -50,16 +58,9 @@ ...@@ -50,16 +58,9 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12">
<el-form-item label="User" prop="usrcon">
<c-select
v-model="model.usrcon"
style="width: 100%"
placeholder="请选择User"
>
</c-select>
</el-form-item>
</c-col>
</el-row> </el-row>
<!-- <!--
<c-col :span="12"> <c-col :span="12">
...@@ -69,31 +70,43 @@ ...@@ -69,31 +70,43 @@
</c-col> </c-col>
--> -->
<el-row v-show="searchSlot.searchToggle"> <el-row v-show="searchSlot.searchToggle">
<c-col :span="12"> <c-col :span="24">
<el-form-item label="Between"> <c-col :span="12">
<el-date-picker <el-form-item label="User" prop="usrcon">
type="date" <c-select
v-model="model.trncorco.inidatfro" v-model="model.usrcon"
style="width: 45%" style="width: 100%"
placeholder="请选择Date of entry of Transaction" placeholder="请选择User"
></el-date-picker> >
- </c-select>
<el-date-picker </el-form-item>
type="date" </c-col>
v-model="model.trncorco.inidattil"
style="width: 45%"
placeholder="请选择Date of entry of Transaction until"
></el-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Between">
<el-date-picker
type="date"
v-model="model.trncorco.inidatfro"
style="width: 45%"
placeholder="请选择Date of entry of Transaction"
></el-date-picker>
-
<el-date-picker
type="date"
v-model="model.trncorco.inidattil"
style="width: 45%"
placeholder="请选择Date of entry of Transaction until"
></el-date-picker>
</el-form-item>
</c-col>
</c-col>
<!-- <!--
<c-col :span="12"> <c-col :span="12">
<el-form-item label="and"> <el-form-item label="and">
</el-form-item> </el-form-item>
</c-col> --> </c-col> -->
<c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Transaction Type " prop="atp.cod"> <el-form-item label="Transaction Type " prop="atp.cod">
<c-input <c-input
...@@ -126,18 +139,21 @@ ...@@ -126,18 +139,21 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Transaction Text" prop="atptxt"> <el-form-item label="Transaction Text" prop="atptxt">
<c-input <c-input
v-model="model.atptxt" v-model="model.atptxt"
maxlength="37" maxlength="37"
:readonly="true"
placeholder="请输入Transaction Text" placeholder="请输入Transaction Text"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</el-row>
</el-row>
</el-form> </el-form>
</template> </template>
</c-list-search> </c-list-search>
...@@ -157,13 +173,15 @@ ...@@ -157,13 +173,15 @@
--> -->
<div style="margin-top:20px;"> <div style="margin-top:20px;">
<c-button size="small" type="primary" @click="onSeaown">
<!-- <c-button size="small" type="primary" @click="onSeaown">
Search Own Search Own
</c-button> </c-button>
<c-button size="small" type="primary" @click="onSeajbh"> <c-button size="small" type="primary" @click="onSeajbh">
Search All Search All
</c-button> </c-button> -->
<c-button <c-button
size="small" size="small"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment