瀏覽代碼

模具详情中的零件列表改动

Reiskuchen 5 年之前
父節點
當前提交
eecbd3ff71
共有 2 個文件被更改,包括 55 次插入14 次删除
  1. 45 4
      ys_vue/src/views/mold/moldDetail.vue
  2. 10 10
      ys_vue/src/views/mold/moldList.vue

+ 45 - 4
ys_vue/src/views/mold/moldDetail.vue

@@ -83,6 +83,7 @@
 
         <el-col :span="24" class="title">
             文档资料
+
             <!-- 上传 模具0 零件1 时 -->
             <el-dropdown trigger="click" style="float:right;" v-show="(activeTab == 0 || activeTab == 1) && update == 1">
                 <el-button size="small" type="primary">
@@ -97,6 +98,18 @@
                 </el-dropdown-menu>
             </el-dropdown>
 
+            <!-- 零件1 新建零件 -->
+            <el-dropdown trigger="click" style="float:right; margin-right: 10px;" v-show=" activeTab == 1 && update == 1">
+                <el-button size="small" type="primary">
+                    新建零件
+                    <i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item @click.native="centerDialog3Visible = true">单个新建</el-dropdown-item>
+                    <el-dropdown-item>批量新建</el-dropdown-item>
+                </el-dropdown-menu>
+            </el-dropdown>
+
             <!-- 上传 试模2 保养3 更新4 时 -->
             <el-upload ref="upload"
                 v-show="(activeTab == 2 || activeTab == 3 || activeTab == 4) && update == 1"
@@ -163,6 +176,7 @@
 
                 <!-- 零件文档 -->
                 <el-tab-pane label="零件文档" name="1">
+
                     <el-table
                     :data="documents.part"
                     highlight-current-row
@@ -170,7 +184,10 @@
                     style="width: 100%;"
                     >
                         <el-table-column type="index" width="40"></el-table-column>
-                        <el-table-column prop="fileName" label="名称" sortable></el-table-column>
+                        <el-table-column label="零件编号" width="200" sortable></el-table-column>
+                        <el-table-column prop="fileName" label="零件名称" sortable></el-table-column>
+                        <el-table-column label="寿命次数" width="100" sortable></el-table-column>
+                        <el-table-column label="易损件" width="100" sortable></el-table-column>
                         <el-table-column prop="fileSize" label="大小" width="200" sortable></el-table-column>
                         <el-table-column prop="uploadtor" label="上传者" width="200" sortable></el-table-column>
                         <el-table-column prop="indate" label="上传时间" width="200" sortable></el-table-column>
@@ -383,6 +400,25 @@
             </span>
         </el-dialog>
 
+        <!-- 单个新增零件弹窗 -->
+        <el-dialog title="编辑模具" v-if="centerDialog3Visible" :visible.sync="centerDialog3Visible" :close-on-click-modal="false" customClass="customWidth">
+            <el-form :model="newParts" label-width="100px" :rules="formRules" ref="newParts" :inline="true" class="demo-form-inline">
+                <el-form-item label="零件编号" prop="number">
+                    <el-input v-model="newParts.number" autocomplete="off" placeholder="请输入模具名称"></el-input>
+                </el-form-item>
+                <el-form-item label="零件名称" prop="name">
+                    <el-input v-model="newParts.name" autocomplete="off" placeholder="请输入模具编号"></el-input>
+                </el-form-item>
+                <el-form-item label="零件寿命" prop="life">
+                    <el-input v-model="newParts.life" autocomplete="off" placeholder="请输入初始模次"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="centerDialog3Visible = false">取消</el-button>
+                <el-button type="primary">提交</el-button>
+            </div>
+        </el-dialog>
+
         <!--编辑界面-->
         <el-dialog title="编辑模具" v-if="editFormVisible" :visible.sync="editFormVisible" :close-on-click-modal="false" customClass="customWidth">
             <el-form :model="editForm" label-width="100px" :rules="formRules" ref="editForm" :inline="true" class="demo-form-inline">
@@ -430,7 +466,11 @@
                 moldDetail: {},
                 customCompany: [],
                 boxes: [],
-
+                newParts: {
+                    number: "",
+                    name: "",
+                    life: ""
+                },
                 formRules: {
                     modelNo: [
                         { required: true, message: "请输入模具编号", trigger: "blur" }
@@ -472,8 +512,9 @@
                     height: 0
                 },
 
-                centerDialogVisible: false,
-                centerDialog2Visible: false,
+                centerDialogVisible: false, //审批界面
+                centerDialog2Visible: false, //模具界面
+                centerDialog3Visible: false, //创建零件界面
 
                 listLoading: false,
                 activeTab: 0,

+ 10 - 10
ys_vue/src/views/mold/moldList.vue

@@ -33,27 +33,27 @@
         <!--列表-->
         <el-table :data="molds" :height="tableHeight" highlight-current-row v-loading="listLoading" style="width: 100%;">
             <el-table-column type="index" width="40"></el-table-column>
-            <el-table-column prop="modelName" label="模具名称" width="180" sortable>
+            <el-table-column prop="modelName" label="模具名称" width="140" sortable>
                 <template slot-scope="scope">
                     <el-link :underline="false" type="primary" @click="toDetail(scope.row)">{{scope.row.modelName}}</el-link>
                 </template>
             </el-table-column>
-            <el-table-column prop="modelNo" label="模具编号" width="150" sortable></el-table-column>
-            <el-table-column prop="equipmentNo" label="云模盒编号" width="150" sortable></el-table-column>
+            <el-table-column prop="modelNo" label="模具编号" width="120" sortable></el-table-column>
+            <el-table-column prop="equipmentNo" label="云模盒编号" width="120" sortable></el-table-column>
             <el-table-column prop="hillNumber" label="电量" align="center" width="100" sortable></el-table-column>
             <el-table-column prop="diffTime" label="倒计时" align="center" width="100" sortable></el-table-column>
-            <el-table-column prop="projectName" label="所属项目" width="180" sortable></el-table-column>
-            <el-table-column prop="ownerCompanyName" label="所属资产方" width="200" sortable></el-table-column>
+            <el-table-column prop="projectName" label="所属项目" width="140" sortable></el-table-column>
+            <el-table-column prop="ownerCompanyName" label="所属资产方" width="300" sortable></el-table-column>
             <el-table-column prop="produceCompany" label="所属生产方" width="200" sortable></el-table-column>
-                    <el-table-column prop="initialModulus" label="初始模次" width="100" align="center" sortable></el-table-column>
+            <el-table-column prop="initialModulus" label="初始模次" width="100" align="center" sortable></el-table-column>
             <el-table-column prop="settingLife" label="模次寿命" width="100" align="center" sortable></el-table-column>
             <el-table-column prop="initial" label="穴数" width="100" align="center" sortable></el-table-column>
             <el-table-column prop="rfid" label="对应RFID码" width="120" align="center" sortable></el-table-column>
             <el-table-column label="状态" width="100" align="center" sortable>
-                    <template slot-scope="scope">
-                        <span v-if="scope.row.state == 1" style="color:#00CD66;">运行</span>
-                        <span v-else style="color:#999999;">静止</span>
-                    </template>
+                <template slot-scope="scope">
+                    <span v-if="scope.row.state == 1" style="color:#00CD66;">运行</span>
+                    <span v-else style="color:#999999;">静止</span>
+                </template>
             </el-table-column>
             <el-table-column label="操作" width="150" align="center" fixed="right" sortable v-if="user.parentId == 1">
                 <template slot-scope="scope">