操作屏增加需求
This commit is contained in:
@@ -11,16 +11,17 @@
|
||||
<p class="point_value">{{ e.device_code }}</p>
|
||||
<div v-if="e.type === '1'" class="button" @click="showPop('CONTAINER', e)">呼叫空框</div>
|
||||
<div v-if="e.type === '1'" class="button" @click="showPop('SCANER', e)">完成入库</div>
|
||||
<div v-if="e.type === '0'" class="button" @click="showPop('PALLET', e)">当前托盘</div>
|
||||
<div v-if="e.type === '0'" class="button" @click="showPop('BACK', e)">回库</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-show="type === 'IN'" class="pop-wraper pop-wraper-2" :class="{'popshow': show, 'pophide': !show}">
|
||||
<div class="pop-grid">
|
||||
<el-row type="flex" justify="space-between">
|
||||
<el-col :span="13">
|
||||
<div class="zd-row pop-grid">
|
||||
<div class="pop-grid_l">
|
||||
<div class="pop-grid_t">
|
||||
<el-table
|
||||
:data="popList"
|
||||
style="width: 100%; padding-right: 10px"
|
||||
height="100%"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
<el-table-column
|
||||
@@ -48,11 +49,11 @@
|
||||
label="优先级"
|
||||
/>
|
||||
</el-table>
|
||||
</el-col>
|
||||
<el-col :span="11">
|
||||
</div>
|
||||
<div class="pop-grid_t">
|
||||
<el-table
|
||||
:data="popSecList"
|
||||
style="width: 100%"
|
||||
height="100%"
|
||||
>
|
||||
<el-table-column
|
||||
prop="order_code"
|
||||
@@ -79,8 +80,12 @@
|
||||
label="优先级"
|
||||
/>
|
||||
</el-table>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
<div class="pop-grid_r">
|
||||
<img v-if="imgSrc !== ''" :src="imgSrc" alt="">
|
||||
<!-- <img class="img_pallet" src="../../../assets/images/screen_bg.jpg" alt=""> -->
|
||||
</div>
|
||||
</div>
|
||||
<el-row type="flex" justify="space-around">
|
||||
<el-col :span="4">
|
||||
@@ -93,11 +98,11 @@
|
||||
</div>
|
||||
<div v-show="type === 'CONTAINER'" class="pop-wraper pop-wraper-1" :class="{'popshow': show, 'pophide': !show}">
|
||||
<div class="pop-h1">{{ popData.title }}</div>
|
||||
<div class="pop-grid">
|
||||
<div class="filter-items">
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">托盘类型</el-col>
|
||||
<el-col :span="18" class="select-wraper">
|
||||
<el-select v-model="value" placeholder="请选择">
|
||||
<el-select v-model="value" :popper-append-to-body="false" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.value"
|
||||
@@ -141,7 +146,7 @@
|
||||
<div class="pop-grid pop-grid_1">
|
||||
<el-table
|
||||
:data="popList"
|
||||
style="width: 100%"
|
||||
height="100%"
|
||||
>
|
||||
<el-table-column
|
||||
label="订单号"
|
||||
@@ -200,15 +205,23 @@
|
||||
</el-row>
|
||||
</div>
|
||||
<div v-show="type === 'BACK'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
|
||||
<div class="pop-grid">
|
||||
<div class="zd-row pop-grid">
|
||||
<div class="pop-grid_r">
|
||||
<img v-if="imgSrc !== ''" :src="imgSrc" alt="">
|
||||
</div>
|
||||
<div class="pop-grid_l">
|
||||
<el-table
|
||||
:data="popList"
|
||||
style="width: 100%"
|
||||
height="100%"
|
||||
>
|
||||
<el-table-column
|
||||
prop="order_code"
|
||||
label="订单号"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="material_code"
|
||||
label="零件号"
|
||||
/>
|
||||
<el-table-column
|
||||
label="数量"
|
||||
>
|
||||
@@ -218,16 +231,57 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<el-row type="flex" justify="space-around">
|
||||
<el-col :span="4">
|
||||
<button class="login_button login_button_dis" @click="show = false">取消</button>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<button class="login_button" :disabled="disabled" @click="toSure">确定</button>
|
||||
<button class="login_button" @click="toSure">确定</button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<div v-show="type === 'PALLET'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
|
||||
<div class="zd-row pop-grid">
|
||||
<div class="pop-grid_l">
|
||||
<img v-if="imgSrc !== ''" :src="imgSrc" alt="">
|
||||
</div>
|
||||
<div class="pop-grid_r">
|
||||
<el-table
|
||||
:data="popList"
|
||||
height="100%"
|
||||
@current-change="handleCurrentChange1"
|
||||
>
|
||||
<el-table-column
|
||||
prop="vehicle_path"
|
||||
label="图纸查看"
|
||||
/>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<el-row type="flex" justify="space-around">
|
||||
<el-col :span="4">
|
||||
<button class="login_button login_button_dis" @click="show = false">取消</button>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<button class="login_button" @click="toSure">确定</button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<div v-show="show" class="modal" />
|
||||
<div v-show="alertShow" class="pop-wraper pop-wraper-1" :class="{'popshow': alertShow, 'pophide': !alertShow}" style="z-index: 22;">
|
||||
<div class="pop-h1">提示</div>
|
||||
<div class="filter-items"><p class="p-text">是否确认回库？</p></div>
|
||||
<el-row type="flex" justify="space-around">
|
||||
<el-col :span="6">
|
||||
<button class="login_button login_button_dis" @click="alertShow = false">取消</button>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<button class="login_button" @click="toSure1">确定</button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<div v-show="alertShow" class="modal" style="z-index: 21;" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -250,7 +304,9 @@ export default {
|
||||
value2: '',
|
||||
options2: [],
|
||||
vcode: '',
|
||||
disabled: false
|
||||
disabled: false,
|
||||
imgSrc: '',
|
||||
alertShow: false
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -274,6 +330,7 @@ export default {
|
||||
})
|
||||
},
|
||||
showPop(type, e) {
|
||||
this.imgSrc = ''
|
||||
this.popData = {}
|
||||
this.popList = []
|
||||
this.popSecList = []
|
||||
@@ -315,16 +372,25 @@ export default {
|
||||
const arr = []
|
||||
arr.push(this.popData.device_code)
|
||||
crudProduceScreen.fabOrders({ deviceCodes: arr }).then(res => {
|
||||
this.popList = [...res]
|
||||
this.imgSrc = res.path
|
||||
this.popList = [...res.material]
|
||||
this.popList.map(el => {
|
||||
this.$set(el, 'material_qty', 0)
|
||||
})
|
||||
this.show = true
|
||||
})
|
||||
} else if (type === 'PALLET') {
|
||||
crudProduceScreen.getPointVehicle({ device_code: this.popData.device_code }).then(res => {
|
||||
crudProduceScreen.fabMaterial({ vehicle_code: res }).then(res => {
|
||||
this.popList = [...res]
|
||||
})
|
||||
})
|
||||
this.show = true
|
||||
}
|
||||
},
|
||||
handleCurrentChange(val) {
|
||||
this.currentRow = val
|
||||
this.imgSrc = val.vehicle_path
|
||||
crudProduceScreen.fabMaterial({ vehicle_code: this.currentRow.vehicle_code }).then(res => {
|
||||
this.popSecList = [...res]
|
||||
})
|
||||
@@ -378,19 +444,27 @@ export default {
|
||||
this.disabled = false
|
||||
})
|
||||
} else if (this.type === 'BACK') {
|
||||
crudProduceScreen.sendVehicle({ mater: this.popList, device_code: this.popData.device_code }).then(res => {
|
||||
this.$message(res.msg)
|
||||
}).catch(() => {
|
||||
this.disabled = false
|
||||
})
|
||||
this.alertShow = true
|
||||
return
|
||||
}
|
||||
this.show = false
|
||||
},
|
||||
toSure1() {
|
||||
this.alertShow = false
|
||||
this.show = false
|
||||
crudProduceScreen.sendVehicle({ mater: this.popList, device_code: this.popData.device_code }).then(res => {
|
||||
this.$message(res.msg)
|
||||
}).catch(() => {})
|
||||
},
|
||||
addRow(index, rows) {
|
||||
rows.splice(index, 0, { order_code: '', material_qty: '', material_code: '' })
|
||||
},
|
||||
delRow(index, rows) {
|
||||
rows.splice(index, 1)
|
||||
},
|
||||
handleCurrentChange1(val) {
|
||||
this.imgSrc = val.vehicle_path
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -398,4 +472,11 @@ export default {
|
||||
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import './style.scss';
|
||||
>>>.el-message-box {
|
||||
background: rgba(45,88,184,0.1);
|
||||
border: 1px solid #4980BD;
|
||||
}
|
||||
.custom-message-box {
|
||||
background-color: #f56c6c;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,124 +1,32 @@
|
||||
<template>
|
||||
<div class="container ver-center">
|
||||
<el-row type="flex" justify="center" class="height-30">
|
||||
<el-col :span="5" class="height-100 ver-justify">
|
||||
<el-row type="flex" justify="space-between" class="btns-wrap">
|
||||
<el-col :span="9" class="height-100 ver-justify">
|
||||
<div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT1' in pointState)}" @click="showPop(3, 'OUT1')">Container</div>
|
||||
<div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT1' in pointState)}" @click="showPop(4, 'OUT1')">Scaner</div>
|
||||
</el-col>
|
||||
<el-col :span="13" class="height-100">
|
||||
<div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT1' in pointState)}">
|
||||
<p class="p1">OUT1</p>
|
||||
<p v-show="'OUT1' in pointState" class="p2">{{ pointState.OUT1 }}</p>
|
||||
<div class="container">
|
||||
<button class="btn-close" :disabled="disabled" @click="toExit" />
|
||||
<div class="m-content">
|
||||
<p>{{ screenData.device_name }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-between" class="btns-wrap">
|
||||
<el-col :span="9" class="height-100 ver-justify">
|
||||
<div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT3' in pointState)}" @click="showPop(3, 'OUT3')">Container</div>
|
||||
<div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT3' in pointState)}" @click="showPop(4, 'OUT3')">Scaner</div>
|
||||
</el-col>
|
||||
<el-col :span="13" class="height-100">
|
||||
<div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT3' in pointState)}">
|
||||
<p class="p1">OUT3</p>
|
||||
<p v-show="'OUT3' in pointState" class="p2">{{ pointState.OUT3 }}</p>
|
||||
<div class="button-wraper" :style="screenData.region_points.length <= 2 ? 'justify-content: center' : 'justify-content: space-between'">
|
||||
<div v-for="(e, i) in screenData.region_points" :key="i" class="button-item" :class="{'button-item_3': screenData.region_points.length <= 3}">
|
||||
<p v-if="e.type === '1'" class="point_name">{{ e.name }}</p>
|
||||
<p v-if="e.type === '0'" class="point_name point_name_btn" @click="showPop('IN', e)">{{ e.name }}</p>
|
||||
<p class="point_value">{{ e.device_code }}</p>
|
||||
<div v-if="e.type === '1'" class="button" @click="showPop('CONTAINER', e)">呼叫空框</div>
|
||||
<div v-if="e.type === '1'" class="button" @click="showPop('SCANER', e)">完成入库</div>
|
||||
<div v-if="e.type === '0'" class="button" @click="showPop('BACK', e)">回库</div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="9" class="height-100 ver-justify mg2">
|
||||
<div class="m-content ver-center" @click="showPop(1)">
|
||||
<p>{{ JSON.stringify(pkObj) !== '{}' ? pkObj.label : 'MACHINE' }}</p>
|
||||
</div>
|
||||
<el-row type="flex" justify="space-between" class="btns-wrap-2">
|
||||
<el-col :span="7" class="height-100">
|
||||
<div class="s-btn-2" :class="{'s-btn-2_dis': !('N1' in pointState)}" @click="showPop(2, 'N1')">
|
||||
<p class="p1">N1</p>
|
||||
<p v-show="'N1' in pointState" class="p2">{{ pointState.N1 }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4" class="height-100 ver-center">
|
||||
<div class="s-btn-1" :class="{'s-btn-1_dis': !('N1' in pointState)}" @click="showPop(5, 'N1')">Back</div>
|
||||
</el-col>
|
||||
<el-col :span="7" class="height-100">
|
||||
<div class="s-btn-2" :class="{'s-btn-2_dis': !('N2' in pointState)}" @click="showPop(2, 'N2')">
|
||||
<p class="p1">N2</p>
|
||||
<p v-show="'N2' in pointState" class="p2">{{ pointState.N2 }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4" class="height-100 ver-center">
|
||||
<div class="s-btn-1" :class="{'s-btn-1_dis': !('N2' in pointState)}" @click="showPop(5, 'N2')">Back</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="5" class="height-100 ver-justify">
|
||||
<el-row type="flex" justify="space-between" class="btns-wrap">
|
||||
<el-col :span="13" class="height-100">
|
||||
<div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT2' in pointState)}">
|
||||
<p class="p1">OUT2</p>
|
||||
<p v-show="'OUT2' in pointState" class="p2">{{ pointState.OUT2 }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="9" class="height-100 ver-justify">
|
||||
<div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT2' in pointState)}" @click="showPop(3, 'OUT2')">Container</div>
|
||||
<div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT2' in pointState)}" @click="showPop(4, 'OUT2')">Scaner</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-between" class="btns-wrap">
|
||||
<el-col :span="13" class="height-100">
|
||||
<div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT4' in pointState)}">
|
||||
<p class="p1">OUT4</p>
|
||||
<p v-show="'OUT4' in pointState" class="p2">{{ pointState.OUT4 }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="9" class="height-100 ver-justify">
|
||||
<div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT4' in pointState)}" @click="showPop(3, 'OUT4')">Container</div>
|
||||
<div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT4' in pointState)}" @click="showPop(4, 'OUT4')">Scaner</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div class="pop-wraper" :class="{'popshow': show, 'pophide': !show, 'pop-wraper-1': type === 3 || type === 4 || type === 5}">
|
||||
<div v-show="type === 1" class="pop-h1">选择设备</div>
|
||||
<div v-show="type === 1" class="pop-grid">
|
||||
<el-table
|
||||
ref="singleTable"
|
||||
:data="machineData"
|
||||
height="100%"
|
||||
highlight-current-row
|
||||
style="width: 100%"
|
||||
@current-change="handleCurrentChange1"
|
||||
>
|
||||
<el-table-column
|
||||
prop="label"
|
||||
label="设备号"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="value"
|
||||
label="设备工序"
|
||||
/>
|
||||
</el-table>
|
||||
</div>
|
||||
<el-row v-show="type === 1" class="pop-btns">
|
||||
<el-col :span="3" :offset="6" class="height-100">
|
||||
<div class="s-btn-1 s-btn-3" @click="toSure1">确定</div>
|
||||
</el-col>
|
||||
<el-col :span="3" :offset="6" class="height-100">
|
||||
<div class="s-btn-1 s-btn-3" @click="show = false, vechineList = []">取消</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div v-show="type === 2" class="pop-grid">
|
||||
<div v-show="type === 'IN'" class="pop-wraper pop-wraper-2" :class="{'popshow': show, 'pophide': !show}">
|
||||
<div class="pop-grid">
|
||||
<el-row type="flex" justify="space-between">
|
||||
<el-col :span="24">
|
||||
<el-col :span="13">
|
||||
<el-table
|
||||
ref="singleTable"
|
||||
:data="n1List"
|
||||
height="100%"
|
||||
highlight-current-row
|
||||
style="width: 100%"
|
||||
@current-change="handleCurrentChange2"
|
||||
:data="popList"
|
||||
style="width: 100%; padding-right: 10px"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
<el-table-column
|
||||
prop="vehicle_code"
|
||||
label="载具号"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="order_code"
|
||||
label="订单号"
|
||||
@@ -127,14 +35,6 @@
|
||||
prop="region_code"
|
||||
label="工序"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="material_id"
|
||||
label="物料号"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="material_type"
|
||||
label="物料类型"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="material_qty"
|
||||
label="物料数量"
|
||||
@@ -144,34 +44,85 @@
|
||||
label="交期时间"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="custom"
|
||||
label="客户编码"
|
||||
prop="priority"
|
||||
label="优先级"
|
||||
/>
|
||||
</el-table>
|
||||
</el-col>
|
||||
<el-col :span="11">
|
||||
<el-table
|
||||
:data="popSecList"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-table-column
|
||||
prop="order_code"
|
||||
label="订单号"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="point_code"
|
||||
label="点位编码"
|
||||
prop="due_date"
|
||||
label="交期时间"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="material_code"
|
||||
label="零件号"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="material_qty"
|
||||
label="物料数量"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="region_code"
|
||||
label="工序"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="priority"
|
||||
label="优先级"
|
||||
/>
|
||||
</el-table>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<el-row v-show="type === 2" type="flex" class="pop-btns" justify="center">
|
||||
<el-col :span="3" class="height-100" style="margin: 0 1%;">
|
||||
<div class="s-btn-1 s-btn-3" @click="show = false, vechineList = []">取消</div>
|
||||
<el-row type="flex" justify="space-around">
|
||||
<el-col :span="4">
|
||||
<button class="login_button login_button_dis" @click="show = false">取消</button>
|
||||
</el-col>
|
||||
<el-col :span="3" class="height-100" style="margin: 0 1%;">
|
||||
<div class="s-btn-1 s-btn-3" @click="toCall">叫料</div>
|
||||
<el-col :span="4">
|
||||
<button class="login_button" :disabled="disabled" @click="toSure">叫料</button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div v-show="type === 3" class="pop-grid">
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">点位</el-col>
|
||||
<el-col :span="18"><input v-model="emptyObj.device_code" type="text" class="p-value" disabled></el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<div v-show="type === 'CONTAINER'" class="pop-wraper pop-wraper-1" :class="{'popshow': show, 'pophide': !show}">
|
||||
<div class="pop-h1">{{ popData.title }}</div>
|
||||
<div class="pop-grid">
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">托盘类型</el-col>
|
||||
<el-col :span="18" class="select-wraper">
|
||||
<el-select v-model="val1" placeholder="请选择">
|
||||
<el-select v-model="value" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
class="option-wraper"
|
||||
/>
|
||||
</el-select>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<el-row type="flex" justify="space-around">
|
||||
<el-col :span="6">
|
||||
<button class="login_button login_button_dis" @click="show = false">取消</button>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<button class="login_button" @click="toSure">确定</button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<div v-show="type === 'SCANER'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="2" class="p-label">目的地</el-col>
|
||||
<el-col :span="8" class="select-wraper">
|
||||
<el-select v-model="value1" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in options1"
|
||||
:key="item.value"
|
||||
@@ -181,76 +132,98 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="2" class="p-label" />
|
||||
<el-col :span="2" class="p-label">载具号</el-col>
|
||||
<el-col :span="8" class="select-wraper">
|
||||
<input v-model="vcode" type="text" class="set-input">
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">设备工序</el-col>
|
||||
<el-col :span="18"><input v-model="emptyObj.regin_code" type="text" class="p-value" disabled></el-col>
|
||||
<div class="pop-grid pop-grid_1">
|
||||
<el-table
|
||||
:data="popList"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-table-column
|
||||
label="订单号"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<div class="select-wraper">
|
||||
<el-select
|
||||
v-model="scope.row.order_code"
|
||||
filterable
|
||||
allow-create
|
||||
default-first-option
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in options2"
|
||||
:key="item.order_code"
|
||||
:label="item.order_code"
|
||||
:value="item.order_code"
|
||||
class="option-wraper"
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="物料号"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<input v-model="scope.row.material_code" type="text" class="set-input">
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="数量"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<input v-model="scope.row.material_qty" type="text" class="set-input">
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-button circle type="primary" icon="el-icon-plus" @click.native.prevent="addRow(scope.$index, popList)" />
|
||||
<el-button circle type="primary" icon="el-icon-minus" @click.native.prevent="delRow(scope.$index, popList)" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<el-row type="flex" justify="space-around">
|
||||
<el-col :span="4">
|
||||
<button class="login_button login_button_dis" @click="show = false">取消</button>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<button class="login_button" :disabled="disabled" @click="toSure">确定</button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<el-row v-show="type === 3" class="pop-btns">
|
||||
<el-col :span="5" :offset="5" class="height-100">
|
||||
<div class="s-btn-1 s-btn-3" @click="toSure3">确定</div>
|
||||
</el-col>
|
||||
<el-col :span="5" :offset="5" class="height-100">
|
||||
<div class="s-btn-1 s-btn-3" @click="show = false">取消</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div v-show="type === 4" class="pop-grid">
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">地面点位</el-col>
|
||||
<el-col :span="18"><input v-model="sendObj.device_code" type="text" class="p-value" disabled></el-col>
|
||||
</el-row>
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">订单编号</el-col>
|
||||
<el-col :span="18"><input v-model="sendObj.order_code" type="text" class="p-value"></el-col>
|
||||
</el-row>
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">合格数量</el-col>
|
||||
<el-col :span="18"><input v-model="sendObj.material_qty" type="number" class="p-value"></el-col>
|
||||
</el-row>
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">设备工序</el-col>
|
||||
<el-col :span="18"><input v-model="sendObj.regin_code" type="text" class="p-value" disabled></el-col>
|
||||
</el-row>
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">载具编码</el-col>
|
||||
<el-col :span="18"><input v-model="sendObj.vehicle_code" type="text" class="p-value"></el-col>
|
||||
</el-row>
|
||||
<el-row class="filter-wraper">
|
||||
<el-col :span="1" :offset="6"><el-checkbox v-model="check1" /></el-col>
|
||||
<el-col :span="5" class="p-label">是否报功</el-col>
|
||||
<el-col :span="1" :offset="3"><el-checkbox v-model="check2" /></el-col>
|
||||
<el-col :span="5" class="p-label">指定外协区</el-col>
|
||||
</el-row>
|
||||
<div v-show="type === 'BACK'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
|
||||
<div class="pop-grid">
|
||||
<el-table
|
||||
:data="popList"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-table-column
|
||||
prop="order_code"
|
||||
label="订单号"
|
||||
/>
|
||||
<el-table-column
|
||||
label="数量"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<input v-model="scope.row.material_qty" type="number" class="set-input">
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<el-row v-show="type === 4" class="pop-btns">
|
||||
<el-col :span="5" :offset="5" class="height-100">
|
||||
<div class="s-btn-1 s-btn-3" @click="toSure4">确定</div>
|
||||
<el-row type="flex" justify="space-around">
|
||||
<el-col :span="4">
|
||||
<button class="login_button login_button_dis" @click="show = false">取消</button>
|
||||
</el-col>
|
||||
<el-col :span="5" :offset="5" class="height-100">
|
||||
<div class="s-btn-1 s-btn-3" @click="show = false">取消</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div v-show="type === 5" class="pop-grid">
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">地面点位</el-col>
|
||||
<el-col :span="18"><input v-model="backObj.device_code" type="text" class="p-value" disabled></el-col>
|
||||
</el-row>
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">物料数量</el-col>
|
||||
<el-col :span="18"><input v-model="backObj.material_qty" type="number" class="p-value"></el-col>
|
||||
</el-row>
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">设备工序</el-col>
|
||||
<el-col :span="18"><input v-model="backObj.regin_code" type="text" class="p-value" disabled></el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<el-row v-show="type === 5" class="pop-btns">
|
||||
<el-col :span="5" :offset="5" class="height-100">
|
||||
<div class="s-btn-1 s-btn-3" @click="toSure5">确定</div>
|
||||
</el-col>
|
||||
<el-col :span="5" :offset="5" class="height-100">
|
||||
<div class="s-btn-1 s-btn-3" @click="show = false">取消</div>
|
||||
<el-col :span="4">
|
||||
<button class="login_button" :disabled="disabled" @click="toSure">确定</button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
@@ -260,443 +233,169 @@
|
||||
|
||||
<script>
|
||||
import crudProduceScreen from './produceScreen'
|
||||
// import crudProduceScreen from './mork'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
type: null,
|
||||
show: false,
|
||||
machineData: [],
|
||||
n1List: [],
|
||||
buttonName: '',
|
||||
vechineList: [],
|
||||
currentRow1: null,
|
||||
currentRow2: null,
|
||||
pkObj: {},
|
||||
checked: false,
|
||||
pointState: {},
|
||||
emptyObj: {},
|
||||
sendObj: {},
|
||||
backObj: {},
|
||||
val1: '',
|
||||
options1: [],
|
||||
check1: false,
|
||||
check2: false
|
||||
type: null,
|
||||
popData: {},
|
||||
popList: [],
|
||||
popSecList: [],
|
||||
currentRow: null,
|
||||
value: '',
|
||||
options: [{ value: 'G01', label: 'G01' }, { value: 'R01', label: 'R01' }, { value: 'R02', label: 'R02' }, { value: 'R03', label: 'R03' }, { value: 'S04', label: 'S04' }, { value: 'S06', label: 'S06' }],
|
||||
value1: '',
|
||||
options1: [{ value: '1', label: '货架' }, { value: '2', label: '内部' }, { value: '3', label: '外协' }, { value: '4', label: '内部过道' }],
|
||||
value2: '',
|
||||
options2: [],
|
||||
vcode: '',
|
||||
disabled: false
|
||||
}
|
||||
},
|
||||
created() {
|
||||
crudProduceScreen.vehicleType().then(res => {
|
||||
this.options1 = [...res.content]
|
||||
})
|
||||
computed: {
|
||||
screenData() {
|
||||
let res = {}
|
||||
if (this.$store.state.produceScreen.screenData !== '') {
|
||||
res = JSON.parse(this.$store.state.produceScreen.screenData)
|
||||
}
|
||||
return res
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
showPop(type, name) {
|
||||
toExit() {
|
||||
this.disabled = true
|
||||
crudProduceScreen.loginOut({ username: this.screenData.username, device_code: this.screenData.device_code }).then(res => {
|
||||
this.disabled = false
|
||||
localStorage.removeItem('screenData')
|
||||
this.$router.push('/produceScreen/setup')
|
||||
}).catch(() => {
|
||||
this.disabled = false
|
||||
})
|
||||
},
|
||||
showPop(type, e) {
|
||||
this.popData = {}
|
||||
this.popList = []
|
||||
this.popSecList = []
|
||||
this.currentRow = null
|
||||
this.value = ''
|
||||
this.value1 = ''
|
||||
this.vcode = ''
|
||||
this.type = type
|
||||
this.buttonName = name
|
||||
if (type === 1) {
|
||||
crudProduceScreen.regionList().then(res => {
|
||||
this.machineData = [...res.content]
|
||||
this.popData = e
|
||||
if (type === 'IN') {
|
||||
crudProduceScreen.regionOrder(this.screenData.device_code, this.popData.device_code).then(res => {
|
||||
this.popList = [...res.content]
|
||||
this.show = true
|
||||
})
|
||||
} else if (type === 2 && name in this.pointState) {
|
||||
crudProduceScreen.regionOrder(this.pkObj.value, this.pointState[name]).then(res => {
|
||||
this.n1List = [...res.content]
|
||||
this.n1List.map(el => {
|
||||
this.$set(el, 'device_code', this.pointState[name])
|
||||
})
|
||||
this.vechineList = []
|
||||
this.show = true
|
||||
})
|
||||
} else if (type === 3 && name in this.pointState) {
|
||||
} else if (type === 'CONTAINER') {
|
||||
this.popData.title = '选择托盘类型'
|
||||
this.emptyObj = {}
|
||||
this.val1 = ''
|
||||
this.show = true
|
||||
this.emptyObj.device_code = this.pointState[name]
|
||||
this.emptyObj.regin_code = this.pkObj.value
|
||||
} else if (type === 4 && name in this.pointState) {
|
||||
this.sendObj = {}
|
||||
this.check1 = false
|
||||
this.check2 = false
|
||||
this.emptyObj.device_code = e.name
|
||||
} else if (type === 'SCANER') {
|
||||
const arr = []
|
||||
if (JSON.stringify(this.screenData) !== '{}') {
|
||||
this.screenData.region_points.map(el => {
|
||||
if (el.type === '0') {
|
||||
arr.push(el.device_code)
|
||||
}
|
||||
})
|
||||
}
|
||||
crudProduceScreen.fabOrders({ deviceCodes: arr }).then(res => {
|
||||
this.options2 = [...res]
|
||||
})
|
||||
crudProduceScreen.getPointVehicle({ device_code: this.popData.device_code }).then(res => {
|
||||
this.vcode = res
|
||||
})
|
||||
this.popList.push({ order_code: '', material_qty: '', material_code: '' })
|
||||
this.show = true
|
||||
this.sendObj.order_code = ''
|
||||
this.sendObj.material_qty = null
|
||||
this.sendObj.vehicle_code = ''
|
||||
this.sendObj.device_code = this.pointState[name]
|
||||
this.sendObj.regin_code = this.pkObj.value
|
||||
} else if (type === 5 && name in this.pointState) {
|
||||
this.backObj = {}
|
||||
} else if (type === 'BACK') {
|
||||
const arr = []
|
||||
arr.push(this.popData.device_code)
|
||||
crudProduceScreen.fabOrders({ deviceCodes: arr }).then(res => {
|
||||
this.popList = [...res]
|
||||
this.popList.map(el => {
|
||||
this.$set(el, 'material_qty', 0)
|
||||
})
|
||||
this.show = true
|
||||
this.backObj.material_qty = null
|
||||
this.backObj.device_code = this.pointState[name]
|
||||
this.backObj.regin_code = this.pkObj.value
|
||||
})
|
||||
}
|
||||
},
|
||||
handleCurrentChange1(val) {
|
||||
this.currentRow1 = val
|
||||
},
|
||||
handleCurrentChange2(val) {
|
||||
this.currentRow2 = val
|
||||
},
|
||||
toSure1() {
|
||||
if (this.currentRow1 === null) {
|
||||
this.$message.error('请选择设备！')
|
||||
return
|
||||
}
|
||||
this.pkObj = this.currentRow1
|
||||
this.show = false
|
||||
crudProduceScreen.regionPoints(this.pkObj.value).then(res => {
|
||||
this.pointState = res
|
||||
handleCurrentChange(val) {
|
||||
this.currentRow = val
|
||||
crudProduceScreen.fabMaterial({ vehicle_code: this.currentRow.vehicle_code }).then(res => {
|
||||
this.popSecList = [...res]
|
||||
})
|
||||
},
|
||||
toCall() {
|
||||
if (this.currentRow2 === null) {
|
||||
this.$message.error('请选择设备！')
|
||||
toSure() {
|
||||
this.disabled = true
|
||||
if (this.type === 'IN') {
|
||||
if (this.popSecList.length === 0) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
crudProduceScreen.callMater(this.currentRow2).then(res => {
|
||||
crudProduceScreen.callMater({ mater: this.popSecList, device_code: this.popData.device_code, vehicle_code: this.currentRow.vehicle_code }).then(res => {
|
||||
this.disabled = false
|
||||
this.$message(res.msg)
|
||||
}).catch(() => {
|
||||
this.disabled = false
|
||||
})
|
||||
this.show = false
|
||||
},
|
||||
toSure3() {
|
||||
if (!this.val1) {
|
||||
} else if (this.type === 'CONTAINER') {
|
||||
if (!this.value) {
|
||||
this.disabled = false
|
||||
this.$message.error('请选择托盘类型！')
|
||||
return
|
||||
}
|
||||
this.emptyObj.vehicle_type = this.val1
|
||||
crudProduceScreen.callEmp(this.emptyObj).then(res => {
|
||||
crudProduceScreen.callEmp({ vehicle_type: this.value, device_code: this.popData.device_code }).then(res => {
|
||||
this.disabled = false
|
||||
this.$message(res.msg)
|
||||
}).catch(() => {
|
||||
this.disabled = false
|
||||
})
|
||||
} else if (this.type === 'SCANER') {
|
||||
if (!this.vcode) {
|
||||
this.disabled = false
|
||||
this.$message.error('请填写载具号')
|
||||
return
|
||||
}
|
||||
if (!this.value1) {
|
||||
this.disabled = false
|
||||
this.$message.error('请选择目的地')
|
||||
return
|
||||
}
|
||||
const arr = []
|
||||
this.popList.map(el => {
|
||||
if (el.order_code !== '' && el.material_qty !== '' && el.material_code !== '') {
|
||||
arr.push(el)
|
||||
}
|
||||
})
|
||||
crudProduceScreen.sendMater({ device_code: this.popData.device_code, mater: arr, point_code: this.value1, vehicle_code: this.vcode }).then(res => {
|
||||
this.disabled = false
|
||||
this.$message(res.msg)
|
||||
}).catch(() => {
|
||||
this.disabled = false
|
||||
})
|
||||
} else if (this.type === 'BACK') {
|
||||
crudProduceScreen.sendVehicle({ mater: this.popList, device_code: this.popData.device_code }).then(res => {
|
||||
this.$message(res.msg)
|
||||
}).catch(() => {
|
||||
this.disabled = false
|
||||
})
|
||||
}
|
||||
this.show = false
|
||||
},
|
||||
toSure4() {
|
||||
if (this.sendObj.order_code === '') {
|
||||
this.$message.error('请输入订单编码！')
|
||||
return
|
||||
}
|
||||
if (this.sendObj.material_qty === '' || this.sendObj.material_qty === null) {
|
||||
this.$message.error('请输入合格数量！')
|
||||
return
|
||||
}
|
||||
if (this.sendObj.vehicle_code === '') {
|
||||
this.$message.error('请输入载具编码！')
|
||||
return
|
||||
}
|
||||
this.sendObj.has_report = this.check1
|
||||
this.sendObj.target_region_code = this.check2
|
||||
crudProduceScreen.sendMater(this.sendObj).then(res => {
|
||||
this.$message(res.msg)
|
||||
})
|
||||
this.show = false
|
||||
addRow(index, rows) {
|
||||
rows.splice(index, 0, { order_code: '', material_qty: '', material_code: '' })
|
||||
},
|
||||
toSure5() {
|
||||
if (this.backObj.material_qty === '' || this.backObj.material_qty === null) {
|
||||
this.$message.error('请输入物料数量！')
|
||||
return
|
||||
}
|
||||
crudProduceScreen.sendVehicle(this.backObj).then(res => {
|
||||
this.$message(res.msg)
|
||||
})
|
||||
this.show = false
|
||||
delRow(index, rows) {
|
||||
rows.splice(index, 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
.container {
|
||||
// width: 1280px;
|
||||
// height: 960px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
padding: 1.5%;
|
||||
box-sizing: border-box;
|
||||
background: center / 100% 100% url('~@/assets/images/screen_bg.jpg') no-repeat;
|
||||
}
|
||||
.height-10 {
|
||||
height: 10%;
|
||||
}
|
||||
.height-20 {
|
||||
height: 20%;
|
||||
}
|
||||
.height-30 {
|
||||
height: 30%;
|
||||
}
|
||||
.height-100 {
|
||||
height: 100%;
|
||||
}
|
||||
.mg2 {
|
||||
margin: 0 2%;
|
||||
}
|
||||
.ver-justify {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.ver-center {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
}
|
||||
.s-btn-1 {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 45%;
|
||||
font-size: 18px;
|
||||
line-height: 1;
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
padding: 0 15px;
|
||||
background: center / 100% 100% url('~@/assets/images/screen_1.png') no-repeat;
|
||||
}
|
||||
.s-btn-1_dis {
|
||||
background-image: url('~@/assets/images/screen_5.png');
|
||||
}
|
||||
.s-btn-2 {
|
||||
position: relative;
|
||||
height: 100%;
|
||||
background-color: #b3d8ff;
|
||||
border: 1px solid #53a8ff;
|
||||
border-radius: 16px;
|
||||
&::before {
|
||||
position: absolute;
|
||||
content: '';
|
||||
left: 0;
|
||||
top: 20%;
|
||||
width: 100%;
|
||||
height: 80%;
|
||||
background-image: linear-gradient(to bottom, #66b1ff, #a0cfff);
|
||||
border-radius: 16px;
|
||||
}
|
||||
.p1 {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 22px;
|
||||
line-height: 22px;
|
||||
font-weight: 700;
|
||||
color: #fff;
|
||||
margin: 0;
|
||||
}
|
||||
.p2 {
|
||||
position: absolute;
|
||||
bottom: 22%;
|
||||
width: 100%;
|
||||
font-size: 16px;
|
||||
line-height: 16px;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
.s-btn-2_dis {
|
||||
background-color: #a2b1c1;
|
||||
border: 1px solid #393f44;
|
||||
&::before {
|
||||
background-image: linear-gradient(to bottom, #666e77, #a8b5c3);
|
||||
}
|
||||
}
|
||||
.s-btn-3 {
|
||||
height: 100%;
|
||||
}
|
||||
.btns-wrap {
|
||||
height: 40%;
|
||||
}
|
||||
.btns-wrap-2 {
|
||||
height: 35%;
|
||||
}
|
||||
.m-content {
|
||||
height: 54%;
|
||||
border: 1px solid #4aaee2;
|
||||
border-radius: 10px;
|
||||
padding: 10px;
|
||||
box-sizing: border-box;
|
||||
background-image: linear-gradient(to right, rgba(36, 128, 207, 0.5), rgba(15, 61, 101, 0.5));
|
||||
box-shadow: inset 1px 1px 4px 2px rgb(74 174 226 / 40%), inset -1px -1px 4px 2px rgb(74 174 226 / 40%);
|
||||
p {
|
||||
font-size: 24px;
|
||||
line-height: 1;
|
||||
font-weight: 700;
|
||||
text-align: center;
|
||||
color: #3CC1FF;
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
.m-content-2 {
|
||||
width: 60%;
|
||||
height: 65%;
|
||||
margin: 1% auto 0;
|
||||
}
|
||||
.m-content-inner {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
// background-color: #fff;
|
||||
border-radius: 10px;
|
||||
padding: 2% 1%
|
||||
}
|
||||
.grid {
|
||||
height: 90%;
|
||||
padding-top: 2%;
|
||||
}
|
||||
.pop-wraper {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 5%;
|
||||
z-index: 20;
|
||||
width: 90%;
|
||||
height: 80%;
|
||||
border-radius: 15px;
|
||||
padding: 3%;
|
||||
background: center / 100% 100% url('~@/assets/images/screen_2.png') no-repeat;
|
||||
}
|
||||
.pop-wraper-1 {
|
||||
width: 50%;
|
||||
left: 25%;
|
||||
height: 60%;
|
||||
padding: 5% 3% 3% 3%;
|
||||
background: center / 100% 100% url('~@/assets/images/screen_4.png') no-repeat;
|
||||
}
|
||||
.popshow {
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
.pophide {
|
||||
transform: translateY(100%);
|
||||
}
|
||||
.modal {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0,0,0,0.5);
|
||||
z-index: 10;
|
||||
}
|
||||
.pop-h1 {
|
||||
font-size: 22px;
|
||||
line-height: 1;
|
||||
font-weight: 700;
|
||||
text-align: left;
|
||||
color: #F6F9FE;
|
||||
margin: 0;
|
||||
background: linear-gradient(180deg, rgba(255,255,255,1) 0%, rgba(49,190,255,0.9) 0%, rgba(239,252,254,1) 40%);
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
}
|
||||
.pop-btns {
|
||||
height: 8%;
|
||||
}
|
||||
.pop-grid {
|
||||
height: calc(92% - 24px);
|
||||
padding: 2% 0;
|
||||
}
|
||||
>>>.el-table {
|
||||
background-color: transparent;
|
||||
}
|
||||
>>>.el-table--border {
|
||||
border: none;
|
||||
}
|
||||
>>>.el-table .el-table__header-wrapper th {
|
||||
height: 40px;
|
||||
}
|
||||
>>>.el-table thead tr {
|
||||
background: center / 100% 100% url('~@/assets/images/screen_3.png') no-repeat;
|
||||
}
|
||||
>>>.el-table .el-table__header-wrapper th {
|
||||
background-color: transparent;
|
||||
color: #AFBED8;
|
||||
font-size: 16px;
|
||||
}
|
||||
>>>.el-table th.el-table__cell.is-leaf {
|
||||
border-bottom-color: #5D92FF;
|
||||
}
|
||||
>>>.el-table--border .el-table__cell {
|
||||
border-right: none;
|
||||
}
|
||||
>>>.el-table--mini .el-table__cell {
|
||||
padding: 8px 0;
|
||||
}
|
||||
>>>.el-table {
|
||||
color: #fff;
|
||||
font-size: 14px;
|
||||
tr {
|
||||
background-color: rgba(31,46,73,0.3);
|
||||
}
|
||||
}
|
||||
>>>.el-table td.el-table__cell {
|
||||
border-bottom-color: rgba(122,159,224,0.17);
|
||||
}
|
||||
>>>.el-table::before, .el-table--group::after, .el-table--border::after {
|
||||
background-color: rgba(122,159,224,0.17);
|
||||
}
|
||||
>>>.el-table__body tr.current-row>td.el-table__cell {
|
||||
background-color: #3F6ACA;
|
||||
}
|
||||
.filter-wraper {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.p-label {
|
||||
font-size: 18px;
|
||||
line-height: 40px;
|
||||
text-align: right;
|
||||
color: #fff;
|
||||
margin: 0;
|
||||
}
|
||||
.p-value {
|
||||
width: 100%;
|
||||
font-size: 18px;
|
||||
line-height: 40px;
|
||||
height: 40px;
|
||||
text-align: left;
|
||||
color: #fff;
|
||||
margin: 0;
|
||||
padding: 0 30px 0 15px;
|
||||
background: rgba(45,88,184,0.25);
|
||||
border: 1px solid #21D0F2;
|
||||
}
|
||||
.select-wraper {
|
||||
font-size: 18px;
|
||||
line-height: 40px;
|
||||
height: 40px;
|
||||
text-align: left;
|
||||
color: #fff;
|
||||
>>>.el-select {
|
||||
width: 100%;
|
||||
}
|
||||
>>>.el-input__inner {
|
||||
background-color: rgba(45,88,184,0.25);
|
||||
border-color: #21D0F2;
|
||||
}
|
||||
>>>.el-input--mini .el-input__inner {
|
||||
font-size: 18px;
|
||||
line-height: 40px;
|
||||
height: 40px;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
.option-wraper {
|
||||
font-size: 18px;
|
||||
line-height: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
>>>.el-checkbox__inner {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
font-size: 40px;
|
||||
}
|
||||
>>>.el-checkbox__inner::after {
|
||||
width: 6px;
|
||||
height: 20px;
|
||||
left: 15px;
|
||||
top: 3px;
|
||||
}
|
||||
>>>.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
|
||||
background-color: rgba(122,159,224,0.5)
|
||||
}
|
||||
@import './style.scss';
|
||||
</style>
|
||||
|
||||
@@ -30,7 +30,7 @@ export function deviceInLogin() {
|
||||
// 4.根据工序查询订单
|
||||
export function regionOrder(code) {
|
||||
const res = {
|
||||
content: [{ vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }]
|
||||
content: [{ vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11', vehicle_path: 'http://127.0.0.1:5500/src/assets/images/screen_bg.jpg.preview' }, { order_code: '1', vehicle_path: 'http://127.0.0.1:5500/src/assets/images/screen_bg.jpg.preview' }, { order_code: '2' }, { order_code: '3' }, { order_code: '4' }, { order_code: '5' }, { order_code: '6' }, { order_code: '7' }, { order_code: '8' }, { order_code: '9' }]
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
resolve(res)
|
||||
@@ -39,11 +39,9 @@ export function regionOrder(code) {
|
||||
|
||||
// 5.查询载具物料信息
|
||||
export function fabMaterial() {
|
||||
const res = {
|
||||
content: [
|
||||
{ order_code: '111-02', material_qty: '' }
|
||||
const res = [
|
||||
{ order_code: '111-02', material_qty: '', vehicle_path: 'http://127.0.0.1:5500/src/assets/images/screen_bg.jpg.preview' }
|
||||
]
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
resolve(res)
|
||||
})
|
||||
@@ -69,9 +67,12 @@ export function callEmp(data) {
|
||||
|
||||
// 8.查询订单号
|
||||
export function fabOrders() {
|
||||
const res = [
|
||||
{ order_code: '111-02' }
|
||||
const res = {
|
||||
path: '',
|
||||
material: [
|
||||
{ order_code: '111-02', material_code: 'dljflfj' }
|
||||
]
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
resolve(res)
|
||||
})
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<el-row class="filter-wraper" type="flex" justify="space-between">
|
||||
<el-col :span="5" class="p-label">设备</el-col>
|
||||
<el-col :span="18" class="select-wraper">
|
||||
<el-select v-model="value" placeholder="请选择">
|
||||
<el-select v-model="value" :popper-append-to-body="false" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.device_code"
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
.zd-row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -103,10 +107,22 @@
|
||||
line-height: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
::v-deep {
|
||||
.el-select-dropdown {
|
||||
position: absolute !important;
|
||||
background-color: rgba(7,31,62,0.95);
|
||||
border: 1px solid #4980BD;
|
||||
}
|
||||
.el-select-dropdown__item {
|
||||
font-size: 18px;
|
||||
line-height: 40px;
|
||||
height: 40px;
|
||||
color: #fff;
|
||||
}
|
||||
.el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
|
||||
color: #3CC1FF;
|
||||
background-color: rgba(7,31,62,0.95) !important;
|
||||
}
|
||||
}
|
||||
>>>.el-checkbox__inner {
|
||||
width: 40px;
|
||||
@@ -165,6 +181,9 @@
|
||||
>>>.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
|
||||
background-color: rgba(122,159,224,0.5)
|
||||
}
|
||||
>>>.el-table__empty-block {
|
||||
background-color: #071F3E;
|
||||
}
|
||||
.login_button {
|
||||
width: 100%;
|
||||
font-size: 22px;
|
||||
@@ -273,7 +292,7 @@
|
||||
.pop-wraper-2 {
|
||||
left: 3%;
|
||||
width: 94%;
|
||||
padding: 2% 1.5% 3% 1.5%;
|
||||
padding: 2% 2% 3% 2%;
|
||||
}
|
||||
.popshow {
|
||||
transform: translateY(-50%);
|
||||
@@ -302,16 +321,40 @@
|
||||
-webkit-text-fill-color: transparent;
|
||||
}
|
||||
.pop-grid {
|
||||
height: calc(100% - 112px);
|
||||
margin-bottom: 60px;
|
||||
overflow: auto;
|
||||
height: calc(100% - 82px);
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
.pop-grid_1 {
|
||||
height: calc(100% - 172px);
|
||||
height: calc(100% - 142px);
|
||||
}
|
||||
.pop-grid_l {
|
||||
width: 60%;
|
||||
height: 100%;
|
||||
}
|
||||
.pop-grid_r {
|
||||
width: 39%;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
}
|
||||
.pop-grid_t {
|
||||
height: 50%;
|
||||
}
|
||||
.img_pallet {
|
||||
width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
.filter-items {
|
||||
height: calc(100% - 112px);
|
||||
margin-bottom: 60px;
|
||||
}
|
||||
.filter-wraper {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.p-text {
|
||||
font-size: 24px;
|
||||
line-height: 40px;
|
||||
color: #fff;
|
||||
}
|
||||
.p-label {
|
||||
font-size: 18px;
|
||||
line-height: 40px;
|
||||
|
||||
Reference in New Issue
Block a user