695593266@qq.com 8 месяцев назад
Родитель
Сommit
3ca336650a
2 измененных файлов с 35 добавлено и 9 удалено
  1. 4 4
      src/views/outsourcing/components/search.vue
  2. 31 5
      src/views/outsourcing/index.vue

+ 4 - 4
src/views/outsourcing/components/search.vue

@@ -7,7 +7,7 @@
     @submit.native.prevent
   >
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="工单编码:">
           <el-input
             size="mini"
@@ -18,7 +18,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="委外名称:">
           <el-input
             size="mini"
@@ -29,7 +29,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="委外编码:">
           <el-input
             size="mini"
@@ -51,7 +51,7 @@
 
       <el-col
         style="display: flex; justify-content: flex-end"
-        v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }"
+        v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }"
       >
         <el-form-item label-width="0px">
           <el-button

+ 31 - 5
src/views/outsourcing/index.vue

@@ -63,6 +63,21 @@
           >
         </template>
 
+        <template v-slot:purchaseStatus="{ row }">
+          <el-tag v-if="row.purchaseStatus == 0 || !row.purchaseStatus"
+            >未入库</el-tag
+          >
+          <el-tag v-if="row.purchaseStatus == 1" type="warning"
+            >原料入库</el-tag
+          >
+          <!-- <el-tag v-if="row.purchaseStatus == 2" type="success"
+            >审核通过</el-tag
+          > -->
+          <el-tag v-if="row.purchaseStatus == 3" type="success"
+            >委外完成</el-tag
+          >
+        </template>
+
         <template v-slot:outsourceScene="{ row }">
           <span>{{ row.outsourceScene | outsourceSceneText }}</span>
         </template>
@@ -242,7 +257,8 @@
           {
             slot: 'type',
             label: '委外类型',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'outsourceScene',
@@ -275,26 +291,36 @@
           {
             prop: 'warehouseName',
             label: '仓库',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {
             prop: 'createUserName',
             label: '申请人',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {
             prop: 'createTime',
             label: '创建时间',
             align: 'center',
-            width: 100
+            width: 100,
+            showOverflowTooltip: true
           },
 
           {
             slot: 'status',
             label: '状态',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            slot: 'purchaseStatus',
+            label: '采购状态',
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             slot: 'approvalStatus',