mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mes-zjl #123

Merged
juzi merged 2 commits from projects/mes-zjl into projects/mes-test 2023-11-28 16:52:00 +08:00
Conversation 0 Commits 2 Files Changed 11 +32 -17
11 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/base/delivery.js
View File

@ -18,6 +18,15 @@ export function deliveryProgressPage(data) {
})
}
// 获取订单列表
export function listOrderList(query) {
return request({
url: '/extend/delivery-log/listOrderList',
method: 'get',
params: query
})
}
// 获取发货进度分页
export function deliveryLogDetPage(data) {
return request({

6
src/styles/index.scss
View File

@ -196,4 +196,8 @@ input, textarea{
margin-right: 8px;
vertical-align: middle;
}
// 抽屉head区域---end
// 抽屉head区域---end
// 弹出框，上下分布，去掉label的padding-bottom
.el-form--label-top .el-form-item__label {
padding: 0;
}

9
src/views/delivery/deliveryLog/components/addOrUpdate.vue
View File

@ -3,7 +3,7 @@
<el-row :gutter="20">
<el-col :span='6'>
<el-form-item label="订单名" prop="orderId">
<el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;" filterable>
<el-option
v-for="item in orderList"
:key="item.id"
@ -39,7 +39,7 @@
<el-row :gutter="20">
<el-col :span='6'>
<el-form-item label="发货负责人" prop="deliveryPersonId">
<el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;" filterable>
<el-option
v-for="item in personList"
:key="item.id"
@ -75,9 +75,8 @@
</el-form>
</template>
<script>
import { orderList } from '@/api/base/orderManage'
import { getWorkerList } from '@/api/base/worker'
import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog } from '@/api/base/delivery'
import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog, listOrderList } from '@/api/base/delivery'
export default {
name: 'AddOrUpdate',
data() {
@ -116,7 +115,7 @@ export default {
}
},
getSelectList() {
orderList().then(res => {
listOrderList().then(res => {
this.orderList = res.data || []
})
getWorkerList().then(res => {

2
src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
View File

@ -1,7 +1,7 @@
<template>
<el-form ref="form" :rules="rules" label-width="100px" :model="form">
<el-form-item label="关联表名" prop="plcId">
<el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;" filterable>
<el-option
v-for="item in plcList"
:key="item.id"

2
src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
View File

@ -3,7 +3,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="能源类型" prop="typeId">
<el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;" filterable>
<el-option
v-for="item in energyListType"
:key="item.id"

2
src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
View File

@ -15,7 +15,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="能源类型" prop="energyTypeId">
<el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" @change="toggleType">
<el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable @change="toggleType">
<el-option
v-for="item in this.energyTypeList"
:key="item.id"

2
src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue
View File

@ -27,7 +27,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="能源类型" prop="energyTypeId">
<el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
<el-option
v-for="item in energyListType"
:key="item.id"

2
src/views/group/base/groupTeam/components/groupTeamAdd.vue
View File

@ -15,7 +15,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="班组组长" prop="leaderId">
<el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" @change="selectLeader">
<el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" filterable @change="selectLeader">
<el-option
v-for="item in workerList"
:key="item.id"

2
src/views/order/base/orderManage/components/addWorkOrder.vue
View File

@ -6,7 +6,7 @@
<el-input v-model="form.name"></el-input>
</el-form-item>
<el-form-item label="工单名称" prop="workOrderId" v-if='isBind'>
<el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" @change="getWorkOrderMsg">
<el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable @change="getWorkOrderMsg">
<el-option
v-for="item in workOrderList"
:key="item.id"

6
src/views/order/base/orderManage/components/orderAdd.vue
View File

@ -18,7 +18,7 @@
</el-col>
<el-col :span='6'>
<el-form-item label="产品名称" prop="planProductId">
<el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable>
<el-option
v-for="item in productList"
:key="item.id"
@ -39,7 +39,7 @@
</el-col>
<el-col :span='6'>
<el-form-item label="客户" prop="customerId">
<el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable>
<el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable filterable>
<el-option
v-for="item in customerList"
:key="item.id"
@ -82,7 +82,7 @@
</el-col>
<el-col :span='6'>
<el-form-item label="关联工艺" prop="processFlowId">
<el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable @change="processFlowIdChange">
<el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable filterable @change="processFlowIdChange">
<el-option
v-for="item in processFlowList"
:key="item.id"

7
src/views/order/monitoring/orderCompletionMonitoring/index.vue
View File

@ -154,7 +154,7 @@ export default {
},
tableProps,
list: [],
tableH: this.tableHeight(315),
tableH: this.tableHeight(305),
total: 0,
tableBtn: [
this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
@ -215,7 +215,7 @@ export default {
components: { MonitoringRingCharts },
mounted() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(315)
this.tableH = this.tableHeight(305)
})
let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
let end = moment().format('yyyy-MM-DD')
@ -347,6 +347,9 @@ export default {
.el-tabs__item {
color: rgba(0, 0, 0, 0.45);
}
.searchBarBox {
margin-bottom: 0;
}
.boxTitle {
display: inline-block;
font-size: 16px;