0603

src/api/business/outsourcedOrder.js

@@ -37,7 +37,14 @@ export function saveOrder(data) {
 	})
 }
 
-
+// 保存外协单
+export function submitDetails(data) {
+	return request({
+		url: baseUrl + '/business/outsource/submitDetails',
+		method: 'post',
+		data: data
+	})
+}
 export function processesForOutsource(data) {
 	return request({
 		url: baseUrl + '/business/outsource/processesForOutsource',

src/api/business/outsourcedRecords.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+const baseUrl = import.meta.env.VITE_APP_PRODUCTION_API
+
+// 查询外协发出单历史记录列表
+export function listOutsourcedRecords(query) {
+  return request({
+    url:baseUrl +  '/business/outsourcedRecords/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外协发出单历史记录详细
+export function getOutsourcedRecords(id) {
+  return request({
+    url: baseUrl + '/business/outsourcedRecords/' + id,
+    method: 'get'
+  })
+}
+
+// 新增外协发出单历史记录
+export function addOutsourcedRecords(data) {
+  return request({
+    url:baseUrl +  '/business/outsourcedRecords',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外协发出单历史记录
+export function updateOutsourcedRecords(data) {
+  return request({
+    url: baseUrl + '/business/outsourcedRecords',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除外协发出单历史记录
+export function delOutsourcedRecords(id) {
+  return request({
+    url:baseUrl +  '/business/outsourcedRecords/' + id,
+    method: 'delete'
+  })
+}

src/views/business/daywork/index.vue

@@ -79,21 +79,19 @@
                 <dict-tag :options="daywork_status" :value="scope.row.status" />
               </template>
             </el-table-column>
-            <el-table-column fixed="right" label="操作" align="center" width="140px">
+            <el-table-column fixed="right" label="操作" align="center" width="200px">
               <template #default="scope">
                 <el-button v-show="scope.row.deptProcessStatus &&
         (scope.row.status == 2 || scope.row.status == 3) &&
-        scope.row.processId == latestProcessId
+        scope.row.id == latestProcessId && scope.row.deptId == latestDeptId && !(lastStatus == 4 || lastStatus == 5 ||lastStatus ==7)
         " link type="warning" icon="Edit" @click="handleUpdateDayworkItem(scope.row)">编辑
                 </el-button>
-                <el-button v-show="!(scope.row.deptProcessStatus &&
-        (scope.row.status == 2 || scope.row.status == 3) &&
-        scope.row.processId == latestProcessId)" link type="primary" icon="View"
+                <el-button  link type="primary" icon="View"
                   @click="handleCheckDayworkItem(scope.row)">查看
                 </el-button>
                 <el-button v-show="scope.row.deptProcessStatus &&
         (scope.row.status == 2 || scope.row.status == 3) &&
-        scope.row.processId == latestProcessId
+        scope.row.id == latestProcessId&& scope.row.deptId == latestDeptId &&!(lastStatus == 4 || lastStatus == 5 ||lastStatus ==7)
         " v-hasPermi="['business:daywork:remove']" link type="danger" icon="Delete"
                   @click="handleDeletedItem(scope.row.id)">删除
                 </el-button>
@@ -141,7 +139,9 @@ const loading = ref(false);
 const dayworkItemList = ref([]);
 const dayworkItemLoading = ref(false);
 const itemTotal = ref(0);
+const lastStatus = ref(null)
 const latestProcessId = ref(null);
+const latestDeptId = ref(null)
 const deptProcessList = ref([]);
 /**工序 */
 const processList = ref([]);
@@ -391,7 +391,11 @@ function getDayworkItems() {
       // }
     }
     if (res.others != null && res.others.latestProcessId != null) {
-      latestProcessId.value = latestProcessId
+      latestProcessId.value = res.others.latestProcessId
+    }
+    if (res.others != null && res.others.lastItem != null) {
+      latestDeptId.value = res.others.lastItem.deptId
+      lastStatus.value = res.others.lastItem.status
     }
     for (var i = 0; i < res.rows.length; i++) {
       let timeStamp = res.rows[i].workingHours;
@@ -407,6 +411,7 @@ function getDayworkItems() {
           res.rows[i].deptProcessStatus = true;
         }
       }
+      console.log(res.rows[i].deptProcessStatus)
     }
     dayworkItemList.value = res.rows;
     getProcess();

src/views/business/outsource/DialogOutsourcedRecords.vue

@@ -0,0 +1,57 @@
+<template>
+	<el-dialog title="历史记录" v-model="visible" width="800px" height="400px" @close="close" append-to-body draggable  style="font-size: 14px;">
+		<el-table ref="dialogTable" :data="recordsList" size="small" v-loading="loading" border height="500px" header-row-class-name="list-header-row" row-class-name="list-row" >
+			<el-table-column type="index" label="序号" width="50" align="center" />
+			<el-table-column label="记录" align="center" prop="records" />
+		</el-table>
+	</el-dialog>
+</template>
+<script setup>
+import { listOutsourcedRecords } from "@/api/business/outsourcedRecords";
+/** 工序变量 */
+const total = ref(0)
+const recordsList = ref([])
+const visible = ref(false)
+const loading = ref(false)
+const data = reactive({
+	queryParams: {
+		masterId:null
+	}
+})
+const { queryParams } = toRefs(data)
+
+/**
+ * 对话框打开 事件
+ */
+function open(data) {
+	visible.value = true
+	queryParams.value.masterId = data
+	getList()
+}
+
+/**
+ * 对话框关闭 事件
+ */
+function close() {
+	visible.value = false
+}
+
+/**
+ * 加载数据
+ */
+function getList() {
+	loading.value = true
+	listOutsourcedRecords(queryParams.value).then((res) => {
+		recordsList.value = res.rows
+		loading.value = false
+	})
+}
+
+defineExpose({
+	open
+})
+</script>
+<style scoped>
+.el-table--small {
+    font-size: 14px;
+}</style>

src/views/business/outsource/DialogProcesses.vue

@@ -124,7 +124,9 @@ const selections = ref([]);
  * 对话框打开 事件
  */
 function open(data) {
+  console.log(data)
   queryParams.value.lotId = data.lotId
+  queryParams.value.outsourceDetailId = data.id?data.id:0
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
   visible.value = true;

src/views/business/outsource/form.vue

@@ -13,17 +13,17 @@
           <span>外协单信息</span>
         </span>
 
-        <el-button
+        <!-- <el-button
           v-if="editStatus"
           type="success"
           icon="check"
           @click="saveFrom"
         >
           暂存
-        </el-button>
+        </el-button> -->
 
         <el-button
-          v-if="!editStatus"
+          v-if="editStatus && form.isSubmit==1"
           type="primary"
           icon="Download"
           @click="handleExport"
@@ -34,8 +34,15 @@
           v-if="editStatus"
           type="primary"
           icon="Finished"
-          @click="submitFrom"
-          >保存并提交</el-button
+          @click="handleSubmit"
+          >保存</el-button
+        >
+        <el-button
+        v-if="editStatus && form.isSubmit==1"
+          type="info"
+          icon="Calendar"
+          @click="handleViewRecords"
+          >历史记录</el-button
         >
         <div class="close-btn" @click="cancel">
           <i class="fa fa-times" aria-hidden="true" />
@@ -80,7 +87,7 @@
           <el-col :span="6">
             <el-form-item label="外协商名称" prop="supplierName">
               <el-input
-                v-if="editStatus"
+                v-if="editStatus && form.isSubmit == 0"
                 v-model="form.supplierName"
                 readonly
                 placeholder="请输入外协商名称"
@@ -179,7 +186,7 @@
             <el-form-item label="备注" prop="remark">
               <el-input
                 v-if="editStatus"
-                v-model="form.remark"
+                v-model.trim="form.remark"
                 placeholder="请输入备注"
               />
               <span v-else>{{ form.remark }}</span>
@@ -375,8 +382,8 @@
       ref="dialogCarrierRef"
       :multiple-selected="handleMultipleSelectedOutsourceCarriers"
     />
-    <!-- 收回明细带回 -->
-    <!-- <form-details-recycling ref="formDetailsRecyclingRef" :singleSelected="handleSingleSelectedRecycling"/> -->
+    <!-- 历史记录弹窗 -->
+    <dialog-outsourced-records ref="dialogOutsourcedRecordsRef"/>
   </el-drawer>
 </template>
 <script setup>
@@ -386,12 +393,13 @@ import {
   carrierForOutsource,
   submitOrder,
   exportOutsource,
+  submitDetails
 } from "@/api/business/outsourcedOrder";
 import dialogCarrier from "./DialogCarrier";
 import dialogSuppliers from "./DialogSuppliers";
 import dialogProducts from "./DialogProducts";
 import dialogProcesses from "./DialogProcesses";
-// import FormDetailsRecycling from "./detailsRecyclingForm";
+import dialogOutsourcedRecords from "./DialogOutsourcedRecords"
 const { proxy } = getCurrentInstance();
 /** 父组件传参 */
 const props = defineProps({
@@ -421,7 +429,7 @@ const loading = ref(false);
 const multiple = ref(true);
 const visible = ref(false);
 const editStatus = ref(true);
-const isFullscreen = ref(false);
+const detailInfo = ref({});
 const totalCarriersNum = ref(0)
 const loadingCarrier = ref(false);
 const carriers = ref([]);
@@ -442,12 +450,14 @@ function handleExport() {
 }
 
 /** 打开抽屉 */
-function open(id) {
+function open(row) {
   reset();
   totalCarriersNum.value = 0
   visible.value = true;
-  if (id) {
-    form.value.id = id;
+  if (row) {
+    console.log(row)
+    detailInfo.value = row
+    form.value.id = row.id;
     getForm();
   } else {
     editStatus.value = true;
@@ -474,7 +484,12 @@ function getForm() {
       totalCarriersNum.value += item.carrierNum
     })
 
-    editStatus.value = form.value.isSubmit == 0;
+    editStatus.value = form.value.isSubmit == 1;
+    if(!detailInfo.value.flag) {
+      editStatus.value = false
+      console.log(editStatus.value)
+    }
+    console.log(editStatus.value)
     loading.value = false;
   });
 }
@@ -495,7 +510,11 @@ function handleChangePackagingMethod() {
     })
   }
 }else{
-  form.value.details.forEach(item =>{item.newCarriers = [];item.carrierIds = [];item.carriers = carriers.value})
+  form.value.details.forEach(item =>{
+    console.log(item.editStatus)
+    if(item.editStatus){
+    item.newCarriers = [];item.carrierIds = [];item.carriers = carriers.value}
+})
 }
   console.log(form.value.details)
   for(let i = 0;i<form.value.details.length;i++) {
@@ -517,6 +536,10 @@ function handleChangeDeliveryMethod() {
   }
  
 }
+//打开历史记录弹窗
+function handleViewRecords() {
+  proxy.$refs.dialogOutsourcedRecordsRef.open(form.value.id);
+}
 
 function selectText(value, data) {
   if (value) {
@@ -555,6 +578,7 @@ function reset() {
     packagingMethod: "0",
     remark: null,
     details: [],
+    isSubmit:0
   };
   proxy.resetForm("formRef");
 }
@@ -636,6 +660,79 @@ function submitFrom() {
     })
     .catch(() => {});
 }
+//5.29保存
+function handleSubmit() {
+  if(form.value.isSubmit==0){
+  proxy.$modal
+    .confirm("是否确定保存，保存后外协商不可编辑！")
+    .then(function () {
+      return;
+    })
+    .then(() => {
+      if (!form.value.details || form.value.details.length == 0) {
+        proxy.$modal.msgError("请添加产品明细");
+        return;
+      }
+
+      proxy.$refs["formRef"].validate((valid) => {
+        for (const item of form.value.details) {
+          if (!item.processNames) {
+            proxy.$modal.msgError("请选择" + item.lotCode + "批次的工序");
+            return;
+          }
+        }
+        if (form.value.packagingMethod == 1) {
+          console.log("form.value.details", form.value.details);
+          for (const item of form.value.details) {
+            if (item.newCarriers.length == 0) {
+              proxy.$modal.msgError("请选择" + item.lotCode + "批次的新箱号");
+              return;
+            }
+          }
+        }
+        if (valid) {
+          console.log(form.value)
+          submitDetails(form.value).then((response) => {
+            proxy.$modal.msgSuccess("提交成功");
+            visible.value = false;
+            getList.value();
+          });
+        }
+      });
+    })
+  }else{
+    if (!form.value.details || form.value.details.length == 0) {
+        proxy.$modal.msgError("请添加产品明细");
+        return;
+      }
+
+      proxy.$refs["formRef"].validate((valid) => {
+        for (const item of form.value.details) {
+          if (!item.processNames) {
+            proxy.$modal.msgError("请选择" + item.lotCode + "批次的工序");
+            return;
+          }
+        }
+        if (form.value.packagingMethod == 1) {
+          console.log("form.value.details", form.value.details);
+          for (const item of form.value.details) {
+            if (item.newCarriers.length == 0) {
+              proxy.$modal.msgError("请选择" + item.lotCode + "批次的新箱号");
+              return;
+            }
+          }
+        }
+        if (valid) {
+          console.log(form.value)
+          submitDetails(form.value).then((response) => {
+            proxy.$modal.msgSuccess("提交成功");
+            visible.value = false;
+            getList.value();
+          });
+        }
+      });
+  }
+}
 
 /***************************** 外协商对话框相关 *****************************/
 // 打开外协商选择对话框
@@ -657,14 +754,6 @@ const handleSingleSelectedSupplier = (data) => {
     form.value.freightAmount = 0.0
   }
 };
-/***************************** 外协收回明细相关 *****************************/
-//打开收回明细表单
-function handleDetailsRecycling() {
-  proxy.$refs.formDetailsRecyclingRef.open(row);
-}
-function handleSingleSelectedRecycling() {
-  
-}
 /***************************** 产品对话框相关 *****************************/
 // 打开产品选择对话框
 const handleShowDialogProducts = () => {
@@ -733,6 +822,7 @@ function remoteCarriers(code, newCarrier,row) {
   carrierForOutsource({
     categoryId: categoryId,
     code: code,
+    dayworkId:row.dayworkId
   }).then((res) => {
     if (res.code === 200) {
       carriers.value = res.rows.map((v) => ({ value: v.id, label: v.code }));
@@ -840,6 +930,7 @@ const handleShowDialogProcesses = (row) => {
 
 // 工序选择带回
 const handleMultipleSelectedProcesses = (selection) => {
+  currentDetail.value.processes = []
   const processNames = selection.map((item) => item.processAlias);
   // 使用join方法将数组转换为以逗号分隔的字符串
   let commaSeparatedString = processNames.join(",");

src/views/business/outsource/formOld.vue

@@ -0,0 +1,937 @@
+<template>
+  <el-drawer
+    title="外协单信息"
+    :with-header="false"
+    v-model="visible"
+    direction="rtl"
+    size="100%"
+  >
+    <div class="form-container column-container">
+      <div class="form-btns-container">
+        <span class="title-label">
+          <el-icon><Document /></el-icon>
+          <span>外协单信息</span>
+        </span>
+
+        <!-- <el-button
+          v-if="editStatus"
+          type="success"
+          icon="check"
+          @click="saveFrom"
+        >
+          暂存
+        </el-button> -->
+
+        <el-button
+          v-if="editStatus && form.isSubmit==1"
+          type="primary"
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['business:outsource:export']"
+          >导出</el-button
+        >
+        <el-button
+          v-if="editStatus"
+          type="primary"
+          icon="Finished"
+          @click="handleSubmit"
+          >保存</el-button
+        >
+        <div class="close-btn" @click="cancel">
+          <i class="fa fa-times" aria-hidden="true" />
+          <!-- <span>关闭</span> -->
+        </div>
+      </div>
+      <el-form
+        ref="formRef"
+        class="master-container"
+        :model="form"
+        v-loading="loading"
+        :rules="rules"
+        label-width="120px"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="单据号" prop="formCode">
+              <el-input
+                v-if="editStatus"
+                v-model="form.formCode"
+                disabled
+                placeholder="系统自动生成"
+              />
+              <span v-else>{{ form.formCode }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="表单日期" prop="formDate">
+              <el-date-picker
+                v-if="editStatus"
+                clearable
+                v-model="form.formDate"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择表单日期"
+                style="width: 100%"
+              >
+              </el-date-picker>
+              <span v-else>{{ parseTime(form.formDate, "{y}-{m}-{d}") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外协商名称" prop="supplierName">
+              <el-input
+                v-if="editStatus && form.isSubmit == 0"
+                v-model="form.supplierName"
+                readonly
+                placeholder="请输入外协商名称"
+              >
+                <template #append>
+                  <el-button icon="Search" @click="handleShowDialogSuppliers" />
+                </template>
+              </el-input>
+              <span v-else>{{ form.supplierName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="运费单价" prop="freightPrice">
+              <el-input-number
+                v-if="editStatus"
+                v-model="form.freightPrice"
+                :min="0"
+                :precision="2"
+                controls-position="right"
+              />
+              <span v-else>{{ form.freightPrice }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="运费总价" prop="freightAmount">
+              <el-input-number
+                v-if="editStatus"
+                v-model="form.freightAmount"
+                :min="0"
+                :precision="2"
+                controls-position="right"
+              />
+              <span v-else>{{ form.freightAmount }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="送货方式" prop="deliveryMethod">
+              <el-select
+                v-if="editStatus"
+                v-model="form.deliveryMethod"
+                placeholder="请选择"
+                @change="handleChangeDeliveryMethod"
+              >
+                <el-option
+                  v-for="dict in deliveryMethod"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+              <span v-else>{{
+                selectText(form.deliveryMethod, deliveryMethod)
+              }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="带箱方式" prop="packagingMethod">
+              <el-select
+                v-if="editStatus"
+                v-model="form.packagingMethod"
+                placeholder="请选择"
+                @change="handleChangePackagingMethod"
+              >
+                <el-option
+                  v-for="dict in packagingMethod"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+              <span v-else>{{
+                selectText(form.packagingMethod, packagingMethod)
+              }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="结算方式" prop="settlementType">
+              <el-select
+                v-if="editStatus"
+                v-model="form.settlementType"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="dict in settlementType"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+              <span v-else>{{
+                selectText(form.settlementType, settlementType)
+              }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-if="editStatus"
+                v-model.trim="form.remark"
+                placeholder="请输入备注"
+              />
+              <span v-else>{{ form.remark }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="总箱数" prop="remark">
+              <span >{{ totalCarriersNum }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <!-- 渲染数据区 -->
+      <div class="form-details-btns-container">
+        <el-button
+          v-if="editStatus"
+          type="primary"
+          icon="Plus"
+          @click="handleShowDialogProducts"
+          v-hasPermi="['business:outsource:add']"
+        >
+          添加外协产品明细
+        </el-button>
+      </div>
+      <div class="el-table-container">
+        <div class="el-table-inner-container">
+          <el-table
+            v-loading="loading"
+            :data="form.details"
+            size="small"
+            border
+            height="100%"
+          >
+            <el-table-column
+              label="行号"
+              type="index"
+              align="center"
+              width="48"
+            />
+            <el-table-column
+              label="批次号"
+              align="center"
+              prop="lotCode"
+              width="104"
+            />
+            <el-table-column
+              label="产品描述"
+              align="center"
+              prop="productDescription"
+              width="320"
+            />
+            <el-table-column label="产品数" align="center" width="160" prop="productNum">
+              <template #default="scope">
+                <el-input-number
+                  v-if="editStatus"
+                  :min="0"
+                  v-model="scope.row.productNum"
+                  placeholder="产品数"
+                />
+                <span v-else>{{ scope.row.productNum }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="箱数"
+              align="center"
+              prop="carrierNum"
+              width="70"
+            />
+            <el-table-column
+              :label="form.packagingMethod === '0' ? '箱号' : '原箱号'"
+              align="center"
+              prop="originalCarrier"
+              width="320"
+            />
+            <el-table-column
+              label="新箱号"
+              align="center"
+              prop="newCarrier"
+              width="320"
+            >
+              <template #default="scope">
+                <el-button link type="primary" icon="Refresh" v-if="!scope.row.editStatus && editStatus" @click="handleChangeCarrier(scope.row)">换箱</el-button>
+                <el-select
+                  v-if="editStatus && scope.row.editStatus"
+                  v-model="scope.row.carrierIds"
+                  multiple
+                  filterable
+                  remote
+                  reserve-keyword
+                  placeholder="请选择箱号"
+                  :remote-method="
+                    (arg) => remoteCarriers(arg, scope.row.newCarriers,scope.row)
+                  "
+                  :loading="loadingCarrier"
+                  @change="(arg) => handleCarrierChange(arg, scope.row)"
+                >
+                  <el-option
+                    v-for="item in scope.row.carriers"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-if="!editStatus">{{ scope.row.newCarrier }}</span>
+                <!-- <el-input
+                  v-if="editStatus"
+                  v-model="scope.row.newCarrier"
+                  readonly
+                  placeholder="请选择新箱号"
+                >
+                  <template #append>
+                    <el-button
+                      icon="Search"
+                      @click="handleShowDialogOutsourceCarriers(scope.row)"
+                    />
+                  </template>
+                </el-input>
+                <span v-else>{{ scope.row.newCarrier }}</span>-->
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="外协工序"
+              align="center"
+              prop="processNames"
+              width="320"
+            >
+              <template #default="scope">
+                <el-input
+                  v-if="editStatus"
+                  v-model="scope.row.processNames"
+                  readonly
+                  placeholder="请选择工序"
+                >
+                  <template #append>
+                    <el-button
+                      icon="Search"
+                      @click="handleShowDialogProcesses(scope.row)"
+                    />
+                  </template>
+                </el-input>
+                <span v-else>{{ scope.row.processNames }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" prop="remark">
+              <template #default="scope">
+                <el-input
+                  v-if="editStatus"
+                  v-model="scope.row.remark"
+                  placeholder="备注"
+                />
+                <span v-else>{{ scope.row.remark }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="editStatus"
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
+              width="64"
+            >
+              <template #default="scope">
+                <el-button
+                  circle
+                  type="danger"
+                  icon="Delete"
+                  @click="handleDelete(scope.$index)"
+                  v-hasPermi="['business:outsource:remove']"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <!-- 外协商选择 -->
+    <dialog-suppliers
+      ref="dialogSuppliersRef"
+      :single-selected="handleSingleSelectedSupplier"
+    />
+    <!-- 产品选择 -->
+    <dialog-products
+      ref="dialogProductsRef"
+      :supplier-id="form.supplierId"
+      :multiple-selected="handleMultipleSelectedProducts"
+    />
+    <!-- 工序选择 -->
+    <dialog-processes
+      ref="dialogProcessesRef"
+      :multiple-selected="handleMultipleSelectedProcesses"
+    />
+    <!-- 新箱号选择 -->
+    <dialog-carrier
+      ref="dialogCarrierRef"
+      :multiple-selected="handleMultipleSelectedOutsourceCarriers"
+    />
+  </el-drawer>
+</template>
+<script setup>
+import {
+  getOrder,
+  saveOrder,
+  carrierForOutsource,
+  submitOrder,
+  exportOutsource,
+  submitDetails
+} from "@/api/business/outsourcedOrder";
+import dialogCarrier from "./DialogCarrier";
+import dialogSuppliers from "./DialogSuppliers";
+import dialogProducts from "./DialogProducts";
+import dialogProcesses from "./DialogProcesses";
+const { proxy } = getCurrentInstance();
+/** 父组件传参 */
+const props = defineProps({
+  getList: {
+    type: Function,
+    default: () => {},
+  },
+  deliveryMethod: {
+    type: Array,
+    default: [],
+  },
+  settlementType: {
+    type: Array,
+    default: [],
+  },
+  packagingMethod: {
+    type: Array,
+    default: [],
+  },
+});
+const { getList, deliveryMethod, packagingMethod, settlementType } =
+  toRefs(props);
+/** 字典数组区 */
+/** 表单抽屉 页变量 */
+
+const loading = ref(false);
+const multiple = ref(true);
+const visible = ref(false);
+const editStatus = ref(true);
+const detailInfo = ref({});
+const totalCarriersNum = ref(0)
+const loadingCarrier = ref(false);
+const carriers = ref([]);
+const webHost = import.meta.env.VITE_APP_BASE_API;
+const form = ref({});
+// const formatDetails = ref([])
+const currentDetail = ref({});
+const rules = {
+  supplierName: [
+    { required: true, message: "外协商名称不能为空", trigger: "change" },
+  ],
+};
+
+/***********************  方法区  ****************************/
+/** 导出按钮操作 */
+function handleExport() {
+  exportOutsource({ id: form.value.id });
+}
+
+/** 打开抽屉 */
+function open(row) {
+  reset();
+  totalCarriersNum.value = 0
+  visible.value = true;
+  if (row) {
+    console.log(row)
+    detailInfo.value = row
+    form.value.id = row.id;
+    getForm();
+  } else {
+    editStatus.value = true;
+  }
+}
+
+/** 查询表单信息  */
+function getForm() {
+  loading.value = true;
+  getOrder(form.value.id).then((response) => {
+    form.value = response.data
+    console.log(form.value.details)
+    form.value.details.forEach(item =>{
+      item.editStatus = false
+     if(!form.value.id) {
+        item.carrierNum = item.originalCarrier.split(",").length
+      }else {
+        if(item.newCarrier !=null) {
+        item.carrierNum = item.newCarrier.split(",").length
+      }else {
+        item.carrierNum = item.originalCarrier.split(",").length
+      }
+      }
+      totalCarriersNum.value += item.carrierNum
+    })
+
+    editStatus.value = form.value.isSubmit == 1;
+    if(!detailInfo.value.flag) {
+      editStatus.value = false
+      console.log(editStatus.value)
+    }
+    console.log(editStatus.value)
+    loading.value = false;
+  });
+}
+//改变带箱方式
+function handleChangePackagingMethod() {
+  totalCarriersNum.value = 0
+  if(!editStatus){
+  if(form.value.packagingMethod == 1 && form.value.details.length>0) {
+    form.value.details.forEach(item =>{item.newCarriers = [];item.carrierIds = [];item.carriers = carriers.value})
+  }if(form.value.packagingMethod == 0 &&form.value.details.length>0) {
+    form.value.details.forEach(item =>{
+      item.carriers = carriers.value;
+      item.newCarriers = [];
+      item.carrierIds = [];
+      item.newCarriers.push(...item.originalCarrierList.map(v => ({ id: v.carrierId, code: v.carrierCode })));
+      item.carriers.push( ...item.originalCarrierList.map((v) => ({ value: v.carrierId, label: v.carrierCode })));
+      item.carrierIds = item.originalCarrierList.map(info => { return info.carrierId }) 
+    })
+  }
+}else{
+  form.value.details.forEach(item =>{item.newCarriers = [];item.carrierIds = [];item.carriers = carriers.value})
+}
+  console.log(form.value.details)
+  for(let i = 0;i<form.value.details.length;i++) {
+    if(form.value.packagingMethod == 1) {
+        form.value.details[i].carrierNum =form.value.details[i].newCarriers? form.value.details[i].newCarriers.length:0
+      }else {
+        form.value.details[i].carrierNum = form.value.details[i].newCarriers && form.value.details[i].newCarriers.length>0? form.value.details[i].newCarriers.length:form.value.details[i].originalCarrier.split(",").length
+      }
+      console.log(form.value.details)
+      totalCarriersNum.value += form.value.details[i].carrierNum
+  }
+}
+//改变送货方式
+function handleChangeDeliveryMethod() {
+  if(form.value.deliveryMethod == 1) {
+    form.value.freightAmount= form.value.freightPrice * totalCarriersNum.value
+  }else {
+    form.value.freightAmount = 0.0
+  }
+ 
+}
+
+function selectText(value, data) {
+  if (value) {
+    return data.filter((item) => item.value == value)[0].label;
+  }
+}
+
+/** 取消按钮 */
+function cancel() {
+  visible.value = false;
+  reset();
+}
+
+const handleDelete = (index) => {
+  totalCarriersNum.value -=form.value.details[index].carrierNum
+  if(form.value.deliveryMethod == 1) {
+    form.value.freightAmount= form.value.freightPrice * totalCarriersNum.value
+  }else {
+    form.value.freightAmount = 0.0
+  }
+  form.value.details.splice(index, 1);
+};
+
+/** 表单重置 */
+function reset() {
+  form.value = {
+    id: null,
+    tenantId: null,
+    formCode: null,
+    formDate: proxy.parseTime(new Date(), "{y}-{m}-{d}"),
+    supplierId: "0",
+    supplierName: "",
+    deliveryMethod: "0",
+    freightPrice: 0.0,
+    freightAmount: 0.0,
+    packagingMethod: "0",
+    remark: null,
+    details: [],
+    isSubmit:0
+  };
+  proxy.resetForm("formRef");
+}
+/** 保存 */
+function saveFrom() {
+  if (!form.value.details || form.value.details.length == 0) {
+    proxy.$modal.msgError("请添加产品明细");
+    return;
+  }
+
+  proxy.$refs["formRef"].validate((valid) => {
+    for (const item of form.value.details) {
+      if (!item.processNames) {
+        proxy.$modal.msgError("请选择" + item.lotCode + "批次的工序");
+        return;
+      }
+    }
+
+    if (form.value.packagingMethod == 1) {
+      console.log("form.value.details", form.value.details);
+      for (const item of form.value.details) {
+        if (item.newCarriers.length == 0) {
+          proxy.$modal.msgError("请选择" + item.lotCode + "批次的新箱号");
+          return;
+        }
+      }
+    }
+    if (valid) {
+      saveOrder(form.value).then((response) => {
+        if (response.code == 200) {
+          proxy.$modal.msgSuccess("保存成功");
+          visible.value = false;
+          getList.value();
+        }
+      });
+    }
+  });
+}
+
+/** 保存并提交 */
+function submitFrom() {
+  console.log("from", form.value);
+  proxy.$modal
+    .confirm("是否确定提交，提交后不可修改，删除")
+    .then(function () {
+      return;
+    })
+    .then(() => {
+      if (!form.value.details || form.value.details.length == 0) {
+        proxy.$modal.msgError("请添加产品明细");
+        return;
+      }
+
+      proxy.$refs["formRef"].validate((valid) => {
+        for (const item of form.value.details) {
+          if (!item.processNames) {
+            proxy.$modal.msgError("请选择" + item.lotCode + "批次的工序");
+            return;
+          }
+        }
+        if (form.value.packagingMethod == 1) {
+          console.log("form.value.details", form.value.details);
+          for (const item of form.value.details) {
+            if (item.newCarriers.length == 0) {
+              proxy.$modal.msgError("请选择" + item.lotCode + "批次的新箱号");
+              return;
+            }
+          }
+        }
+        if (valid) {
+          console.log(form.value)
+          submitOrder(form.value).then((response) => {
+            proxy.$modal.msgSuccess("提交成功");
+            visible.value = false;
+            getList.value();
+          });
+        }
+      });
+    })
+    .catch(() => {});
+}
+//5.29保存
+function handleSubmit() {
+  if(form.value.isSubmit==0){
+  proxy.$modal
+    .confirm("是否确定保存，保存后外协商不可编辑！")
+    .then(function () {
+      return;
+    })
+    .then(() => {
+      if (!form.value.details || form.value.details.length == 0) {
+        proxy.$modal.msgError("请添加产品明细");
+        return;
+      }
+
+      proxy.$refs["formRef"].validate((valid) => {
+        for (const item of form.value.details) {
+          if (!item.processNames) {
+            proxy.$modal.msgError("请选择" + item.lotCode + "批次的工序");
+            return;
+          }
+        }
+        if (form.value.packagingMethod == 1) {
+          console.log("form.value.details", form.value.details);
+          for (const item of form.value.details) {
+            if (item.newCarriers.length == 0) {
+              proxy.$modal.msgError("请选择" + item.lotCode + "批次的新箱号");
+              return;
+            }
+          }
+        }
+        if (valid) {
+          console.log(form.value)
+          submitDetails(form.value).then((response) => {
+            proxy.$modal.msgSuccess("提交成功");
+            visible.value = false;
+            getList.value();
+          });
+        }
+      });
+    })
+  }else{
+    if (!form.value.details || form.value.details.length == 0) {
+        proxy.$modal.msgError("请添加产品明细");
+        return;
+      }
+
+      proxy.$refs["formRef"].validate((valid) => {
+        for (const item of form.value.details) {
+          if (!item.processNames) {
+            proxy.$modal.msgError("请选择" + item.lotCode + "批次的工序");
+            return;
+          }
+        }
+        if (form.value.packagingMethod == 1) {
+          console.log("form.value.details", form.value.details);
+          for (const item of form.value.details) {
+            if (item.newCarriers.length == 0) {
+              proxy.$modal.msgError("请选择" + item.lotCode + "批次的新箱号");
+              return;
+            }
+          }
+        }
+        if (valid) {
+          console.log(form.value)
+          submitDetails(form.value).then((response) => {
+            proxy.$modal.msgSuccess("提交成功");
+            visible.value = false;
+            getList.value();
+          });
+        }
+      });
+  }
+}
+
+/***************************** 外协商对话框相关 *****************************/
+// 打开外协商选择对话框
+const handleShowDialogSuppliers = () => {
+  proxy.$refs.dialogSuppliersRef.open();
+};
+// 外协商选择带回
+const handleSingleSelectedSupplier = (data) => {
+  console.log(data);
+  form.value.supplierId = data.id;
+  form.value.lossLimit = data.lossLimit;
+  form.value.supplierName = data.name;
+  form.value.deliveryMethod = data.deliveryMethod;
+  form.value.freightPrice = data.freightPrice
+  form.value.settlementType = data.settlementType;
+  if(form.value.deliveryMethod == 1) {
+    form.value.freightAmount= form.value.freightPrice * totalCarriersNum.value
+  }else {
+    form.value.freightAmount = 0.0
+  }
+};
+/***************************** 产品对话框相关 *****************************/
+// 打开产品选择对话框
+const handleShowDialogProducts = () => {
+  const dayworkIds = form.value.details.map((item) => item.dayworkId);
+  // console.log(dayworkIds);
+  proxy.$refs.dialogProductsRef.open(dayworkIds);
+};
+// 产品选择带回
+const handleMultipleSelectedProducts = (selection) => {
+  selection.forEach((item) => {
+    const newDetail = {
+      lotId: item.lotId,
+      lotCode: item.lotCode,
+      dayworkId: item.id,
+      productId: item.productId,
+      productDescription: item.productDescription,
+      technologicalProcessId: item.technologicalProcessId,
+      technologyVersion: item.technologyVersion,
+      originalCarrier: item.originalCarrier,
+      originalCarrierCount: item.originalCarrier.split(",").length,
+      carrierNum:item.originalCarrier.split(",").length,
+      originalCarrierList:item.originalCarrierList,
+      productNum: item.productNum,
+      productCode: item.productCode,
+      newCarrier: "",
+      carriers:[],
+      newCarrierCount: 0,
+      newCarriers: [],
+      processNames: "",
+      remark: item.remark,
+      processes: [],
+    };
+    form.value.details.push(newDetail);
+    console.log(newDetail)
+    totalCarriersNum.value += newDetail.originalCarrierCount
+    if(form.value.deliveryMethod == 1) {
+    form.value.freightAmount= form.value.freightPrice * totalCarriersNum.value
+    }else {
+    form.value.freightAmount = 0.0
+  }
+    // console.log("form.value.details", form.value.details);
+  });
+};
+
+/***************************** 外协箱子对话框相关 *****************************/
+// 打开外协箱子选择对话框
+const handleShowDialogOutsourceCarriers = (row) => {};
+
+function remoteCarriers(code, newCarrier,row) {
+  loadingCarrier.value = true;
+  // console.log(row, carriers.value)
+  console.log("row", row);
+  // if (true) {
+  //   carriers.value = [{ value: '"1747500987856662535"', label: '000319' }]
+  //   return 
+  // }
+  let categoryId;
+  if (form.value.packagingMethod == 1) {
+    categoryId = "1783783697558847489";
+  } else {
+    categoryId = "2";
+  }
+  if (code == "") {
+    return;
+  }
+  carrierForOutsource({
+    categoryId: categoryId,
+    code: code,
+    dayworkId:row.dayworkId
+  }).then((res) => {
+    if (res.code === 200) {
+      carriers.value = res.rows.map((v) => ({ value: v.id, label: v.code }));
+      row.carriers = res.rows.map((v) => ({ value: v.id, label: v.code }));
+      if (Array.isArray(newCarrier)) {
+        // 安全地更新 carriers
+        row.carriers.push(
+          ...newCarrier
+            .filter((v) => !row.carriers.map((e) => e.value).includes(v.id))
+            .map((v) => ({ value: v.id, label: v.code }))
+        );
+      }
+    } else {
+      row.carriers = [];
+      row.carriers.push(...newCarrier);
+    }
+    loadingCarrier.value = false;
+  });
+}
+//换箱
+function handleChangeCarrier(row) {
+  console.log(row)
+  if(editStatus.value && !form.value.id){
+  if(form.value.packagingMethod == 0) {
+    row.newCarriers.push(...row.originalCarrierList.map(v => ({ id: v.carrierId, code: v.carrierCode })))
+    row.carriers.push( ...row.originalCarrierList.map((v) => ({ value: v.carrierId, label: v.carrierCode })))
+    row.carrierIds = row.originalCarrierList.map(info => { return info.carrierId })
+  }else{
+    row.newCarriers = null
+  }
+}
+if(editStatus.value && form.value.id){
+  row.carriers = []
+    row.newCarriers.map(v => ({ id: v.value, code: v.label }))
+    console.log(row.newCarriers)
+    row.carriers = row.newCarriers.map((v) => ({ value: v.id, label: v.code }))
+    row.carrierIds = row.newCarriers.map(info => { return info.id })
+    console.log(row)
+}
+  row.editStatus = true;
+}
+function handleCarrierChange(arg, item) {
+  totalCarriersNum.value = 0
+  item.newCarriers = item.carriers
+    .filter((v) => arg.includes(v.value))
+    .map((v) => ({ id: v.value, code: v.label }));
+    console.log(item.newCarriers)
+    item.carrierNum = item.newCarriers.length
+
+    for(let i = 0;i<form.value.details.length;i++) {
+    if(form.value.packagingMethod == 1) {
+        form.value.details[i].carrierNum =form.value.details[i].newCarriers? form.value.details[i].newCarriers.length:0
+      }else {
+        //原厂蓝箱
+        form.value.details[i].carrierNum =form.value.details[i].newCarriers? form.value.details[i].newCarriers.length:form.value.details[i].originalCarrier.split(",").length
+      }
+      console.log(form.value.details)
+      totalCarriersNum.value += form.value.details[i].carrierNum
+  }
+       if(form.value.deliveryMethod == 1) {
+        form.value.freightAmount= form.value.freightPrice * totalCarriersNum.value
+        }else {
+          form.value.freightAmount = 0.0
+        }
+}
+
+/** 使用新方式 */
+// const handleShowDialogOutsourceCarriers = (row) => {
+//   // 确保 form.details 存在且不是 undefined
+//   let allNewCarriers;
+//   if (form.value && form.value.details && Array.isArray(form.value.details)) {
+//     allNewCarriers = form.value.details
+//       .flatMap((detail) =>
+//         detail.newCarriers ? detail.newCarriers.filter((item) => item) : []
+//       )
+//       .filter(Boolean);
+
+//     // 现在 allNewCarriers 包含了所有非空的 newCarriers 数组的元素
+//   }
+//   // form.value.details.newCarriers
+//   // const allNewCarriers = form.details.flatMap((detail) => detail.newCarriers);
+//   console.log("allNewCarriers", allNewCarriers);
+//   proxy.$refs.dialogCarrierRef.open(row.lotId, from.value.deliveryMethod);
+// };
+
+// 箱子选择带回
+const handleMultipleSelectedOutsourceCarriers = (selection, lotId) => {
+  const carrierNames = selection.map((item) => item.code);
+  let carrierNamesString = carrierNames.join(",");
+  form.value.details.map((item) => {
+    if (item.lotId == lotId) {
+      item.newCarrier = carrierNamesString;
+      item.newCarrierCount = selection.length;
+      item.newCarriers = selection;
+    }
+  });
+};
+
+/***************************** 外协工序对话框相关 *****************************/
+// 打开外协工序选择对话框
+const handleShowDialogProcesses = (row) => {
+  currentDetail.value = row;
+  proxy.$refs.dialogProcessesRef.open(row);
+};
+
+// 工序选择带回
+const handleMultipleSelectedProcesses = (selection) => {
+  currentDetail.value.processes = []
+  const processNames = selection.map((item) => item.processAlias);
+  // 使用join方法将数组转换为以逗号分隔的字符串
+  let commaSeparatedString = processNames.join(",");
+  currentDetail.value.processes = [];
+  currentDetail.value.processNames = commaSeparatedString;
+  selection.forEach((item) => {
+    const newProcess = {
+      processId: item.processId,
+      processCode: item.processCode,
+      processAlias: item.processAlias,
+      processStepNumber: item.processStepNumber,
+      technologicalProcessDetailId: item.id,
+    };
+    currentDetail.value.processes.push(newProcess);
+  });
+};
+
+/** 暴露给父组件的方法 */
+defineExpose({
+  open,
+});
+</script>

src/views/business/outsource/index.vue

@@ -192,11 +192,11 @@
             label="操作"
             align="center"
             class-name="small-padding fixed-width"
-            width="144"
+            width="200"
           >
             <template #default="scope">
               <el-button
-                v-if="scope.row.isSubmit == 0"
+                v-if="scope.row.isSubmit == 1"
                 link
                 type="warning"
                 icon="Edit"
@@ -206,17 +206,15 @@
                 编辑
               </el-button>
               <el-button
-                v-if="scope.row.isSubmit == 1"
                 link
                 type="primary"
                 icon="View"
-                @click="handleUpdate(scope.row)"
+                @click="handleView(scope.row)"
                 v-hasPermi="['business:outsource:query']"
               >
                 查看
               </el-button>
               <el-button
-                v-if="scope.row.isSubmit == 0"
                 link
                 type="danger"
                 icon="Delete"
@@ -328,7 +326,13 @@ function handleAdd() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
   const id = row.id || ids.value;
-  proxy.$refs.orderRef.open(id);
+  row.flag = true
+  proxy.$refs.orderRef.open(row);
+}
+function handleView(row) {
+  const id = row.id || ids.value;
+  row.flag =false
+  proxy.$refs.orderRef.open(row);
 }
 
 /** 删除按钮操作 */

src/views/business/returnReceipt/DialogOutsourceDetails.vue

@@ -97,12 +97,14 @@ function open(data) {
 
 //查看对应外协所有批次
 function handleShowAllDetail() {
+	queryParams.value.pageNum =1
 	queryParams.value.pageSize = 10
 	showAll.value = true
 	getAllList()
 }
 //查看对应外协已完成批次
 function handleShowFinishedDetail() {
+	queryParams.value.pageNum =1
 	queryParams.value.pageSize = 10
 	showAll.value = false
 	getList()

src/views/business/returnReceipt/form.vue

@@ -315,6 +315,7 @@ const handleMultipleSelectedOutsourceDetails = (selection) => {
         processAlias: selection[i].processes[j].processAlias,
         processCode: selection[i].processes[j].processCode,
         processStepNumber: selection[i].processes[j].processStepNumber,
+        productionDeptId:selection[i].productionDeptId,
         status: 0,
         auditNum: 0,
       };
@@ -414,6 +415,8 @@ function submitForm() {
 }
 //反选操作
 function handleDelReturnReceiveDetail(row) {
+  console.log(row)
+  if(form.value.id) {
   if(row.productionDeptId!=0) {
     proxy.$modal.msgError("该批次已周转，不能删除");
   }else{
@@ -426,6 +429,10 @@ function handleDelReturnReceiveDetail(row) {
     });
   }
 }
+else{
+  form.value.details.splice(form.value.details.indexOf(row), 1)
+}
+}
 
 /** 暴露给父组件的方法 */
 defineExpose({

src/views/business/returnReceipt/index.vue

@@ -57,7 +57,7 @@
       <el-button
         type="danger"
         icon="Delete"
-        :disabled="multiple"
+        :disabled="ids.length == 0"
         v-hasPermi="['business:returnReceipt:remove']"
         @click="handleDelete"
       >