Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/aftersales/aftersalesWorkOrder.vue

@@ -1468,7 +1468,7 @@ const ButtonPermissions = computed(() => {
         assignment: false, //工单指派
         applyArbitration: UserPermissions.value == '仓库客服', //客服介入
         DingTalkNumber: false, //钉钉号填写
-        batchFinish: UserPermissions.value != '仓库客服', //批量完结
+        batchFinish: false, //批量完结
         Batchdetermination: UserPermissions.value != '仓库客服', //批量确定
         appeal: false, //申诉
         ManagerConfirmed: false, //处理完毕下面的客服经理批量确定
@@ -1501,7 +1501,7 @@ const ButtonPermissions = computed(() => {
         batchReject: UserPermissions.value == '总部客服', //批量打回
         assignment: false, //工单指派
         applyArbitration: false, //客服介入
-        batchFinish: UserPermissions.value != '仓库客服', //批量完结
+        batchFinish: false, //批量完结
         appeal: false, //申诉
         Batchdetermination: false, //批量确定
         DingTalkNumber: false, //钉钉号填写
@@ -1601,7 +1601,7 @@ const ButtonPermissions = computed(() => {
         batchReject: false, //批量打回
         assignment: UserPermissions.value == '总部客服经理', //工单指派
         applyArbitration: false, //客服介入
-        batchFinish: false, //批量完结
+        batchFinish: UserPermissions.value != '仓库客服', //批量完结
         appeal: false, //申诉
         Batchdetermination: false, //批量确定
         ManagerConfirmed: UserPermissions.value == '总部客服经理', //处理完毕下面的客服经理批量确定

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -1520,6 +1520,7 @@ const CustomerServiceCompleted = () => {
       warehouseId: $route.query.warehouseId,
       workOrderNumber: $route.query.workOrderNumber,
       RouterState: 'Kfend',
+      workOrderStatus: $route.query.workOrderStatus, //当前单子状态
       CompletedEditing: 'true', //可以编辑完结信息编辑
       index: '1',
     },
@@ -1538,6 +1539,8 @@ const EditInformation = () => {
       workOrderNumber: $route.query.workOrderNumber,
       RouterState: 'Infoedit',
       ProcessType: $route.query.ProcessType, //类型 1 待处理 2 已处理
+      ProcessingresultsState:UserPermissions.value !='仓库客服'?true:false, //
+      workOrderStatus: $route.query.workOrderStatus, //当前单子状态
     },
   });
 };
@@ -1552,6 +1555,7 @@ const AppealEstablished = () => {
       warehouseId: $route.query.warehouseId,
       workOrderNumber: $route.query.workOrderNumber,
       RouterState: 'Kfend',
+      workOrderStatus: $route.query.workOrderStatus, //当前单子状态
       Appealeditor: 'appeal', //申诉编辑
       appealID: $route.query.appealID, //申诉ID
       AppealEstablished: 'true', //申诉成立

src/views/aftersales/aftersalesWorkOrdermodify.vue

@@ -505,7 +505,7 @@
       </el-tab-pane>
     </el-tabs>
 
-    <el-tabs type="border-card" class="demo-tabs" v-if="!Processingresults">
+    <el-tabs type="border-card" class="demo-tabs" v-if="CompensationParty.length">
       <el-tab-pane>
         <template #label>
           <span class="custom-tabs-label">
@@ -533,7 +533,7 @@
                 :placeholder="item.state == 0 ? '请填写赔款方' : '请填写受款方'"
                 :disabled="Processingresults"
               />
-               Processingresults表示此刻只能编辑处理结果 
+               ProcessingresultsState表示此刻只能编辑处理结果 
             </div> -->
 
             <div class="sk_input">
@@ -542,7 +542,7 @@
                   v-model="item.warehouseId"
                   filterable
                   placeholder="请选择仓库"
-                  :disabled="Processingresults"
+                  :disabled="ProcessingresultsState"
                 >
                   <el-option
                     v-for="item in warehouseData"
@@ -557,7 +557,7 @@
               <el-form-item label="原因">
                 <el-input
                   v-model="item.reason"
-                  :disabled="Processingresults"
+                  :disabled="ProcessingresultsState"
                   placeholder="请填写原因"
                 />
               </el-form-item>
@@ -569,7 +569,7 @@
                   :min="0"
                   v-model="item.num"
                   placeholder="金额"
-                  :disabled="Processingresults"
+                  :disabled="ProcessingresultsState"
                 />
               </el-form-item>
             </div>
@@ -582,7 +582,7 @@
                   placeholder="请填写责任人"
                   clearable
                   :rows="2"
-                  :disabled="Processingresults"
+                  :disabled="ProcessingresultsState"
                 />
               </el-form-item>
             </div>
@@ -617,7 +617,7 @@
     </el-tabs>
 
     <!-- 仲裁原因 -->
-    <div class="arbitrate" v-if="!Processingresults">
+    <div class="arbitrate" v-if="CompensationParty.length">
       <el-tabs type="border-card" class="demo-tabs">
         <el-tab-pane>
           <template #label>
@@ -632,7 +632,7 @@
             type="textarea"
             :autosize="{ minRows: 5, maxRows: 4 }"
             placeholder="请输入仲裁原因"
-            :disabled="Processingresults"
+            :disabled="ProcessingresultsState"
           />
         </el-tab-pane>
       </el-tabs>
@@ -668,17 +668,18 @@
 
     <div class="dialog-footer">
       <!-- <el-button @click="Indexdialog = false">取消</el-button> -->
-      <el-button type="primary" @click="ConfirmForm" v-if="RouterState == 'Infoedit'">
-        提交
+      <el-button type="primary" @click="ConfirmForm" v-if="RouterState == 'Infoedit' && UserPermissions=='仓库客服'">
+        提1交
       </el-button>
+
+
       <!--编辑提交-->
       <el-button
         type="primary"
         @click="Arbitrationcompleted"
-        v-if="
-          (RouterState == 'Kfend' && !Appealeditor) || Appealeditor == 'appeal' || Processingresults
-        "
+        v-if="(RouterState == 'Kfend' && !Appealeditor) || Appealeditor == 'appeal' || ProcessingresultsState"
       >
+      <!-- 申诉编辑  -->
         提交
       </el-button>
 
@@ -867,9 +868,10 @@ const dialogImgList = ref(false); //图片预览弹窗
 const CompletedEditing = ref(false); //完结编辑
 const amplifyurl = ref(''); //当前点击的图片
 const amplifysrcList = ref([]); //图片循环列表
-const Processingresults = ref(false); //理赔是否可以编辑
+const ProcessingresultsState = ref(false); //理赔是否可以编辑
 const ProcessedId = ref(null); //处理完毕里面编辑的iD
 const Copyprocessingresults = ref(); //处理结果拷贝
+const UserPermissions=ref('');//存储当前角色信息
 // ref 用于跟踪哪些字段被修改过
 // 当字段改变时标记它为已修改
 
@@ -878,26 +880,26 @@ const markFieldAsModified = fieldName => {
   modifiedFields.value.add(fieldName);
 };
 const CompensationParty = ref([
-  {
-    name: '',
-    state: 0,
-    num: null,
-    reason: '',
-    cld: 1,
-    explains: '',
-    warehouseId: '',
-    personResponsibleList: '',
-  }, //赔款方
-  {
-    name: '',
-    state: 1,
-    num: null,
-    reason: '',
-    cld: 1,
-    explains: '',
-    warehouseId: '',
-    personResponsibleList: '',
-  }, //受款方
+  // {
+  //   name: '',
+  //   state: 0,
+  //   num: null,
+  //   reason: '',
+  //   cld: 1,
+  //   explains: '',
+  //   warehouseId: '',
+  //   personResponsibleList: '',
+  // }, //赔款方
+  // {
+  //   name: '',
+  //   state: 1,
+  //   num: null,
+  //   reason: '',
+  //   cld: 1,
+  //   explains: '',
+  //   warehouseId: '',
+  //   personResponsibleList: '',
+  // }, //受款方
 ]); //收/赔
 const PackageInfo = ref([
   //包件信息
@@ -1061,11 +1063,12 @@ const onLoad = () => {
     CompletedEditing.value = false;
   }
   // 判断是否为理赔金未出编辑
-  if ($route.query.Processingresults) {
+  if ($route.query.ProcessingresultsState == true && UserPermissions.value !='仓库客服' ) {
     console.log($route.query.Processingresults, '理赔金未出编辑');
-    Processingresults.value = true;
+    ProcessingresultsState.value = false;
+   
   } else{
-    Processingresults.value = false;
+    ProcessingresultsState.value = true;
   }
   console.log(RouterState.value, '路由状态');
   getDictionaryBiz('result_handling').then(res => {
@@ -1087,7 +1090,22 @@ const onLoad = () => {
   updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节
   handle(); //处理方和责任方信息
 
+ 
+    getDictionaryBiz('after_sales_visits').then(res=>{
+      const matchingItem = res.data.data.find(
+      item => item.dictValue == JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name
+    );
+    UserPermissions.value =  matchingItem.dictValue
+    console.log(UserPermissions.value,'当前角色信息');
+    })
+
   $_getInfo({ id: $route.query.id }).then(res => {
+
+
+
+
+
+
     groundlineType.value = res.data.data.discoveryNode; //发现节点回显
     oldData.value = JSON.parse(JSON.stringify(res.data.data));
     console.log(oldData.value, '旧数据');
@@ -1527,7 +1545,7 @@ const PaymentConfirmation = val => {
 
 // 添加赔款方
 const AddCompensation = () => {
-  if (Processingresults.value) {
+  if (ProcessingresultsState.value) {
     // 表示此刻为理赔编辑状态，只能操作处理结果
     return;
   }
@@ -1542,7 +1560,7 @@ const AddCompensation = () => {
 };
 // 添加受款方
 const AddPayee = () => {
-  if (Processingresults.value) {
+  if (ProcessingresultsState.value) {
     // 表示此刻为理赔编辑状态，只能操作处理结果
     return;
   }
@@ -1579,7 +1597,7 @@ const amountMoney = () => {
 };
 // 移除按钮
 const payremove = (state, val, data) => {
-  if (Processingresults.value) {
+  if (ProcessingresultsState.value) {
     // 表示此刻为理赔编辑状态，只能操作处理结果
     return;
   }
@@ -2041,13 +2059,14 @@ const Arbitrationcompleted = () => {
       .catch(res => {
         editloading.value = false; //关闭加载效果
       });
+      console.log('申诉下面编辑完结信息');
     return;
   }
 
   console.log(Copyprocessingresults.value, '初始化处理结果参数');
   console.log(ProcessingList.value, '最新的处理结果参数');
 
-  if (Processingresults.value) {
+  if (ProcessingresultsState.value) {
     // 理赔金额未出编辑
     // 处理结果编辑
     let data = {
@@ -2062,8 +2081,8 @@ const Arbitrationcompleted = () => {
         // ProcessedId.value
       },
     };
-
     // 查找被删除的
+    if( Copyprocessingresults.value){
       let missingObjects = Copyprocessingresults.value.filter(objA => {
       let matchingObjects = ProcessingList.value.filter(
         objB => objB.state === objA.state && objB.id === objA.id
@@ -2074,6 +2093,9 @@ const Arbitrationcompleted = () => {
       console.log(missingObjects);
       data.aftersalesProcessingResultsDTO['assignList'] = missingObjects.map(item => item.id);
     }
+    }
+
+
 
     data.aftersalesProcessingResultsDTO['processingMoneyEntityList'] = ProcessingList.value
       .map(item => {
@@ -2142,6 +2164,7 @@ const Arbitrationcompleted = () => {
           type: 'success',
         });
       });
+    console.log('理赔金额未出编辑');
     return;
   }
 
@@ -2215,6 +2238,7 @@ const Arbitrationcompleted = () => {
       .catch(res => {
         editloading.value = false; //关闭加载效果
       });
+      console.log('申诉完结信息编辑');
     return;
     // 下面不执行
   }

src/views/distribution/inventory/distrilbutionBillLadingView.vue

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