调整

admin/src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
-import { getToken } from '@/utils/auth'
+import { getToken,removeToken } from '@/utils/auth'
 
 // create an axios instance
 const service = axios.create({
@@ -65,6 +65,9 @@ service.interceptors.response.use(
           })
         })
       }
+      if (res.code == 400) {
+          removeToken()
+      }
       return Promise.reject(new Error(res.message || 'Error'))
     } else {
       return res

admin/src/views/order/index.vue

@@ -446,7 +446,7 @@
               >
             </el-form-item>
 
-            <el-form-item label="出游日期">
+            <el-form-item required pros="travel_date" label="出游日期">
               <el-date-picker
                 v-model="item.travel_date"
                 type="date"
@@ -462,7 +462,7 @@
               />
             </el-form-item>
 
-            <el-form-item label="下次跟进时间" v-if="item.status !== 2">
+            <el-form-item required pros="next_follow" label="下次跟进时间" v-if="item.status !== 2">
               <el-date-picker
                 v-model="next_follow"
                 type="datetime"
@@ -478,13 +478,6 @@
             }}</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="预约跟进状态">
-          <template v-for="(v, k) in status_arr">
-            <el-radio v-if="k > 0" v-model="item.status" :label="k" border>{{
-              v
-            }}</el-radio>
-          </template>
-        </el-form-item>
         <!--        <el-form-item label="快捷跟进" style="width: 600px;">
           <el-select v-model="value" placeholder="请选择" @change="onChange">
             <el-form-item style="display: inline-flex;text-align: left;width: 770px;">
@@ -499,7 +492,7 @@
           </el-select>
         </el-form-item>-->
 
-        <el-form-item label="跟进说明">
+        <el-form-item required pros='desc' label="跟进说明">
           <el-input v-model="item.desc" type="textarea" />
         </el-form-item>
       </el-form>
@@ -936,7 +929,6 @@ export default {
       this.$axios
         .post("/admin/order/oneClickRepair", { id: item.id })
         .then((res) => {
-          this.dialogVisible = false;
           this.$notify({
             title: "成功",
             message: "同步完成",
@@ -946,7 +938,7 @@ export default {
         })
         .catch((err) => {
           this.$notify.error({
-            title: "错误",
+            title: "同步失败",
             message: err,
           });
         });

admin/vue.config.js

@@ -38,8 +38,8 @@ module.exports = {
     },
     proxy: {
       '/dev-api': { // 接口地址 以 api开头的都走下面的配置
-        target: 'https://www.szjinao.cn', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
-        // target: 'http://192.168.0.6:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
+        // target: 'https://www.szjinao.cn', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
+        target: 'http://192.168.0.6:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
         ws: true, // 是否支持 websocket 请求 支持
         changeOrigin: true, // 是否启用跨域
         pathRewrite: {

service/app/admin/controller/OrderController.php

@@ -257,9 +257,9 @@ class OrderController extends base
         if(empty($desc) || empty($status)) return $this->error(2004, '跟进说明需要填写！');
         if(empty($personnel)) return $this->error(2004, '人员情况需要填写！');
         if(empty($travel_date)) return $this->error(2004, '出游时间需要填写！');
+        if(empty($next_follow)) return $this->error(2004, '下次跟进时间必填！');
         if ($status == 1){
             if(empty($next_follow)) return $this->error(2004, '下次跟进时间需要填写！');
-
         }
         if ($status == 2){
             $next_follow = '';

service/public/static/css/chunk-256b2874.8cf6f045.css

@@ -1 +1 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-40a40a21]{position:relative;padding-bottom:60px}.el-table[data-v-40a40a21],.filter-container[data-v-40a40a21]{padding-bottom:5px}
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-f35db07a]{position:relative;padding-bottom:60px}.el-table[data-v-f35db07a],.filter-container[data-v-f35db07a]{padding-bottom:5px}