优化客服，修改客户管理bug

src/router/views/index.js

@@ -1436,24 +1436,24 @@ export default [
           keepAlive: false,
         },
         path: '/aftersales/aftersalesWorkOrdermodifyTemp',
-        name: '重构详情',
+        name: '修改旧页面',
         component: () => import('@/views/aftersales/aftersalesWorkOrdermodifyTemp.vue'),
       },
     ],
   },
   {
-    path: '/aftersales/aftersalesWorkOrdermodifyTemp',
+    path: '/aftersales/aftersalesWorkOrdermodify',
     component: Layout,
-    redirect: '/aftersales/aftersalesWorkOrdermodifyTemp',
+    redirect: '/aftersales/aftersalesWorkOrdermodify',
     children: [
       {
         meta: {
           i18n: 'dict',
           keepAlive: false,
         },
-        path: '/aftersales/aftersalesWorkOrdermodifyTemp',
-        name: '编辑重构',
-        component: () => import('@/views/aftersales/aftersalesWorkOrdermodifyTemp.vue'),
+        path: '/aftersales/aftersalesWorkOrdermodify',
+        name: '工单修改',
+        component: () => import('@/views/aftersales/aftersalesWorkOrdermodify.vue'),
       },
     ],
   },
@@ -1523,22 +1523,7 @@ export default [
       },
     ],
   },
-  {
-    path: '/aftersales/aftersalesWorkOrdermodify',
-    component: Layout,
-    redirect: '/aftersales/aftersalesWorkOrdermodify',
-    children: [
-      {
-        meta: {
-          i18n: 'dict',
-          keepAlive: false,
-        },
-        path: '/aftersales/aftersalesWorkOrdermodify',
-        name: '信息编辑',
-        component: () => import('@/views/aftersales/aftersalesWorkOrdermodify.vue'),
-      },
-    ],
-  },
+
 
   {
     path: '/aftersales/DataSynchronization',

src/views/aftersales/aftersalesWorkOrderAddTemp.vue

@@ -516,7 +516,7 @@
 
       <div class="Transport_damage_photos" v-if="SelectType == 1 || SelectType == 3">
         <span class="title">{{
-          SelectType == 1 ? '运损照片' : SelectType == 3 ? '窜货照片' : '照片'
+          SelectType == 1 ? '货损照片(2张)' : SelectType == 3 ? '窜货照片(1张)' : '照片'
         }}</span>
         <el-upload
           v-model:file-list="Indexform.packList"

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -2060,9 +2060,9 @@ const submitresults = async value => {
         data.claimIdentification = '1';
       }
       // 提交||保存接口
+      Pageloading.value=true
       if(value == 1 || value ==2){
       console.log(data, '要提交的参数');
-      Pageloading.value = true;
       $_addProcessingResults(data)
         .then(res => {
           if (res.data.code == 200) {
@@ -2122,12 +2122,20 @@ const submitresults = async value => {
             $router.push('/aftersales/aftersalesWorkOrder');
             AddressClosed('/aftersales/aftersalesWorkOrderend'); //删除当前页面
             }
+          }).catch((error)=>{
+            console.log(error);
+          }).finally(()=>{
+            Pageloading.value = false;
           })
         })
         .catch(() => {
-
+              // 传递要刷新的菜单
+            $useStore.commit('EDIT_REFRESHITEM', {title: 'aftersalesWorkOrder',status: true,});//要刷新的页面
+            $useStore.commit('Customer_Menu',Number($route.query.RouteIndexs));//要刷新的菜单
+            $router.push('/aftersales/aftersalesWorkOrder');
+            AddressClosed('/aftersales/aftersalesWorkOrderend'); //删除当前页面
         }).finally(()=>{
-          Pageloading.value = false;
+
       })
       }
       })

src/views/basicdata/brand/basicClient.vue

@@ -214,6 +214,7 @@
         :before-close="beforeClose"
         :close-on-click-modal="false"
         append-to-body
+ 
       >
         <div v-loading="loadingObj.submitLoading">
           <el-form :disabled="view" ref="form" :model="form" :rules="rules" label-width="120px">
@@ -511,6 +512,7 @@ export default {
   data() {
     return {
       excelForm: {},
+      fromloading:true,
       excelBox: false,
       excelOption: {
         submitBtn: false,
@@ -527,7 +529,7 @@ export default {
               res: 'data',
             },
             tip: '请上传 .xls,.xlsx 标准格式文件',
-            action: '/api/logpm-basicdata/basicdataClient/import-basicDataClient',
+            action: '/api/blade-resource/oss/endpoint/put-file',
           },
           {
             label: '模板下载',
@@ -580,7 +582,17 @@ export default {
           sortable: true,
           head: false,
         },
-
+        {
+          prop: 'brandName',
+          label: '品牌',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'linkman',
           label: '联系人',
@@ -870,10 +882,9 @@ export default {
         'Blade-Auth': 'Bearer ' + getToken(),
       };
     },
-    // action() {
-    //   return '/api/blade-resource/oss/endpoint/put-file';
-    //   // return '/api/blade-resource/oss/endpoint/put-file-attach'
-    // },
+    action() {
+      return '/api/blade-resource/oss/endpoint/put-file';
+    },
   },
   methods: {
     uploadAfter(res, done, loading, column) {
@@ -1263,7 +1274,22 @@ export default {
               this.form.bladeRegionCityId = this.form.bladeRegionProvinceId[1];
               this.form.bladeRegionAreaId = this.form.bladeRegionProvinceId[2];
               this.form.bladeRegionProvinceId = this.form.bladeRegionProvinceId[0];
+
+
               console.log('上传llll>>>', this.form);
+               // 将日期字符串转换为日期对象
+            const startTime = new Date(this.form.contractStartTime);//开始时间
+            const endTime = new Date(this.form.contractEntTime);//结束时间
+
+           // 检查开始时间是否大于结束时间
+            if (startTime.getTime() > endTime.getTime()) {
+            // 开始时间大于结束时间的处理逻辑
+          this.$message({
+                  type: 'warning',
+                  message: '结束时间不能小于开始时间!',
+                });
+          return
+          }
               await add(this.form);
               this.box = false;
               this.onLoad(this.page);
@@ -1292,6 +1318,18 @@ export default {
               this.form.bladeRegionCityId = this.form.bladeRegionProvinceId[1];
               this.form.bladeRegionAreaId = this.form.bladeRegionProvinceId[2];
               this.form.bladeRegionProvinceId = this.form.bladeRegionProvinceId[0];
+            // 将日期字符串转换为日期对象
+            const startTime = new Date(this.form.contractStartTime);//开始时间
+            const endTime = new Date(this.form.contractEntTime);//结束时间
+           // 检查开始时间是否大于结束时间
+            if (startTime.getTime() > endTime.getTime()) {
+            // 开始时间大于结束时间的处理逻辑
+            this.$message({
+                  type: 'warning',
+                  message: '结束时间不能小于开始时间!',
+                });
+             return
+          }
               await update(this.form);
               this.box = false;
               this.onLoad(this.page);