|
|
@@ -7,7 +7,7 @@
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="工位编码:" prop="code">
|
|
|
- <el-input clearable @click.native="openCode" v-model="form.code" placeholder="请输入" />
|
|
|
+ <el-input clearable @click.native="openCode" v-model="form.code" placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
@@ -16,11 +16,31 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
+
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="工位类型:" prop="extInfo.type">
|
|
|
+ <el-select size="small" class="ele-fluid" v-model="form.extInfo.type">
|
|
|
+ <el-option label="设备" :value="1" />
|
|
|
+ <el-option label="工位" :value="3" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="设备编码:" prop="extInfo.assetCode">
|
|
|
+ <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.workTypeId" v-if="form.extInfo.type == 3">
|
|
|
+ <DictSelection dictName="工种" clearable filterable v-model="form.extInfo.workTypeId">
|
|
|
+ </DictSelection>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="设备名称:" prop="extInfo.assetName">
|
|
|
<el-input disabled v-model="form.extInfo.assetName" />
|
|
|
@@ -37,7 +57,7 @@
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="所属车间:" prop="extInfo.workshopId">
|
|
|
@@ -51,7 +71,7 @@
|
|
|
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="所属产线:" prop="productionLineId">
|
|
|
- <el-select v-model="form.productionLineId" placeholder="请选择" style="width: 100%"
|
|
|
+ <el-select v-model="form.productionLineId" placeholder="请选择" style="width: 100%"
|
|
|
@change="change_productionLineId">
|
|
|
<el-option v-for="item in options.productionLineId" :key="item.id" :label="item.name" :value="item.id">
|
|
|
</el-option>
|
|
|
@@ -61,8 +81,8 @@
|
|
|
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="负责人部门:" prop="extInfo.principalDep">
|
|
|
- <ele-tree-select clearable :data="options_groupId" filterable v-model="form.extInfo.principalDep" valueKey="id"
|
|
|
- labelKey="name" placeholder="请选择" @change="change_principalDep" default-expand-all />
|
|
|
+ <ele-tree-select clearable :data="options_groupId" filterable v-model="form.extInfo.principalDep"
|
|
|
+ valueKey="id" labelKey="name" placeholder="请选择" @change="change_principalDep" default-expand-all />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
@@ -82,11 +102,10 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="16">
|
|
|
-
|
|
|
+
|
|
|
<el-form-item label="可执行工序:" prop="taskNames">
|
|
|
- <el-input :value="form.taskNames" placeholder="请选择"
|
|
|
- @click.native="handleProduce"></el-input>
|
|
|
-
|
|
|
+ <el-input :value="form.taskNames" placeholder="请选择" @click.native="handleProduce"></el-input>
|
|
|
+
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -139,8 +158,8 @@
|
|
|
<!-- 选择设备 -->
|
|
|
<ProductModal ref="productRefs" :isLedger="true" @changeProduct='determineChoose' />
|
|
|
<ProduceDialog ref="produceRef" @changeProduct="produceConfirm" />
|
|
|
- <!-- 自定义编码 -->
|
|
|
- <CodeDialog ref="codeRefs" v-if="codeShow" @close="codeShow= false" @chooseCode="chooseCode"></CodeDialog>
|
|
|
+ <!-- 自定义编码 -->
|
|
|
+ <CodeDialog ref="codeRefs" v-if="codeShow" @close="codeShow = false" @chooseCode="chooseCode"></CodeDialog>
|
|
|
|
|
|
</el-dialog>
|
|
|
</template>
|
|
|
@@ -194,7 +213,8 @@ export default {
|
|
|
assetName: '', //设备名称
|
|
|
meterMeasuringUnit: '', // 节拍计量单位
|
|
|
workCenterId: null, //所属工作中心
|
|
|
- produceId: null //可执行工序
|
|
|
+ produceId: null, //可执行工序
|
|
|
+ type: null
|
|
|
},
|
|
|
id: '',
|
|
|
leaderId: '', // 负责人
|
|
|
@@ -206,7 +226,7 @@ export default {
|
|
|
workstationSubstanceList: [],
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
};
|
|
|
};
|
|
|
return {
|
|
|
@@ -248,7 +268,7 @@ export default {
|
|
|
message: '请选择',
|
|
|
trigger: 'change'
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
productionLineId: {
|
|
|
required: true,
|
|
|
message: '请输入',
|
|
|
@@ -320,13 +340,13 @@ export default {
|
|
|
// 选择可执行工序
|
|
|
handleProduce() {
|
|
|
let param = {
|
|
|
- taskIds: this.form.taskIds && this.form.taskIds[0],
|
|
|
- taskNames: this.form.taskNames && this.form.taskNames[0],
|
|
|
+ taskIds: this.form.taskIds && this.form.taskIds[0],
|
|
|
+ taskNames: this.form.taskNames && this.form.taskNames[0],
|
|
|
}
|
|
|
this.$refs.produceRef.open(param)
|
|
|
},
|
|
|
produceConfirm(data) {
|
|
|
- this.form.taskIds = [ data.id]
|
|
|
+ this.form.taskIds = [data.id]
|
|
|
this.form.taskNames = [data.name]
|
|
|
|
|
|
},
|
|
|
@@ -341,7 +361,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
openCode() {
|
|
|
- this.codeShow =true
|
|
|
+ this.codeShow = true
|
|
|
},
|
|
|
|
|
|
chooseCode(code) {
|
|
|
@@ -458,7 +478,7 @@ export default {
|
|
|
},
|
|
|
// 获取产线
|
|
|
getlistFactoryLineByParentId() {
|
|
|
-
|
|
|
+
|
|
|
listFactoryLine([this.form.extInfo.workshopId]).then((res) => {
|
|
|
console.log(res);
|
|
|
this.options.productionLineId = res;
|
|
|
@@ -513,7 +533,7 @@ export default {
|
|
|
// }
|
|
|
}
|
|
|
this.form = Object.assign({}, this.form, res)
|
|
|
-
|
|
|
+
|
|
|
|
|
|
if (res.taskList?.length) {
|
|
|
this.form.taskNames = res.taskList.map(i => i.name)
|