Merge branch '250217外协发出一键选择工序，报工维护修改，分选包装后自动周转' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue into 250217外协发出一键选择工序，报工维护修改，分选包装后自动周转

src/api/business/outsourcedOrder.js

@@ -42,11 +42,11 @@ export function getInnerOrder(query) {
 	})
 }
 
-export function carrierForOutsource(query) {
+export function carrierForOutsource(data) {
 	return request({
 		url: baseUrl + '/business/outsource/carrierForOutsource',
-		method: 'get',
-		params: query
+		method: 'post',
+		data: data
 	})
 }
 

src/views/business/innerOutsource/form.vue

@@ -1011,10 +1011,19 @@ function remoteCarriers(code, newCarrier, row) {
   if (code == "") {
     return;
   }
+  let hasAddCarrierIds = []
+  console.log(form.value.details)
+  form.value.details.forEach((item) => {
+    item.carriers.forEach(v=>{
+      hasAddCarrierIds.push(v.value)
+    })
+  });
+  console.log("hasAddCarrierIds",hasAddCarrierIds)
   carrierForOutsource({
     categoryId: categoryId,
     code: code,
     dayworkId: row.dayworkId,
+    hasAddCarrierIds:hasAddCarrierIds
   }).then((res) => {
     if (res.code === 200) {
       carriers.value = res.rows.map((v) => ({ value: v.id, label: v.code }));

src/views/business/outsource/form.vue

@@ -954,10 +954,18 @@ function remoteCarriers(code, newCarrier, row) {
   if (code == "") {
     return;
   }
+  let hasAddCarrierIds = []
+  console.log(form.value.details)
+  form.value.details.forEach((item) => {
+    item.carriers.forEach(v=>{
+      hasAddCarrierIds.push(v.value)
+    })
+  });
   carrierForOutsource({
     categoryId: categoryId,
     code: code,
     dayworkId: row.dayworkId,
+    hasAddCarrierIds:hasAddCarrierIds
   }).then((res) => {
     if (res.code === 200) {
       carriers.value = res.rows.map((v) => ({ value: v.id, label: v.code }));

src/views/system/role/selectUser.vue

@@ -76,6 +76,7 @@ function selectable(row, index) {
 
 // 显示弹框
 function show() {
+  resetQuery()
   queryParams.roleId = props.roleId
   getList()
   visible.value = true