刘璐珈

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: ''
@@ -242,7 +243,6 @@ export default {
               材料: this.Data[i].材料,
               重量: this.Data[i].重量,
               批次数量: this.Data[i].批次数量,
-              是否加急: this.Data[i].是否加急,
               备料任务接受时间: this.Data[i].备料任务接受时间,
               备料任务分配时间: this.Data[i].备料任务分配时间
             })
@@ -306,12 +306,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
@@ -365,8 +359,4 @@ export default {
     }
   }
 </style>
-<style>
-  .el-table .isUrgentItem{
-    background: #FF9797;
-  }
-</style>
+

src/views/ManufacturingCenter/MaterialArrival/index.vue

@@ -22,7 +22,7 @@
           </el-select>
           <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
           <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
-          <el-button :disabled="Name===0" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
+          <el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
         </el-card>
         <el-row>
           <el-card style="width: 850px; margin-left: 0px;display: inline-block;" >
@@ -283,7 +283,6 @@ export default {
       this.processSerialNumber = ''
       this.radio = true
       this.tableData1 = []
-      this.Name = 0
       this.row2 = row
       gettabledata1(row.工艺计划流水号).then(response => {
         if (response.data.length !== 0) {
@@ -346,9 +345,7 @@ export default {
     },
     getRow(row) {
       this.processSerialNumber = row.工序流水号
-      console.log(row.完成日期, 222)
-      row.完成日期 ? this.Name = 0 : this.Name = 1
-      console.log(this.Name, 111)
+      row.完成日期 ? this.Name = 1 : this.Name = 0
     },
     handleSizeChange(val) {
       this.pageSize = val