Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-08-22 b676b41c726941872df7788a05f8ce291427cd94

 UI-Project/src/views/PurchaseReturn/purchaseReturn.vue

@@ -625,21 +625,24 @@
  <el-dialog  
      v-model="dialogVisible"
      width="100%" 
      :title="$t('processCard.glasstakeout')"
      top="0vh"
      :show-close="false"
      >  
      <div class="custom-title" style="text-align: center; margin-bottom: 20px;">  
      {{ $t('processCard.glasstakeout') }}  
    </div>  
      <el-table  
        :data="tableData"  
        style="width: 100%;height: 860px"  
        style="width: 100%;height: 760px"  
      >  
      <el-table-column prop="flowCardId" :label="$t('processCard.flowcard')" width="140" align="center"/>
      <el-table-column prop="layer" :label="$t('processCard.layer')" align="center" width="80"/>
      <el-table-column prop="layer" :label="$t('processCard.layer')" align="center" width="52"/>
      <el-table-column prop="engineerId" :label="$t('processCard.project')" align="center" width="110"/>
      <el-table-column prop="temperingLayoutId" :label="$t('processCard.temperinglayout')" align="center" width="80"/>
      <el-table-column prop="temperingFeedSequence" :label="$t('processCard.temperingfeed')" align="center" width="80"/>
      <el-table-column prop="temperingLayoutId" :label="$t('processCard.temperinglayout')" align="center" width="52"/>
      <el-table-column prop="temperingFeedSequence" :label="$t('processCard.temperingfeed')" align="center" width="52"/>
      <el-table-column prop="width" :label="$t('processCard.width')" align="center" width="80"/>
      <el-table-column prop="height" :label="$t('processCard.height')" align="center" width="80"/>
      <el-table-column prop="thickness" :label="$t('processCard.thickness')" align="center" width="80"/>
      <el-table-column prop="thickness" :label="$t('processCard.thickness')" align="center" width="52"/>
      </el-table>  
    </el-dialog>  
  </div>
@@ -724,4 +727,8 @@
  height: 100%; /* 确保div占据整个矩形的高度 */  
  /* font-size: small; */
} 
.custom-title {  
  font-size: 20px;
  font-weight: bold;
} 
</style>