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>
@@ -119,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">
@@ -243,7 +244,7 @@
                    <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>
@@ -358,8 +359,9 @@
                softwareVersion: '',
                groupId: '',
                linkWay: '',
                machineCode: '',
                workstationId: '',
                workstationCode: '',
                workstationName: '',
                code: '',
                status: '',
                invoiceValue: '',
@@ -478,7 +480,7 @@
                    }))
                }
            })
            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,
@@ -486,17 +488,17 @@
                    }))
                }
            })
            this.$HTTP.get('/api/blade-cps/employee/tree').then(res => {
            this.$HTTP.get('/api/smis/employee/tree').then(res => {
                if (res.code === 200) {
                    this.options.employeeId = res.data
                }
            })
            this.$HTTP.get('/api/blade-cps/group/tree?groupCategory=1&groupType=group_machine').then(res => {
            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/blade-cps/organization/tree?groupType=group_organization&groupCategory=1').then(res => {
            this.$HTTP.get('/api/smis/organization/tree?groupType=group_organization&groupCategory=1').then(res => {
                if (res.code === 200) {
                    this.options.organizationId = res.data
                }
@@ -512,7 +514,7 @@
                this.form[item] = ''
            })
            if (params.id) {
                this.$HTTP.get(`/api/blade-cps/machine/detail/${params.id}`).then(res => {
                this.$HTTP.get(`/api/smis/machine/detail/${params.id}`).then(res => {
                    if (res.code === 200) {
                        this.form = {
                            ...this.form,
@@ -540,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()
                            })
                        }