自提修改

src/views/aftersales/aftersalesWorkOrdermodify.vue

@@ -668,16 +668,16 @@
 
     <div class="dialog-footer">
       <!-- <el-button @click="Indexdialog = false">取消</el-button> -->
-      <el-button type="primary" @click="ConfirmForm" v-if="RouterState == 'Infoedit' && !UserPermissions=='仓库客服'">
+      <el-button type="primary" @click="ConfirmForm" v-if="RouterState == 'Infoedit' && UserPermissions=='仓库客服'">
-        提交
+        提1交
       </el-button>
+
+
       <!--编辑提交-->
       <el-button
         type="primary"
         @click="Arbitrationcompleted"
-        v-if="
+        v-if="(RouterState == 'Kfend' && !Appealeditor) || Appealeditor == 'appeal' || ProcessingresultsState"
-          (RouterState == 'Kfend' && !Appealeditor) || Appealeditor == 'appeal' || ProcessingresultsState
-        "
       >
       <!-- 申诉编辑  -->
         提交
@@ -1063,7 +1063,7 @@ const onLoad = () => {
     CompletedEditing.value = false;
   }
   // 判断是否为理赔金未出编辑
-  if ($route.query.Processingresults == true && UserPermissions.value !='仓库客服' ) {
+  if ($route.query.ProcessingresultsState == true && UserPermissions.value !='仓库客服' ) {
     console.log($route.query.Processingresults, '理赔金未出编辑');
     ProcessingresultsState.value = false;
    
@@ -1545,7 +1545,7 @@ const PaymentConfirmation = val => {
 
 // 添加赔款方
 const AddCompensation = () => {
-  if (Processingresults.value) {
+  if (ProcessingresultsState.value) {
     // 表示此刻为理赔编辑状态，只能操作处理结果
     return;
   }
@@ -1560,7 +1560,7 @@ const AddCompensation = () => {
 };
 // 添加受款方
 const AddPayee = () => {
-  if (Processingresults.value) {
+  if (ProcessingresultsState.value) {
     // 表示此刻为理赔编辑状态，只能操作处理结果
     return;
   }
@@ -1597,7 +1597,7 @@ const amountMoney = () => {
 };
 // 移除按钮
 const payremove = (state, val, data) => {
-  if (Processingresults.value) {
+  if (ProcessingresultsState.value) {
     // 表示此刻为理赔编辑状态，只能操作处理结果
     return;
   }
@@ -2066,7 +2066,7 @@ const Arbitrationcompleted = () => {
   console.log(Copyprocessingresults.value, '初始化处理结果参数');
   console.log(ProcessingList.value, '最新的处理结果参数');
 
-  if (ProcessingresultsState.value && $route.query.workOrderStatus !='10') {
+  if (ProcessingresultsState.value) {
     // 理赔金额未出编辑
     // 处理结果编辑
     let data = {
@@ -2081,9 +2081,9 @@ const Arbitrationcompleted = () => {
         // ProcessedId.value
       },
     };
-
     // 查找被删除的
-    let missingObjects = Copyprocessingresults.value.filter(objA => {
+    if( Copyprocessingresults.value){
+      let missingObjects = Copyprocessingresults.value.filter(objA => {
       let matchingObjects = ProcessingList.value.filter(
         objB => objB.state === objA.state && objB.id === objA.id
       );
@@ -2093,6 +2093,9 @@ const Arbitrationcompleted = () => {
       console.log(missingObjects);
       data.aftersalesProcessingResultsDTO['assignList'] = missingObjects.map(item => item.id);
     }
+    }
+
+
 
     data.aftersalesProcessingResultsDTO['processingMoneyEntityList'] = ProcessingList.value
       .map(item => {

src/views/distribution/inventory/distrilbutionBillLadingView.vue

@@ -217,7 +217,7 @@ export default {
             values: '',
             width: '150',
             checkarr: [],
-            fixed: true,  
+            fixed: true,
             sortable: true,
             head: false,
           },
@@ -226,7 +226,7 @@ export default {
           //   label: '客户车次号',
           //   type: 2,
           //   values: '',
-          //   width: '150'
+          //   width: '150',
           //   checkarr: [],
           //   fixed: true,
           //   sortable: true,
@@ -479,7 +479,7 @@ export default {
           {
             prop: 'pickupStatusName', //需要新增字段
             label: '提货状态',
-            type: 2,
+            type: 1,
             values: '',
             width: '150',
             checkarr: [],