修改bug

src/components/annex/config/mainList.json

@@ -34,6 +34,7 @@
         "prop": "createBy",
         "label": "上传人",
         "overHidden": true,
+        "disabled":true,
         "cell":true
     },
     {

src/components/annex/main.vue

@@ -62,7 +62,7 @@ export default {
             return "padding:0;height:40px;";
         },
         addRow() {
-            this.data.push({createTime:dateFormat(new Date()), $cellEdit: true });
+            this.data.push({createBy:this.$store.getters.userInfo.user_name,createTime:dateFormat(new Date()), $cellEdit: true });
         },
         handleSucces(scope, res, file) {
             console.log(scope, res, file)

src/components/collection/main.vue

@@ -2,13 +2,28 @@
     <div>
         <trade-card title="收费信息">
             <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
-                @resetColumn="resetColumn" :cell-style="cellStyle">
+                @resetColumn="resetColumn" :cell-style="cellStyle" @selection-change="selectionChange">
                 <template slot="menuLeft">
                     <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="addBut">新增
                     </el-button>
+                    <el-button type="info" size="small" @click.stop="addJFA">作业费协议
+                    </el-button>
+                    <el-button type="primary" size="small" @click.stop="feeCon">费用确认单
+                    </el-button>
                 </template>
             </avue-crud>
         </trade-card>
+        <el-dialog title="作业费协议" :visible.sync="dialogVisible" width="70%" :before-close="handleClose" append-to-body>
+            <span>
+                <avue-crud ref="crud" :data="jfaData" :option="jfaOption" :cell-style="cellStyle"
+                    @selection-change="selectionChange2">
+                </avue-crud>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" size="small" @click="importData">导 入</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
@@ -20,6 +35,39 @@ export default {
         return {
             treeStyle: "height:" + (window.innerHeight - 315) + "px",
             tableOption: {},
+            dialogVisible: false,
+            selectionList: [],
+            selectionList2: [],
+            jfaData: [],
+            jfaOption: {
+                selection: true,
+                tip: false,
+                header: false,
+                menu: false,
+                index: true,
+                column: [
+                    {
+                        label: '客户名称',
+                        prop: 'corpname'
+                    },
+                    {
+                        label: '费用名称',
+                        prop: 'name'
+                    },
+                    {
+                        label: '计价单位',
+                        prop: 'feeUnitid'
+                    },
+                    {
+                        label: '单价',
+                        prop: 'price'
+                    },
+                    {
+                        label: '备注',
+                        prop: 'remark'
+                    }
+                ]
+            }
         };
     },
     props: {
@@ -43,6 +91,32 @@ export default {
         addRow(row) {
             this.data.push({ ...row, $cellEdit: true });
         },
+        addJFA() {
+            this.dialogVisible = true
+        },
+        importData() {
+            if (this.selectionList2.length) {
+                console.log('11')
+            } else {
+                this.$message.error("请选择作业费协议!");
+            }
+        },
+        handleClose() {
+
+        },
+        feeCon() {
+            if (this.selectionList.length) {
+                console.log('11')
+            } else {
+                this.$message.error("请选择需要打印的明细!");
+            }
+        },
+        selectionChange(list) {
+            this.selectionList = list
+        },
+        selectionChange2(list) {
+            this.selectionList2 = list
+        },
         rowCell(row, index) {
             if (row.$cellEdit == true) {
                 this.$set(row, "$cellEdit", false);

src/components/payment/main.vue

@@ -2,15 +2,29 @@
     <div>
         <trade-card title="付款信息">
             <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
-                @resetColumn="resetColumn" :cell-style="cellStyle">
+                @resetColumn="resetColumn" :cell-style="cellStyle" @selection-change="selectionChange">
                 <template slot="menuLeft">
                     <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="addBut">新增
                     </el-button>
-                    <el-button type="info" icon="el-icon-plus" size="small" @click.stop="addJFA">作业费协议
+                    <el-button type="info" size="small" @click.stop="addJFA">作业费协议
+                    </el-button>
+                    <el-button type="primary" size="small" @click.stop="askPay">请款单
                     </el-button>
                 </template>
             </avue-crud>
         </trade-card>
+        <el-dialog title="作业费协议" :visible.sync="dialogVisible" width="70%" :before-close="handleClose" append-to-body>
+            <span>
+                <avue-tabs :option="tabOption" @change="handleChange"></avue-tabs>
+                <avue-crud ref="crud" :data="jfaData" :option="jfaOption" :cell-style="cellStyle"
+                    @selection-change="selectionChange2">
+                </avue-crud>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" size="small" @click="importData">导 入</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
@@ -22,6 +36,49 @@ export default {
         return {
             treeStyle: "height:" + (window.innerHeight - 315) + "px",
             tableOption: {},
+            dialogVisible: false,
+            selectionList: [],
+            selectionList2: [],
+            jfaData: [],
+            jfaOption: {
+                selection: true,
+                tip: false,
+                header: false,
+                menu: false,
+                index: true,
+                column: [
+                    {
+                        label: '客户名称',
+                        prop: 'corpname'
+                    },
+                    {
+                        label: '费用名称',
+                        prop: 'name'
+                    },
+                    {
+                        label: '计价单位',
+                        prop: 'feeUnitid'
+                    },
+                    {
+                        label: '单价',
+                        prop: 'price'
+                    },
+                    {
+                        label: '备注',
+                        prop: 'remark'
+                    }
+                ]
+            },
+            tabOption: {
+                column: [{
+                    label: '车队作业费',
+                    prop: 'tab1',
+                },
+                {
+                    label: '劳务作业非',
+                    prop: 'tab2',
+                }]
+            }
         };
     },
     props: {
@@ -46,8 +103,25 @@ export default {
             this.data.push({ $cellEdit: true });
         },
         addJFA() {
+            this.dialogVisible = true
+        },
+        importData() {
+            if (this.selectionList2.length) {
+                console.log('11')
+            } else {
+                this.$message.error("请选择作业费协议!");
+            }
+        },
+        handleClose() {
 
         },
+        askPay() {
+            this.$message.error("请选择需要打印的明细!");
+        },
+        handleChange(column) {
+            this.type = column
+            this.$message.success(JSON.stringify(column))
+        },
         rowCell(row, index) {
             if (row.$cellEdit == true) {
                 this.$set(row, "$cellEdit", false);