留样，消耗列表字段调整；

src/views/sample/consume/index.vue

@@ -33,22 +33,43 @@ export default {
     data() {
         return {
             columns: [
-                { type: 'index', columnKey: 'index', align: 'center', label: '序号', width: 55, showOverflowTooltip: true },
-                { prop: 'sampleCode', slot: 'sampleCode', label: '编码', align: 'center', width: 160, showOverflowTooltip: true },
-                { prop: 'categoryCode', label: '物品编码', align: 'center', width: 160, showOverflowTooltip: true },
-                { prop: 'categoryName', label: '物品名称', align: 'center', width: 160, showOverflowTooltip: true },
-                { prop: 'specification', label: '规格', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'brandNum', label: '牌号', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'modelType', label: '型号', align: 'center', width: 160, showOverflowTooltip: true },
-                { prop: 'measureUnit', label: '计量单位', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'batchNo', label: '批次号', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'weight', label: '重量', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'weightUnit', label: '重量单位', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'disposeTime', label: '处置时间', align: 'center', width: 180, showOverflowTooltip: true },
+                { type: 'index', columnKey: 'index', align: 'center', label: '序号', width: 55, showOverflowTooltip: true, fixed: 'left' },
+                { label: '样品编码', prop: 'sampleCode', width: 120, showOverflowTooltip: true, align: 'center', fixed: 'left' },
+                { label: '编码', prop: 'categoryCode', width: 120, showOverflowTooltip: true, align: 'center', fixed: 'left' },
+                { label: '名称', prop: 'categoryName', width: 120, showOverflowTooltip: true, align: 'center' },
+                { label: '批次号', prop: 'batchNo', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '发货条码', prop: 'barcodes', align: 'center', width: 120, showOverflowTooltip: true },
+                { label: '包装编码', prop: 'packageNo', align: 'center', width: 120, showOverflowTooltip: true },
+                { label: '包装单位', prop: 'packingUnit', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '计量数量', prop: 'measureQuantity', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '计量单位', prop: 'measureUnit', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '供应商名称', prop: 'supplierName', align: 'center', width: 120, showOverflowTooltip: true },
+                { label: '供应商代号', prop: 'supplierCode', align: 'center', width: 120, showOverflowTooltip: true },
+                { label: '物料代号', prop: 'materielDesignation', align: 'center', slot: 'materielDesignation', width: 100, showOverflowTooltip: true },
+                { label: '客户代号', prop: 'clientCode', align: 'center', slot: 'clientCode', width: 100, showOverflowTooltip: true },
+                { label: '刻码', prop: 'engrave', align: 'center', slot: 'engrave', showOverflowTooltip: true },
+                { label: '重量', prop: 'weight', align: 'center', slot: 'weight', showOverflowTooltip: true },
+                { label: '重量单位', prop: 'weightUnit', align: 'center', showOverflowTooltip: true },
+                { label: '仓库', prop: 'warehouseName', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '货区', prop: 'areaName', align: 'center', showOverflowTooltip: true },
+                { label: '货架', prop: 'goodsShelfName', align: 'center', showOverflowTooltip: true },
+                { label: '货位', prop: 'goodsAllocationName', align: 'center', showOverflowTooltip: true },
+                { label: '生产日期', prop: 'productionDate', align: 'center', showOverflowTooltip: true },
+                { label: '采购日期', prop: 'purchaseDate', align: 'center', showOverflowTooltip: true },
                 {
-                    prop: 'status', label: '状态', align: 'center',
-                    formatter: (row, column, cellValue) => {
-                        return cellValue == 1 ? '已处置' : cellValue == 2 ? '未处置' : '';
+                    label: '处置状态', prop: 'disposalStatus', align: 'center', formatter: (row, column, cellValue) => {
+                        return cellValue == 7 ? '消耗' : '';
+                    }
+                },
+                { label: '处置时间', prop: 'disposeTime', align: 'center', width: 100, showOverflowTooltip: true },
+                {
+                    label: '质检状态', prop: 'qualityStatus', align: 'center', formatter: (row, column, cellValue) => {
+                        return cellValue == 0 ? '未检' : cellValue == 1 ? '已检' : cellValue == 2 ? '待检' : '';
+                    }
+                },
+                {
+                    label: '质检结果', prop: 'qualityResults', align: 'center', formatter: (row, column, cellValue) => {
+                        return cellValue == 1 ? '合格' : cellValue == 2 ? '不合格' : '';
                     }
                 },
             ]

src/views/sample/keepSample/index.vue

@@ -33,22 +33,43 @@ export default {
     data() {
         return {
             columns: [
-                { type: 'index', columnKey: 'index', align: 'center', label: '序号', width: 55, showOverflowTooltip: true },
-                { prop: 'sampleCode', slot: 'sampleCode', label: '编码', align: 'center', width: 160, showOverflowTooltip: true },
-                { prop: 'categoryCode', label: '物品编码', align: 'center', width: 160, showOverflowTooltip: true },
-                { prop: 'categoryName', label: '物品名称', align: 'center', width: 160, showOverflowTooltip: true },
-                { prop: 'specification', label: '规格', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'brandNum', label: '牌号', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'modelType', label: '型号', align: 'center', width: 160, showOverflowTooltip: true },
-                { prop: 'measureUnit', label: '计量单位', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'batchNo', label: '批次号', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'weight', label: '重量', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'weightUnit', label: '重量单位', align: 'center', width: 100, showOverflowTooltip: true },
-                { prop: 'disposeTime', label: '处置时间', align: 'center', width: 180, showOverflowTooltip: true },
+                { type: 'index', columnKey: 'index', align: 'center', label: '序号', width: 55, showOverflowTooltip: true, fixed: 'left' },
+                { label: '样品编码', prop: 'sampleCode', width: 120, showOverflowTooltip: true, align: 'center', fixed: 'left' },
+                { label: '编码', prop: 'categoryCode', width: 120, showOverflowTooltip: true, align: 'center', fixed: 'left' },
+                { label: '名称', prop: 'categoryName', width: 120, showOverflowTooltip: true, align: 'center' },
+                { label: '批次号', prop: 'batchNo', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '发货条码', prop: 'barcodes', align: 'center', width: 120, showOverflowTooltip: true },
+                { label: '包装编码', prop: 'packageNo', align: 'center', width: 120, showOverflowTooltip: true },
+                { label: '包装单位', prop: 'packingUnit', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '计量数量', prop: 'measureQuantity', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '计量单位', prop: 'measureUnit', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '供应商名称', prop: 'supplierName', align: 'center', width: 120, showOverflowTooltip: true },
+                { label: '供应商代号', prop: 'supplierCode', align: 'center', width: 120, showOverflowTooltip: true },
+                { label: '物料代号', prop: 'materielDesignation', align: 'center', slot: 'materielDesignation', width: 100, showOverflowTooltip: true },
+                { label: '客户代号', prop: 'clientCode', align: 'center', slot: 'clientCode', width: 100, showOverflowTooltip: true },
+                { label: '刻码', prop: 'engrave', align: 'center', slot: 'engrave', showOverflowTooltip: true },
+                { label: '重量', prop: 'weight', align: 'center', slot: 'weight', showOverflowTooltip: true },
+                { label: '重量单位', prop: 'weightUnit', align: 'center', showOverflowTooltip: true },
+                { label: '仓库', prop: 'warehouseName', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '货区', prop: 'areaName', align: 'center', showOverflowTooltip: true },
+                { label: '货架', prop: 'goodsShelfName', align: 'center', showOverflowTooltip: true },
+                { label: '货位', prop: 'goodsAllocationName', align: 'center', showOverflowTooltip: true },
+                { label: '生产日期', prop: 'productionDate', align: 'center', showOverflowTooltip: true },
+                { label: '采购日期', prop: 'purchaseDate', align: 'center', showOverflowTooltip: true },
                 {
-                    prop: 'status', label: '状态', align: 'center',
-                    formatter: (row, column, cellValue) => {
-                        return cellValue == 1 ? '已处置' : cellValue == 2 ? '未处置' : '';
+                    label: '处置状态', prop: 'disposalStatus', align: 'center', formatter: (row, column, cellValue) => {
+                        return cellValue == 6 ? '留样' : '';
+                    }
+                },
+                { label: '处置时间', prop: 'disposeTime', align: 'center', width: 100, showOverflowTooltip: true },
+                {
+                    label: '质检状态', prop: 'qualityStatus', align: 'center', formatter: (row, column, cellValue) => {
+                        return cellValue == 0 ? '未检' : cellValue == 1 ? '已检' : cellValue == 2 ? '待检' : '';
+                    }
+                },
+                {
+                    label: '质检结果', prop: 'qualityResults', align: 'center', formatter: (row, column, cellValue) => {
+                        return cellValue == 1 ? '合格' : cellValue == 2 ? '不合格' : '';
                     }
                 },
             ]

src/views/sample/samplemanagement/components/search.vue

@@ -3,23 +3,23 @@
 <template>
   <el-form label-width="77px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 8 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
         <el-form-item label="编码:">
           <el-input clearable v-model="where.sampleCode" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 8 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
         <el-form-item label="物品编码:">
           <el-input clearable v-model="where.categoryCode" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 8 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
         <el-form-item label="物品名称:">
           <el-input clearable v-model="where.categoryName" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 8 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
         <el-form-item label="样品状态:">
           <el-select
             v-model="where.status"
@@ -32,8 +32,8 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 8 } : { span: 4 }">
-        <el-form-item label="样品取样方式:">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
+        <el-form-item label="取样方式:">
           <el-select
             v-model="where.conditionType"
             placeholder="请选择"
@@ -46,7 +46,7 @@
         </el-form-item>
       </el-col>
       <el-col style="display: flex; justify-content: flex-end"
-        v-bind="styleResponsive ? { lg: 4, md: 6 } : { span: 12 }">
+        v-bind="styleResponsive ? { lg: 18, md: 6 } : { span: 12 }">
         <div class="ele-form-actions">
           <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
             查询