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

src/layout/components/TagsView/index.vue

@@ -196,21 +196,23 @@ function refreshSelectedTag(view) {
   }
 }
 function closeSelectedTag(view) {
+  console.log(view.fullPath)
   //关闭批次查询页面时清空批次查询页面store
-  if ((view.fullPath = "/Production/lot/:productionPlanNo/:lineNumber")) {
+  if ((view.fullPath == "/Production/lot/:productionPlanNo/:lineNumber")) {
     lotStore().setlotQueryParams(null);
   }
-  if ((view.fullPath = "/Production/daywork")) {
+  if ((view.fullPath == "/Production/daywork")) {
     dayworkStore().setProductionPlanNoQueryParams(null);
     dayworkStore().setProductDescriptionQueryParams(null);
     dayworkStore().setDeptIdQueryParams(null);
     dayworkStore().setEquipmentDetailCodeQueryParams(null);
     dayworkStore().setProcessIdQueryParams(null);
   }
-  if ((view.fullPath = "/Production/furnaceInfo")) {
+  if ((view.fullPath == "/Production/furnaceInfo")) {
     furnaceStore().setlotQueryParams(null);
   }
-  if ((view.fullPath = "/outsourced/innerOutsource")) {
+  if ((view.fullPath == "/outsourced/innerOutsource")) {
+    
     innerOutsourceStore().setInnerOutsourceQueryParams(null);
   }
   proxy.$tab.closePage(view).then(({ visitedViews }) => {

src/store/modules/innerOutsourceOrder.js

@@ -7,17 +7,7 @@ const innerOutsourceStore = defineStore('innerOutsourceOrder', {
     setInnerOutsourceQueryParams(value) {
       this.innerOutsourceQueryParams = value;
     },
-    checkClean(obj) {
-      // console.log(obj.name)
-      if (obj.name == '') {
-        this.innerOutsourceQueryParams = null
-      }
-    },
-    allClean() {
-      this.innerOutsourceQueryParams = null
-    },
-    otherClean(obj) {
-    }
+
   }
 })
 

src/views/business/innerOutsource/index.vue

@@ -190,6 +190,7 @@ function getList() {
 function handleQuery() {
   queryParams.value.pageNum = 1;
   const innerOutsourceQueryParams = JSON.parse(JSON.stringify(queryParams.value));
+  console.log(innerOutsourceQueryParams)
     innerOutsourceStore().setInnerOutsourceQueryParams(innerOutsourceQueryParams);
   getList();
 }
@@ -197,6 +198,8 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm("queryRef");
+  queryParams.value = {};
+  innerOutsourceStore().setInnerOutsourceQueryParams(null);
   handleQuery();
 }