diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 803be0a7..ea295edc 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -186,7 +186,7 @@
                         >
                         <!-- 处理结果确定和完结确定 -->
                         <el-button
-                          v-if="TabPermissions == '2'"
+                          v-if="TabPermissions == '2' && slotProps.scope.row.workOrderStatus !='30'"
                           @click="DetermineStorage(slotProps.scope)"
                           >确定</el-button
                         >
@@ -2492,7 +2492,9 @@ const DetermineStorage = val => {
   let ID = {};
   ID = val.row.id;
   data['assignList'].push(ID);
+  details.loadingObj.list=true;//开启加载效果
   if (TabPermissions.value == '6') {
+
     $_updateManagerConfirmed(data).then(res => {
       if (res.data.code == 200) {
         ElMessage({
@@ -2501,6 +2503,9 @@ const DetermineStorage = val => {
         });
       }
       console.log(res, '完结确定');
+      tabChenge(TabPermissions.value)
+    }).catch(res=>{
+      details.loadingObj.list=false;//关闭加载效果
     });
     // 赔款方
     console.log(data, '处理好的值');
@@ -2515,6 +2520,9 @@ const DetermineStorage = val => {
           type: 'success',
         });
       }
+      tabChenge(TabPermissions.value)
+    }).catch(res=>{
+      details.loadingObj.list=false;//关闭加载效果
     });
   }
 };
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 8f720681..3c617f85 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -1161,8 +1161,10 @@ const ConfirmForm = () => {
             brandName: item.brandName ? item.brandName : null, //品牌
           });
         });
-        // 运单号拼接
-        DataSubmit.waybillNumber = PackageInfo.value.map(item => item.waybillNumber).join(',');
+        DataSubmit.packageCode = [...new Set(PackageInfo.value.map(item => item.packageCode))].join(','); //包条码
+        DataSubmit.waybillNumber = [...new Set(PackageInfo.value.map(item => item.waybillNumber))].join(','); //运单号
+        DataSubmit.brandName = [...new Set(PackageInfo.value.map(item => item.brandName))].join(','); //品牌
+        DataSubmit.orderCode = [...new Set(PackageInfo.value.map(item => item.orderCode))].join(','); //包件信息订单自编码
       }
 
       // DataSubmit['packageEntityList'].push({
@@ -1174,7 +1176,7 @@ const ConfirmForm = () => {
       //   waybillNumber: PackageInfo.value.map(item => item.waybillNumber).join(','), //运单号
       //   orderCode: PackageInfo.value.map(item => item.orderCode).join(','), //订单自编码
       // });
-      DataSubmit.orderCode = [...new Set(PackageInfo.value.map(item => item.orderCode))].join(','); //包件信息订单自编码
+  
       // 总件数
       Indexform.value.number = PackageInfo.value.length;
       console.log(DataSubmit['packageEntityList'], '包件信息');
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index 41d121f1..6525190f 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -60,7 +60,7 @@
           </el-form-item>
 
           <el-form-item label="车次号" class="el_lab">
-            <el-input v-model="endFrom.trainNumber" disabled placeholder="请输入车次号" />
+            <el-input v-model="endFrom.trainNumber" disabled placeholder="暂无车次号" />
           </el-form-item>
 
           <el-form-item label="运损时间" class="el_lab">
@@ -122,7 +122,7 @@
             <el-input
               disabled
               v-model="endFrom.investigationProcess"
-              placeholder="请输入调查经过"
+              placeholder="暂无调查经过"
               clearable
               :rows="2"
               type="textarea"
@@ -716,6 +716,7 @@
               <div class="inputMax" v-loading="Msgloadinga" element-loading-text="Loading...">
                 <div class="inputfell">
                   <div class="inputbtn">
+                    <div class="inputleft"> 
                     <el-upload
                       ref="uploadRef"
                       class="upload-demo"
@@ -724,7 +725,7 @@
                       :on-success="fellSuccess"
                     >
                       <template #trigger>
-                        <el-button type="primary">上传附件</el-button>
+                        <el-button type="primary" class="el-fil">上传附件</el-button>
                         <div class="felltis" v-if="KFfeel.length">上传成功</div>
                       </template>
                     </el-upload>
@@ -747,19 +748,22 @@
                       />
                     </el-select>
                   </div>
+                    <el-button type="primary" class="el_next" @click="NextRecord()"> 下一条 </el-button>
+                  </div>
 
                   <el-input
                     v-model="Msgtextarea"
-                    :rows="4"
+                    :rows="5"
                     type="textarea"
                     placeholder="回复内容"
                     @input="appoint(Msgtextarea)"
                   />
-                </div>
-                <div class="msgHf">
+                  <div class="msgHf">
                   <el-button type="primary" @click="replyMessage()"> 回复 </el-button>
-                  <el-button type="primary" @click="NextRecord()"> 下一条 </el-button>
+                 
+                </div>
                 </div>
+             
               </div>
             </div>
 
@@ -896,7 +900,7 @@ const dialogImgList = ref(false); //图片预览弹窗
 const amplifyurl = ref(''); //当前点击的图片
 const amplifysrcList = ref([]); //图片循环列表
 const Replycopy = ref([]); //拷贝一份回复方
-
+const Mydata=ref();//当前登录人信息
 const PackageInfo = ref([
   //包件信息
   { packageCode: '', orderCode: '', waybillNumber: '' },
@@ -1063,6 +1067,7 @@ const TransportChange = val => {
 
 // 页面初始化数据
 const onLoad = () => {
+  Mydata.value=JSON.parse(localStorage.getItem('my_data'));//记录本地登录     
   // 获取角色权限
   getDictionaryBiz('after_sales_visits').then(res => {
     console.log(res, '角色字典');
@@ -1970,11 +1975,28 @@ const submit = () => {
 };
 // 消息回复
 const replyMessage = () => {
+
+  if(!Msgtextarea.value){
+    ElMessage({
+    message: '请输入回复内容',
+    type: 'warning',
+  })
+  return
+  }
+// if (endFrom.value.processor.includes()) {
+//   console.log(true);
+// } else {
+//   console.log(false);
+// }
+
+
   console.log(MessageContent.value, '当前的聊天记录');
   console.log(warehouseData.value, '参数1212312312312312');
   console.log(MessageResponsibility, '责任方');
   console.log(MessageResponsibility.value,'当前处理方信息');
   console.log(separateMessageResponsibility.value);
+ 
+
   if(!MessageResponsibility.value.length && !separateMessageResponsibility.value.length){
     ElMessage({
     message: '请选择至少一个处理方',
@@ -2501,6 +2523,9 @@ const CustomerServiceCompleted = () => {
   display: flex;
   align-items: flex-end;
   justify-content: space-between;
+  position: absolute;
+    right: 0;
+    bottom: 0;
   :deep(.el-button) {
     margin-left: 20px;
   }
@@ -2569,6 +2594,24 @@ const CustomerServiceCompleted = () => {
         justify-content: space-between;
         align-items: center;
       }
+      .inputleft{
+        display:flex;
+        :deep(.el-fil){
+          background-color: #afbdc3;
+          border: none;
+        }
+      }
+      :deep(.el_next){
+        background-color: #afbdc3;
+          border: none;
+      }
+      :deep(.el_next:hover){
+        background-color: #409eff;
+      }
+
+    }
+    :deep(.el-textarea){
+      margin-top: 6px;
     }
   }
 }