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

src/components/BusinessButton.vue

@@ -28,7 +28,7 @@ export default {
                     message: '保存成功',
                     type: 'success'
                 });
-                this.$history.push("/business/trnrel")
+                this.$router.history.push("/business/trnrel")
             } else {
                 this.$notify({
                     title: '失败',
@@ -46,7 +46,7 @@ export default {
                     message: '暂存成功',
                     type: 'success'
                 });
-                this.$history.push("/business/sptsel")
+                this.$router.history.push("/business/sptsel")
             } else {
                 this.$notify({
                     title: '失败',

src/config/CodeTable/index.js

@@ -5771,13 +5771,16 @@ const CodeTable = {
 		{ label: "国结系统融资过渡帐", value: "BF" }
 	],
 	setfelRol: [
-		{ label: "ISS Issuing Bank", value: "APL" }
+		{ label: "OWN Ourselves", value: "OWN" },
+		{ label: "ISS issuing Bank", value: "ISS" },
+		{ label: "APL Applicat", value: "APL" }
 	],
 	ptydbt: [
 		{ label: "OWN Ourselves", value: "OWN" },
-		{ label: "ISS issuing Bank", value: "ISS" }
+		{ label: "ISS issuing Bank", value: "ISS" },
+		{ label: "APL Applicat", value: "APL" }
 	],
-	Payee: [
+	payee: [
 		{ label: "OWN Ourselves", value: "OWN" },
 		{ label: "ISS issuing Bank", value: "ISS" }
 	]

src/model/Ditopn/Event.js

@@ -379,8 +379,8 @@ export default {
                     window.sessionStorage.docTXT = ''
                     XMLdata = rtnmsg.data.litbenl1blk
                 }
-                console.log( window.sessionStorage.docTXT);
-                console.log( window.sessionStorage.docXML);
+                // console.log( window.sessionStorage.docTXT);
+                // console.log( window.sessionStorage.docXML);
                 window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
             }
             this.dialogOpen=true

src/views/Business/Ditopn/Docpan.vue

@@ -238,10 +238,9 @@
        --><template>
             <el-dialog
                 :title="title"
-                :visible="centerDialogVisible"
+                :visible.sync="centerDialogVisible"
                 width="60%"
                 center
-                :show-close="false"
             >
                 <el-form label-width="100px" :model="dialog">
                     <el-row>

src/views/Business/Ditopn/Setpan.vue

@@ -155,9 +155,70 @@
                         >
                         </el-button>
                     </template>
+                    <template slot-scope="scoped">
+                        <el-button
+                            size="mini"
+                            @click="detail1(scoped.index, scoped.row)"
+                            >details</el-button
+                        >
+                    </template>
                 </el-table-column>
             </c-table>
         </el-col>
+        <el-col>
+            <el-dialog :visible.sync="dialogVisible" center>
+                <el-form :model="dialog">
+                    <el-form-item label="收款人">
+                        <el-select v-model="dialog.ptypay">
+                            <el-option
+                                v-for="item in codes.ptypay"
+                                :key="item.value"
+                                :labelF="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="收款人摘要"
+                        ><el-input v-model="dialog.txtpay" />
+                    </el-form-item>
+                    <el-form-item label="付款人">
+                        <el-select v-model="dialog.ptydbt">
+                            <el-option
+                                v-for="item in codes.ptydbt"
+                                :key="item.value"
+                                :labelF="item.label"
+                                :value="item.value"
+                            /> </el-select
+                    ></el-form-item>
+                    <el-form-item label="付款人摘要"
+                        ><el-input v-model="dialog.txtdbp" />
+                    </el-form-item>
+                    <el-form-item label="费用"
+                        ><el-select v-model="dialog.cur">
+                            <el-option
+                                v-for="item in codes.cur"
+                                :key="item.value"
+                                :labelF="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                        <el-input v-model="dialog.amt" style="width: 200px"
+                    /></el-form-item>
+
+                    <el-form-item label-width="10em">
+                        <el-checkbox v-model="dialog.forflg"
+                            >CG00005</el-checkbox
+                        >
+                    </el-form-item>
+                </el-form>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="saveDialog"
+                        >确 定</el-button
+                    >
+                </span>
+            </el-dialog>
+        </el-col>
         <!--=================== Own Commission/Charges:================== -->
         <el-col :span="24" style="text-align: left">
             <el-form-item label="Own Commission/Charges:"> </el-form-item>
@@ -217,9 +278,17 @@
                 <el-table-column label="Fee Amount" prop="amt" width="auto">
                 </el-table-column>
                 <el-table-column label="Details" prop="det" width="auto">
+                    <template slot-scope="scoped">
+                        <el-button
+                            size="mini"
+                            @click="detail2(scoped.$index, scoped.row)"
+                            >details</el-button
+                        >
+                    </template>
                 </el-table-column>
             </c-table>
         </el-col>
+        <setpan-dialog v-if="dialogVisible2" :visible="dialogVisible2" :model="model" :idx="index" :codes="codes"/>
         <el-col :span="24" style="text-align: left">
             <el-form-item label="Settlement:" label-width="100px">
             </el-form-item>
@@ -316,21 +385,52 @@
 </template>
 <script>
 import Event from "~/model/Ditopn/Event";
+import SetpanDialog from "./SetpanDialog.vue";
 
 export default {
+    components: { SetpanDialog },
     props: ["model", "codes"],
     data() {
-        return{};
+        return {
+            dialogVisible: false,
+            dialogVisible2: false,
+            dialog: {
+                payee: "",
+                ptydbt: "",
+                txtpay: "",
+                txtdbt: "",
+                CG00005: "",
+            },
+            dialog2: {
+                feetxtinf:"",
+                feetxt:"",
+            },
+            index: 0,
+        };
     },
     methods: {
         ...Event,
         addRow() {
-            let newRow = {};
+            let newRow = { ...dialog };
             this.model.setmod.setfog.setfol.push(newRow);
         },
         removeRow() {
             this.model.setmod.setfog.setfol.pop();
         },
+        detail1(index, row) {
+            this.dialogVisible = true;
+            this.dialog = row;
+            this.index = index;
+        },
+        detail2(index, row) {
+            this.dialogVisible2 = true;
+            this.index = index;
+            this.dialog2 = row
+        },
+        saveDialog() {
+            this.visiable = false;
+            this.model.setmod.setfog.setfol[this.index] = this.dialog;
+        },
     },
     created: function () {},
 };

src/views/Business/Ditopn/index.vue

@@ -158,8 +158,7 @@ export default {
            defaultRules: Default,
            pattern: Pattern,
            rules:null,
-           codes:{...CodeTable
-           },
+           codes:{...CodeTable},
         }
     },
     methods:{