修改bug

src/api/basicData/agreement.js

@@ -54,4 +54,23 @@ export const submit = (row) => {
     method: 'post',
     data: row
   })
+}
+export function getStoragetree() {
+  return request({
+    url: '/api/blade-client/storagetype/tree',
+    method: 'get',
+  })
+}
+export function getAllgoodstype() {
+  return request({
+    url: '/api/blade-client/goodstype/listAll',
+    method: 'get',
+  })
+}
+export function getLazylist(data) {
+  return request({
+    url: '/api/blade-system/dept/lazy-list',
+    method: 'get',
+    params: data
+  })
 }

src/api/basicData/financingLedger.js

@@ -11,3 +11,14 @@ export const getList = (current, size, params) => {
     }
   })
 }
+export const getfinancingDetailsList = (current, size, params) => {
+  return request({
+    url: '/api/trade-purchase/financing/financingDetailsList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/router/views/index.js

@@ -1789,5 +1789,57 @@ export default [{
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/salesManagement/outStock/index')
   }]
+}, {
+  path: '/basicData/agreement/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/basicData/agreement/index',
+    name: '仓储费协议',
+    meta: {
+      i18n: '/basicData/agreement/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/basicData/agreement/index')
+  }]
+}, {
+  path: '/financing/financingManagement/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/financing/financingManagement/index',
+    name: '融资管理',
+    meta: {
+      i18n: '/financing/financingManagement/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/financing/financingManagement/index')
+  }]
+}, {
+  path: '/financing/financingLedger/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/financing/financingLedger/index',
+    name: '融资总账',
+    meta: {
+      i18n: '/financing/financingLedger/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/financing/financingLedger/index')
+  }]
+}, {
+  path: '/financing/financingLedger/detail',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/financing/financingLedger/detail',
+    name: '融资总账明细',
+    meta: {
+      i18n: '/financing/financingLedger/detail',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/financing/financingLedger/detail')
+  }]
 }
 ]

src/views/basicData/agreement/detailsPage.vue

@@ -20,6 +20,12 @@
             <crop-select v-model="form.corpId" corpType="KH" :refresh="false" @getCorpData="getCorpData"
               :disabled="detailData.status == 1"></crop-select>
           </template>
+          <template slot="warehouseId">
+            <el-cascader v-model="form.warehouseId" :options="storagetreeList" :show-all-levels="false"
+              :disabled="detailData.status == 1"
+              :props="{ checkStrictly: true, emitPath: false, label: 'title',multiple: true }" clearable>
+            </el-cascader>
+          </template>
         </avue-form>
       </basic-container>
       <containerTitle title="基础明细"></containerTitle>
@@ -30,6 +36,12 @@
             <el-button type="primary" @click="addRow" size="small" :disabled="detailData.status == 1">新增
             </el-button>
           </template>
+          <template slot="feeId" slot-scope="{ row,index }">
+            <breakdown-select v-if="row.$cellEdit" v-model="row.feeId" @selectValue="value => selectValue(value,row)"
+              :configuration="breakConfiguration">
+            </breakdown-select>
+            <span v-else>{{ row.feeName }}</span>
+          </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>
@@ -46,7 +58,7 @@
 
 <script>
 import { optionList } from "./js/optionList";
-import { getDetail, submit } from "@/api/basicData/agreement";
+import { getDetail, submit, getStoragetree, getAllgoodstype, getLazylist } from "@/api/basicData/agreement";
 export default {
   name: "index",
   data() {
@@ -61,21 +73,57 @@ export default {
           {
             label: "合同编号",
             prop: "contractNo",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6,
           },
           {
             label: "制单部门",
             prop: "deptId",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
+            type: "select",
+            dataType: "string",
+            props: {
+              label: "deptName",
+              value: "id"
+            },
+            dicData: [],
             span: 6,
           },
           {
             label: "客户名称",
             prop: "corpId",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6,
           },
           {
             label: "贸易方式",
-            prop: "trademodeId",
+            prop: "billType",
+            type: "select",
+            dataType: "string",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            dicData: [],
+            multiple: true,
             span: 6,
           },
           {
@@ -95,14 +143,40 @@ export default {
             span: 6,
           },
           {
+            label: "商品分类",
+            prop: "goodsId",
+            type: "select",
+            dataType: "string",
+            props: {
+              label: "cname",
+              value: "id"
+            },
+            dicData: [],
+            span: 6,
+          },
+          {
             label: "仓库",
             prop: "warehouseId",
+            // type: "cascader",
+            // dataType: "string",
+            // dicData: [],
+            // props: {
+            //   label: 'title',
+            //   value: 'id'
+            // },
+            // multiple: true,
             span: 6,
           },
           {
             label: "状态",
             prop: "billStatus",
-            disabled:true,
+            type: "select",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            dicData: [],
+            disabled: true,
             span: 6,
           },
           {
@@ -111,7 +185,7 @@ export default {
             type: "textarea",
             minRows: 2,
             width: 120,
-            span: 24,
+            span: 18,
           },
         ]
       },
@@ -122,7 +196,18 @@ export default {
       jobLevelList: [],
       occupationalLevelList: [],
       maritalList: [],
-      orderFilesList:[]
+      orderFilesList: [],
+      storagetreeList: [],
+      breakConfiguration: {
+        multipleChoices: false,
+        multiple: false,
+        disabled: false,
+        searchShow: true,
+        collapseTags: false,
+        clearable: true,
+        placeholder: "请点击右边按钮选择",
+        dicData: []
+      },
     };
   },
   props: {
@@ -144,17 +229,50 @@ export default {
     this.getWorkDicts("result_type").then(res => {
       this.resultList = res.data.data;
     });
+    this.getWorkDicts("trading_type").then(res => {
+      this.findObject(this.option.column, "billType").dicData =
+        res.data.data;
+    });
+    this.getWorkDicts("unit").then(res => {
+      this.findObject(this.optionList.column, "feeUnitId").dicData =
+        res.data.data;
+    });
+    this.getWorkDicts("bill_status").then(res => {
+      this.findObject(this.option.column, "billSdtatus").dicData = res.data.data;
+    });
+    getStoragetree().then(res => {
+      this.storagetreeList = res.data.data;
+    })
+    getAllgoodstype().then(res => {
+      this.findObject(this.option.column, "goodsId").dicData =
+        res.data.data;
+    })
+    getLazylist().then(res => {
+      this.findObject(this.option.column, "deptId").dicData =
+        res.data.data;
+    })
   },
   methods: {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    selectValue(value,row) {
+      console.log(value,row)
+      if(row.feeId){
+        row.feeName=value.cname
+      }else{
+        row.feeName=""
+      }
+    },
     getDetail(id) {
       getDetail(id)
         .then(res => {
+          if (res.data.data.warehouseId) {
+            res.data.data.warehouseId = res.data.data.warehouseId.split(',')
+          }
           this.form = res.data.data;
           this.dataList = res.data.data.agreementitemsList;
-          this.orderFilesList=res.data.data.orderFilesList
+          this.orderFilesList = res.data.data.orderFilesList
         })
         .finally(() => {
           // this.loading = false;
@@ -162,7 +280,7 @@ export default {
           // this.pageLoading = false;
         });
     },
-    getCorpData(row){
+    getCorpData(row) {
       this.form.corpName = row.cname
     },
     addRow() {
@@ -204,13 +322,21 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
+          if (this.form.warehouseId) {
+            console.log(this.form.warehouseId)
+            this.form.warehouseId = this.form.warehouseId.join(',')
+          }
           this.loadingBtn = true;
           submit({ ...this.form, agreementitemsList: this.dataList })
             .then(res => {
               this.$message.success("保存成功");
+              if (res.data.data.data.warehouseId) {
+                res.data.data.data.warehouseId = res.data.data.data.warehouseId.split(',')
+              }
+              console.log()
               this.form = res.data.data.data;
               this.dataList = res.data.data.data.agreementitemsList;
-              this.orderFilesList=res.data.data.orderFilesList
+              this.orderFilesList = res.data.data.orderFilesList
             })
             .finally(() => {
               this.loadingBtn = false;

src/views/basicData/agreement/index.vue

@@ -9,12 +9,16 @@
           <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 slot-scope="{ row,index}" slot="contractNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.contractNo }}</span>
         </template>
         <template slot-scope="{ row,index}" slot="corpId">
           <span>{{ row.corpName }}</span>
         </template>
+        <template slot-scope="{ row,index}" slot="status">
+          <el-switch v-model="row.status" active-value="0" inactive-value="1" @change="switchChange(row)">
+          </el-switch>
+        </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
         </template>
@@ -32,7 +36,7 @@
 <script>
 import detailsPage from "./detailsPage";
 import { option } from "./js/optionList";
-import { getList, remove } from "@/api/basicData/agreement";
+import { getList, remove, submit } from "@/api/basicData/agreement";
 
 export default {
   name: "index",
@@ -143,6 +147,22 @@ export default {
         });
       });
     },
+    switchChange(row) {
+      this.$confirm("确定要"+row.stauts==0?"开启":"停用"+row.corpName+"吗?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        submit({ ...row })
+          .then(res => {
+            this.$message.success("修改成功");
+          })
+          .finally(() => {
+            this.onLoad(this.page, this.search);
+          });
+      });
+
+    },
     async saveColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(192),

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

@@ -1,4 +1,4 @@
-export const option ={
+export const option = {
   searchShow: true,
   searchMenuSpan: 16,
   align: "center",
@@ -18,13 +18,13 @@ export const option ={
       label: "合同编号",
       prop: "contractNo",
       overHidden: true,
-      search:true
+      search: true
     },
     {
       label: "客户名称",
       prop: "corpId",
       overHidden: true,
-      search:true
+      search: true
     },
     {
       label: "有效期起",
@@ -33,7 +33,7 @@ export const option ={
       type: "date",
       format: "yyyy-MM-dd",
       valueFormat: "yyyy-MM-dd",
-      search:true
+      search: true
     },
     {
       label: "有效期至",
@@ -42,7 +42,17 @@ export const option ={
       type: "date",
       format: "yyyy-MM-dd",
       valueFormat: "yyyy-MM-dd",
-      search:true
+      search: true
+    },
+    {
+      label: "是否开启",
+      prop: "status",
+      overHidden: true,
+      // props: {
+      //   label: "dictValue",
+      //   value: "dictKey"
+      // },
+      dicData: []
     },
     {
       label: "状态",
@@ -57,7 +67,7 @@ export const option ={
     },
   ]
 }
-export const optionList ={
+export const optionList = {
   align: "center",
   addBtn: false,
   refreshBtn: false,
@@ -71,49 +81,47 @@ export const optionList ={
       label: "费用名称",
       prop: "feeId",
       overHidden: true,
-      cell:true,
-      width: 120,
+      width: 150,
     },
     {
       label: "计价单位",
       prop: "feeUnitId",
       overHidden: true,
-      cell:true,
+      type: "select",
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
+      dicData: [],
+      cell: true,
       width: 120,
     },
     {
       label: "开始天数",
       prop: "fromDays",
       overHidden: true,
-      cell:true,
+      cell: true,
       width: 120,
     },
     {
       label: "结束天数",
       prop: "enDays",
       overHidden: true,
-      cell:true,
+      cell: true,
       width: 120,
     },
     {
       label: "单价",
       prop: "price",
       overHidden: true,
-      cell:true,
-      width: 120,
-    },
-    {
-      label: "状态",
-      prop: "status",
-      overHidden: true,
-      cell:true,
+      cell: true,
       width: 120,
     },
     {
       label: "备注",
       prop: "remark",
       overHidden: true,
-      cell:true,
+      cell: true,
       width: 120,
     },
   ]

src/views/financing/financingLedger/detail.vue

@@ -0,0 +1,165 @@
+<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-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" :disabled="row.status>0" @click.stop="rowView(row, index)">
+              查看详情
+            </el-button>
+          </template>
+        </avue-crud>
+      </basic-container>
+    </div>
+  </template>
+  
+  <script>
+  import { option } from "./js/optionList";
+  import { getfinancingDetailsList } from "@/api/basicData/financingLedger";
+  
+  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;
+      },
+      rowView(row) {
+        this.$router.push({
+          path: "/salesManagement/outStock/index",
+          query: {
+            generateId: row.id
+          }
+        });
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        this.dataList.forEach(item => {
+          this.$refs.crud.toggleRowExpansion(item, false);
+        });
+        getfinancingDetailsList(
+          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;
+      },
+      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/index.vue

@@ -1,23 +1,21 @@
 <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 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-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" :disabled="row.status>0" @click.stop="rowView(row, index)">
+            查看明细
+          </el-button>
+        </template>
       </avue-crud>
     </basic-container>
   </div>
@@ -25,7 +23,7 @@
 
 <script>
 import { option } from "./js/optionList";
-import {getList} from "@/api/basicData/financingLedger";
+import { getList } from "@/api/basicData/financingLedger";
 
 export default {
   name: "index",
@@ -79,6 +77,14 @@ export default {
     newAdd() {
       this.show = false;
     },
+    rowView(row) {
+      this.$router.push({
+        path: "/financing/financingLedger/detail",
+        query: {
+          Id: row.id
+        }
+      });
+    },
     onLoad(page, params = {}) {
       this.loading = true;
       this.dataList.forEach(item => {

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

@@ -1,6 +1,6 @@
 export const option ={
   searchShow: true,
-  searchMenuSpan: 8,
+  searchMenuSpan: 16,
   align: "center",
   searchSpan: 8,
   tip: false,
@@ -10,31 +10,17 @@ export const option ={
   viewBtn: false,
   editBtn: false,
   delBtn: false,
-  menuWidth: 70,
+  menuWidth: 100,
   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",
     },
@@ -49,18 +35,6 @@ export const option ={
     {
       label: "本期结余金额",
       prop: "balanceAmount",
-    },
-    {
-      label: "未还款金额",
-      prop: "amount",
-    },
-    {
-      label: "状态",
-      prop: "status",
-    },
-    {
-      label: "备注",
-      prop: "remarks",
     }
   ]
 }

src/views/financing/financingManagement/detailsPage.vue

@@ -68,6 +68,13 @@ export default {
           {
             label: "客户",
             prop: "corpId",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
@@ -76,6 +83,13 @@ export default {
             type: "date",
             format: 'yyyy-MM-dd',
             valueFormat: 'yyyy-MM-dd',
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
@@ -88,11 +102,25 @@ export default {
               value: "dictKey"
             },
             dicData: [],
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
             label: "融资金额",
             prop: "financingAmount",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 6
           },
           {
@@ -209,13 +237,12 @@ export default {
           url: '/financing/financingManagement/index',
           pageStatus: "this.$store.getters.entranceXsStatus",
           pageLabel: "融资管理",
-          checkFlag: 3,
+          checkFlag: 1,
         }
         checkFinancing(data).then(res => {
           if (res.data.success) {
             this.$message.success("操作成功!")
-            this.viewDisabled = true
-            this.approverDisabled = true
+            this.option.disabled = true;
           }
         })
       }).finally(() => {

src/views/purchase/contract/detailsPage.vue

@@ -110,8 +110,8 @@
                     :disabled="item.disabled ? true : false || takeDisabled || viewDisabled" size="small"
                     autocomplete="off" placeholder="请输入"></el-input>
                   <el-select v-model="form['prepayCurrency']" size="small" style="width: 30%" :value="'USD'"
-                    :disabled="item.disabled ? true : false || takeDisabled || viewDisabled" value="USD"
-                    placeholder="请选择" clearable filterable>
+                    :disabled="item.disabled ? true : false || takeDisabled || viewDisabled" placeholder="请选择" clearable
+                    filterable>
                     <el-option v-for="(item, index) in currencyDic" :key="index" :label="item.dictValue"
                       :value="item.dictValue"></el-option>
                   </el-select>
@@ -217,8 +217,8 @@
             <template slot-scope="{row,index}" slot="menu">
               <el-button type="text" size="small" icon="el-icon-edit"
                 :disabled="row.actualQuantity != 0 || viewDisabled" @click="rowCell(row, index)">{{ row.$cellEdit ?
-                    '修改完成' : '修改'
-                
+                '修改完成' : '修改'
+
                 }}
               </el-button>
               <el-button type="text" icon="el-icon-delete" size="small"
@@ -244,7 +244,7 @@
           </avue-crud>
         </trade-card>
         <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="viewDisabled" :itemType="'申请'"
-          :optionType="'JK'" @beforeFinance="beforeFinance" @afterFinance="afterFinance" @getBillNo="getBillNo"
+          :optionType="'JK'" @afterFinance="afterFinance" @getBillNo="getBillNo"
           feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :billNoList="billNoList"
           :delType="2" :financeDisabled="false"
           :isDecimal="$store.getters.userInfo.tenant_id == '269129' || $store.getters.userInfo.tenant_id == '888390'" />
@@ -779,29 +779,6 @@ export default {
       })
       this.billNoList = Array.from(new Set(this.billNoList))
     },
-    //费用明细回调
-    beforeFinance(feesData, callback) {
-      let params = {}
-      if (contrastObj(this.form, this.oldForm) || contrastList(this.contactsData, this.oldContactsData)
-        || contrastList2(feesData, this.oldFeesList) || contrastList(this.orderFilesList, this.oldFilesList)
-      ) {
-        this.$confirm("数据发生变化，请先提交保存？", {
-          confirmButtonText: "保存",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.editCustomer();
-        }).finally(() => {
-          params.valid = false
-          callback(params)
-        })
-      } else {
-        params.valid = true
-        params.parentId = this.form.id
-        params.srcOrderno = this.form.orderNo
-        callback(params)
-      }
-    },
     //生成账单之后需要更新明细列表的属性
     afterFinance() {
       detailListData(this.form.id).then(res => {

src/views/purchasingManagement/inStock/config/customerContact.json

@@ -125,6 +125,12 @@
       "prop": "unit",
       "label": "入库单位",
       "overHidden": true,
+      "type": "select",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dicData": [],
       "cell": true,
       "width": 100
     },

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -66,8 +66,8 @@
         </avue-crud>
       </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" />
+        feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :optionType="'CMY'" :itemType="'C'" :inCropId="true"
+        :tabShow="3" @beforeFinance="beforeFinance" :delType="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%"
         :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
@@ -236,6 +236,10 @@ export default {
       this.findObject(this.tableOption.column, "itemId").dicData =
         res.data.data;
     })
+    this.getWorkDicts("unit").then(res => {
+      this.findObject(this.tableOption.column, "unit").dicData =
+        res.data.data;
+    });
   },
   methods: {
     cellStyle() {
@@ -384,6 +388,13 @@ export default {
         this.buttonLoading = false
       })
     },
+    beforeFinance(feesData,callback){
+      let params = {}
+      //暂时默认通过  之后优化
+      params.valid = true
+      params.parentId = this.form.id
+      callback(params)
+    },
     getTemplate() {
       window.open(`/api/trade-purchase/woodHarvestingCloud/export-template?${this.website.tokenHeader}=${getToken()}`)
     },

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

@@ -125,6 +125,12 @@
       "prop": "unit",
       "label": "出库单位",
       "overHidden": true,
+      "type": "select",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dicData": [],
       "cell": true,
       "width": 100
     },

src/views/salesManagement/outStock/detailsPage.vue

@@ -37,8 +37,9 @@
               :disabled="detailData.status == 1"></crop-select>
           </template>
           <template slot="storageId">
-            <el-cascader v-model="form.storageId" :options="storagetreeList" :show-all-levels="false" :disabled="detailData.status == 1"
-              :props="{ checkStrictly: true, emitPath: false, label: 'title' }" clearable @change="storagetreeChange">
+            <el-cascader v-model="form.storageId" :options="storagetreeList" :show-all-levels="false"
+              :disabled="detailData.status == 1" :props="{ checkStrictly: true, emitPath: false, label: 'title' }"
+              clearable @change="storagetreeChange">
             </el-cascader>
           </template>
         </avue-form>
@@ -67,8 +68,8 @@
         </avue-crud>
       </trade-card>
       <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="detailData.status == 1"
-        feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" optionType="JK" itemType="申请" :inCropId="true"
-        :tabShow="2" :billingShow="false" />
+        feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :optionType="'CMY'" :itemType="'D'" :inCropId="true"
+        :tabShow="2" @beforeFinance="beforeFinance" :delType="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%"
@@ -238,6 +239,10 @@ export default {
       this.findObject(this.tableOption.column, "itemId").dicData =
         res.data.data;
     })
+    this.getWorkDicts("unit").then(res => {
+      this.findObject(this.tableOption.column, "unit").dicData =
+        res.data.data;
+    });
     if (this.$route.query.generateId) {
       this.getGenerate(this.$route.query.generateId);
     }
@@ -436,6 +441,13 @@ export default {
       this.option.disabled = false;
       this.$refs.crud.refreshTable();
     },
+    beforeFinance(feesData, callback) {
+      let params = {}
+      //暂时默认通过  之后优化
+      params.valid = true
+      params.parentId = this.form.id
+      callback(params)
+    },
     async saveColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(191),

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" 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!='采购'"/>
+    <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>