优化

src/views/outsourcing/components/search.vue

@@ -9,13 +9,13 @@
             </el-col>
 
             <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-                <el-form-item label="委外申请单名称:">
+                <el-form-item label="委外名称:">
                     <el-input clearable v-model="where.name" placeholder="请输入" />
                 </el-form-item>
             </el-col>
 
             <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-                <el-form-item label="委外申请单编码:">
+                <el-form-item label="委外编码:">
                     <el-input clearable v-model="where.code" placeholder="请输入" />
                 </el-form-item>
             </el-col>

src/views/outsourcing/index.vue

@@ -8,29 +8,6 @@
 
 
 
-                <template v-slot:totalCount="{ row }">
-                    {{ row.totalCount }} {{ row.measuringUnit }}
-                </template>
-
-
-                <template v-slot:totalPackage="{ row }">
-                    {{ row.totalPackage }}
-                </template>
-
-
-                <template v-slot:totalWeight="{ row }">
-                    {{ row.totalWeight }} {{ row.weightUnit }}
-                </template>
-
-
-
-                <template v-slot:approvalStatus="{ row }">
-                    <span :class="{ 'ele-text-danger': row.approvalStatus == 2 }">
-                        {{ statusFormatter(row.approvalStatus) }}
-                    </span>
-                </template>
-
-
             </ele-pro-table>
         </el-card>
 
@@ -52,14 +29,6 @@ export default {
             loading: false,
 
 
-
-            statusOpt: [
-                { label: '未提交', value: 0 },
-                { label: '审核中', value: 1 },
-                { label: '审核通过', value: 2 },
-                { label: '审核不通过', value: 3 },
-
-            ]
         };
     },
     computed: {
@@ -76,36 +45,44 @@ export default {
                     fixed: 'left'
                 },
                 {
-                    prop: 'workOrderId',
-                    label: '工单id',
+                    prop: 'id',
+                    label: '委外单id',
                     align: 'center',
                     minWidth: 110
                 },
+
+                {
+                    prop: 'code',
+                    label: '委外编码',
+                    align: 'center'
+                },
                 {
-                    prop: 'warehouseName',
-                    label: '仓库名称	',
+                    prop: 'name',
+                    label: '委外名称',
                     align: 'center'
                 },
 
                 {
-                    prop: 'categoryLevelName',
-                    label: '物品分类名称',
+                    prop: 'workOrderId',
+                    label: '工单id',
                     align: 'center'
                 },
+
+            
                 {
-                    prop: 'categoryName',
-                    label: '物品名称',
+                    prop: 'workOrderCode',
+                    label: '工单编码',
                     align: 'center'
                 },
                 {
-                    slot: 'totalCount',
-                    label: '总数量',
+                    slot: 'formedNumLast',
+                    label: '委外数量',
                     align: 'center'
                 },
 
                 {
-                    slot: 'totalPackage',
-                    label: '总包装',
+                    slot: 'formedWeightLast',
+                    label: '委外重量',
                     align: 'center'
                 },
 
@@ -117,12 +94,18 @@ export default {
 
 
                 {
-                    prop: 'approvalUserName',
-                    label: '审核人',
+                    prop: 'remark',
+                    label: '备注',
                     align: 'center'
                 },
 
-
+                {
+                    prop: 'expectReceiveDate',
+                    label: '预计到货日期',
+                    align: 'center',
+                    showOverflowTooltip: true,
+                    minWidth: 110
+                },
 
 
                 {
@@ -132,12 +115,7 @@ export default {
                     showOverflowTooltip: true,
                     minWidth: 110
                 },
-                {
-                    slot: 'approvalStatus',
-                    label: '状态',
-                    align: 'center',
-
-                },
+