|
@@ -4,7 +4,8 @@
|
|
|
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
|
|
|
|
|
|
<el-form :inline="true">
|
|
|
- <h1>{{ titleName }}</h1>
|
|
|
+ <el-form-item ><div :style="{ fontSize: '24px', fontWeight: 'bold', fontFamily: 'Arial' }">{{ titleName }}</div></el-form-item>
|
|
|
+
|
|
|
<el-form-item label="产品名称">
|
|
|
<el-input v-model="name" placeholder="请输入" clearable="true" size="small">
|
|
|
</el-input>
|
|
@@ -126,8 +127,8 @@
|
|
|
</el-table>
|
|
|
|
|
|
<!--工具条-->
|
|
|
- <el-col :span="24" class="toolbar" v-if="false">
|
|
|
- <el-button size="small" @click="batchSetWudulistBtn1"
|
|
|
+ <el-col :span="24" class="toolbar" >
|
|
|
+ <!-- <el-button size="small" @click="batchSetWudulistBtn1"
|
|
|
v-if="(user.timeType.customDegreeActive || user.company.packageProject) && (showColumnWidth != '0' || permissions.projectManagement)">{{
|
|
|
$t('btn.cancel') }}</el-button>
|
|
|
<template v-if="user.timeType.customDegreeActive && (showColumnWidth != '0' || permissions.projectManagement)">
|
|
@@ -147,28 +148,14 @@
|
|
|
$t('projectmanagersinbatches') }}</el-button>
|
|
|
<el-button size="small" type="primary" v-if="user.roleName = '超级管理员'" @click="batchDelete()"
|
|
|
:loading="isDeleting">批量删除</el-button>
|
|
|
- </template>
|
|
|
+ </template> -->
|
|
|
|
|
|
<el-pagination :key="projectListPageComponentKey" @size-change="handleSizeChange"
|
|
|
- @current-change="handleCurrentChange" :page-sizes="[20, 50, 80, 100]" :page-size="size"
|
|
|
+ @current-change="handleCurrentChange" :page-sizes="[10, 20, 50, 100]" :page-size="size"
|
|
|
:current-page.sync="page" layout="total, sizes, prev, pager, next" :total="total"
|
|
|
style="float:right;"></el-pagination>
|
|
|
</el-col>
|
|
|
|
|
|
- <div class="layout-container-floor">
|
|
|
- <el-pagination
|
|
|
- @size-change="handleSizeChange"
|
|
|
- @current-change="handleCurrentChange"
|
|
|
- :current-page="page"
|
|
|
- :page-sizes="[10, 20, 50, 100]"
|
|
|
- :page-size="size"
|
|
|
- layout="total, prev, pager, next, sizes, jumper"
|
|
|
- :total="total"
|
|
|
- style="float:right;"
|
|
|
- >
|
|
|
- </el-pagination>
|
|
|
- </div>
|
|
|
-
|
|
|
<!--新增界面-->
|
|
|
<el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false"
|
|
|
customClass="customWidth" width="960px" :top="'6vh'">
|
|
@@ -180,7 +167,7 @@
|
|
|
<el-step title="派工单"></el-step>
|
|
|
<!-- <el-step title="物料信息"></el-step> -->
|
|
|
</el-steps>
|
|
|
- <div v-if="prodEditActive == 0" style="height: 72vh;overflow-y: auto;overflow-x: hidden;">
|
|
|
+ <div v-if="prodEditActive == 0" style="height: 60.5vh;overflow-y: auto;overflow-x: hidden;">
|
|
|
<el-form ref="form1" :model="addForm" :rules="rules" label-width="120px">
|
|
|
<el-form-item label="产品名称" prop="name">
|
|
|
<!-- <el-input v-model="addForm.code" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目编号" clearable></el-input> -->
|
|
@@ -232,16 +219,7 @@
|
|
|
</div>
|
|
|
<div v-if="prodEditActive == 1">
|
|
|
<!--此处是录入工序的模块-->
|
|
|
- <!-- el-form ref="form2" :rules="rules1" label-width="120px">
|
|
|
- <el-form-item prop="version">
|
|
|
- <el-input placeholder="请输入工序版本号" v-model="procedureVersion" class="input-pM"></el-input>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
-
|
|
|
- <el-form-item label=""></el-form-item>
|
|
|
- </el-form> -->
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
|
|
|
<el-input placeholder="请输入工序版本号" v-model="procedureVersion" clearable maxlength="50" class="input-pM"></el-input>
|
|
|
<el-table :data="procedureLit" style="width: 100%">
|
|
@@ -378,12 +356,12 @@
|
|
|
|
|
|
|
|
|
<!-- 产品分类管理 -->
|
|
|
- <el-dialog title="分类管理" :visible.sync="isganttshow" width="50%" >
|
|
|
+ <el-dialog title="分类管理" :visible.sync="isganttshow" width="40%" >
|
|
|
<div>
|
|
|
<el-table :data="categoryList" style="width: 100%">
|
|
|
<el-table-column type="index" width="180" label="序号">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="name" label="分类名称" width="180">
|
|
|
+ <el-table-column prop="name" label="分类名称" width="200">
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作">
|
|
|
<template slot-scope="scope">
|