diff --git a/api/test_2.js b/api/test_2.js deleted file mode 100644 index 8b712bf9..00000000 --- a/api/test_2.js +++ /dev/null @@ -1,22 +0,0 @@ -// // import request from '@/common/request.js' -// // import promise from '@/common/promise.js' -// import request from '@/common/request_test.js' -// // let devUrl = this.$dev_url; - -// let devUrl = "http://dev.ccwin-in.com:59096" -// export function getlogin(params) { -// return request({ -// url: devUrl + "/api/pda/account/login", -// method: "post", -// data: params, -// }); -// } - -// //修改用户密码 -// export function changePassword(params) { // -// return request({ -// url:devUrl + "/api/pda/account/change-password",// -// data: params, -// method: "post" -// }) -// } diff --git a/common/record.js b/common/record.js index 5e8fe283..353842eb 100644 --- a/common/record.js +++ b/common/record.js @@ -49,6 +49,8 @@ export function getBusinessType(typeCode, callback) { businessType: '', fromlocationTypeList: '', tolocationTypeList: '', + fromInventoryStatuses:'', + toInventoryStatuses:'', message: '' }; getBusinesstypeByCode(typeCode).then(res => { @@ -56,6 +58,8 @@ export function getBusinessType(typeCode, callback) { result.businessType = res.data.list[0]; result.fromlocationTypeList = getDirectoryItemArray(res.data.list[0].outLocationTypes) result.tolocationTypeList = getDirectoryItemArray(res.data.list[0].inLocationTypes) + result.fromInventoryStatuses = res.data.list[0].outInventoryStatuses; + result.toInventoryStatuses = res.data.list[0].inInventoryStatuses; callback(result) } else { result.success = false; diff --git a/components/api-set-tabbar.nvue b/components/api-set-tabbar.nvue deleted file mode 100644 index c9c91872..00000000 --- a/components/api-set-tabbar.nvue +++ /dev/null @@ -1,156 +0,0 @@ - - - - - diff --git a/components/invite.vue b/components/invite.vue deleted file mode 100644 index 93b1236d..00000000 --- a/components/invite.vue +++ /dev/null @@ -1,110 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/product.vue b/components/product.vue deleted file mode 100644 index bfa97265..00000000 --- a/components/product.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - diff --git a/mycomponents/detail/comRequestDetailCard.vue b/mycomponents/detail/comRequestDetailCard.vue index 2e1dc2c3..8cb916fa 100644 --- a/mycomponents/detail/comRequestDetailCard.vue +++ b/mycomponents/detail/comRequestDetailCard.vue @@ -1,19 +1,28 @@ @@ -23,10 +32,6 @@ import recommend from '@/mycomponents/recommend/recommend.vue' import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue' import comMessage from '@/mycomponents/common/comMessage.vue' - import itemQty from '@/mycomponents/item/itemQty.vue' - import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue' - import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue' - import { getDetailOption, getDetailEditRemoveOption, @@ -40,9 +45,6 @@ recommend, balanceQtyEdit, comMessage, - itemQty, - comIssueRequestInfo, - requestDetailInfoPopup }, props: { dataContent: { @@ -67,9 +69,7 @@ }, }, watch: { - dataContent(newVal) { - this.requestItem = newVal.subList[0]; - }, + }, data() { @@ -81,7 +81,6 @@ } }, - requestItem: {}, detailOptions: [], scanOptions: [] } @@ -117,10 +116,9 @@ }, detail(item) { - this.$refs.jobDetailPopup.openPopup(item) - // this.$emit('openDetail', item); - // // this.showItem = item; - // // this.$refs.jobDetailPopup.openPopup(item) + this.$emit('openDetail', item); + // this.showItem = item; + // this.$refs.jobDetailPopup.openPopup(item) }, remove(item) { this.$refs.message.showQuestionMessage("确定移除扫描信息?", diff --git a/mycomponents/job/jobFilter.vue b/mycomponents/job/jobFilter.vue index 695ef2de..a209c2af 100644 --- a/mycomponents/job/jobFilter.vue +++ b/mycomponents/job/jobFilter.vue @@ -8,14 +8,14 @@ 只看当天 - + 只看待处理 - + @@ -69,15 +69,27 @@ data() { return { dataContent: {}, - checkedToday:'', - checkedWaitTask:'', + checkedTodayModel:false, + checkedWaitModel:false, } }, watch: { + checkedToday: { + handler(newName, oldName) { + this.checkedTodayModel = this.checkedToday + }, + immediate: true, + deep: true + }, + checkedWaitTask: { + handler(newName, oldName) { + this.checkedWaitModel = this.checkedWaitTask + }, + immediate: true, + deep: true + } }, mounted() { - this.checkedToday = this.checkedToday - this.checkedWaitTask = this.checkedWaitTask }, methods: { // 点击遮罩 diff --git a/mycomponents/request/requestFilter.vue b/mycomponents/request/requestFilter.vue index 3d1777c5..9e2c35ce 100644 --- a/mycomponents/request/requestFilter.vue +++ b/mycomponents/request/requestFilter.vue @@ -3,11 +3,18 @@ + 只看处理中 - + @@ -35,6 +42,8 @@ data() { return { dataContent: {}, + checkedTodayModel:false, + checkedWaitModel:false } }, props: { @@ -56,6 +65,20 @@ } }, watch: { + checkedToday: { + handler(newName, oldName) { + this.checkedTodayModel = this.checkedToday + }, + immediate: true, + deep: true + }, + checkedWaitTask: { + handler(newName, oldName) { + this.checkedWaitModel = this.checkedWaitTask + }, + immediate: true, + deep: true + } }, mounted() { diff --git a/pages.json b/pages.json index 3f177557..8f8e9dce 100644 --- a/pages.json +++ b/pages.json @@ -1662,19 +1662,19 @@ "backgroundColor": "#ffffff", "list": [{ "pagePath": "pages/index/index", - "iconPath": "static/bar/sy.png", - "selectedIconPath": "static/bar/sya.png", + "iconPath": "static/bar/sy.svg", + "selectedIconPath": "static/bar/sya.svg", "text": "首页" }, { "pagePath": "pages/message/index", - "iconPath": "static/bar/xx.png", - "selectedIconPath": "static/bar/xxa.png", + "iconPath": "static/bar/xx.svg", + "selectedIconPath": "static/bar/xxa.svg", "text": "消息" }, { "pagePath": "pages/setter/index", - "iconPath": "static/bar/sz.png", - "selectedIconPath": "static/bar/sza.png", + "iconPath": "static/bar/sz.svg", + "selectedIconPath": "static/bar/sza.svg", "text": "设置" } ] diff --git a/pages/API/action-sheet/action-sheet.vue b/pages/API/action-sheet/action-sheet.vue deleted file mode 100644 index 90c035d8..00000000 --- a/pages/API/action-sheet/action-sheet.vue +++ /dev/null @@ -1,60 +0,0 @@ - - diff --git a/pages/API/add-phone-contact/add-phone-contact.vue b/pages/API/add-phone-contact/add-phone-contact.vue deleted file mode 100644 index f4c39a37..00000000 --- a/pages/API/add-phone-contact/add-phone-contact.vue +++ /dev/null @@ -1,102 +0,0 @@ - - - - diff --git a/pages/API/animation/animation.vue b/pages/API/animation/animation.vue deleted file mode 100644 index 379858d2..00000000 --- a/pages/API/animation/animation.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - - diff --git a/pages/API/background-audio/background-audio.vue b/pages/API/background-audio/background-audio.vue deleted file mode 100644 index 5a3315e2..00000000 --- a/pages/API/background-audio/background-audio.vue +++ /dev/null @@ -1,163 +0,0 @@ - - - - diff --git a/pages/API/bluetooth/bluetooth.vue b/pages/API/bluetooth/bluetooth.vue deleted file mode 100644 index d9bc4dad..00000000 --- a/pages/API/bluetooth/bluetooth.vue +++ /dev/null @@ -1,723 +0,0 @@ - - - - diff --git a/pages/API/brightness/brightness.vue b/pages/API/brightness/brightness.vue deleted file mode 100644 index a0c9e125..00000000 --- a/pages/API/brightness/brightness.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - diff --git a/pages/API/canvas/canvas.vue b/pages/API/canvas/canvas.vue deleted file mode 100644 index f0f34a12..00000000 --- a/pages/API/canvas/canvas.vue +++ /dev/null @@ -1,366 +0,0 @@ - - - - diff --git a/pages/API/choose-location/choose-location.vue b/pages/API/choose-location/choose-location.vue deleted file mode 100644 index 3b30801c..00000000 --- a/pages/API/choose-location/choose-location.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - diff --git a/pages/API/clipboard/clipboard.vue b/pages/API/clipboard/clipboard.vue deleted file mode 100644 index 648fc4df..00000000 --- a/pages/API/clipboard/clipboard.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - diff --git a/pages/API/download-file/download-file.vue b/pages/API/download-file/download-file.vue deleted file mode 100644 index 2e1ddcd7..00000000 --- a/pages/API/download-file/download-file.vue +++ /dev/null @@ -1,63 +0,0 @@ - - - - diff --git a/pages/API/file/file.vue b/pages/API/file/file.vue deleted file mode 100644 index 43d6cca9..00000000 --- a/pages/API/file/file.vue +++ /dev/null @@ -1,129 +0,0 @@ - - - - diff --git a/pages/API/full-screen-video-ad/full-screen-video-ad.vue b/pages/API/full-screen-video-ad/full-screen-video-ad.vue deleted file mode 100644 index 5224ed82..00000000 --- a/pages/API/full-screen-video-ad/full-screen-video-ad.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - diff --git a/pages/API/get-location/get-location.vue b/pages/API/get-location/get-location.vue deleted file mode 100644 index 26dfd16c..00000000 --- a/pages/API/get-location/get-location.vue +++ /dev/null @@ -1,186 +0,0 @@ - - - - diff --git a/pages/API/get-network-type/get-network-type.vue b/pages/API/get-network-type/get-network-type.vue deleted file mode 100644 index 740d99ea..00000000 --- a/pages/API/get-network-type/get-network-type.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - diff --git a/pages/API/get-node-info/get-node-info.vue b/pages/API/get-node-info/get-node-info.vue deleted file mode 100644 index 870ab167..00000000 --- a/pages/API/get-node-info/get-node-info.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - - - diff --git a/pages/API/get-system-info/get-system-info.vue b/pages/API/get-system-info/get-system-info.vue deleted file mode 100644 index feac3b54..00000000 --- a/pages/API/get-system-info/get-system-info.vue +++ /dev/null @@ -1,148 +0,0 @@ - - - - diff --git a/pages/API/get-user-info/get-user-info.vue b/pages/API/get-user-info/get-user-info.vue deleted file mode 100644 index f3ac9284..00000000 --- a/pages/API/get-user-info/get-user-info.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - - diff --git a/pages/API/ibeacon/ibeacon.vue b/pages/API/ibeacon/ibeacon.vue deleted file mode 100644 index 0b19e4fd..00000000 --- a/pages/API/ibeacon/ibeacon.vue +++ /dev/null @@ -1,300 +0,0 @@ - - - - diff --git a/pages/API/image/image.vue b/pages/API/image/image.vue deleted file mode 100644 index 24279391..00000000 --- a/pages/API/image/image.vue +++ /dev/null @@ -1,239 +0,0 @@ - - - - diff --git a/pages/API/inner-audio/inner-audio.vue b/pages/API/inner-audio/inner-audio.vue deleted file mode 100644 index ba6a2c26..00000000 --- a/pages/API/inner-audio/inner-audio.vue +++ /dev/null @@ -1,124 +0,0 @@ - - - diff --git a/pages/API/intersection-observer/intersection-observer.vue b/pages/API/intersection-observer/intersection-observer.vue deleted file mode 100644 index 80e5d9b6..00000000 --- a/pages/API/intersection-observer/intersection-observer.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - diff --git a/pages/API/login/login.vue b/pages/API/login/login.vue deleted file mode 100644 index 9ab812f6..00000000 --- a/pages/API/login/login.vue +++ /dev/null @@ -1,322 +0,0 @@ - - - - diff --git a/pages/API/make-phone-call/make-phone-call.vue b/pages/API/make-phone-call/make-phone-call.vue deleted file mode 100644 index 0e3cdee0..00000000 --- a/pages/API/make-phone-call/make-phone-call.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - diff --git a/pages/API/map-search/map-search.nvue b/pages/API/map-search/map-search.nvue deleted file mode 100644 index 9dc8ef61..00000000 --- a/pages/API/map-search/map-search.nvue +++ /dev/null @@ -1,102 +0,0 @@ - - - - - diff --git a/pages/API/map/map.nvue b/pages/API/map/map.nvue deleted file mode 100644 index e9d0d4cd..00000000 --- a/pages/API/map/map.nvue +++ /dev/null @@ -1,447 +0,0 @@ - - - - - diff --git a/pages/API/modal/modal.vue b/pages/API/modal/modal.vue deleted file mode 100644 index 65dff736..00000000 --- a/pages/API/modal/modal.vue +++ /dev/null @@ -1,40 +0,0 @@ - - \ No newline at end of file diff --git a/pages/API/navigator/navigator.vue b/pages/API/navigator/navigator.vue deleted file mode 100644 index b58504f0..00000000 --- a/pages/API/navigator/navigator.vue +++ /dev/null @@ -1,105 +0,0 @@ - - diff --git a/pages/API/navigator/new-page/new-nvue-page-1.nvue b/pages/API/navigator/new-page/new-nvue-page-1.nvue deleted file mode 100644 index 5c25cea9..00000000 --- a/pages/API/navigator/new-page/new-nvue-page-1.nvue +++ /dev/null @@ -1,83 +0,0 @@ - - - diff --git a/pages/API/navigator/new-page/new-nvue-page-2.nvue b/pages/API/navigator/new-page/new-nvue-page-2.nvue deleted file mode 100644 index a5d07800..00000000 --- a/pages/API/navigator/new-page/new-nvue-page-2.nvue +++ /dev/null @@ -1,69 +0,0 @@ - - - diff --git a/pages/API/navigator/new-page/new-vue-page-1.vue b/pages/API/navigator/new-page/new-vue-page-1.vue deleted file mode 100644 index 0b6c608a..00000000 --- a/pages/API/navigator/new-page/new-vue-page-1.vue +++ /dev/null @@ -1,108 +0,0 @@ - - - diff --git a/pages/API/navigator/new-page/new-vue-page-2.vue b/pages/API/navigator/new-page/new-vue-page-2.vue deleted file mode 100644 index 925badd9..00000000 --- a/pages/API/navigator/new-page/new-vue-page-2.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - diff --git a/pages/API/on-accelerometer-change/on-accelerometer-change.vue b/pages/API/on-accelerometer-change/on-accelerometer-change.vue deleted file mode 100644 index 0565b422..00000000 --- a/pages/API/on-accelerometer-change/on-accelerometer-change.vue +++ /dev/null @@ -1,62 +0,0 @@ - - diff --git a/pages/API/rewarded-video-ad/rewarded-video-ad.vue b/pages/API/rewarded-video-ad/rewarded-video-ad.vue deleted file mode 100644 index a6d7b992..00000000 --- a/pages/API/rewarded-video-ad/rewarded-video-ad.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - - - diff --git a/pages/API/save-media/save-media.vue b/pages/API/save-media/save-media.vue deleted file mode 100644 index 9b30d563..00000000 --- a/pages/API/save-media/save-media.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - diff --git a/pages/API/scan-code/scan-code.vue b/pages/API/scan-code/scan-code.vue deleted file mode 100644 index 89006deb..00000000 --- a/pages/API/scan-code/scan-code.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - - diff --git a/pages/API/set-navigation-bar-title/set-navigation-bar-title.test.js b/pages/API/set-navigation-bar-title/set-navigation-bar-title.test.js deleted file mode 100644 index 4023b732..00000000 --- a/pages/API/set-navigation-bar-title/set-navigation-bar-title.test.js +++ /dev/null @@ -1,22 +0,0 @@ - -describe('pages/API/set-navigation-bar-title/set-navigation-bar-title.vue', () => { - let page - beforeAll(async () => { - // 重新reLaunch至首页,并获取首页page对象(其中 program 是uni-automator自动注入的全局对象) - page = await program.reLaunch('/pages/API/set-navigation-bar-title/set-navigation-bar-title') - - if (process.env.UNI_PLATFORM === "mp-weixin") { - await page.waitFor(10000) - } else { - await page.waitFor(5000) - } - - page = await program.currentPage() - - }) - - it('set-navigation-bar-title 组件标题', async () => { - let view = await page.$('.common-page-head-title') - expect(await view.text()).toBe('nav-default') - }) -}) diff --git a/pages/API/set-navigation-bar-title/set-navigation-bar-title.vue b/pages/API/set-navigation-bar-title/set-navigation-bar-title.vue deleted file mode 100644 index 58546212..00000000 --- a/pages/API/set-navigation-bar-title/set-navigation-bar-title.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/pages/API/share/share.vue b/pages/API/share/share.vue deleted file mode 100644 index a56f017b..00000000 --- a/pages/API/share/share.vue +++ /dev/null @@ -1,293 +0,0 @@ - - - - - diff --git a/platforms/app-plus/orientation/orientation.vue b/platforms/app-plus/orientation/orientation.vue deleted file mode 100644 index ba636c4e..00000000 --- a/platforms/app-plus/orientation/orientation.vue +++ /dev/null @@ -1,64 +0,0 @@ -