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

src/views/aftersales/aftersalesWorkOrder.vue

@@ -89,35 +89,40 @@
                   > -->
 
                   <!-- v-if="ButtonPermissions.batchReject" -->
+                  <!-- v-if="PermissionButton.batch_return" -->
                   <el-button
-                    v-if="PermissionButton.batch_return"
+                  
                     type="primary"
                     @click="BatchReturn"
                     >批量打回</el-button
                   >
                   <!-- v-if="ButtonPermissions.assignment" -->
-                  <el-button v-if="PermissionButton.assign" type="primary" @click="assign"
+                  <!-- v-if="PermissionButton.assign" -->
+                  <el-button type="primary" @click="assign"
                     >工单指派</el-button
                   >
 
                   <!-- v-if="ButtonPermissions.applyArbitration" -->
+                  <!-- v-if="PermissionButton.apply_arbitration" -->
                   <el-button
-                    v-if="PermissionButton.apply_arbitration"
+                   
                     type="primary"
                     @click="arbitrate"
                     >申请仲裁</el-button
                   >
 
                   <!-- v-if="ButtonPermissions.batchFinish" -->
+                  <!-- v-if="PermissionButton.batch_completion" -->
                   <el-button
-                    v-if="PermissionButton.batch_completion"
+                    
                     type="primary"
                     @click="Batchcompletion"
                     >批量完结</el-button
                   >
 
                   <!-- v-if="ButtonPermissions.appeal" -->
-                  <el-button v-if="PermissionButton.representations" type="primary" @click="appeal"
+                  <!-- v-if="PermissionButton.representations" -->
+                  <el-button  type="primary" @click="appeal"
                     >申诉</el-button
                   >
                   <!-- v-if="details.query.workOrderStatus == 30" -->
@@ -513,10 +518,10 @@ console.log(accessControl, '权限按钮');
 // repulse;//打回
 // arbitration_completed;//仲裁完结
 // information_editing;//信息编辑
-console.log(accessControl.add, '新增按钮权限');
+console.log(accessControl.workAdd, '新增按钮权限');
 const PermissionButton = computed(() => {
   return {
-    workAdd: accessControl.add, //新增
+    workAdd: accessControl.workAdd, //新增
     batch_return: accessControl.batch_return, //批量打回
     assign: accessControl.assign, //工单指派
     apply_arbitration: accessControl.apply_arbitration, //申请仲裁

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -7,7 +7,45 @@
     <!-- <el-divider content-position="left">
       <span> {{ routerState ? '信息查看' : '工单新增' }}</span>
     </el-divider> -->
-    <el-tabs type="border-card" class="PackageInformation" v-show="identifying != '2'">
+
+    <el-form :model="Indexform" label-width="100px" class="IndexFrom" ref="IndexForm">
+      <el-form-item label="异常类型">
+        <el-select
+          v-model="Indexform.workOrderType"
+          clearable
+          placeholder="选择工单异常类型"
+          @change="abnormalChange"
+        >
+          <el-option
+            v-for="item in IndexException"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="发现节点">
+        <el-select
+          v-model="Indexform.discoveryNode"
+          clearable
+          placeholder="选择发现节点"
+          @change="DiscoveringNodesChange"
+        >
+          <el-option
+            v-for="item in DiscoveringNodes"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="异常工单号">
+        <el-input v-model="Indexform.workOrderNumber" disabled placeholder="异常工单号(自动生成)" clearable />
+      </el-form-item>
+
+      <el-tabs type="border-card" class="PackageInformation" v-show="identifying != '2'">
       <el-tab-pane label="包件信息">
         <div class="ResponsibilityBoxS">
           <div><el-button type="primary" @click="AddPackage"> 添加信息 </el-button></div>
@@ -53,42 +91,7 @@
         </div>
       </el-tab-pane>
     </el-tabs>
-    <el-form :model="Indexform" label-width="100px" class="IndexFrom" ref="IndexForm">
-      <el-form-item label="异常类型">
-        <el-select
-          v-model="Indexform.workOrderType"
-          clearable
-          placeholder="选择工单异常类型"
-          @change="abnormalChange"
-        >
-          <el-option
-            v-for="item in IndexException"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="发现节点">
-        <el-select
-          v-model="Indexform.discoveryNode"
-          clearable
-          placeholder="选择发现节点"
-          @change="DiscoveringNodesChange"
-        >
-          <el-option
-            v-for="item in DiscoveringNodes"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
 
-      <el-form-item label="异常工单号">
-        <el-input v-model="Indexform.workOrderNumber" disabled placeholder="异常工单号" clearable />
-      </el-form-item>
       <!-- 必填(提货环节可以不填写运单号) -->
       <!-- <el-form-item label="运单号" v-if="groundlineType != 1">
       <el-input v-model="Indexform.waybillNumber" placeholder="请输入运单号" clearable />
@@ -1428,7 +1431,10 @@ const ViewPackageDetails = val => {
 }
 :deep(.PackageInformation) {
   margin-bottom: 10px;
-  border-top: none;
+  width: 97%;
+  border-left: none;
+  .el-tabs__header{
+  }
 }
 .NumTotal {
   width: 30%;

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -445,12 +445,18 @@
       </el-dialog>
     </div>
     <div class="foot_btn">
-      <el-button type="primary" v-if="PermissionButton.reply"   @click="addireply">回复</el-button>
+      <!-- v-if="PermissionButton.reply"
-      <el-button type="primary" v-if="PermissionButton.processing_completed" @click="addingRecord">处理结果</el-button>
+      v-if="PermissionButton.processing_completed"
-      <el-button type="primary" v-if="PermissionButton.work_order_completion" @click="EndJump">完结 </el-button>
+      v-if="PermissionButton.work_order_completion"
-      <el-button type="primary" v-if="PermissionButton.repulse" @click="BatchReturn">打回 </el-button>
+      v-if="PermissionButton.repulse"
-      <el-button type="primary" v-if="PermissionButton.arbitration_completed" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
+      v-if="PermissionButton.arbitration_completed"
-      <el-button type="primary" v-if="PermissionButton.information_editing" @click="EditInformation">信息编辑</el-button>
+      v-if="PermissionButton.information_editing" -->
+      <el-button type="primary"  @click="addireply">回复</el-button>
+      <el-button type="primary"  @click="addingRecord">处理结果</el-button>
+      <el-button type="primary"  @click="EndJump">完结 </el-button>
+      <el-button type="primary"  @click="BatchReturn">打回 </el-button>
+      <el-button type="primary"  @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
+      <el-button type="primary"  @click="EditInformation">信息编辑</el-button>
     </div>
   </el-card>
   <!-- 批量打回弹窗 -->

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -74,7 +74,7 @@
             />
           </el-form-item>
 
-          <el-form-item label="发货时间" class="el_lab" >
+          <el-form-item label="发货时间" class="el_lab">
             <el-date-picker
               v-model="endFrom.warehousingTime"
               type="datetime"
@@ -559,6 +559,27 @@
               <el-tab-pane label="处理记录">
                 <div class="ovhe" :style="{ height: msgHight + 'px' }" ref="scrollContainer">
                   <el-timeline>
+                    <div class="el_Processingparty">
+                      <span>回复</span>
+                      <el-select
+                        v-model="MessageResponsibility"
+                        multiple
+                        filterable
+                        default-first-option
+                        :reserve-keyword="false"
+                        placeholder="请选择处理方"
+                        @change="Msgresponsibility"
+                      >
+                        <el-option
+                          v-for="item in warehouseData"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                          :disabled="item.disabled"
+                        />
+                      </el-select>
+                    </div>
+
                     <el-timeline-item
                       placement="top"
                       v-for="(item, index) in MessageContent"
@@ -662,6 +683,7 @@
                     :rows="4"
                     type="textarea"
                     placeholder="回复内容"
+                    @input="appoint(Msgtextarea)"
                   />
                 </div>
                 <div class="msgHf">
@@ -1005,6 +1027,7 @@ const onLoad = () => {
         if (item.typesOf == 2) {
           // 处理方
           endFrom.value.processor.push(item.businessId);
+          // MessageResponsibility.value.push(item.businessId)
         }
       });
       console.log(endFrom.value.processor, ' endFrom.value.processor');
@@ -1485,6 +1508,12 @@ const ChangePackageInfo = (val, index) => {
     console.log(PackageInfo.value, '处理好的参数');
   });
 };
+// 回复消息@事件
+const appoint = val => {
+  if (val == '@') {
+    console.log('触发了指定选择');
+  }
+};
 // 新视频预览
 const AddVideoPreview = val => {
   VideoPreviewStatus.value = true; //开启视频查看弹窗
@@ -1980,7 +2009,7 @@ const ViewPackageDetails = val => {
   }
 
   .el_pkLi {
-    width: 100%;
+    width: 90%;
     display: flex;
     justify-content: space-between;
   }
@@ -1989,6 +2018,7 @@ const ViewPackageDetails = val => {
   display: flex;
   align-items: center;
   margin-top: 20px;
+  justify-content: space-between;
   .title {
     width: 126px;
     height: 100%;
@@ -2302,4 +2332,16 @@ const ViewPackageDetails = val => {
   align-items: center;
   justify-content: center;
 }
+.el_Processingparty {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  span {
+    width: 40px;
+  }
+  :deep(.el-select) {
+    width: 100%;
+  }
+}
 </style>

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -1913,7 +1913,7 @@ const ViewEvent = val => {
       current: 1,
       size: 100,
       deliveryId: RouteId.value,
-      orderId: val.id,
+      id: val.id,
     }).then(res => {
       console.log(res, '订单包件信息');
       if (res.data.code == 200) {
@@ -1938,7 +1938,7 @@ const ViewEvent = val => {
     });
   } else {
     $_getPackageListByStockArticleId({
-      orderId: val.id,
+      id: val.id,
       current: 1,
       size: 100,
     }).then(res => {