shebei
This commit is contained in:
parent
368b9f9c12
commit
5db16f4fc2
|
@ -109,47 +109,39 @@
|
||||||
<el-form
|
<el-form
|
||||||
ref="Form"
|
ref="Form"
|
||||||
:model="equipment"
|
:model="equipment"
|
||||||
label-width="80px"
|
label-width="100px"
|
||||||
label-position="right"
|
label-position="right"
|
||||||
:rules="rule1"
|
:rules="rule1"
|
||||||
>
|
>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="11">
|
||||||
<el-form-item label="设备名称" prop="name">
|
<el-form-item label="设备名称" prop="name">
|
||||||
<el-input v-model="equipment.name" placeholder="设备名称" />
|
<el-input v-model="equipment.name" placeholder="设备名称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="11">
|
||||||
<el-form-item label="设备编号" prop="number">
|
<el-form-item label="设备编号" prop="number">
|
||||||
<el-input v-model="equipment.number" placeholder="设备编号" />
|
<el-input v-model="equipment.number" placeholder="设备编号" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="规格型号" prop="model">
|
</el-col>
|
||||||
<el-input v-model="equipment.model" placeholder="规格型号" />
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="11">
|
||||||
|
<el-form-item label="型号规格" prop="model">
|
||||||
|
<el-input v-model="equipment.model" placeholder="规格型号规格" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="类型" prop="type">
|
</el-col>
|
||||||
|
<el-col :span="11">
|
||||||
<el-select style="width: 100%" v-model="equipment.type" placeholder="请选择">
|
<el-form-item label="数量" prop="count">
|
||||||
<el-option
|
<el-input v-model="equipment.count" placeholder="数量" />
|
||||||
v-for="item in typeoptions"
|
|
||||||
:key="item.value"
|
|
||||||
:label="item.label"
|
|
||||||
:value="item.value">
|
|
||||||
</el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="设备状态" prop="state">
|
</el-col>
|
||||||
|
</el-row>
|
||||||
<el-select style="width: 100%" v-model="equipment.state" placeholder="请选择">
|
<el-form-item label="厂商及国别" prop="factory">
|
||||||
<el-option
|
<el-input v-model="equipment.factory" placeholder="生产厂商及国别" />
|
||||||
v-for="item in options"
|
|
||||||
:key="item.value"
|
|
||||||
:label="item.label"
|
|
||||||
:value="item.value">
|
|
||||||
</el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<el-form-item label="生产厂商" prop="factory">
|
|
||||||
<el-input v-model="equipment.factory" placeholder="生产厂商" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="11">
|
||||||
<el-form-item label="生产日期" prop="production_date">
|
<el-form-item label="生产日期" prop="production_date">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="equipment.production_date"
|
v-model="equipment.production_date"
|
||||||
|
@ -160,6 +152,8 @@
|
||||||
>
|
>
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="11">
|
||||||
<el-form-item label="购置日期" prop="buy_date">
|
<el-form-item label="购置日期" prop="buy_date">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="equipment.buy_date"
|
v-model="equipment.buy_date"
|
||||||
|
@ -170,18 +164,34 @@
|
||||||
>
|
>
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-form-item label="状态" prop="state">
|
||||||
|
|
||||||
<el-form-item label="技术参数" prop="parameter">
|
<el-select style="width: 100%" v-model="equipment.state" placeholder="请选择">
|
||||||
<el-input v-model="equipment.parameter" placeholder="技术参数" />
|
<el-option
|
||||||
|
v-for="item in options"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value">
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="技术指标" prop="parameter">
|
||||||
|
<el-input v-model="equipment.parameter" placeholder="技术指标" />
|
||||||
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="存放位置" prop="place">
|
<el-form-item label="存放位置" prop="place">
|
||||||
<el-input v-model="equipment.place" placeholder="存放位置" />
|
<el-input v-model="equipment.place" placeholder="存放位置" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="11">
|
||||||
<el-form-item label="所属部门" prop="belong_dept">
|
<el-form-item label="所属部门" prop="belong_dept">
|
||||||
<el-cascader :options="depOptions" :props="{ checkStrictly: true,emitPath:false }" ref="demoCascader" style="width:100%" v-model="equipment.belong_dept"></el-cascader>
|
<el-cascader :options="depOptions" :props="{ checkStrictly: true,emitPath:false }" ref="demoCascader" style="width:100%" v-model="equipment.belong_dept"></el-cascader>
|
||||||
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="11">
|
||||||
<el-form-item label="保管人" prop="keeper">
|
<el-form-item label="保管人" prop="keeper">
|
||||||
|
|
||||||
<el-select
|
<el-select
|
||||||
|
@ -201,7 +211,8 @@
|
||||||
|
|
||||||
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
<el-form-item label="设备备注" prop="description">
|
<el-form-item label="设备备注" prop="description">
|
||||||
<el-input
|
<el-input
|
||||||
type="textarea"
|
type="textarea"
|
||||||
|
@ -210,6 +221,15 @@
|
||||||
placeholder="设备备注"
|
placeholder="设备备注"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</el-form>
|
</el-form>
|
||||||
<div style="text-align: right">
|
<div style="text-align: right">
|
||||||
<el-button type="danger" @click="dialogVisible = false">取消</el-button>
|
<el-button type="danger" @click="dialogVisible = false">取消</el-button>
|
||||||
|
@ -244,13 +264,7 @@ export default {
|
||||||
'2':'检验工具',
|
'2':'检验工具',
|
||||||
|
|
||||||
},
|
},
|
||||||
typeoptions: [{
|
|
||||||
value: 1,
|
|
||||||
label: '生产设备'
|
|
||||||
}, {
|
|
||||||
value: 2,
|
|
||||||
label: '检验工具'
|
|
||||||
}],
|
|
||||||
options: [{
|
options: [{
|
||||||
value: 0,
|
value: 0,
|
||||||
label: '运转正常'
|
label: '运转正常'
|
||||||
|
@ -370,6 +384,7 @@ export default {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
this.equipment.type=1;
|
||||||
createEquipment(this.equipment).then((res) => {
|
createEquipment(this.equipment).then((res) => {
|
||||||
if (res.code >= 200) {
|
if (res.code >= 200) {
|
||||||
this.getList();
|
this.getList();
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Generated by Django 3.2.6 on 2021-09-13 08:33
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('em', '0003_equipment_type'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='equipment',
|
||||||
|
name='count',
|
||||||
|
field=models.IntegerField(default=0, verbose_name='数量'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -4,6 +4,7 @@ from django.db.models.base import Model
|
||||||
import django.utils.timezone as timezone
|
import django.utils.timezone as timezone
|
||||||
from django.db.models.query import QuerySet
|
from django.db.models.query import QuerySet
|
||||||
from apps.system.models import CommonAModel, CommonBModel, Organization, User, Dict, File
|
from apps.system.models import CommonAModel, CommonBModel, Organization, User, Dict, File
|
||||||
|
#from apps.mtm.models import Process
|
||||||
from utils.model import SoftModel, BaseModel
|
from utils.model import SoftModel, BaseModel
|
||||||
from simple_history.models import HistoricalRecords
|
from simple_history.models import HistoricalRecords
|
||||||
|
|
||||||
|
@ -32,8 +33,10 @@ class Equipment(CommonBModel):
|
||||||
state = models.CharField('设备状态', max_length=11, choices=state_choices, default=1)
|
state = models.CharField('设备状态', max_length=11, choices=state_choices, default=1)
|
||||||
parameter = models.TextField('技术参数', null=True, blank=True)
|
parameter = models.TextField('技术参数', null=True, blank=True)
|
||||||
place = models.CharField('存放位置', max_length=50, null=True, blank=True)
|
place = models.CharField('存放位置', max_length=50, null=True, blank=True)
|
||||||
|
count = models.IntegerField('数量', default=0)
|
||||||
keeper = models.ForeignKey(User, verbose_name='保管人', on_delete=models.CASCADE, null=True, blank=True)
|
keeper = models.ForeignKey(User, verbose_name='保管人', on_delete=models.CASCADE, null=True, blank=True)
|
||||||
description = models.CharField('描述', max_length=200, blank=True, null=True)
|
description = models.CharField('描述', max_length=200, blank=True, null=True)
|
||||||
|
#process = models.ForeignKey(Process, verbose_name='工序', on_delete=models.CASCADE, null=True, blank=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = '设备信息'
|
verbose_name = '设备信息'
|
||||||
|
|
|
@ -24,7 +24,7 @@ class Material(CommonAModel):
|
||||||
)
|
)
|
||||||
name = models.CharField('物料名称', max_length=100, unique=True)
|
name = models.CharField('物料名称', max_length=100, unique=True)
|
||||||
number = models.CharField('编号', max_length=100, unique=True)
|
number = models.CharField('编号', max_length=100, unique=True)
|
||||||
specification = models.CharField('规格型号', max_length=100, null=True, blank=True)
|
specification = models.CharField('型号', max_length=100, null=True, blank=True)
|
||||||
type = models.CharField('物料类型', choices= type_choices, max_length=20, default=1)
|
type = models.CharField('物料类型', choices= type_choices, max_length=20, default=1)
|
||||||
sort_str = models.CharField('排序字符', max_length=100, null=True, blank=True)
|
sort_str = models.CharField('排序字符', max_length=100, null=True, blank=True)
|
||||||
processes = models.JSONField('工艺流程', default=list, blank=True)
|
processes = models.JSONField('工艺流程', default=list, blank=True)
|
||||||
|
|
|
@ -50,7 +50,7 @@ class StepSimpleSerializer(serializers.ModelSerializer):
|
||||||
fields = ['id', 'name', 'sort']
|
fields = ['id', 'name', 'sort']
|
||||||
|
|
||||||
class StepDetailSerializer(serializers.ModelSerializer):
|
class StepDetailSerializer(serializers.ModelSerializer):
|
||||||
equipments_ = EquipmentSimpleSerializer(source='equipments', many=True)
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Step
|
model = Step
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
|
|
Loading…
Reference in New Issue