songyang 1 год назад
Родитель
Сommit
e2facc1d77

+ 1 - 1
src/config/index.js

@@ -424,7 +424,7 @@ export default {
     basicMacType: '基础资料-账户',
     basicSource: '基础资料-来源',
     basicTags: '基础资料-标签',
-    basicLossReason: '基础资料-亏原因',
+    basicLossReason: '基础资料-亏原因',
   },
 
   /**

+ 2 - 1
src/locale/lang/zh-CN.js

@@ -485,7 +485,7 @@ export const columns = {
   checkDate:'盘点日期',
   checkNo:'盘点单号',
   checkStatusName:'盘点状态',
-  oInvQty:'原存货量',
+  oinvQty:'原存货量',
   lossReasonName:'盘亏原因',
   checkQty:'盘点数量',
   balanceQty:'差异数量',
@@ -539,6 +539,7 @@ export const columns = {
   receivableBalance:'客户欠款',
   freezeGoodsDetail:'冻结明细',
   checkGoodsDetail:'盘点明细',
+  transferGoodsDetail:'调整明细',
   flgNegative:'允许余额为负数',
   initDate:'开户日期',
   trfDate:'转账日期',

+ 7 - 1
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,
+        makeStaffId: self.$store.state.user.id,
         staffId: null,
         checkStaff: null,
         staffCode: null,
@@ -123,6 +123,12 @@ export default {
           type: 'tableSelect',
           controlId: 'invId',
           dataType: self.$config.tableSelectType.inventory,
+          // 查询条件
+          otherSearchParam: () => {
+            return {
+              whId: self.formData.whId,
+            }
+          },
           fieldUpdate:self.$updateColumns.checkChooseIvt,
           searchDetailFlag: true
         },

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

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

+ 2 - 2
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,
+        makeStaffId: self.$store.state.user.id,
         staffId: self.$store.state.user.staffId,
         staffName: self.$store.state.user.staffName,
        /* oWhId: null,
@@ -143,7 +143,7 @@ export default {
         },
         //目标仓库
         {
-          field: 'whName',
+          field: 'whId',
           type: 'select',
           options: () => self.whList,
           labelKey: 'whName',

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

@@ -112,7 +112,7 @@ export default {
     let self = this
     return {
       detailModel: 'goodsDetailData',
-      detailOptions: [{label: self.$t('freezeGoodsDetail'), name: 'freezeGoodsDetail'}, //货物明细
+      detailOptions: [{label: self.$t('transferGoodsDetail'), name: 'transferGoodsDetail'}, //货物明细
         {label: self.$t('filesDetail'), name: 'filesDetail'}, //附件明细
       ],
       tableData: [],