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

src/components/finance/financialAccount.vue

@@ -142,6 +142,10 @@ import corpOption from './config/corpOption.json'
 export default {
   name: "financialAccount",
   props: {
+    debitAmount: {
+      type: Number,
+       default: 0,
+    },
     addBut: {
       type: Boolean,
       default: true
@@ -394,14 +398,14 @@ export default {
           amountSum += Number(this.data[item].amount)
         }
         let res = await getApplyAmount({ srcBillId: this.srcBillId, billType: "申请" })
-        if ((Number(this.form.debitAmount) - Number(res.data.data)) <= amountSum) {
-          return true
+        if ((Number(this.debitAmount) - Number(res.data.data)) <= amountSum) {
+          return '可结算金额:' + res.data.data + '元'
         }
       } else {
         for (let item in this.data) {
           let res = await getApplyAmount({ srcBillId: this.data[item].itemId, billType: "申请" })
           if ((Number(this.data[item].itemorderAmount) - Number(res.data.data)) <= this.data[item].amount) {
-            return this.data[item].srcOrderno
+            return '合同号：' + this.data[item].srcOrderno + '可结算金额:' + res.data.data + '元'
           }
         }
       }
@@ -434,9 +438,9 @@ export default {
       let forData = await this.forData()
       if (forData) {
         if (this.addBut) {
-          return this.$message.error('已付费金额大于货款')
+          return this.$message.error(forData)
         } else {
-          return this.$message.error('合同号:' + forData + '已付费金额大于货款')
+          return this.$message.error(forData)
         }
       }
 

src/views/basicData/customerCategory/index.vue

@@ -12,6 +12,7 @@
       :before-close="beforeClose"
       :table-loading="loading"
       @row-save="rowSave"
+      :search.sync="search"
       @search-change="searchChange"
       @search-reset="searchReset"
       @selection-change="selectionChange"
@@ -50,6 +51,7 @@ export default {
   data() {
     return {
       form: {},
+      search:{},
       option: option,
       loading: false,
       parentId: 0,

src/views/basicData/customerInformation/index.vue

@@ -28,6 +28,7 @@
               :before-open="beforeOpen"
               :before-close="beforeClose"
               @row-save="rowSave"
+              :search.sync="search"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
@@ -161,6 +162,7 @@ export default {
       switchDialog: false,
       treeDeptId: "",
       form: {},
+      search:{},
       option: option,
       parentId: 0,
       dataList: [],

src/views/basicData/customerManagement/companyMaterial/index.vue

@@ -28,6 +28,7 @@
               :before-open="beforeOpen"
               :before-close="beforeClose"
               @row-save="rowSave"
+              :search.sync="search"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
@@ -157,6 +158,7 @@ export default {
       switchDialog: false,
       treeDeptId: "",
       form: {},
+      search:{},
       option: option,
       parentId: 0,
       dataList: [],

src/views/basicData/customerManagement/companyType/index.vue

@@ -12,6 +12,7 @@
       :before-close="beforeClose"
       :table-loading="loading"
       @row-save="rowSave"
+      :search.sync="search"
       @search-change="searchChange"
       @search-reset="searchReset"
       @selection-change="selectionChange"
@@ -50,6 +51,7 @@ export default {
   data() {
     return {
       form: {},
+      search:{},
       option: option,
       loading: false,
       parentId: 0,

src/views/basicData/customerManagement/supplierMaterial/index.vue

@@ -28,6 +28,7 @@
               :before-open="beforeOpen"
               :before-close="beforeClose"
               @row-save="rowSave"
+              :search.sync="search"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
@@ -161,6 +162,7 @@ export default {
       switchDialog: false,
       treeDeptId: "",
       form: {},
+      search:{},
       option: option,
       parentId: 0,
       dataList: [],

src/views/basicData/customerManagement/supplierType/index.vue

@@ -12,6 +12,7 @@
       :before-close="beforeClose"
       :table-loading="loading"
       @row-save="rowSave"
+      :search.sync="search"
       @search-change="searchChange"
       @search-reset="searchReset"
       @selection-change="selectionChange"
@@ -50,6 +51,7 @@ export default {
   data() {
     return {
       form: {},
+      search:{},
       option: option,
       loading: false,
       parentId: 0,

src/views/basicData/factoryInformation/factoryCategory/index.vue

@@ -12,6 +12,7 @@
       :before-close="beforeClose"
       :table-loading="loading"
       @row-save="rowSave"
+      :search.sync="search"
       @search-change="searchChange"
       @search-reset="searchReset"
       @selection-change="selectionChange"
@@ -48,6 +49,7 @@ export default {
   data() {
     return {
       form: {},
+      search:{},
       option: option,
       loading: false,
       parentId: 0,

src/views/basicData/factoryInformation/factoryInformation/index.vue

@@ -28,6 +28,7 @@
               :before-open="beforeOpen"
               :before-close="beforeClose"
               @row-save="rowSave"
+              :search.sync="search"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
@@ -150,6 +151,7 @@ export default {
       switchDialog: false,
       treeDeptId: "",
       form: {},
+      search:{},
       option: option,
       parentId: 0,
       dataList: [],

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -392,6 +392,7 @@
         tradeType="GN"
         @choceFun="choceFun"
         @submit="feeSubmit"
+        :debitAmount="form.debitAmount"
       >
       </financial-account>
     </el-dialog>

src/views/statisticAnalysis/profitLedger/index.vue

@@ -136,7 +136,7 @@ export default {
             overHidden: true,
           },
           {
-            label: "业务区间",
+            label: "年月",
             prop: "accDate",
             search: true,
             type: 'date',
@@ -153,7 +153,7 @@ export default {
             overHidden: true,
           },
           {
-            label: "应付金额",
+            label: "成本金额",
             prop: "handleAmount",
             search: false,
             overHidden: true,