diff --git a/common/style/layout.styl b/common/style/layout.styl
index 939e85f..b697a8f 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -126,56 +126,95 @@ uni-button:after {
border-collapse: separate;
-webkit-border-horizontal-spacing: 0px;
-webkit-border-vertical-spacing: 10rpx;
+ padding-bottom: 8rpx;
background-color: #f5f5f5;
}
-.slide_new table td, .slide_new table th {
+.slide_new table th {
+ position: sticky;
+ top: 0;
+ left: 0;
+ z-index: 120;
+ font-size: 26rpx;
+ line-height: 98rpx;
+ color: #696969;
+ font-weight: bold;
+ text-align: center;
box-sizing: border-box;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
white-space: nowrap;
padding: 0 20rpx;
- text-align: center;
+ background: #d7d7d7;
}
-.slide_new table td:first-child, .slide_new table th:first-child{
- position: sticky;
+.slide_new table th:first-child{
left: 0;
- z-index: 101;
- box-shadow: inset -3px 0px 3px 0px rgba(160,160,160,0.20);
-}
-.slide_new table thead tr th {
- position: sticky;
- top: 0;
- background: #d7d7d7;
- font-size: 26rpx;
- line-height: 98rpx;
- color: #696969;
+ z-index: 121;
+ color: #4e6ef2;
font-weight: bold;
- z-index: 100;
+ box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
}
-.slide_new table thead tr th:first-child {
- background: #d7d7d7;
+.slide_new table th.th_2 {
+ left: 86rpx;
+ z-index: 122;
+ box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
}
-.slide_new table tbody tr td {
+.slide_new table td {
font-size: 28rpx;
line-height: 98rpx;
color: #323232;
+ text-align: center;
+ box-sizing: border-box;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ padding: 0 20rpx;
background: #fff;
}
-.slide_new table thead tr th.fontcol1,.slide_new table tbody tr td.fontcol1 {
+.slide_new table td:first-child{
+ position: sticky;
+ left: 0;
+ z-index: 100;
+ color: #4e6ef2;
+ font-weight: bold;
+ box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
+}
+.slide_new table td.td_2 {
+ position: sticky;
+ left: 86rpx;
+ z-index: 101;
+ box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
+}
+.slide_new table th.fontcol1,.slide_new table td.fontcol1 {
color: #4e6ef2;
font-weight: bold;
}
-.slide_new table thead tr th.fontcol2,.slide_new table tbody tr td.fontcol2 {
+.slide_new table th.fontcol2,.slide_new table td.fontcol2 {
color: #d7592f;
font-weight: bold;
}
-.slide_new table tbody tr.checked td {
- background-color: #f0c560;
+.slide_new table tr.checked {
+ // background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
+ background-color: #6190e8;
+}
+.slide_new table tr.checked td {
+ background-color: transparent;
color: #fff;
}
-.slide_new table tbody tr.checked td:first-child {
- border-left: 6rpx solid #ff8227;
+.slide_new table tr.checked td:first-child {
+ // background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
+ background-color: #6190e8;
+}
+.slide_new table tr.checked td:nth-child(2) {
+ // background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
+ background-color: #6190e8;
+}
+.slide_new table tr.checked td:first-child {
+ border-left: 1rpx solid #6798ef;
+}
+.slide_new table tr.checked td:last-child {
+ border-right: 1rpx solid #6798ef;
}
.item-wrapper {
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 239028a..24deec5 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -3,15 +3,15 @@
+ @focus="handleFocus"
+ @blur="handleBlur"
+ @confirm="handleSend">
-
-
-
-
+
+
@@ -21,7 +21,6 @@
export default {
data() {
return {
- cur: '',
focusState: false
};
},
@@ -30,97 +29,28 @@
event: 'input'
},
props: {
- value: String,
- seaShow: {
- type: Boolean,
- default: false
- },
- focused: {
- type: Boolean,
- default: false
- }
+ value: String
},
- watch: {
- focused() {
- this.focusState = this.focused
- },
- },
- 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 () {
- this.focusState = false
- },
- toSearch () {
- this.$emit('toSearch', this.cur)
+ handleBlur (e) {
+ this.$emit('input', e.target.value)
+ // if (e.target.value.length) {
+ // this.$emit('handleChange', e.target.value)
+ // }
+ 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/pages.json b/pages.json
index 7b3d408..532e2a2 100644
--- a/pages.json
+++ b/pages.json
@@ -113,7 +113,7 @@
}
,{
- "path" : "pages/outbound/empty-tray-out-store",
+ "path" : "pages/outbound/tray-out-store",
"style" :
{
"navigationStyle": "custom"
@@ -152,6 +152,24 @@
}
}
+ ,{
+ "path" : "pages/entry/document",
+ "style" :
+ {
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 50
+ }
+
+ }
+ ,{
+ "path" : "pages/pick/pick-list",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/entry/document.vue b/pages/entry/document.vue
new file mode 100644
index 0000000..a81cb74
--- /dev/null
+++ b/pages/entry/document.vue
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+ 单据类型
+
+
+
+
+
+
+
+ 单据编码
+
+
+
+
+
+
+
+
+
+
+
+ | 序号 |
+ 单据类型 |
+ 单据编码 |
+ 物料编码 |
+ 物料规格 |
+ 物料批次 |
+ 计划数量 |
+ 未入库数量 |
+
+
+
+
+ | {{i+1}} |
+ {{e.source_form_type}} |
+ {{e.source_form_date}} |
+ {{e.material_code}} |
+ {{e.material_spec}} |
+ {{e.pcsn}} |
+ {{e.assign_qty}} |
+ {{e.qty}} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/entry/empty-tray-to-store.vue b/pages/entry/empty-tray-to-store.vue
index 6b84cd4..1a3d777 100644
--- a/pages/entry/empty-tray-to-store.vue
+++ b/pages/entry/empty-tray-to-store.vue
@@ -1,49 +1,32 @@
+
- 条码
+ 载具码
-
+
-
-
- 重量
+ 托盘类型
-
-
-
-
-
-
- 数量
-
-
-
-
-
-
-
- 牌号
-
-
-
+
+
-
+
@@ -51,7 +34,7 @@
-
-
diff --git a/pages/outbound/out-store-confirm.vue b/pages/outbound/out-store-confirm.vue
index 239d03a..b87f38f 100644
--- a/pages/outbound/out-store-confirm.vue
+++ b/pages/outbound/out-store-confirm.vue
@@ -1,15 +1,74 @@
-
-
+
+
+
+
+
+
+
+ 载具码
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/outbound/tray-out-store.vue b/pages/outbound/tray-out-store.vue
new file mode 100644
index 0000000..29ff37d
--- /dev/null
+++ b/pages/outbound/tray-out-store.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+ 托盘类型
+
+
+
+
+
+
+
+ 出库数量
+
+
+
+
+
+
+
+ 出库点
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/pick/pick-list.vue b/pages/pick/pick-list.vue
new file mode 100644
index 0000000..f2234e7
--- /dev/null
+++ b/pages/pick/pick-list.vue
@@ -0,0 +1,163 @@
+
+
+
+
+
+
+
+
+ 料箱码
+
+
+
+
+
+
+
+
+
+
+
+ | 序号 |
+ 拣选单编码 |
+ 载具编码 |
+ 状态 |
+ 仓库 |
+ 拣选站台 |
+ 车间 |
+ 创建时间 |
+
+
+
+
+ | {{i+1}} |
+ {{e.code}} |
+ {{e.vehicle_code}} |
+ {{e.status}} |
+ {{e.stor_code}} |
+ {{e.point_code}} |
+ {{e.product_area}} |
+ {{e.create_time}} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/pick/pick-task.vue b/pages/pick/pick-task.vue
index 239d03a..19adcf6 100644
--- a/pages/pick/pick-task.vue
+++ b/pages/pick/pick-task.vue
@@ -1,15 +1,143 @@
-
-
+
+
+
+
+
+
+
+ 拣选单据
+
+
+
+
+
+
+
+
+
+ 返回时间
+
+
+
+
+
+
+
+
+
+ 拣选仓库
+
+
+
+
+
+
+
+
+
+
+
+ 拣选载具
+
+
+
+
+
+
+
+
+
+ 车间
+
+
+
+
+
+
+
+
+
+
+
+ 拣选站台
+
+
+
+
+
+
+
+
+
+ 创建时间
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/getData2.js b/utils/getData2.js
index 2ef3a07..44f0d8b 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -14,181 +14,52 @@ export const pdaUpdate = () => request({
// 登录
export const handLogin = (user, password) => request({
- url:'mobile/auth/login',
+ url:'api/bigScreenScreen/login',
data: {
- username: user,
+ user: user,
password: password
}
})
/**
- * 混碾搬运
+ * 组盘入库
*/
-// 查询货架上未拆包料盅信息
-export const unpackShelfInfo = () => request({
- url:'api/pda/unpackShelfInfo',
- data: {}
+// 单据类型
+export const FormTypes = () => request({
+ method: 'GET',
+ url:'api/bmFormStruc/getTypes?type=pda'
})
-// 查询拆包机点位
-export const getCbjPoint = () => request({
- url:'api/pda/getCbjPoint',
- data: {}
+// 单据数据
+export const pmFormData = (page, size, sort, form_type) => request({
+ method: 'GET',
+ url:'api/pmFormData?page=' + page + '&size=' + size + '&sort=' + sort + '&form_type=' + form_type
})
-// 拆包机叫料
-export const cbjqlTask = (sp, ep) => request({
- url:'api/pda/cbjqlTask',
- data: {
- startPoint: sp,
- endPoint: ep
- }
+// 组盘确认
+export const mdGruopDick = (item, code, type) => request({
+ url:'api/mdGruopDick',
+ data: {item: item, stor_code: code, type: type}
})
-// 查询混碾工单
-export const hnWorkOrder = () => request({
- url:'api/pda/hnWorkOrder',
- data: {}
-})
-// 拆包机下料位满料入货架
-export const cbjmlTask = (code, bcode, sp) => request({
- url:'api/pda/cbjmlTask',
- data: {orderCode: code,barCode: bcode,startPoint: sp}
-})
-// 拆包机下料位叫空蛊
-export const cbjqkTask = (ep) => request({
- url:'api/pda/cbjqkTask',
- data: {endPoint: ep}
-})
-// 拆包机空料位送空蛊
-export const cbjskTask = (type, sp) => request({
- url:'api/pda/cbjskTask',
- data: {nextType: type, startPoint: sp}
-})
-
/**
- * 压机搬运
+ * 空托盘入库
*/
-// 压机上料位下拉框
-export const yjslwPointList = () => request({
- url:'api/pda/yjslwPointList',
- data: {}
+export const pdaPalletIostorinvIn = (code, id) => request({
+ url:'api/pdaPalletIostorinv/in',
+ data: {vehicle_code: code, material_id: id}
})
-// 压机上料位强制回货架
-export const qzhhjTask = (code) => request({
- url:'api/pda/qzhhjTask',
- data: {deviceCode: code}
-})
-// 查询货架上已拆包料盅信息
-export const packShelfInfo = () => request({
- url:'api/pda/packShelfInfo',
- data: {}
-})
-// 困料货架点对点到布料机上料位
-export const yzqlTask = (sp, ep) => request({
- url:'api/pda/yzqlTask',
- data: {startPoint: sp, endPoint: ep}
-})
-
/**
- * 物料报废
+ * 托盘出库
*/
-// 物料报废
-export const materialScrap = (code) => request({
- url:'api/pda/materialScrap',
- data: {
- barCode: code
- }
+export const pdaPalletIostorinvOut = (id, qty, point) => request({
+ url:'api/pdaPalletIostorinv/out',
+ data: {material_id: id, qty: qty, pcsn: '1', target_point: point}
})
-
/**
- * 人工分拣
+ * 出库确认
*/
-// 查询人工分拣点位
-export const rgfjPoint = () => request({
- url:'api/pda/rgfjPoint',
- data: {}
+export const ioStorageOut = (code) => request({
+ url:'api/ioStorage/out',
+ data: {vehicle_code: code}
})
-// 查询缓存货架点位
-export const hchjPoint = () => request({
- url:'api/pda/hchjPoint',
- data: {}
-})
-// 人工分拣叫料
-export const rgfjqlTask = (sp, code) => request({
- url:'api/pda/rgfjqlTask',
- data: {startPoint: sp, deviceCode: code}
-})
-// 人工分拣送空盘
-export const rgfjskTask = (code) => request({
- url:'api/pda/rgfjskTask',
- data: {deviceCode: code}
-})
-
/**
- * 任务管理
+ * 拣选单列表
*/
-// 1.1 1.1 查询无指令的任务（任务号为-开头）
-export const handTasks = () => request({
- url:'api/hand/tasks',
- acsurl: true,
- data: {}
-})
-// 1.2 任务操作
-export const handTaskoperation = (type, id) => request({
- url:'api/hand/taskoperation',
- acsurl: true,
- data: {
- type: type,
- task_uuid: id
- }
-})
-
-/**
- * 指令管理
- */
-// 1.1 查询未完成指令(生成任务号为-开头)
-export const handInsts = () => request({
- url:'api/hand/insts',
- acsurl: true,
- data: {}
-})
-// 1.2 指令操作
-export const handInst = (type, id) => request({
- url:'api/hand/inst',
- acsurl: true,
- data: {
- type: type,
- inst_uuid: id
- }
-})
-
-/**
- * 压制混碾满料搬运
- */
-export const mlTask = (code, vcode, weight, qty) => request({
- url:'api/pda/mlTask',
- data: {
- deviceCode: code,
- vehicle_code: vcode,
- weight: weight,
- qty: qty
- }
-})
-
-/**
- * 条码解绑
- */
-export const vehicleUnbind = (code) => request({
- url:'api/pda/vehicleUnbind',
- data: {
- point_code: code
- }
-})
-
-/**
- * 组盘查看
- */
-export const zpxxTask = (code) => request({
- url:'api/pda/zpxxTask',
- data: {
- vehicle_code: code
- }
-})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 194d1e0..2f19024 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -1,632 +1,60 @@
-// 查询货架上未拆包料盅信息
-export const unpackShelfInfo = () => {
- let res = [
- {
- "pointCode": "KLHW03",
- "materialCode": "ML-60BT",
- "instorageTime": "2024-01-11 16:26:55"
- }
-]
+export const FormTypes = (code) => {
+ let res = [
+ {
+ lable: '收料通知单明细',
+ id: '1778673956455321600',
+ value: 'MRN_DTL'
+ },
+ {
+ lable: '收料通知单',
+ id: '1778676876466851840',
+ value: 'MRN_MST'
+ },
+ {
+ lable: '出入库单主表',
+ id: '1780517070820216832',
+ value: 'st_ivt_iostorinv'
+ }
+ ]
return res
}
-// 查询拆包机点位
-export const getCbjPoint = () => {
- let res = [
- {
- "value": "CBJKLW",
- "text": "拆包机空料位"
- },
- {
- "value": "CBJMLW",
- "text": "拆包机满料位"
- },
- {
- "value": "CBJXLW ",
- "text": "拆包机下料位"
- }
-]
- return res
-}
-// 拆包机叫料
-export const cbjqlTask = () => {
- let res = {
- "message": "拆包机缺料请求成功"
-}
- return res
-}
-// 查询混碾工单
-export const hnWorkOrder = () => {
- let res = [
- {
- "workorder_id": "1762660775601770496",
- "workorder_code": "240228003",
- "plan_qty": 0,
- "real_qty": 66,
- "plan_weight": 1000,
- "real_weight": 33,
- "real_new_weight": 0,
- "real_old_weight": 0,
- "material_ratio": 0,
- "material_id": "1771048061557149696",
- "raw_material_code": "111",
- "produce_order": null,
- "batch_no": null,
- "team": null,
- "produce_date": "20240307",
- "vehicle_type": "LZ",
- "planproducestart_date": "2024-02-28 10:07:28",
- "planproduceend_date": "2024-02-29 00:00:00",
- "realproducestart_date": "2024-03-22 17:10:37",
- "realproduceend_date": "2024-03-22 17:40:58",
- "standing_time": 1,
- "point_code": "HNJ01",
- "point_name": "混碾机01",
- "region_code": "HN",
- "region_name": "混碾区域",
- "workorder_status": "5",
- "is_needmove": true,
- "workorder_type": "1",
- "production_order": null,
- "passback_status": null,
- "workshop_code": null,
- "ext_id": null,
- "ext_data": "0",
- "is_delete": false,
- "is_new": true,
- "create_id": "1",
- "create_name": "管理员",
- "create_time": "2024-02-28 10:07:32",
- "update_id": "1",
- "update_name": "管理员",
- "update_time": "2024-03-28 10:09:43",
- "is_urgent": false,
- "operator": "管理员",
- "customer": "",
- "inspector": null,
- "qualified_qty": 0,
- "unqualified_qty": 0,
- "material_name": null,
- "material_code": null,
- "material_spec": null,
- "half_material_code": null,
- "order_no": null,
- "custer_no": null,
- "order_subnum": 0,
- "guadansum": 0,
- "pack_method": null,
- "order_number": null,
- "product_code": null,
- "material_model": null
- },
- {
- "workorder_id": "1762660775601770496",
- "workorder_code": "2402280031",
- "plan_qty": 0,
- "real_qty": 66,
- "plan_weight": 1000,
- "real_weight": 33,
- "real_new_weight": 0,
- "real_old_weight": 0,
- "material_ratio": 0,
- "material_id": "1771048061557149696",
- "raw_material_code": "111",
- "produce_order": null,
- "batch_no": null,
- "team": null,
- "produce_date": "20240307",
- "vehicle_type": "LZ",
- "planproducestart_date": "2024-02-28 10:07:28",
- "planproduceend_date": "2024-02-29 00:00:00",
- "realproducestart_date": "2024-03-22 17:10:37",
- "realproduceend_date": "2024-03-22 17:40:58",
- "standing_time": 1,
- "point_code": "HNJ01",
- "point_name": "混碾机01",
- "region_code": "HN",
- "region_name": "混碾区域",
- "workorder_status": "5",
- "is_needmove": true,
- "workorder_type": "1",
- "production_order": null,
- "passback_status": null,
- "workshop_code": null,
- "ext_id": null,
- "ext_data": "0",
- "is_delete": false,
- "is_new": true,
- "create_id": "1",
- "create_name": "管理员",
- "create_time": "2024-02-28 10:07:32",
- "update_id": "1",
- "update_name": "管理员",
- "update_time": "2024-03-28 10:09:43",
- "is_urgent": false,
- "operator": "管理员",
- "customer": "",
- "inspector": null,
- "qualified_qty": 0,
- "unqualified_qty": 0,
- "material_name": null,
- "material_code": null,
- "material_spec": null,
- "half_material_code": null,
- "order_no": null,
- "custer_no": null,
- "order_subnum": 0,
- "guadansum": 0,
- "pack_method": null,
- "order_number": null,
- "product_code": null,
- "material_model": null
- }
-]
- return res
-}
-// 拆包机下料位满料入货架
-export const cbjmlTask = () => {
- let res = {"message":"满料入库请求成功"}
- return res
-}
-// 拆包机下料位叫空蛊
-export const cbjqkTask = () => {
- let res = {"message":"空蛊出库请求成功"}
- return res
-}
-// 压机上料位下拉框
-export const yjslwPointList = () => {
- let res = [
- {
- "value": "YJ01SLW01",
- "text": "压机01上料位01"
- },
- {
- "value": "YJ01SLW02",
- "text": "压机01上料位02"
- },
- {
- "value": "YJ02SLW01",
- "text": "压机02上料位01"
- },
- {
- "value": "YJ02SLW02",
- "text": "压机02上料位02"
- },
- {
- "value": "YJ03SLW01",
- "text": "压机03上料位01"
- },
- {
- "value": "YJ03SLW02",
- "text": "压机03上料位02"
- },
- {
- "value": "YJ04SLW01",
- "text": "压机04上料位01"
- },
- {
- "value": "YJ04SLW02",
- "text": "压机04上料位02"
- },
- {
- "value": "YJ05SLW01",
- "text": "压机05上料位01"
- },
- {
- "value": "YJ05SLW02",
- "text": "压机05上料位02"
- },
- {
- "value": "YJ06SLW01",
- "text": "压机06上料位01"
- },
- {
- "value": "YJ06SLW02",
- "text": "压机06上料位02"
- },
- {
- "value": "YJ07SLW01",
- "text": "压机07上料位01"
- },
- {
- "value": "YJ07SLW02",
- "text": "压机07上料位02"
- },
- {
- "value": "YJ08SLW01",
- "text": "压机08上料位01"
- },
- {
- "value": "YJ08SLW02",
- "text": "压机08上料位02"
- },
- {
- "value": "YJ09SLW01",
- "text": "压机09上料位01"
- },
- {
- "value": "YJ09SLW02",
- "text": "压机09上料位02"
- }
-]
- return res
-}
-// 压机上料位强制回货架
-export const qzhhjTask = (code) => {
- let res = {"message":"压制上料位强制回库请求成功"}
- return res
-}
-// 查询货架上已拆包料盅信息
-export const packShelfInfo = () => {
- let res = [
- {
- "pointCode": "KLHW10",
- "materialCode": "MT-14AT",
- "instorageTime": "2024-04-07 16:08:59"
- }
-]
- return res
-}
-// 困料货架点对点到布料机上料位
-export const yzqlTask = (sp, ep) => {
- let res = {
- "message": "布料机上料位请求成功"
-}
- return res
-}
-// 物料报废
-export const materialScrap = () => {
- let res = {"message":"物料作废成功"}
- return res
-}
-// 查询人工分拣点位
-export const rgfjPoint = () => {
- let res = [
- {
- "value": "RGFJC01",
- "text": "人工分拣拆01"
- },
- {
- "value": "RGFJC02",
- "text": "人工分拣拆02"
- },
- {
- "value": "RGFJC03",
- "text": "人工分拣拆03"
- },
- {
- "value": "RGFJC04",
- "text": "人工分拣拆04"
- },
- {
- "value": "RGFJC05",
- "text": "人工分拣拆05"
- },
- {
- "value": "RGFJC06",
- "text": "人工分拣拆06"
- }
-]
- return res
-}
-// 查询缓存货架点位
-export const hchjPoint = () => {
- let res = [
- {
- "value": "HCHJ01",
- "text": "缓存货架01"
- },
- {
- "value": "HCHJ02",
- "text": "缓存货架02"
- },
- {
- "value": "HCHJ03",
- "text": "缓存货架03"
- },
- {
- "value": "HCHJ04",
- "text": "缓存货架04"
- },
- {
- "value": "HCHJ05",
- "text": "缓存货架05"
- },
- {
- "value": "HCHJ06",
- "text": "缓存货架06"
- },
- {
- "value": "HCHJ07",
- "text": "缓存货架07"
- },
- {
- "value": "HCHJ08",
- "text": "缓存货架08"
- },
- {
- "value": "HCHJ09",
- "text": "缓存货架09"
- },
- {
- "value": "HCHJ10",
- "text": "缓存货架10"
- },
- {
- "value": "HCHJ11",
- "text": "缓存货架11"
- },
- {
- "value": "HCHJ12",
- "text": "缓存货架12"
- },
- {
- "value": "HCHJ13",
- "text": "缓存货架13"
- },
- {
- "value": "HCHJ14",
- "text": "缓存货架14"
- },
- {
- "value": "HCHJ15",
- "text": "缓存货架15"
- },
- {
- "value": "HCHJ16",
- "text": "缓存货架16"
- },
- {
- "value": "HCHJ17",
- "text": "缓存货架17"
- },
- {
- "value": "HCHJ18",
- "text": "缓存货架18"
- },
- {
- "value": "HCHJ19",
- "text": "缓存货架19"
- },
- {
- "value": "HCHJ20",
- "text": "缓存货架20"
- },
- {
- "value": "HCHJ21",
- "text": "缓存货架21"
- },
- {
- "value": "HCHJ22",
- "text": "缓存货架22"
- },
- {
- "value": "HCHJ23",
- "text": "缓存货架23"
- },
- {
- "value": "HCHJ24",
- "text": "缓存货架24"
- },
- {
- "value": "HCHJ25",
- "text": "缓存货架25"
- },
- {
- "value": "HCHJ26",
- "text": "缓存货架26"
- },
- {
- "value": "HCHJ27",
- "text": "缓存货架27"
- },
- {
- "value": "HCHJ28",
- "text": "缓存货架28"
- },
- {
- "value": "HCHJ29",
- "text": "缓存货架29"
- },
- {
- "value": "HCHJ30",
- "text": "缓存货架30"
- },
- {
- "value": "HCHJ31",
- "text": "缓存货架31"
- },
- {
- "value": "HCHJ32",
- "text": "缓存货架32"
- },
- {
- "value": "HCHJ33",
- "text": "缓存货架33"
- },
- {
- "value": "HCHJ34",
- "text": "缓存货架34"
- },
- {
- "value": "HCHJ35",
- "text": "缓存货架35"
- },
- {
- "value": "HCHJ36",
- "text": "缓存货架36"
- },
- {
- "value": "HCHJ37",
- "text": "缓存货架37"
- },
- {
- "value": "HCHJ38",
- "text": "缓存货架38"
- },
- {
- "value": "HCHJ39",
- "text": "缓存货架39"
- },
- {
- "value": "HCHJ40",
- "text": "缓存货架40"
- },
- {
- "value": "HCHJ41",
- "text": "缓存货架41"
- },
- {
- "value": "HCHJ42",
- "text": "缓存货架42"
- },
- {
- "value": "HCHJ43",
- "text": "缓存货架43"
- },
- {
- "value": "HCHJ44",
- "text": "缓存货架44"
- }
-]
- return res
-}
-// 人工分拣叫料
-export const rgfjqlTask = (sp, code) => {
- let res = {"message":"人工分拣缺料请求成功"}
- return res
-}
-// 人工分拣送空盘
-export const rgfjskTask = (code) => {
- let res = {"message":"人工分拣送空请求成功"}
- return res
-}
-// 任务管理
-export const handTasks = (key, scode, ncode) => {
+export const pmFormData = (code) => {
let res = {
- "result": [
- {
- "material_type": "",
- "task_status": "1",
- "carrier": "0033",
- "task_no": "1800358896351711233",
- "create_time": "2024-06-11 10:47:33",
- "task_status_name": "执行中",
- "next_devicecode": "HCHJ01",
- "start_devicecode": "CYHCX39",
- "material_type_name": "",
- "task_uuid": "718e14a17b744a81bc51a51945355daa",
- "task_type": "1",
- "priority": "1"
- },
- {
- "material_type": "",
- "task_status": "1",
- "carrier": "3010",
- "task_no": "1800768187059539969",
- "create_time": "2024-06-12 13:56:04",
- "task_status_name": "执行中",
- "next_devicecode": "HNJ03DJW",
- "start_devicecode": "KLHW19",
- "material_type_name": "",
- "task_uuid": "f8e5ab3341f64bee887f4acaf403a4be",
- "task_type": "1",
- "priority": "1"
- },
- {
- "material_type": "",
- "task_status": "1",
- "carrier": "3011",
- "task_no": "1800771496990347265",
- "create_time": "2024-06-12 14:06:44",
- "task_status_name": "执行中",
- "next_devicecode": "KLHW36",
- "start_devicecode": "HNJ03DJW",
- "material_type_name": "",
- "task_uuid": "177eb5d976d245efbe3d5d56c8e93e22",
- "task_type": "1",
- "priority": "1"
- },
- {
- "material_type": "",
- "task_status": "1",
- "carrier": "4011",
- "task_no": "1800773119993057281",
- "create_time": "2024-06-12 14:15:54",
- "task_status_name": "执行中",
- "next_devicecode": "HNJ04DJW",
- "start_devicecode": "KLHW23",
- "material_type_name": "",
- "task_uuid": "29053a22a18b489eb0af483d897c0468",
- "task_type": "1",
- "priority": "1"
- },
- {
- "material_type": "",
- "task_status": "1",
- "carrier": "0030",
- "task_no": "1800819807675879425",
- "create_time": "2024-06-12 17:18:44",
- "task_status_name": "执行中",
- "next_devicecode": "RYHCX01",
- "start_devicecode": "YJ02XLW02",
- "material_type_name": "",
- "task_uuid": "6f8642c70ee14bfc8d2699477fa977c7",
- "task_type": "1",
- "priority": "1"
- },
- {
- "material_type": "",
- "task_status": "0",
- "carrier": "",
- "task_no": "1800820183942696961",
- "create_time": "2024-06-12 17:20:14",
- "task_status_name": "就绪",
- "next_devicecode": "YJ02XLW02",
- "start_devicecode": "CPJCK",
- "material_type_name": "",
- "task_uuid": "f41e5bfb7b32472fa940a8085c1e6d5e",
- "task_type": "1",
- "priority": "1"
- }
- ],
- "code": "1",
- "desc": "查询成功"
-}
- return res
-}
-// 1.2 任务操作
-export const handTaskoperation = (type, id) => {
- let res = {
- "message": "001"
-}
- return res
-}
-// 指令管理
-export const handInsts = () => {
- let res = {
- "data": [
- {
- "task_no": "-087",
- "inst_status": "2",
- "create_time": "2024-03-28 10:54:39",
- "carrier": '001',
- "carno": '1号车',
- "inst_uuid": "012bc5e653ce48949020f1147333aa7f",
- "inst_step": "3",
- "instruction_code": '11100',
- "next_devicecode": "L1",
- "start_devicecode": "RKSSX2",
- "instruction_code": "163",
- "priority": "1"
- }
- ],
- "message": "操作成功"
-}
- return res
-}
-export const handInst = (code) => {
- let res = {
- "message": "001"
-}
+ totalElements: '2',
+ content: [
+ {
+ id: '1813491860891635712',
+ code: 'MV20240717001',
+ proc_inst_id: '1813491872891539456',
+ source_form_id: '',
+ source_form_type: '',
+ source_form_date: '',
+ form_type: 'st_ivt_move',
+ status: '80',
+ remark: '',
+ create_time: '2024-07-17 16:32:07',
+ create_name: '管理员',
+ material_id: null,
+ material_name: null,
+ material_code: '100',
+ material_spec: null,
+ single_weight: null,
+ qty: '0.000',
+ assign_qty: '0.000',
+ unit_id: null,
+ pcsn: null,
+ vehicle_code: null,
+ vehicle_id: null,
+ form_data: {
+ stor_code: 'FStockPallet'
+ },
+ parent_id: null,
+ hasChildren: true
+ }
+ ],
+ data: null,
+ code: '200',
+ msg: '查询成功'
+ }
return res
}
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index f56c5ba..747926e 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -51,6 +51,7 @@ const request = (params) => {
dataType: 'json',
})
.then(res => { // 成功
+ uni.hideLoading();
if (res.length === 1) {
uni.showModal({
content: 'request:fail',
@@ -121,10 +122,11 @@ const request = (params) => {
}
})
.catch(err => { // 错误
+ uni.hideLoading();
reject(err)
})
.finally(() => {
- uni.hideLoading();
+ // uni.hideLoading();
})
})
}
diff --git a/vuex/modules/data.js b/vuex/modules/data.js
new file mode 100644
index 0000000..e2914f9
--- /dev/null
+++ b/vuex/modules/data.js
@@ -0,0 +1,31 @@
+import * as types from '../types'
+const state = {
+ publicObj: '',
+ publicArr: ''
+}
+const getters = {
+ publicObj: state => state.publicObj,
+ publicArr: state => state.publicArr
+}
+const actions = {
+ setPublicObj ({commit}, res) {
+ commit(types.PUBLIC_OBJ, res)
+ },
+ setPublicArr ({commit}, res) {
+ commit(types.PUBLIC_ARR, res)
+ }
+}
+const mutations = {
+ [types.PUBLIC_OBJ] (state, res) {
+ state.publicObj = res
+ },
+ [types.PUBLIC_ARR] (state, res) {
+ state.publicArr = res
+ }
+}
+export default {
+ state,
+ getters,
+ actions,
+ mutations
+}
\ No newline at end of file
diff --git a/vuex/store.js b/vuex/store.js
index 095161f..f8cd813 100644
--- a/vuex/store.js
+++ b/vuex/store.js
@@ -2,11 +2,13 @@ import Vue from 'vue'
import Vuex from 'vuex'
import user from './modules/user'
+import data from './modules/data'
Vue.use(Vuex)
export default new Vuex.Store({
modules: {
- user
+ user,
+ data
}
})
diff --git a/vuex/types.js b/vuex/types.js
index 4668940..e66f0dc 100644
--- a/vuex/types.js
+++ b/vuex/types.js
@@ -6,4 +6,9 @@ export const DEL_LOGIN_NAME = 'DEL_LOGIN_NAME'
export const COM_CONFIG = 'COM_CONFIG'
export const SAVE_USER_INFO = 'SAVE_USER_INFO'
export const DEL_USER_INFO = 'DEL_USER_INFO'
-export const SAVE_TOKEN = 'SAVE_TOKEN'
\ No newline at end of file
+export const SAVE_TOKEN = 'SAVE_TOKEN'
+/**
+ * data
+ */
+export const PUBLIC_OBJ = 'PUBLIC_OBJ'
+export const PUBLIC_ARR = 'PUBLIC_ARR'
\ No newline at end of file