1

lzhe

2024-10-07 9516d95bdcc481b71d4b090bbdcfff39a84b26d6

 src/views/console/workstation/Dialog.vue

@@ -41,13 +41,33 @@
                        <scUpload v-model="form.avatar" title="工位图片"></scUpload>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                <el-col :span="12" v-show="!form.id">
                    <el-form-item label="生产日历" prop="calendarCode">
                        <el-select v-model="form.calendarCode" style="width: 240px">
                            <el-option v-for="item in options.calendarList" :key="item.id" :label="item.name"
                                :value="item.id" />
                                :value="item.code" />
                        </el-select>
                    </el-form-item>
                </el-col>
                <!-- 修改的次日生效 -->
                <el-col :span="11" v-show="form.id">
                    <el-form-item label="生产日历" prop="calendarCode">
                        <el-select v-model="form.calendarCodeWaiting" style="width: 240px">
                            <el-option v-for="item in options.calendarList" :key="item.id" :label="item.name"
                                :value="item.code" />
                        </el-select>
                    </el-form-item>

                </el-col>
                <el-col :span="1" v-show="form.id">
                    <div style="display: flex;align-items: center;height: 32px;margin-bottom: 18px;">
                        <el-tooltip class="box-item" effect="dark" content="修改后的日历次日生效" placement="top-start">
                            <el-icon>
                                <el-icon-warning-filled style="vertical-align: middle" />
                            </el-icon>
                        </el-tooltip>
                    </div>

                </el-col>
                <el-col :span="24" style="padding:12px 0;" v-if="form.type == 0">
                    机器信息
@@ -68,7 +88,8 @@
                            filterable>
                            <el-option v-for="item in options.listnoband" :key="item.id" :label="item.machineName"
                                :value="item.id">
                                {{ `${item?.machineCode}-${item?.machineName}-${item?.brand}` }}</el-option>
                                {{ `${item?.machineCode}-${item?.machineName}${item?.brand ? '-' + item.brand : ''}`
                                }}</el-option>
                        </el-select>
                        <el-input v-if="form.id" :disabled="form.id" v-model="form.machineName"></el-input>
                    </el-form-item>
@@ -88,7 +109,7 @@
                    <el-form-item label="加工属性" prop="properties">
                        <el-select v-model="form.properties" style="width: 240px">
                            <el-option v-for="item in options.machining_type" :key="item.dictKey"
                                :label="item.dictValue" :value="item.dictKey" />
                                :label="item.dictValue" :value="item.dictKey - 0" />
                        </el-select>
                    </el-form-item>
                </el-col>
@@ -198,6 +219,7 @@
                status: '',
                avatar: '',
                calendarCode: '',
                calendarCodeWaiting: '',
                linkWay: '',
                machineId: '',
                machineCode: '',
@@ -301,8 +323,10 @@
                Object.keys(this.form).forEach(key => {
                    this.form[key] = params[key]
                })

                this.$HTTP.get(`/api/blade-cps/workstation/get?workstationId=${params.id}`).then(res => {
                    this.form = res?.data
                    if (this.form.calendarCode && !this.form.calendarCodeWaiting) this.form.calendarCodeWaiting = this.form.calendarCode
                    this.$HTTP.get(`/api/blade-cps/workstation-workbench/listWorkbench?workstationId=${params.id}`).then(res => {
                        this.form.workbenchVOList = res?.data?.workstationList || []
                    })