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

# Conflicts:
#	src/locale/lang/zh-CN.js

src/components/table/dk-table/dk-table-column.vue

@@ -567,7 +567,7 @@ export default {
         }
       } else {
         let val = row[this.field];
-        if (val.indexOf(".jpg") >= 0 || val.indexOf('.jpeg') >= 0 || val.indexOf('.png') >= 0 || val.indexOf('.bmp') >= 0) {
+        if (val && (val.indexOf(".jpg") >= 0 || val.indexOf('.jpeg') >= 0 || val.indexOf('.png') >= 0 || val.indexOf('.bmp') >= 0)) {
           flag = true;
         }
       }

src/components/table/dk-table/dk-table.vue

@@ -1161,7 +1161,6 @@ export default {
             if (it.componentInstance.sum) {
               for (let column of columns) {
                 if (it.componentInstance.field === column.property) {
-                  // console.log('t1',it.componentInstance.columnType)
                   // if (it.componentInstance.columnType === '' && it.componentInstance.getColumnType) {
                   //   it.componentInstance.getColumnType(data)
                   // }

src/config/index.js

@@ -531,7 +531,7 @@ export default {
    */
   transferType: {
     whTransfer: '调整类型-仓库调整',
-    nscTransfer: '调整类型-非标号调整',
+    nscTransfer: '调整类型-色号调整',
   },
 
   /**

src/locale/lang/zh-CN.js

@@ -119,6 +119,7 @@ export const button = {
   chooseSalesForPurchase:'选择销售订单',
   purchaseBasedOnSales:'选择销售订单',
   choosePurchase:'选择采购入库单',
+  costCheck:'成本核对',
 }
 
 /**
@@ -745,6 +746,8 @@ export const columns = {
   ingBoxPiece:'包装数量',
   intoingBoxPiece:'入库在包装数量',
   intoBoxPiece:'已入库包装数量',
+  sumAmtHandle:'核销金额',
+  fromTypeName:'来源单类型',
   cpName:'公司名称',
   cpManager:'负责人',
   cpPhone:'联系电话',

src/mixins/index.js

@@ -316,6 +316,7 @@ export const indexMixin = {
           let isDataDetail = false;
           this.searchInfo = res.data;   // 记录返回的实体，返回较多的数据，可能会用到
           this.tableData = res.data.list;
+          console.log("tableData", this.tableData)
           // 如果list没有值，可能就是data返回
           if (!this.tableData && res.data && Array.isArray(res.data)) {
             this.tableData = res.data;

src/view/fin/cost-check/index.vue

@@ -31,6 +31,7 @@
         :page-flag="false"
         :page-total-flag="false"
         :show-setting-flag="false"
+        show-footer
         :freeze="false">
         <DkTableColumn field="intoNo"></DkTableColumn>
         <vxe-column show-overflow="ellipsis" field="costPrice" width="100" height="100" min-width="80"
@@ -59,9 +60,9 @@
         <DkTableColumn field="skuName" width="auto"></DkTableColumn>
         <DkTableColumn field="supName" width="auto"></DkTableColumn>
         <DkTableColumn field="intoTypeName" width="auto"></DkTableColumn>
-        <DkTableColumn field="intoQty" width="auto"></DkTableColumn>
-        <DkTableColumn field="priceInto" width="auto"></DkTableColumn>
-        <DkTableColumn field="intoAmt" width="auto"></DkTableColumn>
+        <DkTableColumn field="intoQty" width="auto" data-type="number" :sum="true" :digits="0"></DkTableColumn>
+        <DkTableColumn field="priceInto" width="auto" data-type="number" sum :digits="0"></DkTableColumn>
+        <DkTableColumn field="intoAmt" width="auto" data-type="number" sum :digits="2"></DkTableColumn>
         <DkTableColumn field="flgCostCheckName" width="auto"></DkTableColumn>
 
       </DkTable>

src/view/fin/daily-check-report/index.vue

@@ -36,6 +36,7 @@
                    :page-size-opts="pageSizeOpts"
                    :page-size="pageInfo.pageSize"
                    name="table"
+                   show-footer
                    :height="this.tableHeight * split - 36">
             <!-- 客户名称-->
             <DkTableColumn field="cusName"></DkTableColumn>
@@ -48,11 +49,11 @@
             <!-- 业务员-->
             <DkTableColumn field="staffName" width="auto"></DkTableColumn>
             <!-- 订货总额-->
-            <DkTableColumn field="totalOrderAmount" :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="totalOrderAmount" dataType="number" sum :digits="0"></DkTableColumn>
             <!-- 应收总额-->
-            <DkTableColumn field="amtShould" :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="amtShould" dataType="number" sum :digits="0"></DkTableColumn>
             <!-- 收款总额-->
-            <DkTableColumn field="amtRec" :title="$t('amtRecTotal')" :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="amtRec" :title="$t('amtRecTotal')" dataType="number" sum :digits="0"></DkTableColumn>
             <!-- 账务日期-->
             <DkTableColumn field="accDate" width="auto" :dataType="$config.columnType.date"></DkTableColumn>
           </DkTable>

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

@@ -107,8 +107,8 @@ export default {
         remarks: null,
         accDate: new Date(),
         orgId: self.$store.state.user.orgId,
-        staffId: self.$store.state.user.id,
-        makeStaff: self.$store.state.user.id,
+        staffId: self.$store.state.user.staffId,
+        makeStaff: self.$store.state.user.staffId,
         macReceiptCode:null,
       },
       //查询

src/view/fin/money-transfer/form.vue

@@ -66,11 +66,11 @@ export default {
         remarks: null,
         annexPaths: null,
         accDate: new Date(),
-        staffId: self.$store.state.user.id,
+        staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
         orgId: self.$store.state.user.orgId,
         orgName: self.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
       },
       transferColumns: [
         {
@@ -201,11 +201,11 @@ export default {
         remarks: null,
         annexPaths: null,
         accDate: new Date(),
-        staffId: self.$store.state.user.id,
+        staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
         orgId: self.$store.state.user.orgId,
         orgName: self.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
       }
     },
   }

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

@@ -300,11 +300,11 @@ export default {
         remarks: null,
         annexPaths: null,
         accDate: new Date(),
-        staffId: self.$store.state.user.id,
+        staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
         orgId: self.$store.state.user.orgId,
         orgName: self.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
       }
     },
   },

src/view/fin/other-payable/form.vue

@@ -108,7 +108,7 @@ export default {
         sumAmtPay: null,
         remarks: null,
         annexPaths: null,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
         paymentList: [],
@@ -314,7 +314,7 @@ export default {
         sumAmtPay: null,
         remarks: null,
         annexPaths: null,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
         paymentList: [],

src/view/fin/other-receivable/form.vue

@@ -115,7 +115,7 @@ export default {
         sumAmtRec: null,
         remarks: null,
         annexPaths: null,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
         receiptList: [],
@@ -324,7 +324,7 @@ export default {
         sumAmtRec: null,
         remarks: null,
         annexPaths: null,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
         receiptList: [],

src/view/fin/other-receivable/index.vue

@@ -59,8 +59,8 @@
           </DkTable>
         </div>
         <div slot="bottom">
+          <DkTabs v-model="detailModel" :options="detailOptions" @on-click="detailTabsClick"></DkTabs>
           <div v-show="visItemFlag">
-            <DkTabs v-model="detailModel" :options="detailOptions" @on-click="detailTabsClick"></DkTabs>
             <!--其他收入单明细-->
             <DkTable :id="'table-'+$options.name" ref="detail-select" :data="tableDataDetail_otherReceivableItem"
                      showFooter
@@ -141,6 +141,16 @@ export default {
           valueKind: 'M-CHOICE'
         },
         {
+          itemCode: '制单时间-时间',
+          itemName: 'makeTime',
+          valueFormat: {
+            code: 'makeTime',
+            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
+          },
+          valueKind: 'DATE_RANGE',
+          // required: true,
+        },
+        {
           itemCode: '业务员-文本',
           itemName: 'staffId',
           valueFormat: {
@@ -151,16 +161,7 @@ export default {
           },
           valueKind: 'M-CHOICE'
         },
-        {
-          itemCode: '制单时间-时间',
-          itemName: 'makeTime',
-          valueFormat: {
-            code: 'makeTime',
-            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
-          },
-          valueKind: 'DATE_RANGE',
-          // required: true,
-        },
+
         self.$config.flgValidSearch
       ],
     }

src/view/fin/payment/form.vue

@@ -184,7 +184,7 @@ export default {
         paymentResidue: 0,
         remarks: null,
         annexPaths: null,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
         payableList: [],
@@ -261,7 +261,7 @@ export default {
      * @date   : 2024-02-20 15:53
      */
     initData() {
-      this.formData.staffId = this.$store.state.user.id
+      this.formData.staffId = this.$store.state.user.staffId
       this.formData.staffName = this.$store.state.user.staffName
       this.formData.orgId = this.$store.state.user.orgId
       this.formData.orgName = this.$store.state.user.orgName
@@ -563,7 +563,7 @@ export default {
         paymentResidue: null,
         remarks: null,
         annexPaths: null,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
         payableList: [],

src/view/fin/payment/index.vue

@@ -160,6 +160,16 @@ export default {
           valueKind: 'M-CHOICE'
         },
         {
+          itemCode: '制单时间-时间',
+          itemName: 'makeTime',
+          valueFormat: {
+            code: 'makeTime',
+            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
+          },
+          valueKind: 'DATE_RANGE',
+          // required: true,
+        },
+        {
           itemCode: '付款类型-下拉',
           itemName: 'paymentType',
           valueFormat: {
@@ -184,16 +194,6 @@ export default {
         //   },
         //   valueKind: 'M-CHOICE'
         // },
-        {
-          itemCode: '制单时间-时间',
-          itemName: 'makeTime',
-          valueFormat: {
-            code: 'makeTime',
-            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
-          },
-          valueKind: 'DATE_RANGE',
-          // required: true,
-        },
         self.$config.flgValidSearch
       ],
     }

src/view/fin/receipt/form.vue

@@ -186,11 +186,11 @@ export default {
         receiptResidue: 0,
         remarks: null,
         annexPaths: null,
-        staffId: this.$store.state.user.id,
+        staffId: this.$store.state.user.staffId,
         staffName: this.$store.state.user.staffName,
         orgId: this.$store.state.user.orgId,
         orgName: this.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
         receivableList: [],
@@ -565,11 +565,11 @@ export default {
         receiptResidue: 0,
         remarks: null,
         annexPaths: null,
-        staffId: this.$store.state.user.id,
+        staffId: this.$store.state.user.staffId,
         staffName: this.$store.state.user.staffName,
         orgId: this.$store.state.user.orgId,
         orgName: this.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
         receivableList: [],

src/view/fin/receipt/index.vue

@@ -151,6 +151,16 @@ export default {
           valueKind: 'STR'
         },
         {
+          itemCode: '制单时间-时间',
+          itemName: 'makeTime',
+          valueFormat: {
+            code: 'makeTime',
+            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
+          },
+          valueKind: 'DATE_RANGE',
+          // required: true,
+        },
+        {
           itemCode: '业务部门-文本',
           itemName: 'orgId',
           valueFormat: {
@@ -197,16 +207,6 @@ export default {
         //   },
         //   valueKind: 'M-CHOICE'
         // },
-        {
-          itemCode: '制单时间-时间',
-          itemName: 'makeTime',
-          valueFormat: {
-            code: 'makeTime',
-            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
-          },
-          valueKind: 'DATE_RANGE',
-          // required: true,
-        },
         self.$config.flgValidSearch
       ],
     }

src/view/fin/supplier-account-report/index.vue

@@ -31,11 +31,12 @@
                  ref="table-select"
                  :showCheckboxHeader="false"
                  :choose-flag="false"
+                 show-footer
                  v-show="!this.detailFlag">
           <DkTableColumn field="supName" type="link"
                          @on-link="tabsClick"></DkTableColumn>
-          <DkTableColumn field="sumAmtPay" data-type="number"/>
-          <DkTableColumn field="sumAmtHandle" data-type="number"/>
+          <DkTableColumn field="sumAmtPay" sum data-type="number" :digits="2" />
+          <DkTableColumn field="sumAmtHandle" sum data-type="number" :digits="2" />
           <DkTableColumn field="remarks" width="auto"></DkTableColumn>
         </DkTable>
 
@@ -47,12 +48,13 @@
                  primaryKey="itemId"
                  :multiple="false"
                  :choose-flag="false"
+                 show-footer
                  v-show="this.detailFlag">
           <DkTableColumn field="accItemTypeName"/>
           <DkTableColumn field="orgName"/>
           <DkTableColumn field="staffName"/>
-          <DkTableColumn field="amtPay" data-type="number"/>
-          <DkTableColumn field="amtHandle" data-type="number"/>
+          <DkTableColumn field="amtPay" data-type="number" sum :digits="2" />
+          <DkTableColumn field="amtHandle" data-type="number" sum :digits="2" />
           <!--备注-->
           <DkTableColumn field="remarks"></DkTableColumn>
         </DkTable>

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

@@ -91,7 +91,7 @@ export default {
         orgId: self.$store.state.user.orgId,
         orgName: self.$store.state.user.orgName,
         transferType: null,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
        /* oWhId: null,

src/view/mst/supplier/index.vue

@@ -158,7 +158,7 @@ export default {
         remarks: null,
         orgId : self.$store.state.user.orgId,
         orgName  : self.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         startAmount:0,
       },
       // 查询条件

src/view/report/detail-report/index.vue

@@ -122,6 +122,10 @@ export default {
             });
           }
         }
+        //库存查询跳转
+        if(item['linkType'] == 'IVT'){
+          this.$router.push('/mst/goods/edit/' + row['skuId'])
+        }
       }
     },
     /**

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

@@ -164,14 +164,14 @@ const data = {
       {field: 'cusFromName'},
       {field: 'makeStaffName'},
       {field: 'makeTime',dataType:"dateTime"},
-      {field: 'sumQuantity',dataType:'number',align:'right'},
+      {field: 'sumQuantity',dataType:'number',align:'right',sum:true},
       {field: 'sumStandard',dataType:'number',align:'right'},
-      {field: 'sumAmount',dataType:'number',align:'right'},
+      {field: 'sumAmount',dataType:'number',align:'right',sum:true},
       {field: 'saleDiscount',dataType:'number',align:'right'},
       {field: 'paymentNo'},
-      {field: 'amtReceivable',dataType:'number',align:'right'},
-      {field: 'amtHandle',dataType:'number',align:'right'},
-      {field: 'amtResidue',dataType:'number',align:'right'},
+      {field: 'amtReceivable',dataType:'number',align:'right',sum:true},
+      {field: 'amtHandle',dataType:'number',align:'right',sum:true},
+      {field: 'amtResidue',dataType:'number',align:'right',sum:true},
       {field: 'remarks', width: 'auto'}
     ],
     detailColumns:[
@@ -184,11 +184,11 @@ const data = {
       {field: 'outNo'},
       {field: 'outStatusName'},
       {field: 'whName'},
-      {field: 'itemQty',dataType:'number',align:'right'},
+      {field: 'itemQty',dataType:'number',align:'right',sum:true},
       {field: 'priceStd',dataType:'number',align:'right'},
-      {field: 'amtStd',dataType:'number',align:'right'},
+      {field: 'amtStd',dataType:'number',align:'right',sum:true},
       {field: 'priceSale',dataType:'number',align:'right'},
-      {field: 'itemAmt',dataType:'number',align:'right'},
+      {field: 'itemAmt',dataType:'number',align:'right',sum:true},
       {field: 'priceDiscount',dataType:'number',align:'right'},
       {field: 'outingQty',dataType:'number',align:'right'},
       {field: 'outingAmt',dataType:'number',align:'right'},
@@ -208,37 +208,37 @@ const data = {
     methodsName: 'getIvtDetailReport',
     // 查询条件
     searchContent: [
-      {itemCode: 'skuCode'},
+      {itemCode: 'skuModel'},
       {itemCode: 'skuName'},
       {itemCode: 'nonStdCode'},
       {itemCode: 'whName'},
-      {itemCode: 'skuName'},
+      {itemCode: 'flgViewItem',valueKind:'SWITCH',itemName:'查看明细'},
     ],
     // 列表列
     columns: [
-      {field: 'skuCode'},
-      {field: 'skuName'},
-      {field: 'skuModel'},
+      {field: 'path', title:$t('skuImages'),type:'image'},
+      {field: 'skuModel',type:'link',linkType:'IVT'},
+      {field: 'skuName',type:'link',linkType:'IVT'},
+      {field: 'whCode'},
+      {field: 'whName'},
+      {field: 'nonStdCode'},
+      {field: 'invQty',dataType: 'number',align:'right', digits: 0, sum: true},
+      {field: 'usableQty',dataType: 'number',align:'right', digits: 0, sum: true},
+      //库存包装数
+      {field: 'costPrice',dataType: 'number',align:'right', digits: 2, sum: true},
+      {field: 'costAmt',dataType: 'number',align:'right', digits: 2, sum: true},
       {field: 'brandName'},
       {field: 'categoryName',title:$t('catName')},
-      {field: 'unitName'},
-      {field: 'conversionFactor'},
       {field: 'seriesName'},
       {field: 'skuSpec'},
-      {field: 'pricePurchase'},
-      {field: 'priceStandard'},
-      {field: 'priceWholesale'},
-      {field: 'priceLimited'},
-      {field: 'path', title:$t('skuImages'),type:'image'},
-      {field: 'nonStdCode'},
-      {field: 'invQty',dataType: 'number',align:'right', digits: 2, sum: true},
-      {field: 'outingQty',dataType: 'number',align:'right', digits: 2, sum: true},
-      {field: 'usableQty',dataType: 'number',align:'right', digits: 2, sum: true},
-      {field: 'whCode'},
-      {field: 'whName'},
-      {field: 'priceInto'},
-      {field: 'remarks', width: 'auto'}
+      {field: 'unitName'},
     ],
+    detailColumns:[
+      //来源单号
+      {field: 'fromTypeName'},
+      {field: 'fromNo'},
+      {field: 'inventoryQty',title: $t('invQty'),dataType: 'number',align:'right', digits: 0, sum: true},
+    ]
   },
   // 采购明细表
   'pur-detail-report': {
@@ -883,7 +883,7 @@ const data = {
       {field: 'staffName'},
       {field: 'makeStaffName'},
       {field: 'macName'},
-      {field: 'amtRec',dataType:'number',sum:'true',align:'right'},
+      {field: 'amtRec',dataType:'number',sum:true,align:'right'},
       {field: 'remarks', width: 'auto'}
     ],
   },

src/view/sale/cus-receipt/form.vue

@@ -101,11 +101,11 @@ export default {
         receivableBalance: null,
         remarks: null,
         annexPaths: null,
-        staffId: this.$store.state.user.id,
+        staffId: this.$store.state.user.staffId,
         staffName: this.$store.state.user.staffName,
         orgId: this.$store.state.user.orgId,
         orgName: this.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
       },
@@ -292,11 +292,11 @@ export default {
         receivableBalance: null,
         remarks: null,
         annexPaths: null,
-        staffId: this.$store.state.user.id,
+        staffId: this.$store.state.user.staffId,
         staffName: this.$store.state.user.staffName,
         orgId: this.$store.state.user.orgId,
         orgName: this.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
       }

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

@@ -208,11 +208,11 @@ export default {
         outStatus: this.$config.outStatus.chuKuZhong,
         staffList: [],    //存放从业务员id和分配百分比
         orgList: [],      //存放从业务部门id和分配百分比
-        staffId: self.$store.state.user.id,
+        staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
         orgId: self.$store.state.user.orgId,
         orgName: self.$store.state.user.orgName,
-        makeStaff: this.$store.state.user.id,
+        makeStaff: this.$store.state.user.staffId,
         annexPaths: null,
         outingQty: null,
         outingAmt: null,
@@ -943,11 +943,11 @@ export default {
         outStatus: this.$config.outStatus.chuKuZhong,
         staffList: [],    //存放从业务员id和分配百分比
         orgList: [],      //存放从业务部门id和分配百分比
-        staffId: self.$store.state.user.id,
+        staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
         orgId: self.$store.state.user.orgId,
         orgName: self.$store.state.user.orgName,
-        makeStaff: this.$store.state.user.id,
+        makeStaff: this.$store.state.user.staffId,
         annexPaths: null,
         outingQty: null,
         outingAmt: null,

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

@@ -163,7 +163,7 @@ export default {
         orgId: null,
         orgName: null,
         outStatus: this.$config.outStatus.chuKuZhong,
-        makeStaff: this.$store.state.user.id,
+        makeStaff: this.$store.state.user.staffId,
         annexPaths: null,
         outingQty: null,
         outingAmt: null,

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

@@ -192,11 +192,11 @@ export default {
         outStatus: this.$config.outStatus.chuKuZhong,
         staffList: [],    //存放从业务员id和分配百分比
         orgList: [],      //存放从业务部门id和分配百分比
-        staffId: self.$store.state.user.id,
+        staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
         orgId: self.$store.state.user.orgId,
         orgName: self.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         flgAutoHandle: true,
         limitEdit: true,
       },
@@ -814,11 +814,11 @@ export default {
         outStatus: this.$config.outStatus.chuKuZhong,
         staffList: [],    //存放从业务员id和分配百分比
         orgList: [],      //存放从业务部门id和分配百分比
-        staffId: self.$store.state.user.id,
+        staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
         orgId: self.$store.state.user.orgId,
         orgName: self.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         flgAutoHandle: true,
       }
 

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

@@ -158,7 +158,7 @@ export default {
         staffName: null,
         orgId: null,
         orgName: null,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         flgAutoHandle: true,
       },
       addressArea: [],

src/view/sale/order-sum-report/index.vue

@@ -41,7 +41,6 @@
                    :page-size-opts="pageSizeOpts"
                    :page-size="pageInfo.pageSize"
                    name="table">
-            <DkTableColumn field="skuCode"></DkTableColumn>
             <DkTableColumn field="skuName"></DkTableColumn>
             <DkTableColumn field="skuModel"></DkTableColumn>
             <DkTableColumn field="skuSpec"></DkTableColumn>
@@ -96,7 +95,6 @@
             <DkTableColumn field="cusPhone"/>
             <DkTableColumn field="contactName"/>
             <DkTableColumn field="statusName" :title="$t('outStatusName')" :color-cards="['待出库','出库中','已出库','已退货']"/>
-            <DkTableColumn field="skuCode"></DkTableColumn>
             <DkTableColumn field="skuName"></DkTableColumn>
             <DkTableColumn field="skuModel"></DkTableColumn>
             <DkTableColumn field="skuSpec"></DkTableColumn>

src/view/sale/order/form.vue

@@ -254,11 +254,11 @@ export default {
         orgList: [],      //存放从业务部门id和分配百分比
         orderStatus: self.$config.orderStatus.done, //订单状态
         outStatus: self.$config.outStatus.daiChuKu,
-        staffId: self.$store.state.user.id,
+        staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
         orgId: self.$store.state.user.orgId,
         orgName: self.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         outsourcedItemList:[],//外协明细
         outboundProcessingFlag:true,//开单并出库办理
         flgAutoHandle : self.$store.state.user.setting[self.$config.settingCode.IVT001] ? true : false ,//自动办理标识
@@ -1704,11 +1704,11 @@ export default {
         orgList: [],      //存放从业务部门id和分配百分比
         orderStatus: self.$config.orderStatus.done, //订单状态
         outStatus: self.$config.outStatus.daiChuKu,
-        staffId: self.$store.state.user.id,
+        staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
         orgId: self.$store.state.user.orgId,
         orgName: self.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
       }
 
       // 设置默认业务员业务部门