添加去掉组织架构搜索功能，添加留样与消耗列表中字段，调整格式

src/views/inspectionStandard/components/search.vue

@@ -47,15 +47,15 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
-        <el-form-item label="组织机构:">
-          <auth-selection
-            data-type="Array"
-            v-model="where.deptIds"
-            style="width: 100%"
-          ></auth-selection>
-        </el-form-item>
-      </el-col>
+<!--      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">-->
+<!--        <el-form-item label="组织机构:">-->
+<!--          <auth-selection-->
+<!--            data-type="Array"-->
+<!--            v-model="where.deptIds"-->
+<!--            style="width: 100%"-->
+<!--          ></auth-selection>-->
+<!--        </el-form-item>-->
+<!--      </el-col>-->
       <el-col
         style="display: flex; justify-content: flex-end"
         v-bind="styleResponsive ? { lg: 4, md: 18 } : { span: 4 }"

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

@@ -19,11 +19,15 @@
           <el-input clearable v-model="where.categoryName" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
-        <el-form-item label="样品状态:">
-          <el-select v-model="where.status" placeholder="请选择" style="width: 100%" clearable>
-            <el-option label="已处理" :value="1" />
-            <el-option label="未处理" :value="2" />
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 8 } : { span: 4 }">
+        <el-form-item label="质检状态:">
+          <el-select
+            v-model="where.qualityResults"
+            placeholder="请选择"
+            style="width: 100%"
+          >
+            <el-option label="合格" :value="1" />
+            <el-option label="不合格" :value="2" />
           </el-select>
         </el-form-item>
       </el-col>

src/views/sample/consume/index.vue

@@ -36,7 +36,7 @@ export default {
                 { 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: 'categoryName', width: 120, showOverflowTooltip: true, align: 'center', fixed: 'left' },
                 { 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 },
@@ -56,19 +56,30 @@ export default {
                 { label: '货位', prop: 'goodsAllocationName', align: 'center', showOverflowTooltip: true },
                 { label: '生产日期', prop: 'productionDate', align: 'center', showOverflowTooltip: true },
                 { label: '采购日期', prop: 'purchaseDate', align: 'center', showOverflowTooltip: true },
+                { label: '留样日期', prop: 'sampleDate', align: 'center', showOverflowTooltip: true ,formatter: (row, column, cellValue) => {
+                    return cellValue?.split(' ')[0];
+                  }
+                },
+                { label: '留样条件', prop: 'sampleCondition', align: 'center', showOverflowTooltip: true },
+                { label: '生产商/受托生产', prop: 'producerManufacturer', align: 'center',width: 130, showOverflowTooltip: true },
+                { label: '留样地点', prop: 'samplePlace', align: 'center', showOverflowTooltip: true },
+                { label: '留样备注', prop: 'sampleRemark', align: 'center', showOverflowTooltip: true },
                 {
                     label: '处置状态', prop: 'disposalStatus', align: 'center', formatter: (row, column, cellValue) => {
                         return cellValue == 7 ? '消耗' : '';
                     }
                 },
-                { label: '处置时间', prop: 'disposeTime', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '处置时间', prop: 'disposeTime', align: 'center', width: 100, showOverflowTooltip: true,formatter: (row, column, cellValue) => {
+                    return cellValue?.split(' ')[0];
+                  }
+                },
                 {
                     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) => {
+                    label: '质检结果', prop: 'qualityResults', align: 'center',  fixed: 'right',formatter: (row, column, cellValue) => {
                         return cellValue == 1 ? '合格' : cellValue == 2 ? '不合格' : '';
                     }
                 },

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

@@ -19,11 +19,15 @@
           <el-input clearable v-model="where.categoryName" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
-        <el-form-item label="样品状态:">
-          <el-select v-model="where.status" placeholder="请选择" style="width: 100%" clearable>
-            <el-option label="已处理" :value="1" />
-            <el-option label="未处理" :value="2" />
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 8 } : { span: 4 }">
+        <el-form-item label="质检状态:">
+          <el-select
+            v-model="where.qualityResults"
+            placeholder="请选择"
+            style="width: 100%"
+          >
+            <el-option label="合格" :value="1" />
+            <el-option label="不合格" :value="2" />
           </el-select>
         </el-form-item>
       </el-col>

src/views/sample/keepSample/index.vue

@@ -36,7 +36,7 @@ export default {
                 { 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: 'categoryName', width: 120, showOverflowTooltip: true, align: 'center' , fixed: 'left' },
                 { 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 },
@@ -56,19 +56,30 @@ export default {
                 { label: '货位', prop: 'goodsAllocationName', align: 'center', showOverflowTooltip: true },
                 { label: '生产日期', prop: 'productionDate', align: 'center', showOverflowTooltip: true },
                 { label: '采购日期', prop: 'purchaseDate', align: 'center', showOverflowTooltip: true },
+                { label: '留样日期', prop: 'sampleDate', align: 'center', showOverflowTooltip: true ,formatter: (row, column, cellValue) => {
+                    return cellValue?.split(' ')[0];
+                  }
+                },
+                { label: '留样条件', prop: 'sampleCondition', align: 'center', showOverflowTooltip: true },
+                { label: '生产商/受托生产', prop: 'producerManufacturer', align: 'center',width: 130, showOverflowTooltip: true },
+                { label: '留样地点', prop: 'samplePlace', align: 'center', showOverflowTooltip: true },
+                { label: '留样备注', prop: 'sampleRemark', align: 'center', showOverflowTooltip: true },
                 {
                     label: '处置状态', prop: 'disposalStatus', align: 'center', formatter: (row, column, cellValue) => {
                         return cellValue == 6 ? '留样' : '';
                     }
                 },
-                { label: '处置时间', prop: 'disposeTime', align: 'center', width: 100, showOverflowTooltip: true },
+                { label: '处置时间', prop: 'disposeTime', align: 'center', width: 100, showOverflowTooltip: true,formatter: (row, column, cellValue) => {
+                    return cellValue?.split(' ')[0];
+                  }
+                },
                 {
                     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) => {
+                    label: '质检结果', prop: 'qualityResults', align: 'center',  fixed: 'right', formatter: (row, column, cellValue) => {
                         return cellValue == 1 ? '合格' : cellValue == 2 ? '不合格' : '';
                     }
                 },