Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/views/business/lot/DialogWasteRecycling.vue

@@ -8,14 +8,6 @@
     draggable
   >
     <div class="form-container">
-      <el-row :gutter="20" style="margin: 20px 0 0 38px">
-        <el-col :span="9">
-          <span>产品描述</span>
-          <span style="margin-left: 10px">{{
-            detailsRow.productDescription
-          }}</span>
-        </el-col>
-      </el-row>
       <el-form
         ref="wasteRecyclingRef"
         class="master-container"
@@ -25,15 +17,38 @@
         :rules="rules"
       >
         <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="参考批号" label-width="90px">
+          <el-col :span="15">
+            <el-form-item label="产品描述" label-width="90px">
               <el-input
-                v-model.trim="detailsRow.lotCode"
+                v-model.trim="detailsRow.productDescription"
                 :disabled="true"
+                style="width: 250px"
               >
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="9">
+            <el-form-item
+              label="领料部门"
+              label-width="90px"
+              prop="requisitionDepartmentId"
+            >
+              <el-select-v2
+                v-model="form.requisitionDepartmentId"
+                :options="deptList"
+                placeholder="请选择领料工段"
+                style="width: 200px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="参考批号" label-width="90px">
+              <el-input v-model.trim="detailsRow.lotCode" :disabled="true">
+              </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="生成批数" label-width="90px" prop="lotNumber">
               <el-input
@@ -44,8 +59,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="单批量" label-width="90px" prop="productionQuantity">
-              <el-input-number 
+            <el-form-item
+              label="单批量"
+              label-width="90px"
+              prop="productionQuantity"
+            >
+              <el-input-number
                 v-model="form.productionQuantity"
                 controls-position="right"
                 style="width: 150px"
@@ -71,7 +90,7 @@
         <span style="font-size: 18px; font-weight: 700; line-height: 25px"
           >工序</span
         >
-        <!-- <div style="float: inline-end">
+        <div style="float: inline-end">
           <span
             style="
               color: rgba(0, 203, 117, 1);
@@ -97,7 +116,7 @@
             @click="handleAddProcess"
             >+从工序库添加</span
           >
-        </div> -->
+        </div>
       </div>
       <div id="insideProcessForm">
         <el-table
@@ -166,7 +185,9 @@
   </el-dialog>
 </template>
 <script setup>
-import { getLastLot } from "@/api/business/lot";
+import { getLastLot, getProcess, addWasteRecycling } from "@/api/business/lot";
+import { listDeptProcess } from "@/api/business/deptProcess";
+import { getDeptList } from "@/api/system/dept";
 import processChoice from "./DialogProcessChoice";
 import { onMounted, ref } from "vue";
 import Sortable from "sortablejs";
@@ -179,12 +200,14 @@ const processLoading = ref(false);
 const total = ref(0);
 const visible = ref(false);
 const detailsRow = ref({});
+const deptList = ref([]);
 const processList = ref([]);
 const referenceLotInfo = ref({});
 //校验生成批数
 const validateLotNumber = (rule, value, callback) => {
   const min = 0;
-  if (value %1 !== 0) { // 检查是否无法解析为整数
+  if (value % 1 !== 0) {
+    // 检查是否无法解析为整数
     callback(new Error(`当前生成批数不能是小数`));
   } else if (value <= min) {
     callback(new Error("当前生成批数应大于0"));
@@ -195,7 +218,7 @@ const validateLotNumber = (rule, value, callback) => {
 //校验单批量
 const validateproductionQuantity = (rule, value, callback) => {
   const min = 0;
-  if (value %1 !== 0) {
+  if (value % 1 !== 0) {
     callback(new Error(`当前单批量不能是小数`));
   } else if (value <= min) {
     callback(new Error("当前单批量应大于0"));
@@ -222,6 +245,9 @@ const data = reactive({
       { required: true, message: "单批量不能为空", trigger: "blur" },
       { validator: validateproductionQuantity, trigger: "blur" },
     ],
+    requisitionDepartmentId: [
+      { required: true, message: "领料部门不能为空", trigger: "blur" },
+    ],
   },
 });
 const { queryParams, form, rules } = toRefs(data);
@@ -231,6 +257,9 @@ const { queryParams, form, rules } = toRefs(data);
 const open = (data) => {
   reset();
   detailsRow.value = proxy.deepClone(data[0]);
+  getDeptList({ type: 0, isWorkSection: 1 }).then((res) => {
+    deptList.value = res.data;
+  });
   processList.value = [];
   console.log(detailsRow.value);
   visible.value = true;
@@ -248,6 +277,7 @@ const reset = () => {
     referenceLot: null,
     lotNumber: null,
     productionQuantity: null,
+    requisitionDepartmentId: null,
   };
   proxy.resetForm("wasteRecyclingRef");
 };
@@ -294,70 +324,120 @@ function handleDeleteProcess(row) {
 const handleSave = () => {
   proxy.$refs["wasteRecyclingRef"].validate((valid) => {
     if (valid) {
-      var wasteRecyclingInfo = {}
+      var wasteRecyclingInfo = {};
       for (var i = 0; i < processList.value.length; i++) {
-        processList.value[i].processStepNumber= 1000 + i * 10;
+        processList.value[i].processStepNumber = 1000 + i * 10;
       }
       wasteRecyclingInfo.lotCodeList = form.value.newLots;
-      wasteRecyclingInfo.productionPlanDetailId = detailsRow.value.productionPlanDetailId
-      wasteRecyclingInfo.technologicalProcessId = referenceLotInfo.value.technologicalProcessId
-      wasteRecyclingInfo.technologyVersion = referenceLotInfo.value.technologyVersion
-      wasteRecyclingInfo.productId = detailsRow.value.product.id
-      wasteRecyclingInfo.productionQuantity = form.value.productionQuantity
-      wasteRecyclingInfo.processList = processList.value
-      //废品回用的批号
-      wasteRecyclingInfo.lotCode = detailsRow.value.lotCode
-      console.log(wasteRecyclingInfo)
-      //保存废品回用
-
+      wasteRecyclingInfo.productionPlanDetailId =
+        detailsRow.value.productionPlanDetailId;
+      wasteRecyclingInfo.technologicalProcessId =
+        detailsRow.value.technologicalProcessId;
+      wasteRecyclingInfo.technologyVersion = detailsRow.value.technologyVersion;
+      wasteRecyclingInfo.productId = detailsRow.value.product.id;
+      wasteRecyclingInfo.productionQuantity = form.value.productionQuantity;
+      wasteRecyclingInfo.productDescription =
+        detailsRow.value.productDescription;
+      wasteRecyclingInfo.processList = processList.value;
+      wasteRecyclingInfo.lotCode = detailsRow.value.lotCode;
+      wasteRecyclingInfo.requisitionDepartmentId =
+        form.value.requisitionDepartmentId;
+      for (let i = 0; i < processList.value.length; i++) {
+        if (form.value.requisitionDepartmentId == deptList.value[i].value) {
+          wasteRecyclingInfo.requisitionDepartmentName =
+            deptList.value[i].label;
+        }
+      }
+      console.log(wasteRecyclingInfo);
+      //判断工序除了processId = 1 和等于2的工序，当前领料部门是否能干第一道序
+      const filteredProcessList = processList.value.filter((item) => {
+        return item.processId != 1 && item.processId != 2;
+      });
+      //该工段能干的工序
+      listDeptProcess({
+        getFlag: "true",
+        deptId: form.value.requisitionDepartmentId,
+      }).then((res) => {
+        if (res.code == 200) {
+          var deptProcess = res.rows;
+          var flag = false;
+          console.log(deptProcess);
+          console.log(filteredProcessList[0].processAlias)
+          console.log(filteredProcessList[0].processAlias,deptProcess[0].processAlias)
+          for (var i = 0; i < deptProcess.length; i++) {
+            if (
+              filteredProcessList[0].processId == deptProcess[i].processId
+            ) {
+              flag = true;
+              break;
+            }
+          }
+          if (flag) {
+            //保存废品回用
+            addWasteRecycling(wasteRecyclingInfo).then((response) => {
+              if (response.code == 200) {
+                proxy.$modal.msgSuccess("添加废品回用成功");
+                handleCancel();
+              }
+            });
+          } else {
+            proxy.$modal.msgError("当前领料部门不能干首序");
+          }
+        }
+      });
     }
   });
 };
 
-/**参考批次带回 */
-function handleLotSelected(selection) {
-  console.log(selection);
-  referenceLotInfo.value = selection;
-  form.value.referenceLot = selection.lotCode;
-  processList.value = []
-}
 /**添加历史工艺 */
 function handleAddPreProcess() {
   currentUID = processList.value.length + 1;
-  processList.value = []
-  for(var i = 0; i < referenceLotInfo.value.technologicalProcessDetailList.length; i++) {
-    let process = {}
-    process.technologicalProcessId = referenceLotInfo.value.technologicalProcessId
-    process.technologyVersion = referenceLotInfo.value.technologyVersion
-    process.productId = detailsRow.value.product.id
-    process.productCode = referenceLotInfo.value.technologicalProcessDetailList[i].productCode
-    process.processId = referenceLotInfo.value.technologicalProcessDetailList[i].processId
-    process.processKey = referenceLotInfo.value.technologicalProcessDetailList[i].processKey
-    process.processCode = referenceLotInfo.value.technologicalProcessDetailList[i].processCode
-    process.processAlias = referenceLotInfo.value.technologicalProcessDetailList[i].processAlias
-    process.productShaftCategory = referenceLotInfo.value.technologicalProcessDetailList[i].productShaftCategory
-    process.productShaftCategoryName = referenceLotInfo.value.productShaftCategoryName
-    process.productDescription = referenceLotInfo.value.technologicalProcessDetailList[i].productDescription
-    process.uuid = currentUID++;
-    processList.value.push(process)
-  }
-  console.log(processList.value)
-
-  rowDrop()
+  processList.value = [];
+  getProcess({
+    id: detailsRow.value.lotId,
+    isAmend: detailsRow.value.isAmend,
+    isWasteRecycling: detailsRow.value.isWasteRecycling,
+    technologicalProcessId: detailsRow.value.technologicalProcessId,
+  }).then((res) => {
+    if (res.code == 200) {
+      referenceLotInfo.value = res.data;
+      for (var i = 0; i < referenceLotInfo.value.length; i++) {
+        let process = {};
+        process.technologyVersion = detailsRow.value.technologyVersion;
+        process.productId = detailsRow.value.product.id;
+        process.productCode = referenceLotInfo.value[i].productCode;
+        process.processId = referenceLotInfo.value[i].processId;
+        process.processKey = referenceLotInfo.value[i].processKey;
+        process.processCode = referenceLotInfo.value[i].processCode;
+        process.processAlias = referenceLotInfo.value[i].processAlias;
+        process.productShaftCategory =
+          referenceLotInfo.value[i].productShaftCategory;
+        process.productShaftCategoryName =
+          referenceLotInfo.value[i].productShaftCategoryName;
+        process.productDescription =
+          referenceLotInfo.value[i].productDescription;
+        process.uuid = currentUID++;
+        processList.value.push(process);
+      }
+      rowDrop();
+    }
+  });
 }
 /** 行拖拽 */
 function rowDrop() {
   // 要侦听拖拽响应的DOM对象
-  const tbody = document.querySelector('#insideProcessForm .el-table__body-wrapper tbody')
+  const tbody = document.querySelector(
+    "#insideProcessForm .el-table__body-wrapper tbody"
+  );
   Sortable.create(tbody, {
     // 指定父元素下可被拖拽的子元素
-    handle: '.move-handle',
+    handle: ".move-handle",
     // 结束拖拽后的回调函数
     onEnd({ newIndex, oldIndex }) {
-      const currentRow = processList.value.splice(oldIndex, 1)[0]
-      processList.value.splice(newIndex, 0, currentRow)
-    }
-  })
+      const currentRow = processList.value.splice(oldIndex, 1)[0];
+      processList.value.splice(newIndex, 0, currentRow);
+    },
+  });
 }
 
 /**工序库添加工序 */
@@ -367,27 +447,28 @@ function handleAddProcess() {
 
 /**工序库添加工序带回 */
 function handleProcessSelected(selection) {
-  console.log(detailsRow.value.product)
+  console.log(detailsRow.value.product);
   currentUID = processList.value.length + 1;
   for (var i = 0; i < selection.length; i++) {
     var processAdd = {};
     //工艺从参考工艺取
-    processAdd.technologicalProcessId = referenceLotInfo.value.technologicalProcessId
-    processAdd.technologyVersion = referenceLotInfo.value.technologyVersion
+    processAdd.technologyVersion = detailsRow.value.technologyVersion;
     processAdd.productId = detailsRow.value.product.id;
     processAdd.productCode = detailsRow.value.product.productCode;
     processAdd.processId = selection[i].id;
     processAdd.processAlias = selection[i].processAlias;
     processAdd.processCode = selection[i].processCode;
-    processAdd.productShaftCategory =detailsRow.value.product.shaftCategoryCode;
-    processAdd.productShaftCategoryName = referenceLotInfo.value.productShaftCategoryName;
+    processAdd.productShaftCategory =
+      detailsRow.value.product.shaftCategoryCode;
+    processAdd.productShaftCategoryName =
+      detailsRow.value.productShaftCategoryName;
     processAdd.processKey = selection[i].processKey;
-    processAdd.productDescription = referenceLotInfo.value.productDescription
+    processAdd.productDescription = detailsRow.value.productDescription;
     processAdd.uuid = currentUID++;
     processList.value.push(processAdd);
   }
   console.log(processList.value);
-  rowDrop()
+  rowDrop();
 }
 /** 获取行 id */
 function getRowKey(row) {

src/views/business/reviseBath/form.vue

@@ -1,19 +1,16 @@
 <template>
   <!-- 添加或修改项目信息对话框 -->
   <el-drawer
-    v-model="visible"
-    size="90%"
-    direction="rtl"
-    :close-on-press-escape="false"
+      v-model="visible"
+      size="90%"
+      direction="rtl"
+      :close-on-press-escape="false"
   >
     <div class="page-container form-container">
-      <div
-        class="form-btns-container"
-        style="display: flex; align-items: center"
-      >
-        <span class="title-label"
-          ><el-icon>
-            <Document />
+      <div class="form-btns-container" style="display: flex; align-items: center;">
+        <span class="title-label" 
+        ><el-icon>
+            <Document/>
           </el-icon>
           计划详情</span
         >
@@ -45,15 +42,14 @@
             @keydown.enter.prevent
           />
         </el-form-item>
-        <!-- <el-form-item label="工段：">
+        <el-form-item label="工段：">
           <el-select-v2
               v-model="queryParams.deptId"
               :options="deptList"
               placeholder="请选择工段"
               style="width: 140px"
-              @change="handleQuerydaywork"
           />
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="是否回退：">
           <el-select
             v-model="queryParams.isFallback"
@@ -85,149 +81,127 @@
             >搜索</el-button
           >
         </el-form-item>
-        <div style="margin-top: 20px">
-          <el-button type="primary" @click="handleFallback">回退</el-button>
+        <div style="margin-top: 20px;">
+        <el-button type="primary"  @click="handleFallback"
+            >回退</el-button
+          >
           <el-button type="primary" @click="handleWasteRecycling"
             >添加废品回用</el-button
           >
-          <el-button type="primary" @click="handleQuerydaywork">分批</el-button>
-          <el-button
-            type="primary"
-            :disabled="once"
-            @click="handleOnceSingleChange"
+          <el-button type="primary"  @click="handleQuerydaywork"
+            >分批</el-button
+          >
+          <el-button type="primary"  @click="handleQuerydaywork"
             >单批单改</el-button
           >
-          <el-button
-            type="primary"
-            :disabled="multi"
-            @click="handleQuerydaywork"
+          <el-button type="primary"  @click="handleQuerydaywork"
             >多批单改</el-button
           >
-        </div>
+      </div>
       </el-form>
       <!-- 列表区 -->
       <div class="el-table-container">
         <el-table
-          ref="dayworkTable"
-          v-loading="loading"
-          row-key="id"
-          @selection-change="handleSelectionChange"
-          height="100%"
-          :data="dayworkList"
+            ref="dayworkTable"
+            v-loading="loading"
+            row-key="id"
+            @selection-change="handleSelectionChange"
+            height="100%"
+            :data="lotList"
         >
-          <el-table-column type="selection" width="40" align="center" />
-          <el-table-column
-            label="客户简称"
-            prop="companyAlias"
-            align="center"
-          />
-          <el-table-column
-            label="生产计划单号"
-            width="100"
-            prop="productionPlanNo"
-            align="center"
-          />
-          <el-table-column label="批次号" prop="lotCode" align="center" />
-          <el-table-column
-            label="产品描述"
-            prop="productDescription"
-            align="center"
-          />
+          <el-table-column type="selection" width="40" align="center"/>
+          <el-table-column label="客户简称" prop="companyAlias" width="120" align="center"/>
+          <el-table-column label="生产计划单号" width="100" prop="productionPlanNo" align="center"/>
+          <el-table-column label="批次号" prop="lotCode" width="130" align="center"/>
+          <el-table-column label="产品描述" prop="productDescription" align="center"/>
+          <el-table-column label="图纸版本" width="80" prop="technologyVersion" align="center"/>
+          <el-table-column label="投产量" width="100" prop="productionQuantity" align="center"/>
           <el-table-column
-            label="图纸版本"
-            width="80"
-            prop="technologyVersion"
-            align="center"
-          />
-          <el-table-column
-            label="投产量"
-            width="100"
-            prop="productionQuantity"
-            align="center"
-          />
-          <el-table-column
-            label="下达日期"
-            prop="createTime"
-            width="100"
-            align="center"
-          >
+                label="下达日期"
+                prop="createTime"
+                width="100"
+                align="center"
+            >
+              <template #default="scope">
+                <span>{{
+                    proxy.moment(scope.row.createTime).format("YYYY-MM-DD")
+                  }}</span>
+              </template>
+            </el-table-column>
+          <el-table-column label="当前工段" width="100" prop="deptName" align="center"/>
+          <el-table-column label="当前工序" width="120" prop="processAlias" align="center"/>
+          <el-table-column label="回退" width="60" prop="isFallback" align="center">
             <template #default="scope">
-              <span>{{
-                proxy.moment(scope.row.createTime).format("YYYY-MM-DD")
-              }}</span>
+              <dict-tag
+                  :options="yes_no"
+                  :value="scope.row.isFallback"
+              />
             </template>
           </el-table-column>
-          <el-table-column
-            label="当前工段"
-            width="100"
-            prop="deptName"
-            align="center"
-          />
-          <el-table-column
-            label="当前工序"
-            width="120"
-            prop="processAlias"
-            align="center"
-          />
-          <el-table-column
-            label="回退"
-            width="60"
-            prop="isFallback"
-            align="center"
-          >
+          <el-table-column label="废品回用" width="70" prop="isWasteRecycling" align="center">
             <template #default="scope">
-              <dict-tag :options="yes_no" :value="scope.row.isFallback" />
+              <dict-tag
+                  :options="yes_no"
+                  :value="scope.row.isWasteRecycling"
+              />
             </template>
           </el-table-column>
-          <el-table-column
-            label="废品回用"
-            width="70"
-            prop="isWasteRecycling"
-            align="center"
-          >
+          <el-table-column label="批废" width="70" prop="isWaste" align="center">
             <template #default="scope">
-              <dict-tag :options="yes_no" :value="scope.row.isWasteRecycling" />
+              <dict-tag
+                  :options="yes_no"
+                  :value="scope.row.isWaste"
+              />
             </template>
           </el-table-column>
-          <el-table-column label="母批号" prop="fromCode" align="center" />
+          <el-table-column label="母批号" prop="fromCode" align="center"/>
           <el-table-column
-            fixed="right"
-            label="操作"
-            align="center"
-            width="140px"
+              fixed="right"
+              label="操作"
+              align="center"
+              width="140px"
           >
             <template #default="scope">
-              <el-button
-                link
-                type="danger"
-                icon="Delete"
-                @click="handleDayworkWaste(scope.row)"
-                >批废
-              </el-button>
+              <el-button v-if="scope.row.isWaste == 0"
+                  link
+                  type="danger"
+                  icon="Delete"
+                  @click="handlelotWaste(scope.row)"
+              >批废
+              </el-button
+              >
+              <el-button v-else
+                  link
+                  type="primary"
+                  icon="View"
+                  @click="handleChecklotWaste(scope.row)"
+              >查看
+              </el-button
+              >
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <once-change ref="onceChangeRef" />
+      <lot-waste-dialog ref="lotWasteDialogRef" @handleSaveSuccess="open(currentProductionPlan)"/>
+      <waste-recycling-dialog ref="wasteRecyclingDialogRef"></waste-recycling-dialog>
+      
     </div>
   </el-drawer>
 </template>
 <script setup>
-import { getDayworkInfo } from "@/api/business/daywork.js";
-import onceChange from "./onceSingleChangeDialog";
-import { ref } from "vue";
-const { proxy } = getCurrentInstance();
+import {
+  getDayworkInfo,getDeptList
+} from "@/api/business/daywork.js";
+import lotWasteDialog from './dayworkWasteDialog.vue'
+const {proxy} = getCurrentInstance();
 /** 字典数组区 */
 const { yes_no } = proxy.useDict("yes_no");
 /** 表单抽屉 页变量 */
+const currentProductionPlan = ref({});
 const loading = ref(false);
-const ids = ref([]); //多选框选中数据
-const once = ref(true); //单批单改按钮是否可点击
-const multi = ref(true); //多批单改按钮是否可点击
-const dayworkList = ref([]);
+const lotList = ref([])
 const visible = ref(false);
-const formOpen = ref(false);
-
+const deptList = ref([])
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
@@ -237,50 +211,53 @@ const queryParams = ref({
   isFallback: "",
   isWasteRecycling: "",
 });
+const queryDeptParams = ref({
+  lineNumber:'',
+  productionPlanNo:''
+})
 
 /***********************  方法区  ****************************/
 /** 打开抽屉 */
 const open = (row) => {
-  console.log(row);
-  queryParams.value.lineNumber = row.lineNumber;
-  queryParams.value.productionPlanNo = row.productionPlanNo;
-
+  currentProductionPlan.value = row;
+  queryParams.value.lineNumber = row.lineNumber
+  queryParams.value.productionPlanNo = row.productionPlanNo
+  queryDeptParams.value.lineNumber = row.lineNumber
+  queryDeptParams.value.productionPlanNo = row.productionPlanNo
+  getDeptList(queryDeptParams.value).then(res => {
+    if(res.code == 200) {
+        deptList.value = res.data
+    }
+  })
   //获取工段信息
-  getDayworkList();
+  getDayworkList()
   visible.value = true;
 };
 /**获取生产计划列表 */
 function getDayworkList() {
   loading.value = true;
-  getDayworkInfo(queryParams.value).then((res) => {
-    if (res.code == 200) {
-      dayworkList.value = res.rows;
-      loading.value = false;
+  getDayworkInfo(queryParams.value).then(res => {
+    if(res.code == 200) {
+      lotList.value = res.rows
+      loading.value = false
     }
-  });
+  })
 }
-
-/** 多选框选中数据 */
-function handleSelectionChange(selection) {
-  ids.value = selection.map((item) => item.lotCode);
-  console.log(selection);
-  once.value = ids.value.length == 1 ? false : true;
-  multi.value = ids.value.length > 1 ? false : true;
-}
-
-/** 单批单改按钮操作 */
-function handleOnceSingleChange() {
-  proxy.$refs.onceChangeRef.open(ids.value[0]);
-}
-
 /**搜索 */
 function handleQuerydaywork() {
-  getDayworkList();
+  getDayworkList()
+}
+/**批废 */
+function handlelotWaste(row) {
+  //flag为true时代表批废
+  row.flag = false
+   proxy.$refs.lotWasteDialogRef.open(row)
+}
+/**查看 */
+function handleChecklotWaste(row) {
+  row.flag = true
+  proxy.$refs.lotWasteDialogRef.open(row)
 }
-
-/**批量删除 */
-function handleDelete() {}
-
 /**
  * 对话框关闭 事件
  */
@@ -290,14 +267,15 @@ function close() {
 
 /**搜索栏清空 */
 function reset() {
-  queryParams = ref({
-    pageNum: 1,
-    pageSize: 10,
-    lotCode: "",
-    deptId: null,
-    isFallback: "",
-    isWasteRecycling: "",
-  });
+ queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+  lotCode: "",
+  deptId: null,
+  isFallback: "",
+  isWasteRecycling: "",
+});
+  proxy.resetForm("queryRef");
 }
 
 /** 取消按钮 */