update

gaoshp

2024-11-03 3931e2728f618d0090f129b2665bc1285c4440c3

 src/views/tpm/machine/Dialog.vue

@@ -51,7 +51,7 @@
                    <el-form-item label="生命状态" prop="machineLifeStatus">
                        <el-select v-model="form.machineLifeStatus" placeholder="" style="width: 240px">
                            <el-option v-for="item in options.machineLifeStatus" :key="item.value" :label="item.label"
                                :value="item.value" />
                                :value="item.value - 0" />
                        </el-select>
                    </el-form-item>
                </el-col>
@@ -107,7 +107,9 @@
                </el-col>
                <el-col :span="8">
                    <el-form-item label="所属机器组" prop="groupId">
                        <el-input style="width: 240px" v-model="form.groupId" placeholder="所属机器组" clearable></el-input>
                        <!-- <el-input style="width: 240px" v-model="form.groupId" placeholder="所属机器组" clearable></el-input> -->
                        <el-tree-select v-model="form.groupId" node-key="id" :props="props" :data="options.groupId"
                            filterable style="width: 240px" />
                    </el-form-item>
                </el-col>
                <el-col :span="8">
@@ -117,14 +119,15 @@
                    </el-form-item>
                </el-col>
                <el-col :span="8">
                    <el-form-item label="工位编号" prop="workstationId">
                        <el-input style="width: 240px" v-model="form.workstationId" placeholder="未绑定"
                    <el-form-item label="工位编号" prop="workstationCode">
                        <el-input style="width: 240px" v-model="form.workstationCode" placeholder="未绑定"
                            disabled></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="8">
                    <el-form-item label="工位名称" prop="code">
                        <el-input style="width: 240px" v-model="form.code" placeholder="未绑定" disabled></el-input>
                    <el-form-item label="工位名称" prop="workstationName">
                        <el-input style="width: 240px" v-model="form.workstationName" placeholder="未绑定"
                            disabled></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="8">
@@ -219,8 +222,8 @@
                </el-col>
                <el-col :span="8">
                    <el-form-item label="使用部门" prop="organizationId">
                        <el-input style="width: 240px" v-model="form.organizationId" placeholder="使用部门"
                            clearable></el-input>
                        <el-tree-select v-model="form.organizationId" node-key="id" :props="props"
                            :data="options.organizationId" filterable style="width: 240px" />
                    </el-form-item>
                </el-col>
                <el-col :span="8">
@@ -241,13 +244,15 @@
                    <el-form-item label="使用状态" prop="machineUseStatus">
                        <el-select v-model="form.machineUseStatus" placeholder="" style="width: 240px">
                            <el-option v-for="item in options.machineUseStatus" :key="item.value" :label="item.label"
                                :value="item.value" />
                                :value="item.value - 0" />
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="8">
                    <el-form-item label="责任人" prop="employeeId">
                        <el-input style="width: 240px" v-model="form.employeeId" placeholder="责任人" clearable></el-input>
                        <!-- <el-input style="width: 240px" v-model="form.employeeId" placeholder="责任人" clearable></el-input> -->
                        <el-tree-select v-model="form.employeeId" node-key="id" :props="props"
                            :data="options.employeeId" filterable style="width: 240px" />
                    </el-form-item>
                </el-col>
                <el-col :span="8">
@@ -294,6 +299,9 @@
    },
    data() {
        return {
            props: {
                label: 'name',
            },
            options: {
                machineTypeId: [],
                machineLifeStatus: [],
@@ -317,7 +325,10 @@
                        value: 0
                    }
                ],
                machineUseStatus: []
                machineUseStatus: [],
                employeeId: [],
                groupId: [],
                organizationId: []
            },
            mode: "add",
            titleMap: {
@@ -348,8 +359,9 @@
                softwareVersion: '',
                groupId: '',
                linkWay: '',
                machineCode: '',
                workstationId: '',
                workstationCode: '',
                workstationName: '',
                code: '',
                status: '',
                invoiceValue: '',
@@ -468,12 +480,27 @@
                    }))
                }
            })
            this.$HTTP.get('/api/blade-cps/device-types/page?keyWord=&current=1&size=-1').then(res => {
            this.$HTTP.get('/api/smis/device-types/page?keyWord=&current=1&size=-1').then(res => {
                if (res.code === 200) {
                    this.options.machineTypeId = res.data.records.map(item => ({
                        label: item.name,
                        value: item.id
                    }))
                }
            })
            this.$HTTP.get('/api/smis/employee/tree').then(res => {
                if (res.code === 200) {
                    this.options.employeeId = res.data
                }
            })
            this.$HTTP.get('/api/smis/group/tree?groupCategory=1&groupType=group_machine').then(res => {
                if (res.code === 200) {
                    this.options.groupId = res.data
                }
            })
            this.$HTTP.get('/api/smis/organization/tree?groupType=group_organization&groupCategory=1').then(res => {
                if (res.code === 200) {
                    this.options.organizationId = res.data
                }
            })
        },
@@ -486,8 +513,8 @@
            Object.keys(this.form).forEach(item => {
                this.form[item] = ''
            })
            if (params) {
                this.$HTTP.get(`/api/blade-cps/machine/detail/${params.id}`).then(res => {
            if (params.id) {
                this.$HTTP.get(`/api/smis/machine/detail/${params.id}`).then(res => {
                    if (res.code === 200) {
                        this.form = {
                            ...this.form,
@@ -495,6 +522,11 @@
                        }
                    }
                })
            } else {
                this.form = {
                    ...this.form,
                    ...params
                }
            }

            return this
@@ -510,11 +542,11 @@
                    let res
                    try {
                        if (this.form.id) {
                            res = await this.$HTTP.put('/api/blade-cps/machine', data).catch(() => {
                            res = await this.$HTTP.put('/api/smis/machine', data).catch(() => {
                                throw new Error()
                            })
                        } else {
                            res = await this.$HTTP.post('/api/blade-cps/machine', data).catch(() => {
                            res = await this.$HTTP.post('/api/smis/machine', data).catch(() => {
                                throw new Error()
                            })
                        }
@@ -528,7 +560,7 @@
                        this.visible = false;
                        this.$message.success("操作成功")
                    } else {
                        this.$alert(res.message, "提示", { type: 'error' })
                        this.$alert(res.msg, "提示", { type: 'error' })
                    }
                } else {
                    return false;