diff --git a/common/style/layout.css b/common/style/layout.css
index e003df6..a549a30 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -273,7 +273,7 @@ uni-button:after {
width: 100%;
z-index: 200;
background-color: #fff;
- padding-top: 10rpx;
+ padding: 10rpx 0;
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
}
.submit-button {
@@ -285,8 +285,7 @@ uni-button:after {
padding: 0 22rpx;
background-color: #fff;
border: 1px solid #ff6a00;
- margin: 0 40rpx 10rpx 0;
- border-radius: 30rpx;
+ border-radius: 10rpx;
}
.btn-disabled, .submit-button[disabled] {
background-color: #c9c9c9;
diff --git a/common/style/reset.css b/common/style/reset.css
index 8355389..0890ca5 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -40,4 +40,87 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+}
+.flexstart {
+ align-items: flex-start !important;
+}
+.jcflexstart {
+ justify-content: flex-start !important;
+}
+.zd-row {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.zd-col-24 {
+ width: 100%;
+}
+.zd-col-23 {
+ width: 95.83333%
+}
+.zd-col-22 {
+ width: 91.66667%
+}
+.zd-col-21 {
+ width: 87.5%
+}
+.zd-col-20 {
+ width: 83.33333%
+}
+.zd-col-19 {
+ width: 79.16667%
+}
+.zd-col-18 {
+ width: 75%
+}
+.zd-col-17 {
+ width: 70.83333%
+}
+.zd-col-16 {
+ width: 66.66667%
+}
+.zd-col-15 {
+ width: 62.5%
+}
+.zd-col-14 {
+ width: 58.33333%
+}
+.zd-col-13 {
+ width: 54.16667%
+}
+.zd-col-12 {
+ width: 50%;
+}
+.zd-col-11 {
+ width: 45.83333%
+}
+.zd-col-10 {
+ width: 41.66667%
+}
+.zd-col-9 {
+ width: 37.5%
+}
+.zd-col-8 {
+ width: 33.33333%
+}
+.zd-col-7 {
+ width: 29.16667%
+}
+.zd-col-6 {
+ width: 25%
+}
+.zd-col-5 {
+ width: 20.83333%
+}
+.zd-col-4 {
+ width: 16.66667%
+}
+.zd-col-3 {
+ width: 12.5%
+}
+.zd-col-2 {
+ width: 8.33333%
+}
+.zd-col-1 {
+ width: 4.16667%
}
\ No newline at end of file
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 7525607..45eb768 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -1,18 +1,16 @@
-
+
-
-
-
-
-
-
+ @focus="handleFocus"
+ @blur="handleBlur"
+ @confirm="handleSend">
+
+
@@ -21,7 +19,6 @@
export default {
data() {
return {
- cur: '',
focusState: false
};
},
@@ -30,109 +27,44 @@
event: 'input'
},
props: {
- value: String,
- seaShow: {
- type: Boolean,
- default: false
- },
- focused: {
- type: Boolean,
- default: false
- }
+ value: String
},
- mounted () {
- if (this.focused) {
- this.focusState = true
- }
- },
methods: {
- handleChange ($event) {
- this.cur = $event.target.value
- this.$emit('input', this.cur)
- this.$emit('handleChange', this.cur)
- if (this.focusState) {
- this.focusState = false
+ handleFocus () {
+ this.focusState = true
+ },
+ handleBlur (e) {
+ this.$emit('input', e.target.value)
+ if (e.target.value.length) {
+ this.$emit('handleChange', e.target.value)
}
- },
- handleBlur () {
- this.focusState = false
- },
- toSearch () {
- this.$emit('toSearch', this.cur)
+ this.focusState = false
},
toDel () {
- this.cur = ''
this.$emit('input', '')
},
- toScan () {
- setTimeout(() => {
- this.focusState = true
- },0)
- setTimeout(() => {
- uni.hideKeyboard()
- }, 300)
- this.cur = ''
- this.$emit('input', '')
- },
- async toPhone() {
- // #ifdef APP-PLUS
- let status = await this.checkPermission();
- if (status !== 1) {
- return;
+ handleSend (e) {
+ this.$emit('input', e.target.value)
+ if (e.target.value.length) {
+ this.$emit('handleChange', e.target.value)
}
- // #endif
- uni.scanCode({
- success: (res) => {
- this.$emit('input', res.result)
- this.$emit('handleChange', res.result)
- },
- fail: (err) => {
- // uni.showToast({
- // title: '出错',
- // icon: 'none'
- // })
- }
- });
}
- // #ifdef APP-PLUS
- ,
- async checkPermission(code) {
- let status = permision.isIOS ? await permision.requestIOS('camera') :
- await permision.requestAndroid('android.permission.CAMERA');
-
- if (status === null || status === 1) {
- status = 1;
- } else {
- uni.showModal({
- content: "需要相机权限",
- confirmText: "设置",
- success: function(res) {
- if (res.confirm) {
- permision.gotoAppSetting();
- }
- }
- })
- }
- return status;
- }
- // #endif
}
}
-
diff --git a/components/SearchBox1.vue b/components/SearchBox1.vue
deleted file mode 100644
index 63134f7..0000000
--- a/components/SearchBox1.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5a4dddb..dd3c2ac 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -60,7 +60,7 @@
{menu_id: '5', icon: 'RF09', name: '人工分拣', path: '', sonTree: [
{menu_id: '1', name: '分拣排产', path: '/pages/modules/sort-schedue'},
{menu_id: '2', name: '剩料入库', path: '/pages/modules/surplus-mater-instore'},
- {menu_id: '3', name: '托盘绑定', path: '/pages/modules/pallet-bind'},
+ // {menu_id: '3', name: '托盘绑定', path: '/pages/modules/pallet-bind'},
{menu_id: '4', name: '包装入库', path: '/pages/modules/package-instore'},
{menu_id: '5', name: '呼叫满料', path: '/pages/modules/call-full-mater'},
{menu_id: '6', name: '呼叫木盘', path: '/pages/modules/call-mupan'},
diff --git a/pages/modules/call-full-mater.vue b/pages/modules/call-full-mater.vue
index d9ce7c4..cea19ae 100644
--- a/pages/modules/call-full-mater.vue
+++ b/pages/modules/call-full-mater.vue
@@ -25,9 +25,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/call-mupan.vue b/pages/modules/call-mupan.vue
index 9c7e1fa..bed5849 100644
--- a/pages/modules/call-mupan.vue
+++ b/pages/modules/call-mupan.vue
@@ -25,9 +25,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/empty-instore.vue b/pages/modules/empty-instore.vue
index 827a045..67283d5 100644
--- a/pages/modules/empty-instore.vue
+++ b/pages/modules/empty-instore.vue
@@ -25,9 +25,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/equip-inspection.vue b/pages/modules/equip-inspection.vue
index 1440a6a..b052005 100644
--- a/pages/modules/equip-inspection.vue
+++ b/pages/modules/equip-inspection.vue
@@ -25,9 +25,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/equip-operate.vue b/pages/modules/equip-operate.vue
index af5a8eb..2cd0517 100644
--- a/pages/modules/equip-operate.vue
+++ b/pages/modules/equip-operate.vue
@@ -19,9 +19,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/forced-rest.vue b/pages/modules/forced-rest.vue
index 4c8523a..4661f62 100644
--- a/pages/modules/forced-rest.vue
+++ b/pages/modules/forced-rest.vue
@@ -35,9 +35,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/hunnian-carry.vue b/pages/modules/hunnian-carry.vue
index 04cc8e7..e6da801 100644
--- a/pages/modules/hunnian-carry.vue
+++ b/pages/modules/hunnian-carry.vue
@@ -19,9 +19,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/hunnian-operate.vue b/pages/modules/hunnian-operate.vue
index ac4755a..dc59ee9 100644
--- a/pages/modules/hunnian-operate.vue
+++ b/pages/modules/hunnian-operate.vue
@@ -25,9 +25,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/man-group.vue b/pages/modules/man-group.vue
index ff8d70f..93014c4 100644
--- a/pages/modules/man-group.vue
+++ b/pages/modules/man-group.vue
@@ -35,9 +35,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/package-instore.vue b/pages/modules/package-instore.vue
index b6bc2cf..e3dd0be 100644
--- a/pages/modules/package-instore.vue
+++ b/pages/modules/package-instore.vue
@@ -4,21 +4,51 @@
- 托盘编码
+ 钢托盘1编码
-
+
物料数量
-
+
- 剩余数量
+ 钢托盘2编码
-
+
+
+
+
+ 物料数量
+
+
+
+
+
+ 钢托盘3编码
+
+
+
+
+
+ 物料数量
+
+
+
+
+
+ 木托盘编码
+
+
+
+
+
+ 物料数量
+
+
@@ -47,9 +77,9 @@
-
-
-
+
+
+
@@ -65,9 +95,14 @@
},
data() {
return {
- val1: '',
- val2: '',
- val3: '0',
+ code1: '',
+ num1: '',
+ code2: '',
+ num2: '',
+ code3: '',
+ num3: '',
+ code4: '',
+ num4: '',
dataList: [],
disabled: false
};
@@ -84,16 +119,21 @@
/** 确认 */
async toSure () {
this.disabled = true
- if (!this.val1 || !this.val2) {
+ if (!(((this.code1 !== '' && this.num1 !== '') || (this.code2 !== '' && this.num2 !== '') || (this.code3 !== '' && this.num3 !== '')) && (this.code4 !== '' && this.num4 !== ''))) {
this.disabled = false
return
}
try {
- let res = await manualSortingPackingTask(this.val1, this.val2, this.val3)
+ let res = await manualSortingPackingTask(this.code1, this.num1, this.code2, this.num2, this.code3, this.num3, this.code4, this.num4)
this.disabled = false
- this.val1 = ''
- this.val2 = ''
- this.val3 = '0'
+ this.code1 = ''
+ this.num2 = ''
+ this.code2 = ''
+ this.num2 = ''
+ this.code3 = ''
+ this.num3 = ''
+ this.code4 = ''
+ this.num4 = ''
this._manualSortingPackingTaskShow()
uni.showToast({
title: res.message,
@@ -107,5 +147,7 @@
}
-
diff --git a/pages/modules/pallet-bind.vue b/pages/modules/pallet-bind.vue
index ce3e1f3..a16a120 100644
--- a/pages/modules/pallet-bind.vue
+++ b/pages/modules/pallet-bind.vue
@@ -19,9 +19,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/press-carry.vue b/pages/modules/press-carry.vue
index b02b71b..aec4d6c 100644
--- a/pages/modules/press-carry.vue
+++ b/pages/modules/press-carry.vue
@@ -29,9 +29,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/shelf-check.vue b/pages/modules/shelf-check.vue
index b082d79..c7a1891 100644
--- a/pages/modules/shelf-check.vue
+++ b/pages/modules/shelf-check.vue
@@ -59,9 +59,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/sort-schedue.vue b/pages/modules/sort-schedue.vue
index 0b3f70c..93a1e31 100644
--- a/pages/modules/sort-schedue.vue
+++ b/pages/modules/sort-schedue.vue
@@ -33,9 +33,9 @@
-
-
-
+
+
+
diff --git a/pages/modules/surplus-mater-instore.vue b/pages/modules/surplus-mater-instore.vue
index 3cdcd7b..315ad7b 100644
--- a/pages/modules/surplus-mater-instore.vue
+++ b/pages/modules/surplus-mater-instore.vue
@@ -39,9 +39,9 @@
-
-
-
+
+
+
diff --git a/utils/getData2.js b/utils/getData2.js
index 939aad5..1823c3f 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -126,12 +126,17 @@ export const manualSortingPackingTaskShow = () => request({
data: {}
})
// 确认
-export const manualSortingPackingTask = (code, qty, sqty) => request({
+export const manualSortingPackingTask = (code1, qty1, code2, qty2, code3, qty3, code, qty) => request({
url:'/api/pda/manualSorting/packingTask',
data: {
+ g_vehicle_code1: code1,
+ g_qty1: qty1,
+ g_vehicle_code2: code2,
+ g_qty2: qty2,
+ g_vehicle_code3: code3,
+ g_qty3: qty3,
vehicle_code: code,
- qty: qty,
- surplus_quantity: sqty
+ qty: qty
}
})