Merge branch 'main' of http://47.100.212.83:3000/yangzifeng/shzg_projectManage

src/views/wisdom/record/index.vue

@@ -18,8 +18,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="库存状态" prop="isChuku">
+          <el-form-item label="库存状态" prop="bizType">
-            <el-select v-model="queryParams.isChuku" placeholder="请选择" clearable>
+            <el-select v-model="queryParams.bizType" placeholder="请选择" clearable>
               <el-option v-for="dict in storeStatusList" :key="dict.id" :label="dict.statusName" :value="dict.id" />
             </el-select>
           </el-form-item>
@@ -71,7 +71,7 @@
         <el-col :span="6">
           <el-form-item label="出库类型" prop="operationTypeCK">
             <el-select v-model="operationTypeCK" placeholder="请选择出库类型"
-              @change="changeOperationType($event, 'operationTypeCK')" clearable>
+              @change="changeOperationType($event, 'operationTypeCK')" clearable >
               <el-option v-for="dict in ckTypeList" :key="dict.id" :label="dict.typeName" :value="dict.typeCode" />
             </el-select>
           </el-form-item>
@@ -183,7 +183,7 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     billNo: null,
-    isChuku: null,
+    bizType: null,
     startTime: null,
     endTime: null,
     xmNo: null,
@@ -276,13 +276,15 @@ function handleExport() {
 //搜索按钮操作 
 function handleQuery() {
   //所属仓库
-  console.log(warehouseCode.value, optionTime, '====');
+  console.log(operationTypeCK.value,operationTypeRK.value, '====');
   if (warehouseCode.value) {
     queryParams.value.cangku = warehouseCode.value[1]
   }
   //详细类型
   if (operationTypeCK.value?.length > 0 || operationTypeRK.value?.length > 0) {
     queryParams.value.operationType = operationTypeRK.value || operationTypeCK.value
+  }else{
+    queryParams.value.operationType =''
   }
   //操作时间
   if (optionTime.value && optionTime.value.length > 0) {