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

src/components/GridEtyPromptDialog.vue

@@ -65,7 +65,6 @@ export default {
             const obj = {}
             for (let i = 0; i < lines.length; i++) {
                 let line = lines[i];
-                line = line.replace(/Quote/g, "\"");
                 if (etyReg.test(line)) {
                     const gs = line.match(etyReg)
                     const columnName = gs[1]

src/views/Business/Ditopn/index.vue

@@ -172,15 +172,13 @@ export default {
     },
     methods:{
     },
-    mounted:async function(){
+    created:async function(){
         console.log("进入ditopn交易");
         let rtnmsg = await this.init(this.$route.query)
         if(rtnmsg.respCode == SUCCESS)
         {
             //更新数据
-            console.log(rtnmsg)
             Utils.copyValueFromVO(this.model,rtnmsg.data)
-            console.log(this.model);
             if(this.isInDisplay){
                 this.restoreDisplay()
             }

src/views/Public/Setpan.vue

@@ -169,34 +169,46 @@
         </c-col>
         <c-col>
             <el-dialog :visible.sync="dialogVisible" center>
-                <el-form :model="dialog">
+                <c-col>
+                    <el-form :model="dialog" label-width="200px">
+                        <c-col :span="16" >
                             <el-form-item label="收款人">
-                        <el-select v-model="dialog.ptypay">
+                                <el-select v-model="dialog.ptypay" style="width: 100%">
                                     <el-option
-                                v-for="item in codes.ptypay"
+                                        v-for="item in codes.payee"
                                         :key="item.value"
-                                :labelF="item.label"
+                                        :label="item.label"
                                         :value="item.value"
                                     />
                                 </el-select>
                             </el-form-item>
-                    <el-form-item label="收款人摘要"
-                        ><c-input v-model="dialog.txtpay" />
+                        </c-col>
+                        <c-col :span="16">
+                            <el-form-item label="收款人摘要">
+                                <c-input v-model="dialog.txtpay" style="width: 100%"/>
                             </el-form-item>
+                        </c-col>
+                        <c-col :span="16">
                             <el-form-item label="付款人">
-                        <el-select v-model="dialog.ptydbt">
+                                <el-select v-model="dialog.ptydbt" style="width: 100%">
                                     <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="付款人摘要"
-                        ><c-input v-model="dialog.txtdbp" />
+                                    />
+                                </el-select>
+                            </el-form-item>
+                        </c-col>
+                        <c-col :span="16">
+                            <el-form-item label="付款人摘要">
+                                <c-input v-model="dialog.txtdbp" style="width: 100%"/>
                             </el-form-item>
-                    <el-form-item label="费用"
-                        ><c-select v-model="dialog.cur">
+                        </c-col>
+                        <c-col :span="16">
+                            <c-col :span="18">
+                                <el-form-item label="费用">
+                                    <c-select v-model="dialog.cur" style="width: 100%">
                                         <el-option
                                             v-for="item in codes.cur"
                                             :key="item.value"
@@ -204,21 +216,24 @@
                                             :value="item.value"
                                         />
                                     </c-select>
-                        <c-input v-model="dialog.amt" style="width: 200px"
-                    /></el-form-item>
-
-                    <el-form-item label-width="10em">
-                        <c-checkbox v-model="dialog.forflg"
-                            >CG00005</c-checkbox
-                        >
                                 </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">
-                    <el-button type="primary" @click="saveDialog"
-                        >确 定</el-button
-                    >
+                    <el-button type="primary" @click="saveDialog">确 定</el-button>
                     <el-button @click="dialogVisible = false">取 消</el-button>
-                    
                 </span>
             </el-dialog>
         </c-col>
@@ -292,7 +307,7 @@
                 </el-table-column>
             </c-table>
         </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">
             <el-form-item label="Settlement:" label-width="100px">
             </el-form-item>
@@ -403,7 +418,6 @@ export default {
     data() {
         return {
             dialogVisible: false,
-            dialogVisible2: false,
             dialog: {
                 payee: "",
                 ptydbt: "",
@@ -449,10 +463,12 @@ export default {
         },
         // 第三个表格
         detail2(index, row) {
-            this.executeRule("det").then(res=>{
-                this.dialogVisible2 = true;
-                this.index = index;
-                this.dialog2 = row
+            const that = this;
+            that.executeRule("det").then(res=>{
+                that.$refs.setpanDialog.visiable = true;
+                that.$refs.setpanDialog.formData = Object.assign({}, that.model.setmod.setfeg.setfel[index]);
+                that.index = index;
+                that.dialog2 = row
             })
         },
     },