This commit is contained in:
2025-02-11 12:44:50 +08:00
parent 0fd979662e
commit 032f03375e
2 changed files with 144 additions and 119 deletions

View File

@@ -37,8 +37,23 @@
</view> </view>
<view class="zd-row submit-bar_new"> <view class="zd-row submit-bar_new">
<button class="zd-col-7 submit-button_c" @tap="toClear">清空</button> <button class="zd-col-7 submit-button_c" @tap="toClear">清空</button>
<button class="zd-col-15 submit-button_new" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled" @tap="_callTask">确认</button> <button class="zd-col-15 submit-button_new" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled" @tap="toPop">确认</button>
</view> </view>
<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
<view class="pop-line"></view>
<view class="msg_content">
<view class="zd-row">
<view class="zd-col-24">
<span class="filter_label">确认下发任务</span>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_callTask">确定</button>
</view>
</view>
<view v-if="show" class="msg_mask"></view>
</view> </view>
</template> </template>
@@ -51,6 +66,7 @@
}, },
data() { data() {
return { return {
show: false,
disabled: false, disabled: false,
options1: [], options1: [],
index1: '', index1: '',
@@ -159,6 +175,11 @@
this.options4 = [] this.options4 = []
this.options5 = [] this.options5 = []
}, },
toPop () {
if (this.index1 && this.index2 && this.index3 && this.index4) {
this.show = true
}
},
async _callTask () { async _callTask () {
this.disabled = true this.disabled = true
if (!this.index1 || !this.index2) { if (!this.index1 || !this.index2) {
@@ -181,4 +202,8 @@
</script> </script>
<style lang="stylus"> <style lang="stylus">
@import '../../common/style/mixin.styl';
.msg_wrapper
height auto
min-height 30%
</style> </style>

View File

@@ -8,12 +8,12 @@ export const queryArea = () => request({
}) })
// 根据区域查询点位 // 根据区域查询点位
export const queryPointByArea = (rcode) => request({ // export const queryPointByArea = (rcode) => request({
url:'api/hand/queryPointByArea', // url:'api/hand/queryPointByArea',
data: { // data: {
region_code: rcode // region_code: rcode
} // }
}) // })
/** /**
* 搬运任务 * 搬运任务
@@ -31,117 +31,117 @@ export const callTask = (sdcode, ndcode, type, material) => request({
}) })
// 查询任务模式以及每个任务模式下对应的区域名称 // 查询任务模式以及每个任务模式下对应的区域名称
export const queryBusinessProcesses = () => request({ // export const queryBusinessProcesses = () => request({
url:'api/hand/queryBusinessProcesses', // url:'api/hand/queryBusinessProcesses',
data: {} // data: {}
}) // })
// 模拟数据 // 模拟数据
// export const queryBusinessProcesses = () => { export const queryBusinessProcesses = () => {
// let res = { let res = {
// "data": [ "data": [
// { {
//             "createBy": "System",             "createBy": "System",
//             "updatedBy": "System",             "updatedBy": "System",
//             "createTime": 1738984469000,             "createTime": 1738984469000,
//             "updateTime": 1738984469000,             "updateTime": 1738984469000,
//             "id": 46,             "id": 46,
//             "dictDetails": [             "dictDetails": [
//                 {                 {
//                     "createBy": "System",                     "createBy": "System",
//                     "updatedBy": "System",                     "updatedBy": "System",
//                     "createTime": 1738984714000,                     "createTime": 1738984714000,
//                     "updateTime": 1738984714000,                     "updateTime": 1738984714000,
//                     "id": 320,                     "id": 320,
//                     "dict": {                     "dict": {
//                         "id": 46                         "id": 46
//                     },                     },
//                     "label": "Ⅵ区空托回流区",                     "label": "Ⅵ区空托回流区",
//                     "value": "07",                     "value": "07",
//                     "dictSort": 1                     "dictSort": 1
//                 },                 },
//                 {                 {
//                     "createBy": "System",                     "createBy": "System",
//                     "updatedBy": "System",                     "updatedBy": "System",
//                     "createTime": 1738984739000,                     "createTime": 1738984739000,
//                     "updateTime": 1738984739000,                     "updateTime": 1738984739000,
//                     "id": 321,                     "id": 321,
//                     "dict": {                     "dict": {
//                         "id": 46                         "id": 46
//                     },                     },
//                     "label": "箱体物料区",                     "label": "箱体物料区",
//                     "value": "08",                     "value": "08",
//                     "dictSort": 2                     "dictSort": 2
//                 }                 }
//             ],             ],
//             "name": "BusinessProcesses_1",             "name": "BusinessProcesses_1",
//             "description": "箱体入库"             "description": "箱体入库"
//         },         },
//         {         {
//             "createBy": "System",             "createBy": "System",
//             "updatedBy": "System",             "updatedBy": "System",
//             "createTime": 1738984482000,             "createTime": 1738984482000,
//             "updateTime": 1738984482000,             "updateTime": 1738984482000,
//             "id": 47,             "id": 47,
//             "dictDetails": [             "dictDetails": [
//                 {                 {
//                     "createBy": "System",                     "createBy": "System",
//                     "updatedBy": "System",                     "updatedBy": "System",
//                     "createTime": 1738984785000,                     "createTime": 1738984785000,
//                     "updateTime": 1738984785000,                     "updateTime": 1738984785000,
//                     "id": 322,                     "id": 322,
//                     "dict": {                     "dict": {
//                         "id": 47                         "id": 47
//                     },                     },
//                     "label": "Ⅵ区空托回流区",                     "label": "Ⅵ区空托回流区",
//                     "value": "07",                     "value": "07",
//                     "dictSort": 1                     "dictSort": 1
//                 },                 },
//                 {                 {
//                     "createBy": "System",                     "createBy": "System",
//                     "updatedBy": "System",                     "updatedBy": "System",
//                     "createTime": 1738984803000,                     "createTime": 1738984803000,
//                     "updateTime": 1738984803000,                     "updateTime": 1738984803000,
//                     "id": 323,                     "id": 323,
//                     "dict": {                     "dict": {
//                         "id": 47                         "id": 47
//                     },                     },
//                     "label": "箱体物料区",                     "label": "箱体物料区",
//                     "value": "08",                     "value": "08",
//                     "dictSort": 1                     "dictSort": 1
//                 },                 },
//                 {                 {
//                     "createBy": "System",                     "createBy": "System",
//                     "updatedBy": "System",                     "updatedBy": "System",
//                     "createTime": 1738984903000,                     "createTime": 1738984903000,
//                     "updateTime": 1738984903000,                     "updateTime": 1738984903000,
//                     "id": 324,                     "id": 324,
//                     "dict": {                     "dict": {
//                         "id": 47                         "id": 47
//                     },                     },
//                     "label": "模组下线区",                     "label": "模组下线区",
//                     "value": "01",                     "value": "01",
//                     "dictSort": 2                     "dictSort": 2
//                 }                 }
//             ],             ],
//             "name": "BusinessProcesses_2",             "name": "BusinessProcesses_2",
//             "description": "模组下线"             "description": "模组下线"
//         },         },
// ], ],
// "message": "200" "message": "200"
// } }
// return res return res
// } }
// export const queryPointByArea = () => { export const queryPointByArea = () => {
// let res = { let res = {
// data: [ data: [
// { {
// device_name: "147", device_name: "147",
// device_id: "178a645c3b874818b6c0576e1dc6e616", device_id: "178a645c3b874818b6c0576e1dc6e616",
// device_code: "147" device_code: "147"
// } }
// ], ],
// message: "200" message: "200"
// } }
// return res return res
// } }