Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js

@@ -18,7 +18,7 @@ export default {
           </template>
         </template>
         <div class="cell el-table__cell" :class="key" v-else-if="!item.hidden">
-          <div class="cell">{{item.title}}</div>
+          <div class="cell">{{item.title}} <template v-if="data.length&&item.reduce">:{{data.map(o=>o[key]).reduce(item.reduce)}}</template></div>
         </div>
       </template>
     </div>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/bei-jian.js

@@ -12,11 +12,15 @@ const schema = {
     },
     beginDate: {
       title: "开始时间",
-      type: "DateTime",
+      type: "string",
+      input: "datetime",
+      clearable: true,
     },
     endDate: {
       title: "结束时间",
-      type: "DateTime",
+      type: "string",
+      input: "datetime",
+      clearable: true,
     },
     clientCode: {
       title: "客户编码",
@@ -72,6 +76,20 @@ export default function () {
               },
             },
             default: [
+              {
+                logic: "and",
+                column: "beginDate",
+                action: "biggerThanOrEqual",
+                value: null,
+                readOnly: true,
+              },
+              {
+                logic: "and",
+                column: "endDate",
+                action: "smallThanOrEqual",
+                value: null,
+                readOnly: true,
+              },
               {
                 logic: "and",
                 column: "lu",
@@ -79,6 +97,13 @@ export default function () {
                 value: null,
                 readOnly: true,
               },
+              {
+                logic: "and",
+                column: "contractNo",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
             ],
           },
           skipCount: {

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js

@@ -374,10 +374,12 @@ export default {
         qty: {
           type: "number",
           title: "数量",
+          reduce: (x, y) => x + y,
         },
         amt: {
           type: "number",
           title: "金额",
+          reduce: (x, y) => x + y,
         },
       },
     };