From 994b734d8bcb4f97bd77351af6fe8e522f496e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Tue, 28 Mar 2023 16:29:03 +0800 Subject: [PATCH 01/87] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E8=BE=93=E5=85=A5=E5=AE=9E=E6=97=B6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B0=81=E8=A3=85=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/README.md | 15 +++++++- fe/PC/src/components/currenForm/index.vue | 14 ++++++- fe/PC/src/components/currenTable/index.vue | 12 ++++++ fe/PC/src/components/umyTable/index.vue | 12 ++++++ fe/PC/src/utils/index.js | 44 ++++++++++++++++++++++ 5 files changed, 94 insertions(+), 3 deletions(-) diff --git a/fe/PC/README.md b/fe/PC/README.md index 63680f9e7..eda9eab98 100644 --- a/fe/PC/README.md +++ b/fe/PC/README.md @@ -107,8 +107,19 @@ active 步骤控制 pageStatus 结合active控制返回结果 [字段设置：rowDrop] - @radio="rowDrop" 数据更新方法 :tableColumns="tableColumns" 表头数据 :visible="visible" 是否显示 -@closeRowDrop="closeRowDrop" 关闭方法 \ No newline at end of file +@closeRowDrop="closeRowDrop" 关闭方法 + +[表单组件补充:currenForm] +validType type仅等于input时：实时keyUp校验，类型如下： + 1、number:正整数, + 2、pointNumber:数字+带小数点(只能输入一个小数点, 小数点后方保留位数见), + 3、numberLetter: 数字+字母, + 4、letter:纯字母, + 5、letterCn:字母+中文 +pointNumberFixed 组合上方validType值仅等于pointNumber时： + 小数点后方保留位数,如不填写默认为100位 ++示例： +{ type:"input", label:"金额", prop:"money", validType:'pointNumber',pointNumberFixed:2}, \ No newline at end of file diff --git a/fe/PC/src/components/currenForm/index.vue b/fe/PC/src/components/currenForm/index.vue index c89c62e88..050ce8b60 100644 --- a/fe/PC/src/components/currenForm/index.vue +++ b/fe/PC/src/components/currenForm/index.vue @@ -23,11 +23,12 @@ v-if="!hide ? true : false" > + @@ -307,6 +308,7 @@ + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-calendar/components/uni-calendar/calendar.js b/fe/PDA/components/uni-calendar/calendar.js similarity index 100% rename from fe/PDA/uni_modules/uni-calendar/components/uni-calendar/calendar.js rename to fe/PDA/components/uni-calendar/calendar.js diff --git a/fe/PDA/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue b/fe/PDA/components/uni-calendar/uni-calendar-item.vue similarity index 83% rename from fe/PDA/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue rename to fe/PDA/components/uni-calendar/uni-calendar-item.vue index 0353011e9..8bcfae21f 100644 --- a/fe/PDA/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue +++ b/fe/PDA/components/uni-calendar/uni-calendar-item.vue @@ -6,8 +6,7 @@ 'uni-calendar-item--before-checked':weeks.beforeMultiple, 'uni-calendar-item--multiple': weeks.multiple, 'uni-calendar-item--after-checked':weeks.afterMultiple, - }" - @click="choiceDate(weeks)"> + }" @click="choiceDate(weeks)"> {{todayText}} + }">今天 {{weeks.isDay ? todayText : (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}} + }">{{weeks.isDay?'今天': (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}} - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue b/fe/PDA/components/uni-calendar/uni-calendar.vue similarity index 83% rename from fe/PDA/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue rename to fe/PDA/components/uni-calendar/uni-calendar.vue index a2c33d0db..75498d913 100644 --- a/fe/PDA/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue +++ b/fe/PDA/components/uni-calendar/uni-calendar.vue @@ -4,10 +4,10 @@ - {{cancelText}} + 取消 - {{okText}} + 确定 @@ -15,12 +15,12 @@ - {{ (nowDate.year||'') +' / '+( nowDate.month||'')}} + {{ (nowDate.year||'') +'年'+( nowDate.month||'') +'月'}} - {{todayText}} + 回到今天 @@ -29,25 +29,25 @@ - {{SUNText}} + 日 - {{monText}} + 一 - {{TUEText}} + 二 - {{WEDText}} + 三 - {{THUText}} + 四 - {{FRIText}} + 五 - {{SATText}} + 六 @@ -63,11 +63,6 @@ - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-calendar/components/uni-calendar/util.js b/fe/PDA/components/uni-calendar/util.js similarity index 94% rename from fe/PDA/uni_modules/uni-calendar/components/uni-calendar/util.js rename to fe/PDA/components/uni-calendar/util.js index bae927375..37f44321e 100644 --- a/fe/PDA/uni_modules/uni-calendar/components/uni-calendar/util.js +++ b/fe/PDA/components/uni-calendar/util.js @@ -139,15 +139,13 @@ class Calendar { let disableBefore = true let disableAfter = true if (this.startDate) { - // let dateCompBefore = this.dateCompare(this.startDate, fullDate) - // disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate) - disableBefore = this.dateCompare(this.startDate, nowDate) + let dateCompBefore = this.dateCompare(this.startDate, fullDate) + disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate) } if (this.endDate) { - // let dateCompAfter = this.dateCompare(fullDate, this.endDate) - // disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate) - disableAfter = this.dateCompare(nowDate, this.endDate) + let dateCompAfter = this.dateCompare(fullDate, this.endDate) + disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate) } let multiples = this.multipleStatus.data let checked = false @@ -171,7 +169,7 @@ class Calendar { afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate), month: full.month, lunar: this.getlunar(full.year, full.month, i), - disable: !(disableBefore && disableAfter), + disable: !disableBefore || !disableAfter, isDay } if (info) { diff --git a/fe/PDA/components/uni-card/uni-card.vue b/fe/PDA/components/uni-card/uni-card.vue new file mode 100644 index 000000000..efb164f92 --- /dev/null +++ b/fe/PDA/components/uni-card/uni-card.vue @@ -0,0 +1,420 @@ + + + + + \ No newline at end of file diff --git a/fe/PDA/components/uni-col/uni-col.vue b/fe/PDA/components/uni-col/uni-col.vue new file mode 100644 index 000000000..650a3732f --- /dev/null +++ b/fe/PDA/components/uni-col/uni-col.vue @@ -0,0 +1,2968 @@ + + + + + \ No newline at end of file diff --git a/fe/PDA/mycomponents/wincom/basicCom/winCollapseItem.vue b/fe/PDA/components/uni-collapse-item/uni-collapse-item.vue similarity index 91% rename from fe/PDA/mycomponents/wincom/basicCom/winCollapseItem.vue rename to fe/PDA/components/uni-collapse-item/uni-collapse-item.vue index 8294fea98..7a85c250d 100644 --- a/fe/PDA/mycomponents/wincom/basicCom/winCollapseItem.vue +++ b/fe/PDA/components/uni-collapse-item/uni-collapse-item.vue @@ -1,30 +1,21 @@ @@ -104,10 +94,6 @@ type: Boolean, default: false }, - clearIcon: { - type: Boolean, - default: true - }, border: { type: Boolean, default: true @@ -115,10 +101,6 @@ split: { type: String, default: '/' - }, - ellipsis: { - type: Boolean, - default: true } }, data() { @@ -142,10 +124,6 @@ }) }, methods: { - clear() { - this.inputSelected.splice(0) - this._dispatchEvent([]) - }, onPropsChange() { this._treeData = [] this.selectedIndex = 0 @@ -160,11 +138,11 @@ if (this.isLocaldata) { this.loadData() this.inputSelected = this.selected.slice(0) - } else if (!this.parentField && !this.selfField && this.hasValue) { + } else if (!this.parentField && !this.selfField && this.dataValue) { this.getNodeData(() => { this.inputSelected = this.selected.slice(0) }) - } else if (this.hasValue) { + } else if (this.dataValue.length) { this.getTreePath(() => { this.inputSelected = this.selected.slice(0) }) @@ -182,13 +160,13 @@ }, show() { this.isOpened = true - setTimeout(() => { + this.$nextTick(() => { this.$refs.pickerView.updateData({ treeData: this._treeData, selected: this.selected, selectedIndex: this.selectedIndex }) - }, 200) + }) this.$emit('popupopened') }, hide() { @@ -212,39 +190,29 @@ }, onchange(e) { this.hide() - this.$nextTick(() => { - this.inputSelected = e; - }) + this.inputSelected = e this._dispatchEvent(e) }, - _processReadonly(dataList, value) { + _processReadonly(dataList, valueArray) { var isTree = dataList.findIndex((item) => { return item.children }) if (isTree > -1) { - let inputValue - if (Array.isArray(value)) { - inputValue = value[value.length - 1] + if (Array.isArray(valueArray)) { + let inputValue = valueArray[valueArray.length - 1] if (typeof inputValue === 'object' && inputValue.value) { inputValue = inputValue.value } - } else { - inputValue = value } this.inputSelected = this._findNodePath(inputValue, this.localdata) return } - if (!this.hasValue) { - this.inputSelected = [] - return - } - let result = [] - for (let i = 0; i < value.length; i++) { - var val = value[i] + for (let i = 0; i < valueArray.length; i++) { + var value = valueArray[i] var item = dataList.find((v) => { - return v.value == val + return v.value == value }) if (item) { result.push(item) @@ -268,16 +236,13 @@ return result }, _dispatchEvent(selected) { - let item = {} - if (selected.length) { - var value = new Array(selected.length) - for (var i = 0; i < selected.length; i++) { - value[i] = selected[i].value - } - item = selected[selected.length - 1] - } else { - item.value = '' + var value = new Array(selected.length) + for (var i = 0; i < selected.length; i++) { + value[i] = selected[i].value } + + const item = selected[selected.length - 1] + if (this.formItem) { this.formItem.setValue(item.value) } @@ -294,9 +259,8 @@ } - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js b/fe/PDA/components/uni-data-pickerview/uni-data-picker.js similarity index 86% rename from fe/PDA/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js rename to fe/PDA/components/uni-data-pickerview/uni-data-picker.js index c12fd54b3..bb285009f 100644 --- a/fe/PDA/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js +++ b/fe/PDA/components/uni-data-pickerview/uni-data-picker.js @@ -6,12 +6,6 @@ export default { return [] } }, - spaceInfo: { - type: Object, - default () { - return {} - } - }, collection: { type: String, default: '' @@ -66,12 +60,12 @@ export default { return [] } }, - modelValue: { - type: [Array, String, Number], - default () { - return [] - } - }, + modelValue: { + type: [Array, String, Number], + default () { + return [] + } + }, preload: { type: Boolean, default: false @@ -91,15 +85,6 @@ export default { multiple: { type: Boolean, default: false - }, - map: { - type: Object, - default() { - return { - text: "text", - value: "value" - } - } } }, data() { @@ -126,29 +111,29 @@ export default { return !this.collection.length }, postField() { - let fields = [this.field]; - if (this.parentField) { - fields.push(`${this.parentField} as parent_value`); - } + let fields = [this.field]; + if (this.parentField) { + fields.push(`${this.parentField} as parent_value`); + } return fields.join(','); }, - dataValue() { - let isModelValue = Array.isArray(this.modelValue) ? (this.modelValue.length > 0) : (this.modelValue !== null || this.modelValue !== undefined) - return isModelValue ? this.modelValue : this.value - }, - hasValue() { - if (typeof this.dataValue === 'number') { - return true - } - return (this.dataValue != null) && (this.dataValue.length > 0) - } + dataValue(){ + let isarr = Array.isArray(this.value) && this.value.length === 0 + let isstr = typeof this.value === 'string' && !this.value + let isnum = typeof this.value === 'number' && !this.value + + if(isarr || isstr || isnum){ + return this.modelValue + } + + return this.value + } }, created() { this.$watch(() => { var al = []; ['pageCurrent', 'pageSize', - 'spaceInfo', 'value', 'modelValue', 'localdata', @@ -187,7 +172,7 @@ export default { }, getCommand(options = {}) { /* eslint-disable no-undef */ - let db = uniCloud.database(this.spaceInfo) + let db = uniCloud.database() const action = options.action || this.action if (action) { @@ -274,7 +259,7 @@ export default { return } - if (this.dataValue != null) { + if (this.dataValue.length) { this._loadNodeData((data) => { this._treeData = data this._updateBindData() @@ -404,15 +389,13 @@ export default { _updateSelected() { var dl = this.dataList var sl = this.selected - let textField = this.map.text - let valueField = this.map.value for (var i = 0; i < sl.length; i++) { var value = sl[i].value var dl2 = dl[i] for (var j = 0; j < dl2.length; j++) { var item2 = dl2[j] - if (item2[valueField] === value) { - sl[i].text = item2[textField] + if (item2.value === value) { + sl[i].text = item2.text break } } @@ -447,10 +430,11 @@ export default { }, _filterData(data, paths) { let dataList = [] + let hasNodes = true dataList.push(data.filter((item) => { - return (item.parent_value === null || item.parent_value === undefined || item.parent_value === '') + return item.parent_value === undefined })) for (let i = 0; i < paths.length; i++) { var value = paths[i].value @@ -472,7 +456,6 @@ export default { }, _extractTree(nodes, result, parent_value) { let list = result || [] - let valueField = this.map.value for (let i = 0; i < nodes.length; i++) { let node = nodes[i] @@ -482,14 +465,14 @@ export default { child[key] = node[key] } } - if (parent_value !== null && parent_value !== undefined && parent_value !== '') { + if (parent_value !== undefined) { child.parent_value = parent_value } result.push(child) let children = node.children if (children) { - this._extractTree(children, result, node[valueField]) + this._extractTree(children, result, node.value) } } }, @@ -513,13 +496,12 @@ export default { } }, _findNodePath(key, nodes, path = []) { - let textField = this.map.text - let valueField = this.map.value for (let i = 0; i < nodes.length; i++) { - let node = nodes[i] - let children = node.children - let text = node[textField] - let value = node[valueField] + let { + value, + text, + children + } = nodes[i] path.push({ value, @@ -544,7 +526,7 @@ export default { _processLocalData() { this._treeData = [] this._extractTree(this.localdata, this._treeData) - + var inputValue = this.dataValue if (inputValue === undefined) { return @@ -552,8 +534,8 @@ export default { if (Array.isArray(inputValue)) { inputValue = inputValue[inputValue.length - 1] - if (typeof inputValue === 'object' && inputValue[this.map.value]) { - inputValue = inputValue[this.map.value] + if (typeof inputValue === 'object' && inputValue.value) { + inputValue = inputValue.value } } diff --git a/fe/PDA/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue b/fe/PDA/components/uni-data-pickerview/uni-data-pickerview.vue similarity index 80% rename from fe/PDA/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue rename to fe/PDA/components/uni-data-pickerview/uni-data-pickerview.vue index 065aac2b6..234b1066b 100644 --- a/fe/PDA/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue +++ b/fe/PDA/components/uni-data-pickerview/uni-data-pickerview.vue @@ -3,21 +3,18 @@ - - + \ No newline at end of file diff --git a/fe/PDA/components/uni-datetime-picker/cale-50.png b/fe/PDA/components/uni-datetime-picker/cale-50.png new file mode 100644 index 0000000000000000000000000000000000000000..fc72eaae94388cf559207f04e95aba049b878605 GIT binary patch literal 673 zcmV;S0$%-zP)xK~!jg?U}!8(?Jx#KZ+J51T2zjB?Jl5K~o${7U|;V<{(9cPVFcn zI5~)epro^Io%A0tbm&qFPF4resSpd|uNFkK6|0L5cOlO&-}`#^%_SF-`@q5DeedqQ z`+i^EyWBw}5|jr(OSkKTXycG&zYI`9Otq zS7GfMTBgr_ntyk$Ha1LqtCuOb2vz{S06eSkm%w;GP)2*oBX|@U@}K+BCWnLn{r_;n{28zLsUC`6l#17@Dm0 zL&)VGIF$$K$DXNEGPE{OH%Fif)JfpGU%#AaUn{hEZaZ)qb=?*EQYWo_(F?QY3hF>0 zwByM|T*z|TbQxMj6|ovHX8#VnvyTe*N5D=%KO&Jx#4~>ZHrP8;-9Ar000000NkvXX Hu0mjf5KA%s literal 0 HcmV?d00001 diff --git a/fe/PDA/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue b/fe/PDA/components/uni-datetime-picker/calendar-item.vue similarity index 68% rename from fe/PDA/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue rename to fe/PDA/components/uni-datetime-picker/calendar-item.vue index 3d2dbeac1..21f86f835 100644 --- a/fe/PDA/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue +++ b/fe/PDA/components/uni-datetime-picker/calendar-item.vue @@ -6,7 +6,8 @@ 'uni-calendar-item--after-checked-x':weeks.afterMultiple, }" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)"> - {{weeks.date}} + {{weeks.date}} + + - @@ -61,7 +64,7 @@ } - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js b/fe/PDA/components/uni-datetime-picker/calendar.js similarity index 100% rename from fe/PDA/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js rename to fe/PDA/components/uni-datetime-picker/calendar.js diff --git a/fe/PDA/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/fe/PDA/components/uni-datetime-picker/calendar.vue similarity index 72% rename from fe/PDA/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue rename to fe/PDA/components/uni-datetime-picker/calendar.vue index 8f7f18158..246ee9037 100644 --- a/fe/PDA/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue +++ b/fe/PDA/components/uni-datetime-picker/calendar.vue @@ -1,92 +1,82 @@ - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/fe/PDA/components/uni-datetime-picker/util.js similarity index 92% rename from fe/PDA/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js rename to fe/PDA/components/uni-datetime-picker/util.js index efa5773ae..1f9f97793 100644 --- a/fe/PDA/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js +++ b/fe/PDA/components/uni-datetime-picker/util.js @@ -1,3 +1,5 @@ +import CALENDAR from './calendar.js' + class Calendar { constructor({ date, @@ -110,6 +112,7 @@ class Calendar { dateArr.push({ date: beforeDate, month: full.month - 1, + lunar: this.getlunar(full.year, full.month - 1, beforeDate), disable: true }) } @@ -167,12 +170,12 @@ class Calendar { year: full.year, date: i, multiple: this.range ? checked : false, - beforeMultiple: this.isLogicBefore(nowDate, this.multipleStatus.before, this.multipleStatus.after), - afterMultiple: this.isLogicAfter(nowDate, this.multipleStatus.before, this.multipleStatus.after), + beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate), + afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate), month: full.month, + lunar: this.getlunar(full.year, full.month, i), disable: !(disableBefore && disableAfter), - isDay, - userChecked: false + isDay } if (info) { data.extraInfo = info @@ -191,6 +194,7 @@ class Calendar { dateArr.push({ date: i, month: Number(full.month) + 1, + lunar: this.getlunar(full.year, Number(full.month) + 1, i), disable: true }) } @@ -239,25 +243,6 @@ class Calendar { } } - /** - * 比较真实起始日期 - */ - - isLogicBefore(currentDay, before, after) { - let logicBefore = before - if (before && after) { - logicBefore = this.dateCompare(before, after) ? before : after - } - return this.dateEqual(logicBefore, currentDay) - } - - isLogicAfter(currentDay, before, after) { - let logicAfter = after - if (before && after) { - logicAfter = this.dateCompare(before, after) ? after : before - } - return this.dateEqual(logicAfter, currentDay) - } /** * 获取日期范围内所有日期 @@ -280,6 +265,19 @@ class Calendar { } return arr } + /** + * 计算阴历日期显示 + */ + getlunar(year, month, date) { + return CALENDAR.solar2lunar(year, month, date) + } + /** + * 设置打点 + */ + setSelectInfo(data, value) { + this.selected = value + this._getWeek(data) + } /** * 获取多选状态 @@ -289,21 +287,22 @@ class Calendar { before, after } = this.multipleStatus + if (!this.range) return if (before && after) { if (!this.lastHover) { this.lastHover = true return } - this.multipleStatus.before = fullDate + this.multipleStatus.before = '' this.multipleStatus.after = '' this.multipleStatus.data = [] this.multipleStatus.fulldate = '' this.lastHover = false } else { + this.lastHover = false if (!before) { this.multipleStatus.before = fullDate - this.lastHover = false } else { this.multipleStatus.after = fullDate if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) { @@ -313,7 +312,6 @@ class Calendar { this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus .before); } - this.lastHover = true } } this._getWeek(fullDate) diff --git a/fe/PDA/uni_modules/uni-drawer/components/uni-drawer/keypress.js b/fe/PDA/components/uni-drawer/keypress.js similarity index 100% rename from fe/PDA/uni_modules/uni-drawer/components/uni-drawer/keypress.js rename to fe/PDA/components/uni-drawer/keypress.js diff --git a/fe/PDA/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue b/fe/PDA/components/uni-drawer/uni-drawer.vue similarity index 86% rename from fe/PDA/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue rename to fe/PDA/components/uni-drawer/uni-drawer.vue index 247152108..f06c550ea 100644 --- a/fe/PDA/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue +++ b/fe/PDA/components/uni-drawer/uni-drawer.vue @@ -1,6 +1,6 @@ @@ -112,17 +106,16 @@ color: '#3c3e49', selectedColor: '#007AFF', backgroundColor: '#fff', - buttonColor: '#007AFF', - iconColor: '#fff' + buttonColor: '#007AFF' } } }, computed: { contentWidth(e) { - return (this.content.length + 1) * 55 + 15 + 'px' + return (this.content.length + 1) * 55 + 10 + 'px' }, contentWidthMin() { - return '55px' + return 55 + 'px' }, // 动态计算宽度 boxWidth() { @@ -161,11 +154,9 @@ } }, watch: { - pattern: { - handler(val, oldVal) { - this.styles = Object.assign({}, this.styles, val) - }, - deep: true + pattern(newValue, oldValue) { + //console.log(JSON.stringify(newValue)) + this.styles = Object.assign({}, this.styles, newValue) } }, created() { @@ -217,9 +208,7 @@ } - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-fab/components/uni-fab/uni-fab.vue.bak b/fe/PDA/components/uni-fab/uni-fab.vue.bak similarity index 90% rename from fe/PDA/uni_modules/uni-fab/components/uni-fab/uni-fab.vue.bak rename to fe/PDA/components/uni-fab/uni-fab.vue.bak index 5adc72a8a..0532f23f9 100644 --- a/fe/PDA/uni_modules/uni-fab/components/uni-fab/uni-fab.vue.bak +++ b/fe/PDA/components/uni-fab/uni-fab.vue.bak @@ -12,10 +12,10 @@ bottom: vertical === 'bottom' && direction === 'vertical', right: horizontal === 'right' && direction === 'horizontal' }" :style="{ 'background-color': styles.buttonColor }" class="fab-circle" @click="_onClick"> - - - - + + + + - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-fav/components/uni-fav/uni-fav.vue b/fe/PDA/components/uni-fav/uni-fav.vue similarity index 76% rename from fe/PDA/uni_modules/uni-fav/components/uni-fav/uni-fav.vue rename to fe/PDA/components/uni-fav/uni-fav.vue index d2c58df9e..7e17030d3 100644 --- a/fe/PDA/uni_modules/uni-fav/components/uni-fav/uni-fav.vue +++ b/fe/PDA/components/uni-fav/uni-fav.vue @@ -1,21 +1,18 @@ - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js b/fe/PDA/components/uni-file-picker/choose-and-upload-file.js similarity index 100% rename from fe/PDA/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js rename to fe/PDA/components/uni-file-picker/choose-and-upload-file.js diff --git a/fe/PDA/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/fe/PDA/components/uni-file-picker/uni-file-picker.vue similarity index 85% rename from fe/PDA/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue rename to fe/PDA/components/uni-file-picker/uni-file-picker.vue index 0928a41af..55451556d 100644 --- a/fe/PDA/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue +++ b/fe/PDA/components/uni-file-picker/uni-file-picker.vue @@ -4,9 +4,7 @@ {{ title }} {{ filesList.length }}/{{ limitLength }} - + @@ -14,9 +12,7 @@ - + @@ -84,9 +80,6 @@ uploadImage, uploadFile }, - options: { - virtualHost: true - }, emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'input'], props: { // #ifdef VUE3 @@ -197,7 +190,7 @@ // #ifndef VUE3 value: { handler(newVal, oldVal) { - this.setValue(newVal, oldVal) + this.localValue = newVal }, immediate: true }, @@ -205,11 +198,14 @@ // #ifdef VUE3 modelValue: { handler(newVal, oldVal) { - this.setValue(newVal, oldVal) + this.localValue = newVal }, immediate: true }, // #endif + localValue(newVal, oldVal) { + this.setValue(newVal, oldVal) + } }, computed: { filesList() { @@ -244,6 +240,7 @@ this.noSpace = true uniCloud.chooseAndUploadFile = chooseAndUploadFile } + this.tempData = {} this.form = this.getForm('uniForms') this.formItem = this.getForm('uniFormsItem') if (this.form && this.formItem) { @@ -254,25 +251,33 @@ } }, methods: { - /** - * 公开用户使用，清空文件 - * @param {Object} index - */ - clearFiles(index) { - if (index !== 0 && !index) { - this.files = [] - this.$nextTick(() => { - this.setEmit() - }) + setValue(newVal, oldVal) { + const newData = (v) => { + const files = this.files.find(i => i.url === v.url) + const reg = /cloud:\/\/([\w.]+\/?)\S*/ + if (!v.path) { + v.path = v.url + } + if (reg.test(v.url)) { + this.getTempFileURL(v, v.url) + } + return v + } + // let data = null + if (this.returnType === 'object') { + newData(newData) } else { - this.files.splice(index, 1) + newVal.forEach(v => { + newData(v) + }) } - this.$nextTick(() => { - this.setEmit() - }) + + this.formItem && this.formItem.setValue(newVal) + this.files = [].concat(newVal || []) }, + /** - * 公开用户使用，继续上传 + * 继续上传 */ upload() { let files = [] @@ -281,46 +286,9 @@ files.push(Object.assign({}, v)) } }) - return this.uploadFiles(files) - }, - async setValue(newVal, oldVal) { - const newData = async (v) => { - const reg = /cloud:\/\/([\w.]+\/?)\S*/ - let url = '' - if(v.fileID){ - url = v.fileID - }else{ - url = v.url - } - if (reg.test(url)) { - v.fileID = url - v.url = await this.getTempFileURL(url) - } - if(v.url) v.path = v.url - return v - } - if (this.returnType === 'object') { - if (newVal) { - await newData(newVal) - } else { - newVal = {} - } - } else { - if (!newVal) newVal = [] - for(let i =0 ;i < newVal.length ;i++){ - let v = newVal[i] - await newData(v) - } - } - this.localValue = newVal - if (this.form && this.formItem &&!this.is_reset) { - this.is_reset = false - this.formItem.setValue(this.localValue) - } - let filesData = Object.keys(newVal).length > 0 ? newVal : []; - this.files = [].concat(filesData) - }, + this.uploadFiles(files) + }, /** * 选择文件 */ @@ -394,7 +362,7 @@ if (this.limitLength - this.files.length <= 0) break files[i].uuid = Date.now() let filedata = await get_file_data(files[i], this.fileMediatype) - filedata.progress = 0 + filedata.progress = 100 filedata.status = 'ready' this.files.push(filedata) currentData.push({ @@ -419,15 +387,14 @@ */ uploadFiles(files) { files = [].concat(files) - return uploadCloudFiles.call(this, files, 5, res => { + uploadCloudFiles.call(this, files, 5, res => { this.setProgress(res, res.index, true) }) .then(result => { this.setSuccessAndError(result) - return result; }) .catch(err => { - console.log(err) + console.log('err', err) }) }, @@ -440,9 +407,9 @@ let tempFilePath = [] let errorTempFilePath = [] for (let i = 0; i < res.length; i++) { + // const index = item.index const item = res[i] const index = item.uuid ? this.files.findIndex(p => p.uuid === item.uuid) : item.index - if (index === -1 || !this.files) break if (item.errMsg === 'request:fail') { this.files[index].url = item.path @@ -453,18 +420,11 @@ errorTempFilePath.push(this.files[index].url) } else { this.files[index].errMsg = '' - this.files[index].fileID = item.url - const reg = /cloud:\/\/([\w.]+\/?)\S*/ - if (reg.test(item.url)) { - this.files[index].url = await this.getTempFileURL(item.url) - }else{ - this.files[index].url = item.url - } - + this.files[index].url = item.url this.files[index].status = 'success' this.files[index].progress += 1 successData.push(this.files[index]) - tempFilePath.push(this.files[index].fileID) + tempFilePath.push(this.files[index].url) } } @@ -545,7 +505,8 @@ let data = [] if (this.returnType === 'object') { data = this.backObject(this.files)[0] - this.localValue = data?data:null + this.localValue = {} + Object.assign(this.localValue, data) } else { data = this.backObject(this.files) if (!this.localValue) { @@ -575,18 +536,21 @@ name: v.name, path: v.path, size: v.size, - fileID:v.fileID, url: v.url }) }) return newFilesData }, - async getTempFileURL(fileList) { + async getTempFileURL(file, fileList) { fileList = { fileList: [].concat(fileList) } const urls = await uniCloud.getTempFileURL(fileList) - return urls.fileList[0].tempFileURL || '' + file.path = urls.fileList[0].tempFileURL || '' + const index = this.files.findIndex(v => v.path === file.path) + if (index !== -1) { + this.$set(this.files, index, file) + } }, /** * 获取父元素实例 @@ -605,14 +569,12 @@ } - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue b/fe/PDA/components/uni-file-picker/upload-file.vue similarity index 91% rename from fe/PDA/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue rename to fe/PDA/components/uni-file-picker/upload-file.vue index 625d92ec7..56295ff4c 100644 --- a/fe/PDA/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue +++ b/fe/PDA/components/uni-file-picker/upload-file.vue @@ -8,8 +8,7 @@ + 'files-border':index !== 0 && styles.dividline}" :style="index !== 0 && styles.dividline &&borderLineStyle"> - {{unicode}} + {{unicode}} - + + + diff --git a/fe/PDA/uni_modules/uni-icons/components/uni-icons/uniicons.css b/fe/PDA/components/uni-icons/uni-icons/uniicons.css similarity index 100% rename from fe/PDA/uni_modules/uni-icons/components/uni-icons/uniicons.css rename to fe/PDA/components/uni-icons/uni-icons/uniicons.css diff --git a/fe/PDA/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/fe/PDA/components/uni-icons/uni-icons/uniicons.ttf similarity index 100% rename from fe/PDA/uni_modules/uni-icons/components/uni-icons/uniicons.ttf rename to fe/PDA/components/uni-icons/uni-icons/uniicons.ttf diff --git a/fe/PDA/uni_modules/uni-icons/components/uni-icons/uni.ttf b/fe/PDA/components/uni-icons/uni.ttf similarity index 100% rename from fe/PDA/uni_modules/uni-icons/components/uni-icons/uni.ttf rename to fe/PDA/components/uni-icons/uni.ttf diff --git a/fe/PDA/components/uni-icons/uniicons.css b/fe/PDA/components/uni-icons/uniicons.css new file mode 100644 index 000000000..2f56eabde --- /dev/null +++ b/fe/PDA/components/uni-icons/uniicons.css @@ -0,0 +1,663 @@ +.uniui-color:before { + content: "\e6cf"; +} + +.uniui-wallet:before { + content: "\e6b1"; +} + +.uniui-settings-filled:before { + content: "\e6ce"; +} + +.uniui-auth-filled:before { + content: "\e6cc"; +} + +.uniui-shop-filled:before { + content: "\e6cd"; +} + +.uniui-staff-filled:before { + content: "\e6cb"; +} + +.uniui-vip-filled:before { + content: "\e6c6"; +} + +.uniui-plus-filled:before { + content: "\e6c7"; +} + +.uniui-folder-add-filled:before { + content: "\e6c8"; +} + +.uniui-color-filled:before { + content: "\e6c9"; +} + +.uniui-tune-filled:before { + content: "\e6ca"; +} + +.uniui-calendar-filled:before { + content: "\e6c0"; +} + +.uniui-notification-filled:before { + content: "\e6c1"; +} + +.uniui-wallet-filled:before { + content: "\e6c2"; +} + +.uniui-medal-filled:before { + content: "\e6c3"; +} + +.uniui-gift-filled:before { + content: "\e6c4"; +} + +.uniui-fire-filled:before { + content: "\e6c5"; +} + +.uniui-refreshempty:before { + content: "\e6bf"; +} + +.uniui-location-filled:before { + content: "\e6af"; +} + +.uniui-person-filled:before { + content: "\e69d"; +} + +.uniui-personadd-filled:before { + content: "\e698"; +} + +.uniui-back:before { + content: "\e6b9"; +} + +.uniui-forward:before { + content: "\e6ba"; +} + +.uniui-arrow-right:before { + content: "\e6bb"; +} + +.uniui-arrowthinright:before { + content: "\e6bb"; +} + +.uniui-arrow-left:before { + content: "\e6bc"; +} + +.uniui-arrowthinleft:before { + content: "\e6bc"; +} + +.uniui-arrow-up:before { + content: "\e6bd"; +} + +.uniui-arrowthinup:before { + content: "\e6bd"; +} + +.uniui-arrow-down:before { + content: "\e6be"; +} + +.uniui-arrowthindown:before { + content: "\e6be"; +} + +.uniui-bottom:before { + content: "\e6b8"; +} + +.uniui-arrowdown:before { + content: "\e6b8"; +} + +.uniui-right:before { + content: "\e6b5"; +} + +.uniui-arrowright:before { + content: "\e6b5"; +} + +.uniui-top:before { + content: "\e6b6"; +} + +.uniui-arrowup:before { + content: "\e6b6"; +} + +.uniui-left:before { + content: "\e6b7"; +} + +.uniui-arrowleft:before { + content: "\e6b7"; +} + +.uniui-eye:before { + content: "\e651"; +} + +.uniui-eye-filled:before { + content: "\e66a"; +} + +.uniui-eye-slash:before { + content: "\e6b3"; +} + +.uniui-eye-slash-filled:before { + content: "\e6b4"; +} + +.uniui-info-filled:before { + content: "\e649"; +} + +.uniui-reload:before { + content: "\e6b2"; +} + +.uniui-micoff-filled:before { + content: "\e6b0"; +} + +.uniui-map-pin-ellipse:before { + content: "\e6ac"; +} + +.uniui-map-pin:before { + content: "\e6ad"; +} + +.uniui-location:before { + content: "\e6ae"; +} + +.uniui-starhalf:before { + content: "\e683"; +} + +.uniui-star:before { + content: "\e688"; +} + +.uniui-star-filled:before { + content: "\e68f"; +} + +.uniui-calendar:before { + content: "\e6a0"; +} + +.uniui-fire:before { + content: "\e6a1"; +} + +.uniui-medal:before { + content: "\e6a2"; +} + +.uniui-font:before { + content: "\e6a3"; +} + +.uniui-gift:before { + content: "\e6a4"; +} + +.uniui-link:before { + content: "\e6a5"; +} + +.uniui-notification:before { + content: "\e6a6"; +} + +.uniui-staff:before { + content: "\e6a7"; +} + +.uniui-vip:before { + content: "\e6a8"; +} + +.uniui-folder-add:before { + content: "\e6a9"; +} + +.uniui-tune:before { + content: "\e6aa"; +} + +.uniui-auth:before { + content: "\e6ab"; +} + +.uniui-person:before { + content: "\e699"; +} + +.uniui-email-filled:before { + content: "\e69a"; +} + +.uniui-phone-filled:before { + content: "\e69b"; +} + +.uniui-phone:before { + content: "\e69c"; +} + +.uniui-email:before { + content: "\e69e"; +} + +.uniui-personadd:before { + content: "\e69f"; +} + +.uniui-chatboxes-filled:before { + content: "\e692"; +} + +.uniui-contact:before { + content: "\e693"; +} + +.uniui-chatbubble-filled:before { + content: "\e694"; +} + +.uniui-contact-filled:before { + content: "\e695"; +} + +.uniui-chatboxes:before { + content: "\e696"; +} + +.uniui-chatbubble:before { + content: "\e697"; +} + +.uniui-upload-filled:before { + content: "\e68e"; +} + +.uniui-upload:before { + content: "\e690"; +} + +.uniui-weixin:before { + content: "\e691"; +} + +.uniui-compose:before { + content: "\e67f"; +} + +.uniui-qq:before { + content: "\e680"; +} + +.uniui-download-filled:before { + content: "\e681"; +} + +.uniui-pyq:before { + content: "\e682"; +} + +.uniui-sound:before { + content: "\e684"; +} + +.uniui-trash-filled:before { + content: "\e685"; +} + +.uniui-sound-filled:before { + content: "\e686"; +} + +.uniui-trash:before { + content: "\e687"; +} + +.uniui-videocam-filled:before { + content: "\e689"; +} + +.uniui-spinner-cycle:before { + content: "\e68a"; +} + +.uniui-weibo:before { + content: "\e68b"; +} + +.uniui-videocam:before { + content: "\e68c"; +} + +.uniui-download:before { + content: "\e68d"; +} + +.uniui-help:before { + content: "\e679"; +} + +.uniui-navigate-filled:before { + content: "\e67a"; +} + +.uniui-plusempty:before { + content: "\e67b"; +} + +.uniui-smallcircle:before { + content: "\e67c"; +} + +.uniui-minus-filled:before { + content: "\e67d"; +} + +.uniui-micoff:before { + content: "\e67e"; +} + +.uniui-closeempty:before { + content: "\e66c"; +} + +.uniui-clear:before { + content: "\e66d"; +} + +.uniui-navigate:before { + content: "\e66e"; +} + +.uniui-minus:before { + content: "\e66f"; +} + +.uniui-image:before { + content: "\e670"; +} + +.uniui-mic:before { + content: "\e671"; +} + +.uniui-paperplane:before { + content: "\e672"; +} + +.uniui-close:before { + content: "\e673"; +} + +.uniui-help-filled:before { + content: "\e674"; +} + +.uniui-paperplane-filled:before { + content: "\e675"; +} + +.uniui-plus:before { + content: "\e676"; +} + +.uniui-mic-filled:before { + content: "\e677"; +} + +.uniui-image-filled:before { + content: "\e678"; +} + +.uniui-locked-filled:before { + content: "\e668"; +} + +.uniui-info:before { + content: "\e669"; +} + +.uniui-locked:before { + content: "\e66b"; +} + +.uniui-camera-filled:before { + content: "\e658"; +} + +.uniui-chat-filled:before { + content: "\e659"; +} + +.uniui-camera:before { + content: "\e65a"; +} + +.uniui-circle:before { + content: "\e65b"; +} + +.uniui-checkmarkempty:before { + content: "\e65c"; +} + +.uniui-chat:before { + content: "\e65d"; +} + +.uniui-circle-filled:before { + content: "\e65e"; +} + +.uniui-flag:before { + content: "\e65f"; +} + +.uniui-flag-filled:before { + content: "\e660"; +} + +.uniui-gear-filled:before { + content: "\e661"; +} + +.uniui-home:before { + content: "\e662"; +} + +.uniui-home-filled:before { + content: "\e663"; +} + +.uniui-gear:before { + content: "\e664"; +} + +.uniui-smallcircle-filled:before { + content: "\e665"; +} + +.uniui-map-filled:before { + content: "\e666"; +} + +.uniui-map:before { + content: "\e667"; +} + +.uniui-refresh-filled:before { + content: "\e656"; +} + +.uniui-refresh:before { + content: "\e657"; +} + +.uniui-cloud-upload:before { + content: "\e645"; +} + +.uniui-cloud-download-filled:before { + content: "\e646"; +} + +.uniui-cloud-download:before { + content: "\e647"; +} + +.uniui-cloud-upload-filled:before { + content: "\e648"; +} + +.uniui-redo:before { + content: "\e64a"; +} + +.uniui-images-filled:before { + content: "\e64b"; +} + +.uniui-undo-filled:before { + content: "\e64c"; +} + +.uniui-more:before { + content: "\e64d"; +} + +.uniui-more-filled:before { + content: "\e64e"; +} + +.uniui-undo:before { + content: "\e64f"; +} + +.uniui-images:before { + content: "\e650"; +} + +.uniui-paperclip:before { + content: "\e652"; +} + +.uniui-settings:before { + content: "\e653"; +} + +.uniui-search:before { + content: "\e654"; +} + +.uniui-redo-filled:before { + content: "\e655"; +} + +.uniui-list:before { + content: "\e644"; +} + +.uniui-mail-open-filled:before { + content: "\e63a"; +} + +.uniui-hand-down-filled:before { + content: "\e63c"; +} + +.uniui-hand-down:before { + content: "\e63d"; +} + +.uniui-hand-up-filled:before { + content: "\e63e"; +} + +.uniui-hand-up:before { + content: "\e63f"; +} + +.uniui-heart-filled:before { + content: "\e641"; +} + +.uniui-mail-open:before { + content: "\e643"; +} + +.uniui-heart:before { + content: "\e639"; +} + +.uniui-loop:before { + content: "\e633"; +} + +.uniui-pulldown:before { + content: "\e632"; +} + +.uniui-scan:before { + content: "\e62a"; +} + +.uniui-bars:before { + content: "\e627"; +} + +.uniui-cart-filled:before { + content: "\e629"; +} + +.uniui-checkbox:before { + content: "\e62b"; +} + +.uniui-checkbox-filled:before { + content: "\e62c"; +} + +.uniui-shop:before { + content: "\e62f"; +} + +.uniui-headphones:before { + content: "\e630"; +} + +.uniui-cart:before { + content: "\e631"; +} diff --git a/fe/PDA/unpackage/dist/dev/.nvue/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/fe/PDA/components/uni-icons/uniicons.ttf similarity index 100% rename from fe/PDA/unpackage/dist/dev/.nvue/uni_modules/uni-icons/components/uni-icons/uniicons.ttf rename to fe/PDA/components/uni-icons/uniicons.ttf diff --git a/fe/PDA/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue b/fe/PDA/components/uni-indexed-list/uni-indexed-list-item.vue similarity index 90% rename from fe/PDA/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue rename to fe/PDA/components/uni-indexed-list/uni-indexed-list-item.vue index 19284bd2e..abad2a8e7 100644 --- a/fe/PDA/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue +++ b/fe/PDA/components/uni-indexed-list/uni-indexed-list-item.vue @@ -8,7 +8,7 @@ - + {{ item.name }} @@ -21,7 +21,7 @@ - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue b/fe/PDA/components/uni-indexed-list/uni-indexed-list.vue similarity index 90% rename from fe/PDA/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue rename to fe/PDA/components/uni-indexed-list/uni-indexed-list.vue index ee3a7ec01..21dbc16fa 100644 --- a/fe/PDA/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue +++ b/fe/PDA/components/uni-indexed-list/uni-indexed-list.vue @@ -8,8 +8,7 @@ - + @@ -18,13 +17,9 @@ - - - {{ list.key }} + + + {{ list.key }} @@ -214,7 +209,7 @@ }, touchEnd() { this.touchmove = false - // this.touchmoveIndex = -1 + this.touchmoveIndex = -1 }, /** @@ -282,7 +277,7 @@ } } - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-link/components/uni-link/uni-link.vue b/fe/PDA/components/uni-link/uni-link.vue similarity index 78% rename from fe/PDA/uni_modules/uni-link/components/uni-link/uni-link.vue rename to fe/PDA/components/uni-link/uni-link.vue index 27c5468e1..8373eaebb 100644 --- a/fe/PDA/uni_modules/uni-link/components/uni-link/uni-link.vue +++ b/fe/PDA/components/uni-link/uni-link.vue @@ -1,21 +1,6 @@ - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue b/fe/PDA/components/uni-list-ad/uni-list-ad.vue similarity index 83% rename from fe/PDA/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue rename to fe/PDA/components/uni-list-ad/uni-list-ad.vue index b9349c29a..f9a0bf199 100644 --- a/fe/PDA/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue +++ b/fe/PDA/components/uni-list-ad/uni-list-ad.vue @@ -4,8 +4,7 @@ - + @@ -69,7 +68,7 @@ } - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss b/fe/PDA/components/uni-list-chat/uni-list-chat.scss similarity index 100% rename from fe/PDA/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss rename to fe/PDA/components/uni-list-chat/uni-list-chat.scss diff --git a/fe/PDA/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue b/fe/PDA/components/uni-list-chat/uni-list-chat.vue similarity index 79% rename from fe/PDA/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue rename to fe/PDA/components/uni-list-chat/uni-list-chat.vue index 2b3100859..d8729b9c9 100644 --- a/fe/PDA/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue +++ b/fe/PDA/components/uni-list-chat/uni-list-chat.vue @@ -7,14 +7,12 @@ - + - - + + @@ -70,7 +68,7 @@ */ export default { name: 'UniListChat', - emits:['click'], + emits: ['click'], props: { title: { type: String, @@ -217,58 +215,24 @@ }; - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue b/fe/PDA/components/uni-list-item/uni-list-item.vue similarity index 77% rename from fe/PDA/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue rename to fe/PDA/components/uni-list-item/uni-list-item.vue index 2c7d9ea7c..aa681fd06 100644 --- a/fe/PDA/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue +++ b/fe/PDA/components/uni-list-item/uni-list-item.vue @@ -3,12 +3,9 @@ - + - + @@ -20,20 +17,16 @@ - - {{ title }} + + {{ title }} {{ note }} - + {{ rightText }} - - + + @@ -58,7 +51,6 @@ * @value sm 小图 * @property {String} badgeText 数字角标内容 * @property {String} badgeType 数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21) - * @property {Object} badgeStyle 数字角标样式 * @property {String} rightText 右侧文字内容 * @property {Boolean} disabled = [true|false] 是否禁用 * @property {Boolean} clickable = [true|false] 是否开启点击反馈 @@ -96,7 +88,7 @@ default: '' }, ellipsis: { - type: [Number,String], + type: [Number], default: 0 }, disabled: { @@ -139,12 +131,6 @@ type: String, default: 'success' }, - badgeStyle:{ - type: Object, - default () { - return {} - } - }, rightText: { type: String, default: '' @@ -165,7 +151,7 @@ type: Object, default () { return { - type: '', + type: 'contact', color: '#000000', size: 20 }; @@ -228,7 +214,7 @@ } }, pageApi(api) { - let callback = { + uni[api]({ url: this.to, success: res => { this.$emit('click', { @@ -239,47 +225,20 @@ this.$emit('click', { data: err }); + console.error(err.errMsg); } - } - switch (api) { - case 'navigateTo': - uni.navigateTo(callback) - break - case 'redirectTo': - uni.redirectTo(callback) - break - case 'reLaunch': - uni.reLaunch(callback) - break - case 'switchTab': - uni.switchTab(callback) - break - default: - uni.navigateTo(callback) - } + }); } } }; - + \ No newline at end of file diff --git a/fe/PDA/components/uni-list/uni-list.vue b/fe/PDA/components/uni-list/uni-list.vue new file mode 100644 index 000000000..59a00a5ed --- /dev/null +++ b/fe/PDA/components/uni-list/uni-list.vue @@ -0,0 +1,107 @@ + + + + \ No newline at end of file diff --git a/fe/PDA/components/uni-list/uni-refresh.vue b/fe/PDA/components/uni-list/uni-refresh.vue new file mode 100644 index 000000000..856370911 --- /dev/null +++ b/fe/PDA/components/uni-list/uni-refresh.vue @@ -0,0 +1,65 @@ + + + + + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-list/components/uni-list/uni-refresh.wxs b/fe/PDA/components/uni-list/uni-refresh.wxs similarity index 100% rename from fe/PDA/uni_modules/uni-list/components/uni-list/uni-refresh.wxs rename to fe/PDA/components/uni-list/uni-refresh.wxs diff --git a/fe/PDA/components/uni-load-more/uni-load-more.vue b/fe/PDA/components/uni-load-more/uni-load-more.vue new file mode 100644 index 000000000..92a95e18d --- /dev/null +++ b/fe/PDA/components/uni-load-more/uni-load-more.vue @@ -0,0 +1,366 @@ + + + + + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue b/fe/PDA/components/uni-nav-bar/uni-nav-bar.vue similarity index 51% rename from fe/PDA/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue rename to fe/PDA/components/uni-nav-bar/uni-nav-bar.vue index cbfc16859..3cbcfc6a3 100644 --- a/fe/PDA/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue +++ b/fe/PDA/components/uni-nav-bar/uni-nav-bar.vue @@ -1,59 +1,50 @@ - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue b/fe/PDA/components/uni-nav-bar/uni-status-bar.vue similarity index 80% rename from fe/PDA/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue rename to fe/PDA/components/uni-nav-bar/uni-status-bar.vue index 6a688744f..cd1e509c4 100644 --- a/fe/PDA/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue +++ b/fe/PDA/components/uni-nav-bar/uni-status-bar.vue @@ -18,10 +18,8 @@ } - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue b/fe/PDA/components/uni-notice-bar/uni-notice-bar.vue similarity index 81% rename from fe/PDA/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue rename to fe/PDA/components/uni-notice-bar/uni-notice-bar.vue index 424430dab..687bfd5f0 100644 --- a/fe/PDA/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue +++ b/fe/PDA/components/uni-notice-bar/uni-notice-bar.vue @@ -1,24 +1,25 @@ @@ -63,7 +64,7 @@ }, backgroundColor: { type: String, - default: '#FFF9EA' + default: '#fffbe8' }, speed: { // 默认1s滚动100px @@ -72,11 +73,11 @@ }, color: { type: String, - default: '#FF9A43' + default: '#de8c17' }, moreColor: { type: String, - default: '#FF9A43' + default: '#999999' }, single: { // 是否单行 @@ -262,7 +263,7 @@ } - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/fe/PDA/components/uni-number-box/uni-number-box.vue similarity index 75% rename from fe/PDA/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue rename to fe/PDA/components/uni-number-box/uni-number-box.vue index 8d255fbb1..21a42aa4d 100644 --- a/fe/PDA/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue +++ b/fe/PDA/components/uni-number-box/uni-number-box.vue @@ -1,12 +1,11 @@ @@ -19,12 +18,8 @@ * @property {Number} min 最小值 * @property {Number} max 最大值 * @property {Number} step 每次点击改变的间隔大小 - * @property {String} background 背景色 - * @property {String} color 字体颜色（前景色） * @property {Boolean} disabled = [true|false] 是否为禁用状态 * @event {Function} change 输入框值改变时触发的事件，参数为输入框当前的 value - * @event {Function} focus 输入框聚焦时触发的事件，参数为 event 对象 - * @event {Function} blur 输入框失焦时触发的事件，参数为 event 对象 */ export default { @@ -51,14 +46,6 @@ type: Number, default: 1 }, - background: { - type: String, - default: '#f5f5f5' - }, - color: { - type: String, - default: '#333' - }, disabled: { type: Boolean, default: false @@ -153,68 +140,85 @@ } }; - + \ No newline at end of file diff --git a/fe/PDA/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue b/fe/PDA/components/uni-pagination/uni-pagination.vue similarity index 62% rename from fe/PDA/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue rename to fe/PDA/components/uni-pagination/uni-pagination.vue index 713503405..fd1912528 100644 --- a/fe/PDA/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue +++ b/fe/PDA/components/uni-pagination/uni-pagination.vue @@ -1,52 +1,34 @@ diff --git a/fe/PDA/mycomponents/coms/return/comProductionReturn.vue b/fe/PDA/mycomponents/coms/return/comProductionReturn.vue index e51865dce..ba5f5584c 100644 --- a/fe/PDA/mycomponents/coms/return/comProductionReturn.vue +++ b/fe/PDA/mycomponents/coms/return/comProductionReturn.vue @@ -6,8 +6,8 @@ - {{statusColor(dataContent.jobStatus)}} + :class="dataContent.jobStatus | statusStyle"> + {{dataContent.jobStatus | statusColor}} {{dataContent.number }} @@ -25,7 +25,7 @@ 创建时间:{{dataContent.creationTime===null?'无':formatDate(dataContent.creationTime)}} + class="text_darkblue">创建时间:{{dataContent.creationTime===null?'无':dataContent.creationTime| formatDate}} @@ -45,7 +45,7 @@ }; }, props: ['dataContent'], - methods:{ + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, @@ -55,7 +55,7 @@ formatDate: function(val) { return dateFormat(val) } - } + }, } diff --git a/fe/PDA/mycomponents/coms/return/comReturn.vue b/fe/PDA/mycomponents/coms/return/comReturn.vue index 321ac3479..ee79ce29c 100644 --- a/fe/PDA/mycomponents/coms/return/comReturn.vue +++ b/fe/PDA/mycomponents/coms/return/comReturn.vue @@ -6,8 +6,8 @@ - {{statusColor(returnItem.jobStatus) }} + :class="returnItem.jobStatus | statusStyle"> + {{returnItem.jobStatus | statusColor}} {{returnItem.number }} @@ -26,7 +26,7 @@ 创建时间:{{returnItem.creationTime===null?'无':formatDate(returnItem.creationTime)}} + class="text_darkblue">创建时间:{{returnItem.creationTime===null?'无':returnItem.creationTime| formatDate}} @@ -46,7 +46,7 @@ }; }, props: ['returnItem'], - methods:{ + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, @@ -56,7 +56,7 @@ formatDate: function(val) { return dateFormat(val) } - } + }, } diff --git a/fe/PDA/mycomponents/coms/store/comDeliverFg.vue b/fe/PDA/mycomponents/coms/store/comDeliverFg.vue index 6ff2a34df..2af3857c3 100644 --- a/fe/PDA/mycomponents/coms/store/comDeliverFg.vue +++ b/fe/PDA/mycomponents/coms/store/comDeliverFg.vue @@ -61,9 +61,9 @@ - - - {{ statusColor(dataContent.status)}} + + + {{ dataContent.status | statusColor}} @@ -92,16 +92,18 @@ value: false } }, - methods: { - qtyInput(value, item) { - this.$emit('qtyInput', value, item) - }, + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, inventoryStatus: function(val) { return getInventoryStatusDesc(val); } + }, + methods: { + qtyInput(value, item) { + this.$emit('qtyInput', value, item) + } } } diff --git a/fe/PDA/mycomponents/coms/store/comDeliverTf.vue b/fe/PDA/mycomponents/coms/store/comDeliverTf.vue index d150f50d5..c8ddab299 100644 --- a/fe/PDA/mycomponents/coms/store/comDeliverTf.vue +++ b/fe/PDA/mycomponents/coms/store/comDeliverTf.vue @@ -60,9 +60,9 @@ - - - {{ statusColor(dataContent.status)}} + + + {{ dataContent.status | statusColor}} @@ -90,16 +90,18 @@ value: false } }, - methods: { - qtyInput(value, item) { - this.$emit('qtyInput', value, item) - }, + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, inventoryStatus: function(val) { return getInventoryStatusDesc(val); } + }, + methods: { + qtyInput(value, item) { + this.$emit('qtyInput', value, item) + } } } diff --git a/fe/PDA/mycomponents/coms/store/comReceipt.vue b/fe/PDA/mycomponents/coms/store/comReceipt.vue index 2db7bff38..5051d5e9a 100644 --- a/fe/PDA/mycomponents/coms/store/comReceipt.vue +++ b/fe/PDA/mycomponents/coms/store/comReceipt.vue @@ -45,6 +45,9 @@ type: Object, value: null }, + }, + filters: { + }, methods: { diff --git a/fe/PDA/mycomponents/coms/store/comTjRecycle.vue b/fe/PDA/mycomponents/coms/store/comTjRecycle.vue index e3f82a40b..49ed78768 100644 --- a/fe/PDA/mycomponents/coms/store/comTjRecycle.vue +++ b/fe/PDA/mycomponents/coms/store/comTjRecycle.vue @@ -58,6 +58,9 @@ type: Object, value: null }, + }, + filters: { + }, methods: { diff --git a/fe/PDA/mycomponents/coms/task/comCalc.vue b/fe/PDA/mycomponents/coms/task/comCalc.vue index 106bce59e..26a321983 100644 --- a/fe/PDA/mycomponents/coms/task/comCalc.vue +++ b/fe/PDA/mycomponents/coms/task/comCalc.vue @@ -6,9 +6,9 @@ - {{countStageDesc(datacontent.countStage)}} | - {{checkTypeDesc(datacontent.type)}} | - {{countMethodDesc(datacontent.countMethod) }} + {{datacontent.countStage|countStageDesc}} | + {{datacontent.type | checkTypeDesc}} | + {{datacontent.countMethod |countMethodDesc}} @@ -35,7 +35,7 @@ }, // 此处定义传入的数据 props: ['datacontent'], - methods:{ + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, @@ -57,7 +57,7 @@ inventoryStatusColor: function(val) { return getInventoryStatusDesc(val); }, - } + }, } diff --git a/fe/PDA/mycomponents/coms/task/comCount.vue b/fe/PDA/mycomponents/coms/task/comCount.vue index 9a85b80f9..a4920c109 100644 --- a/fe/PDA/mycomponents/coms/task/comCount.vue +++ b/fe/PDA/mycomponents/coms/task/comCount.vue @@ -6,9 +6,9 @@ - {{countStageDesc(datacontent.countStage)}} | + {{datacontent.countStage|countStageDesc}} | - {{countMethodDesc(datacontent.countMethod)}} | + {{datacontent.countMethod |countMethodDesc}} | {{datacontent.locationCode }} @@ -17,7 +17,7 @@ {{datacontent.creationTime===null?'无':formatDate(datacontent.creationTime) }} + class="text_darkblue">{{datacontent.creationTime===null?'无':datacontent.creationTime| formatDate}} @@ -44,7 +44,7 @@ }, // 此处定义传入的数据 props: ['datacontent'], - methods:{ + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, @@ -69,7 +69,7 @@ formatDate: function(val) { return dateFormat(val) } - } + }, } diff --git a/fe/PDA/mycomponents/coms/task/comCountItems.vue b/fe/PDA/mycomponents/coms/task/comCountItems.vue index d9422db2b..4e3c016c6 100644 --- a/fe/PDA/mycomponents/coms/task/comCountItems.vue +++ b/fe/PDA/mycomponents/coms/task/comCountItems.vue @@ -14,7 +14,6 @@ import comCount from '@/mycomponents/coms/task/comCount.vue'; export default { components: {comCount}, //返回首页 - emits:["selectedItem"], data() { return { countList: {} @@ -22,6 +21,8 @@ }, props: { + }, + filters: { }, methods: { openPopup(items) { diff --git a/fe/PDA/mycomponents/coms/task/comCountScanDetail.vue b/fe/PDA/mycomponents/coms/task/comCountScanDetail.vue index 376fd3bf6..a146c508f 100644 --- a/fe/PDA/mycomponents/coms/task/comCountScanDetail.vue +++ b/fe/PDA/mycomponents/coms/task/comCountScanDetail.vue @@ -72,17 +72,18 @@ }; }, - mounted() { - - }, - methods: { + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, statusColor: function(val) { return getJobStatuDesc(val); }, - } + }, + mounted() { + + }, + methods: {} } diff --git a/fe/PDA/mycomponents/coms/task/comDeliver.vue b/fe/PDA/mycomponents/coms/task/comDeliver.vue index 365143003..0f3f65fa0 100644 --- a/fe/PDA/mycomponents/coms/task/comDeliver.vue +++ b/fe/PDA/mycomponents/coms/task/comDeliver.vue @@ -21,7 +21,7 @@ {{dataContent.deliverTime===null?'无':formatDate(dataContent.deliverTime) }} + class="text_darkblue">{{dataContent.deliverTime===null?'无':dataContent.deliverTime| formatDate}} @@ -49,7 +49,7 @@ value: null } }, - methods:{ + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, @@ -59,7 +59,7 @@ formatDate: function(val) { return dateFormat(val) } - } + }, } diff --git a/fe/PDA/mycomponents/coms/task/comInspect.vue b/fe/PDA/mycomponents/coms/task/comInspect.vue index f663ac0f8..887870bab 100644 --- a/fe/PDA/mycomponents/coms/task/comInspect.vue +++ b/fe/PDA/mycomponents/coms/task/comInspect.vue @@ -9,8 +9,8 @@ - - {{statusColor(datacontent.jobStatus)}} + + {{datacontent.jobStatus | statusColor}} {{datacontent.itemCode}} @@ -77,14 +77,14 @@ value: null } }, - methods:{ + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, statusColor: function(val) { return getJobStatuDesc(val); } - } + }, } diff --git a/fe/PDA/mycomponents/coms/task/comIssue.vue b/fe/PDA/mycomponents/coms/task/comIssue.vue index b3a4a5082..5d150ab34 100644 --- a/fe/PDA/mycomponents/coms/task/comIssue.vue +++ b/fe/PDA/mycomponents/coms/task/comIssue.vue @@ -24,7 +24,7 @@ {{dataContent.creationTime===null?'无':formatDate(dataContent.creationTime) }} + class="text_darkblue">{{dataContent.creationTime===null?'无':dataContent.creationTime| formatDate}} @@ -60,7 +60,7 @@ value: null } }, - methods: { + filters: { jobStatusStyle: function(val) { return getJobStatuStyle(val); }, @@ -76,7 +76,7 @@ formatDate: function(val) { return dateFormat(val) } - } + }, } diff --git a/fe/PDA/mycomponents/coms/task/comMerge.vue b/fe/PDA/mycomponents/coms/task/comMerge.vue index 4b60e4af0..5d64697f1 100644 --- a/fe/PDA/mycomponents/coms/task/comMerge.vue +++ b/fe/PDA/mycomponents/coms/task/comMerge.vue @@ -39,8 +39,8 @@ - - + + {{ dataContent.status | statusColor}} @@ -67,16 +67,19 @@ data() { return {} }, - created() { - - }, - methods: { + filters: { statusStyle: function(val) { return getInventoryTypeStyle(val); }, statusColor: function(val) { return getInventoryStatusDesc(val); }, + }, + created() { + + }, + methods: { + } } diff --git a/fe/PDA/mycomponents/coms/task/comPutaway.vue b/fe/PDA/mycomponents/coms/task/comPutaway.vue index a2616677b..93c18dbd0 100644 --- a/fe/PDA/mycomponents/coms/task/comPutaway.vue +++ b/fe/PDA/mycomponents/coms/task/comPutaway.vue @@ -8,8 +8,8 @@ - - {{statusColor(datacontent.jobStatus)}} + + {{datacontent.jobStatus | statusColor}} {{datacontent.itemCode}} @@ -76,21 +76,21 @@ value: null } }, - methods:{ + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, statusColor: function(val) { return getJobStatuDesc(val); }, - + // putawayjobTypeStyle: function(val) { // return getJobStatuStyle(val); // }, // putawayjobTypeDesc: function(val) { // return getJobStatuDesc(val); // } - } + }, } diff --git a/fe/PDA/mycomponents/coms/task/comPutawayjob.vue b/fe/PDA/mycomponents/coms/task/comPutawayjob.vue index 57fba64b4..2e25f12de 100644 --- a/fe/PDA/mycomponents/coms/task/comPutawayjob.vue +++ b/fe/PDA/mycomponents/coms/task/comPutawayjob.vue @@ -39,9 +39,9 @@ - - - {{statusColor(datacontent.status)}} + + + {{datacontent.status | statusColor}} @@ -72,7 +72,7 @@ value: null } }, - methods:{ + filters: { statusStyle: function(val) { return getInventoryTypeStyle(val); }, diff --git a/fe/PDA/mycomponents/coms/task/comReceipt.vue b/fe/PDA/mycomponents/coms/task/comReceipt.vue index 9f88e69c0..d2fef243b 100644 --- a/fe/PDA/mycomponents/coms/task/comReceipt.vue +++ b/fe/PDA/mycomponents/coms/task/comReceipt.vue @@ -2,23 +2,31 @@ @@ -29,17 +37,11 @@ getJobStatuDesc, dateFormat } from '@/common/basic.js'; - import comJobTopInfo from '@/mycomponents/comjob/comJobTopInfo.vue'; - import winJobNumber from '@/mycomponents/wincom/unitCom/winJobNumber.vue'; - import winJobCreation from '@/mycomponents/wincom/unitCom/winJobCreation.vue'; - import winJobNumberDetailInfo from '@/mycomponents/wincom/unitCom/winJobNumberDetailInfo.vue' + import comJobTopInfo from '@/mycomponents/comjob/comJobTopInfo.vue' export default { name: "comReceipt", components: { - comJobTopInfo, - winJobNumber, - winJobCreation, - winJobNumberDetailInfo + comJobTopInfo }, data() { return { @@ -47,13 +49,7 @@ }; }, props: ['receiptItem'], - methods:{ - openJobDetail(item){ - this.$refs.itemDetailInfo.openDetail(); - }, - openJobDetails(item){ - this.$emit("openJobDetail",item); - }, + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, @@ -63,8 +59,7 @@ formatDate: function(val) { return dateFormat(val) } - - } + }, } diff --git a/fe/PDA/mycomponents/coms/task/comReceiptDetail.vue b/fe/PDA/mycomponents/coms/task/comReceiptDetail.vue index 38457fb85..b342a1f55 100644 --- a/fe/PDA/mycomponents/coms/task/comReceiptDetail.vue +++ b/fe/PDA/mycomponents/coms/task/comReceiptDetail.vue @@ -68,7 +68,7 @@ }, // 此处定义传入的数据 props: ['receiptDetail'], - methods:{ + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, @@ -78,7 +78,7 @@ formatDate: function(val) { return dateFormat(val) } - } + }, } diff --git a/fe/PDA/mycomponents/coms/task/comTjDeliver.vue b/fe/PDA/mycomponents/coms/task/comTjDeliver.vue index f5d48c308..d454ac337 100644 --- a/fe/PDA/mycomponents/coms/task/comTjDeliver.vue +++ b/fe/PDA/mycomponents/coms/task/comTjDeliver.vue @@ -3,8 +3,8 @@ - - {{statusColor(datacontent.jobStatus)}} + + {{datacontent.jobStatus | statusColor}} {{datacontent.number}} @@ -56,14 +56,14 @@ value: null } }, - methods:{ + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, statusColor: function(val) { return getJobStatuDesc(val); } - } + }, } diff --git a/fe/PDA/mycomponents/dycom/dyItemInfo.vue b/fe/PDA/mycomponents/dycom/dyItemInfo.vue index 8ca68a560..6279f0afb 100644 --- a/fe/PDA/mycomponents/dycom/dyItemInfo.vue +++ b/fe/PDA/mycomponents/dycom/dyItemInfo.vue @@ -38,6 +38,9 @@ return {}; }, props: ['dataContent'], + filters: { + + }, } diff --git a/fe/PDA/mycomponents/receipt/receipt_detal.vue b/fe/PDA/mycomponents/receipt/receipt_detal.vue deleted file mode 100644 index f4f5f4e4d..000000000 --- a/fe/PDA/mycomponents/receipt/receipt_detal.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/receipt/receipt_detal_A.vue b/fe/PDA/mycomponents/receipt/receipt_detal_A.vue deleted file mode 100644 index df504b009..000000000 --- a/fe/PDA/mycomponents/receipt/receipt_detal_A.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - - - \ No newline at end of file diff --git a/fe/PDA/mycomponents/receipt/receipt_detal_B.vue b/fe/PDA/mycomponents/receipt/receipt_detal_B.vue deleted file mode 100644 index fd5a33150..000000000 --- a/fe/PDA/mycomponents/receipt/receipt_detal_B.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/fe/PDA/mycomponents/return/comProductionReturn.vue b/fe/PDA/mycomponents/return/comProductionReturn.vue index 303629eb7..135c4161c 100644 --- a/fe/PDA/mycomponents/return/comProductionReturn.vue +++ b/fe/PDA/mycomponents/return/comProductionReturn.vue @@ -21,7 +21,7 @@ {{dataContent.creationTime===null?'无':formatDate(dataContent.creationTime) }} + class="text_darkblue">{{dataContent.creationTime===null?'无':dataContent.creationTime| formatDate}} @@ -45,7 +45,7 @@ }; }, props: ['dataContent'], - methods:{ + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, @@ -55,7 +55,7 @@ formatDate: function(val) { return dateFormat(val) } - } + }, } diff --git a/fe/PDA/mycomponents/return/comReturn.vue b/fe/PDA/mycomponents/return/comReturn.vue index e9c96b9f8..9a9d86afd 100644 --- a/fe/PDA/mycomponents/return/comReturn.vue +++ b/fe/PDA/mycomponents/return/comReturn.vue @@ -22,7 +22,7 @@ {{returnItem.creationTime===null?'无':formatDate(returnItem.creationTime) }} + class="text_darkblue">{{returnItem.creationTime===null?'无':returnItem.creationTime| formatDate}} @@ -47,7 +47,7 @@ }; }, props: ['returnItem'], - methods:{ + filters: { statusStyle: function(val) { return getJobStatuStyle(val); }, @@ -57,7 +57,7 @@ formatDate: function(val) { return dateFormat(val) } - } + }, } diff --git a/fe/PDA/mycomponents/scan/comScanCreateTp.vue b/fe/PDA/mycomponents/scan/comScanCreateTp.vue index e9ed5ddab..f319934ed 100644 --- a/fe/PDA/mycomponents/scan/comScanCreateTp.vue +++ b/fe/PDA/mycomponents/scan/comScanCreateTp.vue @@ -92,6 +92,14 @@ }, props: { + }, + filters: { + statusStyle: function(val) { + return getInventoryTypeStyle(val); + }, + statusColor: function(val) { + return getInventoryStatusDesc(val); + }, }, mounted() { this.scanPlaceholder = this.defaultPlaceholder; @@ -104,12 +112,6 @@ }, methods: { - statusStyle: function(val) { - return getInventoryTypeStyle(val); - }, - statusColor: function(val) { - return getInventoryStatusDesc(val); - }, openScanPopup() { this.$refs.popup.open('bottom') }, diff --git a/fe/PDA/mycomponents/scan/comScanIssueList.vue b/fe/PDA/mycomponents/scan/comScanIssueList.vue index 72b60ce73..4d1e009f1 100644 --- a/fe/PDA/mycomponents/scan/comScanIssueList.vue +++ b/fe/PDA/mycomponents/scan/comScanIssueList.vue @@ -16,7 +16,6 @@ components: { comIssue }, - emits:["selectedItem"], props: { }, diff --git a/fe/PDA/mycomponents/scan/comScanReceiptList.vue b/fe/PDA/mycomponents/scan/comScanReceiptList.vue index df2dc94cd..c83600442 100644 --- a/fe/PDA/mycomponents/scan/comScanReceiptList.vue +++ b/fe/PDA/mycomponents/scan/comScanReceiptList.vue @@ -12,7 +12,6 @@ diff --git a/fe/PDA/mycomponents/wincom/basicCom/winBalance.vue b/fe/PDA/mycomponents/wincom/basicCom/winBalance.vue deleted file mode 100644 index 0e9e646b3..000000000 --- a/fe/PDA/mycomponents/wincom/basicCom/winBalance.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/basicCom/winBalance1.vue b/fe/PDA/mycomponents/wincom/basicCom/winBalance1.vue deleted file mode 100644 index 354059eca..000000000 --- a/fe/PDA/mycomponents/wincom/basicCom/winBalance1.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - diff --git a/fe/PDA/mycomponents/wincom/basicCom/winBalance2.vue b/fe/PDA/mycomponents/wincom/basicCom/winBalance2.vue deleted file mode 100644 index 0e9e646b3..000000000 --- a/fe/PDA/mycomponents/wincom/basicCom/winBalance2.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/basicCom/winBalance3.vue b/fe/PDA/mycomponents/wincom/basicCom/winBalance3.vue deleted file mode 100644 index 0e9e646b3..000000000 --- a/fe/PDA/mycomponents/wincom/basicCom/winBalance3.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/basicCom/winBalance4.vue b/fe/PDA/mycomponents/wincom/basicCom/winBalance4.vue deleted file mode 100644 index 0e9e646b3..000000000 --- a/fe/PDA/mycomponents/wincom/basicCom/winBalance4.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/basicCom/winBalance5.vue b/fe/PDA/mycomponents/wincom/basicCom/winBalance5.vue deleted file mode 100644 index 0e9e646b3..000000000 --- a/fe/PDA/mycomponents/wincom/basicCom/winBalance5.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/basicCom/winHint.vue b/fe/PDA/mycomponents/wincom/basicCom/winHint.vue deleted file mode 100644 index e9945cb3c..000000000 --- a/fe/PDA/mycomponents/wincom/basicCom/winHint.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - - - \ No newline at end of file diff --git a/fe/PDA/mycomponents/wincom/basicCom/winJobDetailCompare.vue b/fe/PDA/mycomponents/wincom/basicCom/winJobDetailCompare.vue deleted file mode 100644 index 36db7613c..000000000 --- a/fe/PDA/mycomponents/wincom/basicCom/winJobDetailCompare.vue +++ /dev/null @@ -1,124 +0,0 @@ - - - - diff --git a/fe/PDA/mycomponents/wincom/basicCom/winJobScanCount.vue b/fe/PDA/mycomponents/wincom/basicCom/winJobScanCount.vue deleted file mode 100644 index d47eb4497..000000000 --- a/fe/PDA/mycomponents/wincom/basicCom/winJobScanCount.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/basicCom/winLabel.vue b/fe/PDA/mycomponents/wincom/basicCom/winLabel.vue deleted file mode 100644 index 28377b050..000000000 --- a/fe/PDA/mycomponents/wincom/basicCom/winLabel.vue +++ /dev/null @@ -1,65 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/modelCom/receiptCountEdit.vue b/fe/PDA/mycomponents/wincom/modelCom/receiptCountEdit.vue deleted file mode 100644 index fec2ebab7..000000000 --- a/fe/PDA/mycomponents/wincom/modelCom/receiptCountEdit.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/modelCom/receiptEdit.vue b/fe/PDA/mycomponents/wincom/modelCom/receiptEdit.vue deleted file mode 100644 index 405bc846c..000000000 --- a/fe/PDA/mycomponents/wincom/modelCom/receiptEdit.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/modelCom/receiptHandle.vue b/fe/PDA/mycomponents/wincom/modelCom/receiptHandle.vue deleted file mode 100644 index 1b6ebcb41..000000000 --- a/fe/PDA/mycomponents/wincom/modelCom/receiptHandle.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/modelCom/receiptRecommend.vue b/fe/PDA/mycomponents/wincom/modelCom/receiptRecommend.vue deleted file mode 100644 index c830bd294..000000000 --- a/fe/PDA/mycomponents/wincom/modelCom/receiptRecommend.vue +++ /dev/null @@ -1,92 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/scanCom/winComScan.vue b/fe/PDA/mycomponents/wincom/scanCom/winComScan.vue deleted file mode 100644 index 74ec2c587..000000000 --- a/fe/PDA/mycomponents/wincom/scanCom/winComScan.vue +++ /dev/null @@ -1,132 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/scanCom/winScanButton.vue b/fe/PDA/mycomponents/wincom/scanCom/winScanButton.vue deleted file mode 100644 index 28807a3af..000000000 --- a/fe/PDA/mycomponents/wincom/scanCom/winScanButton.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/scanCom/winScanLocation.vue b/fe/PDA/mycomponents/wincom/scanCom/winScanLocation.vue deleted file mode 100644 index eda8269b5..000000000 --- a/fe/PDA/mycomponents/wincom/scanCom/winScanLocation.vue +++ /dev/null @@ -1,85 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/scanCom/winScanPack.vue b/fe/PDA/mycomponents/wincom/scanCom/winScanPack.vue deleted file mode 100644 index da97ec44f..000000000 --- a/fe/PDA/mycomponents/wincom/scanCom/winScanPack.vue +++ /dev/null @@ -1,199 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winContainerCode.vue b/fe/PDA/mycomponents/wincom/unitCom/winContainerCode.vue deleted file mode 100644 index 0fed4c15a..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winContainerCode.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winFilter.vue b/fe/PDA/mycomponents/wincom/unitCom/winFilter.vue deleted file mode 100644 index f431e3a71..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winFilter.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winInventoryStatus.vue b/fe/PDA/mycomponents/wincom/unitCom/winInventoryStatus.vue deleted file mode 100644 index cd1f82986..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winInventoryStatus.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winItemBasicInfo.vue b/fe/PDA/mycomponents/wincom/unitCom/winItemBasicInfo.vue deleted file mode 100644 index dc6a01533..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winItemBasicInfo.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winItemDetailInfo.vue b/fe/PDA/mycomponents/wincom/unitCom/winItemDetailInfo.vue deleted file mode 100644 index 054cd85ba..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winItemDetailInfo.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winItemInfo.vue b/fe/PDA/mycomponents/wincom/unitCom/winItemInfo.vue deleted file mode 100644 index d930a0023..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winItemInfo.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winJobCreation.vue b/fe/PDA/mycomponents/wincom/unitCom/winJobCreation.vue deleted file mode 100644 index 9a195e4cf..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winJobCreation.vue +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winJobNumber.vue b/fe/PDA/mycomponents/wincom/unitCom/winJobNumber.vue deleted file mode 100644 index 156b07198..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winJobNumber.vue +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - -// - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winJobNumberDetailInfo.vue b/fe/PDA/mycomponents/wincom/unitCom/winJobNumberDetailInfo.vue deleted file mode 100644 index b7b021aa5..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winJobNumberDetailInfo.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winJobRecommend.vue b/fe/PDA/mycomponents/wincom/unitCom/winJobRecommend.vue deleted file mode 100644 index b9485e40b..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winJobRecommend.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winLocationCode.vue b/fe/PDA/mycomponents/wincom/unitCom/winLocationCode.vue deleted file mode 100644 index c19a93751..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winLocationCode.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - -// - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winLocationDetail.vue b/fe/PDA/mycomponents/wincom/unitCom/winLocationDetail.vue deleted file mode 100644 index a0461929a..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winLocationDetail.vue +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winLocationInfo.vue b/fe/PDA/mycomponents/wincom/unitCom/winLocationInfo.vue deleted file mode 100644 index c06f44ae9..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winLocationInfo.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winLot.vue b/fe/PDA/mycomponents/wincom/unitCom/winLot.vue deleted file mode 100644 index ddd83338b..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winLot.vue +++ /dev/null @@ -1,63 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winPackingCode.vue b/fe/PDA/mycomponents/wincom/unitCom/winPackingCode.vue deleted file mode 100644 index cfb23e6b4..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winPackingCode.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winQty.vue b/fe/PDA/mycomponents/wincom/unitCom/winQty.vue deleted file mode 100644 index 327692fc6..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winQty.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winQtyEdit.vue b/fe/PDA/mycomponents/wincom/unitCom/winQtyEdit.vue deleted file mode 100644 index 7b71337e6..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winQtyEdit.vue +++ /dev/null @@ -1,95 +0,0 @@ - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winRecommendSimple.vue b/fe/PDA/mycomponents/wincom/unitCom/winRecommendSimple.vue deleted file mode 100644 index d8dfe6753..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winRecommendSimple.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/unitCom/winSupplierInfo.vue b/fe/PDA/mycomponents/wincom/unitCom/winSupplierInfo.vue deleted file mode 100644 index 2a01a8e25..000000000 --- a/fe/PDA/mycomponents/wincom/unitCom/winSupplierInfo.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - - diff --git a/fe/PDA/mycomponents/wincom/winComScan.vue b/fe/PDA/mycomponents/wincom/winComScan.vue index c212ccf53..0f1929357 100644 --- a/fe/PDA/mycomponents/wincom/winComScan.vue +++ b/fe/PDA/mycomponents/wincom/winComScan.vue @@ -3,9 +3,23 @@ - + + + + + @@ -14,7 +28,6 @@ analyseScanInfo } from '@/common/scan.js'; export default { - emits:["getScanResult"], name: "winComScan", props: { placeholder: { @@ -39,9 +52,9 @@ } }, mounted() { - // if (this.$el.querySelector('textarea') != null) { - // this.$el.querySelector('textarea').setAttribute('inputmode', 'none') - // } + if (this.$el.querySelector('textarea') != null) { + this.$el.querySelector('textarea').setAttribute('inputmode', 'none') + } }, watch: { placeholder() { @@ -64,32 +77,27 @@ confirm() { this.handelScanMsg(); }, - handelScanMsg(e) { - //获取最后一个回车 - // let a = e.detail.value[e.detail.value.length - 1]; + handelScanMsg() { let that = this; - //点击了回车 - if (that.scanMsg.indexOf('\n') != -1) { - if (that.scanMsg == "") - return; - setTimeout(() => { - //去除回车和空格 - let content = that.scanMsg.replace(/[\r\n]/g, "").replace(/[, ]/g, ""); - let scanResult = analyseScanInfo(content); - if (scanResult.sucess) { - if (that.clearResult) { - that.clear(); - } - that.$emit("getScanResult", scanResult); - } else { - uni.showToast({ - title: scanResult.message, - icon: 'error', - duration: 2000 - }) + if (that.scanMsg == "") + return; + setTimeout(() => { + //去除回车和空格 + let content = that.scanMsg.replace(/[\r\n]/g, "").replace(/[, ]/g, ""); + let scanResult = analyseScanInfo(content); + if (scanResult.sucess) { + if (that.clearResult) { + that.clear(); } - }); - } + that.$emit("getScanResult", scanResult); + } else { + uni.showToast({ + title: scanResult.message, + icon: 'error', + duration: 2000 + }) + } + }); }, getfocus() { let that = this; diff --git a/fe/PDA/mycomponents/wincom/winInventoryStatues.vue b/fe/PDA/mycomponents/wincom/winInventoryStatues.vue index 5a17d2c31..56a071ef1 100644 --- a/fe/PDA/mycomponents/wincom/winInventoryStatues.vue +++ b/fe/PDA/mycomponents/wincom/winInventoryStatues.vue @@ -26,7 +26,7 @@ + + diff --git a/fe/PDA/mycomponents/wincom/winScanByPack.vue b/fe/PDA/mycomponents/wincom/winScanByPack.vue index e90ac29a4..e4c49bf6e 100644 --- a/fe/PDA/mycomponents/wincom/winScanByPack.vue +++ b/fe/PDA/mycomponents/wincom/winScanByPack.vue @@ -33,7 +33,7 @@ } from '@/api/index.js'; export default { - name: 'import winScanPack from '@/mycomponents/wincom/scanCom/winScanPack.vue'', + name: 'winScanByPack', components: { winComScan, comMessage diff --git a/fe/PDA/mycomponents/wincom/winTaskDetail.vue b/fe/PDA/mycomponents/wincom/winTaskDetail.vue deleted file mode 100644 index 4457b227b..000000000 --- a/fe/PDA/mycomponents/wincom/winTaskDetail.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - - - diff --git a/fe/PDA/package-lock.json b/fe/PDA/package-lock.json index 0dcb77e48..803d888d2 100644 --- a/fe/PDA/package-lock.json +++ b/fe/PDA/package-lock.json @@ -1,180 +1,936 @@ { - "name": "hello-uniapp", - "version": "3.4.4", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "hello-uniapp", - "version": "3.4.4", - "license": "MIT", - "dependencies": { - "axios": "^1.3.4", - "jwt-decode": "^3.1.2" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "node_modules/axios": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz", - "integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==", - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/jwt-decode": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", - "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - } - }, - "dependencies": { - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "axios": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz", - "integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==", - "requires": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" - }, - "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" - }, - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "jwt-decode": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", - "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "requires": { - "mime-db": "1.52.0" - } - }, - "proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - } - } + "name": "uniproject", + "version": "1.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "uniproject", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "axios": "^0.24.0", + "base-64": "^1.0.0", + "jwt-decode": "^3.1.2", + "moment": "^2.29.4", + "uni-read-pages": "^1.0.5", + "uni-simple-router": "^1.5.5", + "vue-axios": "^3.5.1", + "vue-barcode": "^1.3.0", + "vue-qrcode-reader": "^3.1.0" + }, + "devDependencies": { + "sass": "^1.55.0", + "sass-loader": "^12.6.0" + } + }, + "node_modules/@zxing/library": { + "version": "0.18.6", + "resolved": "https://registry.npmmirror.com/@zxing/library/download/@zxing/library-0.18.6.tgz", + "integrity": "sha1-cXr4xsH9mChl4hBRr917RwrmZ0w=", + "dependencies": { + "ts-custom-error": "^3.0.0" + }, + "engines": { + "node": ">= 10.4.0" + }, + "optionalDependencies": { + "@zxing/text-encoding": "~0.9.0" + } + }, + "node_modules/@zxing/text-encoding": { + "version": "0.9.0", + "resolved": "https://registry.nlark.com/@zxing/text-encoding/download/@zxing/text-encoding-0.9.0.tgz", + "integrity": "sha1-+1D/q8bHxmoMlrTAPj2b50hktws=", + "optional": true + }, + "node_modules/anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/axios": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", + "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", + "dependencies": { + "follow-redirects": "^1.14.4" + } + }, + "node_modules/barcode-detector": { + "version": "1.0.0", + "resolved": "https://registry.nlark.com/barcode-detector/download/barcode-detector-1.0.0.tgz", + "integrity": "sha1-5cWQr/1BUMW1s/3ZKQdacijZv4s=", + "dependencies": { + "@zxing/library": "^0.18.4", + "jsqr": "^1.3.1" + } + }, + "node_modules/base-64": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz", + "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/callforth": { + "version": "0.3.1", + "resolved": "https://registry.npm.taobao.org/callforth/download/callforth-0.3.1.tgz", + "integrity": "sha1-1A9hDH3UfQAR/YS6wys/4Rz/F4U=" + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/core-js": { + "version": "3.20.3", + "resolved": "https://registry.npmmirror.com/core-js/download/core-js-3.20.3.tgz", + "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==", + "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, + "node_modules/decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmmirror.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/filter-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/filter-obj/-/filter-obj-1.1.0.tgz", + "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/follow-redirects": { + "version": "1.14.7", + "resolved": "https://registry.npmmirror.com/follow-redirects/download/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/immutable": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", + "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==", + "dev": true + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/jsbarcode": { + "version": "3.11.5", + "resolved": "https://registry.npmmirror.com/jsbarcode/download/jsbarcode-3.11.5.tgz", + "integrity": "sha512-zv3KsH51zD00I/LrFzFSM6dst7rDn0vIMzaiZFL7qusTjPZiPtxg3zxetp0RR7obmjTw4f6NyGgbdkBCgZUIrA==", + "bin": { + "auto.js": "bin/barcodes/CODE128/auto.js", + "Barcode.js": "bin/barcodes/Barcode.js", + "barcodes": "bin/barcodes", + "canvas.js": "bin/renderers/canvas.js", + "checksums.js": "bin/barcodes/MSI/checksums.js", + "codabar": "bin/barcodes/codabar", + "CODE128": "bin/barcodes/CODE128", + "CODE128_AUTO.js": "bin/barcodes/CODE128/CODE128_AUTO.js", + "CODE128.js": "bin/barcodes/CODE128/CODE128.js", + "CODE128A.js": "bin/barcodes/CODE128/CODE128A.js", + "CODE128B.js": "bin/barcodes/CODE128/CODE128B.js", + "CODE128C.js": "bin/barcodes/CODE128/CODE128C.js", + "CODE39": "bin/barcodes/CODE39", + "constants.js": "bin/barcodes/ITF/constants.js", + "defaults.js": "bin/options/defaults.js", + "EAN_UPC": "bin/barcodes/EAN_UPC", + "EAN.js": "bin/barcodes/EAN_UPC/EAN.js", + "EAN13.js": "bin/barcodes/EAN_UPC/EAN13.js", + "EAN2.js": "bin/barcodes/EAN_UPC/EAN2.js", + "EAN5.js": "bin/barcodes/EAN_UPC/EAN5.js", + "EAN8.js": "bin/barcodes/EAN_UPC/EAN8.js", + "encoder.js": "bin/barcodes/EAN_UPC/encoder.js", + "ErrorHandler.js": "bin/exceptions/ErrorHandler.js", + "exceptions": "bin/exceptions", + "exceptions.js": "bin/exceptions/exceptions.js", + "fixOptions.js": "bin/help/fixOptions.js", + "GenericBarcode": "bin/barcodes/GenericBarcode", + "getOptionsFromElement.js": "bin/help/getOptionsFromElement.js", + "getRenderProperties.js": "bin/help/getRenderProperties.js", + "help": "bin/help", + "index.js": "bin/renderers/index.js", + "index.tmp.js": "bin/barcodes/index.tmp.js", + "ITF": "bin/barcodes/ITF", + "ITF.js": "bin/barcodes/ITF/ITF.js", + "ITF14.js": "bin/barcodes/ITF/ITF14.js", + "JsBarcode.js": "bin/JsBarcode.js", + "linearizeEncodings.js": "bin/help/linearizeEncodings.js", + "merge.js": "bin/help/merge.js", + "MSI": "bin/barcodes/MSI", + "MSI.js": "bin/barcodes/MSI/MSI.js", + "MSI10.js": "bin/barcodes/MSI/MSI10.js", + "MSI1010.js": "bin/barcodes/MSI/MSI1010.js", + "MSI11.js": "bin/barcodes/MSI/MSI11.js", + "MSI1110.js": "bin/barcodes/MSI/MSI1110.js", + "object.js": "bin/renderers/object.js", + "options": "bin/options", + "optionsFromStrings.js": "bin/help/optionsFromStrings.js", + "pharmacode": "bin/barcodes/pharmacode", + "renderers": "bin/renderers", + "shared.js": "bin/renderers/shared.js", + "svg.js": "bin/renderers/svg.js", + "UPC.js": "bin/barcodes/EAN_UPC/UPC.js", + "UPCE.js": "bin/barcodes/EAN_UPC/UPCE.js" + } + }, + "node_modules/jsqr": { + "version": "1.4.0", + "resolved": "https://registry.npmmirror.com/jsqr/download/jsqr-1.4.0.tgz", + "integrity": "sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A==" + }, + "node_modules/jwt-decode": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", + "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" + }, + "node_modules/klona": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", + "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "engines": { + "node": "*" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/query-string": { + "version": "6.14.1", + "resolved": "https://registry.npmmirror.com/query-string/-/query-string-6.14.1.tgz", + "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==", + "dependencies": { + "decode-uri-component": "^0.2.0", + "filter-obj": "^1.1.0", + "split-on-first": "^1.0.0", + "strict-uri-encode": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/rtcpeerconnection-shim": { + "version": "1.2.15", + "resolved": "https://registry.nlark.com/rtcpeerconnection-shim/download/rtcpeerconnection-shim-1.2.15.tgz", + "integrity": "sha1-58wYmoG0NTJMSUmqPftRiIaEskM=", + "dependencies": { + "sdp": "^2.6.0" + }, + "engines": { + "node": ">=6.0.0", + "npm": ">=3.10.0" + } + }, + "node_modules/sass": { + "version": "1.55.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz", + "integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==", + "dev": true, + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/sass-loader": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz", + "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==", + "dev": true, + "dependencies": { + "klona": "^2.0.4", + "neo-async": "^2.6.2" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "fibers": ">= 3.1.0", + "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "sass": "^1.3.0", + "sass-embedded": "*", + "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "fibers": { + "optional": true + }, + "node-sass": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + } + } + }, + "node_modules/sdp": { + "version": "2.12.0", + "resolved": "https://registry.nlark.com/sdp/download/sdp-2.12.0.tgz", + "integrity": "sha1-M4oQavdWDIbkUj+Fg0loA1DVOyI=" + }, + "node_modules/source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/split-on-first": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/split-on-first/-/split-on-first-1.1.0.tgz", + "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==", + "engines": { + "node": ">=6" + } + }, + "node_modules/strict-uri-encode": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", + "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-custom-error": { + "version": "3.2.0", + "resolved": "https://registry.nlark.com/ts-custom-error/download/ts-custom-error-3.2.0.tgz", + "integrity": "sha1-/4+Ao4Erq53ESFNjEtpS3OG3IPs=", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/uni-read-pages": { + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/uni-read-pages/-/uni-read-pages-1.0.5.tgz", + "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==", + "hasInstallScript": true + }, + "node_modules/uni-simple-router": { + "version": "1.5.5", + "resolved": "https://registry.npmmirror.com/uni-simple-router/-/uni-simple-router-1.5.5.tgz", + "integrity": "sha512-VjBnwhvmWYHVNsj2zcPjYBwb9TqG7miR87qLBBLI4gHOnJVYmCyjZK/bj06f9slvTMbWXrze7LJ9/Hi/8DB0ag==", + "hasInstallScript": true, + "dependencies": { + "query-string": "^6.12.1" + } + }, + "node_modules/vue": { + "version": "2.6.14", + "resolved": "https://registry.npmmirror.com/vue/download/vue-2.6.14.tgz", + "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==" + }, + "node_modules/vue-axios": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/vue-axios/-/vue-axios-3.5.1.tgz", + "integrity": "sha512-PyiCHFZ30IGgzmW8mr8DkrzUqqDc5F1qtDfRVMDVx3q1zNSi3UxWKBHxtt/Gsz+HVJehxtc7vxyk+Vxr1Ok2BQ==", + "peerDependencies": { + "axios": ">=1.0.0", + "vue": "^3.0.0 || ^2.0.0" + } + }, + "node_modules/vue-barcode": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/vue-barcode/download/vue-barcode-1.3.0.tgz", + "integrity": "sha512-DxQ0hxes/dP6GajsJumpW6jV14VwlnTwStZbtE6G0wkewuJVDoDOdxUr5seGuxsMT9fJ0aty4X47Z5TG0M/gxg==", + "dependencies": { + "jsbarcode": "^3.5.8" + } + }, + "node_modules/vue-qrcode-reader": { + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/vue-qrcode-reader/download/vue-qrcode-reader-3.1.0.tgz", + "integrity": "sha512-k2uoUjibxzdHJPfmsL1T9KVNzKPG/xIzKWMgBTXExoJlvZ5VKrBIFpP3P+rXNylfL3yw5AftE3K1yf4CoTkfkQ==", + "dependencies": { + "barcode-detector": "^1.0.0", + "callforth": "^0.3.1", + "core-js": "^3.6.5", + "vue": "^2.6.11", + "webrtc-adapter": "7.7.0" + } + }, + "node_modules/webrtc-adapter": { + "version": "7.7.0", + "resolved": "https://registry.npmmirror.com/webrtc-adapter/download/webrtc-adapter-7.7.0.tgz", + "integrity": "sha1-5W/yX5JRd6xVOnxJMjykEI0rX00=", + "dependencies": { + "rtcpeerconnection-shim": "^1.2.15", + "sdp": "^2.12.0" + }, + "engines": { + "node": ">=6.0.0", + "npm": ">=3.10.0" + } + } + }, + "dependencies": { + "@zxing/library": { + "version": "0.18.6", + "resolved": "https://registry.npmmirror.com/@zxing/library/download/@zxing/library-0.18.6.tgz", + "integrity": "sha1-cXr4xsH9mChl4hBRr917RwrmZ0w=", + "requires": { + "@zxing/text-encoding": "~0.9.0", + "ts-custom-error": "^3.0.0" + } + }, + "@zxing/text-encoding": { + "version": "0.9.0", + "resolved": "https://registry.nlark.com/@zxing/text-encoding/download/@zxing/text-encoding-0.9.0.tgz", + "integrity": "sha1-+1D/q8bHxmoMlrTAPj2b50hktws=", + "optional": true + }, + "anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "axios": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", + "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", + "requires": { + "follow-redirects": "^1.14.4" + } + }, + "barcode-detector": { + "version": "1.0.0", + "resolved": "https://registry.nlark.com/barcode-detector/download/barcode-detector-1.0.0.tgz", + "integrity": "sha1-5cWQr/1BUMW1s/3ZKQdacijZv4s=", + "requires": { + "@zxing/library": "^0.18.4", + "jsqr": "^1.3.1" + } + }, + "base-64": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz", + "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" + }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "callforth": { + "version": "0.3.1", + "resolved": "https://registry.npm.taobao.org/callforth/download/callforth-0.3.1.tgz", + "integrity": "sha1-1A9hDH3UfQAR/YS6wys/4Rz/F4U=" + }, + "chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, + "core-js": { + "version": "3.20.3", + "resolved": "https://registry.npmmirror.com/core-js/download/core-js-3.20.3.tgz", + "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==" + }, + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmmirror.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==" + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "filter-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/filter-obj/-/filter-obj-1.1.0.tgz", + "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==" + }, + "follow-redirects": { + "version": "1.14.7", + "resolved": "https://registry.npmmirror.com/follow-redirects/download/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==" + }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "optional": true + }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "immutable": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", + "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==", + "dev": true + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true + }, + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "jsbarcode": { + "version": "3.11.5", + "resolved": "https://registry.npmmirror.com/jsbarcode/download/jsbarcode-3.11.5.tgz", + "integrity": "sha512-zv3KsH51zD00I/LrFzFSM6dst7rDn0vIMzaiZFL7qusTjPZiPtxg3zxetp0RR7obmjTw4f6NyGgbdkBCgZUIrA==" + }, + "jsqr": { + "version": "1.4.0", + "resolved": "https://registry.npmmirror.com/jsqr/download/jsqr-1.4.0.tgz", + "integrity": "sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A==" + }, + "jwt-decode": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", + "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" + }, + "klona": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", + "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", + "dev": true + }, + "moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" + }, + "neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true + }, + "query-string": { + "version": "6.14.1", + "resolved": "https://registry.npmmirror.com/query-string/-/query-string-6.14.1.tgz", + "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==", + "requires": { + "decode-uri-component": "^0.2.0", + "filter-obj": "^1.1.0", + "split-on-first": "^1.0.0", + "strict-uri-encode": "^2.0.0" + } + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "rtcpeerconnection-shim": { + "version": "1.2.15", + "resolved": "https://registry.nlark.com/rtcpeerconnection-shim/download/rtcpeerconnection-shim-1.2.15.tgz", + "integrity": "sha1-58wYmoG0NTJMSUmqPftRiIaEskM=", + "requires": { + "sdp": "^2.6.0" + } + }, + "sass": { + "version": "1.55.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz", + "integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==", + "dev": true, + "requires": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + } + }, + "sass-loader": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz", + "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==", + "dev": true, + "requires": { + "klona": "^2.0.4", + "neo-async": "^2.6.2" + } + }, + "sdp": { + "version": "2.12.0", + "resolved": "https://registry.nlark.com/sdp/download/sdp-2.12.0.tgz", + "integrity": "sha1-M4oQavdWDIbkUj+Fg0loA1DVOyI=" + }, + "source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "dev": true + }, + "split-on-first": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/split-on-first/-/split-on-first-1.1.0.tgz", + "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==" + }, + "strict-uri-encode": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", + "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==" + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "ts-custom-error": { + "version": "3.2.0", + "resolved": "https://registry.nlark.com/ts-custom-error/download/ts-custom-error-3.2.0.tgz", + "integrity": "sha1-/4+Ao4Erq53ESFNjEtpS3OG3IPs=" + }, + "uni-read-pages": { + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/uni-read-pages/-/uni-read-pages-1.0.5.tgz", + "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==" + }, + "uni-simple-router": { + "version": "1.5.5", + "resolved": "https://registry.npmmirror.com/uni-simple-router/-/uni-simple-router-1.5.5.tgz", + "integrity": "sha512-VjBnwhvmWYHVNsj2zcPjYBwb9TqG7miR87qLBBLI4gHOnJVYmCyjZK/bj06f9slvTMbWXrze7LJ9/Hi/8DB0ag==", + "requires": { + "query-string": "^6.12.1" + } + }, + "vue": { + "version": "2.6.14", + "resolved": "https://registry.npmmirror.com/vue/download/vue-2.6.14.tgz", + "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==" + }, + "vue-axios": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/vue-axios/-/vue-axios-3.5.1.tgz", + "integrity": "sha512-PyiCHFZ30IGgzmW8mr8DkrzUqqDc5F1qtDfRVMDVx3q1zNSi3UxWKBHxtt/Gsz+HVJehxtc7vxyk+Vxr1Ok2BQ==" + }, + "vue-barcode": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/vue-barcode/download/vue-barcode-1.3.0.tgz", + "integrity": "sha512-DxQ0hxes/dP6GajsJumpW6jV14VwlnTwStZbtE6G0wkewuJVDoDOdxUr5seGuxsMT9fJ0aty4X47Z5TG0M/gxg==", + "requires": { + "jsbarcode": "^3.5.8" + } + }, + "vue-qrcode-reader": { + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/vue-qrcode-reader/download/vue-qrcode-reader-3.1.0.tgz", + "integrity": "sha512-k2uoUjibxzdHJPfmsL1T9KVNzKPG/xIzKWMgBTXExoJlvZ5VKrBIFpP3P+rXNylfL3yw5AftE3K1yf4CoTkfkQ==", + "requires": { + "barcode-detector": "^1.0.0", + "callforth": "^0.3.1", + "core-js": "^3.6.5", + "vue": "^2.6.11", + "webrtc-adapter": "7.7.0" + } + }, + "webrtc-adapter": { + "version": "7.7.0", + "resolved": "https://registry.npmmirror.com/webrtc-adapter/download/webrtc-adapter-7.7.0.tgz", + "integrity": "sha1-5W/yX5JRd6xVOnxJMjykEI0rX00=", + "requires": { + "rtcpeerconnection-shim": "^1.2.15", + "sdp": "^2.12.0" + } + } + } } diff --git a/fe/PDA/package.json b/fe/PDA/package.json index 34fe846a9..f722a0116 100644 --- a/fe/PDA/package.json +++ b/fe/PDA/package.json @@ -1,108 +1,29 @@ { - "id": "hello-uniapp", - "name": "hello-uniapp", - "displayName": "hello-uniapp 示例工程", - "version": "3.4.4", - "description": "uni-app 框架示例，一套代码，同时发行到iOS、Android、H5、小程序等多个平台，请使用手机扫码快速体验 uni-app 的强大功能", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": "https://github.com/dcloudio/hello-uniapp.git", - "keywords": [ - "hello-uniapp", - "uni-app", - "uni-ui", - "示例工程" - ], - "author": "", - "license": "MIT", - "bugs": { - "url": "https://github.com/dcloudio/hello-uniapp/issues" - }, - "homepage": "https://github.com/dcloudio/hello-uniapp#readme", - "dependencies": { - "axios": "^1.3.4", - "jwt-decode": "^3.1.2" - }, - "dcloudext": { - "category": [ - "前端页面模板", - "uni-app前端项目模板" - ], - "sale": { - "regular": { - "price": "0.00" - }, - "sourcecode": { - "price": "0.00" - } - }, - "contact": { - "qq": "" - }, - "declaration": { - "ads": "无", - "data": "无", - "permissions": "无" - }, - "npmurl": "" - }, - "uni_modules": { - "dependencies": [], - "encrypt": [], - "platforms": { - "cloud": { - "tcb": "y", - "aliyun": "y" - }, - "client": { - "App": { - "app-vue": "y", - "app-nvue": "y" - }, - "H5-mobile": { - "Safari": "y", - "Android Browser": "y", - "微信浏览器(Android)": "y", - "QQ浏览器(Android)": "y" - }, - "H5-pc": { - "Chrome": "y", - "IE": "y", - "Edge": "y", - "Firefox": "y", - "Safari": "y" - }, - "小程序": { - "微信": "y", - "阿里": "y", - "百度": "y", - "字节跳动": "y", - "QQ": "y", - "京东": "y" - }, - "快应用": { - "华为": "u", - "联盟": "u" - }, - "Vue": { - "vue2": "y", - "vue3": "y" - } - } - } - }, - "uni-app": { - "scripts": { - "mp-dingtalk": { - "title": "钉钉小程序", - "env": { - "UNI_PLATFORM": "mp-alipay" - }, - "define": { - "MP-DINGTALK": true - } - } - } - } + "name": "uniproject", + "version": "1.0.0", + "description": "", + "main": "main.js", + "scripts": { + "serve": "npm run dev", + "build": "npm run build", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "keywords": [], + "author": "", + "license": "ISC", + "devDependencies": { + "sass": "^1.55.0", + "sass-loader": "^12.6.0" + }, + "dependencies": { + "axios": "^0.24.0", + "base-64": "^1.0.0", + "jwt-decode": "^3.1.2", + "moment": "^2.29.4", + "uni-read-pages": "^1.0.5", + "uni-simple-router": "^1.5.5", + "vue-axios": "^3.5.1", + "vue-barcode": "^1.3.0", + "vue-qrcode-reader": "^3.1.0" + } } diff --git a/fe/PDA/pages.js b/fe/PDA/pages.js new file mode 100644 index 000000000..fea8dac56 --- /dev/null +++ b/fe/PDA/pages.js @@ -0,0 +1,545 @@ +module.exports = () => ({ + "pages": [{ + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "WMS仓库管理系统", + "enablePullDownRefresh": false, + "titleNView": { + "autoBackButton": "true", + "buttons": [{}] + } + } + }, + { + "path": "pages/login/index", + "style": { + "navigationBarTitleText": "登录", + "titleNView": { + "autoBackButton": "true", + "buttons": [{}] + } + } + }, + { + "path": "pages/setter/index", + "style": { + "navigationBarTitleText": "个人资料", + "enablePullDownRefresh": true + } + + }, { + "path": "pages/setter/passwordpage", + "style": { + "navigationBarTitleText": "修改密码", + "enablePullDownRefresh": true + } + + }, { + "path": "pages/message/index", + "style": { + "navigationBarTitleText": "消息", + "enablePullDownRefresh": true + } + + }, + { + "path": "pages/message/details", + "style": { + "navigationBarTitleText": "消息详情", + "enablePullDownRefresh": true + } + + }, + { + "path": "pages/query/item", + "style": { + "navigationBarTitleText": "按零件查询库存", + "enablePullDownRefresh": true, + } + }, + { + "path": "pages/query/location", + "style": { + "navigationBarTitleText": "按库位查询库存", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/receipt", + "style": { + "navigationBarTitleText": "采购收货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/receipt_detail", + "style": { + "navigationBarTitleText": "收货任务详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/receipt_result", + "style": { + "navigationBarTitleText": "检验结果", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/putaway/purchasePutaway", + "style": { + "navigationBarTitleText": "采购上架", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/return/returnBeforPutaway", + "style": { + "navigationBarTitleText": "上架前退货", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/putaway/semiPutaway", + "style": { + "navigationBarTitleText": "半成品上架", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/putaway/rapReceipt", + "style": { + "navigationBarTitleText": "回收料收货", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/putaway/rapTansfer", + "style": { + "navigationBarTitleText": "回收料调整", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/return/purchaseReturn", + "style": { + "navigationBarTitleText": "上架后退货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/return/purchaseReturn_detail", + "style": { + "navigationBarTitleText": "退货任务详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/scrap", + "style": { + "navigationBarTitleText": "原料报废", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/return/productionReturn", + "style": { + "navigationBarTitleText": "生产退库", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/return/productionReturn_detail", + "style": { + "navigationBarTitleText": "生产退库详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/return/returnToWarehouse", + "style": { + "navigationBarTitleText": "直接退库", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/inventory/transferIssue", + "style": { + "navigationBarTitleText": "储位调出", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/transferIssue_detail", + "style": { + "navigationBarTitleText": "调出详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/transferReceipt", + "style": { + "navigationBarTitleText": "储位调入", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/transferReceipt_detail", + "style": { + "navigationBarTitleText": "调入详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/transferByLocation", + "style": { + "navigationBarTitleText": "储位内移库", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/transferDiffLocation", + "style": { + "navigationBarTitleText": "储位调拨", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/unpick", + "style": { + "navigationBarTitleText": "托盘拆分", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/merge", + "style": { + "navigationBarTitleText": "托盘合并", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/createTP", + "style": { + "navigationBarTitleText": "新建托盘", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/unissue", + "style": { + "navigationBarTitleText": "计划外出库", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/unreceipt", + "style": { + "navigationBarTitleText": "计划外入库", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/hold", + "style": { + "navigationBarTitleText": "隔离库存处理", + "enablePullDownRefresh": true + } + }, + // { + // "path": "pages/instruments/index", + // "style": { + // "navigationBarTitleText": "器具管理", + // "enablePullDownRefresh": true + // } + + // }, + // { + // "path": "pages/check/part", + // "style": { + // "navigationBarTitleText": "零件查询", + // "enablePullDownRefresh": true + // } + // }, + { + "path": "pages/task/Inspect", + "style": { + "navigationBarTitleText": "质量检验", + "enablePullDownRefresh": true + } + }, + // Inspect_summary + { + "path": "pages/task/Inspect_summary", + "style": { + "navigationBarTitleText": "检验结果", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/Inspect_detail", + "style": { + "navigationBarTitleText": "检验任务详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/putawayjob", + "style": { + "navigationBarTitleText": "新增上架", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/putawayByLocation", + "style": { + "navigationBarTitleText": "上架限制库位", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/putawayNoLocation", + "style": { + "navigationBarTitleText": "执行上架", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/putaway_detail", + "style": { + "navigationBarTitleText": "上架任务详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/replen", + "style": { + "navigationBarTitleText": "新增补料", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/issueByFIFO", + "style": { + "navigationBarTitleText": "发料", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/issueNoFIFO", + "style": { + "navigationBarTitleText": "非FIFO发料", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/issue_detail", + "style": { + "navigationBarTitleText": "发料任务详情", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/task/deliver", + "style": { + "navigationBarTitleText": "发货任务", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/deliver_detail", + "style": { + "navigationBarTitleText": "发货任务详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/count", + "style": { + "navigationBarTitleText": "盘点任务", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/countByItem", + "style": { + "navigationBarTitleText": "新增盘点(零件)", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/countByLocation", + "style": { + "navigationBarTitleText": "新增盘点(库位)", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/count_detail", + "style": { + "navigationBarTitleText": "盘点任务详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/image/image", + "style": { + "navigationBarTitleText": "上传图片", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/receipt", + "style": { + "navigationBarTitleText": "完工收货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/recycle", + "style": { + "navigationBarTitleText": "完工收货调整", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/deliverFG", + "style": { + "navigationBarTitleText": "直接发货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/deliverTF", + "style": { + "navigationBarTitleText": "调拨发货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/tjReceipt", + "style": { + "navigationBarTitleText": "天津Mes完工收货", //天津mes + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/receiptOrder", + "style": { + "navigationBarTitleText": "按序收货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/receiptRandom", + "style": { + "navigationBarTitleText": "任意收货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/deliverAll", + "style": { + "navigationBarTitleText": "按序发货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/deliverMany", + "style": { + "navigationBarTitleText": "跳序发货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/tjDeliver_detail", + "style": { + "navigationBarTitleText": "发货任务详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/tjRecycle", + "style": { + "navigationBarTitleText": "完工调整", //天津mes + "enablePullDownRefresh": true + } + }, + { + "path" : "pages/setter/setterDetail", + "style" : + { + "navigationBarTitleText": "参数设置详情", + "enablePullDownRefresh": true + } + + }, + { + "path": "pages/store/deliverRaw", + "style": { + "navigationBarTitleText": "原料直发", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/store/issueDirect", + "style": { + "navigationBarTitleText": "直接发料", + "enablePullDownRefresh": false + } + }, + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "WMS仓库管理系统-移动端", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8", + "h5": { + "maxWidth": 1190, + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#F1F1F1" + }, + //增加返回首页 + "titleNView": { + "autoBackButton": "true", + "buttons": [{ + "float": "right", + "text": "\ue7c6", + "fontSrc": "/static/icon/iconfont.ttf", + "fontSize": "22px" + }] + }, + "softinputMode": "adjustPan" //adjustResize + }, + + "tabBar": { + "color": "#7A7E83", + "selectedColor": "#2678f2", + "borderStyle": "black", + "backgroundColor": "#ffffff", + "list": [{ + "pagePath": "pages/index/index", + "iconPath": "static/bar/sy.svg", + "selectedIconPath": "static/bar/sya.svg", + "text": "首页" + }, + // { + // "pagePath": "pages/list/index", + // "iconPath": "static/bar/fx.png", + // "selectedIconPath": "static/bar/fxa.png", + // "text": "发现" + // }, + { + "pagePath": "pages/message/index", + "iconPath": "static/bar/xx.svg", + "selectedIconPath": "static/bar/xxa.svg", + "text": "消息" + }, { + "pagePath": "pages/setter/index", + "iconPath": "static/bar/sz.svg", + "selectedIconPath": "static/bar/sza.svg", + "text": "设置" + } + ] + } +}) diff --git a/fe/PDA/pages.json b/fe/PDA/pages.json index 022b99358..10e248d24 100644 --- a/fe/PDA/pages.json +++ b/fe/PDA/pages.json @@ -1,23 +1,14 @@ { - "pages": [{ "path": "pages/index/index", "style": { - "navigationBarTitleText": "WMS仓库管理系统-移动端", - "titleNView": { - "autoBackButton": "true", - "buttons": [{}] - } + "navigationBarTitleText": "WMS仓库管理系统-移动端" } }, { "path": "pages/login/index", "style": { - "navigationBarTitleText": "登录", - "titleNView": { - "autoBackButton": "true", - "buttons": [{}] - } + "navigationBarTitleText": "登录" } }, { @@ -25,7 +16,6 @@ "style": { "navigationBarTitleText": "个人资料", "enablePullDownRefresh": true - } }, { @@ -34,16 +24,8 @@ "navigationBarTitleText": "修改密码", "enablePullDownRefresh": true } - }, - { - "path": "pages/setter/setterDetail", - "style": { - "navigationBarTitleText": "参数设置详情", - "enablePullDownRefresh": true - } - - }, - { + + }, { "path": "pages/message/index", "style": { "navigationBarTitleText": "消息", @@ -57,44 +39,45 @@ "navigationBarTitleText": "消息详情", "enablePullDownRefresh": true } - + }, { - "path": "pages/demo/demo", + "path": "pages/query/item", "style": { - "navigationBarTitleText": "组件", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, // 是否配置下拉刷新的功能 + "navigationBarTitleText": "按零件查询库存" /// 标题 + // "titleNView": { + + // "autoBackButton": "true", // 左上角返回按钮 + // "buttons": [{ + // "id": "1", + // "float": "right", + // "fontSize": "15px", + // // "fontSrc": "你自己自定义按钮前面放的icon", + // "text": "WMS仓库管理系统-移动端" + // }] + // } } }, { - "path": "pages/putaway/purchasePutaway", + "path": "pages/query/location", "style": { - "navigationBarTitleText": "采购上架", - "enablePullDownRefresh": false + "navigationBarTitleText": "按库位查询库存", + "enablePullDownRefresh": true } }, { "path": "pages/task/receipt", "style": { "navigationBarTitleText": "采购收货", - "enablePullDownRefresh": true, - "titleNView": { - "autoBackButton": "true", - "buttons": [{ - "float": "right", - "text": "\ue7c6", - "fontSrc": "/static/icon/iconfont.ttf", - "fontSize": "22px" - }, - // 右边按钮 - { - "float": "right", - "text": "过滤", - "fontSrc": "/static/icon/iconfont.ttf", - "fontSize": "15px" - } - ] - } + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/Inspect_summary", + "style": { + "navigationBarTitleText": "检验结果", + "enablePullDownRefresh": true } }, { @@ -104,6 +87,20 @@ "enablePullDownRefresh": true } }, + { + "path": "pages/task/receipt_result", + "style": { + "navigationBarTitleText": "检验结果", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/putaway/purchasePutaway", + "style": { + "navigationBarTitleText": "采购上架", + "enablePullDownRefresh": false + } + }, { "path": "pages/return/returnBeforPutaway", "style": { @@ -111,6 +108,27 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/putaway/semiPutaway", + "style": { + "navigationBarTitleText": "半成品上架", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/putaway/rapReceipt", + "style": { + "navigationBarTitleText": "回收料收货", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/putaway/rapTansfer", + "style": { + "navigationBarTitleText": "回收料调整", + "enablePullDownRefresh": true + } + }, { "path": "pages/return/purchaseReturn", "style": { @@ -133,53 +151,59 @@ } }, { - "path": "pages/store/deliverRaw", + "path": "pages/return/productionReturn", "style": { - "navigationBarTitleText": "原料直发", - "enablePullDownRefresh": false + "navigationBarTitleText": "生产退库", + "enablePullDownRefresh": true } }, { - "path": "pages/task/issueByFIFO", + "path": "pages/return/productionReturn_detail", "style": { - "navigationBarTitleText": "发料", + "navigationBarTitleText": "生产退库详情", "enablePullDownRefresh": true } }, { - "path": "pages/task/issue_detail", + "path": "pages/return/returnToWarehouse", "style": { - "navigationBarTitleText": "发料任务详情", + "navigationBarTitleText": "直接退库", "enablePullDownRefresh": false } }, { - "path": "pages/store/issueDirect", + "path": "pages/inventory/transferIssue", "style": { - "navigationBarTitleText": "直接发料", - "enablePullDownRefresh": false + "navigationBarTitleText": "储位调出", + "enablePullDownRefresh": true } }, { - "path": "pages/query/item", + "path": "pages/inventory/transferIssue_detail", "style": { - "enablePullDownRefresh": true, // 是否配置下拉刷新的功能 - "navigationBarTitleText": "按零件查询库存", - "titleNView": { - "autoBackButton": "true", - "buttons": [{}] - } + "navigationBarTitleText": "调出详情", + "enablePullDownRefresh": true } }, { - "path": "pages/query/location", + "path": "pages/inventory/transferReceipt", "style": { - "navigationBarTitleText": "按库位查询库存", - "enablePullDownRefresh": true, - "titleNView": { - "autoBackButton": "true", - "buttons": [{}] - } + "navigationBarTitleText": "储位调入", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/transferReceipt_detail", + "style": { + "navigationBarTitleText": "调入详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/replen", + "style": { + "navigationBarTitleText": "新增补料", + "enablePullDownRefresh": true } }, { @@ -196,6 +220,120 @@ "enablePullDownRefresh": true } }, + { + "path": "pages/inventory/unpick", + "style": { + "navigationBarTitleText": "托盘拆分", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/merge", + "style": { + "navigationBarTitleText": "托盘合并", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/createTP", + "style": { + "navigationBarTitleText": "新建托盘", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/unissue", + "style": { + "navigationBarTitleText": "计划外出库", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/unreceipt", + "style": { + "navigationBarTitleText": "计划外入库", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/inventory/hold", + "style": { + "navigationBarTitleText": "隔离库存处理", + "enablePullDownRefresh": true + } + }, + // { + // "path": "pages/instruments/index", + // "style": { + // "navigationBarTitleText": "器具管理", + // "enablePullDownRefresh": true + // } + + // }, + // { + // "path": "pages/material/index", + // "style": { + // "navigationBarTitleText": "原料收货", + // "enablePullDownRefresh": true + // } + // }, + // { + // "path": "pages/check/part", + // "style": { + // "navigationBarTitleText": "零件查询", + // "enablePullDownRefresh": true + // } + + // }, + { + "path": "pages/task/Inspect", + "style": { + "navigationBarTitleText": "质量检验", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/putawayJob", + "style": { + "navigationBarTitleText": "新增上架", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/putawayByLocation", + "style": { + "navigationBarTitleText": "上架限制库位", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/putawayNoLocation", + "style": { + "navigationBarTitleText": "执行上架", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/issueByFIFO", + "style": { + "navigationBarTitleText": "发料", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/issueNoFIFO", + "style": { + "navigationBarTitleText": "非FIFO发料", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/deliver", + "style": { + "navigationBarTitleText": "发货任务", + "enablePullDownRefresh": true + } + }, { "path": "pages/task/count", "style": { @@ -203,6 +341,20 @@ "enablePullDownRefresh": true } }, + { + "path": "pages/task/countByItem", + "style": { + "navigationBarTitleText": "新增盘点(零件)", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/task/countByLocation", + "style": { + "navigationBarTitleText": "新增盘点(库位)", + "enablePullDownRefresh": true + } + }, { "path": "pages/task/count_detail", "style": { @@ -211,55 +363,110 @@ } }, { - "path": "pages/return/returnToWarehouse", + "path": "pages/image/image", "style": { - "navigationBarTitleText": "直接退库", - "enablePullDownRefresh": false + "navigationBarTitleText": "上传图片", + "enablePullDownRefresh": true } }, { - "path": "pages/return/productionReturn", + "path": "pages/store/receipt", "style": { - "navigationBarTitleText": "生产退库", + "navigationBarTitleText": "完工收货", "enablePullDownRefresh": true } }, { - "path": "pages/return/productionReturn_detail", + "path": "pages/store/recycle", "style": { - "navigationBarTitleText": "生产退库详情", + "navigationBarTitleText": "完工收货调整", "enablePullDownRefresh": true } }, { - "path": "pages/putaway/rapReceipt", + "path": "pages/store/deliverFG", "style": { - "navigationBarTitleText": "回收料收货", - "enablePullDownRefresh": false + "navigationBarTitleText": "直接发货", + "enablePullDownRefresh": true } }, { - "path": "pages/putaway/semiPutaway", + "path": "pages/store/deliverTF", "style": { - "navigationBarTitleText": "半成品上架", - "enablePullDownRefresh": false + "navigationBarTitleText": "调拨发货", + "enablePullDownRefresh": true } }, { - "path": "pages/task/deliver", + "path": "pages/store/tjReceipt", "style": { - "navigationBarTitleText": "发货任务", + "navigationBarTitleText": "天津Mes完工收货", //天津mes + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/receiptMany", + "style": { + "navigationBarTitleText": "任意收货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/receiptAll", + "style": { + "navigationBarTitleText": "按序收货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/tjRecycle", + "style": { + "navigationBarTitleText": "完工调整", //天津mes + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/deliverAll", + "style": { + "navigationBarTitleText": "按序发货", "enablePullDownRefresh": true } }, { - "path": "pages/task/deliver_detail", + "path": "pages/store/deliverMany", + "style": { + "navigationBarTitleText": "任意发货", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/tjDeliver_detail", "style": { "navigationBarTitleText": "发货任务详情", "enablePullDownRefresh": true } + }, + { + "path": "pages/setter/setterDetail", + "style": { + "navigationBarTitleText": "参数设置详情", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/deliverRaw", + "style": { + "navigationBarTitleText": "原料直发", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/store/issueDirect", + "style": { + "navigationBarTitleText": "直接发料", + "enablePullDownRefresh": false + } } - ], "globalStyle": { "navigationBarTextStyle": "black", @@ -271,30 +478,19 @@ "navigationBarTextStyle": "black", "navigationBarBackgroundColor": "#F1F1F1" }, - //增加返回首页 - "titleNView": { - "autoBackButton": "true", - "buttons": [{ - "float": "right", - "text": "\ue7c6", - "fontSrc": "/static/icon/iconfont.ttf", - "fontSize": "22px" - } - ] - }, "softinputMode": "adjustPan" //adjustResize }, + "tabBar": { "color": "#7A7E83", "selectedColor": "#2678f2", "borderStyle": "black", "backgroundColor": "#ffffff", - "list": [ - { + "list": [{ "pagePath": "pages/index/index", "iconPath": "static/bar/sy.png", "selectedIconPath": "static/bar/sya.png", - "text": "首页" + "text": "WMS仓库管理系统-移动端" }, { "pagePath": "pages/message/index", diff --git a/fe/PDA/pages/API/action-sheet/action-sheet.vue b/fe/PDA/pages/API/action-sheet/action-sheet.vue deleted file mode 100644 index 90c035d81..000000000 --- a/fe/PDA/pages/API/action-sheet/action-sheet.vue +++ /dev/null @@ -1,60 +0,0 @@ - - diff --git a/fe/PDA/pages/API/add-phone-contact/add-phone-contact.vue b/fe/PDA/pages/API/add-phone-contact/add-phone-contact.vue deleted file mode 100644 index f4c39a373..000000000 --- a/fe/PDA/pages/API/add-phone-contact/add-phone-contact.vue +++ /dev/null @@ -1,102 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/animation/animation.vue b/fe/PDA/pages/API/animation/animation.vue deleted file mode 100644 index 379858d24..000000000 --- a/fe/PDA/pages/API/animation/animation.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/background-audio/background-audio.vue b/fe/PDA/pages/API/background-audio/background-audio.vue deleted file mode 100644 index 5a3315e24..000000000 --- a/fe/PDA/pages/API/background-audio/background-audio.vue +++ /dev/null @@ -1,163 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/bluetooth/bluetooth.vue b/fe/PDA/pages/API/bluetooth/bluetooth.vue deleted file mode 100644 index d9bc4dadf..000000000 --- a/fe/PDA/pages/API/bluetooth/bluetooth.vue +++ /dev/null @@ -1,723 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/brightness/brightness.vue b/fe/PDA/pages/API/brightness/brightness.vue deleted file mode 100644 index a0c9e125b..000000000 --- a/fe/PDA/pages/API/brightness/brightness.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/canvas/canvas.vue b/fe/PDA/pages/API/canvas/canvas.vue deleted file mode 100644 index f0f34a127..000000000 --- a/fe/PDA/pages/API/canvas/canvas.vue +++ /dev/null @@ -1,366 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/choose-location/choose-location.vue b/fe/PDA/pages/API/choose-location/choose-location.vue deleted file mode 100644 index 3b30801c1..000000000 --- a/fe/PDA/pages/API/choose-location/choose-location.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/clipboard/clipboard.vue b/fe/PDA/pages/API/clipboard/clipboard.vue deleted file mode 100644 index 648fc4df7..000000000 --- a/fe/PDA/pages/API/clipboard/clipboard.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - diff --git a/fe/PDA/pages/API/download-file/download-file.vue b/fe/PDA/pages/API/download-file/download-file.vue deleted file mode 100644 index 2e1ddcd77..000000000 --- a/fe/PDA/pages/API/download-file/download-file.vue +++ /dev/null @@ -1,63 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/full-screen-video-ad/full-screen-video-ad.vue b/fe/PDA/pages/API/full-screen-video-ad/full-screen-video-ad.vue deleted file mode 100644 index 5224ed82e..000000000 --- a/fe/PDA/pages/API/full-screen-video-ad/full-screen-video-ad.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - diff --git a/fe/PDA/pages/API/get-location/get-location.vue b/fe/PDA/pages/API/get-location/get-location.vue deleted file mode 100644 index 26dfd16c8..000000000 --- a/fe/PDA/pages/API/get-location/get-location.vue +++ /dev/null @@ -1,186 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/get-network-type/get-network-type.vue b/fe/PDA/pages/API/get-network-type/get-network-type.vue deleted file mode 100644 index 740d99eaa..000000000 --- a/fe/PDA/pages/API/get-network-type/get-network-type.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/get-node-info/get-node-info.vue b/fe/PDA/pages/API/get-node-info/get-node-info.vue deleted file mode 100644 index 870ab1678..000000000 --- a/fe/PDA/pages/API/get-node-info/get-node-info.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - - - diff --git a/fe/PDA/pages/API/get-system-info/get-system-info.vue b/fe/PDA/pages/API/get-system-info/get-system-info.vue deleted file mode 100644 index feac3b549..000000000 --- a/fe/PDA/pages/API/get-system-info/get-system-info.vue +++ /dev/null @@ -1,148 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/get-user-info/get-user-info.vue b/fe/PDA/pages/API/get-user-info/get-user-info.vue deleted file mode 100644 index f3ac9284a..000000000 --- a/fe/PDA/pages/API/get-user-info/get-user-info.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/ibeacon/ibeacon.vue b/fe/PDA/pages/API/ibeacon/ibeacon.vue deleted file mode 100644 index 0b19e4fd6..000000000 --- a/fe/PDA/pages/API/ibeacon/ibeacon.vue +++ /dev/null @@ -1,300 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/inner-audio/inner-audio.vue b/fe/PDA/pages/API/inner-audio/inner-audio.vue deleted file mode 100644 index ba6a2c265..000000000 --- a/fe/PDA/pages/API/inner-audio/inner-audio.vue +++ /dev/null @@ -1,124 +0,0 @@ - - - diff --git a/fe/PDA/pages/API/intersection-observer/intersection-observer.vue b/fe/PDA/pages/API/intersection-observer/intersection-observer.vue deleted file mode 100644 index 80e5d9b6a..000000000 --- a/fe/PDA/pages/API/intersection-observer/intersection-observer.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - diff --git a/fe/PDA/pages/API/login/login.vue b/fe/PDA/pages/API/login/login.vue deleted file mode 100644 index 9ab812f67..000000000 --- a/fe/PDA/pages/API/login/login.vue +++ /dev/null @@ -1,322 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/make-phone-call/make-phone-call.vue b/fe/PDA/pages/API/make-phone-call/make-phone-call.vue deleted file mode 100644 index 0e3cdee00..000000000 --- a/fe/PDA/pages/API/make-phone-call/make-phone-call.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/map-search/map-search.nvue b/fe/PDA/pages/API/map-search/map-search.nvue deleted file mode 100644 index 9dc8ef613..000000000 --- a/fe/PDA/pages/API/map-search/map-search.nvue +++ /dev/null @@ -1,102 +0,0 @@ - - - - - diff --git a/fe/PDA/pages/API/map/map.nvue b/fe/PDA/pages/API/map/map.nvue deleted file mode 100644 index e9d0d4cda..000000000 --- a/fe/PDA/pages/API/map/map.nvue +++ /dev/null @@ -1,447 +0,0 @@ - - - - - diff --git a/fe/PDA/pages/API/modal/modal.vue b/fe/PDA/pages/API/modal/modal.vue deleted file mode 100644 index 65dff7365..000000000 --- a/fe/PDA/pages/API/modal/modal.vue +++ /dev/null @@ -1,40 +0,0 @@ - - \ No newline at end of file diff --git a/fe/PDA/pages/API/navigator/navigator.vue b/fe/PDA/pages/API/navigator/navigator.vue deleted file mode 100644 index b58504f0e..000000000 --- a/fe/PDA/pages/API/navigator/navigator.vue +++ /dev/null @@ -1,105 +0,0 @@ - - diff --git a/fe/PDA/pages/API/navigator/new-page/new-nvue-page-1.nvue b/fe/PDA/pages/API/navigator/new-page/new-nvue-page-1.nvue deleted file mode 100644 index 5c25cea9e..000000000 --- a/fe/PDA/pages/API/navigator/new-page/new-nvue-page-1.nvue +++ /dev/null @@ -1,83 +0,0 @@ - - - diff --git a/fe/PDA/pages/API/navigator/new-page/new-nvue-page-2.nvue b/fe/PDA/pages/API/navigator/new-page/new-nvue-page-2.nvue deleted file mode 100644 index a5d07800e..000000000 --- a/fe/PDA/pages/API/navigator/new-page/new-nvue-page-2.nvue +++ /dev/null @@ -1,69 +0,0 @@ - - - diff --git a/fe/PDA/pages/API/navigator/new-page/new-vue-page-1.vue b/fe/PDA/pages/API/navigator/new-page/new-vue-page-1.vue deleted file mode 100644 index 0b6c608af..000000000 --- a/fe/PDA/pages/API/navigator/new-page/new-vue-page-1.vue +++ /dev/null @@ -1,108 +0,0 @@ - - - diff --git a/fe/PDA/pages/API/navigator/new-page/new-vue-page-2.vue b/fe/PDA/pages/API/navigator/new-page/new-vue-page-2.vue deleted file mode 100644 index 925badd91..000000000 --- a/fe/PDA/pages/API/navigator/new-page/new-vue-page-2.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - diff --git a/fe/PDA/pages/API/on-accelerometer-change/on-accelerometer-change.vue b/fe/PDA/pages/API/on-accelerometer-change/on-accelerometer-change.vue deleted file mode 100644 index 0565b422c..000000000 --- a/fe/PDA/pages/API/on-accelerometer-change/on-accelerometer-change.vue +++ /dev/null @@ -1,62 +0,0 @@ - - diff --git a/fe/PDA/pages/API/rewarded-video-ad/rewarded-video-ad.vue b/fe/PDA/pages/API/rewarded-video-ad/rewarded-video-ad.vue deleted file mode 100644 index a6d7b9923..000000000 --- a/fe/PDA/pages/API/rewarded-video-ad/rewarded-video-ad.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - - - diff --git a/fe/PDA/pages/API/save-media/save-media.vue b/fe/PDA/pages/API/save-media/save-media.vue deleted file mode 100644 index 9b30d5633..000000000 --- a/fe/PDA/pages/API/save-media/save-media.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/scan-code/scan-code.vue b/fe/PDA/pages/API/scan-code/scan-code.vue deleted file mode 100644 index 89006deb2..000000000 --- a/fe/PDA/pages/API/scan-code/scan-code.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - - diff --git a/fe/PDA/pages/API/set-navigation-bar-title/set-navigation-bar-title.test.js b/fe/PDA/pages/API/set-navigation-bar-title/set-navigation-bar-title.test.js deleted file mode 100644 index 4023b7324..000000000 --- a/fe/PDA/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/fe/PDA/pages/API/set-navigation-bar-title/set-navigation-bar-title.vue b/fe/PDA/pages/API/set-navigation-bar-title/set-navigation-bar-title.vue deleted file mode 100644 index 585462126..000000000 --- a/fe/PDA/pages/API/set-navigation-bar-title/set-navigation-bar-title.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/fe/PDA/pages/API/share/share.vue b/fe/PDA/pages/API/share/share.vue deleted file mode 100644 index a56f017b5..000000000 --- a/fe/PDA/pages/API/share/share.vue +++ /dev/null @@ -1,293 +0,0 @@ - - - - - diff --git a/fe/PDA/platforms/app-plus/orientation/orientation.vue b/fe/PDA/platforms/app-plus/orientation/orientation.vue deleted file mode 100644 index ba636c4ed..000000000 --- a/fe/PDA/platforms/app-plus/orientation/orientation.vue +++ /dev/null @@ -1,64 +0,0 @@ -