Merge remote-tracking branch 'origin/master'

src/views/business/specialDaywork/form.vue

@@ -987,6 +987,7 @@ const open = (row, deptInfo) => {
     lotClick.value = true;
     firstOrder.value = row.specialIsFirst == 1;
     daywork.value = row;
+    console.log("row", daywork.value);
     daywork.value.productionPlanNo = row.productionPlanDetail.productionPlanNo;
     daywork.value.productDescription =
       row.productionPlanDetail.productDescription;
@@ -1214,6 +1215,7 @@ function remoteCarriers(queryString, choiced) {
     isAbandoned: 0,
     pageSize: 50,
     code: queryString != "" ? queryString : null,
+    lotId: daywork.value.lotId,
   }).then((res) => {
     if (res.code === 200) {
       carriers.value = res.rows.map((v) => ({

src/views/business/specialDaywork/index.vue

@@ -409,6 +409,8 @@ function resetQuery() {
   queryParams.value = {
     pageNum: 1,
     pageSize: 10,
+    deptId: deptList.value[0].value,
+    deptName: deptList.value[0].label,
     specialStartTime: proxy.moment().subtract(7, "days").format("YYYY-MM-DD"),
     specialEndTime: proxy.moment().format("YYYY-MM-DD"),
   };
@@ -444,11 +446,9 @@ function handleNoTurnoverInfo(row) {
 }
 
 function handleDeptChange(arg) {
-  console.log("arg", arg);
-  // const dept = deptList.value.filter((v) => (v.value = arg));
-  // queryParams.value.deptName = dept.label;
-  // queryParams.value.deptId = dept.value;
-  console.log("queryParams", queryParams.value);
+  const dept = deptList.value.filter((v) => (v.value = arg));
+  queryParams.value.deptName = dept[0].label;
+  queryParams.value.deptId = dept[0].value;
 }
 
 /**复选框选中数据 */