From ff9432941c5bdedcc2b5cee6f9f526ef36c7ddc9 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 2 Feb 2024 11:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=8F=91=E8=B4=A7=20?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=88=B3=20=E5=8F=91=E8=B4=A7=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/imgs/status/deliver.png        | Bin 0 -> 16440 bytes
 .../src/views/heli/deliverorder/detail.vue    | 370 ++++++------------
 2 files changed, 121 insertions(+), 249 deletions(-)
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/deliver.png

diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/deliver.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/deliver.png
new file mode 100644
index 0000000000000000000000000000000000000000..4568c2d9c125ee237f5202246aad9c882e932764
GIT binary patch
literal 16440
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
KN>qp$1pFVg_+xee

literal 0
HcmV?d00001

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
index 0bc01e3d..bfc0fe3d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
@@ -1,16 +1,16 @@
 <template>
   <!-- 公共详情  -->
-  <el-card class="hl-card">
+  <el-card class="hl-card" style="position: relative">
     <template #header>
       <span><span v-html="dialogTitle"></span>页</span>
     </template>
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="140px"
-      v-loading="formLoading"
-    >
+    <div class="abstatus">
+      <div v-if="formData.deliverStatus == 2">
+        <img src="/src/assets/imgs/status/deliver.png" alt="" />
+      </div>
+
+    </div>
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="140px" v-loading="formLoading">
       <!-- 基础信息 横向布局 -->
       <el-card class="hl-card-info">
         <template #header>
@@ -24,37 +24,31 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="项目编号" prop="saleOrderIds">
-              <el-input disabled v-model="formData.saleOrderCode" placeholder="请输入项目编号" >
+              <el-input disabled v-model="formData.saleOrderCode" placeholder="请输入项目编号">
                 <template #append><el-button :disabled="active != 'create'" @click="openProjectOrderDialog" :icon="Search" /></template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item prop="contractNo" label="合同号">
-              <el-input v-model="formData.contractNo" disabled/>
+              <el-input v-model="formData.contractNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item prop="property" label="性质">
-              <el-input v-model="formData.property" disabled/>
+              <el-input v-model="formData.property" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
             <el-form-item label="发货日期" prop="deliverDate">
-              <el-date-picker
-                :disabled="detailDisabled"
-                v-model="formData.deliverDate"
-                type="date"
-                value-format="x"
-                placeholder="选择发货日期"
-              />
+              <el-date-picker :disabled="detailDisabled" v-model="formData.deliverDate" type="date" value-format="x" placeholder="选择发货日期" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item prop="customerId" label="客户名称">
-              <el-input v-model="formData.customerName" disabled/>
+              <el-input v-model="formData.customerName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -71,13 +65,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="发货备注" prop="remark">
-              <el-input
-                :disabled="detailDisabled"
-                type="textarea"
-                v-model="formData.remark"
-                show-word-limit
-                maxlength="200"
-              />
+              <el-input :disabled="detailDisabled" type="textarea" v-model="formData.remark" show-word-limit maxlength="200" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -98,14 +86,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="发货方式" prop="deliverMode">
+            <el-form-item label="发货方式" >
               <el-select :disabled="detailDisabled" v-model="formData.deliverMode" placeholder="请选择发货方式">
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MODE)"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
+                <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MODE)" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -124,19 +107,8 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="收货人姓名" prop="receivePersonName">
-              <el-select :disabled="detailDisabled" v-model="formData.receivePersonName"
-                         filterable
-                         allow-create
-                         clearable
-                         @change="receiveOnChange"
-                         @blur="e => { if(e.target.value) formData.receivePersonName = e.target.value;}"
-              >
-                <el-option
-                  v-for="dict in receivePersonOptions"
-                  :key="dict.name"
-                  :label="dict.name"
-                  :value="dict.name"
-                />
+              <el-select :disabled="detailDisabled" v-model="formData.receivePersonName" filterable allow-create clearable @change="receiveOnChange" @blur="e => { if(e.target.value) formData.receivePersonName = e.target.value;}">
+                <el-option v-for="dict in receivePersonOptions" :key="dict.name" :label="dict.name" :value="dict.name" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -147,20 +119,8 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="收货详细地址" prop="receiveAddress">
-              <el-select v-model="formData.receiveAddress"
-                         filterable
-                         allow-create
-                         :disabled="detailDisabled"
-                         @blur="e => { if(e.target.value) formData.receiveAddress = e.target.value;}"
-                         clearable
-                         style="width: 100%"
-              >
-                <el-option
-                  v-for="dict in receivePersonAddressOptions"
-                  :key="dict.address"
-                  :label="dict.address"
-                  :value="dict.address"
-                />
+              <el-select v-model="formData.receiveAddress" filterable allow-create :disabled="detailDisabled" @blur="e => { if(e.target.value) formData.receiveAddress = e.target.value;}" clearable style="width: 100%">
+                <el-option v-for="dict in receivePersonAddressOptions" :key="dict.address" :label="dict.address" :value="dict.address" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -209,17 +169,8 @@
         <el-row>
           <el-col>
             <el-card class="hl-incard">
-              <el-form
-                ref="subFormRef"
-                :model="formData.deliverOrderSubs"
-                :rules="subFormRules"
-                v-loading="subFormLoading"
-                label-width="0"
-              >
-                <el-table
-                  :data="formData.deliverOrderSubs"
-                  class="hl-table"
-                >
+              <el-form ref="subFormRef" :model="formData.deliverOrderSubs" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
+                <el-table :data="formData.deliverOrderSubs" class="hl-table">
                   <el-table-column label="序号" type="index" width="100" />
                   <el-table-column min-width="150" align="center">
                     <template #header> <span class="hl-table_header">*</span>子项目名称 </template>
@@ -243,14 +194,7 @@
                     <template #header> <span class="hl-table_header">*</span>本次发货数量 </template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.amount`" :rules="subFormRules.amount" class="mb-0px!">
-                        <el-input-number
-                          :disabled="detailDisabled"
-                          v-model="row.amount"
-                          placeholder="请输入本次发货数量"
-                          style="width: 100%"
-                          :min="1"
-                          :precision="0"
-                        />
+                        <el-input-number :disabled="detailDisabled" v-model="row.amount" placeholder="请输入本次发货数量" style="width: 100%" :min="1" :precision="0" />
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -284,13 +228,7 @@
                   </el-table-column>
                   <el-table-column label="操作" align="center" width="100">
                     <template #default="scope">
-                      <el-button
-                        v-if="'update,create,deliver'.indexOf(active) > -1"
-                        link
-                        type="danger"
-                        size="small"
-                        @click.prevent="onDeleteItem(scope.$index)"
-                      >
+                      <el-button v-if="'update,create,deliver'.indexOf(active) > -1" link type="danger" size="small" @click.prevent="onDeleteItem(scope.$index)">
                         删除
                       </el-button>
                     </template>
@@ -308,23 +246,12 @@
         </template>
         <el-row>
           <el-col v-if="active != 'detail'">
-            <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem2"
-            >新增</el-button
-            >
+            <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem2">新增</el-button>
           </el-col>
           <el-col>
             <el-card class="hl-incard">
-              <el-form
-                ref="otherSubFormRef"
-                :model="formData.deliverOrderOtherSubs"
-                :rules="subFormRules"
-                v-loading="subFormLoading"
-                label-width="0"
-              >
-                <el-table
-                  :data="formData.deliverOrderOtherSubs"
-                  class="hl-table"
-                >
+              <el-form ref="otherSubFormRef" :model="formData.deliverOrderOtherSubs" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
+                <el-table :data="formData.deliverOrderOtherSubs" class="hl-table">
                   <el-table-column label="序号" type="index" width="100" />
                   <el-table-column min-width="150" align="center">
                     <template #header> <span class="hl-table_header">*</span>名称 </template>
@@ -339,12 +266,7 @@
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.subType`" :rules="subFormRules.subType" class="mb-0px!">
                         <el-select :disabled="detailDisabled" v-model="row.subType" placeholder="请选择子项类型">
-                          <el-option
-                            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MATERIAL_TYPE)"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                          />
+                          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MATERIAL_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
                         </el-select>
                       </el-form-item>
                     </template>
@@ -353,14 +275,7 @@
                     <template #header> <span class="hl-table_header">*</span>本次发货数量 </template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.amount`" :rules="subFormRules.amount" class="mb-0px!">
-                        <el-input-number
-                          :disabled="detailDisabled"
-                          v-model="row.amount"
-                          placeholder="请输入本次发货数量"
-                          style="width: 100%"
-                          :min="1"
-                          :precision="0"
-                        />
+                        <el-input-number :disabled="detailDisabled" v-model="row.amount" placeholder="请输入本次发货数量" style="width: 100%" :min="1" :precision="0" />
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -369,12 +284,7 @@
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.unit`" :rules="subFormRules.unit" class="mb-0px!">
                         <el-select :disabled="detailDisabled" v-model="row.unit" placeholder="请选择单位">
-                          <el-option
-                            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_MATERIAL_UNIT)"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                          />
+                          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_MATERIAL_UNIT)" :key="dict.value" :label="dict.label" :value="dict.value" />
                         </el-select>
                       </el-form-item>
                     </template>
@@ -388,13 +298,7 @@
                   </el-table-column>
                   <el-table-column label="操作" align="center" width="240">
                     <template #default="scope">
-                      <el-button
-                        v-if="'update,create,deliver'.indexOf(active) > -1"
-                        link
-                        type="danger"
-                        size="small"
-                        @click.prevent="onDeleteItem2(scope.$index)"
-                      >
+                      <el-button v-if="'update,create,deliver'.indexOf(active) > -1" link type="danger" size="small" @click.prevent="onDeleteItem2(scope.$index)">
                         删除
                       </el-button>
                     </template>
@@ -412,50 +316,23 @@
         </template>
         <el-row>
           <el-col v-if="active != 'detail'">
-            <el-upload
-              ref="attachmentUploadRef"
-              multiple
-              :limit="10"
-              :action="uploadUrl"
-              :headers="uploadHeaders"
-              name="files"
-              :show-file-list="false"
-              :auto-upload="false"
-              :data="uploadData"
-              :on-change="attachmentUploadChange"
-              class="upload-file-uploader"
-            >
-              <el-button type="primary"><Icon icon="ep:upload-filled" />上传</el-button>
+            <el-upload ref="attachmentUploadRef" multiple :limit="10" :action="uploadUrl" :headers="uploadHeaders" name="files" :show-file-list="false" :auto-upload="false" :data="uploadData" :on-change="attachmentUploadChange" class="upload-file-uploader">
+              <el-button type="primary">
+                <Icon icon="ep:upload-filled" />上传
+              </el-button>
             </el-upload>
           </el-col>
           <el-col>
             <el-card class="hl-incard">
               <el-table :data="formData.attachments" class="hl-table">
                 <el-table-column prop="name" label="文件名称" align="center" />
-                <el-table-column
-                  prop="createTime"
-                  align="center"
-                  label="上传时间"
-                  :formatter="dateFormatter"
-                />
+                <el-table-column prop="createTime" align="center" label="上传时间" :formatter="dateFormatter" />
                 <el-table-column label="操作" align="center">
                   <template #default="scope">
-                    <el-button
-                      v-if="'update,create,deliver'.indexOf(active) > -1"
-                      link
-                      type="danger"
-                      size="small"
-                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
-                    >
+                    <el-button v-if="'update,create,deliver'.indexOf(active) > -1" link type="danger" size="small" @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)">
                       删除
                     </el-button>
-                    <el-button
-                      v-if="!!scope.row.id"
-                      link
-                      type="primary"
-                      size="small"
-                      @click="downloadAttachment(scope.row.name, scope.row.url)"
-                    >
+                    <el-button v-if="!!scope.row.id" link type="primary" size="small" @click="downloadAttachment(scope.row.name, scope.row.url)">
                       下载
                     </el-button>
                   </template>
@@ -480,12 +357,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="userNickname" label="操作人" align="center" />
-                <el-table-column
-                  label="操作时间"
-                  align="center"
-                  prop="startTime"
-                  :formatter="dateFormatter"
-                />
+                <el-table-column label="操作时间" align="center" prop="startTime" :formatter="dateFormatter" />
               </el-table>
             </el-card>
           </el-col>
@@ -494,12 +366,9 @@
     </el-form>
     <div class="text-center hl-footer">
       <el-button @click="goback" size="large">取 消</el-button>
-      <el-button v-if="active != 'detail' && formData.deliverStatus == 1" @click="submitForm('SAVE')" type="success" :disabled="formLoading" size="large"
-        >保 存</el-button>
-      <el-button v-if="(((active != 'detail' && formData.id) || active == 'deliver') && formData.deliverStatus == 1)" @click="submitForm('DELIVER')" type="primary" :disabled="formLoading" size="large"
-        >发 货</el-button>
-      <el-button v-if="active == 'detail' && formData.deliverStatus == 2 && formData.id"  type="primary" @click="printHandle" :disabled="formLoading" size="large"
-      >打印发货单</el-button>
+      <el-button v-if="active != 'detail' && formData.deliverStatus == 1" @click="submitForm('SAVE')" type="success" :disabled="formLoading" size="large">保 存</el-button>
+      <el-button v-if="(((active != 'detail' && formData.id) || active == 'deliver') && formData.deliverStatus == 1)" @click="submitForm('DELIVER')" type="primary" :disabled="formLoading" size="large">发 货</el-button>
+      <el-button v-if="active == 'detail' && formData.deliverStatus == 2 && formData.id" type="primary" @click="printHandle" :disabled="formLoading" size="large">打印发货单</el-button>
     </div>
   </el-card>
   <ProjectOrderDialog ref="projectOrderDialog" @success="handleSelectedProjectOrder" />
@@ -511,23 +380,23 @@ import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 
 import type { UploadProps, UploadUserFile } from 'element-plus'
-import {getStrDictOptions, DICT_TYPE, getIntDictOptions, getDictLabel} from '@/utils/dict'
+import { getStrDictOptions, DICT_TYPE, getIntDictOptions, getDictLabel } from '@/utils/dict'
 import * as DeliverOrderApi from '@/api/heli/deliverorder'
-import {getOperateLogPage} from "@/api/system/operatelog";
-import {deleteFileLogic, downloadFile, getFilePage} from "@/api/infra/file";
-import {Search, Plus} from "@element-plus/icons-vue";
-import UserSelect from "@/views/heli/hlvuestyle/userSelect.vue";
-import {getAccessToken, getTenantId} from "@/utils/auth";
-import {dateFormatter} from "@/utils/formatTime";
-import download from "@/utils/download";
+import { getOperateLogPage } from '@/api/system/operatelog'
+import { deleteFileLogic, downloadFile, getFilePage } from '@/api/infra/file'
+import { Search, Plus } from '@element-plus/icons-vue'
+import UserSelect from '@/views/heli/hlvuestyle/userSelect.vue'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
 import { inject } from 'vue'
 import {
   getProjectOrder,
   getProjectOrderSubListByProjectOrderId,
   ProjectOrderVO
-} from "@/api/heli/projectorder";
-import {getCustomer} from "@/api/heli/customer";
-import ProjectOrderDialog from "@/views/heli/deliverorder/projectOrderDialog.vue";
+} from '@/api/heli/projectorder'
+import { getCustomer } from '@/api/heli/customer'
+import ProjectOrderDialog from '@/views/heli/deliverorder/projectOrderDialog.vue'
 import ShipmentsPrint from './shipmentsPrint.vue' // 引入打印弹框
 
 defineOptions({ name: 'DeliverOrderDetail' })
@@ -590,7 +459,7 @@ const formRules = reactive({
   deliverMode: [{ required: true, message: '发货方式不能为空', trigger: 'change' }],
   receivePersonMobile: [{ required: true, message: '收货人电话不能为空', trigger: 'blur' }],
   receivePersonName: [{ required: true, message: '收货人姓名不能为空', trigger: 'blur' }],
-  receiveAddress: [{ required: true, message: '收货详细地址不能为空', trigger: 'blur' }],
+  receiveAddress: [{ required: true, message: '收货详细地址不能为空', trigger: 'blur' }]
 })
 const subFormLoading = ref(false) // 子表单的加载中
 const subFormRules = reactive({
@@ -598,7 +467,7 @@ const subFormRules = reactive({
   subType: [{ required: true, message: '所属类型不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '名称，唯一不能为空', trigger: 'blur' }],
   amount: [{ required: true, message: '本次发货数量不能为空', trigger: 'blur' }],
-  unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
+  unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 /** 子表的表单 */
@@ -609,7 +478,7 @@ const submitForm = async (operate) => {
   formData.value.active = operate
   await formRef.value.validate()
   // 校验子表单
-  if(active.value != 'create'){
+  if (active.value != 'create') {
     await subFormRef.value.validate()
     await otherSubFormRef.value.validate()
   }
@@ -617,11 +486,11 @@ const submitForm = async (operate) => {
   formLoading.value = true
   try {
     // 设置类型
-    formData.value.deliverOrderSubs?.forEach(item => {
+    formData.value.deliverOrderSubs?.forEach((item) => {
       item.category = 'DELIVER_LIST'
       item.status = 1
     })
-    formData.value.deliverOrderOtherSubs?.forEach(item => {
+    formData.value.deliverOrderOtherSubs?.forEach((item) => {
       item.category = 'OTHER_LIST'
       item.status = 1
     })
@@ -629,16 +498,16 @@ const submitForm = async (operate) => {
     const orderId = await DeliverOrderApi.operateDeliverOrder(data)
     message.success(t('common.operationSuccess'))
     // 上传附件
-    if(attachmentUploadFiles.value.length > 0){
+    if (attachmentUploadFiles.value.length > 0) {
       uploadData.value.businessId = orderId
       attachmentUploadRef.value!.submit()
     }
 
     if (operate == 'SAVE') {
-      if(active.value != 'deliver'){
+      if (active.value != 'deliver') {
         active.value = 'update'
       }
-    }else if(operate == 'DELIVER'){
+    } else if (operate == 'DELIVER') {
       active.value = 'detail'
     }
     activeId.value = orderId
@@ -691,7 +560,7 @@ const onAddItem2 = () => {
   const row = {
     id: undefined,
     deliveryOrderId: undefined,
-    category: "OTHER_LIST",
+    category: 'OTHER_LIST',
     name: undefined,
     blueprintNo: undefined,
     amount: undefined,
@@ -700,10 +569,10 @@ const onAddItem2 = () => {
     size: undefined,
     subType: undefined,
     remark: undefined,
-    status: undefined,
+    status: undefined
   }
   row.deliveryOrderId = formData.value.id
-  if(!formData.value.deliverOrderOtherSubs) {
+  if (!formData.value.deliverOrderOtherSubs) {
     formData.value.deliverOrderOtherSubs = []
   }
   formData.value.deliverOrderOtherSubs.push(row)
@@ -748,7 +617,7 @@ const attachmentUploadChange = (file, files) => {
 
 /** 删除子项操作 */
 const onDeleteItem = (index) => {
-  if(formData.value.deliverOrderSubs.length == 1){
+  if (formData.value.deliverOrderSubs.length == 1) {
     message.warning('发货清单至少存在一条数据')
     return
   }
@@ -792,32 +661,34 @@ const queryData = async (type: string, id?: number) => {
       formData.value.deliverCompany = '杭州合立机械有限公司'
 
       // 性质
-      let properties = formData.value.property.split(",")
-      let property = "";
+      let properties = formData.value.property.split(',')
+      let property = ''
       for (let i = 0; i < properties.length; i++) {
-        property += getDictLabel(DICT_TYPE.HELI_PROJECT_PROPERTY, properties[i]) + ",";
+        property += getDictLabel(DICT_TYPE.HELI_PROJECT_PROPERTY, properties[i]) + ','
       }
-      formData.value.property = property.substring(0, property.length-1);
+      formData.value.property = property.substring(0, property.length - 1)
 
       // 子项列表
       const subArr = await DeliverOrderApi.getDeliverOrderSubListByDeliveryOrderId(id)
       // 如未保存过 即子项为空 从关联项目带出
-      if(!subArr || subArr.length == 0){
-        formData.value.deliverOrderSubs = [];
-        let saleOrderIdArr = formData.value.saleOrderIds.split(",");
+      if (!subArr || subArr.length == 0) {
+        formData.value.deliverOrderSubs = []
+        let saleOrderIdArr = formData.value.saleOrderIds.split(',')
         for (let i = 0; i < saleOrderIdArr.length; i++) {
-          formData.value.deliverOrderSubs = formData.value.deliverOrderSubs.concat(await getProjectOrderSubListByProjectOrderId(saleOrderIdArr[i]));
-          formData.value.deliverOrderSubs.forEach(sub => {
+          formData.value.deliverOrderSubs = formData.value.deliverOrderSubs.concat(
+            await getProjectOrderSubListByProjectOrderId(saleOrderIdArr[i])
+          )
+          formData.value.deliverOrderSubs.forEach((sub) => {
             sub.remark = ''
             sub.saleOrderSubId = sub.id
             sub.id = ''
             sub.saleOrderCode = sub.projectOrderCode
           })
         }
-      }else{
+      } else {
         // 分类发货清单与其他物料清单
-        formData.value.deliverOrderSubs = subArr.filter(sub => sub.category == 'DELIVER_LIST');
-        formData.value.deliverOrderOtherSubs = subArr.filter(sub => sub.category == 'OTHER_LIST');
+        formData.value.deliverOrderSubs = subArr.filter((sub) => sub.category == 'DELIVER_LIST')
+        formData.value.deliverOrderOtherSubs = subArr.filter((sub) => sub.category == 'OTHER_LIST')
       }
 
       // 操作日志
@@ -848,31 +719,31 @@ const queryData = async (type: string, id?: number) => {
 const initCustomerInfo = async () => {
   // 收货人信息
   const customer = await getCustomer(formData.value.customerId)
-  if(customer.contact1Name){
+  if (customer.contact1Name) {
     receivePersonOptions.value.push({
-      "name": customer.contact1Name,
-      "mobile": customer.contact1Method
+      name: customer.contact1Name,
+      mobile: customer.contact1Method
     })
     receivePersonAddressOptions.value.push({
-      "address": customer.contact1Addr
+      address: customer.contact1Addr
     })
   }
-  if(customer.contact2Name){
+  if (customer.contact2Name) {
     receivePersonOptions.value.push({
-      "name": customer.contact2Name,
-      "mobile": customer.contact2Method
+      name: customer.contact2Name,
+      mobile: customer.contact2Method
     })
     receivePersonAddressOptions.value.push({
-      "address": customer.contact2Addr
+      address: customer.contact2Addr
     })
   }
-  if(customer.contact3Name){
+  if (customer.contact3Name) {
     receivePersonOptions.value.push({
-      "name": customer.contact3Name,
-      "mobile": customer.contact3Method
+      name: customer.contact3Name,
+      mobile: customer.contact3Method
     })
     receivePersonAddressOptions.value.push({
-      "address": customer.contact3Addr
+      address: customer.contact3Addr
     })
   }
 }
@@ -883,27 +754,27 @@ const openProjectOrderDialog = () => {
 }
 
 const handleSelectedProjectOrder = (arr: ProjectOrderVO[]) => {
-  if(arr && arr.length > 0){
-    let saleOrderIds = "";
-    let saleOrderCode = "";
-    let contractNo = "";
-    let property = "";
-    let projectName = "";
+  if (arr && arr.length > 0) {
+    let saleOrderIds = ''
+    let saleOrderCode = ''
+    let contractNo = ''
+    let property = ''
+    let projectName = ''
     for (let i = 0; i < arr.length; i++) {
-      let order = arr[i];
-      saleOrderIds += order.id + ",";
-      saleOrderCode += order.code + ",";
-      contractNo += order.contractNo + ",";
-      property += getDictLabel(DICT_TYPE.HELI_PROJECT_PROPERTY, order.property) + ",";
-      projectName += order.projectName + ",";
+      let order = arr[i]
+      saleOrderIds += order.id + ','
+      saleOrderCode += order.code + ','
+      contractNo += order.contractNo + ','
+      property += getDictLabel(DICT_TYPE.HELI_PROJECT_PROPERTY, order.property) + ','
+      projectName += order.projectName + ','
     }
-    formData.value.saleOrderIds = saleOrderIds.substring(0, saleOrderIds.length-1);
-    formData.value.saleOrderCode = saleOrderCode.substring(0, saleOrderCode.length-1);
-    formData.value.contractNo = contractNo.substring(0, contractNo.length-1);
-    formData.value.property = property.substring(0, property.length-1);
-    formData.value.projectName = projectName.substring(0, projectName.length-1);
-    formData.value.customerId = arr[0].customerId;
-    formData.value.customerName = arr[0].customerName;
+    formData.value.saleOrderIds = saleOrderIds.substring(0, saleOrderIds.length - 1)
+    formData.value.saleOrderCode = saleOrderCode.substring(0, saleOrderCode.length - 1)
+    formData.value.contractNo = contractNo.substring(0, contractNo.length - 1)
+    formData.value.property = property.substring(0, property.length - 1)
+    formData.value.projectName = projectName.substring(0, projectName.length - 1)
+    formData.value.customerId = arr[0].customerId
+    formData.value.customerName = arr[0].customerName
   }
 }
 
@@ -913,8 +784,8 @@ const receivePersonOptions = ref([])
 const receivePersonAddressOptions = ref([])
 
 const receiveOnChange = (val) => {
-  let matchedPerson = receivePersonOptions.value.find(p => p.name == val);
-  if(matchedPerson){
+  let matchedPerson = receivePersonOptions.value.find((p) => p.name == val)
+  if (matchedPerson) {
     formData.value.receivePersonMobile = matchedPerson.mobile
   }
 }
@@ -922,17 +793,19 @@ const receiveOnChange = (val) => {
 //打印发货单
 const shipmentsPrintRef = ref() // 打印弹框
 
-const printHandle =()=> {
+const printHandle = () => {
   shipmentsPrintRef.value.open(formData.value.id)
 }
 
 const initDeliverData = async (projectOrderId) => {
-  let projectOrder = await getProjectOrder(projectOrderId);
+  let projectOrder = await getProjectOrder(projectOrderId)
   handleSelectedProjectOrder([projectOrder])
 
-  formData.value.deliverOrderSubs = [];
-  formData.value.deliverOrderSubs = formData.value.deliverOrderSubs.concat(await getProjectOrderSubListByProjectOrderId(projectOrderId));
-  formData.value.deliverOrderSubs.forEach(sub => {
+  formData.value.deliverOrderSubs = []
+  formData.value.deliverOrderSubs = formData.value.deliverOrderSubs.concat(
+    await getProjectOrderSubListByProjectOrderId(projectOrderId)
+  )
+  formData.value.deliverOrderSubs.forEach((sub) => {
     sub.remark = ''
     sub.saleOrderSubId = sub.id
     sub.id = ''
@@ -944,10 +817,10 @@ const initDeliverData = async (projectOrderId) => {
 
 const initData = async () => {
   resetForm()
-  if('detail' == active.value){
+  if ('detail' == active.value) {
     detailDisabled.value = true
   }
-  if('deliver' == active.value && query.projectOrderId){
+  if ('deliver' == active.value && query.projectOrderId) {
     await initDeliverData(query.projectOrderId)
   }
   await queryData(active.value, activeId.value)
@@ -957,7 +830,6 @@ const detailDisabled = ref(false)
 onMounted(() => {
   initData()
 })
-
 </script>
 <style>
 a {