修改bug

src/components/annex/config/mainList.json

@@ -0,0 +1,54 @@
+{
+  "searchShow": true,
+  "searchMenuSpan": 8,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "addBtn": false,
+  "headerAlign": "center",
+  "menuWidth": "200",
+  "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "selection": true,
+  "tip": false,
+  "column": [
+    {
+        "index": 1,
+        "prop": "name",
+        "label": "附件名称",
+        "overHidden": true,
+        "cell":true
+    },
+    {
+        "index": 2,
+        "prop": "type",
+        "label": "文件属性",
+        "overHidden": true,
+        "cell":true
+    },
+    {
+        "index": 3,
+        "prop": "createBy",
+        "label": "上传人",
+        "overHidden": true,
+        "cell":true
+    },
+    {
+        "index": 4,
+        "prop": "createTime",
+        "label": "上传时间",
+        "overHidden": true,
+        "disabled":true,
+        "cell":true
+    },
+    {
+        "index": 5,
+        "prop": "url",
+        "label": "上传附件",
+        "overHidden": true
+    }
+]
+}

src/components/annex/main.vue

@@ -0,0 +1,136 @@
+<template>
+    <div>
+        <trade-card title="明细附件">
+            <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
+                @resetColumn="resetColumn" :cell-style="cellStyle">
+                <template slot="menuLeft">
+                    <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="addRow">新增
+                    </el-button>
+                </template>
+                <template slot="url" slot-scope="{ row }">
+                    <div style="display: flex; justify-content: center">
+                        <el-upload class="upload-demo" :action="uploadImgUrl" :on-success="
+                            (res, file) => {
+                                handleSucces(row, res, file);
+                            }
+                        " :headers="headers" :disabled="disabled" :show-file-list="false" :limit="1">
+                            <el-button size="small" type="text" :disabled="browseStatus">点击上传</el-button>
+                        </el-upload>
+                    </div>
+                </template>
+                <template slot-scope="{ row,index}" slot="menu">
+                    <el-button type="text" icon="el-icon-delete" size="small" @click.stop="rowView(row, index)">查看
+                    </el-button>
+                    <el-button type="text" icon="el-icon-delete" size="small" @click.stop="rowDel(row, index)">删除
+                    </el-button>
+                    <el-button type="text" icon="el-icon-delete" size="small" @click.stop="rowDown(row, index)">下载
+                    </el-button>
+                </template>
+            </avue-crud>
+        </trade-card>
+    </div>
+</template>
+
+<script>
+import tableOption from "./config/mainList.json";
+import { dateFormat } from "@/util/date";
+export default {
+    name: "detailsPageEdit",
+    data() {
+        return {
+            treeStyle: "height:" + (window.innerHeight - 315) + "px",
+            tableOption: {},
+            uploadImgUrl: '',
+        };
+    },
+    props: {
+        data: {
+            type: Array
+        },
+        disabled: {
+            type: Boolean
+        }
+    },
+    async created() {
+        this.tableOption = await this.getColumnData(
+            this.getColumnName(161.3),
+            tableOption
+        );
+    },
+    methods: {
+        cellStyle() {
+            return "padding:0;height:40px;";
+        },
+        addRow() {
+            this.data.push({createTime:dateFormat(new Date()), $cellEdit: true });
+        },
+        handleSucces(scope, res, file) {
+            console.log(scope, res, file)
+        },
+        rowCell(row, index) {
+            if (row.$cellEdit == true) {
+                this.$set(row, "$cellEdit", false);
+            } else {
+                this.$set(row, "$cellEdit", true);
+            }
+        },
+        rowDel(row) {
+            this.$confirm("确定删除数据?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.$message({
+                    type: "success",
+                    message: "删除成功!"
+                });
+                this.data.splice(row.$index, 1);
+            });
+        },
+        rowDown(row) {
+            if (row.url) {
+                window.open(row.url);
+            } else {
+                this.$message.error("请上传附件");
+            }
+
+        },
+        async saveColumn() {
+            const inSave = await this.saveColumnData(
+                this.getColumnName(161.3),
+                this.tableOption
+            );
+            if (inSave) {
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                });
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs.crud.$refs.dialogColumn.columnBox = false;
+            }
+        },
+        async resetColumn() {
+            this.tableOption = tableOption;
+            const inSave = await this.delColumnData(
+                this.getColumnName(161.3),
+                tableOption
+            );
+            if (inSave) {
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                });
+                this.$message.success("重置成功");
+                //关闭窗口
+                setTimeout(() => {
+                    this.$refs.crud.$refs.dialogColumn.columnBox = false;
+                }, 1000);
+            }
+        }
+    },
+    watch: {
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/components/collection/config/mainList.json

@@ -20,27 +20,31 @@
         "prop": "corpid",
         "label": "客户名称",
         "overHidden": true,
-        "width": 260
+        "cell":true,
+        "width": 100
     },
     {
         "index": 2,
         "prop": "feeid",
         "label": "费用名称",
         "overHidden": true,
-        "width": 200
+        "cell":true,
+        "width": 100
     },
     {
         "index": 3,
         "prop": "feeUnitid",
         "label": "计价单位",
         "overHidden": true,
-        "width": 130
+        "cell":true,
+        "width": 100
     },
     {
         "index": 4,
         "prop": "qty",
         "label": "数量",
         "overHidden": true,
+        "cell":true,
         "width": 80
     },
     {
@@ -48,6 +52,7 @@
         "prop": "unitprice",
         "label": "单价",
         "overHidden": true,
+        "cell":true,
         "width": 80
     },
     {
@@ -55,13 +60,15 @@
         "prop": "amount",
         "label": "金额",
         "overHidden": true,
-        "width": 130
+        "cell":true,
+        "width": 100
     },
     {
         "index": 7,
         "prop": "stltypeid",
         "label": "结算方式",
         "overHidden": true,
+        "cell":true,
         "width": 100
     },
     {
@@ -69,6 +76,7 @@
         "prop": "currency",
         "label": "币别",
         "overHidden": true,
+        "cell":true,
         "width": 100
     },
     {
@@ -76,6 +84,7 @@
         "prop": "exrate",
         "label": "汇率",
         "overHidden": true,
+        "cell":true,
         "width": 80
     },
     {
@@ -83,6 +92,7 @@
         "prop": "taxrate",
         "label": "税率",
         "overHidden": true,
+        "cell":true,
         "width": 80
     },
     {
@@ -90,63 +100,72 @@
         "prop": "businessType",
         "label": "作业类型",
         "overHidden": true,
-        "width": 180
+        "cell":true,
+        "width": 100
     },
     {
         "index": 12,
         "prop": "mblno",
         "label": "提单号",
         "overHidden": true,
-        "width": 150
+        "cell":true,
+        "width": 100
     },
     {
         "index": 13,
         "prop": "productName",
         "label": "品名",
         "overHidden": true,
-        "width": 140
+        "cell":true,
+        "width": 100
     },
     {
         "index": 14,
         "prop": "marks",
         "label": "品牌",
         "overHidden": true,
-        "width": 130
+        "cell":true,
+        "width": 100
     },
     {
         "index": 15,
         "prop": "srcTypeId",
         "label": "来源",
         "overHidden": true,
-        "width": 130
+        "cell":true,
+        "width": 100
     },
     {
         "index": 16,
         "prop": "accamount",
         "label": "对账金额",
         "overHidden": true,
-        "width": 130
+        "cell":true,
+        "width": 100
     },
     {
         "index": 17,
         "prop": "stlamount",
         "label": "结算金额",
         "overHidden": true,
-        "width": 130
+        "cell":true,
+        "width": 100
     },
     {
         "index": 18,
         "prop": "stlamountDate",
         "label": "结算日期",
         "overHidden": true,
-        "width": 130
+        "cell":true,
+        "width": 100
     },
     {
         "index": 19,
         "prop": "remark",
         "label": "备注",
         "overHidden": true,
-        "width": 150
+        "cell":true,
+        "width": 100
     }
 ]
 }

src/components/collection/main.vue

@@ -1,8 +1,12 @@
 <template>
-    <div class="customer-main">
-        <trade-card title="入库明细">
+    <div>
+        <trade-card title="收费信息">
             <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
                 @resetColumn="resetColumn" :cell-style="cellStyle">
+                <template slot="menuLeft">
+                    <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="addBut">新增
+                    </el-button>
+                </template>
             </avue-crud>
         </trade-card>
     </div>
@@ -16,30 +20,28 @@ export default {
         return {
             treeStyle: "height:" + (window.innerHeight - 315) + "px",
             tableOption: {},
-            data: [],
         };
     },
     props: {
-        detailData: {
-            type: Object
+        data: {
+            type: Array
         }
     },
     async created() {
-        if (this.detailData.id) {
-            this.getDetail(this.detailData.id);
-        }
         this.tableOption = await this.getColumnData(
-            this.getColumnName(162),
+            this.getColumnName(161.1),
             tableOption
         );
-
     },
     methods: {
         cellStyle() {
             return "padding:0;height:40px;";
         },
-        addRow() {
-            this.data.push({ $cellEdit: true });
+        addBut() {
+            this.$emit('addBut')
+        },
+        addRow(row) {
+            this.data.push({ ...row, $cellEdit: true });
         },
         rowCell(row, index) {
             if (row.$cellEdit == true) {
@@ -63,7 +65,7 @@ export default {
         },
         async saveColumn() {
             const inSave = await this.saveColumnData(
-                this.getColumnName(162),
+                this.getColumnName(161.1),
                 this.tableOption
             );
             if (inSave) {
@@ -78,7 +80,7 @@ export default {
         async resetColumn() {
             this.tableOption = tableOption;
             const inSave = await this.delColumnData(
-                this.getColumnName(162),
+                this.getColumnName(161.1),
                 tableOption
             );
             if (inSave) {

src/components/crop-select/main.vue

@@ -1,114 +1,52 @@
 <template>
   <div>
     <div style="display:flex">
-      <el-select
-        v-if="gysType == 'CK'"
-        size="small"
-        v-model="value"
-        placeholder="请选择"
-        @input="$emit('balabala', value)"
-        :disabled="disabled"
-        filterable
-        clearable
-        style="width:100%"
-        :multiple="multiple ? multiple : false"
-        :collapse-tags="collapseTags ? collapseTags : false"
-        @change="corpChange"
-      >
-        <el-option
-          v-for="item in corpList"
-          :key="item.id"
-          :label="item.code"
-          :value="item.id"
-        >
+      <el-select v-if="gysType == 'CK'" size="small" v-model="value" placeholder="请选择" @input="$emit('balabala', value)"
+        :disabled="disabled" filterable clearable style="width:100%" :multiple="multiple ? multiple : false"
+        :collapse-tags="collapseTags ? collapseTags : false" @change="corpChange">
+        <el-option v-for="item in corpList" :key="item.id" :label="item.code" :value="item.id">
         </el-option>
       </el-select>
-      <el-select
-        v-else
-        size="small"
-        v-model="value"
-        placeholder="请选择"
-        @input="$emit('balabala', value)"
-        :disabled="disabled"
-        filterable
-        clearable
-        style="width:100%"
-        @clear="clear"
-        :multiple="multiple ? multiple : false"
-        :collapse-tags="collapseTags ? collapseTags : false"
-        @change="corpChange"
-      >
-        <el-option
-          v-for="item in corpList"
-          :key="item.id"
-          :label="label?item[label]:item.cname"
-          :value="item.id"
-        >
-        </el-option>
+      <el-select v-else size="small" v-model="value" placeholder="请选择" @input="$emit('balabala', value)"
+        :disabled="disabled" filterable clearable style="width:100%" @clear="clear"
+        :multiple="multiple ? multiple : false" :collapse-tags="collapseTags ? collapseTags : false"
+        @change="corpChange">
+        <template v-if="zhKey">
+          <el-option v-for="item in corpList" :key="item.id" :label="label ? item[label] : item.cname"
+            :value="item.cname">
+          </el-option>
+        </template>
+        <template v-else>
+          <el-option v-for="item in corpList" :key="item.id" :label="label ? item[label] : item.cname" :value="item.id">
+          </el-option>
+        </template>
       </el-select>
-      <el-button
-        icon="el-icon-search"
-        size="mini"
-        v-if="label != 'shortName'"
-        :disabled="disabled"
-        @click="openDialog()"
-      ></el-button>
+      <el-button icon="el-icon-search" size="mini" v-if="label != 'shortName'" :disabled="disabled"
+        @click="openDialog()"></el-button>
     </div>
-    <el-dialog
-      :title="title"
-      :visible.sync="corpVisible"
-      width="80%"
-      top="5vh"
-      append-to-body
-      @closed="closed"
-      class="el-dialogDeep"
-      :close-on-click-modal="false"
-      v-dialog-drag
-    >
+    <el-dialog :title="title" :visible.sync="corpVisible" width="80%" top="5vh" append-to-body @closed="closed"
+      class="el-dialogDeep" :close-on-click-modal="false" v-dialog-drag>
       <span>
         <el-row>
           <el-col :span="4">
             <el-scrollbar>
               <basic-container>
-                <avue-tree
-                  :option="treeOption"
-                  :data="treeData"
-                  @node-click="nodeClick"
-                  :style="treeStyle"
-                />
+                <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" :style="treeStyle" />
               </basic-container>
             </el-scrollbar>
           </el-col>
           <el-col :span="20">
-            <avue-crud
-              :option="tableOption"
-              :data="data"
-              ref="crud"
-              v-model="form"
-              :page.sync="page"
-              :search.sync="search"
-              @search-change="searchChange"
-              @search-reset="searchReset"
-              @selection-change="selectionChange"
-              @on-load="onLoad"
-              @tree-load="treeLoad"
-              @saveColumn="saveColumn"
-              @resetColumn="resetColumn"
-              @refresh-change="refreshChange"
-              :table-loading="loading"
-            >
+            <avue-crud :option="tableOption" :data="data" ref="crud" v-model="form" :page.sync="page"
+              :search.sync="search" @search-change="searchChange" @search-reset="searchReset"
+              @selection-change="selectionChange" @on-load="onLoad" @tree-load="treeLoad" @saveColumn="saveColumn"
+              @resetColumn="resetColumn" @refresh-change="refreshChange" :table-loading="loading">
             </avue-crud>
           </el-col>
         </el-row>
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="corpVisible = false">取 消</el-button>
-        <el-button
-          type="primary"
-          @click="importCorp"
-          :disabled="!multiple && selectionList.length != 1"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="importCorp" :disabled="!multiple && selectionList.length != 1">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -168,7 +106,8 @@ export default {
     gysType: String,
     treeType: String,
     label: String,
-    belongtocompany: Number
+    belongtocompany: Number,
+    zhKey: Boolean,
   },
   model: {
     prop: "value",
@@ -187,14 +126,14 @@ export default {
       this.corpList = res.data.data;
     });
   },
-  mounted() {},
+  mounted() { },
   methods: {
     init() {
       this.openDialog();
     },
     openDialog() {
       let _this = this;
-      this.treeOption.treeLoad = function(node, resolve) {
+      this.treeOption.treeLoad = function (node, resolve) {
         const parentId = node.level === 0 ? 0 : node.data.id;
         getDeptLazyTree({
           parentId: parentId,
@@ -226,7 +165,7 @@ export default {
       this.$emit("getCorpList", [...this.selectionList])
       this.corpVisible = false;
     },
-    clear(){
+    clear() {
       this.$emit("clear");
     },
     corpChange(row) {
@@ -239,7 +178,7 @@ export default {
       } else {
         let arr = [];
         row.forEach(item => {
-          let obj = {id: item};
+          let obj = { id: item };
           this.$set(obj, 'cname', this.corpList.find(e => e.id == item).cname);
           arr.push(obj)
         })
@@ -342,4 +281,5 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+</style>

src/components/payment/config/mainList.json

@@ -0,0 +1,171 @@
+{
+    "searchShow": true,
+    "searchMenuSpan": 8,
+    "border": true,
+    "index": true,
+    "viewBtn": false,
+    "editBtn": false,
+    "delBtn": false,
+    "addBtn": false,
+    "headerAlign": "center",
+    "menuWidth": "70",
+    "showSummary": true,
+    "searchIcon": true,
+    "searchIndex": 2,
+    "selection": true,
+    "tip": false,
+    "column": [
+        {
+            "index": 1,
+            "prop": "corpid",
+            "label": "客户名称",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 2,
+            "prop": "feeid",
+            "label": "费用名称",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 3,
+            "prop": "feeUnitid",
+            "label": "计价单位",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 4,
+            "prop": "qty",
+            "label": "数量",
+            "overHidden": true,
+            "cell": true,
+            "width": 80
+        },
+        {
+            "index": 5,
+            "prop": "unitprice",
+            "label": "单价",
+            "overHidden": true,
+            "cell": true,
+            "width": 80
+        },
+        {
+            "index": 6,
+            "prop": "amount",
+            "label": "金额",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 7,
+            "prop": "stltypeid",
+            "label": "结算方式",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 8,
+            "prop": "currency",
+            "label": "币别",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 9,
+            "prop": "exrate",
+            "label": "汇率",
+            "overHidden": true,
+            "cell": true,
+            "width": 80
+        },
+        {
+            "index": 10,
+            "prop": "taxrate",
+            "label": "税率",
+            "overHidden": true,
+            "cell": true,
+            "width": 80
+        },
+        {
+            "index": 11,
+            "prop": "businessType",
+            "label": "作业类型",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 12,
+            "prop": "mblno",
+            "label": "提单号",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 13,
+            "prop": "productName",
+            "label": "品名",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 14,
+            "prop": "marks",
+            "label": "品牌",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 15,
+            "prop": "srcTypeId",
+            "label": "来源",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 16,
+            "prop": "accamount",
+            "label": "对账金额",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 17,
+            "prop": "stlamount",
+            "label": "结算金额",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 18,
+            "prop": "stlamountDate",
+            "label": "结算日期",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        },
+        {
+            "index": 19,
+            "prop": "remark",
+            "label": "备注",
+            "overHidden": true,
+            "cell": true,
+            "width": 100
+        }
+    ]
+}

src/components/payment/main.vue

@@ -0,0 +1,109 @@
+<template>
+    <div>
+        <trade-card title="付款信息">
+            <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
+                @resetColumn="resetColumn" :cell-style="cellStyle">
+                <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>
+                </template>
+            </avue-crud>
+        </trade-card>
+    </div>
+</template>
+
+<script>
+import tableOption from "./config/mainList.json";
+export default {
+    name: "detailsPageEdit",
+    data() {
+        return {
+            treeStyle: "height:" + (window.innerHeight - 315) + "px",
+            tableOption: {},
+        };
+    },
+    props: {
+        data: {
+            type: Array
+        }
+    },
+    async created() {
+        this.tableOption = await this.getColumnData(
+            this.getColumnName(161.2),
+            tableOption
+        );
+    },
+    methods: {
+        cellStyle() {
+            return "padding:0;height:40px;";
+        },
+        addBut() {
+            this.$emit('addBut')
+        },
+        addRow() {
+            this.data.push({ $cellEdit: true });
+        },
+        addJFA() {
+
+        },
+        rowCell(row, index) {
+            if (row.$cellEdit == true) {
+                this.$set(row, "$cellEdit", false);
+            } else {
+                this.$set(row, "$cellEdit", true);
+            }
+        },
+        rowDel(row) {
+            this.$confirm("确定删除数据?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.$message({
+                    type: "success",
+                    message: "删除成功!"
+                });
+                this.data.splice(row.$index, 1);
+            });
+        },
+        async saveColumn() {
+            const inSave = await this.saveColumnData(
+                this.getColumnName(161.2),
+                this.tableOption
+            );
+            if (inSave) {
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                });
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs.crud.$refs.dialogColumn.columnBox = false;
+            }
+        },
+        async resetColumn() {
+            this.tableOption = tableOption;
+            const inSave = await this.delColumnData(
+                this.getColumnName(161.2),
+                tableOption
+            );
+            if (inSave) {
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                });
+                this.$message.success("重置成功");
+                //关闭窗口
+                setTimeout(() => {
+                    this.$refs.crud.$refs.dialogColumn.columnBox = false;
+                }, 1000);
+            }
+        }
+    },
+    watch: {
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/enums/column-name.js

@@ -626,6 +626,18 @@ const columnName = [{
     name: '产品信息-主图附件'
   },
   {
+    code: 161.1,
+    name: '仓库-收款信息'
+  },
+  {
+    code: 161.2,
+    name: '仓库-付款信息'
+  },
+  {
+    code: 161.3,
+    name: '仓库-附件明细'
+  },
+  {
     code: 161,
     name: '入库-列表页'
   },

src/router/views/index.js

@@ -906,6 +906,62 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/purchase/stockBill/index')
   }]
 },
+{
+  path: '/statisticAnalysis/dataDetail/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/statisticAnalysis/dataDetail/index',
+    name: "数据明细(N)",
+    meta: {
+      i18n: '/statisticAnalysis/dataDetail/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/dataDetail/index')
+  }]
+},
+{
+  path: '/statisticAnalysis/dataDetail/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/statisticAnalysis/dataDetail/index',
+    name: "数据明细(N)",
+    meta: {
+      i18n: '/statisticAnalysis/dataDetail/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/dataDetail/index')
+  }]
+},
+{
+  path: '/statisticAnalysis/salesmanCommission/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/statisticAnalysis/salesmanCommission/index',
+    name: "销售人员提成(N)",
+    meta: {
+      i18n: '/statisticAnalysis/salesmanCommission/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/salesmanCommission/index')
+  }]
+},
+{
+  path: '/statisticAnalysis/salesDetails/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/statisticAnalysis/salesDetails/index',
+    name: "销售明细(N)",
+    meta: {
+      i18n: '/statisticAnalysis/salesDetails/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/salesDetails/index')
+  }]
+},
 //利润分析
 {
   path: '/statisticAnalysis/profit/index',

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -95,9 +95,11 @@
                   <el-option v-for="(item, index) in settingOption" :key="index" :label="item.dictValue"
                     :value="item.dictValue"></el-option>
                 </el-select>
-                <el-date-picker v-else-if="item.prop === 'c'" v-model="form[item.prop]" type="month" size="small"
-                  format="yyyy年MM月05日" value-format="yyyy-MM-05" placeholder="请选择月" style="width: 100%;">
-                </el-date-picker>
+                <el-select v-else-if="item.prop === 'c'" v-model="form[item.prop]" clearable filterable size="small"
+                  style="width: 100%;" @change="cChange">
+                  <el-option v-for="(item, index) in monthOption" :key="index" :label="item.dictValue"
+                    :value="item.dictKey"></el-option>
+                </el-select>
                 <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
@@ -390,7 +392,7 @@ export default {
           {
             label: "账户名称",
             prop: "accountName",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -402,7 +404,7 @@ export default {
           {
             label: "开户银行",
             prop: "accountBank",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -414,7 +416,7 @@ export default {
           {
             label: "银行帐号",
             prop: "accountNo",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -426,7 +428,7 @@ export default {
           {
             label: "CNAPS",
             prop: "cnaps",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -438,7 +440,7 @@ export default {
           {
             label: "银行地址",
             prop: "localBankAddress",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -450,7 +452,7 @@ export default {
           {
             label: "外币账户名称",
             prop: "accountNameFcy",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -462,7 +464,7 @@ export default {
           {
             label: "外币开户银行",
             prop: "accountBankFcy",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -474,7 +476,7 @@ export default {
           {
             label: "外币银行账号",
             prop: "accountNoFcy",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -486,7 +488,7 @@ export default {
           {
             label: "Swift Code",
             prop: "swiftCode",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -498,7 +500,7 @@ export default {
           {
             label: "外币银行地址",
             prop: "foreignBankAddress",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -510,7 +512,7 @@ export default {
           {
             label: "授信状态",
             prop: "creditstatus",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -522,7 +524,7 @@ export default {
           {
             label: "授信等级",
             prop: "creditLevel",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -534,7 +536,7 @@ export default {
           {
             label: "授信额度",
             prop: "creditGrant",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -546,7 +548,7 @@ export default {
           {
             label: "授信天数",
             prop: "creditDay",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -558,7 +560,7 @@ export default {
           {
             label: "授信利率",
             prop: "creditRate",
-            span:8,
+            span: 8,
             rules: [
               {
                 required: false,
@@ -569,59 +571,65 @@ export default {
           },
           {
             label: "FOB系数",
-            span:8,
+            span: 8,
             prop: "coefficient"
           },
           {
             label: "付款方式",
-            span:8,
+            span: 8,
             prop: "paymentType"
           },
           {
             label: "包装要求",
-            span:8,
+            span: 8,
             prop: "packageRemarks"
           },
           {
             label: "账期设置",
-            span:8,
+            span: 8,
             prop: "a"
           },
           {
             label: "天数",
-            span:8,
+            span: 8,
             hide: true,
             prop: "b"
           },
           {
-            label: "每月某日结清",
-            span:8,
+            label: "结清月份",
+            span: 8,
             hide: true,
             prop: "c"
           },
           {
+            label: "结清天数",
+            span: 8,
+            hide: true,
+            prop: "j"
+          },
+          {
             label: "日利息万分",
-            span:8,
+            span: 8,
             prop: "d"
           },
           {
             label: "最大欠款额",
-            span:8,
+            span: 8,
             prop: "e"
           },
           {
             label: "协议号",
-            span:8,
+            span: 8,
             prop: "f"
           },
           {
             label: "账期日期",
-            span:8,
+            span: 8,
             prop: "g"
           },
           {
             label: "账期备注",
-            span:24,
+            span: 24,
             prop: "h"
           }
         ]
@@ -757,6 +765,7 @@ export default {
       },
       paymentOption: [],
       settingOption: [],
+      monthOption: [],
       addressOption: {},
       addressForm: {},
       addressData: [],
@@ -822,9 +831,13 @@ export default {
     this.getWorkDicts("account_period").then(res => {
       this.settingOption = res.data.data;
     });
+    this.getWorkDicts("month").then(res => {
+      this.monthOption = res.data.data;
+    });
     this.getWorkDicts("credit_rating").then(res => {
       this.creditRatingList = res.data.data;
     });
+
     if (this.detailData.id) {
       detail(this.detailData.id).then(res => {
         if (res.data.data.adminProfiles) {
@@ -965,6 +978,9 @@ export default {
           if (e.prop == 'c') {
             e.hide = false
           }
+          if (e.prop == 'j') {
+            e.hide = false
+          }
         })
       } else if (row == '业务后') {
         this.financialInformation.column.forEach(e => {
@@ -974,6 +990,9 @@ export default {
           if (e.prop == 'c') {
             e.hide = true
           }
+          if (e.prop == 'j') {
+            e.hide = true
+          }
         })
       } else {
         this.financialInformation.column.forEach(e => {
@@ -983,6 +1002,9 @@ export default {
           if (e.prop == 'c') {
             e.hide = true
           }
+          if (e.prop == 'j') {
+            e.hide = true
+          }
         })
       }
     },

src/views/statisticAnalysis/dataDetail/index.vue

@@ -8,6 +8,12 @@
         <template slot="menuLeft">
           <el-button type="info" size="small" @click="outExport" icon="el-icon-download">导出</el-button>
         </template>
+        <template slot="corpNameSearch">
+          <crop-select v-model="search.corpName" corpType="KH" :zhKey="true"></crop-select>
+        </template>
+        <template slot="belongCompanySearch">
+          <crop-select v-model="search.belongCompany" corpType="GS" :zhKey="true"></crop-select>
+        </template>
       </avue-crud>
     </basic-container>
   </div>

src/views/statisticAnalysis/salesDetails/index.vue

@@ -122,7 +122,7 @@ export default {
             label: "日期",
             prop: "careteTime",
             type: "datetime",
-            format: 'yyyy-MM-dd HH:mm:ss',
+            format: 'yyyy-MM-dd',
             valueFormat: 'yyyy-MM-dd HH:mm:ss',
             searchRange: true,
             searchDefaultTime: ['00:00:00', '23:59:59'],

src/views/warehousing/goodsTransfer/config/mainList.json

@@ -17,7 +17,7 @@
   "column": [
     {
       "index": 1,
-      "prop": "fMblno",
+      "prop": "mblno",
       "label": "提单号",
       "overHidden": true,
       "width": 100
@@ -31,98 +31,98 @@
     },
     {
       "index": 3,
-      "prop": "fItemsStatus",
+      "prop": "itemsStatus",
       "label": "货转状态",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 4,
-      "prop": "fFeeStatus",
+      "prop": "feeStatus",
       "label": "费用状态",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 5,
-      "prop": "fCorpid",
+      "prop": "corpid",
       "label": "客户",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 6,
-      "prop": "fTocorpid",
+      "prop": "tocorpid",
       "label": "转客户",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 7,
-      "prop": "fProductName",
+      "prop": "productName",
       "label": "品名",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 8,
-      "prop": "fMarks",
+      "prop": "marks",
       "label": "品牌",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 9,
-      "prop": "fBillno",
+      "prop": "billno",
       "label": "业务编号",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 10,
-      "prop": "fBsdate",
+      "prop": "bsdate",
       "label": "货转日期",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 11,
-      "prop": "fTrademodeid",
+      "prop": "trademodeid",
       "label": "贸易方式",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 12,
-      "prop": "fWarehouseid",
+      "prop": "warehouseid",
       "label": "仓库",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 13,
-      "prop": "fQty",
+      "prop": "qty",
       "label": "件数",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 14,
-      "prop": "fGrossweight",
+      "prop": "grossweight",
       "label": "毛重(kg)",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 15,
-      "prop": "fNetweight",
+      "prop": "netweight",
       "label": "净重(kg)",
       "overHidden": true,
       "width": 100
     },
     {
       "index": 16,
-      "prop": "fBillno",
+      "prop": "billno",
       "label": "系统编号",
       "overHidden": true,
       "width": 100

src/views/warehousing/goodsTransfer/detailsPage.vue

@@ -20,17 +20,21 @@
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
         </avue-form>
       </trade-card>
-      <trade-card title="入库明细">
+      <trade-card title="货转明细">
         <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
           @resetColumn="resetColumn" :cell-style="cellStyle">
         </avue-crud>
       </trade-card>
+      <collection :data="[]" />
+      <payment :data="[]" />
     </div>
   </div>
 </template>
 
 <script>
 import tableOption from "./config/customerContact.json";
+import collection from "@/components/collection/main";
+import payment from "@/components/payment/main";
 export default {
   name: "detailsPageEdit",
   data() {
@@ -140,6 +144,10 @@ export default {
       type: Object
     }
   },
+  components: {
+    collection,
+    payment
+  },
   async created() {
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);

src/views/warehousing/inStock/detailsPage.vue

@@ -25,12 +25,18 @@
           @resetColumn="resetColumn" :cell-style="cellStyle">
         </avue-crud>
       </trade-card>
+      <annex :data="[]"/>
+      <collection ref="collection" :data="[]" @addBut="addRowCol" />
+      <payment ref="payment" :data="[]" @addBut="addRowPay" />
     </div>
   </div>
 </template>
 
 <script>
 import tableOption from "./config/customerContact.json";
+import collection from "@/components/collection/main";
+import payment from "@/components/payment/main";
+import annex from "@/components/annex/main";
 export default {
   name: "detailsPageEdit",
   data() {
@@ -66,7 +72,6 @@ export default {
             prop: "bsdate",
             span: 6
           },
-
           {
             label: "入库时间",
             prop: "bstime",
@@ -215,6 +220,11 @@ export default {
       type: Object
     }
   },
+  components: {
+    collection,
+    payment,
+    annex
+  },
   async created() {
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
@@ -232,6 +242,12 @@ export default {
     addRow() {
       this.data.push({ $cellEdit: true });
     },
+    addRowCol() {
+      this.$refs.collection.addRow()
+    },
+    addRowPay() {
+      this.$refs.payment.addRow()
+    },
     rowCell(row, index) {
       if (row.$cellEdit == true) {
         this.$set(row, "$cellEdit", false);

src/views/warehousing/outStock/detailsPage.vue

@@ -25,12 +25,17 @@
           @resetColumn="resetColumn" :cell-style="cellStyle">
         </avue-crud>
       </trade-card>
+      <collection :data="[]" />
+      <payment :data="[]" />
     </div>
+
   </div>
 </template>
 
 <script>
 import tableOption from "./config/customerContact.json";
+import collection from "@/components/collection/main";
+import payment from "@/components/payment/main";
 export default {
   name: "detailsPageEdit",
   data() {
@@ -174,6 +179,10 @@ export default {
       type: Object
     }
   },
+  components: {
+    collection,
+    payment
+  },
   async created() {
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);

src/views/warehousing/stockTransfer/detailsPage.vue

@@ -20,17 +20,21 @@
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
         </avue-form>
       </trade-card>
-      <trade-card title="入库明细">
+      <trade-card title="调拨明细">
         <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
           @resetColumn="resetColumn" :cell-style="cellStyle">
         </avue-crud>
       </trade-card>
+      <collection :data="[]" />
+      <payment :data="[]" />
     </div>
   </div>
 </template>
 
 <script>
 import tableOption from "./config/customerContact.json";
+import collection from "@/components/collection/main";
+import payment from "@/components/payment/main";
 export default {
   name: "detailsPageEdit",
   data() {
@@ -179,6 +183,10 @@ export default {
       type: Object
     }
   },
+  components: {
+    collection,
+    payment
+  },
   async created() {
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);