Merge branch 'master' of http://121.40.234.130:8899/root/yongYuJiaJu
This commit is contained in:
@@ -114,9 +114,10 @@
|
||||
>
|
||||
<el-table-column type="selection" width="50" />
|
||||
<el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column v-if="false" prop="task_type" label="任务类型" />
|
||||
<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip/>
|
||||
<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column v-if="false" prop="task_status" label="任务状态" />
|
||||
@@ -127,8 +128,8 @@
|
||||
<el-table-column prop="point1_region_name" label="区域1" width="100" />
|
||||
<el-table-column prop="point_code2" label="点位2" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />
|
||||
<!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
|
||||
<!--<el-table-column prop="point_code3" label="点位3" width="85" />
|
||||
<el-table-column prop="point_code4" label="点位4" width="85" />-->
|
||||
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
|
||||
|
||||
Reference in New Issue
Block a user