修改bug

src/api/basicData/financing.js

@@ -32,7 +32,7 @@ export const remove = (ids) => {
   })
 }
 
-export const add = (row) => {
+export const submit = (row) => {
   return request({
     url: '/api/trade-purchase/financing/submit',
     method: 'post',
@@ -40,11 +40,10 @@ export const add = (row) => {
   })
 }
 
-export const update = (row) => {
+export const checkFinancing= (row) => {
   return request({
-    url: '/api/trade-purchase/financing/submit',
+    url: '/api/trade-purchase/financing/checkFinancing',
     method: 'post',
     data: row
   })
-}
-
+}

src/api/basicData/financingLedger.js

@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/trade-purchase/financing/financingAccountList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/enums/column-name.js

@@ -822,6 +822,12 @@ const columnName = [{
 }, {
   code: 197,
   name: '库存管理-盘点明细表'
+}, {
+  code: 198,
+  name: '融资管理-融资管理列表页'
+}, {
+  code: 199,
+  name: '融资管理-融资管理明细表'
 }
 ]
 export const getColumnName = (key) => {

src/views/approveData/index.vue

@@ -27,6 +27,7 @@
         <span v-else-if="scope.row.checkType == 'RK'">入库管理审核</span>
         <span v-else-if="scope.row.checkType == 'CK'">出库管理审核</span>
         <span v-else-if="scope.row.checkType == 'PD'">库内盘点审核</span>
+        <span v-else-if="scope.row.checkType == 'rzgl'">融资管理审核</span>
       </template>
       <template slot="menuLeft">
         <el-button size="small" type="success" :disabled="selectionList.length == 0" @click.stop="batchCheck">批量审批

src/views/basicData/agreement/agreementitems.vue

@@ -1,335 +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.agreementitems_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/basicData/agreementitems";
-  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: "对应主表id",
-              prop: "pid",
-              rules: [{
-                required: true,
-                message: "请输入对应主表id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "行号",
-              prop: "lineno",
-              rules: [{
-                required: true,
-                message: "请输入行号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "费用名称,存储id 显示名称	t_fees 中的no或 name，模糊查找选择后，存储f_id，显示name",
-              prop: "feeId",
-              rules: [{
-                required: true,
-                message: "请输入费用名称,存储id 显示名称	t_fees 中的no或 name，模糊查找选择后，存储f_id，显示name",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "计价单位,t_unitfees f_id存储id 显示名称 name	对应，t_unitfees f_id，如果选择为毛重，数量（f_qty）取主表的毛重，如果选择净重，取主表的净重，如果为箱量，取主表的箱量",
-              prop: "feeUnitId",
-              rules: [{
-                required: true,
-                message: "请输入计价单位,t_unitfees f_id存储id 显示名称 name	对应，t_unitfees f_id，如果选择为毛重，数量（f_qty）取主表的毛重，如果选择净重，取主表的净重，如果为箱量，取主表的箱量",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "开始天数,只有为仓储费显示",
-              prop: "fromDays",
-              rules: [{
-                required: true,
-                message: "请输入开始天数,只有为仓储费显示",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "结束天数,只有为仓储费显示",
-              prop: "enDays",
-              rules: [{
-                required: true,
-                message: "请输入结束天数,只有为仓储费显示",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "单价,只有为仓储费显示",
-              prop: "price",
-              rules: [{
-                required: true,
-                message: "请输入单价,只有为仓储费显示",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "状态，默认 T ,正常T 停用F 下拉选择",
-              prop: "status",
-              rules: [{
-                required: true,
-                message: "请输入状态，默认 T ,正常T 停用F 下拉选择",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "删除状态",
-              prop: "delFlag",
-              rules: [{
-                required: true,
-                message: "请输入删除状态",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建者",
-              prop: "createBy",
-              rules: [{
-                required: true,
-                message: "请输入创建者",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建时间",
-              prop: "createTime",
-              rules: [{
-                required: true,
-                message: "请输入创建时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "更新者",
-              prop: "updateBy",
-              rules: [{
-                required: true,
-                message: "请输入更新者",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "更新时间",
-              prop: "updateTime",
-              rules: [{
-                required: true,
-                message: "请输入更新时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "备注",
-              prop: "remark",
-              rules: [{
-                required: true,
-                message: "请输入备注",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.agreementitems_add, false),
-          viewBtn: this.vaildData(this.permission.agreementitems_view, false),
-          delBtn: this.vaildData(this.permission.agreementitems_delete, false),
-          editBtn: this.vaildData(this.permission.agreementitems_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/basicData/agreement/detailsPage.vue

@@ -38,6 +38,8 @@
           </template>
         </avue-crud>
       </basic-container>
+      <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
+        delUrl="" />
     </div>
   </div>
 </template>
@@ -57,12 +59,6 @@ export default {
         labelWidth: 130,
         column: [
           {
-            label: "业务编号",
-            prop: "billNo",
-            disabled:true,
-            span: 6,
-          },
-          {
             label: "合同编号",
             prop: "contractNo",
             span: 6,
@@ -78,36 +74,11 @@ export default {
             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",
@@ -124,26 +95,6 @@ export default {
             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,
@@ -151,6 +102,7 @@ export default {
           {
             label: "状态",
             prop: "billStatus",
+            disabled:true,
             span: 6,
           },
           {
@@ -159,7 +111,7 @@ export default {
             type: "textarea",
             minRows: 2,
             width: 120,
-            span: 12,
+            span: 24,
           },
         ]
       },
@@ -169,7 +121,8 @@ export default {
       jobTitleList: [],
       jobLevelList: [],
       occupationalLevelList: [],
-      maritalList: []
+      maritalList: [],
+      orderFilesList:[]
     };
   },
   props: {
@@ -201,6 +154,7 @@ export default {
         .then(res => {
           this.form = res.data.data;
           this.dataList = res.data.data.agreementitemsList;
+          this.orderFilesList=res.data.data.orderFilesList
         })
         .finally(() => {
           // this.loading = false;
@@ -212,9 +166,6 @@ export default {
       this.form.corpName = row.cname
     },
     addRow() {
-      // if (!this.form.resultType) {
-      //   return this.$message.error("请选择计算类别");
-      // }
       this.dataList.push({ $cellEdit: true });
     },
     rowCell(row, index) {
@@ -259,6 +210,7 @@ export default {
               this.$message.success("保存成功");
               this.form = res.data.data.data;
               this.dataList = res.data.data.data.agreementitemsList;
+              this.orderFilesList=res.data.data.orderFilesList
             })
             .finally(() => {
               this.loadingBtn = false;

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

@@ -1,374 +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.agreement_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/basicData/agreement";
-  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: "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)
-        };
-      },
-      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/basicData/agreement/index.vue

@@ -15,6 +15,9 @@
         <template slot-scope="{ row,index}" slot="corpId">
           <span>{{ row.corpName }}</span>
         </template>
+        <template slot="corpIdSearch">
+          <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
+        </template>
         <template slot-scope="{ row, index }" slot="menu">
           <el-button type="text" size="small" @click.stop="rowDel(row, index)">
             删除
@@ -56,8 +59,8 @@ export default {
   },
   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.getWorkDicts("bill_status").then(res => {
+      this.findObject(this.option.column, "billSdtatus").dicData = res.data.data;
       this.$refs.crud.init();
     });
     this.option.height = window.innerHeight - 210;

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

@@ -1,6 +1,6 @@
 export const option ={
   searchShow: true,
-  searchMenuSpan: 24,
+  searchMenuSpan: 16,
   align: "center",
   searchSpan: 8,
   tip: false,
@@ -15,118 +15,45 @@ export const option ={
   searchIndex: 2,
   column: [
     {
-      label: "业务编号",
-      prop: "billNo",
-      overHidden: true,
-      width: 120,
-    },
-    {
       label: "合同编号",
       prop: "contractNo",
       overHidden: true,
-      width: 120,
-    },
-    {
-      label: "制单部门",
-      prop: "deptId",
-      overHidden: true,
-      width: 120,
+      search:true
     },
     {
       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,
+      search:true
     },
     {
       label: "有效期起",
       prop: "beginDate",
       overHidden: true,
-      width: 120,
+      type: "date",
+      format: "yyyy-MM-dd",
+      valueFormat: "yyyy-MM-dd",
+      search:true
     },
     {
       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,
+      type: "date",
+      format: "yyyy-MM-dd",
+      valueFormat: "yyyy-MM-dd",
+      search:true
     },
     {
       label: "状态",
       prop: "billStatus",
       overHidden: true,
-      width: 120,
+      type: "select",
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
+      dicData: []
     },
   ]
 }

src/views/financing/financingLedger/index.vue

@@ -25,7 +25,7 @@
 
 <script>
 import { option } from "./js/optionList";
-import {getList, remove} from "@/api/basicData/financing";
+import {getList} from "@/api/basicData/financingLedger";
 
 export default {
   name: "index",
@@ -116,23 +116,6 @@ export default {
       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),

src/views/financing/financingManagement/detailsPage.vue

@@ -0,0 +1,252 @@
+<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 class="add-customer-btn">
+        <el-button type="primary" size="small" :disabled="form.status>0" v-if="detailData.status == 1"
+          class="el-button--small-yh " @click.stop="openEdit">编辑
+        </el-button>
+        <el-button type="primary" @click="editCustomer" :loading="subLoading" v-if="detailData.status != 1"
+          size="small">{{ form.id ? '修改数据' : '保存数据' }}
+        </el-button>
+        <el-dropdown style="padding: 0 6px;line-height: 0">
+          <el-button type="primary" size="small" :loading="buttonLoading" :disabled="!form.id">
+            审核处理<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item :disabled="form.status>0" @click.native="auditCheck">审核数据</el-dropdown-item>
+            <el-dropdown-item :disabled="form.status<1" @click.native="checkScheduleDialog = true">审核进度
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+    </div>
+    <div class="customer-main">
+      <trade-card title="基础信息">
+        <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="getKHData"
+              :disabled="detailData.status == 1"></crop-select>
+          </template>
+        </avue-form>
+      </trade-card>
+      <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
+        :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+        <check-schedule :checkId="form.id" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
+        </check-schedule>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getDetail, submit, checkFinancing } from "@/api/basicData/financing";
+import feeInfo from "@/components/fee-info/main";
+import checkSchedule from "../../../components/check/checkSchedule";
+import uploadFile from "@/components/upload-file/main";
+export default {
+  name: "detailsPageEdit",
+  data() {
+    return {
+      form: {},
+      checkScheduleDialog: false,
+      option: {
+        disabled: false,
+        menuBtn: false,
+        labelWidth: 100,
+        column: [
+          {
+            label: "系统编号",
+            prop: "sysNo",
+            disabled: true,
+            span: 6
+          },
+          {
+            label: "客户",
+            prop: "corpId",
+            span: 6
+          },
+          {
+            label: "融资日期",
+            prop: "financingDate",
+            type: "date",
+            format: 'yyyy-MM-dd',
+            valueFormat: 'yyyy-MM-dd',
+            span: 6
+          },
+          {
+            label: "融资类别",
+            prop: "financingType",
+            type: "select",
+            dataType: 'number',
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            dicData: [],
+            span: 6
+          },
+          {
+            label: "融资金额",
+            prop: "financingAmount",
+            span: 6
+          },
+          {
+            label: "状态",
+            prop: "status",
+            type: "select",
+            dataType: 'number',
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            dicData: [],
+            disabled: true,
+            span: 6
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            type: "textarea",
+            minRows: 2,
+            width: 120,
+            span: 12,
+          },
+        ]
+
+      },
+      itemsVOList: [],
+      orderFilesList: [],
+      subLoading: false,
+      pageLoading: false,
+      batchNo: '',
+      storagetreeList: []
+    };
+  },
+  props: {
+    detailData: {
+      type: Object
+    }
+  },
+  components: {
+    feeInfo,
+    checkSchedule,
+    uploadFile
+  },
+  async created() {
+    if (this.detailData.status == 1) {
+      this.option.disabled = true;
+    }
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
+    this.getWorkDicts("approval_status").then(res => {
+      this.findObject(this.option.column, "status").dicData =
+        res.data.data;
+    });
+    this.getWorkDicts("financing_type").then(res => {
+      this.findObject(this.option.column, "financingType").dicData =
+        res.data.data;
+    });
+  },
+  methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    getKHData(row) {
+      this.form.corpName = row.cname
+    },
+    getDetail(id) {
+      this.pageLoading = true;
+      getDetail(id)
+        .then(res => {
+          this.form = res.data.data;
+        })
+        .finally(() => {
+          this.pageLoading = false;
+        });
+    },
+    //修改提交触发
+    editCustomer(status) {
+      this.$refs["form"].validate((valid, done) => {
+        done();
+        if (valid) {
+          this.subLoading = true;
+          let data = {
+            ...this.form
+          };
+          submit(data).then(res => {
+            console.log(res)
+            this.form = res.data.data.data;
+            this.$message({
+              type: "success",
+              message: "保存成功!"
+            });
+          })
+            .finally(() => {
+              this.subLoading = false;
+            });
+        } else {
+          return false;
+        }
+      });
+    },
+    //请核
+    auditCheck() {
+      this.$confirm("确定审核此订单?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.buttonLoading = true
+        const data = {
+          id: this.form.id,
+          checkType: 'rzgl',
+          url: '/financing/financingManagement/index',
+          pageStatus: "this.$store.getters.entranceXsStatus",
+          pageLabel: "融资管理",
+          checkFlag: 3,
+        }
+        checkFinancing(data).then(res => {
+          if (res.data.success) {
+            this.$message.success("操作成功!")
+            this.viewDisabled = true
+            this.approverDisabled = true
+          }
+        })
+      }).finally(() => {
+        this.buttonLoading = false
+      })
+    },
+    //返回列表
+    backToList() {
+      this.$emit("goBack");
+    },
+    openEdit() {
+      this.detailData.status = 2;
+      this.option.disabled = false;
+      this.$refs.crud.refreshTable();
+    }
+  },
+  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/financing/financingManagement/index.vue

@@ -0,0 +1,189 @@
+<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">
+        <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="sysNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.sysNo }}</span>
+        </template>
+        <template slot-scope="{ row,index}" slot="corpId">
+          <span>{{ row.corpName }}</span>
+        </template>
+        <template slot="corpIdSearch">
+          <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
+        </template>
+        <template slot="financingDateSearch">
+          <el-date-picker v-model="search.financingDate" type="daterange" start-placeholder="开始日期"
+            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </template>
+        <template slot-scope="{ row, index }" slot="menu">
+          <el-button type="text" size="small" :disabled="row.status>0"  @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 detailsPage from "./detailsPage";
+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: {},
+    };
+  },
+  components: {
+    detailsPage
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(198), option);
+    this.getWorkDicts("approval_status").then(res => {
+      this.findObject(this.option.column, "status").dicData =
+        res.data.data;
+    });
+    this.getWorkDicts("financing_type").then(res => {
+      this.findObject(this.option.column, "financingType").dicData =
+        res.data.data;
+    });
+    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 => {
+          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(198),
+        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(198), 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/financingManagement/js/optionList.js

@@ -0,0 +1,128 @@
+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",
+      type: "date",
+      format: 'yyyy-MM-dd',
+      valueFormat: 'yyyy-MM-dd',
+      search: true,
+      searchSpan: 8,
+    },
+    {
+      label: "融资类别",
+      prop: "financingType",
+      type: "select",
+      dataType: 'number',
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
+      dicData: [],
+    },
+    {
+      label: "融资金额",
+      prop: "financingAmount",
+    },
+    {
+      label: "状态",
+      prop: "status",
+      type: "select",
+      dataType: 'number',
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
+      dicData: [],
+    },
+    {
+      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: "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/purchasingManagement/inStock/index.vue

@@ -13,7 +13,7 @@
                 <template slot-scope="{ row,index}" slot="menu">
                     <el-button type="text" icon="el-icon-plus" size="small" @click.stop="generate(row, index)">生成出库单
                     </el-button>
-                    <el-button type="text" icon="el-icon-delete" size="small" @click.stop="rowDel(row, index)">删除
+                    <el-button type="text" icon="el-icon-delete" size="small" :disabled="row.status>0" @click.stop="rowDel(row, index)">删除
                     </el-button>
                 </template>
                 <template slot="stockTimeSearch">

src/views/salesManagement/outStock/index.vue

@@ -10,10 +10,6 @@
                     <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newAdd()">创建单据
                     </el-button>
                 </template> -->
-                <template slot-scope="{ row,index}" slot="menu">
-                    <el-button type="text" icon="el-icon-delete" size="small" @click.stop="rowDel(row, index)">删除
-                    </el-button>
-                </template>
                 <template slot="stockTimeSearch">
                     <el-date-picker v-model="search.stockTime" type="daterange" start-placeholder="开始日期"
                         end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">

src/views/wel/components/quick-launch.vue

@@ -103,11 +103,11 @@
         </div>
       </div>
       <div class="content" v-if="sysType == 4 || sysType == 2">
-        <div class="content-icon" @click="inPage('bj')" v-if="sysType == 4">
+        <div class="content-icon" @click="inPage('bj')" v-if="sysType == 4&&roleName!='采购'">
           <i class="tradingIcon icon-sales" style="color:#606266"></i>
           <span>报价</span>
         </div>
-        <div class="content-icon" @click="inPage('xs')">
+        <div class="content-icon" @click="inPage('xs')" v-if="roleName!='采购'">
           <i class="tradingIcon icon-sales" style="color:#409EFF"></i>
           <span>销售</span>
         </div>
@@ -166,6 +166,7 @@ export default {
   data() {
     return {
       largeScreenToken: '',
+      roleName:''
     };
   },
   props: {
@@ -177,6 +178,7 @@ export default {
         this.largeScreenToken = res.data.data[0].dictKey;
       })
     }
+    this.roleName=localStorage.getItem("roleName")
   },
   methods: {
     inPage(type) {

src/views/wel/home/defaultPage.vue

@@ -3,10 +3,10 @@
     <quick-launch class="item1" :sysType="sysType" />
     <audit-data class="item2" :sysType="sysType"/>
     <realtime-data class="item3" :sysType="sysType"/>
-    <sales-reached class="item4" :sysType="sysType"/>
-    <sales-trend class="item5" :sysType="sysType"/>
-    <charge-today class="item6" :sysType="sysType"/>
-    <pay-today class="item7" :sysType="sysType"/>
+    <sales-reached class="item4" :sysType="sysType" v-if="sysType==4&&roleName!='采购'"/>
+    <sales-trend class="item5" :sysType="sysType" v-if="sysType==4&&roleName!='采购'"/>
+    <charge-today class="item6" :sysType="sysType" v-if="sysType==4&&roleName!='采购'"/>
+    <pay-today class="item7" :sysType="sysType" v-if="sysType==4&&roleName!='采购'"/>
   </div>
 </template>
 
@@ -21,12 +21,16 @@ import payToday from "../components/pay-today";
 export default {
   name: "wel",
   data() {
-    return {};
+    return {
+      roleName:''
+    };
   },
   props:{
     sysType:Number
   },
-  created() {},
+  created() {
+    this.roleName=localStorage.getItem("roleName")
+  },
   components: {
     quickLaunch,
     auditData,