Merge remote-tracking branch 'origin/master'

yangwl
wws 1 year ago
commit e96ed89557

@ -107,6 +107,8 @@
{{ scope.row.status == 1 ? "正常" : "停用" }}
</template>
</el-table-column>
<el-table-column label="设备IP" align="center" prop="plcIp" width="150"/>
<el-table-column label="设备端口号" align="center" prop="plcPort" width="100"/>
<el-table-column label="单台能力工时" align="center" prop="unitWorkingHours" width="100"/>
<el-table-column label="工段" align="center" prop="workshopSection" />
<el-table-column label="设备位置" align="center" prop="equipmentLocation" />
@ -190,7 +192,19 @@
</el-col>
<el-col :span="12">
<el-form-item label="工作中心编码" prop="workshopCode">
<el-input v-model="form.workshopCode" placeholder="请输入所属车间编码" />
<el-input v-model="form.workshopCode" placeholder="请输入所属工作中心编码" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="设备IP" prop="plcIp">
<el-input v-model="form.plcIp" placeholder="请输入设备IP" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备端口号" prop="plcPort">
<el-input v-model="form.plcPort" placeholder="请输入设备端口号" />
</el-form-item>
</el-col>
</el-row>
@ -277,6 +291,18 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="设备IP" prop="plcIp">
<el-input v-model="form.plcIp" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备端口号" prop="plcPort">
<el-input v-model="form.plcPort" placeholder="" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="单台能力工时" prop="unitWorkingHours">

@ -400,7 +400,6 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancelAttached"> </el-button>
</div>
</el-dialog>

Loading…
Cancel
Save