修改bug

src/api/basicData/agreement.js

@@ -48,3 +48,10 @@ export const update = (row) => {
   })
 }
 
+export const submit = (row) => {
+  return request({
+    url: '/api/trade-purchase/agreement/submit',
+    method: 'post',
+    data: row
+  })
+}

src/components/fee-info/main.vue

@@ -31,13 +31,11 @@
           </el-button>
         </template>
         <template slot="corpId" slot-scope="{ row, index }">
-          <span v-if="row.$cellEdit && !inCropId" class="required_fields">*</span>
-          <crop-select ref="corp" style="width: 90% !important;display: inline-block" v-if="row.$cellEdit"
+          <crop-select ref="corp"  v-if="row.$cellEdit"
             v-model="row.corpId" :cropIndex="index" @getCorpData="getCorpData" corpType="KG"></crop-select>
           <span v-else>{{ row.corpName }}</span>
         </template>
         <template slot="feeName" slot-scope="{ row }">
-          <span v-if="row.$cellEdit" class="required_fields">*</span>
           <breakdown-select v-if="row.$cellEdit" v-model="row.itemId" @selectValue="value => selectValue(value, row)"
             :configuration="breakConfiguration">
           </breakdown-select>

src/enums/column-name.js

@@ -804,6 +804,18 @@ const columnName = [{
 }, {
   code: 191,
   name: '销售管理-出库明细表'
+}, {
+  code: 192,
+  name: '基础资料-仓储费协议列表页'
+}, {
+  code: 193,
+  name: '基础资料-仓储费协议明细表'
+}, {
+  code: 194,
+  name: '融资管理-融资总账列表页'
+}, {
+  code: 195,
+  name: '融资管理-融资总账明细表'
 }
 ]
 export const getColumnName = (key) => {

src/views/approveData/index.vue

@@ -24,6 +24,8 @@
         <span v-else-if="scope.row.checkType == 'xstpqh'">销售特批请核</span>
         <span v-else-if="scope.row.checkType == 'dldd'">代理订单请核</span>
         <span v-else-if="scope.row.checkType == 'xsjh'">销售机会请核</span>
+        <span v-else-if="scope.row.checkType == 'RK'">入库管理审核</span>
+        <span v-else-if="scope.row.checkType == 'CK'">出库管理审核</span>
       </template>
       <template slot="menuLeft">
         <el-button size="small" type="success" :disabled="selectionList.length == 0" @click.stop="batchCheck">批量审批

src/views/basicData/agreement/detailsPage.vue

@@ -0,0 +1,328 @@
+<template>
+  <div>
+    <div class="borderless">
+      <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 class="add-customer-btn">
+          <el-button type="primary" size="small" @click="editCustomer" :disabled="loadingBtn || detailData.status == 1">
+            保存数据
+          </el-button>
+        </div>
+      </div>
+      <containerTitle title="基础资料" style="margin-top: 60px"></containerTitle>
+      <basic-container v-loading="loadingBtn">
+        <avue-form ref="form" class="trading-form" v-model="form" :option="option">
+          <template slot="corpId">
+            <crop-select v-model="form.corpId" corpType="KH" :refresh="false" @getCorpData="getCorpData"
+              :disabled="detailData.status == 1"></crop-select>
+          </template>
+        </avue-form>
+      </basic-container>
+      <containerTitle title="基础明细"></containerTitle>
+      <basic-container v-loading="loadingBtn">
+        <avue-crud ref="crud" :option="optionList" :data="dataList" :table-loading="loading" @saveColumn="saveColumn"
+          @resetColumn="resetColumn" :cell-style="cellStyle">
+          <template slot="menuLeft">
+            <el-button type="primary" @click="addRow" size="small" :disabled="detailData.status == 1">新增
+            </el-button>
+          </template>
+          <template slot="menu" slot-scope="{ row, index }">
+            <el-button size="small" type="text" @click="rowCell(row, index)" :disabled="detailData.status == 1">{{
+            row.$cellEdit ? "保存" : "修改" }}</el-button>
+            <el-button size="small" type="text" @click="rowDel(row, index)" :disabled="detailData.status == 1">删除
+            </el-button>
+          </template>
+        </avue-crud>
+      </basic-container>
+    </div>
+  </div>
+</template>
+
+<script>
+import { optionList } from "./js/optionList";
+import { getDetail, submit } from "@/api/basicData/agreement";
+export default {
+  name: "index",
+  data() {
+    return {
+      loadingBtn: false,
+      form: {},
+      dataList: [],
+      option: {
+        menuBtn: false,
+        labelWidth: 130,
+        column: [
+          {
+            label: "业务编号",
+            prop: "billNo",
+            disabled:true,
+            span: 6,
+          },
+          {
+            label: "合同编号",
+            prop: "contractNo",
+            span: 6,
+          },
+          {
+            label: "制单部门",
+            prop: "deptId",
+            span: 6,
+          },
+          {
+            label: "客户名称",
+            prop: "corpId",
+            span: 6,
+          },
+          {
+            label: "货物品名",
+            prop: "goodsId",
+            span: 6,
+          },
+          {
+            label: "结算方式",
+            prop: "stltypeId",
+            span: 6,
+          },
+          {
+            label: "费用类型",
+            prop: "feetypeId",
+            span: 6,
+          },
+          {
+            label: "货物类别",
+            prop: "packages",
+            span: 6,
+          },
+          {
+            label: "贸易方式",
+            prop: "trademodeId",
+            span: 6,
+          },
+          {
+            label: "免堆天数",
+            prop: "freeDays",
+            span: 6,
+          },
+          {
+            label: "有效期起",
+            prop: "beginDate",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            span: 6,
+          },
+          {
+            label: "有效期至",
+            prop: "endDate",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            span: 6,
+          },
+          {
+            label: "作业费类型",
+            prop: "taskType",
+            span: 6,
+          },
+          {
+            label: "收付款方式",
+            prop: "dc",
+            span: 6,
+          },
+          {
+            label: "业务类型",
+            prop: "billType",
+            span: 6,
+          },
+          {
+            label: "业务类型名称",
+            prop: "billTypeName",
+            span: 6,
+          },
+          {
+            label: "仓库",
+            prop: "warehouseId",
+            span: 6,
+          },
+          {
+            label: "状态",
+            prop: "billStatus",
+            span: 6,
+          },
+          {
+            label: "备注",
+            prop: "remark",
+            type: "textarea",
+            minRows: 2,
+            width: 120,
+            span: 12,
+          },
+        ]
+      },
+      optionList: {},
+      resultList: [],
+      normTypeList: [],
+      jobTitleList: [],
+      jobLevelList: [],
+      occupationalLevelList: [],
+      maritalList: []
+    };
+  },
+  props: {
+    detailData: {
+      type: Object
+    }
+  },
+  async created() {
+    this.optionList = await this.getColumnData(
+      this.getColumnName(193),
+      optionList
+    );
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
+    if (this.detailData.status == 1) {
+      this.option.disabled = true;
+    }
+    this.getWorkDicts("result_type").then(res => {
+      this.resultList = res.data.data;
+    });
+  },
+  methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    getDetail(id) {
+      getDetail(id)
+        .then(res => {
+          this.form = res.data.data;
+          this.dataList = res.data.data.agreementitemsList;
+        })
+        .finally(() => {
+          // this.loading = false;
+          // this.showBut = true;
+          // this.pageLoading = false;
+        });
+    },
+    getCorpData(row){
+      this.form.corpName = row.cname
+    },
+    addRow() {
+      // if (!this.form.resultType) {
+      //   return this.$message.error("请选择计算类别");
+      // }
+      this.dataList.push({ $cellEdit: true });
+    },
+    rowCell(row, index) {
+      if (row.$cellEdit == true) {
+        this.editCustomer();
+        this.$set(row, "$cellEdit", false);
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
+    },
+    rowDel(row, index) {
+      this.$confirm("确定删除数据?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        if (row.id) {
+          // delItem(row.id).then(res => {
+          //   this.$message({
+          //     type: "success",
+          //     message: "删除成功!"
+          //   });
+          //   this.dataList.splice(index, 1);
+          // });
+        } else {
+          this.$message({
+            type: "success",
+            message: "删除成功!"
+          });
+          this.dataList.splice(index, 1);
+        }
+      });
+    },
+    //修改提交触发
+    editCustomer() {
+      this.$refs["form"].validate((valid, done) => {
+        done();
+        if (valid) {
+          this.loadingBtn = true;
+          submit({ ...this.form, agreementitemsList: this.dataList })
+            .then(res => {
+              this.$message.success("保存成功");
+              this.form = res.data.data.data;
+              this.dataList = res.data.data.data.agreementitemsList;
+            })
+            .finally(() => {
+              this.loadingBtn = false;
+            });
+        } else {
+          return false;
+        }
+      });
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(193),
+        this.optionList
+      );
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+        });
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      this.optionList = optionList;
+      const inSave = await this.delColumnData(
+        this.getColumnName(193),
+        optionList
+      );
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+        });
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //返回列表
+    backToList() {
+      this.$emit("goBack");
+    }
+  }
+};
+</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;
+}
+
+.img-form ::v-deep .el-form-item {
+  height: 150px;
+  line-height: 150px;
+  margin-bottom: 8px !important;
+}
+
+.img-form ::v-deep .avue-upload__icon {
+  font-size: 20px;
+  width: 150px;
+  height: 150px;
+  line-height: 150px;
+}
+</style>

src/views/basicData/financing/index.vue → src/views/basicData/agreement/index code.vue

@@ -23,7 +23,7 @@
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   v-if="permission.financing_delete"
+                   v-if="permission.agreement_delete"
                    @click="handleDelete">删 除
         </el-button>
       </template>
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/basicData/financing";
+  import {getList, getDetail, add, update, remove} from "@/api/basicData/agreement";
   import {mapGetters} from "vuex";
 
   export default {
@@ -60,155 +60,176 @@
           dialogClickModal: false,
           column: [
             {
-              label: "系统编号",
-              prop: "sysNo",
+              label: "业务编号",
+              prop: "billNo",
               rules: [{
                 required: true,
-                message: "请输入系统编号",
+                message: "请输入业务编号",
                 trigger: "blur"
               }]
             },
             {
-              label: "客户",
+              label: "合同编号",
+              prop: "contractNo",
+              rules: [{
+                required: true,
+                message: "请输入合同编号",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "制单部门",
+              prop: "deptId",
+              rules: [{
+                required: true,
+                message: "请输入制单部门",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "客户名称",
               prop: "corpId",
               rules: [{
                 required: true,
-                message: "请输入客户",
+                message: "请输入客户名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "融资日期",
-              prop: "financingDate",
+              label: "货物品名",
+              prop: "goodsId",
               rules: [{
                 required: true,
-                message: "请输入融资日期",
+                message: "请输入货物品名",
                 trigger: "blur"
               }]
             },
             {
-              label: "融资金额",
-              prop: "financingAmount",
+              label: "结算方式",
+              prop: "stltypeId",
               rules: [{
                 required: true,
-                message: "请输入融资金额",
+                message: "请输入结算方式",
                 trigger: "blur"
               }]
             },
             {
-              label: "上期结余金额",
-              prop: "lastIssueAmount",
+              label: "费用类型",
+              prop: "feetypeId",
               rules: [{
                 required: true,
-                message: "请输入上期结余金额",
+                message: "请输入费用类型",
                 trigger: "blur"
               }]
             },
             {
-              label: "本期增加金额",
-              prop: "currentIssueAmount",
+              label: "货物类别",
+              prop: "packages",
               rules: [{
                 required: true,
-                message: "请输入本期增加金额",
+                message: "请输入货物类别",
                 trigger: "blur"
               }]
             },
             {
-              label: "本期还款金额",
-              prop: "repaymentAmount",
+              label: "贸易方式",
+              prop: "trademodeId",
               rules: [{
                 required: true,
-                message: "请输入本期还款金额",
+                message: "请输入贸易方式",
                 trigger: "blur"
               }]
             },
             {
-              label: "本期结余金额",
-              prop: "balanceAmount",
+              label: "免堆天数",
+              prop: "freedays",
               rules: [{
                 required: true,
-                message: "请输入本期结余金额",
+                message: "请输入免堆天数",
                 trigger: "blur"
               }]
             },
             {
-              label: "未还款金额",
-              prop: "amount",
+              label: "有效期起",
+              prop: "beginDate",
               rules: [{
                 required: true,
-                message: "请输入未还款金额",
+                message: "请输入有效期起",
                 trigger: "blur"
               }]
             },
             {
-              label: "备注",
-              prop: "remarks",
+              label: "有效期至",
+              prop: "enddate",
               rules: [{
                 required: true,
-                message: "请输入备注",
+                message: "请输入有效期至",
                 trigger: "blur"
               }]
             },
             {
-              label: "创建人",
-              prop: "createUser",
+              label: "备注",
+              prop: "remark",
               rules: [{
                 required: true,
-                message: "请输入创建人",
+                message: "请输入备注",
                 trigger: "blur"
               }]
             },
             {
-              label: "创建部门",
-              prop: "createDept",
+              label: "作业费类型",
+              prop: "taskType",
+              width:"150",
               rules: [{
                 required: true,
-                message: "请输入创建部门",
+                message: "请输入作业费类型",
                 trigger: "blur"
               }]
             },
             {
-              label: "创建时间",
-              prop: "createTime",
+              label: "收付款方式",
+              prop: "dc",
+              width:"150",
               rules: [{
                 required: true,
-                message: "请输入创建时间",
+                message: "请输入收付款方式",
                 trigger: "blur"
               }]
             },
             {
-              label: "修改人",
-              prop: "updateUser",
+              label: "业务类型",
+              prop: "billType",
               rules: [{
                 required: true,
-                message: "请输入修改人",
+                message: "请输入业务类型",
                 trigger: "blur"
               }]
             },
             {
-              label: "修改时间",
-              prop: "updateTime",
+              label: "业务类型名称",
+              prop: "billTypeName",
+              width:"150",
               rules: [{
                 required: true,
-                message: "请输入修改时间",
+                message: "请输入业务类型名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "状态",
-              prop: "status",
+              label: "仓库",
+              prop: "warehouseId",
               rules: [{
                 required: true,
-                message: "请输入状态",
+                message: "请输入仓库",
                 trigger: "blur"
               }]
             },
             {
-              label: "是否已删除",
-              prop: "isDeleted",
+              label: "状态",
+              prop: "billStatus",
               rules: [{
                 required: true,
-                message: "请输入是否已删除",
+                message: "请输入状态",
                 trigger: "blur"
               }]
             },
@@ -221,10 +242,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.financing_add, false),
-          viewBtn: this.vaildData(this.permission.financing_view, false),
-          delBtn: this.vaildData(this.permission.financing_delete, false),
-          editBtn: this.vaildData(this.permission.financing_edit, false)
+          addBtn: this.vaildData(this.permission.agreement_add, false),
+          viewBtn: this.vaildData(this.permission.agreement_view, false),
+          delBtn: this.vaildData(this.permission.agreement_delete, false),
+          editBtn: this.vaildData(this.permission.agreement_edit, false)
         };
       },
       ids() {

src/views/basicData/agreement/index.vue

@@ -1,374 +1,182 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.agreement_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
+  <div>
+    <basic-container v-show="show" class="page-crad">
+      <avue-crud ref="crud" :option="option" :data="dataList" :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" @search-criteria-switch="searchCriteriaSwitch">
+        <template slot="menuLeft">
+          <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newAdd()">新增
+          </el-button>
+        </template>
+        <template slot-scope="{ row,index}" slot="billNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.billNo }}</span>
+        </template>
+        <template slot-scope="{ row,index}" slot="corpId">
+          <span>{{ row.corpName }}</span>
+        </template>
+        <template slot-scope="{ row, index }" slot="menu">
+          <el-button type="text" size="small" @click.stop="rowDel(row, index)">
+            删除
+          </el-button>
+        </template>
+      </avue-crud>
+    </basic-container>
+    <details-page v-if="!show" @goBack="backToList" :detailData="detailData" />
+  </div>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/basicData/agreement";
-  import {mapGetters} from "vuex";
+import detailsPage from "./detailsPage";
+import { option } from "./js/optionList";
+import { getList, remove } from "@/api/basicData/agreement";
 
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "业务编号",
-              prop: "billNo",
-              rules: [{
-                required: true,
-                message: "请输入业务编号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "合同编号",
-              prop: "contractNo",
-              rules: [{
-                required: true,
-                message: "请输入合同编号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "制单部门",
-              prop: "deptId",
-              rules: [{
-                required: true,
-                message: "请输入制单部门",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "客户名称",
-              prop: "corpId",
-              rules: [{
-                required: true,
-                message: "请输入客户名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "货物品名",
-              prop: "goodsId",
-              rules: [{
-                required: true,
-                message: "请输入货物品名",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "结算方式",
-              prop: "stltypeId",
-              rules: [{
-                required: true,
-                message: "请输入结算方式",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "费用类型",
-              prop: "feetypeId",
-              rules: [{
-                required: true,
-                message: "请输入费用类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "货物类别",
-              prop: "packages",
-              rules: [{
-                required: true,
-                message: "请输入货物类别",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "贸易方式",
-              prop: "trademodeId",
-              rules: [{
-                required: true,
-                message: "请输入贸易方式",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "免堆天数",
-              prop: "freedays",
-              rules: [{
-                required: true,
-                message: "请输入免堆天数",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "有效期起",
-              prop: "beginDate",
-              rules: [{
-                required: true,
-                message: "请输入有效期起",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "有效期至",
-              prop: "enddate",
-              rules: [{
-                required: true,
-                message: "请输入有效期至",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "备注",
-              prop: "remark",
-              rules: [{
-                required: true,
-                message: "请输入备注",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "作业费类型",
-              prop: "taskType",
-              width:"150",
-              rules: [{
-                required: true,
-                message: "请输入作业费类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "收付款方式",
-              prop: "dc",
-              width:"150",
-              rules: [{
-                required: true,
-                message: "请输入收付款方式",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "业务类型",
-              prop: "billType",
-              rules: [{
-                required: true,
-                message: "请输入业务类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "业务类型名称",
-              prop: "billTypeName",
-              width:"150",
-              rules: [{
-                required: true,
-                message: "请输入业务类型名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "仓库",
-              prop: "warehouseId",
-              rules: [{
-                required: true,
-                message: "请输入仓库",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "状态",
-              prop: "billStatus",
-              rules: [{
-                required: true,
-                message: "请输入状态",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.agreement_add, false),
-          viewBtn: this.vaildData(this.permission.agreement_view, false),
-          delBtn: this.vaildData(this.permission.agreement_delete, false),
-          editBtn: this.vaildData(this.permission.agreement_edit, false)
-        };
+export default {
+  name: "index",
+  data() {
+    return {
+      show: true,
+      loading: false,
+      form: {},
+      search: {},
+      detailData: {},
+      dataList: [],
+      selectionList: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 50, 100, 200, 300, 400, 500]
       },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
+      option: {},
+    };
+  },
+  components: {
+    detailsPage
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(192), option);
+    this.getWorkDicts("in_section").then(res => {
+      this.findObject(this.option.column, "inSection").dicData = res.data.data;
+      this.$refs.crud.init();
+    });
+    this.option.height = window.innerHeight - 210;
+  },
+  methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
       }
+      this.$refs.crud.getTableHeight();
     },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    newAdd() {
+      this.show = false;
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      this.dataList.forEach(item => {
+        this.$refs.crud.toggleRowExpansion(item, false);
+      });
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.search)
+      )
+        .then(res => {
+          if (res.data.data.records) {
+            res.data.data.records.forEach(e => {
+              e.itemLoading = true;
             });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+          }
+          this.dataList = res.data.data.records ? res.data.data.records : [];
+          this.page.total = res.data.data.total;
         })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    editOpen(row, status) {
+      this.detailData = {
+        id: row.id,
+        status: status
+      };
+      this.show = false;
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    rowDel(row, index, done) {
+      this.$confirm("确定删除数据?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        remove(row.id).then(res => {
+          if (res.data.code == 200) {
             this.$message({
               type: "success",
-              message: "操作成功!"
+              message: "删除成功!"
             });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
+            this.onLoad(this.page, this.search);
+          }
+        });
+      });
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(192),
+        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(192), option);
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+        });
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //返回列表
+    backToList() {
+      this.detailData = this.$options.data().detailData;
+      this.show = true;
+      this.onLoad(this.page, this.search);
     }
-  };
+  }
+};
 </script>
 
-<style>
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
 </style>

src/views/basicData/agreement/js/optionList.js

@@ -0,0 +1,193 @@
+export const option ={
+  searchShow: true,
+  searchMenuSpan: 24,
+  align: "center",
+  searchSpan: 8,
+  tip: false,
+  border: true,
+  index: true,
+  addBtn: false,
+  viewBtn: false,
+  editBtn: false,
+  delBtn: false,
+  menuWidth: 70,
+  searchIcon: true,
+  searchIndex: 2,
+  column: [
+    {
+      label: "业务编号",
+      prop: "billNo",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "合同编号",
+      prop: "contractNo",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "制单部门",
+      prop: "deptId",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "客户名称",
+      prop: "corpId",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "货物品名",
+      prop: "goodsId",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "结算方式",
+      prop: "stltypeId",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "费用类型",
+      prop: "feetypeId",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "货物类别",
+      prop: "packages",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "贸易方式",
+      prop: "trademodeId",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "免堆天数",
+      prop: "freeDays",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "有效期起",
+      prop: "beginDate",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "有效期至",
+      prop: "endDate",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "备注",
+      prop: "remark",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "作业费类型",
+      prop: "taskType",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "收付款方式",
+      prop: "dc",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "业务类型",
+      prop: "billType",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "业务类型名称",
+      prop: "billTypeName",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "仓库",
+      prop: "warehouseId",
+      overHidden: true,
+      width: 120,
+    },
+    {
+      label: "状态",
+      prop: "billStatus",
+      overHidden: true,
+      width: 120,
+    },
+  ]
+}
+export const optionList ={
+  align: "center",
+  addBtn: false,
+  refreshBtn: false,
+  editBtn: false,
+  delBtn: false,
+  border: true,
+  menuWidth: 120,
+  stripe: true,
+  column: [
+    {
+      label: "费用名称",
+      prop: "feeId",
+      overHidden: true,
+      cell:true,
+      width: 120,
+    },
+    {
+      label: "计价单位",
+      prop: "feeUnitId",
+      overHidden: true,
+      cell:true,
+      width: 120,
+    },
+    {
+      label: "开始天数",
+      prop: "fromDays",
+      overHidden: true,
+      cell:true,
+      width: 120,
+    },
+    {
+      label: "结束天数",
+      prop: "enDays",
+      overHidden: true,
+      cell:true,
+      width: 120,
+    },
+    {
+      label: "单价",
+      prop: "price",
+      overHidden: true,
+      cell:true,
+      width: 120,
+    },
+    {
+      label: "状态",
+      prop: "status",
+      overHidden: true,
+      cell:true,
+      width: 120,
+    },
+    {
+      label: "备注",
+      prop: "remark",
+      overHidden: true,
+      cell:true,
+      width: 120,
+    },
+  ]
+}

src/views/basicData/financing/financingitems.vue

@@ -1,308 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.financingitems_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/basicData/financingitems";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "",
-              prop: "id",
-              rules: [{
-                required: true,
-                message: "请输入",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "日期",
-              prop: "financingDate",
-              rules: [{
-                required: true,
-                message: "请输入日期",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "融资类别",
-              prop: "financingType",
-              rules: [{
-                required: true,
-                message: "请输入融资类别",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "上期结余金额",
-              prop: "lastIssueAmount",
-              rules: [{
-                required: true,
-                message: "请输入上期结余金额",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "本期增加金额",
-              prop: "currentIssueAmount",
-              rules: [{
-                required: true,
-                message: "请输入本期增加金额",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "本期还款金额",
-              prop: "repaymentAmount",
-              rules: [{
-                required: true,
-                message: "请输入本期还款金额",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "本期结余金额",
-              prop: "balanceAmount",
-              rules: [{
-                required: true,
-                message: "请输入本期结余金额",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建人",
-              prop: "createUser",
-              rules: [{
-                required: true,
-                message: "请输入创建人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建时间",
-              prop: "createTime",
-              rules: [{
-                required: true,
-                message: "请输入创建时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "修改人",
-              prop: "updateUser",
-              rules: [{
-                required: true,
-                message: "请输入修改人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "修改时间",
-              prop: "updateTime",
-              rules: [{
-                required: true,
-                message: "请输入修改时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否已删除（0 否 1是）",
-              prop: "isDeleted",
-              rules: [{
-                required: true,
-                message: "请输入是否已删除（0 否 1是）",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.financingitems_add, false),
-          viewBtn: this.vaildData(this.permission.financingitems_view, false),
-          delBtn: this.vaildData(this.permission.financingitems_delete, false),
-          editBtn: this.vaildData(this.permission.financingitems_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

src/views/financing/financingLedger/index.vue

@@ -0,0 +1,175 @@
+<template>
+  <div>
+    <basic-container v-show="show" class="page-crad">
+      <avue-crud
+        ref="crud"
+        :option="option"
+        :data="dataList"
+        :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"
+        @search-criteria-switch="searchCriteriaSwitch"
+      >
+      </avue-crud>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+import { option } from "./js/optionList";
+import {getList, remove} from "@/api/basicData/financing";
+
+export default {
+  name: "index",
+  data() {
+    return {
+      show: true,
+      loading: false,
+      form: {},
+      search: {},
+      detailData: {},
+      dataList: [],
+      selectionList: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 50, 100, 200, 300, 400, 500]
+      },
+      option: {},
+    };
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(194), option);
+    // this.getWorkDicts("in_section").then(res => {
+    //   this.findObject(this.option.column, "inSection").dicData = res.data.data;
+    //   this.$refs.crud.init();
+    // });
+    this.option.height = window.innerHeight - 210;
+  },
+  methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
+      }
+      this.$refs.crud.getTableHeight();
+    },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    newAdd() {
+      this.show = false;
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      this.dataList.forEach(item => {
+        this.$refs.crud.toggleRowExpansion(item, false);
+      });
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.search)
+      )
+        .then(res => {
+          if (res.data.data.records) {
+            res.data.data.records.forEach(e => {
+              e.itemLoading = true;
+            });
+          }
+          this.dataList = res.data.data.records ? res.data.data.records : [];
+          this.page.total = res.data.data.total;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    editOpen(row, status) {
+      this.detailData = {
+        id: row.id,
+        status: status
+      };
+      this.show = false;
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    rowDel(row, index, done) {
+      this.$confirm("确定删除数据?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        remove(row.id).then(res => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+            this.onLoad(this.page, this.search);
+          }
+        });
+      });
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(194),
+        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(194), option);
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+        });
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //返回列表
+    backToList() {
+      this.detailData = this.$options.data().detailData;
+      this.show = true;
+      this.onLoad(this.page, this.search);
+    }
+  }
+};
+</script>
+
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
+</style>

src/views/financing/financingLedger/js/optionList.js

@@ -0,0 +1,192 @@
+export const option ={
+  searchShow: true,
+  searchMenuSpan: 8,
+  align: "center",
+  searchSpan: 8,
+  tip: false,
+  border: true,
+  index: true,
+  addBtn: false,
+  viewBtn: false,
+  editBtn: false,
+  delBtn: false,
+  menuWidth: 70,
+  searchIcon: true,
+  searchIndex: 2,
+  column: [
+    {
+      label: "系统编号",
+      prop: "sysNo",
+    },
+    {
+      label: "客户",
+      prop: "corpId",
+      search: true,
+      searchSpan: 8,
+    },
+    {
+      label: "融资日期",
+      prop: "financingDate",
+      search: true,
+      searchSpan: 8,
+    },
+    {
+      label: "融资金额",
+      prop: "financingAmount",
+    },
+    {
+      label: "上期结余金额",
+      prop: "lastIssueAmount",
+    },
+    {
+      label: "本期增加金额",
+      prop: "currentIssueAmount",
+    },
+    {
+      label: "本期还款金额",
+      prop: "repaymentAmount",
+    },
+    {
+      label: "本期结余金额",
+      prop: "balanceAmount",
+    },
+    {
+      label: "未还款金额",
+      prop: "amount",
+    },
+    {
+      label: "状态",
+      prop: "status",
+    },
+    {
+      label: "备注",
+      prop: "remarks",
+    }
+  ]
+}
+export const optionList ={
+  align: "center",
+  addBtn: false,
+  refreshBtn: false,
+  editBtn: false,
+  delBtn: false,
+  border: true,
+  menuWidth: 120,
+  stripe: true,
+  column: [
+    {
+      label: "分类明细",
+      prop: "parameter",
+      overHidden: true,
+      index: 1
+    },
+    {
+      label: "工资标准",
+      prop: "salary",
+      precision: 2,
+      type: "number",
+      controls: false,
+      overHidden: true,
+      cell: true,
+      index: 2
+    },
+    {
+      label: "工作量工资标准",
+      prop: "workloadSalaryName",
+      precision: 2,
+      type: "number",
+      controls: false,
+      overHidden: true,
+      cell: true,
+      hide: true,
+      showColumn: false,
+      width: 120,
+      index: 3
+    },
+    {
+      label: "虚拟工作量工资标准",
+      prop: "virtualWorkloadSalary",
+      precision: 2,
+      type: "number",
+      controls: false,
+      overHidden: true,
+      cell: true,
+      hide: true,
+      showColumn: false,
+      width: 140,
+      index: 4
+    },
+    {
+      label: "双休日工作量工资标准",
+      prop: "doubleCease",
+      precision: 2,
+      type: "number",
+      controls: false,
+      overHidden: true,
+      cell: true,
+      hide: true,
+      showColumn: false,
+      width: 160,
+      index: 5
+    },
+    {
+      label: "日常考核工资标准",
+      prop: "dailyAssessmentCriteriaName",
+      precision: 2,
+      type: "number",
+      controls: false,
+      overHidden: true,
+      cell: true,
+      hide: true,
+      showColumn: false,
+      width: 120,
+      index: 6
+    },
+    {
+      label: "虚拟双休日工作量工资标准",
+      prop: "virtualDoubleCease",
+      precision: 2,
+      type: "number",
+      controls: false,
+      overHidden: true,
+      cell: true,
+      hide: true,
+      showColumn: false,
+      width: 170,
+      index: 7
+    },
+    {
+      label: "虚拟日常考核标准",
+      prop: "virtualDailyAssessmentCriteria",
+      precision: 2,
+      type: "number",
+      controls: false,
+      overHidden: true,
+      cell: true,
+      hide: true,
+      showColumn: false,
+      width: 120,
+      index: 8
+    },
+    {
+      label: "学期绩效工资标准",
+      prop: "termPerformanceSalaryName",
+      precision: 2,
+      type: "number",
+      controls: false,
+      overHidden: true,
+      cell: true,
+      hide: true,
+      showColumn: false,
+      width: 120,
+      index: 9
+    },
+    {
+      label: "备注",
+      prop: "remarks",
+      overHidden: true,
+      cell: true,
+      index: 10
+    }
+  ]
+}

src/views/salesManagement/outStock/config/mainList.json

@@ -7,6 +7,7 @@
   "editBtn": false,
   "delBtn": false,
   "addBtn": false,
+  "menu":false,
   "headerAlign": "center",
   "menuWidth": "70",
   "showSummary": true,

src/views/salesManagement/outStock/detailsPage.vue

@@ -68,7 +68,7 @@
       </trade-card>
       <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="detailData.status == 1"
         feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" optionType="JK" itemType="申请" :inCropId="true"
-        :tabShow="3" :billingShow="false" />
+        :tabShow="2" :billingShow="false" />
       <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
         delUrl="" />
       <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
@@ -282,7 +282,6 @@ export default {
       this.form.purchaser = row.cname
     },
     getGYSData(row) {
-      console.log(row)
       this.form.corpName = row.cname
     },
     choceScheduleFun() {
@@ -409,7 +408,7 @@ export default {
         const data = {
           id: this.form.id,
           checkType: 'CK',
-          url: '/purchasingManagement/inStock/index',
+          url: '/salesManagement/outStock/index',
           pageStatus: "this.$store.getters.entranceXsStatus",
           pageLabel: "出库管理",
           checkFlag: 2,