sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改来源库区校验

hella_vue3
lijuncheng 8 months ago
parent
c4450633fb
commit
b8ff5958ad
66 changed files with 221 additions and 309 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/common/basic.js
  2. 6
      src/common/record.js
  3. 12
      src/mycomponents/detail/comDetailCard.vue
  4. 4
      src/mycomponents/detail/comJobDetailCard.vue
  5. 6
      src/mycomponents/location/locationCompare.vue
  6. 6
      src/mycomponents/location/requiredLocation.vue
  7. 4
      src/mycomponents/record/recordDetailCard.vue
  8. 18
      src/mycomponents/scan/winScanLocation.vue
  9. 6
      src/pages/container/record/containerBindRecord.vue
  10. 1
      src/pages/container/record/containerUnBindRecord.vue
  11. 9
      src/pages/count/record/countRecord.vue
  12. 8
      src/pages/customerReturn/job/returnDetail.vue
  13. 13
      src/pages/customerReturn/record/returnRecord.vue
  14. 14
      src/pages/customerReturn/request/customerReturnRequestCreate.vue
  15. 13
      src/pages/deliver/record/deliverRecord.vue
  16. 12
      src/pages/inventoryMove/coms/comMove.vue
  17. 12
      src/pages/inventoryMove/coms/comMoveRecord.vue
  18. 1
      src/pages/inventoryMove/job/inventoryMoveDetail.vue
  19. 1
      src/pages/issue/record/issueRecord.vue
  20. 1
      src/pages/issue/request/issueRequestCreate.vue
  21. 1
      src/pages/issue/request/issueScanRequest.vue
  22. 9
      src/pages/package/record/mergePackageRecord.vue
  23. 7
      src/pages/package/record/overPackageRecord.vue
  24. 9
      src/pages/package/record/splitPackageRecord.vue
  25. 8
      src/pages/pick/job/pickJobDetail.vue
  26. 6
      src/pages/productDismantle/job/productDismantleDetail.vue
  27. 14
      src/pages/productDismantle/record/productDismantleRecord.vue
  28. 8
      src/pages/productPutaway/job/productPutawayDetail.vue
  29. 9
      src/pages/productPutaway/record/productPutawayRecord.vue
  30. 12
      src/pages/productPutaway/request/putawayRequestCreate.vue
  31. 10
      src/pages/productReceipt/coms/comProductDetailCard.vue
  32. 8
      src/pages/productReceipt/job/productReceiptDetail.vue
  33. 4
      src/pages/productReceipt/record/productReceiptRecord.vue
  34. 8
      src/pages/productionReceipt/job/productionReceiptDetail.vue
  35. 13
      src/pages/productionReceipt/record/productionReceiptRecord.vue
  36. 5
      src/pages/productionReturn/coms/comReturn.vue
  37. 10
      src/pages/productionReturn/coms/comReturnDetailCard.vue
  38. 9
      src/pages/productionReturn/job/returnDetail.vue
  39. 3
      src/pages/productionReturn/record/returnToHold.vue
  40. 3
      src/pages/productionReturn/record/returnToStore.vue
  41. 4
      src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
  42. 11
      src/pages/purchaseReceipt/job/receiptDetail.vue
  43. 8
      src/pages/purchaseReturn/record/returnRecord.vue
  44. 8
      src/pages/purchaseReturn/request/returnRequestCreate.vue
  45. 10
      src/pages/putaway/job/putawayDetail.vue
  46. 12
      src/pages/putaway/record/putawayRecord.vue
  47. 12
      src/pages/putaway/request/putawayRequestCreate.vue
  48. 4
      src/pages/repleinsh/coms/comRepleinshRequestPopup.vue
  49. 6
      src/pages/repleinsh/job/repleinshDetail.vue
  50. 11
      src/pages/repleinsh/record/repleinshRecord.vue
  51. 6
      src/pages/repleinsh/request/repleinshRequest.vue
  52. 11
      src/pages/scrap/record/scrapRecord.vue
  53. 11
      src/pages/scrap/request/scrapRequestCreate.vue
  54. 1
      src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
  55. 12
      src/pages/transfer/coms/comReceiptDetailCard.vue
  56. 13
      src/pages/transfer/coms/comTransferRecord.vue
  57. 8
      src/pages/transfer/job/issueDetail.vue
  58. 8
      src/pages/transfer/job/receiptDetail.vue
  59. 1
      src/pages/transfer/job/transferDetail.vue
  60. 13
      src/pages/transfer/record/deliverRecord.vue
  61. 9
      src/pages/transfer/record/receiptRecord.vue
  62. 6
      src/pages/unPlanned/coms/comReceiptDetailCard.vue
  63. 8
      src/pages/unPlanned/job/receiptJobDetail.vue
  64. 6
      src/pages/unPlanned/record/issueRecord.vue
  65. 10
      src/pages/unPlanned/record/receiptRecord.vue
  66. 6
      src/pages/unPlanned/request/issueRequestCreate.vue

12
src/common/basic.js
View File

@ -7,7 +7,7 @@ import { calc } from '@/common/calc'
let jobStatusList = []; let jobStatusList = [];
let itemStatusList = []; let itemStatusList = [];
let locationTypeList = []; let locationAreaTypeList = [];
let uomList = []; let uomList = [];
let inventoryStatusList = []; let inventoryStatusList = [];
let containerTypeList = []; let containerTypeList = [];
@ -24,7 +24,7 @@ let inspectFailedReasonList = [];
export function clearCacheData() { export function clearCacheData() {
jobStatusList = []; jobStatusList = [];
itemStatusList = []; itemStatusList = [];
locationTypeList = []; locationAreaTypeList = [];
uomList = []; uomList = [];
inventoryStatusList = []; inventoryStatusList = [];
containerTypeList = []; containerTypeList = [];
@ -152,11 +152,11 @@ export function getItemStateInfo(value) {
//获取库位类型 //获取库位类型
export function getLocationTypeInfo(value) { export function getLocationTypeInfo(value) {
var resultInfo = ""; var resultInfo = "";
if (locationTypeList.length == 0) { if (locationAreaTypeList.length == 0) {
locationTypeList = getDirectoryInfo("location_type") locationAreaTypeList = getDirectoryInfo("location_type")
} }
if (locationTypeList.length > 0) { if (locationAreaTypeList.length > 0) {
for (let item of locationTypeList) { for (let item of locationAreaTypeList) {
if (item.value == value) { if (item.value == value) {
resultInfo = item resultInfo = item
break; break;

6
src/common/record.js
View File

@ -78,10 +78,8 @@ export function getBusinessType(typeCode, callback) {
let result = { let result = {
success: true, success: true,
businessType: '', businessType: '',
fromlocationTypeList: '',
fromLocationAreaTypeList:'', fromLocationAreaTypeList:'',
toAreaTypes:'', toLocationAreaTypeList:'',
tolocationTypeList: '',
itemCodeTypeList:"", itemCodeTypeList:"",
useOnTheWay:"FALSE", useOnTheWay:"FALSE",
fromInventoryStatuses: '', fromInventoryStatuses: '',
@ -93,8 +91,6 @@ export function getBusinessType(typeCode, callback) {
result.businessType = res.data.list[0]; result.businessType = res.data.list[0];
result.fromLocationAreaTypeList = getDirectoryItemArray(res.data.list[0].outAreaTypes) ; result.fromLocationAreaTypeList = getDirectoryItemArray(res.data.list[0].outAreaTypes) ;
result.toLocationAreaTypeList = getDirectoryItemArray(res.data.list[0].inAreaTypes) ; result.toLocationAreaTypeList = getDirectoryItemArray(res.data.list[0].inAreaTypes) ;
result.fromlocationTypeList = getDirectoryItemArray(res.data.list[0].outLocationTypes)
result.tolocationTypeList = getDirectoryItemArray(res.data.list[0].inLocationTypes)
result.itemCodeTypeList = getDirectoryItemArray(res.data.list[0].itemTypes) result.itemCodeTypeList = getDirectoryItemArray(res.data.list[0].itemTypes)
result.fromInventoryStatuses = res.data.list[0].outInventoryStatuses; result.fromInventoryStatuses = res.data.list[0].outInventoryStatuses;
result.toInventoryStatuses = res.data.list[0].inInventoryStatuses; result.toInventoryStatuses = res.data.list[0].inInventoryStatuses;

12
src/mycomponents/detail/comDetailCard.vue
View File

@ -7,7 +7,7 @@
</item-compare-qty> </item-compare-qty>
</template> </template>
<u-line></u-line> <u-line></u-line>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList" :key="index">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item)" <uni-swipe-action-item @click="swipeClick($event,item)"
:right-options="item.scaned?scanOptions:detailOptions" :right-options="item.scaned?scanOptions:detailOptions"
@ -21,7 +21,7 @@
</uni-collapse> </uni-collapse>
<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit> <balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
:locationTypeList="locationTypeList"></win-scan-location> :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
<comMessage ref="message"></comMessage> <comMessage ref="message"></comMessage>
</view> </view>
</template> </template>
@ -47,11 +47,11 @@
props: { props: {
dataContent: { dataContent: {
type: Object, type: Object,
default: {} default: null
}, },
settingParam: { settingParam: {
type: Object, type: Object,
default: {} default: null
}, },
isShowPack: { isShowPack: {
type: Boolean, type: Boolean,
@ -65,9 +65,9 @@
type: Boolean, type: Boolean,
default: true default: true
}, },
locationTypeList: { locationAreaTypeList: {
type: Array, type: Array,
default: [] default: null
}, },
}, },
watch: { watch: {

4
src/mycomponents/detail/comJobDetailCard.vue
View File

@ -27,7 +27,6 @@
import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue' import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue' import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
import receiptDetailInfoPopup from '@/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue' import receiptDetailInfoPopup from '@/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import pack from '@/mycomponents/balance/pack.vue' import pack from '@/mycomponents/balance/pack.vue'
import detailList from '@/mycomponents/detail/detailList.vue' import detailList from '@/mycomponents/detail/detailList.vue'
import packageList from '@/mycomponents/package/packageList.vue' import packageList from '@/mycomponents/package/packageList.vue'
@ -45,7 +44,6 @@
recommendQtyEdit, recommendQtyEdit,
jobDetailPopup, jobDetailPopup,
receiptDetailInfoPopup, receiptDetailInfoPopup,
winScanLocation,
detailList, detailList,
packageList packageList
}, },
@ -58,7 +56,7 @@
type: Object, type: Object,
default: null default: null
}, },
locationTypeList: { locationAreaTypeList: {
type: Object, type: Object,
default: null default: null
}, },

6
src/mycomponents/location/locationCompare.vue
View File

@ -15,7 +15,7 @@
<image v-if="isShowEdit" style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image> <image v-if="isShowEdit" style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image>
</view> </view>
<win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation'
:locationTypeList="locationTypeList"></win-scan-location> :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -48,9 +48,9 @@
type: Boolean, type: Boolean,
default: true default: true
}, },
locationTypeList: { locationAreaTypeList: {
type: Array, type: Array,
default: [] default: null
} }
}, },

6
src/mycomponents/location/requiredLocation.vue
View File

@ -14,7 +14,7 @@
<image v-if="isShowEdit" style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image> <image v-if="isShowEdit" style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image>
</view> </view>
<win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation'
:locationTypeList="locationTypeList"></win-scan-location> :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -43,9 +43,9 @@
type: Boolean, type: Boolean,
default: true default: true
}, },
locationTypeList: { locationAreaTypeList: {
type: Array, type: Array,
default: [] default: null
} }
}, },

4
src/mycomponents/record/recordDetailCard.vue
View File

@ -13,7 +13,7 @@
<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm"> <recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
</recommend-qty-edit> </recommend-qty-edit>
<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
:locationTypeList="locationTypeList"></win-scan-location> :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
<receipt-detail-info-popup ref="jobDetailPopup" :dataContent="showItem"></receipt-detail-info-popup> <receipt-detail-info-popup ref="jobDetailPopup" :dataContent="showItem"></receipt-detail-info-popup>
<comMessage ref="message"></comMessage> <comMessage ref="message"></comMessage>
</view> </view>
@ -53,7 +53,7 @@
type: Object, type: Object,
default: null default: null
}, },
locationTypeList: { locationAreaTypeList: {
type: Object, type: Object,
default: null default: null
}, },

18
src/mycomponents/scan/winScanLocation.vue
View File

@ -42,7 +42,7 @@
type: String, type: String,
default: '' default: ''
}, },
locationTypeList: { locationAreaTypeList: {
type: Array, type: Array,
default: null default: null
}, },
@ -98,20 +98,14 @@
if (res.data.total > 0) { if (res.data.total > 0) {
let result = res.data.list[0]; let result = res.data.list[0];
var type = result.type; var type = result.type;
var areaType = "" var areaType = result.areaType
if(this.code=="RAW"){
areaType="RAW"
}else {
areaType="SUPPER"
}
var available = result.available; var available = result.available;
if (available == "TRUE") { if (available == "TRUE") {
if (checkDirectoryItemExist(this.locationTypeList, areaType)) { if (checkDirectoryItemExist(this.locationAreaTypeList, areaType)) {
this.location = result; this.location = result;
this.callBack(); this.callBack();
} else { } else {
var hint = getListLocationAreaTypeDesc(this.locationTypeList); var hint = getListLocationAreaTypeDesc(this.locationAreaTypeList);
this.showErrorMessage("扫描库位[" + this.code + "]是[" + this.showErrorMessage("扫描库位[" + this.code + "]是[" +
getLocationAreaTypeName(areaType) + "],需要的库区是[" + hint + "]") getLocationAreaTypeName(areaType) + "],需要的库区是[" + hint + "]")
} }
@ -133,10 +127,10 @@
}, },
checkLocationType(type) { checkLocationType(type) {
var isPass = false; var isPass = false;
if (this.locationTypeList.length == 0) { if (this.locationAreaTypeList.length == 0) {
isPass = true; isPass = true;
} else { } else {
var temp = this.locationTypeList.filter(res => { var temp = this.locationAreaTypeList.filter(res => {
if (res == type) { if (res == type) {
return res return res
} }

6
src/pages/container/record/containerBindRecord.vue
View File

@ -98,14 +98,10 @@
id: '', id: '',
scanCount: 0, scanCount: 0,
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
toLocationInfo: {}, toLocationInfo: {},
fromLocationInfo: {}, fromLocationInfo: {},
toLocationInfo: {},
containerCode: "", containerCode: "",
containerInfo: {}, containerInfo: {},
fromlocationTypeList: [],
tolocationTypeList: [],
allowModifyLocation: false, allowModifyLocation: false,
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
@ -130,8 +126,6 @@
getBusinessType('ContainerBind', res => { getBusinessType('ContainerBind', res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.showContainerPopup(); this.showContainerPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

1
src/pages/container/record/containerUnBindRecord.vue
View File

@ -61,7 +61,6 @@
} from '@/common/directory.js'; } from '@/common/directory.js';
import { import {
getBusinessType,
createItemInfo, createItemInfo,
createDetailInfo, createDetailInfo,
calcHandleQty calcHandleQty

9
src/pages/count/record/countRecord.vue
View File

@ -6,7 +6,7 @@
<view class="page-wraper" v-if="fromLocationCode!=''"> <view class="page-wraper" v-if="fromLocationCode!=''">
<requiredLocation title="盘点库位" :locationCode="fromLocationCode" <requiredLocation title="盘点库位" :locationCode="fromLocationCode"
:isShowEdit="jobContent.allowModifyLocation==1" @getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation==1" @getLocation='scanLocationCode'
:locationTypeList="locationTypeList"></requiredLocation> :locationAreaTypeList="locationAreaTypeList"></requiredLocation>
<u-line></u-line> <u-line></u-line>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
@ -37,7 +37,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-location ref="scanFromLocationCode" title="盘点库位" @getLocation='getLocation' <win-scan-location ref="scanFromLocationCode" title="盘点库位" @getLocation='getLocation'
:locationTypeList="fromLocationTypeArray"></win-scan-location> :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" :isShowStatus="true" :allowEditStatus="true"> <count-qty-edit ref="countQtyEdit" @confirm="editConfirm" :isShowStatus="true" :allowEditStatus="true">
</count-qty-edit> </count-qty-edit>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
@ -98,10 +98,9 @@
jobContent: {}, //任务内容 jobContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [], locationAreaTypeList: [],
toLocationInfo: {}, toLocationInfo: {},
businessTypeInfo: {}, businessTypeInfo: {},
fromLocationTypeArray: [],
toLocationTypeArray: [], toLocationTypeArray: [],
fromLocationInfo: {}, fromLocationInfo: {},
fromLocationCode: "", fromLocationCode: "",
@ -114,8 +113,6 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

8
src/pages/customerReturn/job/returnDetail.vue
View File

@ -6,7 +6,7 @@
<view class=""> <view class="">
<com-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false" <com-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@remove="updateData" @updateData="updateData" @openDetail="openDetail" @remove="updateData" @updateData="updateData" @openDetail="openDetail"
:locationTypeList="tolocationTypeList"> :locationAreaTypeList="toLocationAreaTypeList">
</com-detail-card> </com-detail-card>
</view> </view>
<u-line /> <u-line />
@ -20,7 +20,7 @@
<view class=""> <view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' @getLocation='scanLocationCode'
:locationTypeList="tolocationTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -87,7 +87,7 @@
managementList: [], managementList: [],
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
tolocationTypeList: [], toLocationAreaTypeList: [],
jobStatus:"", jobStatus:"",
jobToLocationCode:"" jobToLocationCode:""
}; };
@ -169,7 +169,7 @@
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
that.fromLocationCode = that.subList[0].fromLocationCode that.fromLocationCode = that.subList[0].fromLocationCode
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

13
src/pages/customerReturn/record/returnRecord.vue
View File

@ -21,7 +21,7 @@
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -35,7 +35,7 @@
</win-scan-pack-and-location> </win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -98,12 +98,11 @@
dataContent: {}, //任务内容 dataContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [], fromLocationAreaTypeList:[],
businessType: {}, businessType: {},
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
fromlocationTypeList: [], toLocationAreaTypeList: [],
tolocationTypeList: [],
managementList: [], managementList: [],
toWarehouseCode: '', toWarehouseCode: '',
}; };
@ -113,8 +112,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

14
src/pages/customerReturn/request/customerReturnRequestCreate.vue
View File

@ -34,7 +34,7 @@
<!-- <view class=""> <!-- <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
</view> --> </view> -->
<view class=""> <view class="">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -49,7 +49,7 @@
</win-scan-pack-and-location> </win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -112,19 +112,17 @@
dataContent: {}, //任务内容 dataContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
businessType: {}, businessType: {},
fromLocationCode: "", fromLocationCode: "",
fromLocation: {}, fromLocation: {},
toLocationCode: "", toLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
toWarehouseCode: '', toWarehouseCode: '',
customerCode: '', customerCode: '',
showCustomer: false, showCustomer: false,
customerList: [], customerList: [],
customerName: "请选择退货客户", customerName: "请选择退货客户",
customerCode: ""
}; };
}, },
onLoad(option) { onLoad(option) {
@ -132,8 +130,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

13
src/pages/deliver/record/deliverRecord.vue
View File

@ -35,7 +35,7 @@
<view class=""> <view class="">
<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode" <requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
@getLocation='scanLocationCode' :isShowEdit="true" @getLocation='scanLocationCode' :isShowEdit="true"
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -48,7 +48,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' headerType="HMQ"></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' headerType="HMQ"></win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -105,11 +105,10 @@
id: '', id: '',
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
businessType: {}, businessType: {},
customerList: [], customerList: [],
customerText: "", customerText: "",
@ -124,8 +123,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

12
src/pages/inventoryMove/coms/comMove.vue
View File

@ -24,7 +24,7 @@
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="toLocationTypeArray" :isShowEdit="toLocationCode==''"></requiredLocation> :locationAreaTypeList="toLocationTypeArray" :isShowEdit="toLocationCode==''"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -36,7 +36,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'"> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
</win-scan-pack-and-location> </win-scan-pack-and-location>
<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -120,8 +120,8 @@
title: "", title: "",
dataContent: {}, dataContent: {},
toWarehouseCode: "", toWarehouseCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
} }
}, },
@ -129,8 +129,8 @@
getBusinessType(this.businessTypeCode, res => { getBusinessType(this.businessTypeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

12
src/pages/inventoryMove/coms/comMoveRecord.vue
View File

@ -23,7 +23,7 @@
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocation' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocation'
:locationTypeList="tolocationTypeList" :isShowEdit="isShowEditLocation"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList" :isShowEdit="isShowEditLocation"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -35,7 +35,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'"> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
</win-scan-pack-and-location> </win-scan-pack-and-location>
<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation' <win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -121,8 +121,8 @@
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
title: "", title: "",
dataContent: {}, dataContent: {},
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
isShowEditLocation:false isShowEditLocation:false
} }
}, },
@ -131,8 +131,8 @@
getBusinessType(this.businessTypeCode, res => { getBusinessType(this.businessTypeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

1
src/pages/inventoryMove/job/inventoryMoveDetail.vue
View File

@ -94,7 +94,6 @@
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
toLocationInfo: {}, toLocationInfo: {},
businessTypeInfo: {}, businessTypeInfo: {},
locationTypeList: [],
managementList: [], managementList: [],
businessTypeCode: '', businessTypeCode: '',
toLocationCode: '', toLocationCode: '',

1
src/pages/issue/record/issueRecord.vue
View File

@ -129,7 +129,6 @@
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.itemCodeTypeList = res.itemCodeTypeList; this.itemCodeTypeList = res.itemCodeTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.fromInventoryStatuses = res.fromInventoryStatuses this.fromInventoryStatuses = res.fromInventoryStatuses
this.toInventoryStatuses = res.toInventoryStatuses this.toInventoryStatuses = res.toInventoryStatuses
this.goScan(true) this.goScan(true)

1
src/pages/issue/request/issueRequestCreate.vue
View File

@ -90,7 +90,6 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.itemCodeTypeList = res.itemCodeTypeList; this.itemCodeTypeList = res.itemCodeTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.useOnTheWay = res.useOnTheWay; this.useOnTheWay = res.useOnTheWay;
this.fromInventoryStatuses = res.fromInventoryStatuses this.fromInventoryStatuses = res.fromInventoryStatuses
this.toInventoryStatuses = res.toInventoryStatuses this.toInventoryStatuses = res.toInventoryStatuses

1
src/pages/issue/request/issueScanRequest.vue
View File

@ -70,7 +70,6 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.itemCodeTypeList = res.itemCodeTypeList; this.itemCodeTypeList = res.itemCodeTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.useOnTheWay = res.useOnTheWay; this.useOnTheWay = res.useOnTheWay;
this.fromInventoryStatuses = res.fromInventoryStatuses this.fromInventoryStatuses = res.fromInventoryStatuses
this.toInventoryStatuses = res.toInventoryStatuses this.toInventoryStatuses = res.toInventoryStatuses

9
src/pages/package/record/mergePackageRecord.vue
View File

@ -36,7 +36,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false"> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
</win-scan-pack-and-location> </win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -88,11 +88,9 @@
id: '', id: '',
scanCount: 0, scanCount: 0,
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
fromLocationCode: "", fromLocationCode: "",
isShowLocation: false, isShowLocation: false,
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [],
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
businessType: {}, businessType: {},
@ -107,8 +105,7 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

7
src/pages/package/record/overPackageRecord.vue
View File

@ -57,7 +57,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false"> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
</win-scan-pack-and-location> </win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromLocationAreaTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -114,12 +114,9 @@
id: '', id: '',
scanCount: 0, scanCount: 0,
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
fromLocationCode: "", fromLocationCode: "",
isShowLocation: false, isShowLocation: false,
fromlocationTypeList: [],
fromLocationAreaTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [],
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
businessType: {}, businessType: {},
@ -137,9 +134,7 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList;
this.fromLocationAreaTypeList = res.fromLocationAreaTypeList this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

9
src/pages/package/record/splitPackageRecord.vue
View File

@ -34,7 +34,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false"> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
</win-scan-pack-and-location> </win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<win-scan-pack title="拆分标签" ref="scanPopupPack" @getResult='getScanPackResult'></win-scan-pack> <win-scan-pack title="拆分标签" ref="scanPopupPack" @getResult='getScanPackResult'></win-scan-pack>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
@ -90,11 +90,9 @@
return { return {
id: '', id: '',
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [],
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
businessType: {}, businessType: {},
@ -108,8 +106,7 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

8
src/pages/pick/job/pickJobDetail.vue
View File

@ -15,7 +15,7 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false" <comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'> @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
</comProductDetailCard> </comProductDetailCard>
</view> </view>
<u-line /> <u-line />
@ -29,7 +29,7 @@
<view class=""> <view class="">
<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' @getLocation='scanLocationCode'
:locationTypeList="toLocationTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -101,7 +101,7 @@
jobContent: {}, //任务内容 jobContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
toLocationTypeList: [], toLocationAreaTypeList: [],
managementList: [], managementList: [],
jobStatus:"", jobStatus:"",
jobToLocationCode:"" jobToLocationCode:""
@ -184,7 +184,7 @@
that.subList = res.data.subList; that.subList = res.data.subList;
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');

6
src/pages/productDismantle/job/productDismantleDetail.vue
View File

@ -30,7 +30,7 @@
<view class=""> <view class="">
<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode" <requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
@getLocation='getToLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'" @getLocation='getToLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -108,7 +108,7 @@
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
toLocationInfo: {}, toLocationInfo: {},
tolocationTypeList: [], toLocationAreaTypeList: [],
}; };
}, },
onLoad(option) { onLoad(option) {
@ -184,7 +184,7 @@
that.subList = res.data.subList; that.subList = res.data.subList;
that.fromLocationCode = that.subList[0].fromLocationCode that.fromLocationCode = that.subList[0].fromLocationCode
that.toLocationCode = that.subList[0].toLocationCode that.toLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes) that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
that.getLocationInfo(that.toLocationCode); that.getLocationInfo(that.toLocationCode);
} else { } else {

14
src/pages/productDismantle/record/productDismantleRecord.vue
View File

@ -19,7 +19,7 @@
</view> </view>
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
<view class="page-footer"> <view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10"
@ -36,7 +36,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -92,16 +92,14 @@
jobContent: {}, //任务内容 jobContent: {}, //任务内容
detailList: [], //接口返回的任务subList detailList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
toLocationInfo: {}, toLocationInfo: {},
businessTypeInfo: {}, businessTypeInfo: {},
fromLocationInfo: {}, fromLocationInfo: {},
fromLocationCode: "", fromLocationCode: "",
toLocationInfo: {},
toLocationCode: "", toLocationCode: "",
isShowLocation: false, isShowLocation: false,
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
allowModifyLocation: false, allowModifyLocation: false,
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
@ -113,8 +111,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

8
src/pages/productPutaway/job/productPutawayDetail.vue
View File

@ -15,7 +15,7 @@
<view class=""> <view class="">
<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" @openDetail="openDetail" @remove="updateData" @updateData="updateData" @openDetail="openDetail"
:locationTypeList='tolocationTypeList'> :locationAreaTypeList='toLocationAreaTypeList'>
</com-detail-card> </com-detail-card>
</view> </view>
<u-line /> <u-line />
@ -28,7 +28,7 @@
<view class=""> <view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' @getLocation='scanLocationCode'
:locationTypeList="tolocationTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -107,7 +107,7 @@
managementList: [], managementList: [],
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
tolocationTypeList: [], toLocationAreaTypeList: [],
jobStatus:"", jobStatus:"",
jobToLocationCode: "", jobToLocationCode: "",
}; };
@ -183,7 +183,7 @@
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.fromLocationCode = that.subList[0].fromLocationCode that.fromLocationCode = that.subList[0].fromLocationCode
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes) that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');

9
src/pages/productPutaway/record/productPutawayRecord.vue
View File

@ -23,7 +23,7 @@
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="tolocationTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -35,7 +35,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -93,10 +93,9 @@
dataContent: {}, //任务内容 dataContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], tolocationTypeList: [],
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
@ -109,7 +108,7 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {

12
src/pages/productPutaway/request/putawayRequestCreate.vue
View File

@ -28,7 +28,7 @@
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode" <!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> --> @getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation> -->
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -41,7 +41,7 @@
</win-scan-pack-and-location> </win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getFromLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getFromLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -104,8 +104,8 @@
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
fromLocationInfo: {}, fromLocationInfo: {},
fromLocationCode: "", fromLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
businessType: {}, businessType: {},
@ -121,8 +121,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

10
src/pages/productReceipt/coms/comProductDetailCard.vue
View File

@ -22,7 +22,7 @@
@confirm="confirm"> @confirm="confirm">
</recommend-qty-edit> </recommend-qty-edit>
<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
:locationTypeList="locationTypeList"></win-scan-location> :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
<productDetailInfoPopup ref="jobDetailPopup" :dataContent="showItem"></productDetailInfoPopup> <productDetailInfoPopup ref="jobDetailPopup" :dataContent="showItem"></productDetailInfoPopup>
<comMessage ref="message"></comMessage> <comMessage ref="message"></comMessage>
</view> </view>
@ -53,15 +53,15 @@
props: { props: {
dataContent: { dataContent: {
type: Object, type: Object,
default: {} default: null
}, },
settingParam: { settingParam: {
type: Object, type: Object,
default: {} default: null
}, },
locationTypeList: { locationAreaTypeList: {
type: Array, type: Array,
default: [] default: null
}, },

8
src/pages/productReceipt/job/productReceiptDetail.vue
View File

@ -15,7 +15,7 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false" <comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'> @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
</comProductDetailCard> </comProductDetailCard>
</view> </view>
<u-line /> <u-line />
@ -29,7 +29,7 @@
<view class=""> <view class="">
<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' @getLocation='scanLocationCode'
:locationTypeList="toLocationTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -101,7 +101,7 @@
jobContent: {}, //任务内容 jobContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
toLocationTypeList: [], toLocationAreaTypeList: [],
managementList: [], managementList: [],
jobStatus:"", jobStatus:"",
jobToLocationCode:"" jobToLocationCode:""
@ -184,7 +184,7 @@
that.subList = res.data.subList; that.subList = res.data.subList;
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');

4
src/pages/productReceipt/record/productReceiptRecord.vue
View File

@ -91,8 +91,6 @@
data() { data() {
return { return {
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
toLocationTypeList: [],
toLocationInfo: {},
toLocationCode: "", toLocationCode: "",
fromLocationTypeList: [], fromLocationTypeList: [],
fromLocationCode: "", fromLocationCode: "",
@ -117,8 +115,6 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.openScanPopup(); this.openScanPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

8
src/pages/productionReceipt/job/productionReceiptDetail.vue
View File

@ -15,7 +15,7 @@
<view class=""> <view class="">
<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" @openDetail="openDetail" @remove="updateData" @updateData="updateData" @openDetail="openDetail"
:locationTypeList='tolocationTypeList'> :locationAreaTypeList='toLocationAreaTypeList'>
</com-detail-card> </com-detail-card>
<u-line /> <u-line />
</view> </view>
@ -30,7 +30,7 @@
<view class=""> <view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' @getLocation='scanLocationCode'
:locationTypeList="tolocationTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -105,7 +105,7 @@
managementList: [], managementList: [],
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
tolocationTypeList: [], toLocationAreaTypeList: [],
jobStatus:"", jobStatus:"",
jobToLocationCode: "", jobToLocationCode: "",
}; };
@ -181,7 +181,7 @@
that.subList = res.data.subList; that.subList = res.data.subList;
that.fromLocationCode = that.subList[0].fromLocationCode that.fromLocationCode = that.subList[0].fromLocationCode
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes) that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
// updateTitle(this.jobContent.number); // updateTitle(this.jobContent.number);
} else { } else {

13
src/pages/productionReceipt/record/productionReceiptRecord.vue
View File

@ -19,7 +19,7 @@
</view> </view>
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
<view class="page-footer"> <view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10"
@ -36,7 +36,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -88,13 +88,12 @@
scanCount: 0, scanCount: 0,
jobContent: {}, //任务内容 jobContent: {}, //任务内容
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
businessTypeInfo: {}, businessTypeInfo: {},
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
isShowLocation: false, isShowLocation: false,
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
allowModifyLocation: false, allowModifyLocation: false,
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
@ -107,8 +106,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

5
src/pages/productionReturn/coms/comReturn.vue
View File

@ -115,7 +115,7 @@
fromLocationCode: '', fromLocationCode: '',
fromLocationTypeList: [], fromLocationTypeList: [],
toLocationCode: '', toLocationCode: '',
tolocationTypeList: [], toLocationAreaTypeList: [],
businessType: {}, businessType: {},
inventoryStatus: '', inventoryStatus: '',
managementList: [], managementList: [],
@ -138,8 +138,7 @@
getBusinessType(this.businessTypeCode, res => { getBusinessType(this.businessTypeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.openScanPopup(); this.openScanPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

10
src/pages/productionReturn/coms/comReturnDetailCard.vue
View File

@ -22,7 +22,7 @@
@confirm="confirm"> @confirm="confirm">
</recommend-qty-edit> </recommend-qty-edit>
<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
:locationTypeList="locationTypeList"></win-scan-location> :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
<returnDetailInfoPopup ref="jobDetailPopup" :dataContent="showItem"></returnDetailInfoPopup> <returnDetailInfoPopup ref="jobDetailPopup" :dataContent="showItem"></returnDetailInfoPopup>
<comMessage ref="message"></comMessage> <comMessage ref="message"></comMessage>
</view> </view>
@ -53,15 +53,15 @@
props: { props: {
dataContent: { dataContent: {
type: Object, type: Object,
default: {} default: null
}, },
settingParam: { settingParam: {
type: Object, type: Object,
default: {} default: null
}, },
locationTypeList: { locationAreaTypeList: {
type: Array, type: Array,
default: [] default: null
}, },

9
src/pages/productionReturn/job/returnDetail.vue
View File

@ -18,7 +18,7 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comReturnDetailCard :dataContent="item" :index="index" :settingParam="jobContent" <comReturnDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'> @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
</comReturnDetailCard> </comReturnDetailCard>
</view> </view>
<u-line /> <u-line />
@ -32,7 +32,7 @@
<view class=""> <view class="">
<locationCompare title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' @getLocation='scanLocationCode'
:locationTypeList="toLocationTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -104,12 +104,10 @@
jobContent: {}, jobContent: {},
toLocationCode: '', toLocationCode: '',
scanCount: 0, scanCount: 0,
jobContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
fromLocationCode: '', fromLocationCode: '',
toLocationCode: '', toLocationAreaTypeList: [],
toLocationTypeList: [],
toLocationInfo: {}, toLocationInfo: {},
businessTypeInfo: {}, businessTypeInfo: {},
titleInfo: "", titleInfo: "",
@ -194,7 +192,6 @@
that.fromLocationCode = that.subList[0].fromLocationCode that.fromLocationCode = that.subList[0].fromLocationCode
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
that.titleInfo = that.subList[0]; that.titleInfo = that.subList[0];
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');

3
src/pages/productionReturn/record/returnToHold.vue
View File

@ -115,7 +115,6 @@
fromLocationCode: '', fromLocationCode: '',
fromLocationTypeList: [], fromLocationTypeList: [],
toLocationCode: '', toLocationCode: '',
tolocationTypeList: [],
businessType: {}, businessType: {},
inventoryStatus: '', inventoryStatus: '',
managementList: [], managementList: [],
@ -139,8 +138,6 @@
getBusinessType(this.businessTypeCode, res => { getBusinessType(this.businessTypeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.openScanPopup(true); this.openScanPopup(true);
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

3
src/pages/productionReturn/record/returnToStore.vue
View File

@ -106,7 +106,6 @@
fromLocationCode: '', fromLocationCode: '',
fromLocationTypeList: [], fromLocationTypeList: [],
toLocationCode: '', toLocationCode: '',
tolocationTypeList: [],
businessType: {}, businessType: {},
inventoryStatus: '', inventoryStatus: '',
managementList: [], managementList: [],
@ -133,8 +132,6 @@
getBusinessType(this.businessTypeCode, res => { getBusinessType(this.businessTypeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.openScanPopup(true); this.openScanPopup(true);
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

4
src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
View File

@ -13,7 +13,7 @@
<recommend-qty-edit ref=" receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm"> <recommend-qty-edit ref=" receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
</recommend-qty-edit> </recommend-qty-edit>
<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
:locationTypeList="locationTypeList"></win-scan-location> :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
<receipt-detail-info-popup ref="jobDetailPopup" :dataContent="showItem"></receipt-detail-info-popup> <receipt-detail-info-popup ref="jobDetailPopup" :dataContent="showItem"></receipt-detail-info-popup>
<comMessage ref="message"></comMessage> <comMessage ref="message"></comMessage>
</view> </view>
@ -56,7 +56,7 @@
type: Object, type: Object,
default: null default: null
}, },
locationTypeList: { locationAreaTypeList: {
type: Object, type: Object,
default: null default: null
}, },

11
src/pages/purchaseReceipt/job/receiptDetail.vue
View File

@ -24,7 +24,7 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'> @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
</com-receipt-detail-card> </com-receipt-detail-card>
</view> </view>
</view> </view>
@ -37,7 +37,7 @@
<view class=""> <view class="">
<locationCompare ref="locationCompare" title="收货库位" :recommendLocationCode="jobToLocationCode" <locationCompare ref="locationCompare" title="收货库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode' :locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationTypeList="toLocationTypeList"> :locationAreaTypeList="toLocationAreaTypeList">
</locationCompare> </locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
@ -112,7 +112,7 @@
jobContent: {}, //任务内容 jobContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
toLocationTypeList: [], toLocationAreaTypeList: [],
toLocationCode: '', toLocationCode: '',
jobToLocationCode: "", jobToLocationCode: "",
toLocationInfo: {}, toLocationInfo: {},
@ -198,13 +198,12 @@
} else { } else {
if (res.data.subList.length > 0) { if (res.data.subList.length > 0) {
that.jobContent = res.data; that.jobContent = res.data;
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes); that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes);
// that.jobContent.toLocationTypeList = that.toLocationTypeList; // that.jobContent.toLocationAreaTypeList = that.toLocationAreaTypeList;
that.subList = res.data.subList; that.subList = res.data.subList;
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.detailSource = getTreeDataSource(that.subList) that.detailSource = getTreeDataSource(that.subList)
console.log(JSON.stringify(this.detailSource))
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

8
src/pages/purchaseReturn/record/returnRecord.vue
View File

@ -41,7 +41,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'>
</win-scan-pack-and-location> </win-scan-pack-and-location>
<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation' <win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -92,8 +92,7 @@
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
fromLocationCode: "", fromLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [],
businessType: {}, //业务类型 businessType: {}, //业务类型
supplierCode: '', //供应商代码 supplierCode: '', //供应商代码
poNumber: '', poNumber: '',
@ -113,8 +112,7 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

8
src/pages/purchaseReturn/request/returnRequestCreate.vue
View File

@ -33,7 +33,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'>
</win-scan-pack-and-location> </win-scan-pack-and-location>
<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation' <win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -84,8 +84,7 @@
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
fromLocationCode: "", fromLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [],
businessType: {}, //业务类型 businessType: {}, //业务类型
poNumber: '', poNumber: '',
dataContent : {} dataContent : {}
@ -97,8 +96,7 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

10
src/pages/putaway/job/putawayDetail.vue
View File

@ -15,7 +15,7 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent" <comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'> @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
</comJobDetailCard> </comJobDetailCard>
</view> </view>
</view> </view>
@ -28,7 +28,7 @@
<view class=""> <view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' @getLocation='scanLocationCode'
:locationTypeList="tolocationTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -100,9 +100,9 @@
managementList: [], managementList: [],
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
tolocationTypeList: [], toLocationAreaTypeList: [],
jobStatus:"", jobStatus:"",
jobToLocationCode:"" jobToLocationCode:"",
}; };
}, },
onLoad(option) { onLoad(option) {
@ -182,7 +182,7 @@
that.fromLocationCode = that.subList[0].fromLocationCode that.fromLocationCode = that.subList[0].fromLocationCode
that.jobToLocationCode = that.subList[0].toLocationCode; that.jobToLocationCode = that.subList[0].toLocationCode;
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');

12
src/pages/putaway/record/putawayRecord.vue
View File

@ -30,7 +30,7 @@
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode" <!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> --> @getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation> -->
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -43,7 +43,7 @@
</win-scan-pack-and-location> </win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -112,8 +112,8 @@
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
fromLocationInfo: {}, fromLocationInfo: {},
fromLocationCode: "", fromLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
businessType: {}, businessType: {},
@ -128,8 +128,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

12
src/pages/putaway/request/putawayRequestCreate.vue
View File

@ -32,7 +32,7 @@
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode" <!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> --> @getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation> -->
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -45,7 +45,7 @@
</win-scan-pack-and-location> </win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getFromLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getFromLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -111,8 +111,8 @@
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
fromLocationInfo: {}, fromLocationInfo: {},
fromLocationCode: "", fromLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
businessType: {}, businessType: {},
@ -128,8 +128,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

4
src/pages/repleinsh/coms/comRepleinshRequestPopup.vue
View File

@ -68,7 +68,7 @@
</win-scan-item> </win-scan-item>
<win-scan-location ref="scanLocationPopup" title='目标库位' @getLocation='getLocationCode' <win-scan-location ref="scanLocationPopup" title='目标库位' @getLocation='getLocationCode'
:locationTypeList="toLocationTypeList"> :locationAreaTypeList="toLocationAreaTypeList">
</win-scan-location> </win-scan-location>
<comMessage ref="comMessage"> <comMessage ref="comMessage">
@ -129,7 +129,7 @@
type: String, type: String,
default: '补料需求信息' default: '补料需求信息'
}, },
toLocationTypeList: { toLocationAreaTypeList: {
type: Array, type: Array,
default: [] default: []
}, },

6
src/pages/repleinsh/job/repleinshDetail.vue
View File

@ -26,7 +26,7 @@
<view class=""> <view class="">
<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode" <requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'" @getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button>
@ -97,7 +97,7 @@
detailOptions: [], detailOptions: [],
scanOptions: [], scanOptions: [],
toLocationCode: '', toLocationCode: '',
tolocationTypeList: [], toLocationAreaTypeList: [],
jobStatus:"" jobStatus:""
}; };
}, },
@ -183,7 +183,7 @@
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.subList = res.data.subList; that.subList = res.data.subList;
that.toLocationCode = that.subList[0].toLocationCode that.toLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.detailSource, that.subList) that.detailSource = getDataSource(that.detailSource, that.subList)
that.resizeCollapse(); that.resizeCollapse();
} else { } else {

11
src/pages/repleinsh/record/repleinshRecord.vue
View File

@ -32,7 +32,7 @@
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
</view> </view>
<com-repleinsh-request-popup ref="comRepleinshRequestPopup" :toLocationTypeList="tolocationTypeList" <com-repleinsh-request-popup ref="comRepleinshRequestPopup" :toLocationAreaTypeList="toLocationAreaTypeList"
@confirm='requestConfirm' @confirm='requestConfirm'
:itemCodeTypeList="itemCodeTypeList"> :itemCodeTypeList="itemCodeTypeList">
</com-repleinsh-request-popup> </com-repleinsh-request-popup>
@ -87,7 +87,6 @@
import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue' import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue' import comBlankView from '@/mycomponents/common/comBlankView.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
import comRepleinshRequestPopup from '@/pages/repleinsh/coms/comRepleinshRequestPopup.vue' import comRepleinshRequestPopup from '@/pages/repleinsh/coms/comRepleinshRequestPopup.vue'
@ -99,7 +98,6 @@
winScanButton, winScanButton,
winScanPack, winScanPack,
comBlankView, comBlankView,
winScanLocation,
winScanPackAndLocation, winScanPackAndLocation,
recordComDetailCard, recordComDetailCard,
comRepleinshRequestPopup, comRepleinshRequestPopup,
@ -112,12 +110,10 @@
receiptJob: {}, receiptJob: {},
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
businessTypeInfo: {}, businessTypeInfo: {},
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
fromlocationTypeList: [], toLocationAreaTypeList: [],
tolocationTypeList: [],
allowModifyLocation: false, allowModifyLocation: false,
businessType: {}, businessType: {},
requestList: [], requestList: [],
@ -132,8 +128,7 @@
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.itemCodeTypeList = res.itemCodeTypeList; this.itemCodeTypeList = res.itemCodeTypeList;
this.fromlocationTypeList = res.fromlocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.showRequestPopup(); this.showRequestPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

6
src/pages/repleinsh/request/repleinshRequest.vue
View File

@ -23,10 +23,6 @@
import requestInfoPopup from '@/pages/repleinsh/coms/requestInfoPopup.vue' import requestInfoPopup from '@/pages/repleinsh/coms/requestInfoPopup.vue'
import requestButton from '@/mycomponents/button/requestButton.vue' import requestButton from '@/mycomponents/button/requestButton.vue'
import {
getBusinessType,
} from '@/common/record.js';
import { import {
goHome, goHome,
updateTitle updateTitle
@ -55,8 +51,6 @@
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
businessType: "", businessType: "",
fromlocationTypeList: [],
tolocationTypeList: [],
toLocationCode: '', toLocationCode: '',
status: [], status: [],
creationTimeStart: "", creationTimeStart: "",

11
src/pages/scrap/record/scrapRecord.vue
View File

@ -44,7 +44,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -94,10 +94,9 @@
dataContent: {}, //任务内容 dataContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
fromLocationCode: "", fromLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
businessType: {}, businessType: {},
@ -112,8 +111,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

11
src/pages/scrap/request/scrapRequestCreate.vue
View File

@ -44,7 +44,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -101,12 +101,11 @@
dataContent: {}, //任务内容 dataContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
fromLocationInfo: {}, fromLocationInfo: {},
fromLocationCode: "", fromLocationCode: "",
isShowLocation: false, isShowLocation: false,
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
allowModifyLocation: false, allowModifyLocation: false,
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
@ -123,8 +122,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

1
src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
View File

@ -79,7 +79,6 @@
dataContent: {}, //任务内容 dataContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
toLocationCode: '', toLocationCode: '',
toLocationInfo: {}, toLocationInfo: {},
businessTypeInfo: {}, businessTypeInfo: {},

12
src/pages/transfer/coms/comReceiptDetailCard.vue
View File

@ -22,7 +22,7 @@
@confirm="confirm"> @confirm="confirm">
</recommend-qty-edit> </recommend-qty-edit>
<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
:locationTypeList="locationTypeList"></win-scan-location> :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> <detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="message"></comMessage> <comMessage ref="message"></comMessage>
</view> </view>
@ -34,7 +34,6 @@
import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue' import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue' import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue' import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import { import {
getDetailOption, getDetailOption,
@ -47,24 +46,23 @@
recommend, recommend,
recommendQtyEdit, recommendQtyEdit,
detailInfoPopup, detailInfoPopup,
winScanLocation
}, },
props: { props: {
dataContent: { dataContent: {
type: Object, type: Object,
default: {} default: null
}, },
settingParam: { settingParam: {
type: Object, type: Object,
default: {} default:null
}, },
isShowLocation: { isShowLocation: {
type: Boolean, type: Boolean,
default: false default: false
}, },
locationTypeList: { locationAreaTypeList: {
type: Object, type: Object,
default: {} default: null
}, },
}, },
watch: { watch: {

13
src/pages/transfer/coms/comTransferRecord.vue
View File

@ -22,7 +22,7 @@
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -35,7 +35,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -96,11 +96,10 @@
id: '', id: '',
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
businessType: {}, businessType: {},
@ -121,8 +120,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

8
src/pages/transfer/job/issueDetail.vue
View File

@ -14,7 +14,7 @@
<view class=""> <view class="">
<com-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false" <com-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@remove="updateData" @updateData="updateData" @openDetail="openDetail" @remove="updateData" @updateData="updateData" @openDetail="openDetail"
:locationTypeList='tolocationTypeList'> :locationAreaTypeList='toLocationAreaTypeList'>
</com-detail-card> </com-detail-card>
</view> </view>
</view> </view>
@ -28,7 +28,7 @@
<view class=""> <view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' @getLocation='scanLocationCode'
:locationTypeList="tolocationTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -97,7 +97,7 @@
toLocationCode: "", toLocationCode: "",
businessTypeInfo: {}, businessTypeInfo: {},
managementList: [], managementList: [],
tolocationTypeList:[], toLocationAreaTypeList:[],
jobStatus:"", jobStatus:"",
jobToLocationCode:"" jobToLocationCode:""
}; };
@ -185,7 +185,7 @@
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
that.fromLocationCode = that.subList[0].fromLocationCode that.fromLocationCode = that.subList[0].fromLocationCode
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

8
src/pages/transfer/job/receiptDetail.vue
View File

@ -18,7 +18,7 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'> @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
</com-receipt-detail-card> </com-receipt-detail-card>
</view> </view>
</view> </view>
@ -31,7 +31,7 @@
<view class=""> <view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' @getLocation='scanLocationCode'
:locationTypeList="toLocationTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -106,7 +106,7 @@
toLocationCode: "", toLocationCode: "",
businessTypeInfo: {}, businessTypeInfo: {},
managementList: [], managementList: [],
toLocationTypeList: [], toLocationAreaTypeList: [],
jobStatus:"", jobStatus:"",
jobToLocationCode:"" jobToLocationCode:""
}; };
@ -195,7 +195,7 @@
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
that.fromLocationCode = that.subList[0].fromLocationCode that.fromLocationCode = that.subList[0].fromLocationCode
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

1
src/pages/transfer/job/transferDetail.vue
View File

@ -91,7 +91,6 @@
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
toLocationInfo: {}, toLocationInfo: {},
businessTypeInfo: {}, businessTypeInfo: {},
locationTypeList: [],
managementList: [], managementList: [],
}; };

13
src/pages/transfer/record/deliverRecord.vue
View File

@ -22,7 +22,7 @@
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -35,7 +35,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view> </view>
</template> </template>
@ -89,11 +89,10 @@
id: '', id: '',
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
fromlocationTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], toLocationAreaTypeList: [],
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
businessType: {}, businessType: {},
@ -108,8 +107,8 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

9
src/pages/transfer/record/receiptRecord.vue
View File

@ -23,7 +23,7 @@
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -83,10 +83,8 @@
id: '', id: '',
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
toLocationCode: "", toLocationCode: "",
fromlocationTypeList: [], toLocationAreaTypeList: [],
tolocationTypeList: [],
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
businessType: {}, businessType: {},
@ -102,8 +100,7 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.openScanPopup(); this.openScanPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

6
src/pages/unPlanned/coms/comReceiptDetailCard.vue
View File

@ -22,7 +22,7 @@
<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm"> <recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
</recommend-qty-edit> </recommend-qty-edit>
<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
:locationTypeList="locationTypeList"></win-scan-location> :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> <detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="message"></comMessage> <comMessage ref="message"></comMessage>
</view> </view>
@ -62,9 +62,9 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
locationTypeList: { locationAreaTypeList: {
type: Object, type: Object,
default: {} default: null
}, },
}, },
watch: { watch: {

8
src/pages/unPlanned/job/receiptJobDetail.vue
View File

@ -15,7 +15,7 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'> @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
</com-receipt-detail-card> </com-receipt-detail-card>
</view> </view>
<u-line /> <u-line />
@ -29,7 +29,7 @@
<view class=""> <view class="">
<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' @getLocation='scanLocationCode'
:locationTypeList="toLocationTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -90,7 +90,7 @@
jobContent: {}, //任务内容 jobContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
toLocationTypeList: [], toLocationAreaTypeList: [],
toLocationCode: '', toLocationCode: '',
toLocationInfo: {}, toLocationInfo: {},
businessTypeInfo: {}, businessTypeInfo: {},
@ -166,7 +166,7 @@
if (res.data.subList.length > 0) { if (res.data.subList.length > 0) {
that.jobContent = res.data; that.jobContent = res.data;
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes); that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes);
that.subList = res.data.subList; that.subList = res.data.subList;
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)

6
src/pages/unPlanned/record/issueRecord.vue
View File

@ -36,7 +36,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'"> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
</win-scan-pack-and-location> </win-scan-pack-and-location>
<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromLocationTypeArray"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -86,7 +86,7 @@
data() { data() {
return { return {
fromLocationCode: "", fromLocationCode: "",
fromLocationTypeArray: [], fromLocationAreaTypeList: [],
fromInventoryStatus: [], fromInventoryStatus: [],
toInventoryStatus: [], toInventoryStatus: [],
businessType: {}, //业务类型 businessType: {}, //业务类型
@ -104,7 +104,7 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromLocationTypeArray = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

10
src/pages/unPlanned/record/receiptRecord.vue
View File

@ -28,7 +28,7 @@
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -48,7 +48,6 @@
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comReceiptRecord from '@/pages/unPlanned/coms/comReceiptRecord.vue' import comReceiptRecord from '@/pages/unPlanned/coms/comReceiptRecord.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue' import comBlankView from '@/mycomponents/common/comBlankView.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import winScanPack from "@/mycomponents/scan/winScanPack.vue" import winScanPack from "@/mycomponents/scan/winScanPack.vue"
import { import {
@ -90,7 +89,6 @@
requiredLocation, requiredLocation,
comReceiptRecord, comReceiptRecord,
comBlankView, comBlankView,
winScanLocation,
winScanPack, winScanPack,
}, },
props: { props: {
@ -107,7 +105,8 @@
reasonCode: "", reasonCode: "",
reasonList: [], reasonList: [],
dataContent: {}, dataContent: {},
managementList: [] managementList: [],
toLocationAreaTypeList:[]
} }
}, },
@ -116,8 +115,7 @@
getBusinessType(this.businessTypeCode, res => { getBusinessType(this.businessTypeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.openScanPopup(); this.openScanPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

6
src/pages/unPlanned/request/issueRequestCreate.vue
View File

@ -42,7 +42,7 @@
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'"> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
</win-scan-pack-and-location> </win-scan-pack-and-location>
<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromLocationTypeArray"></win-scan-location> :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
@ -96,7 +96,7 @@
return { return {
fromLocationCode: "", fromLocationCode: "",
fromLocationInfo: {}, fromLocationInfo: {},
fromLocationTypeArray: [], fromLocationAreaTypeList: [],
fromInventoryStatus: [], fromInventoryStatus: [],
toInventoryStatus: [], toInventoryStatus: [],
businessType: {}, //业务类型 businessType: {}, //业务类型
@ -118,7 +118,7 @@
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromLocationTypeArray = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)

Write Preview
Loading…
Cancel
Save