更新

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -4,8 +4,9 @@
       <div style="white-space: nowrap">
         <el-card>
           <el-row>
+            <span>零件图号:</span>
             <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px;margin: 3px 0"/>
-            <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=100; pageCurrent=1;searchTable()">查询</el-button>
+            <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
               <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
             </el-tooltip>
@@ -31,11 +32,11 @@
         v-loading="loading"
         :data="tableData"
         :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
-        :row-class-name="tableRowClassName1"
         height="760"
         style="width: 1110px; margin: 3px 0"
         size="mini"
         border
+        stripe
         sortable
         highlight-current-row
         element-loading-text="拼命加载中"
@@ -161,7 +162,7 @@ export default {
       Data: [],
       tableData: [], // 表格数据
       total: null, // 总条数
-      pageSize: 100, // 每页显示条数
+      pageSize: 30, // 每页显示条数
       pageCurrent: 1, // 后台获取页
       ordername: '',
       order: ''
@@ -228,6 +229,27 @@ export default {
           // })
           this.tableData = response.data.rows
           this.total = response.data.total
+<<<<<<< HEAD
+=======
+        }
+      }).then(() => {
+        for (let i = 0; i < this.Data.length; i++) {
+          searchtable2(this.Data[i].工艺计划流水号).then(response => {
+            this.tableData.push({
+              工艺计划流水号: this.Data[i].工艺计划流水号,
+              零件名称: this.Data[i].零件名称,
+              零件图号: this.Data[i].零件图号,
+              备料打印: this.Data[i].备料打印,
+              是否外购备料: this.Data[i].是否外购备料,
+              工艺要求: response.data[0].工艺要求,
+              材料: this.Data[i].材料,
+              重量: this.Data[i].重量,
+              批次数量: this.Data[i].批次数量,
+              备料任务接受时间: this.Data[i].备料任务接受时间,
+              备料任务分配时间: this.Data[i].备料任务分配时间
+            })
+          })
+>>>>>>> 0b6cb6f55ad7cb26c02017b256ea0ec59eca150f
           this.loading = false
         }
       })
@@ -287,12 +309,6 @@ export default {
       this.pageCurrent = val
       this.searchTable()
     },
-    tableRowClassName1({ row }) {
-      console.log(row)
-      if (row.是否加急 === '1') {
-        return 'isUrgentItem'
-      }
-    },
     exportExcel() {
       if (this.partName !== '' && this.partName !== null) {
         this.partNamecheck = true
@@ -346,8 +362,4 @@ export default {
     }
   }
 </style>
-<style>
-  .el-table .isUrgentItem{
-    background: #FF9797;
-  }
-</style>
+