Merge remote-tracking branch 'jg-orgin/master' into jg-master

src/components/Search/index.vue

@@ -62,7 +62,8 @@ const getData = () => {
   emit("dataList");
 };
 const reset = () => {
-  emit("resetList");
+  searchForm.value = {};
+  emit("dataList");
 };
 const setSearchFrom = () => {
   props.searchOptions.forEach((option) => {});

src/views/sales/index.vue

@@ -16,6 +16,7 @@
         <el-table-column prop="customer" label="顾客名称" />
         <el-table-column prop="materialName" label="物料名称" />
         <el-table-column prop="materialModel" label="物料型号" />
+        <el-table-column prop="checkCode" label="检验批号" />
         <el-table-column prop="contacts" label="联系人" />
         <el-table-column prop="currentUserName" label="审核人" overhidden="true" />
         <el-table-column prop="state" label="审核状态">
@@ -106,18 +107,18 @@ const tableData = ref([]);
 const searchRef = ref(null);
 const searchForm = [
   {
-    label: "工单号",
-    prop: "workOrderCode",
+    label: "检验批号",
+    prop: "checkCode",
     type: "input",
   },
   {
     label: "顾客名称",
-    prop: "custome",
+    prop: "customer",
     type: "input",
   },
   {
-    label: "关联订单",
-    prop: "orderNo",
+    label: "物料型号",
+    prop: "materialModel",
     type: "input",
   },
 ];

src/views/statistic/firstPassYield/index.vue

@@ -238,11 +238,12 @@ const getTableData = async () => {
 // -------
 
 const reset = () => {searchTime.value = getCurrentMonthStartAndEndDates();
-  // treeRef1.value.setCheckedKeys([statProductionLineData[0].key], true, true);
-  // treeRef2.value.setCheckedKeys([statProductTypeData[0].key], true, true);
+  //treeRef1.value.setCheckedKeys([statProductionLineData[0].key], true, true);
+    //statProductionLineData.value=[];
+    //treeRef1.value.setCheckedKeys([statProductionLineData[0].key], true, true);
+    treeData.value=[];
+    workOrderCodes.value=[];
   currentOption.value.page = 1;
-  workOrderCodes.value = [];
-    treeRef1.value.setCheckedNodes([]);
   getTableData();
 };