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

src/views/aftersales/aftersalesWorkOrder.vue

@@ -15,7 +15,7 @@
                 </el-option>
              </el-select>
 
-         
+
           </el-form-item>
           <el-form-item label="发现节点:">
 <!--            <el-input v-model="query.discoveryNode" placeholder="请输入发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）"></el-input>-->
@@ -82,9 +82,15 @@
           <!-- 操作栏模块 -->
           <el-table-column prop="menu" label="操作" :width="220" align="center">
             <template #default="{row}">
-              <el-button v-if="this.permissionList.viewBtn" type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
+              <!--<el-button v-if="this.permissionList.viewBtn" type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
               <el-button v-if="this.permissionList.editBtn" type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-              <el-button v-if="this.permissionList.delBtn" type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
+              <el-button v-if="this.permissionList.editBtn" type="primary" text icon="el-icon-edit" @click="handleReply(row)">回复</el-button>
+              <el-button v-if="this.permissionList.delBtn" type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
+
+              <el-button  type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
+              <el-button  type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+              <el-button  type="primary" text icon="el-icon-edit" @click="handleReply(row)">回复</el-button>
+              <el-button  type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -158,7 +164,7 @@
              <el-date-picker
              v-model="form.deliverGoodsTime"
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss" 
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               placeholder="选择日期时间">
             </el-date-picker>
@@ -168,7 +174,7 @@
             <el-date-picker
             v-model="form.discoveryTime"
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss" 
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               placeholder="选择日期时间">
             </el-date-picker>
@@ -178,7 +184,7 @@
             <el-date-picker
             v-model="form.warehousingTime"
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss" 
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               placeholder="选择日期时间">
             </el-date-picker>
@@ -216,7 +222,7 @@
             <el-date-picker
             v-model="form.deliveryTime"
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss" 
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               placeholder="选择日期时间">
             </el-date-picker>
@@ -273,6 +279,7 @@
 
 <script>
 import { getList, getDetail, add, update, remove,getProcessor } from "@/api/aftersales/aftersalesWorkOrder";
+import { getList as  getExchangeList } from "@/api/aftersales/aftersalesExchange";
 import option from "@/option/aftersales/aftersalesWorkOrder";
 import { getDetailWarehouse,getDeptWarehouse } from "@/api/basicdata/basicdataWarehouse";
 import { mapGetters } from "vuex";
@@ -371,6 +378,11 @@ export default {
 
       });
       },
+    //查询当前工单回复数据
+    handleReply(){
+
+
+    },
     searchHide() {
       this.search = !this.search;
     },
@@ -391,14 +403,14 @@ export default {
             conditions: 1,
             typesOf:2
           }
-         processorEntityList.push(row);   
+         processorEntityList.push(row);
          let row1= { //责任方
             businessName: this.warehouseData.find(q=> q.id === this.duty).name ,
             businessId: this.duty ,
             conditions: 1,
             typesOf:1
           }
-          processorEntityList.push(row1);  
+          processorEntityList.push(row1);
 
         console.log("数据????>>",processorEntityList);
         this.form.processorEntityList = processorEntityList;
@@ -430,7 +442,7 @@ export default {
     },
     //查询处理方数据
     handleProcessor() {
-      
+
       const {
         workOrderType,
         discoveryNode,