|
|
@@ -61,12 +61,8 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item
|
|
|
- label="设备编码:"
|
|
|
- prop="extInfo.assetCode"
|
|
|
- v-if="form.extInfo.type == 1"
|
|
|
- >
|
|
|
+ <el-col v-if="form.extInfo.type == 1" :span="8">
|
|
|
+ <el-form-item label="设备编码:" prop="extInfo.assetCode">
|
|
|
<el-input
|
|
|
v-model="form.extInfo.assetCode"
|
|
|
readonly
|
|
|
@@ -75,12 +71,8 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item
|
|
|
- label="设备名称:"
|
|
|
- prop="extInfo.assetName"
|
|
|
- v-if="form.extInfo.type == 1"
|
|
|
- >
|
|
|
+ <el-col v-if="form.extInfo.type == 1" :span="8">
|
|
|
+ <el-form-item label="设备名称:" prop="extInfo.assetName">
|
|
|
<el-input disabled v-model="form.extInfo.assetName" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -179,42 +171,6 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item
|
|
|
- label="设备编码:"
|
|
|
- prop="extInfo.assetCode"
|
|
|
- v-if="form.extInfo.type == 1"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model="form.extInfo.assetCode"
|
|
|
- readonly
|
|
|
- @click.native="chooseAsset"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item
|
|
|
- label="设备名称:"
|
|
|
- prop="extInfo.assetName"
|
|
|
- v-if="form.extInfo.type == 1"
|
|
|
- >
|
|
|
- <el-input disabled v-model="form.extInfo.assetName" />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="所属区域:" prop="location_city">
|
|
|
- <area-select
|
|
|
- v-model="form.areaId"
|
|
|
- @checkedKeys="getAreaInfo"
|
|
|
- :data="areaTreeList"
|
|
|
- ref="tree"
|
|
|
- :disabled="form.extInfo.type"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
-
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="班组:" prop="extInfo.teamId">
|
|
|
<el-select
|
|
|
@@ -805,17 +761,20 @@
|
|
|
if (!valid) {
|
|
|
return false;
|
|
|
}
|
|
|
- if (this.clientEnvironmentId != 9) {
|
|
|
- this.form.factoryWorkstationOperations =
|
|
|
- this.$refs.stationMeter.getValue();
|
|
|
- if (!this.form.factoryWorkstationOperations.length) {
|
|
|
- return this.$message.error('请添加工序');
|
|
|
- } else {
|
|
|
- this.form.taskIds = this.form.factoryWorkstationOperations.map(
|
|
|
- (n) => n.operationId
|
|
|
- );
|
|
|
- }
|
|
|
+
|
|
|
+ this.form.factoryWorkstationOperations =
|
|
|
+ this.$refs.stationMeter.getValue();
|
|
|
+ if (
|
|
|
+ !this.form.factoryWorkstationOperations.length &&
|
|
|
+ this.clientEnvironmentId != 9
|
|
|
+ ) {
|
|
|
+ return this.$message.warning('请添加工序');
|
|
|
+ } else {
|
|
|
+ this.form.taskIds = this.form.factoryWorkstationOperations.map(
|
|
|
+ (n) => n.operationId
|
|
|
+ );
|
|
|
}
|
|
|
+
|
|
|
this.loading = true;
|
|
|
|
|
|
if (this.type != 'edit') {
|