Skip to content

V
vue-gjjs
Commit 0c5c9ca8 by zhengxiaokui
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 21627e93 af021a6c
Showing with 71 additions and 58 deletions
src/components/GridEtyPromptDialog.vue
...@@ -65,7 +65,6 @@ export default { ...@@ -65,7 +65,6 @@ export default {
const obj = {} const obj = {}
for (let i = 0; i < lines.length; i++) { for (let i = 0; i < lines.length; i++) {
let line = lines[i]; let line = lines[i];
line = line.replace(/Quote/g, "\"");
if (etyReg.test(line)) { if (etyReg.test(line)) {
const gs = line.match(etyReg) const gs = line.match(etyReg)
const columnName = gs[1] const columnName = gs[1]
......
src/views/Business/Ditopn/index.vue
...@@ -172,15 +172,13 @@ export default { ...@@ -172,15 +172,13 @@ export default {
}, },
methods:{ methods:{
}, },
mounted:async function(){ created:async function(){
console.log("进入ditopn交易"); console.log("进入ditopn交易");
let rtnmsg = await this.init(this.$route.query) let rtnmsg = await this.init(this.$route.query)
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
//更新数据 //更新数据
console.log(rtnmsg)
Utils.copyValueFromVO(this.model,rtnmsg.data) Utils.copyValueFromVO(this.model,rtnmsg.data)
console.log(this.model);
if(this.isInDisplay){ if(this.isInDisplay){
this.restoreDisplay() this.restoreDisplay()
} }
......
src/views/Public/Setpan.vue
...@@ -169,56 +169,71 @@ ...@@ -169,56 +169,71 @@
</c-col> </c-col>
<c-col> <c-col>
<el-dialog :visible.sync="dialogVisible" center> <el-dialog :visible.sync="dialogVisible" center>
<el-form :model="dialog"> <c-col>
<el-form-item label="收款人"> <el-form :model="dialog" label-width="200px">
<el-select v-model="dialog.ptypay"> <c-col :span="16" >
<el-option <el-form-item label="收款人">
v-for="item in codes.ptypay" <el-select v-model="dialog.ptypay" style="width: 100%">
:key="item.value" <el-option
:labelF="item.label" v-for="item in codes.payee"
:value="item.value" :key="item.value"
/> :label="item.label"
</el-select> :value="item.value"
</el-form-item> />
<el-form-item label="收款人摘要" </el-select>
><c-input v-model="dialog.txtpay" /> </el-form-item>
</el-form-item> </c-col>
<el-form-item label="付款人"> <c-col :span="16">
<el-select v-model="dialog.ptydbt"> <el-form-item label="收款人摘要">
<el-option <c-input v-model="dialog.txtpay" style="width: 100%"/>
v-for="item in codes.ptydbt" </el-form-item>
:key="item.value" </c-col>
:labelF="item.label" <c-col :span="16">
:value="item.value" <el-form-item label="付款人">
/> </el-select <el-select v-model="dialog.ptydbt" style="width: 100%">
></el-form-item> <el-option
<el-form-item label="付款人摘要" v-for="item in codes.ptydbt"
><c-input v-model="dialog.txtdbp" /> :key="item.value"
</el-form-item> :labelF="item.label"
<el-form-item label="费用" :value="item.value"
><c-select v-model="dialog.cur"> />
<el-option </el-select>
v-for="item in codes.cur" </el-form-item>
:key="item.value" </c-col>
:labelF="item.label" <c-col :span="16">
:value="item.value" <el-form-item label="付款人摘要">
/> <c-input v-model="dialog.txtdbp" style="width: 100%"/>
</c-select> </el-form-item>
<c-input v-model="dialog.amt" style="width: 200px" </c-col>
/></el-form-item> <c-col :span="16">
<c-col :span="18">
<el-form-item label-width="10em"> <el-form-item label="费用">
<c-checkbox v-model="dialog.forflg" <c-select v-model="dialog.cur" style="width: 100%">
>CG00005</c-checkbox <el-option
> v-for="item in codes.cur"
</el-form-item> :key="item.value"
</el-form> :labelF="item.label"
:value="item.value"
/>
</c-select>
</el-form-item>
</c-col>
<c-col :span="6">
<el-form-item label="" label-width="20px">
<c-input v-model="dialog.amt" style="width: 100%"/>
</el-form-item>
</c-col>
</c-col>
<c-col :span="16">
<el-form-item>
<c-checkbox v-model="dialog.forflg">CG00005</c-checkbox>
</el-form-item>
</c-col>
</el-form>
</c-col>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="saveDialog" <el-button type="primary" @click="saveDialog">确 定</el-button>
>确 定</el-button
>
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
</span> </span>
</el-dialog> </el-dialog>
</c-col> </c-col>
...@@ -292,7 +307,7 @@ ...@@ -292,7 +307,7 @@
</el-table-column> </el-table-column>
</c-table> </c-table>
</c-col> </c-col>
<setpan-dialog v-if="dialogVisible2" :visible="dialogVisible2" :model="model" :idx="index" :codes="codes"/> <setpan-dialog ref="setpanDialog" :model="model" :idx="index" :codes="codes"/>
<c-col :span="24" style="text-align: left"> <c-col :span="24" style="text-align: left">
<el-form-item label="Settlement:" label-width="100px"> <el-form-item label="Settlement:" label-width="100px">
</el-form-item> </el-form-item>
...@@ -403,7 +418,6 @@ export default { ...@@ -403,7 +418,6 @@ export default {
data() { data() {
return { return {
dialogVisible: false, dialogVisible: false,
dialogVisible2: false,
dialog: { dialog: {
payee: "", payee: "",
ptydbt: "", ptydbt: "",
...@@ -449,10 +463,12 @@ export default { ...@@ -449,10 +463,12 @@ export default {
}, },
// 第三个表格 // 第三个表格
detail2(index, row) { detail2(index, row) {
this.executeRule("det").then(res=>{ const that = this;
this.dialogVisible2 = true; that.executeRule("det").then(res=>{
this.index = index; that.$refs.setpanDialog.visiable = true;
this.dialog2 = row that.$refs.setpanDialog.formData = Object.assign({}, that.model.setmod.setfeg.setfel[index]);
that.index = index;
that.dialog2 = row
}) })
}, },
}, },
......
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