取消配送提示

src/views/aftersales/aftersalesWorkOrder.vue

@@ -727,12 +727,18 @@
                   @btnCheck="btnsc"
                   @selectCheck="selectsc"
                   @selection="selectionChange"
+                  :tableRowClassName="
+                  (row, index) => {
+                    if (row.conditions != null && row.conditions == '1') return 'Abnormal';
+                    else return '';
+                  }
+                "
                 >
                   <template #default="slotProps">
                     <template v-if="slotProps.scope.column.label === '操作'">
                       <div class="ElBtnClass">
                         <el-button @click="Unbindassignment(slotProps.scope)">解绑</el-button>
-                        <el-button @click="setAsdefault(slotProps.scope)">设为默认</el-button>
+                        <el-button v-if="slotProps.scope.row.conditions != '1'" @click="setAsdefault(slotProps.scope)">设为默认</el-button>
                       </div>
                     </template>
                   </template>

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -719,9 +719,9 @@
               <div class="ovhe" :style="{ height: msgHight + 'px' }" ref="scrollContainer">
                 <el-timeline>
                   <el-timeline-item
-                  timestamp="2018/4/12" placement="top"
                     v-for="(item, index) in MessageContent"
                     :key="index"
+                    :timestamp="item.time" placement="top"
                   >
                     <el-card
                       :class="{

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -612,6 +612,7 @@
           <el-tabs type="border-card">
             <div class="content">
               <el-tab-pane label="调查记录">
+                <div class="el_header-top"> 
                 <div class="el_Processingparty">
                   <span>回复</span>
                   <el-select
@@ -632,6 +633,11 @@
                     />
                   </el-select>
                 </div>
+
+                <div class="el_Refresh" @click="Chatrefresh">
+                  <el-button type="primary">刷新</el-button>
+                </div>
+              </div>
                 <div class="ovhe" :style="{ height: msgHight + 'px' }" ref="scrollContainer">
                   <el-timeline>
                     
@@ -1792,6 +1798,10 @@ const Msgresponsibility = val => {
   MessageResponsibility.value = val;
   console.log(MessageResponsibility.value, '已经选择的责任方');
 };
+// 聊天刷新
+const Chatrefresh=()=>{
+  Chathistory()
+}
 // 获取当前责任方的责任人
 const ResponsiblePartychange = (val, index) => {
   console.log(val, '选择的责任方');
@@ -2907,7 +2917,6 @@ const CustomerServiceCompleted = () => {
   align-items: center;
   justify-content: center;
   font-size: 12px;
-  margin-bottom: 8px;
   box-shadow: -1px 2px 2px 0px #f5f5f5;
   padding: 0 4px;
   box-sizing: border-box;
@@ -2956,4 +2965,9 @@ const CustomerServiceCompleted = () => {
   background-color: #d3832a;
   border: none;
 }
+.el_header-top{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
 </style>

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -974,8 +974,16 @@ export default {
       this.loading = true;///开启加载效果
       $_cancelDelivery(data).then(res=>{
         console.log(res,'取消带配送');
+        if(res.data.code == 200){
+          ElMessage({
+          message: res.data.msg,
+          type: 'success',
+        })
         this.onLoad(this.page);
-        this.loading = false;///取消配送
+        }
+    
+        // this.loading = false;///取消配送
+
       })
     })
     .catch(() => {

vite.config.js

@@ -23,13 +23,13 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          // target: 'http://192.168.10.25:13000',
+          target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.25:2888', 
           // target: 'http://192.168.6.169:9777',//CYZ  
           // target: 'http://192.168.10.57:13000',
           // target: 'http://192.168.10.200:13000',
           // target: 'http://192.168.10.29:13000',
-          target: 'http://192.168.10.210:13000',//？ 
+          // target: 'http://192.168.10.210:13000',//？ 
           // target: 'http://h5uapi.huitongys.com',
           // target: 'http://test.api.huo5you.com',