出库审核添加查询条件，出库审核详情和出库填报详情保持一致

src/views/InformationAudit/outWarehouseAudit/detail.vue

@@ -8,17 +8,15 @@
             {{ scope.row.outboundType ? showCh(scope.row.outboundType, outdound_type) : scope.row.outboundType }}
           </template>
         </el-table-column>
-        <el-table-column prop="materialGroup" label="物资大类" header-align="center" align="center" />
-        <el-table-column prop="materialType" label="物资类别" header-align="center" align="center" />
-        <el-table-column prop="materialName" label="物资名称" header-align="center" align="center" />
-        <el-table-column prop="unit" label="单位" header-align="center" align="center" />
-        <el-table-column prop="quantity" label="数量" header-align="center" align="center" />
-        <el-table-column prop="province" label="调用省份" header-align="center" align="center">
+        <el-table-column prop="materialName" label="物资名称" header-align="center" align="center" width="360">
           <template #default="scope">
-            {{ scope.row.province ? showCh(scope.row.province, province_ch) : scope.row.province }}
+            {{ scope.row.materialGroup + "/" + scope.row.materialType + "/" + scope.row.materialName }}
           </template>
         </el-table-column>
+        <el-table-column prop="unit" label="单位" header-align="center" align="center" />
+        <el-table-column prop="quantity" label="数量" header-align="center" align="center" />
         <el-table-column prop="outboundTime" label="出库日期" header-align="center" align="center" />
+        <el-table-column prop="inboundTime" label="入库日期" align="center" />
         <el-table-column prop="unitPrice" label="单价（元）" header-align="center" align="center" />
         <el-table-column prop="totalPrice" label="价值（万元）" header-align="center" align="center" />
         <el-table-column prop="isAvailable" label="是否可用" header-align="center" align="center">

src/views/InformationAudit/outWarehouseAudit/index.vue

@@ -4,6 +4,11 @@
     <el-form :model="formData" label-width="100px" class="whole_form">
       <el-row :gutter="20">
         <el-col :span="6">
+          <el-form-item label="库点简称">
+            <el-input v-model="formData.warehouse" clearable placeholder="请输入" style="width: 280px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="出库类型">
             <el-select v-model="formData.outboundType" class="m-2" placeholder="请选择" clearable style="width: 280px">
               <el-option v-for="item in outdound_type" :key="item.value" :label="item.label" :value="item.value" />
@@ -16,7 +21,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="当前审批节点">
+          <el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
+          <el-button :icon="RefreshRight" @click="handleReSearch">清空</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="审批节点">
             <el-select v-model="formData.status" class="m-2" placeholder="请选择" clearable style="width: 280px">
               <el-option
                 v-for="(item, index) in auditing_status"
@@ -27,10 +36,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
-          <el-button :icon="RefreshRight" @click="handleReSearch">清空</el-button>
-        </el-col>
       </el-row>
     </el-form>
     <el-table :data="tableData" style="width: 100%" stripe border>
@@ -122,6 +127,7 @@ let page = reactive({
 });
 let formData = ref({
   outboundType: "",
+  warehouse: "",
   materialNameVo: "",
   status: ""
 });
@@ -130,12 +136,13 @@ let { tableData, deptType } = toRefs(data);
 
 // 获取列表
 const getList = () => {
-  console.log(store.state.searchQuery)
-  store.commit('SET_SEARCH_QUERY', {
+  console.log(store.state.searchQuery);
+  store.commit("SET_SEARCH_QUERY", {
     outAudit: {
       outboundType: formData.value.outboundType,
       materialNameVo: formData.value.materialNameVo,
-      status: formData.value.status
+      status: formData.value.status,
+      warehouse: formData.value.warehouse
     }
   });
   const data = reactive({
@@ -170,6 +177,7 @@ const handleReSearch = () => {
   formData.value.outboundType = "";
   formData.value.materialNameVo = "";
   formData.value.status = "";
+  formData.value.warehouse = "";
   getList();
 };
 // 审核
@@ -196,7 +204,7 @@ const handleShow = (row: any) => {
 };
 
 onMounted(() => {
-  formData.value = store.state.searchQuery.searchQuery.outAudit || {}
+  formData.value = store.state.searchQuery.searchQuery.outAudit || {};
   getList();
   deptType = userInfo.value.deptType ? userInfo.value.deptType : "";
 });

src/views/dataStatistics/warning/detail.vue

@@ -11,7 +11,7 @@
           <el-button :icon="Search" type="primary" @click="getList">查询</el-button>
           <el-button :icon="RefreshRight" @click="clearSearch">清空</el-button>
           <!-- <el-button type="primary" :disable="!tableLoading" :icon="Download" @click="downloadExcel">导出</el-button> -->
-          <el-button type="primary" :icon="Download" @click="exportTemplate" v-if="hasBtn('tj:export')">导出</el-button>
+          <!-- <el-button type="primary" :icon="Download" @click="exportTemplate" v-if="hasBtn('tj:export')">导出</el-button> -->
         </el-col>
         <!-- <el-col :span="6" class="btn_center">
           <el-button class="color1" @click="handlerColor('success', '1')">超期</el-button>