Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/components/annex/main.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <trade-card title="明细附件">
+        <trade-card title="明细附件" :show="false">
             <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
                 @resetColumn="resetColumn" :cell-style="cellStyle">
                 <template slot="menuLeft">

src/components/collection/main.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <trade-card title="收费信息">
+        <trade-card title="收费信息" :show="false">
             <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
                 @resetColumn="resetColumn" :cell-style="cellStyle" @selection-change="selectionChange">
                 <template slot="menuLeft">

src/components/payment/main.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <trade-card title="付款信息">
+        <trade-card title="付款信息" :show="false">
             <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
                 @resetColumn="resetColumn" :cell-style="cellStyle" @selection-change="selectionChange">
                 <template slot="menuLeft">

src/components/trade-card/main.vue

@@ -5,7 +5,7 @@
         <div class="redcolumn"></div>
         <div class="container-title">{{ title }}</div>
       </div>
-      <div class="container-foot" @click="show = !show">
+      <div v-if="showBtn" class="container-foot" @click="show = !show">
         <div v-show="show" style="height: 20px">
           <span><i class="el-icon-arrow-up" /></span>
         </div>
@@ -32,8 +32,7 @@ export default {
   name: "basicContainer",
   data() {
     return {
-      show: true,
-      showSpan: false
+
     };
   },
   props: {
@@ -50,11 +49,15 @@ export default {
     },
     showBtn: {
       type: Boolean,
-      default: false
+      default: true
     },
     title: {
       type: String
-    }
+    },
+    show: {
+      type: Boolean,
+      default: true
+    },
   },
   methods: {
   },

src/views/analyze/inventory/config/customerContact.json

@@ -8,9 +8,9 @@
   "addBtn": false,
   "delBtn": false,
   "headerAlign": "center",
-  "menuWidth": 150,
   "refreshBtn": false,
   "showSummary": true,
+  "menu":false,
   "column": [
     {
       "index": 1,

src/views/analyze/inventory/config/mainList.json

@@ -9,12 +9,12 @@
   "delBtn": false,
   "addBtn": false,
   "headerAlign": "center",
-  "menuWidth": "70",
   "showSummary": true,
   "searchIcon": true,
   "searchIndex": 2,
   "selection": true,
   "tip": false,
+  "menu":false,
   "column": [
     {
       "index": 1,

src/views/analyze/payable/config/customerContact.json

@@ -0,0 +1,108 @@
+{
+  "searchShow": true,
+  "searchMenuSpan": 6,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "addBtn": false,
+  "delBtn": false,
+  "headerAlign": "center",
+  "menuWidth": 150,
+  "refreshBtn": false,
+  "showSummary": true,
+  "menu":false,
+  "column": [
+    {
+      "index": 1,
+      "prop": "ffeeslabel",
+      "label": "结算单位",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 2,
+      "prop": "fmblno",
+      "label": "提单号",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 3,
+      "prop": "fproductlabel",
+      "label": "货物名称",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 4,
+      "prop": "fmarks",
+      "label": "品牌",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 5,
+      "prop": "fBilltype",
+      "label": "业务类型",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 6,
+      "prop": "fReviewDate",
+      "label": "审核日期",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 7,
+      "prop": "storageFee",
+      "label": "仓储费金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 8,
+      "prop": "otherFee",
+      "label": "其他金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 9,
+      "prop": "famount",
+      "label": "应付金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 10,
+      "prop": "fstlamount",
+      "label": "实付金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 11,
+      "prop": "nnfinished",
+      "label": "未付金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 12,
+      "prop": "faccamount",
+      "label": "对账金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 13,
+      "prop": "finvamount",
+      "label": "开票金额",
+      "overHidden": true,
+      "width": 130
+    }
+  ]
+}

src/views/analyze/payable/config/mainList.json

@@ -0,0 +1,100 @@
+{
+  "searchShow": true,
+  "searchSpan": 8,
+  "searchMenuSpan": 16,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "addBtn": false,
+  "headerAlign": "center",
+  "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "selection": true,
+  "tip": false,
+  "menu":false,
+  "column": [
+    {
+      "index": 1,
+      "prop": "ffeeslabel",
+      "label": "结算单位",
+      "search": true,
+      "overHidden": true,
+      "width": 250
+    },
+    {
+      "index": 2,
+      "prop": "reviewDate",
+      "label": "年月",
+      "overHidden": true,
+      "width": 120
+    },
+    {
+      "index": 3,
+      "prop": "famount",
+      "label": "应付金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 4,
+      "prop": "fstlamount",
+      "label": "实付金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 5,
+      "prop": "nnfinished",
+      "label": "未付金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 6,
+      "prop": "faccamount",
+      "label": "对账金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 7,
+      "prop": "finvamount",
+      "label": "开票金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 8,
+      "prop": "isReviewed",
+      "label": "费用状态",
+      "search": true,
+      "hide": true,
+      "showColumn": false,
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 9,
+      "prop": "timeExamine",
+      "label": "区间",
+      "search": true,
+      "hide": true,
+      "showColumn": false,
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 10,
+      "prop": "fReconciliation",
+      "label": "显示0余额",
+      "search": true,
+      "hide": true,
+      "showColumn": false,
+      "overHidden": true,
+      "width": 130
+    }
+  ]
+}

src/views/analyze/payable/detailsPage.vue

@@ -0,0 +1,114 @@
+<template>
+  <div class="borderless" v-loading="pageLoading">
+    <div class="customer-head">
+      <div class="customer-back">
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+          @click="backToList">返回列表
+        </el-button>
+      </div>
+    </div>
+    <div class="customer-main">
+      <trade-card title="基础明细">
+        <avue-crud ref="crud" :data="data" :option="tableOption" @saveColumn="saveColumn" @resetColumn="resetColumn"
+          :cell-style="cellStyle">
+        </avue-crud>
+      </trade-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import tableOption from "./config/customerContact.json";
+export default {
+  name: "detailsPageEdit",
+  data() {
+    return {
+      show: true,
+      treeStyle: "height:" + (window.innerHeight - 315) + "px",
+      disabled: false,
+      tableOption: {},
+      data: [],
+    };
+  },
+  props: {
+    detailData: {
+      type: Object
+    }
+  },
+  async created() {
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
+    this.tableOption = await this.getColumnData(
+      this.getColumnName(179.1),
+      tableOption
+    );
+
+  },
+  methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    getDetail(id) {
+      this.loading = true;
+      this.pageLoading = true;
+    },
+    //返回列表
+    backToList() {
+      this.$emit("goBack");
+    },
+    openEdit() {
+      this.detailData.status = 2;
+      this.option = this.$options.data().option;
+      this.$refs.crud.refreshTable();
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(179.1),
+        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(179.1),
+        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>
+.trading-form ::v-deep .el-form-item {
+  margin-bottom: 8px !important;
+}
+
+::v-deep .el-form-item__error {
+  display: none !important;
+}
+
+::v-deep .select-component {
+  display: flex !important;
+}
+</style>

src/views/analyze/payable/index.vue

@@ -0,0 +1,158 @@
+<template>
+    <div>
+        <basic-container v-show="show" class="page-crad">
+            <avue-crud ref="crud" :option="option" :data="dataList" v-model="form" :page.sync="page"
+                :search.sync="search" @search-change="searchChange" @current-change="currentChange"
+                @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading"
+                @saveColumn="saveColumn" @resetColumn="resetColumn" :cell-style="cellStyle"
+                @selection-change="selectionChange" @search-criteria-switch="searchCriteriaSwitch">
+                <template slot-scope="{row}" slot="ffeeslabel">
+                    <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 1)">{{
+                            row.ffeeslabel
+                    }}
+                    </span>
+                </template>
+            </avue-crud>
+        </basic-container>
+        <detail-page @goBack="goBack" :detailData="detailData" v-if="!show"></detail-page>
+    </div>
+</template>
+
+<script>
+import option from "./config/mainList.json";
+import detailPage from "./detailsPage";
+import _ from "lodash";
+export default {
+    name: "customerInformation",
+    data() {
+        return {
+            search: {},
+            form: {},
+            option: {},
+            dataList: [{
+                ffeeslabel: '1111'
+            }],
+            page: {
+                pageSize: 20,
+                currentPage: 1,
+                total: 0,
+                pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+            },
+            show: true,
+            detailData: {},
+            loading: false,
+            searchShow: true,
+            selectionList: [],
+        };
+    },
+    components: { detailPage },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(179), option);
+        this.option.height = window.innerHeight - 210;
+    },
+    methods: {
+        searchCriteriaSwitch(type) {
+            if (type) {
+                this.option.height = this.option.height - 191;
+            } else {
+                this.option.height = this.option.height + 191;
+            }
+            this.$refs.crud.getTableHeight();
+        },
+        cellStyle() {
+            return "padding:0;height:40px;";
+        },
+        selectionChange(list) {
+            this.selectionList = list;
+        },
+        editOpen(row, status) {
+            this.detailData = {
+                id: row.id,
+                status: status
+            };
+            this.show = false;
+        },
+        //点击搜索按钮触发
+        searchChange(params, done) {
+            this.page.currentPage = 1;
+            this.onLoad(this.page, params);
+            done();
+        },
+        currentChange(val) {
+            this.page.currentPage = val;
+        },
+        sizeChange(val) {
+            this.page.currentPage = 1;
+            this.page.pageSize = val;
+        },
+        onLoad(page, params) {
+            // let data = this.deepClone(Object.assign(params, this.search));
+            // this.loading = true;
+            // getList(page.currentPage, page.pageSize, data)
+            //     .then(res => {
+            //         this.dataList = res.data.data.records ? res.data.data.records : [];
+            //         this.page.total = res.data.data.total;
+            //     })
+            //     .finally(() => {
+            //         this.loading = false;
+            //     });
+        },
+        refreshChange() {
+            this.onLoad(this.page, this.search);
+        },
+        newAdd() {
+            this.show = false;
+        },
+        goBack() {
+            if (this.$route.query.id) {
+                this.$router.$avueRouter.closeTag(this.$route.fullPath);
+                this.$router.push({
+                    path: "/analyze/inventory/index"
+                });
+            }
+            this.detailData = this.$options.data().detailData;
+            this.show = true;
+            this.onLoad(this.page, this.search);
+        },
+        async saveColumn() {
+            const inSave = await this.saveColumnData(
+                this.getColumnName(179),
+                this.option
+            );
+            if (inSave) {
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                });
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs.crud.$refs.dialogColumn.columnBox = false;
+            }
+        },
+        async resetColumn() {
+            this.option = option;
+            const inSave = await this.delColumnData(this.getColumnName(179), this.option);
+            if (inSave) {
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                });
+                this.$message.success("重置成功");
+                this.$refs.crud.$refs.dialogColumn.columnBox = false;
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+::v-deep .select-component {
+    display: flex;
+}
+
+.page-crad ::v-deep .basic-container__card {
+    height: 94.2vh;
+}
+
+.itemTable ::v-deep .el-table {
+    width: 738px;
+}
+</style>

src/views/analyze/receivable/config/customerContact.json

@@ -0,0 +1,108 @@
+{
+  "searchShow": true,
+  "searchMenuSpan": 6,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "addBtn": false,
+  "delBtn": false,
+  "headerAlign": "center",
+  "menuWidth": 150,
+  "refreshBtn": false,
+  "showSummary": true,
+  "menu":false,
+  "column": [
+    {
+      "index": 1,
+      "prop": "ffeeslabel",
+      "label": "结算单位",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 2,
+      "prop": "fmblno",
+      "label": "提单号",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 3,
+      "prop": "fproductlabel",
+      "label": "货物名称",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 4,
+      "prop": "fmarks",
+      "label": "品牌",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 5,
+      "prop": "fBilltype",
+      "label": "业务类型",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 6,
+      "prop": "fReviewDate",
+      "label": "审核日期",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 7,
+      "prop": "storageFee",
+      "label": "仓储费金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 8,
+      "prop": "otherFee",
+      "label": "其他金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 9,
+      "prop": "famount",
+      "label": "应收金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 10,
+      "prop": "fstlamount",
+      "label": "实收金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 11,
+      "prop": "nnfinished",
+      "label": "未收金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 12,
+      "prop": "faccamount",
+      "label": "对账金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 13,
+      "prop": "finvamount",
+      "label": "开票金额",
+      "overHidden": true,
+      "width": 130
+    }
+  ]
+}

src/views/analyze/receivable/config/mainList.json

@@ -0,0 +1,100 @@
+{
+  "searchShow": true,
+  "searchSpan": 8,
+  "searchMenuSpan": 16,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "addBtn": false,
+  "headerAlign": "center",
+  "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "selection": true,
+  "tip": false,
+  "menu":false,
+  "column": [
+    {
+      "index": 1,
+      "prop": "ffeeslabel",
+      "label": "结算单位",
+      "search": true,
+      "overHidden": true,
+      "width": 250
+    },
+    {
+      "index": 2,
+      "prop": "reviewDate",
+      "label": "年月",
+      "overHidden": true,
+      "width": 120
+    },
+    {
+      "index": 3,
+      "prop": "famount",
+      "label": "应收金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 4,
+      "prop": "fstlamount",
+      "label": "实收金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 5,
+      "prop": "nnfinished",
+      "label": "未收金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 6,
+      "prop": "faccamount",
+      "label": "对账金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 7,
+      "prop": "finvamount",
+      "label": "开票金额",
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 8,
+      "prop": "isReviewed",
+      "label": "费用状态",
+      "search": true,
+      "hide": true,
+      "showColumn": false,
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 9,
+      "prop": "timeExamine",
+      "label": "区间",
+      "search": true,
+      "hide": true,
+      "showColumn": false,
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "index": 10,
+      "prop": "fReconciliation",
+      "label": "显示0余额",
+      "search": true,
+      "hide": true,
+      "showColumn": false,
+      "overHidden": true,
+      "width": 130
+    }
+  ]
+}

src/views/analyze/receivable/detailsPage.vue

@@ -0,0 +1,114 @@
+<template>
+  <div class="borderless" v-loading="pageLoading">
+    <div class="customer-head">
+      <div class="customer-back">
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+          @click="backToList">返回列表
+        </el-button>
+      </div>
+    </div>
+    <div class="customer-main">
+      <trade-card title="基础明细">
+        <avue-crud ref="crud" :data="data" :option="tableOption" @saveColumn="saveColumn" @resetColumn="resetColumn"
+          :cell-style="cellStyle">
+        </avue-crud>
+      </trade-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import tableOption from "./config/customerContact.json";
+export default {
+  name: "detailsPageEdit",
+  data() {
+    return {
+      show: true,
+      treeStyle: "height:" + (window.innerHeight - 315) + "px",
+      disabled: false,
+      tableOption: {},
+      data: [],
+    };
+  },
+  props: {
+    detailData: {
+      type: Object
+    }
+  },
+  async created() {
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
+    this.tableOption = await this.getColumnData(
+      this.getColumnName(178.1),
+      tableOption
+    );
+
+  },
+  methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    getDetail(id) {
+      this.loading = true;
+      this.pageLoading = true;
+    },
+    //返回列表
+    backToList() {
+      this.$emit("goBack");
+    },
+    openEdit() {
+      this.detailData.status = 2;
+      this.option = this.$options.data().option;
+      this.$refs.crud.refreshTable();
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(178.1),
+        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(178.1),
+        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>
+.trading-form ::v-deep .el-form-item {
+  margin-bottom: 8px !important;
+}
+
+::v-deep .el-form-item__error {
+  display: none !important;
+}
+
+::v-deep .select-component {
+  display: flex !important;
+}
+</style>

src/views/analyze/receivable/index.vue

@@ -0,0 +1,158 @@
+<template>
+    <div>
+        <basic-container v-show="show" class="page-crad">
+            <avue-crud ref="crud" :option="option" :data="dataList" v-model="form" :page.sync="page"
+                :search.sync="search" @search-change="searchChange" @current-change="currentChange"
+                @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading"
+                @saveColumn="saveColumn" @resetColumn="resetColumn" :cell-style="cellStyle"
+                @selection-change="selectionChange" @search-criteria-switch="searchCriteriaSwitch">
+                <template slot-scope="{row}" slot="ffeeslabel">
+                    <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 1)">{{
+                            row.ffeeslabel
+                    }}
+                    </span>
+                </template>
+            </avue-crud>
+        </basic-container>
+        <detail-page @goBack="goBack" :detailData="detailData" v-if="!show"></detail-page>
+    </div>
+</template>
+
+<script>
+import option from "./config/mainList.json";
+import detailPage from "./detailsPage";
+import _ from "lodash";
+export default {
+    name: "customerInformation",
+    data() {
+        return {
+            search: {},
+            form: {},
+            option: {},
+            dataList: [{
+                ffeeslabel: '1111'
+            }],
+            page: {
+                pageSize: 20,
+                currentPage: 1,
+                total: 0,
+                pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+            },
+            show: true,
+            detailData: {},
+            loading: false,
+            searchShow: true,
+            selectionList: [],
+        };
+    },
+    components: { detailPage },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(178), option);
+        this.option.height = window.innerHeight - 210;
+    },
+    methods: {
+        searchCriteriaSwitch(type) {
+            if (type) {
+                this.option.height = this.option.height - 191;
+            } else {
+                this.option.height = this.option.height + 191;
+            }
+            this.$refs.crud.getTableHeight();
+        },
+        cellStyle() {
+            return "padding:0;height:40px;";
+        },
+        selectionChange(list) {
+            this.selectionList = list;
+        },
+        editOpen(row, status) {
+            this.detailData = {
+                id: row.id,
+                status: status
+            };
+            this.show = false;
+        },
+        //点击搜索按钮触发
+        searchChange(params, done) {
+            this.page.currentPage = 1;
+            this.onLoad(this.page, params);
+            done();
+        },
+        currentChange(val) {
+            this.page.currentPage = val;
+        },
+        sizeChange(val) {
+            this.page.currentPage = 1;
+            this.page.pageSize = val;
+        },
+        onLoad(page, params) {
+            // let data = this.deepClone(Object.assign(params, this.search));
+            // this.loading = true;
+            // getList(page.currentPage, page.pageSize, data)
+            //     .then(res => {
+            //         this.dataList = res.data.data.records ? res.data.data.records : [];
+            //         this.page.total = res.data.data.total;
+            //     })
+            //     .finally(() => {
+            //         this.loading = false;
+            //     });
+        },
+        refreshChange() {
+            this.onLoad(this.page, this.search);
+        },
+        newAdd() {
+            this.show = false;
+        },
+        goBack() {
+            if (this.$route.query.id) {
+                this.$router.$avueRouter.closeTag(this.$route.fullPath);
+                this.$router.push({
+                    path: "/analyze/inventory/index"
+                });
+            }
+            this.detailData = this.$options.data().detailData;
+            this.show = true;
+            this.onLoad(this.page, this.search);
+        },
+        async saveColumn() {
+            const inSave = await this.saveColumnData(
+                this.getColumnName(178),
+                this.option
+            );
+            if (inSave) {
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                });
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs.crud.$refs.dialogColumn.columnBox = false;
+            }
+        },
+        async resetColumn() {
+            this.option = option;
+            const inSave = await this.delColumnData(this.getColumnName(178), this.option);
+            if (inSave) {
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                });
+                this.$message.success("重置成功");
+                this.$refs.crud.$refs.dialogColumn.columnBox = false;
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+::v-deep .select-component {
+    display: flex;
+}
+
+.page-crad ::v-deep .basic-container__card {
+    height: 94.2vh;
+}
+
+.itemTable ::v-deep .el-table {
+    width: 738px;
+}
+</style>

src/views/warehousing/goodsTransfer/detailsPage.vue

@@ -18,6 +18,9 @@
     <div class="customer-main">
       <trade-card title="基础信息">
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
+          <template slot-scope="{}" slot="corpidLabel">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="khEdit">客户名称:</span>
+          </template>
         </avue-form>
       </trade-card>
       <trade-card title="货转明细">
@@ -25,6 +28,7 @@
           @resetColumn="resetColumn" :cell-style="cellStyle">
         </avue-crud>
       </trade-card>
+      <annex :data="[]" />
       <collection :data="[]" />
       <payment :data="[]" />
     </div>
@@ -35,6 +39,7 @@
 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() {
@@ -146,7 +151,8 @@ export default {
   },
   components: {
     collection,
-    payment
+    payment,
+    annex
   },
   async created() {
     if (this.detailData.id) {
@@ -162,6 +168,9 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    khEdit() {
+      this.$router.push('/basicData/customerInformation/index')
+    },
     addRow() {
       this.data.push({ $cellEdit: true });
     },

src/views/warehousing/inStock/detailsPage.vue

@@ -18,6 +18,13 @@
     <div class="customer-main">
       <trade-card title="基础信息">
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
+          <template slot-scope="{}" slot="corpidLabel">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="khEdit">客户名称:</span>
+          </template>
+        </avue-form>
+      </trade-card>
+      <trade-card title="更多信息" :show="false">
+        <avue-form class="trading-form" v-model="form" :option="option2">
         </avue-form>
       </trade-card>
       <trade-card title="入库明细">
@@ -25,7 +32,7 @@
           @resetColumn="resetColumn" :cell-style="cellStyle">
         </avue-crud>
       </trade-card>
-      <annex :data="[]"/>
+      <annex :data="[]" />
       <collection ref="collection" :data="[]" @addBut="addRowCol" />
       <payment ref="payment" :data="[]" @addBut="addRowPay" />
     </div>
@@ -55,11 +62,25 @@ export default {
           {
             label: "客户名称",
             prop: "corpid",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
             label: "提单号",
             prop: "mblno",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
@@ -70,32 +91,74 @@ export default {
           {
             label: "计划日期",
             prop: "bsdate",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
             label: "入库时间",
             prop: "bstime",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
             label: "仓储费方式",
             prop: "chargetype",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
             label: "品名",
             prop: "goodsid",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
             label: "仓库",
             prop: "warehouseid",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
 
           {
             label: "仓管员",
             prop: "storekeeper",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
@@ -106,11 +169,13 @@ export default {
           {
             label: "计费单位",
             prop: "feetUnit",
-            span: 6
-          },
-          {
-            label: "作业类型",
-            prop: "businessType",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
@@ -121,76 +186,49 @@ export default {
           {
             label: "计划件数",
             prop: "planqty",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
             label: "计划毛重(kg)",
             prop: "plangrossweight",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
             label: "计划净重(kg)",
             prop: "plannetweight",
-            span: 6
-          },
-          {
-            label: "计费单位",
-            prop: "feetUnit",
-            span: 6
-          },
-          {
-            label: "作业类型",
-            prop: "businessType",
-            span: 6
-          },
-          {
-            label: "劳务公司",
-            prop: "labour",
-            span: 6
-          },
-          {
-            label: "车队",
-            prop: "fleet",
-            span: 6
-          },
-          {
-            label: "结算方式",
-            prop: "stltypeid",
-            span: 6
-          },
-          {
-            label: "车号",
-            prop: "truckno",
-            span: 6
-          },
-          {
-            label: "司机姓名",
-            prop: "driverName",
-            span: 6
-          },
-          {
-            label: "司机身份证",
-            prop: "driverIdCar",
-            span: 6
-          },
-          {
-            label: "司机电话",
-            prop: "driverTel",
-            span: 6
-          },
-          {
-            label: "发货方(货主)",
-            prop: "shipper",
-            span: 6
-          },
-          {
-            label: "打印抬头",
-            prop: "company",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
             label: "备案序号",
             prop: "emsSeqNo",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
@@ -209,6 +247,60 @@ export default {
           }
         ]
       },
+      option2: {
+        menuBtn: false,
+        labelWidth: 100,
+        column: [{
+          label: "作业类型",
+          prop: "businessType",
+          span: 6
+        },
+        {
+          label: "劳务公司",
+          prop: "labour",
+          span: 6
+        },
+        {
+          label: "车队",
+          prop: "fleet",
+          span: 6
+        },
+        {
+          label: "结算方式",
+          prop: "stltypeid",
+          span: 6
+        },
+        {
+          label: "车号",
+          prop: "truckno",
+          span: 6
+        },
+        {
+          label: "司机姓名",
+          prop: "driverName",
+          span: 6
+        },
+        {
+          label: "司机身份证",
+          prop: "driverIdCar",
+          span: 6
+        },
+        {
+          label: "司机电话",
+          prop: "driverTel",
+          span: 6
+        },
+        {
+          label: "发货方(货主)",
+          prop: "shipper",
+          span: 6
+        },
+        {
+          label: "打印抬头",
+          prop: "company",
+          span: 6
+        }]
+      },
       data: [],
       loading: false,
       subLoading: false,
@@ -239,6 +331,9 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    khEdit() {
+      this.$router.push('/basicData/customerInformation/index')
+    },
     addRow() {
       this.data.push({ $cellEdit: true });
     },

src/views/warehousing/outStock/detailsPage.vue

@@ -18,6 +18,13 @@
     <div class="customer-main">
       <trade-card title="基础信息">
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
+          <template slot-scope="{}" slot="corpidLabel">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="khEdit">客户名称:</span>
+          </template>
+        </avue-form>
+      </trade-card>
+      <trade-card title="更多信息" :show="false">
+        <avue-form ref="form2" class="trading-form" v-model="form" :option="option2">
         </avue-form>
       </trade-card>
       <trade-card title="出库明细">
@@ -25,6 +32,7 @@
           @resetColumn="resetColumn" :cell-style="cellStyle">
         </avue-crud>
       </trade-card>
+      <annex :data="[]" />
       <collection :data="[]" />
       <payment :data="[]" />
     </div>
@@ -36,6 +44,7 @@
 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() {
@@ -98,11 +107,6 @@ export default {
             span: 6
           },
           {
-            label: "作业类型",
-            prop: "businessType",
-            span: 6
-          },
-          {
             label: "计划件数",
             prop: "planqty",
             span: 6
@@ -118,6 +122,30 @@ export default {
             span: 6
           },
           {
+            label: "备注",
+            prop: "remark",
+            type: "textarea",
+            minRows: 2,
+            span: 12
+          },
+          {
+            label: "收费指示",
+            prop: "remarksFees",
+            type: "textarea",
+            minRows: 2,
+            span: 12
+          }
+        ]
+      },
+      option2: {
+        menuBtn: false,
+        labelWidth: 100,
+        column: [
+          {
+            label: "作业类型",
+            prop: "businessType",
+            span: 6
+          }, {
             label: "劳务公司",
             prop: "labour",
             span: 6
@@ -151,22 +179,7 @@ export default {
             label: "打印抬头",
             prop: "company",
             span: 6
-          },
-          {
-            label: "备注",
-            prop: "remark",
-            type: "textarea",
-            minRows: 2,
-            span: 12
-          },
-          {
-            label: "收费指示",
-            prop: "remarksFees",
-            type: "textarea",
-            minRows: 2,
-            span: 12
-          }
-        ]
+          },]
       },
       data: [],
       loading: false,
@@ -181,7 +194,8 @@ export default {
   },
   components: {
     collection,
-    payment
+    payment,
+    annex
   },
   async created() {
     if (this.detailData.id) {
@@ -197,6 +211,9 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    khEdit() {
+      this.$router.push('/basicData/customerInformation/index')
+    },
     addRow() {
       this.data.push({ $cellEdit: true });
     },

src/views/warehousing/stockTransfer/detailsPage.vue

@@ -18,6 +18,13 @@
     <div class="customer-main">
       <trade-card title="基础信息">
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
+          <template slot-scope="{}" slot="corpidLabel">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="khEdit">客户名称:</span>
+          </template>
+        </avue-form>
+      </trade-card>
+      <trade-card title="更多信息" :show="false">
+        <avue-form ref="form2" class="trading-form" v-model="form" :option="option2">
         </avue-form>
       </trade-card>
       <trade-card title="调拨明细">
@@ -25,6 +32,7 @@
           @resetColumn="resetColumn" :cell-style="cellStyle">
         </avue-crud>
       </trade-card>
+      <annex :data="[]" />
       <collection :data="[]" />
       <payment :data="[]" />
     </div>
@@ -35,6 +43,7 @@
 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() {
@@ -65,13 +74,11 @@ export default {
             prop: "mblno",
             span: 6
           },
-
           {
             label: "业务日期",
             prop: "bsdate",
             span: 6
           },
-
           {
             label: "业务时间",
             prop: "bstime",
@@ -113,6 +120,19 @@ export default {
             span: 6
           },
           {
+            label: "备注",
+            prop: "remark",
+            type: "textarea",
+            minRows: 2,
+            span: 12
+          }
+        ]
+      },
+      option2: {
+        menuBtn: false,
+        labelWidth: 100,
+        column: [
+          {
             label: "结算方式",
             prop: "stltypeid",
             span: 6
@@ -127,7 +147,6 @@ export default {
             prop: "fleet",
             span: 6
           },
-
           {
             label: "车号",
             prop: "truckno",
@@ -157,18 +176,6 @@ export default {
             label: "打印抬头",
             prop: "company",
             span: 6
-          },
-          {
-            label: "备案序号",
-            prop: "emsSeqNo",
-            span: 6
-          },
-          {
-            label: "备注",
-            prop: "remark",
-            type: "textarea",
-            minRows: 2,
-            span: 12
           }
         ]
       },
@@ -185,7 +192,8 @@ export default {
   },
   components: {
     collection,
-    payment
+    payment,
+    annex
   },
   async created() {
     if (this.detailData.id) {
@@ -201,6 +209,9 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    khEdit(){
+      this.$router.push('/basicData/customerInformation/index')
+    },
     addRow() {
       this.data.push({ $cellEdit: true });
     },

src/views/workManagement/main-items/configuration/detailsPage.json

@@ -172,7 +172,7 @@
       "label": "频率",
       "prop": "frequency",
       "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=frequency",
+      "dicData": [],
       "props": {
         "label": "dictValue",
         "value": "dictKey"