一览页面相关改动

src/locale/lang/zh-CN.js

@@ -118,6 +118,7 @@ export const button = {
   refreshReport: '更新报表',
   chooseSalesForPurchase:'选择销售订单',
   purchaseBasedOnSales:'选择销售订单',
+  choosePurchase:'选择采购入库单',
 }
 
 /**
@@ -355,7 +356,7 @@ export const columns = {
   purNo:'采购订单号',
   supplierName:'供应商',
   supplierCode:'供应商编码',
-  brandName:'供应商品牌',
+  brandName:'商品品牌',
   pickupDate:'取货日期',
   DeliveryDate:'收货日期',
   purDiscount:'采购折扣',
@@ -739,6 +740,10 @@ export const columns = {
   packageBox:'包装数量',
   purchaseEnter:'入库中',
   purchaseRealEnter:'已入库',
+  returnData:'退货日期',
+  ingBoxPiece:'包装数量',
+  intoingBoxPiece:'入库在包装数量',
+  intoBoxPiece:'已入库包装数量',
 }
 
 /**

src/view/fin/money-account/index.vue

@@ -80,7 +80,7 @@
         </DkFormItem>
       </DkForm>
       <!--附件-->
-      <DkPicWall v-model="formData.annexPaths"
+      <DkPicWall v-model="formData.macReceiptCode"
                  :table="$config.tables.moneyAccount" :accept="$config.uploadFileConfig.acceptPicType"></DkPicWall>
     </DkModal>
   </div>
@@ -109,7 +109,7 @@ export default {
         orgId: self.$store.state.user.orgId,
         staffId: self.$store.state.user.id,
         makeStaff: self.$store.state.user.id,
-        annexPaths:null,
+        macReceiptCode:null,
       },
       //查询
       searchContent: [

src/view/ivt/entry-handle/index.vue

@@ -49,6 +49,7 @@
                    :page-size-opts="pageSizeOpts"
                    :page-size="pageInfo.pageSize"
                    name="table"
+                   showFooter
                    :height="this.tableHeight * split - 66">
             <!-- 入库单号-->
             <DkTableColumn :type="$libaray.checkButtonHasRight('entry-handle-edit')?'link':''" field="intoNo" @on-link="handleLink"></DkTableColumn>
@@ -64,17 +65,13 @@
             <!-- 入库状态-->
             <DkTableColumn field="intoStatusName" :color-cards="['出库中','入库中']"></DkTableColumn>
             <!-- 待入库数量-->
-            <DkTableColumn field="intoingQty"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="intoingQty" :digits="0" dataType="number" sum></DkTableColumn>
             <!-- 待入库金额-->
-            <DkTableColumn field="intoingAmt"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="intoingAmt" :digits="0" dataType="number" sum></DkTableColumn>
             <!-- 已入库数量-->
-            <DkTableColumn field="intoQty"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="intoQty" :digits="0" dataType="number" sum></DkTableColumn>
             <!-- 已入库金额-->
-            <DkTableColumn field="intoAmt"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="intoAmt" :digits="0" dataType="number" sum></DkTableColumn>
             <!-- 仓库-->
             <DkTableColumn field="whName"></DkTableColumn>
             <!-- 供应商-->
@@ -108,6 +105,7 @@
                    :page-size-opts="pageSizeOpts"
                    :page-size="pageInfo.pageSize"
                    name="table"
+                   showFooter
                    :height="this.tableHeight * split - 66">
             <!-- 入库单号-->
             <DkTableColumn :type="$libaray.checkButtonHasRight('entry-handle-edit')?'link':''" field="intoNo" @on-link="handleLink"></DkTableColumn>
@@ -123,17 +121,13 @@
             <!-- 入库状态-->
             <DkTableColumn field="intoStatusName" :color-cards="['入库中','已入库']"></DkTableColumn>
             <!-- 待入库数量-->
-            <DkTableColumn field="intoingQty"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="intoingQty" :digits="0" dataType="number" sum></DkTableColumn>
             <!-- 待入库金额-->
-            <DkTableColumn field="intoingAmt"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="intoingAmt" :digits="0" dataType="number" sum></DkTableColumn>
             <!-- 已入库数量-->
-            <DkTableColumn field="intoQty"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="intoQty" :digits="0" dataType="number" sum></DkTableColumn>
             <!-- 已入库金额-->
-            <DkTableColumn field="intoAmt"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="intoAmt" :digits="0" dataType="number" sum></DkTableColumn>
             <!-- 仓库-->
             <DkTableColumn field="whName"></DkTableColumn>
             <!-- 供应商-->
@@ -173,34 +167,20 @@
               <DkTableColumn field="skuModel" :filter="false"></DkTableColumn>
               <!-- 商品名称-->
               <DkTableColumn field="skuName" :filter="false"></DkTableColumn>
-              <!-- 唯一编码-->
-              <DkTableColumn field="skuCode" :filter="false"></DkTableColumn>
               <!-- 品牌-->
               <DkTableColumn field="brandName" :filter="false"></DkTableColumn>
-              <!--品牌简称-->
-              <DkTableColumn field="shortName" :filter="false"></DkTableColumn>
               <!-- 包装数量-->
-              <DkTableColumn field="ingBoxPiece" />
+              <DkTableColumn field="ingBoxPiece" :title="$t('intoingBoxPiece')"/>
               <!-- 待入库数量-->
-              <DkTableColumn field="intoingQty"
-                             :sum="true" :digits="0"></DkTableColumn>
+              <DkTableColumn field="intoingQty" dataType="number" sum :digits="0"></DkTableColumn>
               <!-- 待入库金额-->
-              <DkTableColumn field="intoingAmt"
-                             :sum="true" :digits="0"></DkTableColumn>
-              <!-- 基本单位-->
-              <DkTableColumn field="intoingBox" dataType="number" :digits="0"/>
-              <!-- 包装单位-->
-              <DkTableColumn field="intoingPiece" dataType="number" :digits="0"/>
+              <DkTableColumn field="intoingAmt" dataType="number" sum :digits="0"></DkTableColumn>
+              <!-- 包装数量-->
+              <DkTableColumn field="boxPiece" :title="$t('intoBoxPiece')"/>
               <!-- 已入库数量-->
-              <DkTableColumn field="intoQty"
-                             :sum="true" :digits="0"></DkTableColumn>
+              <DkTableColumn field="intoQty" dataType="number" sum :digits="0"></DkTableColumn>
               <!-- 已入库金额-->
-              <DkTableColumn field="intoAmt"
-                             :sum="true" :digits="0"></DkTableColumn>
-              <!-- 基本单位-->
-              <DkTableColumn field="intoBox" dataType="number" :digits="0"/>
-              <!-- 包装单位-->
-              <DkTableColumn field="intoPiece" dataType="number" :digits="0"/>
+              <DkTableColumn field="intoAmt" dataType="number" sum  :digits="0"></DkTableColumn>
               <!--备注-->
               <DkTableColumn field="remarks"></DkTableColumn>
             </DkTable>

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

@@ -89,7 +89,7 @@ export default {
         checkOrg: null,
         orgCode: null,
         checkStatus: null,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         staffId: null,
         checkStaff: null,
         staffCode: null,

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

@@ -54,7 +54,7 @@
             <DkTableColumn :type="$libaray.checkButtonHasRight('order-edit')?'link':''" field="checkNo" @on-link="handleLink"/>
             <DkTableColumn field="checkNo"></DkTableColumn>
             <DkTableColumn field="checkDate"></DkTableColumn>
-            <DkTableColumn field="checkStatusName"></DkTableColumn>
+            <DkTableColumn field="checkStatusName" :color-cards="['暂存','完成']"></DkTableColumn>
             <DkTableColumn field="checkOrg"></DkTableColumn>
             <DkTableColumn field="checkStaff"></DkTableColumn>
             <DkTableColumn field="flgLock" type="switch"></DkTableColumn>
@@ -73,30 +73,24 @@
               <DkTableColumn field="skuModel"/>
               <!-- 商品名称-->
               <DkTableColumn field="skuName"/>
-              <!-- 唯一编码-->
-              <DkTableColumn field="skuCode"/>
               <!-- 品牌-->
               <DkTableColumn field="brandName"/>
               <!-- 仓库-->
               <DkTableColumn field="whName" />
               <!-- 原库存量-->
-              <DkTableColumn field="oinvQty" dataType="number"/>
+              <DkTableColumn field="oinvQty" dataType="number" sum :digits="0"/>
               <!-- 库存量-->
-              <DkTableColumn field="invQty" dataType="number"/>
+              <DkTableColumn field="invQty" dataType="number" sum :digits="0"/>
               <!-- 盘点量-->
-              <DkTableColumn field="checkQty" dataType="number"/>
-              <!-- 基本单位-->
-              <DkTableColumn field="box" dataType="number" :digits="0"/>
-              <!-- 包装单位-->
-              <DkTableColumn field="piece" dataType="number" :digits="0"/>
+              <DkTableColumn field="checkQty" dataType="number" sum :digits="0"/>
               <!-- 包装数量-->
-              <DkTableColumn field="boxPiece" />
+              <DkTableColumn field="boxPiece"/>
               <!-- 差异数量-->
-              <DkTableColumn field="balanceQty" dataType="number"/>
+              <DkTableColumn field="balanceQty" dataType="number" sum :digits="0"/>
               <!-- 盘盈单价-->
-              <DkTableColumn field="priceInto" dataType="number" :title="$t('checkPrice')"/>
+              <DkTableColumn field="priceInto" dataType="number" :digits="2" :title="$t('checkPrice')"/>
               <!-- 盘盈金额-->
-              <DkTableColumn field="intoingAmt" dataType="number" :title="$t('checkAmt')"/>
+              <DkTableColumn field="intoingAmt" dataType="number" sum :digits="2" :title="$t('checkAmt')"/>
               <!-- 责任人-->
               <DkTableColumn field="dutyStaff"/>
               <!-- 盘亏原因-->
@@ -166,14 +160,6 @@ export default {
             },
             valueKind: 'M-CHOICE'
           },
-          {
-            itemCode: 'checkDate',
-            valueFormat: {
-              code: 'checkDate',
-              default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
-            },
-            valueKind: 'DATE_RANGE'
-          },
           // 业务部门
           {
             itemCode: 'checkOrg',
@@ -192,6 +178,14 @@ export default {
             magnifierType: Config.MagnifierType.staff,
             valueKind: 'M-SEARCH'
           },
+          {
+            itemCode: 'checkDate',
+            valueFormat: {
+              code: 'checkDate',
+              default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
+            },
+            valueKind: 'DATE_RANGE'
+          },
           self.$config.flgValidSearch
         ],
     }

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

@@ -97,7 +97,7 @@ export default {
     return {
       formData: {
         orgId: self.$store.state.user.orgId,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
         staffCode: null,

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

@@ -48,11 +48,11 @@
                    name="table">
             <DkTableColumn field="freezeNo" ></DkTableColumn>
             <DkTableColumn field="freezeDate"></DkTableColumn>
-            <DkTableColumn field="freezeStatusName"></DkTableColumn>
+            <DkTableColumn field="freezeStatusName" :color-cards="['全部冻结','部分解冻','全部解冻']"></DkTableColumn>
             <DkTableColumn field="cusName"></DkTableColumn>
             <DkTableColumn field="orgName"></DkTableColumn>
             <DkTableColumn field="staffName"></DkTableColumn>
-            <DkTableColumn field="sumQuantity" dataType="number"></DkTableColumn>
+            <DkTableColumn field="sumQuantity" sum dataType="number" :digits="0"></DkTableColumn>
             <DkTableColumn field="makeStaffName"></DkTableColumn>
             <DkTableColumn field="autoUnfreezeDate"></DkTableColumn>
             <DkTableColumn field="flgValid" type="switch"/>
@@ -69,22 +69,16 @@
               <DkTableColumn field="skuModel"/>
               <!-- 商品名称-->
               <DkTableColumn field="skuName"/>
-              <!-- 唯一编码-->
-              <DkTableColumn field="skuCode"/>
               <!-- 品牌-->
-              <DkTableColumn field="shortName"/>
+              <DkTableColumn field="brandName"/>
               <!-- 冻结数量-->
-              <DkTableColumn field="freezeQty"dataType="number" :sum="true" />
-              <!-- 箱-->
-              <DkTableColumn field="box" dataType="number" :digits="0"/>
-              <!-- 片-->
-              <DkTableColumn field="piece" dataType="number" :digits="0"/>
+              <DkTableColumn field="freezeQty" dataType="number" sum :digits="0"/>
               <!-- 包装数量-->
               <DkTableColumn field="boxPiece" />
               <!-- 解冻数量-->
-              <DkTableColumn field="unfreezeQty" dataType="number":sum="true"/>
+              <DkTableColumn field="unfreezeQty" dataType="number" sum :digits="0"/>
               <!-- 剩余解冻数量-->
-              <DkTableColumn field="surplusQty" dataType="number" :sum="true"/>
+              <DkTableColumn field="surplusQty" dataType="number" sum :digits="0"/>
               <!-- 仓库-->
               <DkTableColumn field="whName" />
               <DkTableColumn field="remarks" />

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

@@ -40,7 +40,6 @@
                    :id="'table-'+$options.name"
                    ref="table-select"
                    :data="tableData"
-                   showFooter
                    :height="this.tableHeight * split - 36 "
                    primaryKey="transferId"
                    @pageChange="pageSizeChange"
@@ -75,16 +74,10 @@
               <DkTableColumn field="skuModel"/>
               <!-- 商品名称-->
               <DkTableColumn field="skuName"/>
-              <!-- 唯一编码-->
-              <DkTableColumn field="skuCode"/>
               <!-- 品牌-->
-              <DkTableColumn field="shortName"/>
+              <DkTableColumn field="brandName"/>
               <!-- 调整数量-->
-              <DkTableColumn field="transferQty" dataType="number"/>
-              <!-- 箱-->
-              <DkTableColumn field="box" dataType="number" :digits="0"/>
-              <!-- 片-->
-              <DkTableColumn field="piece" dataType="number" :digits="0"/>
+              <DkTableColumn field="transferQty" sum dataType="number"/>
               <!-- 包装数量-->
               <DkTableColumn field="boxPiece" />
               <!-- 原仓库-->

src/view/ivt/out-handle/index.vue

@@ -51,6 +51,7 @@
                    :page-size-opts="pageSizeOpts"
                    :page-size="pageInfo.pageSize"
                    name="table"
+                   showFooter
                    :height="this.tableHeight * split - 66">
             <!-- 出库单号-->
             <DkTableColumn :type="$libaray.checkButtonHasRight('out-handle-edit')?'link':''" field="outNo" @on-link="handleLink"></DkTableColumn>
@@ -66,19 +67,15 @@
             <!-- 出库状态-->
             <DkTableColumn field="outStatusName" :color-cards="['出库中','已出库']"></DkTableColumn>
             <!-- 待出库数量-->
-            <DkTableColumn field="outingQty"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="outingQty" sum dataType="number" :digits="0"></DkTableColumn>
             <!-- 待出库金额-->
-            <DkTableColumn field="outingAmt"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="outingAmt" sum dataType="number" :digits="2"></DkTableColumn>
             <!-- 已出库数量-->
-            <DkTableColumn field="outQty"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="outQty" sum dataType="number" :digits="0"></DkTableColumn>
             <!-- 已出库金额-->
-            <DkTableColumn field="outAmt"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="outAmt" sum dataType="number" :digits="2"></DkTableColumn>
             <!-- 供应商-->
-            <DkTableColumn field="supplierName" :title="$t('supName')"></DkTableColumn>
+            <DkTableColumn field="supplierName"></DkTableColumn>
             <!-- 收货人-->
             <DkTableColumn field="cusName" :title="$t('consignee')"></DkTableColumn>
             <!-- 收货电话-->
@@ -108,6 +105,7 @@
                    :page-size-opts="pageSizeOpts"
                    :page-size="pageInfo.pageSize"
                    name="table"
+                   showFooter
                    :height="this.tableHeight * split - 66">
             <!-- 出库单号-->
             <DkTableColumn :type="$libaray.checkButtonHasRight('out-handle-edit')?'link':''" field="outNo" @on-link="handleLink"></DkTableColumn>
@@ -123,20 +121,13 @@
             <!-- 出库状态-->
             <DkTableColumn field="outStatusName" :color-cards="['出库中','已出库']"></DkTableColumn>
             <!-- 待出库数量-->
-            <DkTableColumn field="outingQty" :sum="true" :digits="0"></DkTableColumn>
-            <DkTableColumn field="outingBox" dataType="number" sum></DkTableColumn>
-            <DkTableColumn field="outingPiece" dataType="number" sum></DkTableColumn>
+            <DkTableColumn field="outingQty" sum dataType="number" :digits="0"></DkTableColumn>
             <!-- 待出库金额-->
-            <DkTableColumn field="outingAmt"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="outingAmt" sum dataType="number" :digits="2"></DkTableColumn>
             <!-- 已出库数量-->
-            <DkTableColumn field="outQty"
-                           :sum="true" :digits="0"></DkTableColumn>
-            <DkTableColumn field="outBox" dataType="number" sum></DkTableColumn>
-            <DkTableColumn field="outPiece" dataType="number" sum></DkTableColumn>
+            <DkTableColumn field="outQty" sum dataType="number" :digits="0"></DkTableColumn>
             <!-- 已出库金额-->
-            <DkTableColumn field="outAmt"
-                           :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="outAmt" sum dataType="number" :digits="2"></DkTableColumn>
             <!-- 供应商-->
             <DkTableColumn field="supplierName" :title="$t('supName')"></DkTableColumn>
             <!-- 收货人-->
@@ -174,32 +165,20 @@
               <DkTableColumn field="skuModel" :filter="false"></DkTableColumn>
               <!-- 商品名称-->
               <DkTableColumn field="skuName" :filter="false"></DkTableColumn>
-              <!-- 唯一编码-->
-              <DkTableColumn field="skuCode" :filter="false"></DkTableColumn>
               <!-- 品牌-->
               <DkTableColumn field="brandName" :filter="false"></DkTableColumn>
-              <!--品牌简称-->
-              <DkTableColumn field="shortName" :filter="false"></DkTableColumn>
               <!-- 待出库数量-->
-              <DkTableColumn field="outingQty"
-                             :sum="true" :digits="0"></DkTableColumn>
-              <DkTableColumn field="outingBox" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="outingPiece" dataType="number" sum></DkTableColumn>
+              <DkTableColumn field="outingQty" sum dataType="number" :digits="0"></DkTableColumn>
               <!-- 包装数量-->
               <DkTableColumn field="outingBoxPiece" />
               <!-- 待出库金额-->
-              <DkTableColumn field="outingAmt"
-                             :sum="true" :digits="0"></DkTableColumn>
+              <DkTableColumn field="outingAmt" sum dataType="number" :digits="2"></DkTableColumn>
               <!-- 已出库数量-->
-              <DkTableColumn field="outQty"
-                             :sum="true" :digits="0"></DkTableColumn>
-              <DkTableColumn field="outBox" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="outPiece" dataType="number" sum></DkTableColumn>
+              <DkTableColumn field="outQty" sum dataType="number" :digits="0"></DkTableColumn>
               <!-- 包装数量-->
               <DkTableColumn field="outBoxPiece" />
               <!-- 已出库金额-->
-              <DkTableColumn field="outAmt"
-                             :sum="true" :digits="0"></DkTableColumn>
+              <DkTableColumn field="outAmt" sum dataType="number" :digits="2"></DkTableColumn>
               <!--备注-->
               <DkTableColumn field="remarks"></DkTableColumn>
             </DkTable>

src/view/pur/pur-enter/index.vue

@@ -45,6 +45,7 @@
                    primaryKey="intoId"
                    :multiple="false"
                    :choose-flag="false"
+                   showFooter
                    v-if="this.tableModel === 'waitEntry'"
                    @current-change="currentChange($event)"
                    @pageChange="pageSizeChange"
@@ -84,6 +85,7 @@
                    primaryKey="intoId"
                    :multiple="false"
                    :choose-flag="false"
+                   showFooter
                    v-if="this.tableModel === 'ingEntry'"
                    @current-change="currentChange($event)"
                    @pageChange="pageSizeChange"
@@ -137,24 +139,16 @@
               <DkTableColumn field="skuModel" :filter="false"></DkTableColumn>
               <!-- 商品名称-->
               <DkTableColumn field="skuName"></DkTableColumn>
-              <!-- 唯一编码-->
-              <DkTableColumn field="skuCode" :filter="false"></DkTableColumn>
               <!-- 品牌-->
               <DkTableColumn field="brandName" :filter="false"></DkTableColumn>
-              <!--品牌简称-->
-              <DkTableColumn field="shortName" :filter="false"></DkTableColumn>
               <!--非标号-->
-              <DkTableColumn field="nonStandardCode"></DkTableColumn>
+              <DkTableColumn field="nonStdCode"></DkTableColumn>
               <!--入库中数量-->
-              <DkTableColumn field="intoingQty" :title="$t('intoingQty')"></DkTableColumn>
+              <DkTableColumn field="intoingQty" sum data-type="number" :title="$t('intoingQty')"></DkTableColumn>
               <!--入库中金额-->
-              <DkTableColumn field="intoingAmt" :title="$t('intoingAmt')"></DkTableColumn>
-              <!-- 基本单位-->
-              <DkTableColumn field="intoingBox" :title="$t('box')" dataType="number" :digits="0"/>
-              <!-- 包装单位-->
-              <DkTableColumn field="intoingPiece" :title="$t('piece')" dataType="number" :digits="0"/>
+              <DkTableColumn field="intoingAmt" sum data-type="number" :title="$t('intoingAmt')"></DkTableColumn>
               <!-- 包装数量-->
-              <DkTableColumn field="ingBoxPiece" />
+              <DkTableColumn field="ingBoxPiece" :title="$t('boxPiece')"/>
               <!--备注-->
               <DkTableColumn field="remarks"></DkTableColumn>
             </DkTable>
@@ -178,22 +172,14 @@
               <DkTableColumn field="skuModel" :filter="false"></DkTableColumn>
               <!-- 商品名称-->
               <DkTableColumn field="skuName"></DkTableColumn>
-              <!-- 唯一编码-->
-              <DkTableColumn field="skuCode" :filter="false"></DkTableColumn>
               <!-- 品牌-->
               <DkTableColumn field="brandName" :filter="false"></DkTableColumn>
-              <!--品牌简称-->
-              <DkTableColumn field="shortName" :filter="false"></DkTableColumn>
               <!--非标号-->
-              <DkTableColumn field="nonStandardCode"></DkTableColumn>
+              <DkTableColumn field="nonStdCode"></DkTableColumn>
               <!--已入库数量-->
-              <DkTableColumn field="intoQty" :title="$t('intoQty')"></DkTableColumn>
+              <DkTableColumn field="intoQty" sum data-type="number" :title="$t('intoQty')"></DkTableColumn>
               <!--已入库金额-->
-              <DkTableColumn field="intoAmt" :title="$t('intoAmt')"></DkTableColumn>
-              <!-- 基本单位-->
-              <DkTableColumn field="intoBox" :title="$t('box')" dataType="number" :digits="0"/>
-              <!-- 包装单位-->
-              <DkTableColumn field="intoPiece" :title="$t('piece')" dataType="number" :digits="0"/>
+              <DkTableColumn field="intoAmt" sum data-type="number" :title="$t('intoAmt')"></DkTableColumn>
               <!-- 包装数量-->
               <DkTableColumn field="boxPiece" />
               <!--备注-->
@@ -217,6 +203,7 @@
 
 <script>
 import {indexMixin} from '@/mixins'
+import Config from "@/config";
 
 export default {
   name: "pur-enter",
@@ -266,6 +253,33 @@ export default {
         {
           itemCode: 'fromNo',
         },
+        // 业务部门
+        {
+          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: '制单日期-时间',
+          itemName: 'makeTime',
+          valueFormat: {
+            code: 'makeTime',
+            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
+          },
+          valueKind: 'DATE_RANGE'
+        },
         {
           itemCode: '供应商-文本',
           itemName: 'supplierName',
@@ -292,12 +306,7 @@ export default {
           valueFormat: {code: 'skuCode'},
           valueKind: 'STR'
         },
-        {
-          itemCode: '查看冲正单据',
-          itemName: '查看冲正单据',
-          valueFormat: {code: 'showItem', default: false},
-          valueKind: 'SWITCH'
-        },
+        self.$config.flgValidSearch
       ],
     }
   },

src/view/pur/pur-order/index.vue

@@ -77,23 +77,23 @@
             <!--入库状态-->
             <DkTableColumn field="intoStatusName" :color-cards="['待入库','入库中','已入库']"></DkTableColumn>
             <!--入库中数量-->
-            <DkTableColumn field="intoingQty" data-type="number"></DkTableColumn>
+            <DkTableColumn field="intoingQty" sum data-type="number"></DkTableColumn>
             <!--入库中金额-->
-            <DkTableColumn field="intoingAmt" :digits="2" data-type="number"></DkTableColumn>
+            <DkTableColumn field="intoingAmt" sum :digits="2" data-type="number"></DkTableColumn>
             <!--已入库数量-->
-            <DkTableColumn field="intoQty" data-type="number"></DkTableColumn>
+            <DkTableColumn field="intoQty" sum data-type="number"></DkTableColumn>
             <!--已入库金额-->
-            <DkTableColumn field="intoAmt" :digits="2" data-type="number"></DkTableColumn>
+            <DkTableColumn field="intoAmt" sum :digits="2" data-type="number"></DkTableColumn>
             <!--已入库退货数量-->
-            <DkTableColumn field="returnQty" :title="$t('returnIntoQty')" data-type="number"></DkTableColumn>
+            <DkTableColumn field="returnQty" sum :title="$t('returnIntoQty')" data-type="number"></DkTableColumn>
             <!--已入库退货金额-->
-            <DkTableColumn field="returnAmt" :title="$t('returnIntoAmt')" :digits="2" data-type="number"></DkTableColumn>
+            <DkTableColumn field="returnAmt" sum :title="$t('returnIntoAmt')" :digits="2" data-type="number"></DkTableColumn>
             <!--应付金额-->
-            <DkTableColumn field="amtPayable" :digits="2" data-type="number"></DkTableColumn>
+            <DkTableColumn field="amtPayable" sum :digits="2" data-type="number"></DkTableColumn>
             <!--还款金额-->
-            <DkTableColumn field="amtHandle" :digits="2" data-type="number"></DkTableColumn>
+            <DkTableColumn field="amtHandle" sum :digits="2" data-type="number"></DkTableColumn>
             <!--剩余应付-->
-            <DkTableColumn field="amtResidue" :title="$t('amteMeet')" :digits="2" data-type="number"></DkTableColumn>
+            <DkTableColumn field="amtResidue" sum :title="$t('amteMeet')" :digits="2" data-type="number"></DkTableColumn>
             <!--制单人-->
             <DkTableColumn field="makeStaffName"></DkTableColumn>
             <!--制单时间-->
@@ -155,6 +155,7 @@
 
 import {indexMixin} from '@/mixins'
 import PrintModal from '_c/business/print/modal'
+import Config from "@/config";
 
 export default {
   name: 'pur-order',
@@ -198,8 +199,7 @@ export default {
           title: self.$t('pricePur'),
           type: 'number',
           digits: 2,
-          dataType: 'number',
-          sum: true
+          dataType: 'number'
         },
         //采购金额
         {
@@ -211,15 +211,9 @@ export default {
           sum: true
         },
         //折扣
-        {field: 'priceDiscount', title: self.$t('priceDiscount')},
+        {field: 'priceDiscount', title: self.$t('priceDiscount'),type: 'number',dataType: 'number'},
         //非标号
         {field: 'nonStdCode', title: self.$t('nonStandardCode')},
-        //包装单位
-        {field: 'box',title: self.$t('box')},
-        //基本单位
-        {field: 'piece',title: self.$t('piece')},
-        //包装
-        {field: 'packBox',title: self.$t('packBox')},
         //箱片规格
         {field: 'specsName',title: self.$t('boxPiece')},
         //入库状态
@@ -304,16 +298,23 @@ export default {
           valueKind: 'S-SEARCH',
           magnifierType: self.$config.MagnifierType.supplier,
         },
+        // 业务部门
         {
-          itemCode: '入库状态-下拉',
-          itemName: 'intoStatusName',
+          itemCode: 'orgId',
           valueFormat: {
-            code: 'intoStatusList',
-            data: [],
-            valueKey: 'id',
-            labelKey: 'kindName',
+            code: 'orgIds',
           },
-          valueKind: 'M-CHOICE'
+          magnifierType: Config.MagnifierType.org,
+          valueKind: 'M-SEARCH'
+        },
+        // 业务员
+        {
+          itemCode: 'staffId',
+          valueFormat: {
+            code: 'staffIds',
+          },
+          magnifierType: Config.MagnifierType.staff,
+          valueKind: 'M-SEARCH'
         },
         {
           itemCode: '制单日期-时间',
@@ -325,6 +326,17 @@ export default {
           valueKind: 'DATE_RANGE'
         },
         {
+          itemCode: '入库状态-下拉',
+          itemName: 'intoStatusName',
+          valueFormat: {
+            code: 'intoStatusList',
+            data: [],
+            valueKey: 'id',
+            labelKey: 'kindName',
+          },
+          valueKind: 'M-CHOICE'
+        },
+        {
           itemCode: '商品名称-文本',
           itemName: 'skuModel',
           valueFormat: {code: 'skuModel'},
@@ -336,6 +348,7 @@ export default {
           valueFormat: {code: 'skuName'},
           valueKind: 'STR'
         },
+        self.$config.flgValidSearch
       ],
     }
   },

src/view/pur/pur-return/form.vue

@@ -163,24 +163,14 @@
             <DkTableColumn field="skuModel" :filter="false"></DkTableColumn>
             <!-- 商品名称-->
             <DkTableColumn field="skuName"></DkTableColumn>
-            <!-- 唯一编码-->
-            <DkTableColumn field="skuCode" :filter="false"></DkTableColumn>
             <!-- 品牌-->
             <DkTableColumn field="brandName" :filter="false"></DkTableColumn>
-            <!--品牌简称-->
-            <DkTableColumn field="shortName" :filter="false"></DkTableColumn>
             <!--非标号-->
             <DkTableColumn field="nonStandardCode"></DkTableColumn>
             <!--已入库数量-->
             <DkTableColumn field="intoQty" :title="'已入库数量'"></DkTableColumn>
             <!--已入库金额-->
             <DkTableColumn field="intoAmt" :title="'已入库金额'"></DkTableColumn>
-            <!--包装-->
-            <DkTableColumn field="packBox" ></DkTableColumn>
-            <!-- 基本单位-->
-            <DkTableColumn field="intoBox" :title="$t('box')" dataType="number" :digits="0"/>
-            <!-- 包装单位-->
-            <DkTableColumn field="intoPiece" :title="$t('piece')" dataType="number" :digits="0"/>
             <!-- 包装数量-->
             <DkTableColumn field="boxPiece" />
             <!--备注-->

src/view/pur/pur-return/index.vue

@@ -42,6 +42,7 @@
                    primaryKey="intoId"
                    :multiple="false"
                    :choose-flag="false"
+                   showFooter
                    v-if="this.tableModel === 'waitOut'"
                    :page-size-opts="pageSizeOpts"
                    :page-size="pageInfo.pageSize"
@@ -55,11 +56,7 @@
             <!--员工-->
             <DkTableColumn field="staffName"></DkTableColumn>
             <!--供应商-->
-            <DkTableColumn field="supName"></DkTableColumn>
-            <!--联系人-->
-            <DkTableColumn field="contactName"></DkTableColumn>
-            <!--联系电话-->
-            <DkTableColumn field="contactPhone"></DkTableColumn>
+            <DkTableColumn field="supName" :title="$t('supplierName')"></DkTableColumn>
             <!--出库状态-->
             <DkTableColumn field="intoStatusName" :color-cards="['入库中','已入库']"></DkTableColumn>
             <!-- 出库中数量-->
@@ -82,6 +79,7 @@
                    primaryKey="intoId"
                    :multiple="false"
                    :choose-flag="false"
+                   showFooter
                    v-if="this.tableModel === 'ingOut'"
                    @current-change="currentChange($event)"
                    @pageChange="pageSizeChange">
@@ -93,11 +91,7 @@
             <!--员工-->
             <DkTableColumn field="staffName"></DkTableColumn>
             <!--供应商-->
-            <DkTableColumn field="supName"></DkTableColumn>
-            <!--联系人-->
-            <DkTableColumn field="contactName"></DkTableColumn>
-            <!--联系电话-->
-            <DkTableColumn field="contactPhone"></DkTableColumn>
+            <DkTableColumn field="supName" :title="$t('supplierName')"></DkTableColumn>
             <!--出库状态-->
             <DkTableColumn field="intoStatusName"></DkTableColumn>
             <!--已出库数量-->
@@ -132,24 +126,16 @@
               <DkTableColumn field="skuModel" :filter="false"></DkTableColumn>
               <!-- 商品名称-->
               <DkTableColumn field="skuName"></DkTableColumn>
-              <!-- 唯一编码-->
-              <DkTableColumn field="skuCode" :filter="false"></DkTableColumn>
               <!-- 品牌-->
               <DkTableColumn field="brandName" :filter="false"></DkTableColumn>
-              <!--品牌简称-->
-              <DkTableColumn field="shortName" :filter="false"></DkTableColumn>
               <!--非标号-->
-              <DkTableColumn field="nonStandardCode"></DkTableColumn>
+              <DkTableColumn field="nonStdCode"></DkTableColumn>
               <!--出库中数量-->
-              <DkTableColumn field="intoingQty" :title="$t('intoingQty')" dataType="number"></DkTableColumn>
+              <DkTableColumn field="intoingQty" sum :title="$t('intoingQty')" dataType="number"></DkTableColumn>
               <!--出库中金额-->
-              <DkTableColumn field="intoingAmt" :digits="2" :title="$t('intoingAmt')" dataType="number"></DkTableColumn>
-              <!-- 基本单位-->
-              <DkTableColumn field="intoingBox" :title="$t('box')" dataType="number" :digits="0"/>
-              <!-- 包装单位-->
-              <DkTableColumn field="intoingPiece" :title="$t('piece')" dataType="number" :digits="0"/>
+              <DkTableColumn field="intoingAmt" sum :digits="2" :title="$t('intoingAmt')" dataType="number"></DkTableColumn>
               <!-- 包装数量-->
-              <DkTableColumn field="ingBoxPiece" />
+              <DkTableColumn field="ingBoxPiece" :title="$t('boxPiece')"/>
               <!--备注-->
               <DkTableColumn field="remarks"></DkTableColumn>
             </DkTable>
@@ -170,24 +156,16 @@
               <DkTableColumn field="skuModel" :filter="false"></DkTableColumn>
               <!-- 商品名称-->
               <DkTableColumn field="skuName"></DkTableColumn>
-              <!-- 唯一编码-->
-              <DkTableColumn field="skuCode" :filter="false"></DkTableColumn>
               <!-- 品牌-->
               <DkTableColumn field="brandName" :filter="false"></DkTableColumn>
-              <!--品牌简称-->
-              <DkTableColumn field="shortName" :filter="false"></DkTableColumn>
               <!--非标号-->
-              <DkTableColumn field="nonStandardCode"></DkTableColumn>
+              <DkTableColumn field="nonStdCode"></DkTableColumn>
               <!--已出库数量-->
-              <DkTableColumn field="intoQty" :title="$t('intoQty')" dataType="number"></DkTableColumn>
+              <DkTableColumn field="intoQty" sum :title="$t('intoQty')" dataType="number"></DkTableColumn>
               <!--已出库金额-->
-              <DkTableColumn field="intoAmt" :digits="2" :title="$t('intoAmt')" dataType="number"></DkTableColumn>
-              <!-- 基本单位-->
-              <DkTableColumn field="intoBox" :title="$t('box')" dataType="number" :digits="0"/>
-              <!-- 包装单位-->
-              <DkTableColumn field="intoPiece" :title="$t('piece')" dataType="number" :digits="0"/>
+              <DkTableColumn field="intoAmt" sum :digits="2" :title="$t('intoAmt')" dataType="number"></DkTableColumn>
               <!-- 包装数量-->
-              <DkTableColumn field="boxPiece" />
+              <DkTableColumn field="boxPiece" :title="$t('boxPiece')"/>
               <!--备注-->
               <DkTableColumn field="remarks"></DkTableColumn>
             </DkTable>
@@ -213,6 +191,7 @@
 
 <script>
 import {indexMixin} from '@/mixins'
+import Config from "@/config";
 
 export default {
   name: "procure-return",
@@ -268,6 +247,33 @@ export default {
           magnifierType: self.$config.MagnifierType.supplier,
           otherCondition:{supplierType:this.$config.kindCode.supplierPur},
         },
+        // 业务部门
+        {
+          itemCode: 'orgId',
+          valueFormat: {
+            code: 'orgIds',
+          },
+          magnifierType: Config.MagnifierType.org,
+          valueKind: 'M-SEARCH'
+        },
+        // 业务员
+        {
+          itemCode: 'staffId',
+          valueFormat: {
+            code: 'staffIds',
+          },
+          magnifierType: Config.MagnifierType.staff,
+          valueKind: 'M-SEARCH'
+        },
+        {
+          itemCode: '制单日期-时间',
+          itemName: 'returnData',
+          valueFormat: {
+            code: 'makeTime',
+            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
+          },
+          valueKind: 'DATE_RANGE'
+        },
         {
           itemCode: '商品型号-文本',
           itemName: 'skuModel',
@@ -280,18 +286,7 @@ export default {
           valueFormat: {code: 'skuName'},
           valueKind: 'STR'
         },
-        {
-          itemCode: '商品编码-文本',
-          itemName: 'skuCode',
-          valueFormat: {code: 'skuCode'},
-          valueKind: 'STR'
-        },
-        {
-          itemCode: '查看冲正单据',
-          itemName: '查看冲正单据',
-          valueFormat: {code: 'showCancel', default: false},
-          valueKind: 'SWITCH'
-        },
+        self.$config.flgValidSearch
       ],
     }
   },

src/view/sale/order-out/index.vue

@@ -76,16 +76,11 @@
                      :height="this.tableHeight * (1-split)-62" primaryKey="itemId" name="table">
               <DkTableColumn field="skuModel"></DkTableColumn>
               <DkTableColumn field="skuName"></DkTableColumn>
-              <DkTableColumn field="skuCode"></DkTableColumn>
-              <DkTableColumn field="outStatusName"></DkTableColumn>
+              <DkTableColumn field="outStatusName" :color-cards="['待出库','出库中','已出库']"></DkTableColumn>
               <DkTableColumn field="outingQty" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="outingBox" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="outingPiece" dataType="number" sum></DkTableColumn>
               <DkTableColumn field="outingBoxPiece"/>
               <DkTableColumn field="outingAmt" :digits="2" dataType="number" sum></DkTableColumn>
               <DkTableColumn field="outQty" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="outBox" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="outPiece" dataType="number" sum></DkTableColumn>
               <DkTableColumn field="outBoxPiece"/>
               <DkTableColumn field="outAmt" :digits="2" dataType="number" sum></DkTableColumn>
               <DkTableColumn field="returnQty" dataType="number" sum></DkTableColumn>

src/view/sale/order-return/index.vue

@@ -77,8 +77,7 @@
                      :height="this.tableHeight * (1-split)-62" primaryKey="itemId" name="table">
               <DkTableColumn field="skuModel"></DkTableColumn>
               <DkTableColumn field="skuName"></DkTableColumn>
-              <DkTableColumn field="skuCode"></DkTableColumn>
-              <DkTableColumn field="outStatusName" :title="$t('intoStatus')"></DkTableColumn>
+              <DkTableColumn field="outStatusName" :title="$t('intoStatus')" :color-cards="['待出库','出库中','已出库']"></DkTableColumn>
               <DkTableColumn field="outingQty" :title="$t('intoingQty')" dataType="number" sum></DkTableColumn>
               <DkTableColumn field="outingAmt" :title="$t('intoingAmt')" :digits="2" dataType="number" sum></DkTableColumn>
               <DkTableColumn field="outQty" :title="$t('intoQty')" dataType="number" sum></DkTableColumn>

src/view/sale/order/index.vue

@@ -47,7 +47,7 @@
                            @on-link="openCustomerMessage"/>
             <DkTableColumn field="cusPhone"/>
             <DkTableColumn field="contactName"/>
-            <DkTableColumn field="orderStatusName"/>
+            <DkTableColumn field="orderStatusName" :color-cards="['潜客','成交','流失']"/>
             <DkTableColumn field="outStatusName" :color-cards="['待出库','出库中','已出库']"/>
             <DkTableColumn field="sumQuantity" dataType="number" sum/>
             <DkTableColumn field="sumStandard" :digits="2" dataType="number" sum/>
@@ -76,12 +76,7 @@
                    :height=" this.tableHeight * (1-split)-62" primaryKey="itemId" name="table">
             <DkTableColumn field="skuModel"/>
             <DkTableColumn field="skuName"/>
-            <DkTableColumn field="skuCode"/>
             <DkTableColumn field="itemQty" dataType="number" sum/>
-            <!-- 基本单位-->
-            <DkTableColumn field="box" dataType="number" :digits="0"/>
-            <!-- 包装单位-->
-            <DkTableColumn field="piece" dataType="number" :digits="0"/>
             <!-- 包装数量-->
             <DkTableColumn field="boxPiece" />
             <DkTableColumn field="priceStd" :digits="2" dataType="number"/>