Commit c0ea09a15e63e715779a25b937f7a576252a6cdd
1 parent
9086f965
完成设备测试
Showing
5 changed files
with
16 additions
and
43 deletions
src/components/machine/addPrinterRule.vue
| @@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
| 9 | </el-form-item> | 9 | </el-form-item> |
| 10 | <el-form-item :label="$t('printerRule.state')" prop="state"> | 10 | <el-form-item :label="$t('printerRule.state')" prop="state"> |
| 11 | <el-select v-model="form.state" style="width:100%"> | 11 | <el-select v-model="form.state" style="width:100%"> |
| 12 | - <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"></el-option> | 12 | + <el-option v-for="item in stateOptions" :key="item.statusCd" :label="item.name" :value="item.statusCd"></el-option> |
| 13 | </el-select> | 13 | </el-select> |
| 14 | </el-form-item> | 14 | </el-form-item> |
| 15 | </el-form> | 15 | </el-form> |
src/components/machine/addPrinterRuleMachine.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog :title="$t('printerRuleMachine.addTitle')" :visible.sync="visible" width="50%" @close="handleClose"> | ||
| 3 | - <el-form ref="form" :model="form" :rules="rules" label-width="120px"> | 2 | + <el-dialog :title="$t('printerRuleMachine.addTitle')" :visible.sync="visible" width="40%" @close="handleClose"> |
| 3 | + <el-form ref="form" :model="form" :rules="rules" label-width="120px" class="text-left" > | ||
| 4 | <el-form-item :label="$t('printerRuleMachine.machine')" prop="machineId"> | 4 | <el-form-item :label="$t('printerRuleMachine.machine')" prop="machineId"> |
| 5 | <el-select v-model="form.machineId" :placeholder="$t('printerRuleMachine.machinePlaceholder')" style="width:100%"> | 5 | <el-select v-model="form.machineId" :placeholder="$t('printerRuleMachine.machinePlaceholder')" style="width:100%"> |
| 6 | <el-option v-for="item in machines" :key="item.machineId" :label="`${item.machineName}(${item.machineCode})`" | 6 | <el-option v-for="item in machines" :key="item.machineId" :label="`${item.machineName}(${item.machineCode})`" |
src/components/machine/editPrinterRuleMachine.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog | ||
| 3 | - :title="$t('printerRuleMachine.editTitle')" | ||
| 4 | - :visible.sync="visible" | ||
| 5 | - width="50%" | ||
| 6 | - @close="handleClose" | ||
| 7 | - > | ||
| 8 | - <el-form | ||
| 9 | - ref="form" | ||
| 10 | - :model="form" | ||
| 11 | - :rules="rules" | ||
| 12 | - label-width="120px" | ||
| 13 | - > | ||
| 14 | - <el-form-item | ||
| 15 | - :label="$t('printerRuleMachine.machine')" | ||
| 16 | - prop="machineId" | ||
| 17 | - > | ||
| 18 | - <el-select | ||
| 19 | - v-model="form.machineId" | ||
| 20 | - :placeholder="$t('printerRuleMachine.machinePlaceholder')" | ||
| 21 | - style="width:100%" | ||
| 22 | - > | ||
| 23 | - <el-option | ||
| 24 | - v-for="item in machines" | ||
| 25 | - :key="item.machineId" | ||
| 26 | - :label="`${item.machineName}(${item.machineCode})`" | ||
| 27 | - :value="item.machineId" | ||
| 28 | - /> | 2 | + <el-dialog :title="$t('printerRuleMachine.editTitle')" :visible.sync="visible" width="40%" @close="handleClose"> |
| 3 | + <el-form ref="form" :model="form" :rules="rules" label-width="120px" class="text-left"> | ||
| 4 | + <el-form-item :label="$t('printerRuleMachine.machine')" prop="machineId"> | ||
| 5 | + <el-select v-model="form.machineId" :placeholder="$t('printerRuleMachine.machinePlaceholder')" | ||
| 6 | + style="width:100%"> | ||
| 7 | + <el-option v-for="item in machines" :key="item.machineId" :label="`${item.machineName}(${item.machineCode})`" | ||
| 8 | + :value="item.machineId" /> | ||
| 29 | </el-select> | 9 | </el-select> |
| 30 | </el-form-item> | 10 | </el-form-item> |
| 31 | - <el-form-item | ||
| 32 | - :label="$t('printerRuleMachine.quantity')" | ||
| 33 | - prop="quantity" | ||
| 34 | - > | ||
| 35 | - <el-input-number | ||
| 36 | - v-model="form.quantity" | ||
| 37 | - :min="1" | ||
| 38 | - :max="100" | ||
| 39 | - :placeholder="$t('printerRuleMachine.quantityPlaceholder')" | ||
| 40 | - /> | 11 | + <el-form-item :label="$t('printerRuleMachine.quantity')" prop="quantity"> |
| 12 | + <el-input-number v-model="form.quantity" :min="1" :max="100" | ||
| 13 | + :placeholder="$t('printerRuleMachine.quantityPlaceholder')" /> | ||
| 41 | </el-form-item> | 14 | </el-form-item> |
| 42 | </el-form> | 15 | </el-form> |
| 43 | 16 |
src/components/machine/printerRuleDiv.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-card class="box-card"> | 2 | <el-card class="box-card"> |
| 3 | <div class="button-group"> | 3 | <div class="button-group"> |
| 4 | - <el-button type="text" size="small" @click="openAddModal"> | 4 | + <el-button type="text" size="small" @click="openAddModal"> |
| 5 | <i class="el-icon-plus"></i>{{ $t('common.add') }} | 5 | <i class="el-icon-plus"></i>{{ $t('common.add') }} |
| 6 | </el-button> | 6 | </el-button> |
| 7 | <el-button type="text" size="small" @click="openEditModal"> | 7 | <el-button type="text" size="small" @click="openEditModal"> |
src/views/machine/machineTranslateManageList.vue
| @@ -137,8 +137,8 @@ export default { | @@ -137,8 +137,8 @@ export default { | ||
| 137 | row: this.page.size, | 137 | row: this.page.size, |
| 138 | ...this.machineTranslateManageInfo.conditions | 138 | ...this.machineTranslateManageInfo.conditions |
| 139 | } | 139 | } |
| 140 | - const { data, total } = await listMachineTranslates(params) | ||
| 141 | - this.machineTranslateManageInfo.machineTranslates = data | 140 | + const { machineTranslates, total } = await listMachineTranslates(params) |
| 141 | + this.machineTranslateManageInfo.machineTranslates = machineTranslates | ||
| 142 | this.page.total = total | 142 | this.page.total = total |
| 143 | } catch (error) { | 143 | } catch (error) { |
| 144 | this.$message.error(this.$t('machineTranslateManage.fetchError')) | 144 | this.$message.error(this.$t('machineTranslateManage.fetchError')) |