样品过期申请、审核优化

itdmWeb/src/api/api.js

@@ -67,6 +67,8 @@ const queryDeptRolePermission = (params)=>getAction("/sys/sysDepartPermission/qu
 const saveDeptRolePermission = (params)=>postAction("/sys/sysDepartPermission/saveDeptRolePermission",params);
 const queryMyDepartTreeList = (params)=>getAction("/sys/sysDepart/queryMyDeptTreeList",params);
 
+//入库的样品条码下拉列表
+const rukuSampleBarcodeList = (params) => getAction('/inventory/itdmInventoryBarcode/xialaList', params);
 //样品过期审核
 const sampleExpireSH = (params) => putAction('/inventory/itdmSampleExpire/shenhe', params);
 // 委托完成判断
@@ -256,7 +258,8 @@ export {
   updateBarcode,
   createBarcode,
   deleteBarcode,
-  sampleExpireSH
+  sampleExpireSH,
+  rukuSampleBarcodeList
 }
 
 

itdmWeb/src/views/module-iTDM/inventory/ItdmSampleExpireList.vue

@@ -10,8 +10,8 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="审核状态">
-              <j-dict-select-tag placeholder="请选择审核状态" v-model="queryParam.auditStatus" dictCode="audit_status"/>
+            <a-form-item label="审批状态">
+              <j-dict-select-tag placeholder="请选择审批状态" v-model="queryParam.auditStatus" dictCode="audit_status"/>
             </a-form-item>
           </a-col>
 <!--          <template v-if="toggleSearchStatus">-->
@@ -149,11 +149,16 @@
             }
           },
           {
-            title:'过期的条码列表',
+            title:'条码列表',
             align:"center",
             dataIndex: 'barCodes'
           },
           {
+            title:'样品列表',
+            align:"center",
+            dataIndex: 'samples'
+          },
+          {
             title:'处理方式',
             align:"center",
             dataIndex: 'handlingMethod'

itdmWeb/src/views/module-iTDM/inventory/ItdmSampleExpireList1.vue

@@ -116,11 +116,16 @@ export default {
           }
         },
         {
-          title:'过期的条码列表',
+          title:'条码列表',
           align:"center",
           dataIndex: 'barCodes'
         },
         {
+          title:'样品列表',
+          align:"center",
+          dataIndex: 'samples'
+        },
+        {
           title:'处理方式',
           align:"center",
           dataIndex: 'handlingMethod'