问题修改

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/config/index.js

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

src/locale/lang/zh-CN.js

@@ -746,6 +746,7 @@ export const columns = {
   intoingBoxPiece:'入库在包装数量',
   intoBoxPiece:'已入库包装数量',
   sumAmtHandle:'核销金额',
+  fromTypeName:'来源单类型',
 }
 
 /**

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/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/payment/form.vue

@@ -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/receipt/form.vue

@@ -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/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

@@ -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': {

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/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,
       }
 
       // 设置默认业务员业务部门