updatte

gaosp

2024-01-17 89d83a582dda4d8afb8f099905fa2a3b5a6cb08b

updatte

 src/api/Api.js

@@ -1,7 +1,7 @@
/*
 * @Date: 2024-01-10 20:37:45
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-15 23:56:49
 * @LastEditTime: 2024-01-17 00:00:54
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/api/Api.js
 */
import ajax from '@/utils/ajax'
@@ -74,6 +74,10 @@
        url: '/devicetype/delete',
        method: 'POST'
    },
    deviceTypeList:  {
        url: '/devicetype/list',
        method: 'GET'
    },
    machineList: {
        url: '/machine/list',
        method: 'POST'

 src/container/ledger/Manage-add-update.vue

@@ -74,6 +74,18 @@
            </el-form-item>

          </el-col>

          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

            <el-form-item label="设备类型" prop="deviceTypeId">

                <el-select v-model="dataForm.deviceTypeId" placeholder="---请选择---">

                    <el-option

                    v-for="item in deviceTypeIds"

                    :key="item.id"

                    :label="item.name"

                    :value="item.id">

                    </el-option>

                </el-select>

            </el-form-item>

          </el-col>

          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

            <el-form-item label="加工类型" prop="category">

                <el-select v-model="dataForm.category" placeholder="---请选择---">

                    <el-option

@@ -296,7 +308,8 @@
          originalValue: '', // 设备原值

          presentValue: '', // 设备净现值

          weight: '', // 设备重量

          remark: ''// 备注

          remark: '',// 备注

          deviceTypeId:  ''

        },

        machineNamelist: [], // 机床下拉

        workshoplist: [], // 车间list


 src/container/ledger/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-16 22:25:50
 * @LastEditTime: 2024-01-17 00:04:57
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/ledger/index.vue
-->
<template>
@@ -61,8 +61,12 @@
                    <el-input class="item-value" v-model="queryInfo.manufacturer"></el-input>
                </div>
                <div class="item">
                    
                    <!-- <div class="query btn" @click="query">查询</div> -->
                    <span>设备类型</span>
                    <el-select class="item-value" v-model="queryInfo.deviceTypeId" placeholder="">
                        <el-option v-for="item in deviceTypeIds" :key="item.id" :label="item.name"
                            :value="item.id">
                        </el-option>
                    </el-select>
                </div>
                <div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
                    <el-button type="primary" size="small" @click="query">查询</el-button>
@@ -137,7 +141,7 @@
        </List>
        <manage-add-update v-if="addOrUpdateVisible" :addVisible="addOrUpdateVisible" @close="close" @confirm="confirm"
            :deviceType="deviceType" :departmentlist="departmentlist" :isselectlist="isselectlist"
            :deviceStatus="deviceStatus" :financePro="financePro" :row="row"></manage-add-update>
            :deviceStatus="deviceStatus" :financePro="financePro" :deviceTypeIds="deviceTypeIds" :row="row"></manage-add-update>
    </div>
</template>
<script>
@@ -180,6 +184,7 @@
                { value: 'IDLE', label: '空闲' },
                { value: 'ALARM', label: '报警' }
            ],
            deviceTypeIds: [],
            // 账务属性
            financePro: [
                { value: '帐内', label: '帐内' },
@@ -196,6 +201,7 @@
                manageType: '',
                productionDate: '',
                manufacturer: '',
                deviceTypeId: ''
            },
            options: [{}],
            row: {},
@@ -217,6 +223,10 @@
                    }
                })
            })
            
            getRequest('deviceTypeList').then(res => {
                this.deviceTypeIds = res.data || []
            })
        },
        query() {
            this.$refs.list.pageQuery(this.queryInfo)

 src/container/machineList/Manage-add-update.vue

@@ -1,6 +1,6 @@
<template>
    <div>
        <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" width="80%" :visible.sync="addVisible">
        <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" width="80%" :visible.sync="addVisible" @close="cancel">
            <!-- 添加内容-->
            <el-form :model="dataForm" label-width="100px" ref="dataForm">
                <el-row :gutter="20">

 src/container/maintenance/dailyMAdd.vue

@@ -4,6 +4,7 @@
    <el-dialog

        :title="title"

        width="80%"

        @close="cancel"

        :visible.sync="dialogVisibleAdd" class="role-select">

         <!-- 查询表单 -->

        <el-form :model="dataForm" ref="dataForm" label-width="150px" style="margin-top:10px;">