Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

src/api/pages/report/detail-report.js

@@ -17,7 +17,8 @@ export default {
     getOutboundDetailReport: 'outbound_detail_report',
     // 入库明细报表
     getInboundDetailReport: 'inbound_detail_report',
-
+    // 客户收款明细表
+    getRecPayDetailReport: 'rec_pay_detail_report',
   }
 }
 

src/locale/lang/zh-CN.js

@@ -592,6 +592,7 @@ export const columns = {
   returnOutQtySum:'已出库退货总量',
   returnOutAmtSum:'已出库退货总金额',
   intoTypeName:'入库类型',
+  rpNo:'收付款单号',
 }
 
 /**

src/view/ivt/ivt-check/index.vue

@@ -110,6 +110,7 @@
 
 <script>
 import {indexMixin} from "@/mixins";
+import Config from "@/config";
 export default {
   name: 'ivt-check',
   mixins: [indexMixin],
@@ -152,25 +153,20 @@ export default {
             valueKind: 'DATE_RANGE'
           },
           {
-            itemCode: '业务部门-文本',
-            itemName: 'checkOrg',
+            itemCode: 'checkOrg',
             valueFormat: {
               code: 'orgIdList',
               data: [],
-              valueKey: 'orgId',
-              labelKey: 'orgName',
             },
+            magnifierType: self.$config.MagnifierType.org,
             valueKind: 'M-CHOICE'
           },
           {
-            itemCode: '业务员-文本',
-            itemName: 'checkStaff',
+            itemCode: 'checkStaff',
             valueFormat: {
               code: 'staffIdList',
-              data: [],
-              valueKey: 'staffId',
-              labelKey: 'staffCodeName',
             },
+            magnifierType:self.$config.MagnifierType.staff,
             valueKind: 'M-CHOICE'
           },
           self.$config.flgValidSearch

src/view/ivt/ivt-freeze/index.vue

@@ -135,25 +135,20 @@ export default {
             valueKind: 'STR'
           },
           {
-            itemCode: '业务部门-文本',
-            itemName: 'orgId',
+            itemCode: 'orgId',
             valueFormat: {
               code: 'orgIdList',
               data: [],
-              valueKey: 'orgId',
-              labelKey: 'orgName',
             },
+            magnifierType: self.$config.MagnifierType.org,
             valueKind: 'M-CHOICE'
           },
           {
-            itemCode: '业务员-文本',
-            itemName: 'staffId',
+            itemCode: 'staffId',
             valueFormat: {
               code: 'staffIdList',
-              data: [],
-              valueKey: 'staffId',
-              labelKey: 'staffCodeName',
             },
+            magnifierType:self.$config.MagnifierType.staff,
             valueKind: 'M-CHOICE'
           },
           {

src/view/ivt/ivt-transfer/index.vue

@@ -144,25 +144,20 @@ export default {
             valueKind: 'DATE_RANGE'
           },
           {
-            itemCode: '业务部门-文本',
-            itemName: 'transferOrg',
+            itemCode: 'transferOrg',
             valueFormat: {
               code: 'orgIdList',
               data: [],
-              valueKey: 'orgId',
-              labelKey: 'orgName',
             },
+            magnifierType: self.$config.MagnifierType.org,
             valueKind: 'M-CHOICE'
           },
           {
-            itemCode: '业务员-文本',
-            itemName: 'transferStaff',
+            itemCode: 'transferStaff',
             valueFormat: {
               code: 'staffIdList',
-              data: [],
-              valueKey: 'staffId',
-              labelKey: 'staffCodeName',
             },
+            magnifierType:self.$config.MagnifierType.staff,
             valueKind: 'M-CHOICE'
           },
           self.$config.flgValidSearch

src/view/mst/supplier/index.vue

@@ -111,7 +111,7 @@
         </DkFormItem>
         <!--   期初欠款     -->
         <DkFormItem prop="期初欠款">
-          <InputPop v-model="formData.supName" textareaFlag/>
+          <InputPop v-model="formData.startAmount" textareaFlag/>
         </DkFormItem>
         <!--   备注     -->
         <DkFormItem prop="remarks">
@@ -137,6 +137,7 @@ export default {
       supTypeList: [],
       serviceCategoriesList: [],
       brandIds: [],
+      startAmount:null,
       orgId: null,
       staffId: null,
       flgValidBrand:false,

src/view/report/detail-report/setting.js

@@ -56,30 +56,24 @@ const data = {
       // 业务部门
       {
         itemCode: 'orgId',
-        itemName: 'orgName',
         valueFormat: {
           code: 'orgIdList',
-          service:'commonService',
-          method:'getOrg',
-          data: [],
-          valueKey: 'orgId',
-          labelKey: 'orgName',
         },
-        valueKind: 'M-CHOICE'
+        magnifierType: Config.MagnifierType.org,
+        valueKind: 'M-SEARCH'
       },
       // 业务员
       {
         itemCode: 'staffId',
-        itemName: 'staffName',
         valueFormat: {
           code: 'staffIdList',
-          service:'commonService',
-          method:'getStaff',
-          data: [],
-          valueKey: 'staffId',
-          labelKey: 'staffCodeName',
         },
-        valueKind: 'M-CHOICE'
+        magnifierType: Config.MagnifierType.staff,
+        valueKind: 'M-SEARCH'
+      },
+      // 主表备注
+      {
+        itemCode: 'remarks'
       },
       //商品名称
       {itemCode: 'skuName'},
@@ -259,30 +253,24 @@ const data = {
       // 业务部门
       {
         itemCode: 'orgId',
-        itemName: 'orgName',
         valueFormat: {
           code: 'orgIdList',
-          service:'commonService',
-          method:'getOrg',
-          data: [],
-          valueKey: 'orgId',
-          labelKey: 'orgName',
         },
-        valueKind: 'M-CHOICE'
+        magnifierType: Config.MagnifierType.org,
+        valueKind: 'M-SEARCH'
       },
       // 业务员
       {
         itemCode: 'staffId',
-        itemName: 'staffName',
         valueFormat: {
           code: 'staffIdList',
-          service:'commonService',
-          method:'getStaff',
-          data: [],
-          valueKey: 'staffId',
-          labelKey: 'staffCodeName',
         },
-        valueKind: 'M-CHOICE'
+        magnifierType: Config.MagnifierType.staff,
+        valueKind: 'M-SEARCH'
+      },
+      // 主表备注
+      {
+        itemCode: 'remarks'
       },
       //商品名称
       {itemCode: 'skuName'},
@@ -438,30 +426,24 @@ const data = {
       // 业务部门
       {
         itemCode: 'orgId',
-        itemName: 'orgName',
         valueFormat: {
           code: 'orgIdList',
-          service:'commonService',
-          method:'getOrg',
-          data: [],
-          valueKey: 'orgId',
-          labelKey: 'orgName',
         },
-        valueKind: 'M-CHOICE'
+        magnifierType: Config.MagnifierType.org,
+        valueKind: 'M-SEARCH'
       },
       // 业务员
       {
         itemCode: 'staffId',
-        itemName: 'staffName',
         valueFormat: {
           code: 'staffIdList',
-          service:'commonService',
-          method:'getStaff',
-          data: [],
-          valueKey: 'staffId',
-          labelKey: 'staffCodeName',
         },
-        valueKind: 'M-CHOICE'
+        magnifierType: Config.MagnifierType.staff,
+        valueKind: 'M-SEARCH'
+      },
+      // 主表备注
+      {
+        itemCode: 'remarks'
       },
       //商品名称
       {itemCode: 'skuName'},
@@ -613,30 +595,24 @@ const data = {
       // 业务部门
       {
         itemCode: 'orgId',
-        itemName: 'orgName',
         valueFormat: {
           code: 'orgIdList',
-          service:'commonService',
-          method:'getOrg',
-          data: [],
-          valueKey: 'orgId',
-          labelKey: 'orgName',
         },
-        valueKind: 'M-CHOICE'
+        magnifierType: Config.MagnifierType.org,
+        valueKind: 'M-SEARCH'
       },
       // 业务员
       {
         itemCode: 'staffId',
-        itemName: 'staffName',
         valueFormat: {
           code: 'staffIdList',
-          service:'commonService',
-          method:'getStaff',
-          data: [],
-          valueKey: 'staffId',
-          labelKey: 'staffCodeName',
         },
-        valueKind: 'M-CHOICE'
+        magnifierType: Config.MagnifierType.staff,
+        valueKind: 'M-SEARCH'
+      },
+      // 主表备注
+      {
+        itemCode: 'remarks'
       },
       //商品名称
       {itemCode: 'skuName'},
@@ -734,6 +710,86 @@ const data = {
       {field: 'returnAmt',type:'number'},
     ]
   },
+  // 客户收款明细报表
+  'cus-receipt-report': {
+    // 是否显示合计行
+    showFooter: true,
+    // 接口文件
+    serviceStr: 'detailReportService',
+    // 查询方法
+    methodsName: 'getRecPayDetailReport',
+    // 查询条件
+    searchContent: [
+      // 收付款单号
+      {itemCode: 'rpNo'},
+      // 业务单号
+      {itemCode: 'biznisNo'},
+      // 客户名称
+      {itemCode: 'cusName'},
+      // 客户电话
+      {
+        itemCode: 'cusPhone',
+        valueFormat: {
+          code: 'cusPhone',
+        },
+        valueKind: 'M-SEARCH',
+        magnifierType: Config.MagnifierType.customer,
+      },
+
+      // 账务日期
+      {
+        itemCode: 'accDate',
+        valueFormat: {
+          code: 'accDate',
+        },
+        valueKind: 'DATE_RANGE'
+      },
+      // 制单日期
+      {
+        itemCode: 'makeTime',
+        valueFormat: {
+          code: 'makeTime',
+        },
+        valueKind: 'DATE_RANGE'
+      },
+      // 业务部门
+      {
+        itemCode: 'orgId',
+        valueFormat: {
+          code: 'orgIdList',
+        },
+        magnifierType: Config.MagnifierType.org,
+        valueKind: 'M-SEARCH'
+      },
+      // 业务员
+      {
+        itemCode: 'staffId',
+        valueFormat: {
+          code: 'staffIdList',
+        },
+        magnifierType: Config.MagnifierType.staff,
+        valueKind: 'M-SEARCH'
+      },
+      // 主表备注
+      {
+        itemCode: 'remarks'
+      },
+    ],
+    // 列表列
+    columns: [
+      {field: 'rpNo'},
+      {field: 'biznisNo'},
+      {field: 'cusName'},
+      {field: 'cusPhone'},
+      {field: 'accDate',type: 'date'},
+      {field: 'orgName'},
+      {field: 'staffName'},
+      {field: 'makeStaffName'},
+      {field: 'macName'},
+      {field: 'amtRec',type:'number',sum:'true'},
+      {field: 'remarks', width: 'auto'}
+    ],
+  },
 }