技术中心

src/views/TechnologyCenter/ImportChangeParts/index.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
     <el-card v-loading="loading">
-      <el-col :span="6">
-        <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">
-          <el-step title="选择项目"/>
-          <el-step title="选择类型"/>
-          <el-step title="浏览"/>
-          <el-step title="导入到数据库"/>
-          <el-step title="传递"/>
-        </el-steps>
-      </el-col>
-      <div style="width: 620px;margin: 0 auto">
+      <!--      <el-col :span="6">-->
+      <!--        <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">-->
+      <!--          <el-step title="选择项目"/>-->
+      <!--          <el-step title="选择类型"/>-->
+      <!--          <el-step title="浏览"/>-->
+      <!--          <el-step title="导入到数据库"/>-->
+      <!--          <el-step title="传递"/>-->
+      <!--        </el-steps>-->
+      <!--      </el-col>-->
+      <div style="width: 620px;margin: 0px 400px">
         <div style="overflow: hidden">
           <div style="margin-bottom: 10px;">
             <span>项目：</span>

src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue

@@ -36,7 +36,6 @@
       <el-table
         v-loading="listLoading"
         :data="tableData"
-        :row-class-name="tableRowClassName"
         size="mini"
         height="300"
         highlight-current-row
@@ -618,12 +617,6 @@ export default {
     pagination(pageCurrent, pageSize) {
       this.tableData = this.tableDataAll.slice((pageCurrent - 1) * pageSize, pageCurrent * pageSize)
     },
-    tableRowClassName({ row }) {
-      if (this.unSpecification.data.indexOf(row) > -1) {
-        return 'warning-row'
-      }
-      return ''
-    },
     handleEdit(row) {
       this.editForm(row, 'form', [this.title = '编辑零件信息', this.dialogFormVisible = true])
       if (this.type === 2) {

src/views/TechnologyCenter/ImportParts/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
     <el-card v-loading="loading">
+      <!--      <el-col :span="6">-->
+      <!--        <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">-->
+      <!--          <el-step title="选择项目"/>-->
+      <!--          <el-step title="选择类型"/>-->
+      <!--          <el-step title="浏览"/>-->
+      <!--          <el-step title="导入到数据库"/>-->
+      <!--          <el-step title="传递"/>-->
+      <!--        </el-steps>-->
+      <!--      </el-col>-->
       <el-col :span="6">
-        <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">
-          <el-step title="选择项目"/>
-          <el-step title="选择类型"/>
-          <el-step title="浏览"/>
-          <el-step title="导入到数据库"/>
-          <el-step title="传递"/>
-        </el-steps>
-      </el-col>
-      <el-col :span="6">
-        <div style="width: 650px;margin: 0">
+        <div style="width: 650px;margin: 0px 400px ">
           <div style="overflow: hidden">
             <div style="margin-bottom: 0px;">
               <span>项目：</span>

src/views/TechnologyCenter/ImportParts/specificationData.vue

@@ -32,140 +32,147 @@
         </el-row>
       </div>
     </el-card>
-    <el-card>
-      <el-table
-        v-loading="listLoading"
-        :data="tableData"
-        size="mini"
-        border
-        stripe
-        height="280px"
-        highlight-current-row
-        @row-click="searchMaterial1">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <el-table-column align="center" label="物料状态" min-width="50">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</el-tag>
-            <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="图号" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.图号或者型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="名称" min-width="200" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="材料" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.材料或者规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="规格" width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="备件数量" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.备件数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="装机数量" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.装机数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="部件数量" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.部件数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="制造商" min-width="200">
-          <template slot-scope="scope">
-            {{ scope.row.制造商 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="备注" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.备注 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="分类码" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.分类码 }}
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="操作" fixed="right" align="center" width="200">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-button-->
-        <!--size="mini"-->
-        <!--type="primary"-->
-        <!--icon="el-icon-edit"-->
-        <!--@click="handleEdit(scope.row)">编辑</el-button>-->
-        <!--<el-button-->
-        <!--size="mini"-->
-        <!--type="danger"-->
-        <!--icon="el-icon-delete"-->
-        <!--@click="handleDelete(scope.row)">删除</el-button>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-      </el-table>
-      <div class="block">
-        <el-pagination
-          :current-page="pageCurrent"
-          :page-sizes="[10, 20, 40, 100]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-    </el-card>
-    <el-card>
-      <el-table
-        :data="tableData10"
-        :cell-class-name="cell"
-        style="width: 100%"
-        size="mini"
-        height="200px"
-        highlight-current-row
-        border
-        stripe>
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <el-table-column align="center" label="物料名称">
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="物料规格">
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="物料型号">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="供货商">
-          <template slot-scope="scope">
-            {{ scope.row.供货商 }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
+    <el-row>
+      <el-col style="width: 60%">
+        <el-card>
+          <el-table
+            v-loading="listLoading"
+            :data="tableData"
+            size="mini"
+            border
+            stripe
+            style="width: 100%"
+            height="500px"
+            highlight-current-row
+            @row-click="searchMaterial1">
+            <el-table-column
+              label="序号"
+              align="center"
+              type="index"
+              width="50"/>
+            <el-table-column align="center" label="物料状态" min-width="70">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</el-tag>
+                <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="图号" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.图号或者型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="名称" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="材料" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.材料或者规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="规格" width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="备件数量" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.备件数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="装机数量" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.装机数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="部件数量" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.部件数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="制造商" min-width="100">
+              <template slot-scope="scope">
+                {{ scope.row.制造商 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="备注" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.备注 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="分类码" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.分类码 }}
+              </template>
+            </el-table-column>
+            <!--<el-table-column label="操作" fixed="right" align="center" width="200">-->
+            <!--<template slot-scope="scope">-->
+            <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="primary"-->
+            <!--icon="el-icon-edit"-->
+            <!--@click="handleEdit(scope.row)">编辑</el-button>-->
+            <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="danger"-->
+            <!--icon="el-icon-delete"-->
+            <!--@click="handleDelete(scope.row)">删除</el-button>-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+          </el-table>
+          <div class="block">
+            <el-pagination
+              :current-page="pageCurrent"
+              :page-sizes="[10, 20, 40, 100]"
+              :page-size="pageSize"
+              :total="total"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col style="width: 39%">
+        <el-card>
+          <el-table
+            :data="tableData10"
+            :cell-class-name="cell"
+            style="width: 100%"
+            size="mini"
+            height="530px"
+            highlight-current-row
+            border
+            stripe>
+            <el-table-column
+              label="序号"
+              align="center"
+              type="index"
+              width="50"/>
+            <el-table-column align="center" label="物料名称" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="物料规格" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.物料规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="物料型号" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="供货商" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.供货商 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
 
     <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">