12.4

src/api/business/planDetailSubDetail.js

@@ -41,7 +41,12 @@ export function getDeptList() {
     method: 'get'
   })
 }
-
+export function getDeptListByUserIdInPackage() {
+  return request({
+    url: baseUrl + '/business/planDetailSubDetail/getDeptListByUserIdInPackage',
+    method: 'get'
+  })
+}
 export function specialGetDeptList() {
   return request({
     url: baseUrl + '/business/planDetailSubDetail/specialGetDeptList',

src/views/business/daywork/form.vue

@@ -486,7 +486,25 @@ function handleGetUser(selection) {
  form.value.nickName = selection.nickName;
  form.value.userId = selection.userId;
  form.value.userName = selection.userName;
- getEquipmentInfo(form.value)
+ getEquipmentInfo({
+      commonCode: selection.userName,
+      productionPlanDetailId: detailInfo.value.productionPlanDetailId,
+      dayworkItemId: detailInfo.value.id,
+      deptId: detailInfo.value.deptId,
+    }).then((equipmentRef) => {
+      if (equipmentRef.code == 200) {
+        if (equipmentRef.rows.length > 0) {
+          equipmentList.value = equipmentRef.rows;
+          for (let i = 0; i < equipmentList.value.length; i++) {
+            if (row.equipmentDetailCode == equipmentList.value[i].label) {
+              form.value.equipmentDetailId = equipmentList.value[i].value;
+            }
+          }
+        } else {
+          equipmentList.value = [];
+        }
+      }
+    });
  form.value.equipmentDetailId = null
  form.value.equipmentDetailCode = null
 }

src/views/business/packageLine/index.vue

@@ -5,6 +5,10 @@
       <!-- 搜索区域 -->
       <el-form class="list-search-container" :inline="true" style="display: flex">
         <el-form-item class="section-title" label="包装线列表" />
+        <el-form-item class="section-title" label="请选择当前工段：">
+          <el-select-v2 v-model="queryDeptParams.deptId" :options="deptList" placeholder="请选择工段" style="width: 100px"
+            @change="handleDeptChange" />
+        </el-form-item>
         <el-button type="primary" icon="Plus" :disabled="packageResourceGroups.length === 0" @click="handleAdd()"
           v-hasPermi="['business:packageResourceGroup:add']">新增</el-button>
         <el-button type="info" icon="Search" @click="getList()"
@@ -117,11 +121,7 @@ import {
 } from "@/api/business/resourceGroup";
 import { listGroup, addGroup, updateGroup, delGroup, listDetails, addDetails } from "@/api/business/packageResourceGroup";
 import { delDetail } from "@/api/business/packageResourceGroupDetail"
-import {
-  listDeptProcess,
-  addDeptProcess,
-  delDeptProcess,
-} from "@/api/business/deptProcess";
+import { getDeptListByUserIdInPackage } from "@/api/business/planDetailSubDetail.js";
 import resourceGroupForm from "./form";
 import useUserStore from '@/store/modules/user'
 import EmployeeChoiceDialog from './EmployeeChoiceDialog.vue'
@@ -133,6 +133,7 @@ const data = reactive({
   queryDeptParams: {
     deptName: "",
     deptCode: "",
+    deptId: "",
   },
   queryParams: {
     pageNum: 1,
@@ -167,7 +168,7 @@ const groupList = ref([]);
 const groupLoading = ref(false);
 /**资源组明细 */
 const groupDetailLoading = ref(false);
-const groupDetailList = ref([]);
+const deptList = ref([]);
 /**工序 */
 const userList = ref([]);
 const deptProcessLoading = ref(false);
@@ -192,6 +193,10 @@ function getList() {
     workSectionLoading.value = false;
   });
 }
+//切换工段
+function handleDeptChange() {
+  getList()
+}
 /**工段点击事件 */
 const handleWorkSectionChange = (row) => {
   queryParams.value.code = "";
@@ -206,6 +211,18 @@ const handleWorkSectionChange = (row) => {
 
 /*******************************工序方法区*********************************** */
 /**获取工序 */
+function getDeptList(){
+  getDeptListByUserIdInPackage().then((response) => {
+    deptList.value = response.data.rows;
+    if (deptList.value.length > 0) {
+      queryDeptParams.value.deptId = deptList.value[0].value;
+      getList();
+    } else {
+      packageResourceGroups.value = [];
+      userList.value = []
+    }
+  });
+}
 const getDetails = () => {
   deptProcessIds.value = []
   deptProcessLoading.value = true;
@@ -359,6 +376,6 @@ function handleEmployeeMultipleSelected(infos) {
 }
 
 onMounted(() => {
-  getList();
+  getDeptList();
 });
 </script>

src/views/business/returnTurnover/index.vue

@@ -7,24 +7,24 @@
 					@keyup.enter="handleQuery" />
 			</el-form-item> -->
 			<el-form-item label="批次号：" prop="lotCode">
-				<el-input v-model="queryParams.lotCode" placeholder="请输入批次号" style="width: 130px" clearable
+				<el-input v-model.trim="queryParams.lotCode" placeholder="请输入批次号" style="width: 130px" clearable
 					@keyup.enter="handleQuery" />
 			</el-form-item>
 			<el-form-item label="收回单号：" prop="returnFormCode">
-				<el-input v-model="queryParams.returnFormCode" placeholder="请输入收回单号" style="width: 144px" clearable
+				<el-input v-model.trim="queryParams.returnFormCode" placeholder="请输入收回单号" style="width: 144px" clearable
 					@keyup.enter="handleQuery" />
 			</el-form-item>
 			<el-form-item label="产品描述：" prop="productDescription">
-				<el-input v-model="queryParams.productDescription" placeholder="请输入产品描述" style="width: 144px" clearable
+				<el-input v-model.trim="queryParams.productDescription" placeholder="请输入产品描述" style="width: 144px" clearable
 					@keyup.enter="handleQuery" />
 			</el-form-item>
 			<el-form-item label="外协商：" prop="supplierName">
-				<el-input v-model="queryParams.supplierName" placeholder="请输入外协商" style="width: 130px" clearable
+				<el-input v-model.trim="queryParams.supplierName" placeholder="请输入外协商" style="width: 130px" clearable
 					@keyup.enter="handleQuery" />
 			</el-form-item>
 			
 			<el-form-item label="箱号：" prop="newCarrierName">
-				<el-input v-model="queryParams.newCarrierName" placeholder="请输入周转箱号" style="width: 144px" clearable
+				<el-input v-model.trim="queryParams.newCarrierName" placeholder="请输入周转箱号" style="width: 144px" clearable
 					@keyup.enter="handleQuery" />
 			</el-form-item>
 			<el-form-item label="外协检状态：">