jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化

Browse Source 
# Conflicts:
#	jikimo_frontend/static/src/scss/custom_style.scss
This commit is contained in:
mgw
2023-09-26 11:36:59 +08:00
parent 37541fdcd6 8e13d2011c
commit 256d86567e
22 changed files with 797 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sf_plan_management/views/plan_base_view.xml
View File

@@ -47,7 +47,7 @@
<group>
<group>
<field name="code"/>
<field name="day_off_ids" widget="many2many_tags"
<field name="day_off_ids" widget="many2many_tags" placeholder="请选择"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="status"/>
</group>
@@ -101,8 +101,8 @@
<tree string="班次" editable="bottom" >
<field name="code"/>
<field name="name"/>
<field name="start_time"/>
<field name="end_time"/>
<field name="start_time" placeholder="请选择"/>
<field name="end_time" placeholder="请选择"/>
<field name="remark"/>
</tree>
</field>
@@ -211,8 +211,8 @@
<field name="work_center_name_id"/>
<field name="equipment_name_id"/>
<field name="equipment_code"/>
<field name="brand" optional="hide"/>
<field name="model" optional="hide"/>
<field name="brand_id" optional="hide"/>
<field name="type_id" optional="hide"/>
<field name="working_procedure"/>
<field name="production_capacity" optional="hide"/>
<field name="working_calendar_id" optional="hide"/>
@@ -233,14 +233,14 @@
<sheet>
<div>
<h1>
<field name="name"/>
<field name="name" placeholder="请选择"/>
</h1>
</div>
<group>
<group>
<field name="work_center_name_id"/>
<field name="work_center_name_id" placeholder="请选择"/>
<field name="production_capacity"/>
<field name="working_calendar_id"/>
<field name="working_calendar_id" placeholder="请选择"/>
<field name="create_time"/>
</group>
<group>
@@ -254,12 +254,12 @@
<group>`
<group>
<field name="equipment_name_id"/>
<field name="brand"/>
<field name="brand_id"/>
<field name="status"/>
</group>
<group>
<field name="equipment_code" string="机台号"/>
<field name="model"/>
<field name="type_id"/>
</group>
</group>
</page>
@@ -277,8 +277,8 @@
<field name="work_center_name_id"/>
<field name="equipment_code"/>
<field name="equipment_name_id"/>
<field name="brand"/>
<field name="model"/>
<field name="brand_id"/>
<field name="type_id"/>
<field name="working_procedure"/>
<field name="production_capacity"/>
<field name="working_calendar_id"/>