财务修改

src/router/views/index.js

@@ -490,37 +490,53 @@ export default [{
       }
     ]
   },
-  // 收款详情
+  // 付款详情
   {
-    path: '/financialManagement/receipt',
+    path: '/financialManagement/payment',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: '/financialManagement/receipt',
-        name:"收款管理",
+        path: '/financialManagement/payment',
+        name:"付款申请",
         meta: {
-          i18n: '/financialManagement/receipt',
+          i18n: '/financialManagement/payment',
           keepAlive: true,
         },
-        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/receipt')
+        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/payment')
       }
     ]
   },
-  // 付款详情
   {
-    path: '/financialManagement/payment',
+    path: '/financialManagement/settelpayment',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: '/financialManagement/payment',
-        name:"付款管理",
+        path: '/financialManagement/settelpayment',
+        name:"付款结算",
         meta: {
-          i18n: '/financialManagement/payment',
+          i18n: '/financialManagement/settelpayment',
           keepAlive: true,
         },
-        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/payment')
+        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/settelpayment')
+      }
+    ]
+  },
+  // 收款详情
+  {
+    path: '/financialManagement/receipt',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '/financialManagement/receipt',
+        name:"收款结算",
+        meta: {
+          i18n: '/financialManagement/receipt',
+          keepAlive: true,
+        },
+        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/receipt')
       }
     ]
   },

src/views/financialManagement/paymentDetailsPage.vue

@@ -106,6 +106,7 @@
   import {detailListData } from "@/api/importTrade/purchase";
   import {getSysNo} from "@/api/importTrade/purchase";
   import { getUserInfo } from "@/api/system/user";
+  import { contrastObj,contrastList } from "@/util/contrastData";
   export default {
     name: "paymentDetailsPage",
     props: {
@@ -309,6 +310,8 @@
             },
           ],
         },
+        oldForm:{},
+        oldDataList:[],
       }
     },
     created() {
@@ -320,8 +323,12 @@
         this.id = BigInt(this.detailData.id);//字符串转数字  超长用BigInt
         getDetail(this.id).then(res => {
           this.form = res.data.data;
+          this.oldForm = Object.assign({},res.data.data);
           this.configuration.dicData = res.data.data.customerModel;
-          this.dataList = res.data.data.itemsList
+          if(res.data.data.itemsList){
+            this.dataList = res.data.data.itemsList
+            this.oldDataList = this.deepClone(res.data.data.itemsList)
+          }
         })
       }else{
         this.assignment()
@@ -390,6 +397,13 @@
             }
             editFinance(params).then(res =>{
               if(res.data.success){
+                this.form = res.data.data;
+                this.oldForm = Object.assign({},res.data.data);
+                this.configuration.dicData = res.data.data.customerModel;
+                if(res.data.data.itemsList){
+                  this.dataList = res.data.data.itemsList
+                  this.oldDataList = this.deepClone(res.data.data.itemsList)
+                }
                 this.$message.success("操作成功!")
               }
             })
@@ -399,17 +413,22 @@
           }
         })
       },
-      backToList(){
-        this.$confirm("是否保存当前页面？", "提示", {
-          confirmButtonText: "保存",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          this.editFinance(true)
-        }).catch(() => {
+      backToList() {
+        if(contrastObj(this.form,this.oldForm) || contrastList(this.dataList,this.oldDataList)
+        ){
+          this.$confirm("是否保存当前页面？", "提示", {
+            confirmButtonText: "保存",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            this.editCustomer(true)
+          }).catch(()=>{
+            this.$emit("goBack");
+          })
+        }else{
           this.$emit("goBack");
-        })
-      }
+        }
+      },
     }
   }
 </script>

src/views/financialManagement/settelpayment.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "settelpayment"
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/financialManagement/settelpaymentDetailsPage.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "settelpaymentDetailsPage"
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/importTrade/invoice/config/mainList.json

@@ -22,9 +22,14 @@
   "column":[
     {
       "label": "供应商",
-      "prop": "corpsName",
+      "prop": "corpId",
+      "hide": true,
       "search": true,
-      "searchOrder": 1,
+      "searchOrder": 1
+    },
+    {
+      "label": "供应商",
+      "prop": "corpsName",
       "index": 2,
       "width":120
     },
@@ -106,11 +111,19 @@
       "label": "仓库",
       "prop": "storageId",
       "search": true,
+      "hide": true,
       "searchOrder": 8,
       "index": 7,
       "width":150
     },
     {
+      "label": "仓库",
+      "prop": "storageName",
+      "overHidden": true,
+      "index": 7,
+      "width":150
+    },
+    {
       "label": "备注",
       "prop": "deliveryRemarks",
       "search": true,
@@ -128,6 +141,11 @@
       "label": "制单人日期",
       "prop": "createTime",
       "search": true,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
       "searchOrder": 9,
       "index": 9,
       "width":120

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -34,6 +34,7 @@
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" :disabled="item.disabled?true:false || goodsDisable" size="small" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
                 <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
+<!--                <warehouse-select  v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" :configuration="sConfiguration"></warehouse-select>-->
                 <el-select v-else-if="item.prop === 'storageId'" style="width: 100%" :disabled="item.disabled?true:false || goodsDisable"  @change="warehouseChange" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
                   <el-option v-for="(item,index) in storageIdDic" :key="index" :label="item.cname" :value="item.id"></el-option>
                 </el-select>
@@ -300,35 +301,47 @@ export default {
         placeholder:'请点击右边按钮选择',
         dicData:[]
       },
+      sConfiguration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
       basicData: {
         column: [
           {
             label: '系统号',
             prop: 'sysNo',
             disabled:true,
-          }, {
-            label: '合同号',
-            prop: 'orderNo',
-            disabled:true,
+          },
+          {
+            label: '客户名称',
+            prop: 'corpId',
+            span:16,
+            type:'component',
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          },{
-            label: '客户名称',
-            prop: 'corpId',
-            type:'component',
+          },
+          {
+            label: '合同号',
+            prop: 'orderNo',
+            disabled:true,
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          }, {
+          },{
             label: '仓库名称',
             prop: 'storageId',
             rules: [

src/views/importTrade/invoice/index.vue

@@ -5,6 +5,7 @@
                ref="crud"
                v-model="form"
                :page.sync="page"
+               :search.sync="search"
                @row-del="rowDel"
                @row-update="rowUpdate"
                :before-open="beforeOpen"
@@ -18,6 +19,18 @@
                @saveColumn="saveColumn"
                @refresh-change="refreshChange"
                @on-load="onLoad">
+      <template slot="corpIdSearch">
+        <select-component
+          v-model="search.corpId"
+          :configuration="configuration"
+        ></select-component>
+      </template>
+      <template slot="storageIdSearch">
+        <warehouse-select
+          v-model="search.storageId"
+          :configuration="sConfiguration"
+        ></warehouse-select>
+      </template>
       <template slot="menuLeft">
         <el-button size="small"
                    type="success"
@@ -85,6 +98,27 @@ export default {
         pageSize: 10,
         pagerCount: 5,
         total: 0,
+      },
+      search: {},
+      configuration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
+      sConfiguration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
       }
     }
   },

src/views/importTrade/receipt/config/mainList.json

@@ -23,9 +23,15 @@
   "column":[
     {
       "label": "供应商",
-      "prop": "corpsName",
+      "prop": "corpId",
       "search": true,
       "searchOrder": 1,
+      "hide": true
+    },
+    {
+      "label": "供应商",
+      "prop": "corpsName",
+      "overHidden": true,
       "index": 2,
       "width":120
     },
@@ -33,6 +39,7 @@
       "label": "合同号",
       "prop": "orderNo",
       "search": true,
+      "overHidden": true,
       "searchOrder": 2,
       "index": 2,
       "width":120
@@ -41,6 +48,7 @@
       "label": "提单号",
       "prop": "billNo",
       "search": true,
+      "overHidden": true,
       "searchOrder": 3,
       "index": 2,
       "width":120
@@ -49,6 +57,7 @@
       "label": "收货日期",
       "prop": "businessDate",
       "search": true,
+      "overHidden": true,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -83,6 +92,7 @@
       "label": "发货人",
       "prop": "arrivalContact",
       "search": true,
+      "overHidden": true,
       "searchOrder": 5,
       "index": 4,
       "width":120
@@ -91,6 +101,7 @@
       "label": "发货电话",
       "prop": "arrivalTel",
       "search": true,
+      "overHidden": true,
       "searchOrder": 6,
       "index": 4,
       "width":120
@@ -99,6 +110,7 @@
       "label": "发货地址",
       "prop": "arrivalAddress",
       "search": true,
+      "overHidden": true,
       "searchOrder": 7,
       "index": 4,
       "width":120
@@ -107,14 +119,23 @@
       "label": "仓库",
       "prop": "storageId",
       "search": true,
+      "hide": true,
       "searchOrder": 8,
       "index": 7,
       "width":150
     },
     {
+      "label": "仓库",
+      "prop": "storageName",
+      "overHidden": true,
+      "index": 7,
+      "width":150
+    },
+    {
       "label": "备注",
       "prop": "deliveryRemarks",
       "search": true,
+      "overHidden": true,
       "searchOrder": 8,
       "index": 10,
       "width":180
@@ -122,6 +143,7 @@
     {
       "label": "系统编号",
       "prop": "sysNo",
+      "overHidden": true,
       "index": 9,
       "width":120
     },
@@ -129,6 +151,12 @@
       "label": "制单人日期",
       "prop": "createTime",
       "search": true,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "overHidden": true,
       "searchOrder": 9,
       "index": 9,
       "width":120
@@ -137,6 +165,7 @@
       "label": "制单人",
       "prop": "createUserName",
       "search": true,
+      "overHidden": true,
       "searchOrder": 10,
       "index": 9,
       "width":120

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -317,34 +317,26 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '合同号',
-            prop: 'orderNo',
-            rules: [
-              {
-                required: false,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          },  {
-            label: '业务员',
-            prop: 'saleman',
+          },
+          {
+            label: '供应商',
+            prop: 'corpId',
+            span: 16,
             dicData: [],
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          },  {
-            label: '供应商',
-            prop: 'corpId',
-            dicData: [],
+          },
+          {
+            label: '合同号',
+            prop: 'orderNo',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -375,6 +367,18 @@ export default {
             ]
           },
           {
+            label: '业务员',
+            prop: 'saleman',
+            dicData: [],
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: '码单重量',
             prop: 'billWeight',
             disabled: true,

src/views/importTrade/receipt/index.vue

@@ -5,6 +5,7 @@
                ref="crud"
                v-model="form"
                :page.sync="page"
+               :search.sync="search"
                @row-del="rowDel"
                @row-update="rowUpdate"
                :before-open="beforeOpen"
@@ -18,6 +19,18 @@
                @refresh-change="refreshChange"
                @saveColumn="saveColumn"
                @on-load="onLoad">
+      <template slot="corpIdSearch">
+        <select-component
+          v-model="search.corpId"
+          :configuration="configuration"
+        ></select-component>
+      </template>
+      <template slot="storageIdSearch">
+        <warehouse-select
+          v-model="search.storageId"
+          :configuration="sConfiguration"
+        ></warehouse-select>
+      </template>
       <template slot="menuLeft">
         <el-button size="small"
                    type="success"
@@ -79,6 +92,27 @@ export default {
       show:true,
       detailData:{},
       option: option,
+      search: {},
+      configuration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
+      sConfiguration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
       parentId: 0,
       dataList: [],
       page: {
@@ -105,6 +139,18 @@ export default {
       }
     }, 100);
   },
+  mounted() {
+    this.option.height = window.innerHeight - 310;
+    let i = 0;
+    this.option.column.forEach(item => {
+      if (item.search) i++
+    })
+    if (i % 3 !== 0){
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
+      this.option.searchMenuPosition = "right";
+    }
+  },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {

src/views/purchase/contract/config/mainList.json

@@ -44,13 +44,18 @@
     {
       "label": "供应商",
       "prop": "strCorpName",
-      "search": true,
       "overHidden": true,
-      "searchOrder": 3,
       "index": 3,
       "width":200
     },
     {
+      "label": "供应商",
+      "prop": "corpId",
+      "search": true,
+      "hide": true,
+      "searchOrder": 3
+    },
+    {
       "label": "采购商",
       "prop": "strPurchaserName",
       "overHidden": true,
@@ -151,20 +156,6 @@
       "index": 14,
       "width":150
     },
-    {
-      "label": "到港日期",
-      "prop": "dateOfArrival",
-      "type": "date",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "unlinkPanels": true,
-      "searchRange": true,
-      "overHidden": true,
-      "search": true,
-      "searchOrder": 9,
-      "index": 15,
-      "width":150
-    },
      {
       "label": "付款/开证日期",
       "prop": "accountsCollectionDate",

src/views/purchase/contract/detailsPage.vue

@@ -476,6 +476,7 @@ export default {
           }, {
             label: '供应商',
             prop: 'corpId',
+            span: 16,
             dicData: [],
             rules: [
               {
@@ -484,24 +485,25 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '采购商',
-            prop: 'purchaserId',
-            dicData: [],
+          },{
+            label: '合同号',
+            prop: 'orderNo',
+            disabled:true,
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          },{
-            label: '合同号',
-            prop: 'orderNo',
-            disabled:true,
+          }, {
+            label: '采购商',
+            prop: 'purchaserId',
+            span: 16,
+            dicData: [],
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }

src/views/purchase/contract/index.vue

@@ -22,6 +22,12 @@
                  @on-load="onLoad"
                  @expand-change="expandChange"
                  @saveColumn="saveColumn">
+        <template slot="corpIdSearch">
+          <select-component
+            v-model="search.corpId"
+            :configuration="configuration"
+          ></select-component>
+        </template>
         <template slot-scope="scope" slot="expand">
           <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
             <el-table-column   align="center"  width="60"></el-table-column>
@@ -73,7 +79,6 @@
           >删除
           </el-button>
         </template>
-
       </avue-crud>
     </basic-container>
     <detail-page
@@ -105,6 +110,16 @@ export default {
       form: {},
       show: true,
       search: {},
+      configuration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
     }
   },
   components:{
@@ -115,6 +130,15 @@ export default {
   },
   mounted() {
     this.option.height = window.innerHeight - 310;
+    let i = 0;
+    this.option.column.forEach(item => {
+      if (item.search) i++
+    })
+    if (i % 4 !== 0){
+      const num = 4 - Number(i % 4)
+      this.option.searchMenuSpan = num * 8;
+      this.option.searchMenuPosition = "right";
+    }
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)

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

@@ -46,15 +46,25 @@
       "label": "客户名称",
       "prop": "corpsName",
       "overHidden": true,
-      "search": true,
-      "searchOrder": 3,
       "index": 3,
       "width":150
     },
     {
+      "label": "客户名称",
+      "prop": "corpId",
+      "hide": true,
+      "search": true,
+      "searchOrder": 3
+    },
+    {
       "label": "合同日期",
       "prop": "businesDate",
       "overHidden": true,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
       "search": true,
       "searchOrder": 4,
       "index": 4,
@@ -115,6 +125,11 @@
       "label": "客户首付日期",
       "prop": "advanceCollectionDate",
       "overHidden": true,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
       "search": true,
       "searchOrder": 6,
       "index": 12,

src/views/salesManagement/salesContract/detailsPage.vue

@@ -340,7 +340,20 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
+          },
+          {
+            label: '客户名称',
+            span:16,
+            prop: 'corpId',
+            rules: [
+              {
+                required: true,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: '合同号',
             prop: 'orderNo',
             disabled:true,
@@ -363,17 +376,8 @@ export default {
                 trigger: 'blur'
               }
             ]
-          },  {
-            label: '客户名称',
-            prop: 'corpId',
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          },{
+          },
+          {
             label: '业务员',
             prop: 'salesName',
             dicData: [],

src/views/salesManagement/salesContract/index.vue

@@ -5,6 +5,7 @@
                ref="crud"
                v-model="form"
                :page.sync="page"
+               :search.sync="search"
                @row-del="rowDel"
                @row-update="rowUpdate"
                :before-open="beforeOpen"
@@ -19,6 +20,12 @@
                @on-load="onLoad"
                @expand-change="expandChange"
                @saveColumn="saveColumn">
+      <template slot="corpIdSearch">
+        <select-component
+          v-model="search.corpId"
+          :configuration="configuration"
+        ></select-component>
+      </template>
       <template slot-scope="{row,size}" slot="search">
       </template>
       <template slot-scope="scope" slot="expand">
@@ -102,6 +109,16 @@ export default {
       form: {},
       detailData:{},
       search: {},
+      configuration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
     }
   },
   components:{