diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }
diff --git a/src/views/companyDetail/personInfoDetail.vue b/src/views/companyDetail/personInfoDetail.vue
index 02a6d43..449b047 100644
--- a/src/views/companyDetail/personInfoDetail.vue
+++ b/src/views/companyDetail/personInfoDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="el-container">
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="法人代表姓名">{{ personInfo.legalPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表手机号">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表证件">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表姓名" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonName }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表手机号" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表证件" :label-style="labelStyle">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="业务负责人姓名">{{ personInfo.businessLeaderName }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人手机号">{{ personInfo.businessLeaderPhone }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人证件">{{ personInfo.businessLeaderCertificateTypeName }}  {{ personInfo.businessLeaderCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="备用联系人姓名">{{ personInfo.backupPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="备用联系人手机号">{{ personInfo.backupPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="备用联系人手机号" >{{ personInfo.backupPersonPhone }}</el-descriptions-item>
       <el-descriptions-item label="备用联系人证件">{{ personInfo.backupPersonCertificateTypeName }}  {{ personInfo.backupPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="技术负责人姓名">{{ personInfo.technicalLeaderName }}</el-descriptions-item>
@@ -69,7 +69,13 @@
         financeLeaderCertificateTypeName: '',
         financeLeaderCertificateCode: ''
       },
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      },
+      contentStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }
diff --git a/src/views/companyDetail/personInfoDetail.vue b/src/views/companyDetail/personInfoDetail.vue
index 02a6d43..449b047 100644
--- a/src/views/companyDetail/personInfoDetail.vue
+++ b/src/views/companyDetail/personInfoDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="el-container">
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="法人代表姓名">{{ personInfo.legalPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表手机号">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表证件">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表姓名" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonName }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表手机号" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表证件" :label-style="labelStyle">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="业务负责人姓名">{{ personInfo.businessLeaderName }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人手机号">{{ personInfo.businessLeaderPhone }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人证件">{{ personInfo.businessLeaderCertificateTypeName }}  {{ personInfo.businessLeaderCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="备用联系人姓名">{{ personInfo.backupPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="备用联系人手机号">{{ personInfo.backupPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="备用联系人手机号" >{{ personInfo.backupPersonPhone }}</el-descriptions-item>
       <el-descriptions-item label="备用联系人证件">{{ personInfo.backupPersonCertificateTypeName }}  {{ personInfo.backupPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="技术负责人姓名">{{ personInfo.technicalLeaderName }}</el-descriptions-item>
@@ -69,7 +69,13 @@
         financeLeaderCertificateTypeName: '',
         financeLeaderCertificateCode: ''
       },
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      },
+      contentStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/reviewInfoDetail.vue b/src/views/companyDetail/reviewInfoDetail.vue
new file mode 100644
index 0000000..5edd644
--- /dev/null
+++ b/src/views/companyDetail/reviewInfoDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商状态" :label-style="labelStyle" span="2">{{ reviewInfo.supplierStatusName }}</el-descriptions-item>
+      <el-descriptions-item label="资料预审结果" :label-style="labelStyle">{{ reviewInfo.preReviewResultName }}</el-descriptions-item>
+      <el-descriptions-item label="录库评审结果" :label-style="labelStyle">{{ reviewInfo.inputReviewResultName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">季度评价记录</div>
+    <el-table :data="quarterlyEvaluateList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterly" label="评价季度" width="200" >
+        <template slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年 {{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="quarterlyEvaluateResultName" label="评价结果" width="100"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评价说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="100" />
+      <el-table-column prop="quarterlyEvaluateFile" label="评价附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; font-size: 1rem">年度考核记录</div>
+    <el-table :data="annualAssessList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200" ></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="100"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="100" />
+      <el-table-column prop="annualAssessFile" label="考核附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReviewInfoDetail',
+  data() {
+    return {
+      reviewInfo: {
+        supplierStatusName: '',
+        preReviewResultName: '',
+        inputReviewResultName: ''
+      },
+      quarterlyEvaluateList: [],
+      annualAssessList: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
+    }
+  },
+  methods: {
+    showReviewDetail(review) {
+      this.reviewInfo = review
+      this.quarterlyEvaluateList = review.quarterlyEvaluateList
+      this.quarterlyEvaluateList.forEach(item => {
+        if (item.quarterlyEvaluateDate !== '' && item.quarterlyEvaluateDate.length > 10) {
+          item.quarterlyEvaluateDate = item.quarterlyEvaluateDate.substring(0, 10)
+        }
+
+        if (item.quarterlyEvaluateFile !== '') {
+          item.quarterlyEvaluateFileList = item.quarterlyEvaluateFile.split(',')
+        }
+      })
+
+      this.annualAssessList = review.annualAssessList
+      this.annualAssessList.forEach(item => {
+        if (item.annualAssessDate !== '' && item.annualAssessDate.length > 10) {
+          item.annualAssessDate = item.annualAssessDate.substring(0, 10)
+        }
+        if (item.annualAssessFile !== '') {
+          item.annualAssessFileList = item.annualAssessFile.split(',')
+        }
+      })
+
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }
diff --git a/src/views/companyDetail/personInfoDetail.vue b/src/views/companyDetail/personInfoDetail.vue
index 02a6d43..449b047 100644
--- a/src/views/companyDetail/personInfoDetail.vue
+++ b/src/views/companyDetail/personInfoDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="el-container">
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="法人代表姓名">{{ personInfo.legalPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表手机号">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表证件">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表姓名" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonName }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表手机号" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表证件" :label-style="labelStyle">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="业务负责人姓名">{{ personInfo.businessLeaderName }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人手机号">{{ personInfo.businessLeaderPhone }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人证件">{{ personInfo.businessLeaderCertificateTypeName }}  {{ personInfo.businessLeaderCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="备用联系人姓名">{{ personInfo.backupPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="备用联系人手机号">{{ personInfo.backupPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="备用联系人手机号" >{{ personInfo.backupPersonPhone }}</el-descriptions-item>
       <el-descriptions-item label="备用联系人证件">{{ personInfo.backupPersonCertificateTypeName }}  {{ personInfo.backupPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="技术负责人姓名">{{ personInfo.technicalLeaderName }}</el-descriptions-item>
@@ -69,7 +69,13 @@
         financeLeaderCertificateTypeName: '',
         financeLeaderCertificateCode: ''
       },
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      },
+      contentStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/reviewInfoDetail.vue b/src/views/companyDetail/reviewInfoDetail.vue
new file mode 100644
index 0000000..5edd644
--- /dev/null
+++ b/src/views/companyDetail/reviewInfoDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商状态" :label-style="labelStyle" span="2">{{ reviewInfo.supplierStatusName }}</el-descriptions-item>
+      <el-descriptions-item label="资料预审结果" :label-style="labelStyle">{{ reviewInfo.preReviewResultName }}</el-descriptions-item>
+      <el-descriptions-item label="录库评审结果" :label-style="labelStyle">{{ reviewInfo.inputReviewResultName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">季度评价记录</div>
+    <el-table :data="quarterlyEvaluateList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterly" label="评价季度" width="200" >
+        <template slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年 {{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="quarterlyEvaluateResultName" label="评价结果" width="100"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评价说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="100" />
+      <el-table-column prop="quarterlyEvaluateFile" label="评价附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; font-size: 1rem">年度考核记录</div>
+    <el-table :data="annualAssessList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200" ></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="100"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="100" />
+      <el-table-column prop="annualAssessFile" label="考核附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReviewInfoDetail',
+  data() {
+    return {
+      reviewInfo: {
+        supplierStatusName: '',
+        preReviewResultName: '',
+        inputReviewResultName: ''
+      },
+      quarterlyEvaluateList: [],
+      annualAssessList: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
+    }
+  },
+  methods: {
+    showReviewDetail(review) {
+      this.reviewInfo = review
+      this.quarterlyEvaluateList = review.quarterlyEvaluateList
+      this.quarterlyEvaluateList.forEach(item => {
+        if (item.quarterlyEvaluateDate !== '' && item.quarterlyEvaluateDate.length > 10) {
+          item.quarterlyEvaluateDate = item.quarterlyEvaluateDate.substring(0, 10)
+        }
+
+        if (item.quarterlyEvaluateFile !== '') {
+          item.quarterlyEvaluateFileList = item.quarterlyEvaluateFile.split(',')
+        }
+      })
+
+      this.annualAssessList = review.annualAssessList
+      this.annualAssessList.forEach(item => {
+        if (item.annualAssessDate !== '' && item.annualAssessDate.length > 10) {
+          item.annualAssessDate = item.annualAssessDate.substring(0, 10)
+        }
+        if (item.annualAssessFile !== '') {
+          item.annualAssessFileList = item.annualAssessFile.split(',')
+        }
+      })
+
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/distributor/distributorDetail.vue b/src/views/distributor/distributorDetail.vue
index 78b2bbb..52e2bb3 100644
--- a/src/views/distributor/distributorDetail.vue
+++ b/src/views/distributor/distributorDetail.vue
@@ -29,172 +29,9 @@
       </el-tab-pane>
 
       <el-tab-pane label="其他信息" name="extraDetail">
-        其他附加
+        <extra-info-detail ref="extraDetail" />
       </el-tab-pane>
     </el-tabs>
-
-<!--    <div class="deviceDialog ">-->
-<!--      &lt;!&ndash; {{personInfo}} &ndash;&gt;-->
-<!--      <div class="headInfo">-->
-<!--      </div>-->
-<!--      <div class="content">-->
-<!--        <div class="content_nav">-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">-->
-<!--            三证信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">-->
-<!--            联系人信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">-->
-<!--            业务信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 3 }" @click="changeNav(3)">-->
-<!--            经营信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 4 }" @click="changeNav(4)">-->
-<!--            评审信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 5 }" @click="changeNav(5)">-->
-<!--            其他信息-->
-<!--          </div>-->
-<!--        </div>-->
-<!--          <div v-if="navSelect == 4" class="reviewbox">-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.supplierStatusName"-->
-<!--                title="供应商状态"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.preReviewResultName"-->
-<!--                title="资料预审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.inputReviewResult"-->
-<!--                title="录库评审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史季度评价-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.quarterlyEvaluateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="evaluateQuarterly" label="评价季度" />-->
-<!--              <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />-->
-<!--              <el-table-column prop="quarterlyEvaluateIllustration" label="季度评价说明" />-->
-<!--              <el-table-column prop="quarterlyEvaluateDate" label="季度评价时间" />-->
-<!--              <el-table-column prop="quarterlyEvaluateFile" label="评价详情" />-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.annualAssessList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="assessAnnual" label="考核年度" />-->
-<!--              <el-table-column prop="annualAssessResult" label="年度考核结果" />-->
-<!--              <el-table-column prop="annualAssessIllustration" label="年度考核时说明" />-->
-<!--              <el-table-column prop="annualAssessDate" label="年度考核时间" />-->
-<!--              <el-table-column prop="annualAssessFile" label="考核详情" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--          <div v-if="navSelect == 5" class="othernfo">-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.bankList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              &lt;!&ndash; <el-table-column prop="date" label="序号" > </el-table-column> &ndash;&gt;-->
-<!--              <el-table-column prop="accountName" label="账户名称" />-->
-<!--              <el-table-column prop="accountNumber" label="银行账号" />-->
-<!--              <el-table-column prop="depositBank" label="开户行" />-->
-<!--              <el-table-column prop="depositBankName" label="开户行名称" />-->
-<!--              <el-table-column prop="depositBankNumber" label="开户行号" />-->
-<!--              &lt;!&ndash; <el-table-column prop="address" label="操作"> </el-table-column> &ndash;&gt;-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateName"-->
-<!--                title="管理体系认证名称"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateTerm"-->
-<!--                title="管理体系认证期限"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateScan"-->
-<!--                title="管理体系扫描件"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.qualifyCertificateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="id" label="序号" />-->
-<!--              <el-table-column prop="qualifyName" label="资质需要名称" />-->
-<!--              <el-table-column prop="qualifyDesc" label="资质需求描述" />-->
-<!--              <el-table-column prop="proveMaterialDesc" label="资质要求材料" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
   </el-dialog>
 </template>
 
@@ -204,13 +41,14 @@
 import PersonInfoDetail from '@/views/companyDetail/personInfoDetail'
 import BusinessInfoDetail from '@/views/companyDetail/businessInfoDetail'
 import OperationInfoDetail from '@/views/companyDetail/operationInfoDetail'
+import ExtraInfoDetail from '@/views/companyDetail/extraInfoDetail'
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { certificateDetail, personDetail, businessDetail } from '@/api/distributor/distributor'
 
 export default {
   name: 'DistributorDetail',
   components: {
-    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail
+    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail, ExtraInfoDetail
   },
   data() {
     return {
@@ -225,10 +63,6 @@
         companyAddress: ''
       },
       activeTabName: 'certDetail',
-      certificateInfo: '',
-      personInfo: '',
-      businessInfo: '',
-      reviewInfo: '',
       isShowInfo: false
     }
   },
@@ -270,6 +104,8 @@
       businessDetail({ distributorCode: distributorCode }).then(res => {
         if (res !== null && res !== undefined && res !== '') {
           this.$refs.businessDetail.showBusinessDetail(res)
+          this.$refs.operationDetail.showOperationDetail(res)
+          this.$refs.extraDetail.showExtraDetail(res)
         }
       })
     }

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }
diff --git a/src/views/companyDetail/personInfoDetail.vue b/src/views/companyDetail/personInfoDetail.vue
index 02a6d43..449b047 100644
--- a/src/views/companyDetail/personInfoDetail.vue
+++ b/src/views/companyDetail/personInfoDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="el-container">
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="法人代表姓名">{{ personInfo.legalPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表手机号">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表证件">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表姓名" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonName }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表手机号" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表证件" :label-style="labelStyle">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="业务负责人姓名">{{ personInfo.businessLeaderName }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人手机号">{{ personInfo.businessLeaderPhone }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人证件">{{ personInfo.businessLeaderCertificateTypeName }}  {{ personInfo.businessLeaderCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="备用联系人姓名">{{ personInfo.backupPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="备用联系人手机号">{{ personInfo.backupPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="备用联系人手机号" >{{ personInfo.backupPersonPhone }}</el-descriptions-item>
       <el-descriptions-item label="备用联系人证件">{{ personInfo.backupPersonCertificateTypeName }}  {{ personInfo.backupPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="技术负责人姓名">{{ personInfo.technicalLeaderName }}</el-descriptions-item>
@@ -69,7 +69,13 @@
         financeLeaderCertificateTypeName: '',
         financeLeaderCertificateCode: ''
       },
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      },
+      contentStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/reviewInfoDetail.vue b/src/views/companyDetail/reviewInfoDetail.vue
new file mode 100644
index 0000000..5edd644
--- /dev/null
+++ b/src/views/companyDetail/reviewInfoDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商状态" :label-style="labelStyle" span="2">{{ reviewInfo.supplierStatusName }}</el-descriptions-item>
+      <el-descriptions-item label="资料预审结果" :label-style="labelStyle">{{ reviewInfo.preReviewResultName }}</el-descriptions-item>
+      <el-descriptions-item label="录库评审结果" :label-style="labelStyle">{{ reviewInfo.inputReviewResultName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">季度评价记录</div>
+    <el-table :data="quarterlyEvaluateList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterly" label="评价季度" width="200" >
+        <template slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年 {{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="quarterlyEvaluateResultName" label="评价结果" width="100"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评价说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="100" />
+      <el-table-column prop="quarterlyEvaluateFile" label="评价附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; font-size: 1rem">年度考核记录</div>
+    <el-table :data="annualAssessList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200" ></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="100"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="100" />
+      <el-table-column prop="annualAssessFile" label="考核附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReviewInfoDetail',
+  data() {
+    return {
+      reviewInfo: {
+        supplierStatusName: '',
+        preReviewResultName: '',
+        inputReviewResultName: ''
+      },
+      quarterlyEvaluateList: [],
+      annualAssessList: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
+    }
+  },
+  methods: {
+    showReviewDetail(review) {
+      this.reviewInfo = review
+      this.quarterlyEvaluateList = review.quarterlyEvaluateList
+      this.quarterlyEvaluateList.forEach(item => {
+        if (item.quarterlyEvaluateDate !== '' && item.quarterlyEvaluateDate.length > 10) {
+          item.quarterlyEvaluateDate = item.quarterlyEvaluateDate.substring(0, 10)
+        }
+
+        if (item.quarterlyEvaluateFile !== '') {
+          item.quarterlyEvaluateFileList = item.quarterlyEvaluateFile.split(',')
+        }
+      })
+
+      this.annualAssessList = review.annualAssessList
+      this.annualAssessList.forEach(item => {
+        if (item.annualAssessDate !== '' && item.annualAssessDate.length > 10) {
+          item.annualAssessDate = item.annualAssessDate.substring(0, 10)
+        }
+        if (item.annualAssessFile !== '') {
+          item.annualAssessFileList = item.annualAssessFile.split(',')
+        }
+      })
+
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/distributor/distributorDetail.vue b/src/views/distributor/distributorDetail.vue
index 78b2bbb..52e2bb3 100644
--- a/src/views/distributor/distributorDetail.vue
+++ b/src/views/distributor/distributorDetail.vue
@@ -29,172 +29,9 @@
       </el-tab-pane>
 
       <el-tab-pane label="其他信息" name="extraDetail">
-        其他附加
+        <extra-info-detail ref="extraDetail" />
       </el-tab-pane>
     </el-tabs>
-
-<!--    <div class="deviceDialog ">-->
-<!--      &lt;!&ndash; {{personInfo}} &ndash;&gt;-->
-<!--      <div class="headInfo">-->
-<!--      </div>-->
-<!--      <div class="content">-->
-<!--        <div class="content_nav">-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">-->
-<!--            三证信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">-->
-<!--            联系人信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">-->
-<!--            业务信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 3 }" @click="changeNav(3)">-->
-<!--            经营信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 4 }" @click="changeNav(4)">-->
-<!--            评审信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 5 }" @click="changeNav(5)">-->
-<!--            其他信息-->
-<!--          </div>-->
-<!--        </div>-->
-<!--          <div v-if="navSelect == 4" class="reviewbox">-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.supplierStatusName"-->
-<!--                title="供应商状态"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.preReviewResultName"-->
-<!--                title="资料预审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.inputReviewResult"-->
-<!--                title="录库评审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史季度评价-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.quarterlyEvaluateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="evaluateQuarterly" label="评价季度" />-->
-<!--              <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />-->
-<!--              <el-table-column prop="quarterlyEvaluateIllustration" label="季度评价说明" />-->
-<!--              <el-table-column prop="quarterlyEvaluateDate" label="季度评价时间" />-->
-<!--              <el-table-column prop="quarterlyEvaluateFile" label="评价详情" />-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.annualAssessList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="assessAnnual" label="考核年度" />-->
-<!--              <el-table-column prop="annualAssessResult" label="年度考核结果" />-->
-<!--              <el-table-column prop="annualAssessIllustration" label="年度考核时说明" />-->
-<!--              <el-table-column prop="annualAssessDate" label="年度考核时间" />-->
-<!--              <el-table-column prop="annualAssessFile" label="考核详情" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--          <div v-if="navSelect == 5" class="othernfo">-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.bankList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              &lt;!&ndash; <el-table-column prop="date" label="序号" > </el-table-column> &ndash;&gt;-->
-<!--              <el-table-column prop="accountName" label="账户名称" />-->
-<!--              <el-table-column prop="accountNumber" label="银行账号" />-->
-<!--              <el-table-column prop="depositBank" label="开户行" />-->
-<!--              <el-table-column prop="depositBankName" label="开户行名称" />-->
-<!--              <el-table-column prop="depositBankNumber" label="开户行号" />-->
-<!--              &lt;!&ndash; <el-table-column prop="address" label="操作"> </el-table-column> &ndash;&gt;-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateName"-->
-<!--                title="管理体系认证名称"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateTerm"-->
-<!--                title="管理体系认证期限"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateScan"-->
-<!--                title="管理体系扫描件"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.qualifyCertificateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="id" label="序号" />-->
-<!--              <el-table-column prop="qualifyName" label="资质需要名称" />-->
-<!--              <el-table-column prop="qualifyDesc" label="资质需求描述" />-->
-<!--              <el-table-column prop="proveMaterialDesc" label="资质要求材料" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
   </el-dialog>
 </template>
 
@@ -204,13 +41,14 @@
 import PersonInfoDetail from '@/views/companyDetail/personInfoDetail'
 import BusinessInfoDetail from '@/views/companyDetail/businessInfoDetail'
 import OperationInfoDetail from '@/views/companyDetail/operationInfoDetail'
+import ExtraInfoDetail from '@/views/companyDetail/extraInfoDetail'
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { certificateDetail, personDetail, businessDetail } from '@/api/distributor/distributor'
 
 export default {
   name: 'DistributorDetail',
   components: {
-    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail
+    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail, ExtraInfoDetail
   },
   data() {
     return {
@@ -225,10 +63,6 @@
         companyAddress: ''
       },
       activeTabName: 'certDetail',
-      certificateInfo: '',
-      personInfo: '',
-      businessInfo: '',
-      reviewInfo: '',
       isShowInfo: false
     }
   },
@@ -270,6 +104,8 @@
       businessDetail({ distributorCode: distributorCode }).then(res => {
         if (res !== null && res !== undefined && res !== '') {
           this.$refs.businessDetail.showBusinessDetail(res)
+          this.$refs.operationDetail.showOperationDetail(res)
+          this.$refs.extraDetail.showExtraDetail(res)
         }
       })
     }
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 683549f..3956bd0 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -51,7 +51,6 @@
     </el-table>
     <!-- 分页组件 -->
     <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
-<!--    <distributor-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />-->
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -59,7 +58,6 @@
 <script>
 // 组件
 import GroupPage from '@/components/mycomponent/groupPage'
-// import DistributorInfoDialog from '@/components/mycomponent/dialog/distributor/distributorInfoDialog'
 import DistributorDetail from '@/views/distributor/distributorDetail'
 // 逻辑
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
@@ -70,12 +68,10 @@
   components: {
     DistributorDetail,
     GroupPage
-    // DistributorInfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
-      // isShowAdd:false,//显示新增功能
       selectInfo: { // 搜索框中的数据的数据
         distributorCode: '',
         distributorName: ''
@@ -105,7 +101,7 @@
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    },
+    }
   }
 }
 </script>

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }
diff --git a/src/views/companyDetail/personInfoDetail.vue b/src/views/companyDetail/personInfoDetail.vue
index 02a6d43..449b047 100644
--- a/src/views/companyDetail/personInfoDetail.vue
+++ b/src/views/companyDetail/personInfoDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="el-container">
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="法人代表姓名">{{ personInfo.legalPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表手机号">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表证件">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表姓名" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonName }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表手机号" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表证件" :label-style="labelStyle">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="业务负责人姓名">{{ personInfo.businessLeaderName }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人手机号">{{ personInfo.businessLeaderPhone }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人证件">{{ personInfo.businessLeaderCertificateTypeName }}  {{ personInfo.businessLeaderCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="备用联系人姓名">{{ personInfo.backupPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="备用联系人手机号">{{ personInfo.backupPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="备用联系人手机号" >{{ personInfo.backupPersonPhone }}</el-descriptions-item>
       <el-descriptions-item label="备用联系人证件">{{ personInfo.backupPersonCertificateTypeName }}  {{ personInfo.backupPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="技术负责人姓名">{{ personInfo.technicalLeaderName }}</el-descriptions-item>
@@ -69,7 +69,13 @@
         financeLeaderCertificateTypeName: '',
         financeLeaderCertificateCode: ''
       },
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      },
+      contentStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/reviewInfoDetail.vue b/src/views/companyDetail/reviewInfoDetail.vue
new file mode 100644
index 0000000..5edd644
--- /dev/null
+++ b/src/views/companyDetail/reviewInfoDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商状态" :label-style="labelStyle" span="2">{{ reviewInfo.supplierStatusName }}</el-descriptions-item>
+      <el-descriptions-item label="资料预审结果" :label-style="labelStyle">{{ reviewInfo.preReviewResultName }}</el-descriptions-item>
+      <el-descriptions-item label="录库评审结果" :label-style="labelStyle">{{ reviewInfo.inputReviewResultName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">季度评价记录</div>
+    <el-table :data="quarterlyEvaluateList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterly" label="评价季度" width="200" >
+        <template slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年 {{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="quarterlyEvaluateResultName" label="评价结果" width="100"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评价说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="100" />
+      <el-table-column prop="quarterlyEvaluateFile" label="评价附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; font-size: 1rem">年度考核记录</div>
+    <el-table :data="annualAssessList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200" ></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="100"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="100" />
+      <el-table-column prop="annualAssessFile" label="考核附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReviewInfoDetail',
+  data() {
+    return {
+      reviewInfo: {
+        supplierStatusName: '',
+        preReviewResultName: '',
+        inputReviewResultName: ''
+      },
+      quarterlyEvaluateList: [],
+      annualAssessList: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
+    }
+  },
+  methods: {
+    showReviewDetail(review) {
+      this.reviewInfo = review
+      this.quarterlyEvaluateList = review.quarterlyEvaluateList
+      this.quarterlyEvaluateList.forEach(item => {
+        if (item.quarterlyEvaluateDate !== '' && item.quarterlyEvaluateDate.length > 10) {
+          item.quarterlyEvaluateDate = item.quarterlyEvaluateDate.substring(0, 10)
+        }
+
+        if (item.quarterlyEvaluateFile !== '') {
+          item.quarterlyEvaluateFileList = item.quarterlyEvaluateFile.split(',')
+        }
+      })
+
+      this.annualAssessList = review.annualAssessList
+      this.annualAssessList.forEach(item => {
+        if (item.annualAssessDate !== '' && item.annualAssessDate.length > 10) {
+          item.annualAssessDate = item.annualAssessDate.substring(0, 10)
+        }
+        if (item.annualAssessFile !== '') {
+          item.annualAssessFileList = item.annualAssessFile.split(',')
+        }
+      })
+
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/distributor/distributorDetail.vue b/src/views/distributor/distributorDetail.vue
index 78b2bbb..52e2bb3 100644
--- a/src/views/distributor/distributorDetail.vue
+++ b/src/views/distributor/distributorDetail.vue
@@ -29,172 +29,9 @@
       </el-tab-pane>
 
       <el-tab-pane label="其他信息" name="extraDetail">
-        其他附加
+        <extra-info-detail ref="extraDetail" />
       </el-tab-pane>
     </el-tabs>
-
-<!--    <div class="deviceDialog ">-->
-<!--      &lt;!&ndash; {{personInfo}} &ndash;&gt;-->
-<!--      <div class="headInfo">-->
-<!--      </div>-->
-<!--      <div class="content">-->
-<!--        <div class="content_nav">-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">-->
-<!--            三证信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">-->
-<!--            联系人信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">-->
-<!--            业务信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 3 }" @click="changeNav(3)">-->
-<!--            经营信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 4 }" @click="changeNav(4)">-->
-<!--            评审信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 5 }" @click="changeNav(5)">-->
-<!--            其他信息-->
-<!--          </div>-->
-<!--        </div>-->
-<!--          <div v-if="navSelect == 4" class="reviewbox">-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.supplierStatusName"-->
-<!--                title="供应商状态"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.preReviewResultName"-->
-<!--                title="资料预审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.inputReviewResult"-->
-<!--                title="录库评审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史季度评价-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.quarterlyEvaluateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="evaluateQuarterly" label="评价季度" />-->
-<!--              <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />-->
-<!--              <el-table-column prop="quarterlyEvaluateIllustration" label="季度评价说明" />-->
-<!--              <el-table-column prop="quarterlyEvaluateDate" label="季度评价时间" />-->
-<!--              <el-table-column prop="quarterlyEvaluateFile" label="评价详情" />-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.annualAssessList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="assessAnnual" label="考核年度" />-->
-<!--              <el-table-column prop="annualAssessResult" label="年度考核结果" />-->
-<!--              <el-table-column prop="annualAssessIllustration" label="年度考核时说明" />-->
-<!--              <el-table-column prop="annualAssessDate" label="年度考核时间" />-->
-<!--              <el-table-column prop="annualAssessFile" label="考核详情" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--          <div v-if="navSelect == 5" class="othernfo">-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.bankList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              &lt;!&ndash; <el-table-column prop="date" label="序号" > </el-table-column> &ndash;&gt;-->
-<!--              <el-table-column prop="accountName" label="账户名称" />-->
-<!--              <el-table-column prop="accountNumber" label="银行账号" />-->
-<!--              <el-table-column prop="depositBank" label="开户行" />-->
-<!--              <el-table-column prop="depositBankName" label="开户行名称" />-->
-<!--              <el-table-column prop="depositBankNumber" label="开户行号" />-->
-<!--              &lt;!&ndash; <el-table-column prop="address" label="操作"> </el-table-column> &ndash;&gt;-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateName"-->
-<!--                title="管理体系认证名称"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateTerm"-->
-<!--                title="管理体系认证期限"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateScan"-->
-<!--                title="管理体系扫描件"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.qualifyCertificateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="id" label="序号" />-->
-<!--              <el-table-column prop="qualifyName" label="资质需要名称" />-->
-<!--              <el-table-column prop="qualifyDesc" label="资质需求描述" />-->
-<!--              <el-table-column prop="proveMaterialDesc" label="资质要求材料" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
   </el-dialog>
 </template>
 
@@ -204,13 +41,14 @@
 import PersonInfoDetail from '@/views/companyDetail/personInfoDetail'
 import BusinessInfoDetail from '@/views/companyDetail/businessInfoDetail'
 import OperationInfoDetail from '@/views/companyDetail/operationInfoDetail'
+import ExtraInfoDetail from '@/views/companyDetail/extraInfoDetail'
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { certificateDetail, personDetail, businessDetail } from '@/api/distributor/distributor'
 
 export default {
   name: 'DistributorDetail',
   components: {
-    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail
+    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail, ExtraInfoDetail
   },
   data() {
     return {
@@ -225,10 +63,6 @@
         companyAddress: ''
       },
       activeTabName: 'certDetail',
-      certificateInfo: '',
-      personInfo: '',
-      businessInfo: '',
-      reviewInfo: '',
       isShowInfo: false
     }
   },
@@ -270,6 +104,8 @@
       businessDetail({ distributorCode: distributorCode }).then(res => {
         if (res !== null && res !== undefined && res !== '') {
           this.$refs.businessDetail.showBusinessDetail(res)
+          this.$refs.operationDetail.showOperationDetail(res)
+          this.$refs.extraDetail.showExtraDetail(res)
         }
       })
     }
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 683549f..3956bd0 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -51,7 +51,6 @@
     </el-table>
     <!-- 分页组件 -->
     <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
-<!--    <distributor-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />-->
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -59,7 +58,6 @@
 <script>
 // 组件
 import GroupPage from '@/components/mycomponent/groupPage'
-// import DistributorInfoDialog from '@/components/mycomponent/dialog/distributor/distributorInfoDialog'
 import DistributorDetail from '@/views/distributor/distributorDetail'
 // 逻辑
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
@@ -70,12 +68,10 @@
   components: {
     DistributorDetail,
     GroupPage
-    // DistributorInfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
-      // isShowAdd:false,//显示新增功能
       selectInfo: { // 搜索框中的数据的数据
         distributorCode: '',
         distributorName: ''
@@ -105,7 +101,7 @@
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 36e1a2d..df1f8de 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -52,6 +52,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -103,7 +104,8 @@
       selectInfo: {
         orderId: '',
         userName: ''
-      }
+      },
+      loading:false
 
     }
   },
@@ -111,12 +113,16 @@
     tableRowClassName: tableRowClassName,
 
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }
diff --git a/src/views/companyDetail/personInfoDetail.vue b/src/views/companyDetail/personInfoDetail.vue
index 02a6d43..449b047 100644
--- a/src/views/companyDetail/personInfoDetail.vue
+++ b/src/views/companyDetail/personInfoDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="el-container">
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="法人代表姓名">{{ personInfo.legalPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表手机号">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表证件">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表姓名" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonName }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表手机号" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表证件" :label-style="labelStyle">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="业务负责人姓名">{{ personInfo.businessLeaderName }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人手机号">{{ personInfo.businessLeaderPhone }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人证件">{{ personInfo.businessLeaderCertificateTypeName }}  {{ personInfo.businessLeaderCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="备用联系人姓名">{{ personInfo.backupPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="备用联系人手机号">{{ personInfo.backupPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="备用联系人手机号" >{{ personInfo.backupPersonPhone }}</el-descriptions-item>
       <el-descriptions-item label="备用联系人证件">{{ personInfo.backupPersonCertificateTypeName }}  {{ personInfo.backupPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="技术负责人姓名">{{ personInfo.technicalLeaderName }}</el-descriptions-item>
@@ -69,7 +69,13 @@
         financeLeaderCertificateTypeName: '',
         financeLeaderCertificateCode: ''
       },
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      },
+      contentStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/reviewInfoDetail.vue b/src/views/companyDetail/reviewInfoDetail.vue
new file mode 100644
index 0000000..5edd644
--- /dev/null
+++ b/src/views/companyDetail/reviewInfoDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商状态" :label-style="labelStyle" span="2">{{ reviewInfo.supplierStatusName }}</el-descriptions-item>
+      <el-descriptions-item label="资料预审结果" :label-style="labelStyle">{{ reviewInfo.preReviewResultName }}</el-descriptions-item>
+      <el-descriptions-item label="录库评审结果" :label-style="labelStyle">{{ reviewInfo.inputReviewResultName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">季度评价记录</div>
+    <el-table :data="quarterlyEvaluateList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterly" label="评价季度" width="200" >
+        <template slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年 {{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="quarterlyEvaluateResultName" label="评价结果" width="100"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评价说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="100" />
+      <el-table-column prop="quarterlyEvaluateFile" label="评价附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; font-size: 1rem">年度考核记录</div>
+    <el-table :data="annualAssessList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200" ></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="100"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="100" />
+      <el-table-column prop="annualAssessFile" label="考核附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReviewInfoDetail',
+  data() {
+    return {
+      reviewInfo: {
+        supplierStatusName: '',
+        preReviewResultName: '',
+        inputReviewResultName: ''
+      },
+      quarterlyEvaluateList: [],
+      annualAssessList: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
+    }
+  },
+  methods: {
+    showReviewDetail(review) {
+      this.reviewInfo = review
+      this.quarterlyEvaluateList = review.quarterlyEvaluateList
+      this.quarterlyEvaluateList.forEach(item => {
+        if (item.quarterlyEvaluateDate !== '' && item.quarterlyEvaluateDate.length > 10) {
+          item.quarterlyEvaluateDate = item.quarterlyEvaluateDate.substring(0, 10)
+        }
+
+        if (item.quarterlyEvaluateFile !== '') {
+          item.quarterlyEvaluateFileList = item.quarterlyEvaluateFile.split(',')
+        }
+      })
+
+      this.annualAssessList = review.annualAssessList
+      this.annualAssessList.forEach(item => {
+        if (item.annualAssessDate !== '' && item.annualAssessDate.length > 10) {
+          item.annualAssessDate = item.annualAssessDate.substring(0, 10)
+        }
+        if (item.annualAssessFile !== '') {
+          item.annualAssessFileList = item.annualAssessFile.split(',')
+        }
+      })
+
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/distributor/distributorDetail.vue b/src/views/distributor/distributorDetail.vue
index 78b2bbb..52e2bb3 100644
--- a/src/views/distributor/distributorDetail.vue
+++ b/src/views/distributor/distributorDetail.vue
@@ -29,172 +29,9 @@
       </el-tab-pane>
 
       <el-tab-pane label="其他信息" name="extraDetail">
-        其他附加
+        <extra-info-detail ref="extraDetail" />
       </el-tab-pane>
     </el-tabs>
-
-<!--    <div class="deviceDialog ">-->
-<!--      &lt;!&ndash; {{personInfo}} &ndash;&gt;-->
-<!--      <div class="headInfo">-->
-<!--      </div>-->
-<!--      <div class="content">-->
-<!--        <div class="content_nav">-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">-->
-<!--            三证信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">-->
-<!--            联系人信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">-->
-<!--            业务信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 3 }" @click="changeNav(3)">-->
-<!--            经营信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 4 }" @click="changeNav(4)">-->
-<!--            评审信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 5 }" @click="changeNav(5)">-->
-<!--            其他信息-->
-<!--          </div>-->
-<!--        </div>-->
-<!--          <div v-if="navSelect == 4" class="reviewbox">-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.supplierStatusName"-->
-<!--                title="供应商状态"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.preReviewResultName"-->
-<!--                title="资料预审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.inputReviewResult"-->
-<!--                title="录库评审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史季度评价-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.quarterlyEvaluateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="evaluateQuarterly" label="评价季度" />-->
-<!--              <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />-->
-<!--              <el-table-column prop="quarterlyEvaluateIllustration" label="季度评价说明" />-->
-<!--              <el-table-column prop="quarterlyEvaluateDate" label="季度评价时间" />-->
-<!--              <el-table-column prop="quarterlyEvaluateFile" label="评价详情" />-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.annualAssessList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="assessAnnual" label="考核年度" />-->
-<!--              <el-table-column prop="annualAssessResult" label="年度考核结果" />-->
-<!--              <el-table-column prop="annualAssessIllustration" label="年度考核时说明" />-->
-<!--              <el-table-column prop="annualAssessDate" label="年度考核时间" />-->
-<!--              <el-table-column prop="annualAssessFile" label="考核详情" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--          <div v-if="navSelect == 5" class="othernfo">-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.bankList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              &lt;!&ndash; <el-table-column prop="date" label="序号" > </el-table-column> &ndash;&gt;-->
-<!--              <el-table-column prop="accountName" label="账户名称" />-->
-<!--              <el-table-column prop="accountNumber" label="银行账号" />-->
-<!--              <el-table-column prop="depositBank" label="开户行" />-->
-<!--              <el-table-column prop="depositBankName" label="开户行名称" />-->
-<!--              <el-table-column prop="depositBankNumber" label="开户行号" />-->
-<!--              &lt;!&ndash; <el-table-column prop="address" label="操作"> </el-table-column> &ndash;&gt;-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateName"-->
-<!--                title="管理体系认证名称"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateTerm"-->
-<!--                title="管理体系认证期限"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateScan"-->
-<!--                title="管理体系扫描件"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.qualifyCertificateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="id" label="序号" />-->
-<!--              <el-table-column prop="qualifyName" label="资质需要名称" />-->
-<!--              <el-table-column prop="qualifyDesc" label="资质需求描述" />-->
-<!--              <el-table-column prop="proveMaterialDesc" label="资质要求材料" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
   </el-dialog>
 </template>
 
@@ -204,13 +41,14 @@
 import PersonInfoDetail from '@/views/companyDetail/personInfoDetail'
 import BusinessInfoDetail from '@/views/companyDetail/businessInfoDetail'
 import OperationInfoDetail from '@/views/companyDetail/operationInfoDetail'
+import ExtraInfoDetail from '@/views/companyDetail/extraInfoDetail'
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { certificateDetail, personDetail, businessDetail } from '@/api/distributor/distributor'
 
 export default {
   name: 'DistributorDetail',
   components: {
-    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail
+    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail, ExtraInfoDetail
   },
   data() {
     return {
@@ -225,10 +63,6 @@
         companyAddress: ''
       },
       activeTabName: 'certDetail',
-      certificateInfo: '',
-      personInfo: '',
-      businessInfo: '',
-      reviewInfo: '',
       isShowInfo: false
     }
   },
@@ -270,6 +104,8 @@
       businessDetail({ distributorCode: distributorCode }).then(res => {
         if (res !== null && res !== undefined && res !== '') {
           this.$refs.businessDetail.showBusinessDetail(res)
+          this.$refs.operationDetail.showOperationDetail(res)
+          this.$refs.extraDetail.showExtraDetail(res)
         }
       })
     }
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 683549f..3956bd0 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -51,7 +51,6 @@
     </el-table>
     <!-- 分页组件 -->
     <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
-<!--    <distributor-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />-->
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -59,7 +58,6 @@
 <script>
 // 组件
 import GroupPage from '@/components/mycomponent/groupPage'
-// import DistributorInfoDialog from '@/components/mycomponent/dialog/distributor/distributorInfoDialog'
 import DistributorDetail from '@/views/distributor/distributorDetail'
 // 逻辑
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
@@ -70,12 +68,10 @@
   components: {
     DistributorDetail,
     GroupPage
-    // DistributorInfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
-      // isShowAdd:false,//显示新增功能
       selectInfo: { // 搜索框中的数据的数据
         distributorCode: '',
         distributorName: ''
@@ -105,7 +101,7 @@
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 36e1a2d..df1f8de 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -52,6 +52,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -103,7 +104,8 @@
       selectInfo: {
         orderId: '',
         userName: ''
-      }
+      },
+      loading:false
 
     }
   },
@@ -111,12 +113,16 @@
     tableRowClassName: tableRowClassName,
 
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 1f84e63..0a1c756 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -60,6 +60,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -126,7 +127,8 @@
         itemBudget: '',
         itemDuration: ''
       },
-      busOppoId: ''
+      busOppoId: '',
+      loading:false
     }
   },
   methods: {
@@ -141,12 +143,16 @@
       this.busOppoId = row.busOppoId
     },
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
@@ -155,7 +161,7 @@
         itemBudget: '',
         itemDuration: ''
       }
-    }
+    },
   }
 }
 </script>

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }
diff --git a/src/views/companyDetail/personInfoDetail.vue b/src/views/companyDetail/personInfoDetail.vue
index 02a6d43..449b047 100644
--- a/src/views/companyDetail/personInfoDetail.vue
+++ b/src/views/companyDetail/personInfoDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="el-container">
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="法人代表姓名">{{ personInfo.legalPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表手机号">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表证件">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表姓名" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonName }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表手机号" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表证件" :label-style="labelStyle">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="业务负责人姓名">{{ personInfo.businessLeaderName }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人手机号">{{ personInfo.businessLeaderPhone }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人证件">{{ personInfo.businessLeaderCertificateTypeName }}  {{ personInfo.businessLeaderCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="备用联系人姓名">{{ personInfo.backupPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="备用联系人手机号">{{ personInfo.backupPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="备用联系人手机号" >{{ personInfo.backupPersonPhone }}</el-descriptions-item>
       <el-descriptions-item label="备用联系人证件">{{ personInfo.backupPersonCertificateTypeName }}  {{ personInfo.backupPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="技术负责人姓名">{{ personInfo.technicalLeaderName }}</el-descriptions-item>
@@ -69,7 +69,13 @@
         financeLeaderCertificateTypeName: '',
         financeLeaderCertificateCode: ''
       },
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      },
+      contentStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/reviewInfoDetail.vue b/src/views/companyDetail/reviewInfoDetail.vue
new file mode 100644
index 0000000..5edd644
--- /dev/null
+++ b/src/views/companyDetail/reviewInfoDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商状态" :label-style="labelStyle" span="2">{{ reviewInfo.supplierStatusName }}</el-descriptions-item>
+      <el-descriptions-item label="资料预审结果" :label-style="labelStyle">{{ reviewInfo.preReviewResultName }}</el-descriptions-item>
+      <el-descriptions-item label="录库评审结果" :label-style="labelStyle">{{ reviewInfo.inputReviewResultName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">季度评价记录</div>
+    <el-table :data="quarterlyEvaluateList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterly" label="评价季度" width="200" >
+        <template slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年 {{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="quarterlyEvaluateResultName" label="评价结果" width="100"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评价说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="100" />
+      <el-table-column prop="quarterlyEvaluateFile" label="评价附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; font-size: 1rem">年度考核记录</div>
+    <el-table :data="annualAssessList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200" ></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="100"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="100" />
+      <el-table-column prop="annualAssessFile" label="考核附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReviewInfoDetail',
+  data() {
+    return {
+      reviewInfo: {
+        supplierStatusName: '',
+        preReviewResultName: '',
+        inputReviewResultName: ''
+      },
+      quarterlyEvaluateList: [],
+      annualAssessList: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
+    }
+  },
+  methods: {
+    showReviewDetail(review) {
+      this.reviewInfo = review
+      this.quarterlyEvaluateList = review.quarterlyEvaluateList
+      this.quarterlyEvaluateList.forEach(item => {
+        if (item.quarterlyEvaluateDate !== '' && item.quarterlyEvaluateDate.length > 10) {
+          item.quarterlyEvaluateDate = item.quarterlyEvaluateDate.substring(0, 10)
+        }
+
+        if (item.quarterlyEvaluateFile !== '') {
+          item.quarterlyEvaluateFileList = item.quarterlyEvaluateFile.split(',')
+        }
+      })
+
+      this.annualAssessList = review.annualAssessList
+      this.annualAssessList.forEach(item => {
+        if (item.annualAssessDate !== '' && item.annualAssessDate.length > 10) {
+          item.annualAssessDate = item.annualAssessDate.substring(0, 10)
+        }
+        if (item.annualAssessFile !== '') {
+          item.annualAssessFileList = item.annualAssessFile.split(',')
+        }
+      })
+
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/distributor/distributorDetail.vue b/src/views/distributor/distributorDetail.vue
index 78b2bbb..52e2bb3 100644
--- a/src/views/distributor/distributorDetail.vue
+++ b/src/views/distributor/distributorDetail.vue
@@ -29,172 +29,9 @@
       </el-tab-pane>
 
       <el-tab-pane label="其他信息" name="extraDetail">
-        其他附加
+        <extra-info-detail ref="extraDetail" />
       </el-tab-pane>
     </el-tabs>
-
-<!--    <div class="deviceDialog ">-->
-<!--      &lt;!&ndash; {{personInfo}} &ndash;&gt;-->
-<!--      <div class="headInfo">-->
-<!--      </div>-->
-<!--      <div class="content">-->
-<!--        <div class="content_nav">-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">-->
-<!--            三证信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">-->
-<!--            联系人信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">-->
-<!--            业务信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 3 }" @click="changeNav(3)">-->
-<!--            经营信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 4 }" @click="changeNav(4)">-->
-<!--            评审信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 5 }" @click="changeNav(5)">-->
-<!--            其他信息-->
-<!--          </div>-->
-<!--        </div>-->
-<!--          <div v-if="navSelect == 4" class="reviewbox">-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.supplierStatusName"-->
-<!--                title="供应商状态"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.preReviewResultName"-->
-<!--                title="资料预审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.inputReviewResult"-->
-<!--                title="录库评审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史季度评价-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.quarterlyEvaluateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="evaluateQuarterly" label="评价季度" />-->
-<!--              <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />-->
-<!--              <el-table-column prop="quarterlyEvaluateIllustration" label="季度评价说明" />-->
-<!--              <el-table-column prop="quarterlyEvaluateDate" label="季度评价时间" />-->
-<!--              <el-table-column prop="quarterlyEvaluateFile" label="评价详情" />-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.annualAssessList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="assessAnnual" label="考核年度" />-->
-<!--              <el-table-column prop="annualAssessResult" label="年度考核结果" />-->
-<!--              <el-table-column prop="annualAssessIllustration" label="年度考核时说明" />-->
-<!--              <el-table-column prop="annualAssessDate" label="年度考核时间" />-->
-<!--              <el-table-column prop="annualAssessFile" label="考核详情" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--          <div v-if="navSelect == 5" class="othernfo">-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.bankList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              &lt;!&ndash; <el-table-column prop="date" label="序号" > </el-table-column> &ndash;&gt;-->
-<!--              <el-table-column prop="accountName" label="账户名称" />-->
-<!--              <el-table-column prop="accountNumber" label="银行账号" />-->
-<!--              <el-table-column prop="depositBank" label="开户行" />-->
-<!--              <el-table-column prop="depositBankName" label="开户行名称" />-->
-<!--              <el-table-column prop="depositBankNumber" label="开户行号" />-->
-<!--              &lt;!&ndash; <el-table-column prop="address" label="操作"> </el-table-column> &ndash;&gt;-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateName"-->
-<!--                title="管理体系认证名称"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateTerm"-->
-<!--                title="管理体系认证期限"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateScan"-->
-<!--                title="管理体系扫描件"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.qualifyCertificateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="id" label="序号" />-->
-<!--              <el-table-column prop="qualifyName" label="资质需要名称" />-->
-<!--              <el-table-column prop="qualifyDesc" label="资质需求描述" />-->
-<!--              <el-table-column prop="proveMaterialDesc" label="资质要求材料" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
   </el-dialog>
 </template>
 
@@ -204,13 +41,14 @@
 import PersonInfoDetail from '@/views/companyDetail/personInfoDetail'
 import BusinessInfoDetail from '@/views/companyDetail/businessInfoDetail'
 import OperationInfoDetail from '@/views/companyDetail/operationInfoDetail'
+import ExtraInfoDetail from '@/views/companyDetail/extraInfoDetail'
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { certificateDetail, personDetail, businessDetail } from '@/api/distributor/distributor'
 
 export default {
   name: 'DistributorDetail',
   components: {
-    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail
+    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail, ExtraInfoDetail
   },
   data() {
     return {
@@ -225,10 +63,6 @@
         companyAddress: ''
       },
       activeTabName: 'certDetail',
-      certificateInfo: '',
-      personInfo: '',
-      businessInfo: '',
-      reviewInfo: '',
       isShowInfo: false
     }
   },
@@ -270,6 +104,8 @@
       businessDetail({ distributorCode: distributorCode }).then(res => {
         if (res !== null && res !== undefined && res !== '') {
           this.$refs.businessDetail.showBusinessDetail(res)
+          this.$refs.operationDetail.showOperationDetail(res)
+          this.$refs.extraDetail.showExtraDetail(res)
         }
       })
     }
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 683549f..3956bd0 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -51,7 +51,6 @@
     </el-table>
     <!-- 分页组件 -->
     <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
-<!--    <distributor-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />-->
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -59,7 +58,6 @@
 <script>
 // 组件
 import GroupPage from '@/components/mycomponent/groupPage'
-// import DistributorInfoDialog from '@/components/mycomponent/dialog/distributor/distributorInfoDialog'
 import DistributorDetail from '@/views/distributor/distributorDetail'
 // 逻辑
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
@@ -70,12 +68,10 @@
   components: {
     DistributorDetail,
     GroupPage
-    // DistributorInfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
-      // isShowAdd:false,//显示新增功能
       selectInfo: { // 搜索框中的数据的数据
         distributorCode: '',
         distributorName: ''
@@ -105,7 +101,7 @@
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 36e1a2d..df1f8de 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -52,6 +52,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -103,7 +104,8 @@
       selectInfo: {
         orderId: '',
         userName: ''
-      }
+      },
+      loading:false
 
     }
   },
@@ -111,12 +113,16 @@
     tableRowClassName: tableRowClassName,
 
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 1f84e63..0a1c756 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -60,6 +60,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -126,7 +127,8 @@
         itemBudget: '',
         itemDuration: ''
       },
-      busOppoId: ''
+      busOppoId: '',
+      loading:false
     }
   },
   methods: {
@@ -141,12 +143,16 @@
       this.busOppoId = row.busOppoId
     },
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
@@ -155,7 +161,7 @@
         itemBudget: '',
         itemDuration: ''
       }
-    }
+    },
   }
 }
 </script>
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index f573fd8..bed5935 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -21,7 +21,12 @@
             placeholder="请选择服务类型"
             style="width: 200px"
           >
-            <el-option v-for="item in options" :key="item.id" :label="item.typeName" :value="item.typeCode" />
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.typeCode"
+            />
           </el-select>
         </div>
       </div>
@@ -34,7 +39,14 @@
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -47,7 +59,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -64,6 +76,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -75,18 +88,10 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -117,100 +122,141 @@
 
 <script>
 // 组件
-import ManagementAddDialog from '../../components/mycomponent/dialog/server/managementAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ManagementAddDialog from "../../components/mycomponent/dialog/server/managementAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { listPage, M_batchDelete, M_delete } from '../../api/server/Management'
-import { TM_list } from '../../api/server/TypeManagement'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { listPage, M_batchDelete, M_delete } from "../../api/server/Management";
+import { TM_list } from "../../api/server/TypeManagement";
 
 export default {
   components: {
     ManagementAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        serviceName: '',
-        typeCode: ''
+        serviceName: "",
+        typeCode: "",
       },
       options: [],
-      title: ''
-    }
+      title: "",
+      loading:false
+    };
   },
   mounted() {
-    TM_list().then(res => {
-      console.log(res)
-      this.options = res
-    })
+    TM_list().then((res) => {
+      console.log(res);
+      this.options = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.title = '服务新增'
-      this.isShowAdd = true
-      this.rowInfo = ''
+      this.title = "服务新增";
+      this.isShowAdd = true;
+      this.rowInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+        id: "",
+      };
     },
     handleClick(row) {
-      this.title = '服务编辑'
-      this.isShowAdd = true
-      console.log(row)
-      this.rowInfo = row
+      this.title = "服务编辑";
+      this.isShowAdd = true;
+      console.log(row);
+      this.rowInfo = row;
+    },
+    reset() {
+      // 重置
+      this.selectInfo = {
+        serviceName: "",
+        typeCode: "",
+      };
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      M_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            M_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      M_delete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          M_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -252,7 +298,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }
diff --git a/src/views/companyDetail/personInfoDetail.vue b/src/views/companyDetail/personInfoDetail.vue
index 02a6d43..449b047 100644
--- a/src/views/companyDetail/personInfoDetail.vue
+++ b/src/views/companyDetail/personInfoDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="el-container">
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="法人代表姓名">{{ personInfo.legalPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表手机号">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表证件">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表姓名" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonName }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表手机号" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表证件" :label-style="labelStyle">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="业务负责人姓名">{{ personInfo.businessLeaderName }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人手机号">{{ personInfo.businessLeaderPhone }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人证件">{{ personInfo.businessLeaderCertificateTypeName }}  {{ personInfo.businessLeaderCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="备用联系人姓名">{{ personInfo.backupPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="备用联系人手机号">{{ personInfo.backupPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="备用联系人手机号" >{{ personInfo.backupPersonPhone }}</el-descriptions-item>
       <el-descriptions-item label="备用联系人证件">{{ personInfo.backupPersonCertificateTypeName }}  {{ personInfo.backupPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="技术负责人姓名">{{ personInfo.technicalLeaderName }}</el-descriptions-item>
@@ -69,7 +69,13 @@
         financeLeaderCertificateTypeName: '',
         financeLeaderCertificateCode: ''
       },
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      },
+      contentStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/reviewInfoDetail.vue b/src/views/companyDetail/reviewInfoDetail.vue
new file mode 100644
index 0000000..5edd644
--- /dev/null
+++ b/src/views/companyDetail/reviewInfoDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商状态" :label-style="labelStyle" span="2">{{ reviewInfo.supplierStatusName }}</el-descriptions-item>
+      <el-descriptions-item label="资料预审结果" :label-style="labelStyle">{{ reviewInfo.preReviewResultName }}</el-descriptions-item>
+      <el-descriptions-item label="录库评审结果" :label-style="labelStyle">{{ reviewInfo.inputReviewResultName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">季度评价记录</div>
+    <el-table :data="quarterlyEvaluateList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterly" label="评价季度" width="200" >
+        <template slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年 {{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="quarterlyEvaluateResultName" label="评价结果" width="100"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评价说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="100" />
+      <el-table-column prop="quarterlyEvaluateFile" label="评价附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; font-size: 1rem">年度考核记录</div>
+    <el-table :data="annualAssessList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200" ></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="100"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="100" />
+      <el-table-column prop="annualAssessFile" label="考核附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReviewInfoDetail',
+  data() {
+    return {
+      reviewInfo: {
+        supplierStatusName: '',
+        preReviewResultName: '',
+        inputReviewResultName: ''
+      },
+      quarterlyEvaluateList: [],
+      annualAssessList: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
+    }
+  },
+  methods: {
+    showReviewDetail(review) {
+      this.reviewInfo = review
+      this.quarterlyEvaluateList = review.quarterlyEvaluateList
+      this.quarterlyEvaluateList.forEach(item => {
+        if (item.quarterlyEvaluateDate !== '' && item.quarterlyEvaluateDate.length > 10) {
+          item.quarterlyEvaluateDate = item.quarterlyEvaluateDate.substring(0, 10)
+        }
+
+        if (item.quarterlyEvaluateFile !== '') {
+          item.quarterlyEvaluateFileList = item.quarterlyEvaluateFile.split(',')
+        }
+      })
+
+      this.annualAssessList = review.annualAssessList
+      this.annualAssessList.forEach(item => {
+        if (item.annualAssessDate !== '' && item.annualAssessDate.length > 10) {
+          item.annualAssessDate = item.annualAssessDate.substring(0, 10)
+        }
+        if (item.annualAssessFile !== '') {
+          item.annualAssessFileList = item.annualAssessFile.split(',')
+        }
+      })
+
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/distributor/distributorDetail.vue b/src/views/distributor/distributorDetail.vue
index 78b2bbb..52e2bb3 100644
--- a/src/views/distributor/distributorDetail.vue
+++ b/src/views/distributor/distributorDetail.vue
@@ -29,172 +29,9 @@
       </el-tab-pane>
 
       <el-tab-pane label="其他信息" name="extraDetail">
-        其他附加
+        <extra-info-detail ref="extraDetail" />
       </el-tab-pane>
     </el-tabs>
-
-<!--    <div class="deviceDialog ">-->
-<!--      &lt;!&ndash; {{personInfo}} &ndash;&gt;-->
-<!--      <div class="headInfo">-->
-<!--      </div>-->
-<!--      <div class="content">-->
-<!--        <div class="content_nav">-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">-->
-<!--            三证信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">-->
-<!--            联系人信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">-->
-<!--            业务信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 3 }" @click="changeNav(3)">-->
-<!--            经营信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 4 }" @click="changeNav(4)">-->
-<!--            评审信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 5 }" @click="changeNav(5)">-->
-<!--            其他信息-->
-<!--          </div>-->
-<!--        </div>-->
-<!--          <div v-if="navSelect == 4" class="reviewbox">-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.supplierStatusName"-->
-<!--                title="供应商状态"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.preReviewResultName"-->
-<!--                title="资料预审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.inputReviewResult"-->
-<!--                title="录库评审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史季度评价-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.quarterlyEvaluateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="evaluateQuarterly" label="评价季度" />-->
-<!--              <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />-->
-<!--              <el-table-column prop="quarterlyEvaluateIllustration" label="季度评价说明" />-->
-<!--              <el-table-column prop="quarterlyEvaluateDate" label="季度评价时间" />-->
-<!--              <el-table-column prop="quarterlyEvaluateFile" label="评价详情" />-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.annualAssessList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="assessAnnual" label="考核年度" />-->
-<!--              <el-table-column prop="annualAssessResult" label="年度考核结果" />-->
-<!--              <el-table-column prop="annualAssessIllustration" label="年度考核时说明" />-->
-<!--              <el-table-column prop="annualAssessDate" label="年度考核时间" />-->
-<!--              <el-table-column prop="annualAssessFile" label="考核详情" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--          <div v-if="navSelect == 5" class="othernfo">-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.bankList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              &lt;!&ndash; <el-table-column prop="date" label="序号" > </el-table-column> &ndash;&gt;-->
-<!--              <el-table-column prop="accountName" label="账户名称" />-->
-<!--              <el-table-column prop="accountNumber" label="银行账号" />-->
-<!--              <el-table-column prop="depositBank" label="开户行" />-->
-<!--              <el-table-column prop="depositBankName" label="开户行名称" />-->
-<!--              <el-table-column prop="depositBankNumber" label="开户行号" />-->
-<!--              &lt;!&ndash; <el-table-column prop="address" label="操作"> </el-table-column> &ndash;&gt;-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateName"-->
-<!--                title="管理体系认证名称"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateTerm"-->
-<!--                title="管理体系认证期限"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateScan"-->
-<!--                title="管理体系扫描件"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.qualifyCertificateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="id" label="序号" />-->
-<!--              <el-table-column prop="qualifyName" label="资质需要名称" />-->
-<!--              <el-table-column prop="qualifyDesc" label="资质需求描述" />-->
-<!--              <el-table-column prop="proveMaterialDesc" label="资质要求材料" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
   </el-dialog>
 </template>
 
@@ -204,13 +41,14 @@
 import PersonInfoDetail from '@/views/companyDetail/personInfoDetail'
 import BusinessInfoDetail from '@/views/companyDetail/businessInfoDetail'
 import OperationInfoDetail from '@/views/companyDetail/operationInfoDetail'
+import ExtraInfoDetail from '@/views/companyDetail/extraInfoDetail'
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { certificateDetail, personDetail, businessDetail } from '@/api/distributor/distributor'
 
 export default {
   name: 'DistributorDetail',
   components: {
-    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail
+    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail, ExtraInfoDetail
   },
   data() {
     return {
@@ -225,10 +63,6 @@
         companyAddress: ''
       },
       activeTabName: 'certDetail',
-      certificateInfo: '',
-      personInfo: '',
-      businessInfo: '',
-      reviewInfo: '',
       isShowInfo: false
     }
   },
@@ -270,6 +104,8 @@
       businessDetail({ distributorCode: distributorCode }).then(res => {
         if (res !== null && res !== undefined && res !== '') {
           this.$refs.businessDetail.showBusinessDetail(res)
+          this.$refs.operationDetail.showOperationDetail(res)
+          this.$refs.extraDetail.showExtraDetail(res)
         }
       })
     }
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 683549f..3956bd0 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -51,7 +51,6 @@
     </el-table>
     <!-- 分页组件 -->
     <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
-<!--    <distributor-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />-->
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -59,7 +58,6 @@
 <script>
 // 组件
 import GroupPage from '@/components/mycomponent/groupPage'
-// import DistributorInfoDialog from '@/components/mycomponent/dialog/distributor/distributorInfoDialog'
 import DistributorDetail from '@/views/distributor/distributorDetail'
 // 逻辑
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
@@ -70,12 +68,10 @@
   components: {
     DistributorDetail,
     GroupPage
-    // DistributorInfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
-      // isShowAdd:false,//显示新增功能
       selectInfo: { // 搜索框中的数据的数据
         distributorCode: '',
         distributorName: ''
@@ -105,7 +101,7 @@
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 36e1a2d..df1f8de 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -52,6 +52,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -103,7 +104,8 @@
       selectInfo: {
         orderId: '',
         userName: ''
-      }
+      },
+      loading:false
 
     }
   },
@@ -111,12 +113,16 @@
     tableRowClassName: tableRowClassName,
 
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 1f84e63..0a1c756 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -60,6 +60,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -126,7 +127,8 @@
         itemBudget: '',
         itemDuration: ''
       },
-      busOppoId: ''
+      busOppoId: '',
+      loading:false
     }
   },
   methods: {
@@ -141,12 +143,16 @@
       this.busOppoId = row.busOppoId
     },
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
@@ -155,7 +161,7 @@
         itemBudget: '',
         itemDuration: ''
       }
-    }
+    },
   }
 }
 </script>
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index f573fd8..bed5935 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -21,7 +21,12 @@
             placeholder="请选择服务类型"
             style="width: 200px"
           >
-            <el-option v-for="item in options" :key="item.id" :label="item.typeName" :value="item.typeCode" />
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.typeCode"
+            />
           </el-select>
         </div>
       </div>
@@ -34,7 +39,14 @@
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -47,7 +59,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -64,6 +76,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -75,18 +88,10 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -117,100 +122,141 @@
 
 <script>
 // 组件
-import ManagementAddDialog from '../../components/mycomponent/dialog/server/managementAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ManagementAddDialog from "../../components/mycomponent/dialog/server/managementAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { listPage, M_batchDelete, M_delete } from '../../api/server/Management'
-import { TM_list } from '../../api/server/TypeManagement'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { listPage, M_batchDelete, M_delete } from "../../api/server/Management";
+import { TM_list } from "../../api/server/TypeManagement";
 
 export default {
   components: {
     ManagementAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        serviceName: '',
-        typeCode: ''
+        serviceName: "",
+        typeCode: "",
       },
       options: [],
-      title: ''
-    }
+      title: "",
+      loading:false
+    };
   },
   mounted() {
-    TM_list().then(res => {
-      console.log(res)
-      this.options = res
-    })
+    TM_list().then((res) => {
+      console.log(res);
+      this.options = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.title = '服务新增'
-      this.isShowAdd = true
-      this.rowInfo = ''
+      this.title = "服务新增";
+      this.isShowAdd = true;
+      this.rowInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+        id: "",
+      };
     },
     handleClick(row) {
-      this.title = '服务编辑'
-      this.isShowAdd = true
-      console.log(row)
-      this.rowInfo = row
+      this.title = "服务编辑";
+      this.isShowAdd = true;
+      console.log(row);
+      this.rowInfo = row;
+    },
+    reset() {
+      // 重置
+      this.selectInfo = {
+        serviceName: "",
+        typeCode: "",
+      };
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      M_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            M_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      M_delete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          M_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -252,7 +298,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/server/TypeManagement.vue b/src/views/server/TypeManagement.vue
index 4fe0cab..c13185a 100644
--- a/src/views/server/TypeManagement.vue
+++ b/src/views/server/TypeManagement.vue
@@ -5,21 +5,41 @@
       <div class="serveInput">
         服务类型名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.typeName" placeholder="请输入服务类型名称" clearable class="serve-input" />
+          <el-input
+            v-model="selectInfo.typeName"
+            placeholder="请输入服务类型名称"
+            clearable
+            class="serve-input"
+          />
         </div>
       </div>
       <div class="serveBtn">
         <!-- <el-button type="primary" class="btnItem">查询</el-button>
         <el-button type="success" class="btnItem bggreen" @click="addCategory">新增</el-button>
         <el-button type="danger" class="btnItem bgred">删除</el-button> -->
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
 
-        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
+        <el-button
+          type="success"
+          icon="el-icon-circle-plus-outline"
+          class="btnItem bggreen"
+          @click="addCategory"
+        >
           新增
         </el-button>
-        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
+        <el-button
+          type="danger"
+          icon="el-icon-delete-solid"
+          class="btnItem bgred"
+          @click="BatchDelete"
+        >
           删除
         </el-button>
       </div>
@@ -35,9 +55,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" :index="indexMethod" label="序号" width="55" />
+      <el-table-column
+        type="index"
+        :index="indexMethod"
+        label="序号"
+        width="55"
+      />
       <el-table-column prop="typeCode" label="服务类型编号" />
       <el-table-column prop="typeName" label="服务类型名称" />
       <el-table-column prop="description" label="描述" />
@@ -71,101 +97,148 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <typeAddDialog v-if="isShowAdd" :title="dialoaTitle" :data-info="dataInfo" @close="closeAdd" @refresh="refresh" />
+    <typeAddDialog
+      v-if="isShowAdd"
+      :title="dialoaTitle"
+      :data-info="dataInfo"
+      @close="closeAdd"
+      @refresh="refresh"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import typeAddDialog from '../../components/mycomponent/dialog/server/typeAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import typeAddDialog from "../../components/mycomponent/dialog/server/typeAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage, typeDelete, batchDelete } from '../../api/server/TypeManagement'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import {
+  listPage,
+  typeDelete,
+  batchDelete,
+} from "../../api/server/TypeManagement";
+export default {
+  // 加入分页逻辑
   components: {
-    typeAddDialog, GroupPage
+    typeAddDialog,
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       dataInfo: {},
       selectInfo: {
-        typeName: ''
+        typeName: "",
       },
-      dialoaTitle: '',
-      isShowAdd: false // 显示新增功能
-    }
+      dialoaTitle: "",
+      isShowAdd: false, // 显示新增功能
+      loading: false,
+    };
   },
   methods: {
     // 生成序号
     indexMethod(index) {
-      return index + 1
+      return index + 1;
     },
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-      this.dialoaTitle = '新增服务类型'
+      this.isShowAdd = true;
+      this.dialoaTitle = "新增服务类型";
+      this.dataInfo = {
+        typeCode: "", // 服务类型编号
+        typeName: "", // 服务类型名称
+        description: "", // 描述
+        remark: "", // 备注
+        qualifyIds: [""], // 资质要求
+      };
     },
     handleClick(row) {
-      console.log(row)
-      this.isShowAdd = true
-      this.dialoaTitle = '编辑'
-      this.dataInfo = row
+      console.log(row);
+      this.isShowAdd = true;
+      this.dialoaTitle = "编辑";
+      this.dataInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo)
+        .then((res) => {
+          console.log(res);
+          this.tableData = res;
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     dealAry(scope) {
-      const ary = scope.row.qualifys.map(item => {
-        return item.qualifyName
-      })
-      let str = ''
+      const ary = scope.row.qualifys.map((item) => {
+        return item.qualifyName;
+      });
+      let str = "";
       for (let i = 0; i < ary.length; i++) {
-        str += ary[i]
+        str += ary[i];
       }
-      return str
+      return str;
     },
     Bdelete(row) {
-      const id = row.id
-      typeDelete({ id: id }).then(res => {
-        console.log(res)
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务类型吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          const id = row.id;
+          typeDelete({ id: id }).then((res) => {
+            console.log(res);
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
     },
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的服务类型吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              if (res != "") {
+                this.$message({
+                  message: "删除成功",
+                  type: "success",
+                });
+                this.refresh();
+              }
+            });
           })
-          this.refresh()
-        }
-      })
-    }
-  }
-}
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务类型",
+          type: "error",
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }
diff --git a/src/views/companyDetail/personInfoDetail.vue b/src/views/companyDetail/personInfoDetail.vue
index 02a6d43..449b047 100644
--- a/src/views/companyDetail/personInfoDetail.vue
+++ b/src/views/companyDetail/personInfoDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="el-container">
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="法人代表姓名">{{ personInfo.legalPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表手机号">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表证件">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表姓名" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonName }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表手机号" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表证件" :label-style="labelStyle">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="业务负责人姓名">{{ personInfo.businessLeaderName }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人手机号">{{ personInfo.businessLeaderPhone }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人证件">{{ personInfo.businessLeaderCertificateTypeName }}  {{ personInfo.businessLeaderCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="备用联系人姓名">{{ personInfo.backupPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="备用联系人手机号">{{ personInfo.backupPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="备用联系人手机号" >{{ personInfo.backupPersonPhone }}</el-descriptions-item>
       <el-descriptions-item label="备用联系人证件">{{ personInfo.backupPersonCertificateTypeName }}  {{ personInfo.backupPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="技术负责人姓名">{{ personInfo.technicalLeaderName }}</el-descriptions-item>
@@ -69,7 +69,13 @@
         financeLeaderCertificateTypeName: '',
         financeLeaderCertificateCode: ''
       },
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      },
+      contentStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/reviewInfoDetail.vue b/src/views/companyDetail/reviewInfoDetail.vue
new file mode 100644
index 0000000..5edd644
--- /dev/null
+++ b/src/views/companyDetail/reviewInfoDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商状态" :label-style="labelStyle" span="2">{{ reviewInfo.supplierStatusName }}</el-descriptions-item>
+      <el-descriptions-item label="资料预审结果" :label-style="labelStyle">{{ reviewInfo.preReviewResultName }}</el-descriptions-item>
+      <el-descriptions-item label="录库评审结果" :label-style="labelStyle">{{ reviewInfo.inputReviewResultName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">季度评价记录</div>
+    <el-table :data="quarterlyEvaluateList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterly" label="评价季度" width="200" >
+        <template slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年 {{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="quarterlyEvaluateResultName" label="评价结果" width="100"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评价说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="100" />
+      <el-table-column prop="quarterlyEvaluateFile" label="评价附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; font-size: 1rem">年度考核记录</div>
+    <el-table :data="annualAssessList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200" ></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="100"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="100" />
+      <el-table-column prop="annualAssessFile" label="考核附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReviewInfoDetail',
+  data() {
+    return {
+      reviewInfo: {
+        supplierStatusName: '',
+        preReviewResultName: '',
+        inputReviewResultName: ''
+      },
+      quarterlyEvaluateList: [],
+      annualAssessList: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
+    }
+  },
+  methods: {
+    showReviewDetail(review) {
+      this.reviewInfo = review
+      this.quarterlyEvaluateList = review.quarterlyEvaluateList
+      this.quarterlyEvaluateList.forEach(item => {
+        if (item.quarterlyEvaluateDate !== '' && item.quarterlyEvaluateDate.length > 10) {
+          item.quarterlyEvaluateDate = item.quarterlyEvaluateDate.substring(0, 10)
+        }
+
+        if (item.quarterlyEvaluateFile !== '') {
+          item.quarterlyEvaluateFileList = item.quarterlyEvaluateFile.split(',')
+        }
+      })
+
+      this.annualAssessList = review.annualAssessList
+      this.annualAssessList.forEach(item => {
+        if (item.annualAssessDate !== '' && item.annualAssessDate.length > 10) {
+          item.annualAssessDate = item.annualAssessDate.substring(0, 10)
+        }
+        if (item.annualAssessFile !== '') {
+          item.annualAssessFileList = item.annualAssessFile.split(',')
+        }
+      })
+
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/distributor/distributorDetail.vue b/src/views/distributor/distributorDetail.vue
index 78b2bbb..52e2bb3 100644
--- a/src/views/distributor/distributorDetail.vue
+++ b/src/views/distributor/distributorDetail.vue
@@ -29,172 +29,9 @@
       </el-tab-pane>
 
       <el-tab-pane label="其他信息" name="extraDetail">
-        其他附加
+        <extra-info-detail ref="extraDetail" />
       </el-tab-pane>
     </el-tabs>
-
-<!--    <div class="deviceDialog ">-->
-<!--      &lt;!&ndash; {{personInfo}} &ndash;&gt;-->
-<!--      <div class="headInfo">-->
-<!--      </div>-->
-<!--      <div class="content">-->
-<!--        <div class="content_nav">-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">-->
-<!--            三证信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">-->
-<!--            联系人信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">-->
-<!--            业务信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 3 }" @click="changeNav(3)">-->
-<!--            经营信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 4 }" @click="changeNav(4)">-->
-<!--            评审信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 5 }" @click="changeNav(5)">-->
-<!--            其他信息-->
-<!--          </div>-->
-<!--        </div>-->
-<!--          <div v-if="navSelect == 4" class="reviewbox">-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.supplierStatusName"-->
-<!--                title="供应商状态"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.preReviewResultName"-->
-<!--                title="资料预审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.inputReviewResult"-->
-<!--                title="录库评审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史季度评价-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.quarterlyEvaluateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="evaluateQuarterly" label="评价季度" />-->
-<!--              <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />-->
-<!--              <el-table-column prop="quarterlyEvaluateIllustration" label="季度评价说明" />-->
-<!--              <el-table-column prop="quarterlyEvaluateDate" label="季度评价时间" />-->
-<!--              <el-table-column prop="quarterlyEvaluateFile" label="评价详情" />-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.annualAssessList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="assessAnnual" label="考核年度" />-->
-<!--              <el-table-column prop="annualAssessResult" label="年度考核结果" />-->
-<!--              <el-table-column prop="annualAssessIllustration" label="年度考核时说明" />-->
-<!--              <el-table-column prop="annualAssessDate" label="年度考核时间" />-->
-<!--              <el-table-column prop="annualAssessFile" label="考核详情" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--          <div v-if="navSelect == 5" class="othernfo">-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.bankList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              &lt;!&ndash; <el-table-column prop="date" label="序号" > </el-table-column> &ndash;&gt;-->
-<!--              <el-table-column prop="accountName" label="账户名称" />-->
-<!--              <el-table-column prop="accountNumber" label="银行账号" />-->
-<!--              <el-table-column prop="depositBank" label="开户行" />-->
-<!--              <el-table-column prop="depositBankName" label="开户行名称" />-->
-<!--              <el-table-column prop="depositBankNumber" label="开户行号" />-->
-<!--              &lt;!&ndash; <el-table-column prop="address" label="操作"> </el-table-column> &ndash;&gt;-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateName"-->
-<!--                title="管理体系认证名称"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateTerm"-->
-<!--                title="管理体系认证期限"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateScan"-->
-<!--                title="管理体系扫描件"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.qualifyCertificateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="id" label="序号" />-->
-<!--              <el-table-column prop="qualifyName" label="资质需要名称" />-->
-<!--              <el-table-column prop="qualifyDesc" label="资质需求描述" />-->
-<!--              <el-table-column prop="proveMaterialDesc" label="资质要求材料" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
   </el-dialog>
 </template>
 
@@ -204,13 +41,14 @@
 import PersonInfoDetail from '@/views/companyDetail/personInfoDetail'
 import BusinessInfoDetail from '@/views/companyDetail/businessInfoDetail'
 import OperationInfoDetail from '@/views/companyDetail/operationInfoDetail'
+import ExtraInfoDetail from '@/views/companyDetail/extraInfoDetail'
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { certificateDetail, personDetail, businessDetail } from '@/api/distributor/distributor'
 
 export default {
   name: 'DistributorDetail',
   components: {
-    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail
+    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail, ExtraInfoDetail
   },
   data() {
     return {
@@ -225,10 +63,6 @@
         companyAddress: ''
       },
       activeTabName: 'certDetail',
-      certificateInfo: '',
-      personInfo: '',
-      businessInfo: '',
-      reviewInfo: '',
       isShowInfo: false
     }
   },
@@ -270,6 +104,8 @@
       businessDetail({ distributorCode: distributorCode }).then(res => {
         if (res !== null && res !== undefined && res !== '') {
           this.$refs.businessDetail.showBusinessDetail(res)
+          this.$refs.operationDetail.showOperationDetail(res)
+          this.$refs.extraDetail.showExtraDetail(res)
         }
       })
     }
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 683549f..3956bd0 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -51,7 +51,6 @@
     </el-table>
     <!-- 分页组件 -->
     <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
-<!--    <distributor-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />-->
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -59,7 +58,6 @@
 <script>
 // 组件
 import GroupPage from '@/components/mycomponent/groupPage'
-// import DistributorInfoDialog from '@/components/mycomponent/dialog/distributor/distributorInfoDialog'
 import DistributorDetail from '@/views/distributor/distributorDetail'
 // 逻辑
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
@@ -70,12 +68,10 @@
   components: {
     DistributorDetail,
     GroupPage
-    // DistributorInfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
-      // isShowAdd:false,//显示新增功能
       selectInfo: { // 搜索框中的数据的数据
         distributorCode: '',
         distributorName: ''
@@ -105,7 +101,7 @@
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 36e1a2d..df1f8de 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -52,6 +52,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -103,7 +104,8 @@
       selectInfo: {
         orderId: '',
         userName: ''
-      }
+      },
+      loading:false
 
     }
   },
@@ -111,12 +113,16 @@
     tableRowClassName: tableRowClassName,
 
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 1f84e63..0a1c756 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -60,6 +60,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -126,7 +127,8 @@
         itemBudget: '',
         itemDuration: ''
       },
-      busOppoId: ''
+      busOppoId: '',
+      loading:false
     }
   },
   methods: {
@@ -141,12 +143,16 @@
       this.busOppoId = row.busOppoId
     },
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
@@ -155,7 +161,7 @@
         itemBudget: '',
         itemDuration: ''
       }
-    }
+    },
   }
 }
 </script>
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index f573fd8..bed5935 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -21,7 +21,12 @@
             placeholder="请选择服务类型"
             style="width: 200px"
           >
-            <el-option v-for="item in options" :key="item.id" :label="item.typeName" :value="item.typeCode" />
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.typeCode"
+            />
           </el-select>
         </div>
       </div>
@@ -34,7 +39,14 @@
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -47,7 +59,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -64,6 +76,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -75,18 +88,10 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -117,100 +122,141 @@
 
 <script>
 // 组件
-import ManagementAddDialog from '../../components/mycomponent/dialog/server/managementAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ManagementAddDialog from "../../components/mycomponent/dialog/server/managementAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { listPage, M_batchDelete, M_delete } from '../../api/server/Management'
-import { TM_list } from '../../api/server/TypeManagement'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { listPage, M_batchDelete, M_delete } from "../../api/server/Management";
+import { TM_list } from "../../api/server/TypeManagement";
 
 export default {
   components: {
     ManagementAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        serviceName: '',
-        typeCode: ''
+        serviceName: "",
+        typeCode: "",
       },
       options: [],
-      title: ''
-    }
+      title: "",
+      loading:false
+    };
   },
   mounted() {
-    TM_list().then(res => {
-      console.log(res)
-      this.options = res
-    })
+    TM_list().then((res) => {
+      console.log(res);
+      this.options = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.title = '服务新增'
-      this.isShowAdd = true
-      this.rowInfo = ''
+      this.title = "服务新增";
+      this.isShowAdd = true;
+      this.rowInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+        id: "",
+      };
     },
     handleClick(row) {
-      this.title = '服务编辑'
-      this.isShowAdd = true
-      console.log(row)
-      this.rowInfo = row
+      this.title = "服务编辑";
+      this.isShowAdd = true;
+      console.log(row);
+      this.rowInfo = row;
+    },
+    reset() {
+      // 重置
+      this.selectInfo = {
+        serviceName: "",
+        typeCode: "",
+      };
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      M_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            M_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      M_delete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          M_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -252,7 +298,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/server/TypeManagement.vue b/src/views/server/TypeManagement.vue
index 4fe0cab..c13185a 100644
--- a/src/views/server/TypeManagement.vue
+++ b/src/views/server/TypeManagement.vue
@@ -5,21 +5,41 @@
       <div class="serveInput">
         服务类型名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.typeName" placeholder="请输入服务类型名称" clearable class="serve-input" />
+          <el-input
+            v-model="selectInfo.typeName"
+            placeholder="请输入服务类型名称"
+            clearable
+            class="serve-input"
+          />
         </div>
       </div>
       <div class="serveBtn">
         <!-- <el-button type="primary" class="btnItem">查询</el-button>
         <el-button type="success" class="btnItem bggreen" @click="addCategory">新增</el-button>
         <el-button type="danger" class="btnItem bgred">删除</el-button> -->
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
 
-        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
+        <el-button
+          type="success"
+          icon="el-icon-circle-plus-outline"
+          class="btnItem bggreen"
+          @click="addCategory"
+        >
           新增
         </el-button>
-        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
+        <el-button
+          type="danger"
+          icon="el-icon-delete-solid"
+          class="btnItem bgred"
+          @click="BatchDelete"
+        >
           删除
         </el-button>
       </div>
@@ -35,9 +55,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" :index="indexMethod" label="序号" width="55" />
+      <el-table-column
+        type="index"
+        :index="indexMethod"
+        label="序号"
+        width="55"
+      />
       <el-table-column prop="typeCode" label="服务类型编号" />
       <el-table-column prop="typeName" label="服务类型名称" />
       <el-table-column prop="description" label="描述" />
@@ -71,101 +97,148 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <typeAddDialog v-if="isShowAdd" :title="dialoaTitle" :data-info="dataInfo" @close="closeAdd" @refresh="refresh" />
+    <typeAddDialog
+      v-if="isShowAdd"
+      :title="dialoaTitle"
+      :data-info="dataInfo"
+      @close="closeAdd"
+      @refresh="refresh"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import typeAddDialog from '../../components/mycomponent/dialog/server/typeAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import typeAddDialog from "../../components/mycomponent/dialog/server/typeAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage, typeDelete, batchDelete } from '../../api/server/TypeManagement'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import {
+  listPage,
+  typeDelete,
+  batchDelete,
+} from "../../api/server/TypeManagement";
+export default {
+  // 加入分页逻辑
   components: {
-    typeAddDialog, GroupPage
+    typeAddDialog,
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       dataInfo: {},
       selectInfo: {
-        typeName: ''
+        typeName: "",
       },
-      dialoaTitle: '',
-      isShowAdd: false // 显示新增功能
-    }
+      dialoaTitle: "",
+      isShowAdd: false, // 显示新增功能
+      loading: false,
+    };
   },
   methods: {
     // 生成序号
     indexMethod(index) {
-      return index + 1
+      return index + 1;
     },
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-      this.dialoaTitle = '新增服务类型'
+      this.isShowAdd = true;
+      this.dialoaTitle = "新增服务类型";
+      this.dataInfo = {
+        typeCode: "", // 服务类型编号
+        typeName: "", // 服务类型名称
+        description: "", // 描述
+        remark: "", // 备注
+        qualifyIds: [""], // 资质要求
+      };
     },
     handleClick(row) {
-      console.log(row)
-      this.isShowAdd = true
-      this.dialoaTitle = '编辑'
-      this.dataInfo = row
+      console.log(row);
+      this.isShowAdd = true;
+      this.dialoaTitle = "编辑";
+      this.dataInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo)
+        .then((res) => {
+          console.log(res);
+          this.tableData = res;
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     dealAry(scope) {
-      const ary = scope.row.qualifys.map(item => {
-        return item.qualifyName
-      })
-      let str = ''
+      const ary = scope.row.qualifys.map((item) => {
+        return item.qualifyName;
+      });
+      let str = "";
       for (let i = 0; i < ary.length; i++) {
-        str += ary[i]
+        str += ary[i];
       }
-      return str
+      return str;
     },
     Bdelete(row) {
-      const id = row.id
-      typeDelete({ id: id }).then(res => {
-        console.log(res)
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务类型吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          const id = row.id;
+          typeDelete({ id: id }).then((res) => {
+            console.log(res);
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
     },
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的服务类型吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              if (res != "") {
+                this.$message({
+                  message: "删除成功",
+                  type: "success",
+                });
+                this.refresh();
+              }
+            });
           })
-          this.refresh()
-        }
-      })
-    }
-  }
-}
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务类型",
+          type: "error",
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/server/operation.vue b/src/views/server/operation.vue
index 40d80ad..e9a9a10 100644
--- a/src/views/server/operation.vue
+++ b/src/views/server/operation.vue
@@ -6,7 +6,7 @@
         服务名称
         <div class="inputBox" style="width: 120px">
           <el-input
-            v-model="input"
+            v-model="selectInfo.input"
             placeholder="请输入服务名称"
             clearable
             class="product-input"
@@ -18,10 +18,18 @@
           type="primary"
           icon="el-icon-search"
           class="btnItem"
+          @click="selectData"
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -34,12 +42,14 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="BatchDelete"
         >
           删除
         </el-button>
       </div>
     </div>
     <el-table
+    ref="multipleTable"
       :data="tableData"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -49,6 +59,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="date1" label="序号" />
@@ -60,18 +71,10 @@
 
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -93,97 +96,170 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <operation-add-dialog
-      :is-show-info="isShowAdd"
-      @close="closeAdd"
-    />
+    <operation-add-dialog :is-show-info="isShowAdd" @close="closeAdd" />
   </div>
 </template>
 
 <script>
 // 组件
 // import BrandAddDialog from '../../components/mycomponent/dialog/brandAddDialog.vue';
-import OperationAddDialog from '../../components/mycomponent/dialog/server/operationAddDialog.vue'
-
+import OperationAddDialog from "../../components/mycomponent/dialog/server/operationAddDialog.vue";
+import { listPage, O_batchDelete, O_delete } from "../../api/server/operation";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
 
 export default {
   components: {
-    OperationAddDialog
+    OperationAddDialog,
   },
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       tableData: [
         {
-          date1: '1',
-          date: 'fwyy001',
-          name: '4年免费换新',
-          address: '129',
-          address1: '限时9折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "1",
+          date: "fwyy001",
+          name: "4年免费换新",
+          address: "129",
+          address1: "限时9折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '2',
-          date: 'fwyy002',
-          name: '5年免费换新',
-          address: '169',
-          address1: '限时9折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "2",
+          date: "fwyy002",
+          name: "5年免费换新",
+          address: "169",
+          address1: "限时9折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '3',
-          date: 'fwyy003',
-          name: '6年全面保修',
-          address: '94',
-          address1: '限时8折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "3",
+          date: "fwyy003",
+          name: "6年全面保修",
+          address: "94",
+          address1: "限时8折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '4',
-          date: 'fwyy004',
-          name: '7年免费换新',
-          address: '110',
-          address1: '限时8折',
-          address2: '2022/06/01-2022/06/15'
-        }
+          date1: "4",
+          date: "fwyy004",
+          name: "7年免费换新",
+          address: "110",
+          address1: "限时8折",
+          address2: "2022/06/01-2022/06/15",
+        },
       ],
       options: [
         {
-          value: '选项1',
-          label: '黄金糕'
+          value: "选项1",
+          label: "黄金糕",
         },
         {
-          value: '选项2',
-          label: '双皮奶'
+          value: "选项2",
+          label: "双皮奶",
         },
         {
-          value: '选项3',
-          label: '蚵仔煎'
+          value: "选项3",
+          label: "蚵仔煎",
         },
         {
-          value: '选项4',
-          label: '龙须面'
+          value: "选项4",
+          label: "龙须面",
         },
         {
-          value: '选项5',
-          label: '北京烤鸭'
-        }
+          value: "选项5",
+          label: "北京烤鸭",
+        },
       ],
-      value: ''
-    }
+      value: "",
+      selectInfo: {
+        input: "",
+      },
+      loading:false
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-    }
-  }
-}
+      this.isShowAdd = true;
+    },
+    reset() {
+      this.inpute = "";
+    },
+    // 获取指定页面
+    getListPage(limit, offset) {
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err =>{
+        this.loading = false
+      })
+    },
+    // 批量删除
+    BatchDelete() {
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            O_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+          })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
+    },
+    // 删除
+    Bdelete(row) {
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          O_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -225,7 +301,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }
diff --git a/src/views/companyDetail/personInfoDetail.vue b/src/views/companyDetail/personInfoDetail.vue
index 02a6d43..449b047 100644
--- a/src/views/companyDetail/personInfoDetail.vue
+++ b/src/views/companyDetail/personInfoDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="el-container">
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="法人代表姓名">{{ personInfo.legalPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表手机号">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表证件">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表姓名" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonName }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表手机号" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表证件" :label-style="labelStyle">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="业务负责人姓名">{{ personInfo.businessLeaderName }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人手机号">{{ personInfo.businessLeaderPhone }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人证件">{{ personInfo.businessLeaderCertificateTypeName }}  {{ personInfo.businessLeaderCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="备用联系人姓名">{{ personInfo.backupPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="备用联系人手机号">{{ personInfo.backupPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="备用联系人手机号" >{{ personInfo.backupPersonPhone }}</el-descriptions-item>
       <el-descriptions-item label="备用联系人证件">{{ personInfo.backupPersonCertificateTypeName }}  {{ personInfo.backupPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="技术负责人姓名">{{ personInfo.technicalLeaderName }}</el-descriptions-item>
@@ -69,7 +69,13 @@
         financeLeaderCertificateTypeName: '',
         financeLeaderCertificateCode: ''
       },
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      },
+      contentStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/reviewInfoDetail.vue b/src/views/companyDetail/reviewInfoDetail.vue
new file mode 100644
index 0000000..5edd644
--- /dev/null
+++ b/src/views/companyDetail/reviewInfoDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商状态" :label-style="labelStyle" span="2">{{ reviewInfo.supplierStatusName }}</el-descriptions-item>
+      <el-descriptions-item label="资料预审结果" :label-style="labelStyle">{{ reviewInfo.preReviewResultName }}</el-descriptions-item>
+      <el-descriptions-item label="录库评审结果" :label-style="labelStyle">{{ reviewInfo.inputReviewResultName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">季度评价记录</div>
+    <el-table :data="quarterlyEvaluateList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterly" label="评价季度" width="200" >
+        <template slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年 {{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="quarterlyEvaluateResultName" label="评价结果" width="100"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评价说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="100" />
+      <el-table-column prop="quarterlyEvaluateFile" label="评价附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; font-size: 1rem">年度考核记录</div>
+    <el-table :data="annualAssessList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200" ></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="100"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="100" />
+      <el-table-column prop="annualAssessFile" label="考核附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReviewInfoDetail',
+  data() {
+    return {
+      reviewInfo: {
+        supplierStatusName: '',
+        preReviewResultName: '',
+        inputReviewResultName: ''
+      },
+      quarterlyEvaluateList: [],
+      annualAssessList: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
+    }
+  },
+  methods: {
+    showReviewDetail(review) {
+      this.reviewInfo = review
+      this.quarterlyEvaluateList = review.quarterlyEvaluateList
+      this.quarterlyEvaluateList.forEach(item => {
+        if (item.quarterlyEvaluateDate !== '' && item.quarterlyEvaluateDate.length > 10) {
+          item.quarterlyEvaluateDate = item.quarterlyEvaluateDate.substring(0, 10)
+        }
+
+        if (item.quarterlyEvaluateFile !== '') {
+          item.quarterlyEvaluateFileList = item.quarterlyEvaluateFile.split(',')
+        }
+      })
+
+      this.annualAssessList = review.annualAssessList
+      this.annualAssessList.forEach(item => {
+        if (item.annualAssessDate !== '' && item.annualAssessDate.length > 10) {
+          item.annualAssessDate = item.annualAssessDate.substring(0, 10)
+        }
+        if (item.annualAssessFile !== '') {
+          item.annualAssessFileList = item.annualAssessFile.split(',')
+        }
+      })
+
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/distributor/distributorDetail.vue b/src/views/distributor/distributorDetail.vue
index 78b2bbb..52e2bb3 100644
--- a/src/views/distributor/distributorDetail.vue
+++ b/src/views/distributor/distributorDetail.vue
@@ -29,172 +29,9 @@
       </el-tab-pane>
 
       <el-tab-pane label="其他信息" name="extraDetail">
-        其他附加
+        <extra-info-detail ref="extraDetail" />
       </el-tab-pane>
     </el-tabs>
-
-<!--    <div class="deviceDialog ">-->
-<!--      &lt;!&ndash; {{personInfo}} &ndash;&gt;-->
-<!--      <div class="headInfo">-->
-<!--      </div>-->
-<!--      <div class="content">-->
-<!--        <div class="content_nav">-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">-->
-<!--            三证信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">-->
-<!--            联系人信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">-->
-<!--            业务信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 3 }" @click="changeNav(3)">-->
-<!--            经营信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 4 }" @click="changeNav(4)">-->
-<!--            评审信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 5 }" @click="changeNav(5)">-->
-<!--            其他信息-->
-<!--          </div>-->
-<!--        </div>-->
-<!--          <div v-if="navSelect == 4" class="reviewbox">-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.supplierStatusName"-->
-<!--                title="供应商状态"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.preReviewResultName"-->
-<!--                title="资料预审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.inputReviewResult"-->
-<!--                title="录库评审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史季度评价-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.quarterlyEvaluateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="evaluateQuarterly" label="评价季度" />-->
-<!--              <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />-->
-<!--              <el-table-column prop="quarterlyEvaluateIllustration" label="季度评价说明" />-->
-<!--              <el-table-column prop="quarterlyEvaluateDate" label="季度评价时间" />-->
-<!--              <el-table-column prop="quarterlyEvaluateFile" label="评价详情" />-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.annualAssessList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="assessAnnual" label="考核年度" />-->
-<!--              <el-table-column prop="annualAssessResult" label="年度考核结果" />-->
-<!--              <el-table-column prop="annualAssessIllustration" label="年度考核时说明" />-->
-<!--              <el-table-column prop="annualAssessDate" label="年度考核时间" />-->
-<!--              <el-table-column prop="annualAssessFile" label="考核详情" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--          <div v-if="navSelect == 5" class="othernfo">-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.bankList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              &lt;!&ndash; <el-table-column prop="date" label="序号" > </el-table-column> &ndash;&gt;-->
-<!--              <el-table-column prop="accountName" label="账户名称" />-->
-<!--              <el-table-column prop="accountNumber" label="银行账号" />-->
-<!--              <el-table-column prop="depositBank" label="开户行" />-->
-<!--              <el-table-column prop="depositBankName" label="开户行名称" />-->
-<!--              <el-table-column prop="depositBankNumber" label="开户行号" />-->
-<!--              &lt;!&ndash; <el-table-column prop="address" label="操作"> </el-table-column> &ndash;&gt;-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateName"-->
-<!--                title="管理体系认证名称"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateTerm"-->
-<!--                title="管理体系认证期限"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateScan"-->
-<!--                title="管理体系扫描件"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.qualifyCertificateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="id" label="序号" />-->
-<!--              <el-table-column prop="qualifyName" label="资质需要名称" />-->
-<!--              <el-table-column prop="qualifyDesc" label="资质需求描述" />-->
-<!--              <el-table-column prop="proveMaterialDesc" label="资质要求材料" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
   </el-dialog>
 </template>
 
@@ -204,13 +41,14 @@
 import PersonInfoDetail from '@/views/companyDetail/personInfoDetail'
 import BusinessInfoDetail from '@/views/companyDetail/businessInfoDetail'
 import OperationInfoDetail from '@/views/companyDetail/operationInfoDetail'
+import ExtraInfoDetail from '@/views/companyDetail/extraInfoDetail'
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { certificateDetail, personDetail, businessDetail } from '@/api/distributor/distributor'
 
 export default {
   name: 'DistributorDetail',
   components: {
-    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail
+    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail, ExtraInfoDetail
   },
   data() {
     return {
@@ -225,10 +63,6 @@
         companyAddress: ''
       },
       activeTabName: 'certDetail',
-      certificateInfo: '',
-      personInfo: '',
-      businessInfo: '',
-      reviewInfo: '',
       isShowInfo: false
     }
   },
@@ -270,6 +104,8 @@
       businessDetail({ distributorCode: distributorCode }).then(res => {
         if (res !== null && res !== undefined && res !== '') {
           this.$refs.businessDetail.showBusinessDetail(res)
+          this.$refs.operationDetail.showOperationDetail(res)
+          this.$refs.extraDetail.showExtraDetail(res)
         }
       })
     }
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 683549f..3956bd0 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -51,7 +51,6 @@
     </el-table>
     <!-- 分页组件 -->
     <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
-<!--    <distributor-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />-->
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -59,7 +58,6 @@
 <script>
 // 组件
 import GroupPage from '@/components/mycomponent/groupPage'
-// import DistributorInfoDialog from '@/components/mycomponent/dialog/distributor/distributorInfoDialog'
 import DistributorDetail from '@/views/distributor/distributorDetail'
 // 逻辑
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
@@ -70,12 +68,10 @@
   components: {
     DistributorDetail,
     GroupPage
-    // DistributorInfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
-      // isShowAdd:false,//显示新增功能
       selectInfo: { // 搜索框中的数据的数据
         distributorCode: '',
         distributorName: ''
@@ -105,7 +101,7 @@
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 36e1a2d..df1f8de 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -52,6 +52,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -103,7 +104,8 @@
       selectInfo: {
         orderId: '',
         userName: ''
-      }
+      },
+      loading:false
 
     }
   },
@@ -111,12 +113,16 @@
     tableRowClassName: tableRowClassName,
 
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 1f84e63..0a1c756 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -60,6 +60,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -126,7 +127,8 @@
         itemBudget: '',
         itemDuration: ''
       },
-      busOppoId: ''
+      busOppoId: '',
+      loading:false
     }
   },
   methods: {
@@ -141,12 +143,16 @@
       this.busOppoId = row.busOppoId
     },
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
@@ -155,7 +161,7 @@
         itemBudget: '',
         itemDuration: ''
       }
-    }
+    },
   }
 }
 </script>
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index f573fd8..bed5935 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -21,7 +21,12 @@
             placeholder="请选择服务类型"
             style="width: 200px"
           >
-            <el-option v-for="item in options" :key="item.id" :label="item.typeName" :value="item.typeCode" />
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.typeCode"
+            />
           </el-select>
         </div>
       </div>
@@ -34,7 +39,14 @@
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -47,7 +59,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -64,6 +76,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -75,18 +88,10 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -117,100 +122,141 @@
 
 <script>
 // 组件
-import ManagementAddDialog from '../../components/mycomponent/dialog/server/managementAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ManagementAddDialog from "../../components/mycomponent/dialog/server/managementAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { listPage, M_batchDelete, M_delete } from '../../api/server/Management'
-import { TM_list } from '../../api/server/TypeManagement'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { listPage, M_batchDelete, M_delete } from "../../api/server/Management";
+import { TM_list } from "../../api/server/TypeManagement";
 
 export default {
   components: {
     ManagementAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        serviceName: '',
-        typeCode: ''
+        serviceName: "",
+        typeCode: "",
       },
       options: [],
-      title: ''
-    }
+      title: "",
+      loading:false
+    };
   },
   mounted() {
-    TM_list().then(res => {
-      console.log(res)
-      this.options = res
-    })
+    TM_list().then((res) => {
+      console.log(res);
+      this.options = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.title = '服务新增'
-      this.isShowAdd = true
-      this.rowInfo = ''
+      this.title = "服务新增";
+      this.isShowAdd = true;
+      this.rowInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+        id: "",
+      };
     },
     handleClick(row) {
-      this.title = '服务编辑'
-      this.isShowAdd = true
-      console.log(row)
-      this.rowInfo = row
+      this.title = "服务编辑";
+      this.isShowAdd = true;
+      console.log(row);
+      this.rowInfo = row;
+    },
+    reset() {
+      // 重置
+      this.selectInfo = {
+        serviceName: "",
+        typeCode: "",
+      };
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      M_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            M_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      M_delete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          M_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -252,7 +298,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/server/TypeManagement.vue b/src/views/server/TypeManagement.vue
index 4fe0cab..c13185a 100644
--- a/src/views/server/TypeManagement.vue
+++ b/src/views/server/TypeManagement.vue
@@ -5,21 +5,41 @@
       <div class="serveInput">
         服务类型名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.typeName" placeholder="请输入服务类型名称" clearable class="serve-input" />
+          <el-input
+            v-model="selectInfo.typeName"
+            placeholder="请输入服务类型名称"
+            clearable
+            class="serve-input"
+          />
         </div>
       </div>
       <div class="serveBtn">
         <!-- <el-button type="primary" class="btnItem">查询</el-button>
         <el-button type="success" class="btnItem bggreen" @click="addCategory">新增</el-button>
         <el-button type="danger" class="btnItem bgred">删除</el-button> -->
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
 
-        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
+        <el-button
+          type="success"
+          icon="el-icon-circle-plus-outline"
+          class="btnItem bggreen"
+          @click="addCategory"
+        >
           新增
         </el-button>
-        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
+        <el-button
+          type="danger"
+          icon="el-icon-delete-solid"
+          class="btnItem bgred"
+          @click="BatchDelete"
+        >
           删除
         </el-button>
       </div>
@@ -35,9 +55,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" :index="indexMethod" label="序号" width="55" />
+      <el-table-column
+        type="index"
+        :index="indexMethod"
+        label="序号"
+        width="55"
+      />
       <el-table-column prop="typeCode" label="服务类型编号" />
       <el-table-column prop="typeName" label="服务类型名称" />
       <el-table-column prop="description" label="描述" />
@@ -71,101 +97,148 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <typeAddDialog v-if="isShowAdd" :title="dialoaTitle" :data-info="dataInfo" @close="closeAdd" @refresh="refresh" />
+    <typeAddDialog
+      v-if="isShowAdd"
+      :title="dialoaTitle"
+      :data-info="dataInfo"
+      @close="closeAdd"
+      @refresh="refresh"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import typeAddDialog from '../../components/mycomponent/dialog/server/typeAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import typeAddDialog from "../../components/mycomponent/dialog/server/typeAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage, typeDelete, batchDelete } from '../../api/server/TypeManagement'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import {
+  listPage,
+  typeDelete,
+  batchDelete,
+} from "../../api/server/TypeManagement";
+export default {
+  // 加入分页逻辑
   components: {
-    typeAddDialog, GroupPage
+    typeAddDialog,
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       dataInfo: {},
       selectInfo: {
-        typeName: ''
+        typeName: "",
       },
-      dialoaTitle: '',
-      isShowAdd: false // 显示新增功能
-    }
+      dialoaTitle: "",
+      isShowAdd: false, // 显示新增功能
+      loading: false,
+    };
   },
   methods: {
     // 生成序号
     indexMethod(index) {
-      return index + 1
+      return index + 1;
     },
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-      this.dialoaTitle = '新增服务类型'
+      this.isShowAdd = true;
+      this.dialoaTitle = "新增服务类型";
+      this.dataInfo = {
+        typeCode: "", // 服务类型编号
+        typeName: "", // 服务类型名称
+        description: "", // 描述
+        remark: "", // 备注
+        qualifyIds: [""], // 资质要求
+      };
     },
     handleClick(row) {
-      console.log(row)
-      this.isShowAdd = true
-      this.dialoaTitle = '编辑'
-      this.dataInfo = row
+      console.log(row);
+      this.isShowAdd = true;
+      this.dialoaTitle = "编辑";
+      this.dataInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo)
+        .then((res) => {
+          console.log(res);
+          this.tableData = res;
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     dealAry(scope) {
-      const ary = scope.row.qualifys.map(item => {
-        return item.qualifyName
-      })
-      let str = ''
+      const ary = scope.row.qualifys.map((item) => {
+        return item.qualifyName;
+      });
+      let str = "";
       for (let i = 0; i < ary.length; i++) {
-        str += ary[i]
+        str += ary[i];
       }
-      return str
+      return str;
     },
     Bdelete(row) {
-      const id = row.id
-      typeDelete({ id: id }).then(res => {
-        console.log(res)
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务类型吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          const id = row.id;
+          typeDelete({ id: id }).then((res) => {
+            console.log(res);
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
     },
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的服务类型吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              if (res != "") {
+                this.$message({
+                  message: "删除成功",
+                  type: "success",
+                });
+                this.refresh();
+              }
+            });
           })
-          this.refresh()
-        }
-      })
-    }
-  }
-}
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务类型",
+          type: "error",
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/server/operation.vue b/src/views/server/operation.vue
index 40d80ad..e9a9a10 100644
--- a/src/views/server/operation.vue
+++ b/src/views/server/operation.vue
@@ -6,7 +6,7 @@
         服务名称
         <div class="inputBox" style="width: 120px">
           <el-input
-            v-model="input"
+            v-model="selectInfo.input"
             placeholder="请输入服务名称"
             clearable
             class="product-input"
@@ -18,10 +18,18 @@
           type="primary"
           icon="el-icon-search"
           class="btnItem"
+          @click="selectData"
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -34,12 +42,14 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="BatchDelete"
         >
           删除
         </el-button>
       </div>
     </div>
     <el-table
+    ref="multipleTable"
       :data="tableData"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -49,6 +59,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="date1" label="序号" />
@@ -60,18 +71,10 @@
 
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -93,97 +96,170 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <operation-add-dialog
-      :is-show-info="isShowAdd"
-      @close="closeAdd"
-    />
+    <operation-add-dialog :is-show-info="isShowAdd" @close="closeAdd" />
   </div>
 </template>
 
 <script>
 // 组件
 // import BrandAddDialog from '../../components/mycomponent/dialog/brandAddDialog.vue';
-import OperationAddDialog from '../../components/mycomponent/dialog/server/operationAddDialog.vue'
-
+import OperationAddDialog from "../../components/mycomponent/dialog/server/operationAddDialog.vue";
+import { listPage, O_batchDelete, O_delete } from "../../api/server/operation";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
 
 export default {
   components: {
-    OperationAddDialog
+    OperationAddDialog,
   },
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       tableData: [
         {
-          date1: '1',
-          date: 'fwyy001',
-          name: '4年免费换新',
-          address: '129',
-          address1: '限时9折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "1",
+          date: "fwyy001",
+          name: "4年免费换新",
+          address: "129",
+          address1: "限时9折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '2',
-          date: 'fwyy002',
-          name: '5年免费换新',
-          address: '169',
-          address1: '限时9折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "2",
+          date: "fwyy002",
+          name: "5年免费换新",
+          address: "169",
+          address1: "限时9折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '3',
-          date: 'fwyy003',
-          name: '6年全面保修',
-          address: '94',
-          address1: '限时8折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "3",
+          date: "fwyy003",
+          name: "6年全面保修",
+          address: "94",
+          address1: "限时8折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '4',
-          date: 'fwyy004',
-          name: '7年免费换新',
-          address: '110',
-          address1: '限时8折',
-          address2: '2022/06/01-2022/06/15'
-        }
+          date1: "4",
+          date: "fwyy004",
+          name: "7年免费换新",
+          address: "110",
+          address1: "限时8折",
+          address2: "2022/06/01-2022/06/15",
+        },
       ],
       options: [
         {
-          value: '选项1',
-          label: '黄金糕'
+          value: "选项1",
+          label: "黄金糕",
         },
         {
-          value: '选项2',
-          label: '双皮奶'
+          value: "选项2",
+          label: "双皮奶",
         },
         {
-          value: '选项3',
-          label: '蚵仔煎'
+          value: "选项3",
+          label: "蚵仔煎",
         },
         {
-          value: '选项4',
-          label: '龙须面'
+          value: "选项4",
+          label: "龙须面",
         },
         {
-          value: '选项5',
-          label: '北京烤鸭'
-        }
+          value: "选项5",
+          label: "北京烤鸭",
+        },
       ],
-      value: ''
-    }
+      value: "",
+      selectInfo: {
+        input: "",
+      },
+      loading:false
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-    }
-  }
-}
+      this.isShowAdd = true;
+    },
+    reset() {
+      this.inpute = "";
+    },
+    // 获取指定页面
+    getListPage(limit, offset) {
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err =>{
+        this.loading = false
+      })
+    },
+    // 批量删除
+    BatchDelete() {
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            O_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+          })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
+    },
+    // 删除
+    Bdelete(row) {
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          O_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -225,7 +301,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/supplier/supplierDetail.vue b/src/views/supplier/supplierDetail.vue
new file mode 100644
index 0000000..28f84fb
--- /dev/null
+++ b/src/views/supplier/supplierDetail.vue
@@ -0,0 +1,330 @@
+<!--供应商详情弹窗-->
+<template>
+  <el-dialog title="供应商详情" width="75%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-descriptions title="" :column="2" border>
+      <el-descriptions-item label="供应商名称">{{ baseInfo.supplierName }}</el-descriptions-item>
+      <el-descriptions-item label="供应商编号">{{ baseInfo.supplierCode }}</el-descriptions-item>
+      <el-descriptions-item label="单位性质">{{ baseInfo.companyNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="单位类型">{{ baseInfo.companyTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="详细地址" span="2">
+        {{ baseInfo.companyProvince }} / {{ baseInfo.companyCity }} / {{ baseInfo.companyArea }} / {{ baseInfo.companyAddress }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-tabs v-model="activeTabName" style="margin-top: 20px;">
+      <el-tab-pane label="三证信息" name="certDetail">
+        <cert-info-detail ref="certDetail"/>
+      </el-tab-pane>
+
+      <el-tab-pane label="联系人信息" name="personDetail">
+        <person-info-detail ref="personDetail" />
+      </el-tab-pane>
+
+      <el-tab-pane label="业务信息" name="businessDetail">
+        <business-info-detail ref="businessDetail" />
+      </el-tab-pane>
+
+      <el-tab-pane label="经营信息" name="operationDetail">
+        <operation-info-detail ref="operationDetail" />
+      </el-tab-pane>
+
+      <el-tab-pane label="评审信息" name="reviewDetail">
+        <review-info-detail ref="reviewDetail" />
+      </el-tab-pane>
+
+      <el-tab-pane label="其他信息" name="extraDetail">
+        <extra-info-detail ref="extraDetail" />
+      </el-tab-pane>
+    </el-tabs>
+  </el-dialog>
+</template>
+
+<script>
+
+import CertInfoDetail from '@/views/companyDetail/certInfoDetail'
+import PersonInfoDetail from '@/views/companyDetail/personInfoDetail'
+import BusinessInfoDetail from '@/views/companyDetail/businessInfoDetail'
+import OperationInfoDetail from '@/views/companyDetail/operationInfoDetail'
+import ExtraInfoDetail from '@/views/companyDetail/extraInfoDetail'
+import ReviewInfoDetail from '@/views/companyDetail/reviewInfoDetail'
+import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
+import { baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail } from '@/api/supplier/supplier'
+
+export default {
+  name: 'SupplierDetail',
+  components: {
+    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail, ExtraInfoDetail, ReviewInfoDetail
+  },
+  data() {
+    return {
+      baseInfo: {
+        supplierCode: '',
+        supplierName: '',
+        companyNatureName: '',
+        companyTypeName: '',
+        companyProvince: '',
+        companyCity: '',
+        companyArea: '',
+        companyAddress: ''
+      },
+      activeTabName: 'certDetail',
+      isShowInfo: false
+    }
+  },
+  methods: {
+    tableRowClassName: tableRowClassName,
+    initDialog(dialogStatus, row = null) {
+      this.isShowInfo = true
+      this.activeTabName = 'certDetail'
+      if (row !== null) {
+        this.baseInfo.supplierCode = row.supplierCode
+        this.baseInfo.supplierName = row.supplierName
+      }
+      this.getBaseDetail(row.id)
+      this.getCertDetail(row.supplierCode)
+      this.getPersonDetail(row.supplierCode)
+      this.getBusinessDetail(row.supplierCode)
+      this.getReviewDetail(row.supplierCode)
+    },
+    getBaseDetail(id) {
+      baseDetail({ id: id }).then(res => {
+        if (res !== null && res !== undefined && res !== '') {
+          this.baseInfo.companyNatureName = res.companyNatureName
+          this.baseInfo.companyTypeName = res.companyTypeName
+          this.baseInfo.companyProvince = res.companyProvince
+          this.baseInfo.companyCity = res.companyCity
+          this.baseInfo.companyArea = res.companyArea
+          this.baseInfo.companyAddress = res.companyAddress
+        }
+      })
+    },
+    getCertDetail(supplierCode) {
+      certificateDetail({ supplierCode: supplierCode }).then(res => {
+        if (res !== null && res !== undefined && res !== '') {
+          this.$refs.certDetail.showCertDetail(res)
+        }
+      })
+    },
+    getPersonDetail(supplierCode) {
+      personDetail({ supplierCode: supplierCode }).then(res => {
+        if (res !== null && res !== undefined && res !== '') {
+          this.$refs.personDetail.showPersonDetail(res)
+        }
+      })
+    },
+    getBusinessDetail(supplierCode) {
+      businessDetail({ supplierCode: supplierCode }).then(res => {
+        if (res !== null && res !== undefined && res !== '') {
+          this.$refs.businessDetail.showBusinessDetail(res)
+          this.$refs.operationDetail.showOperationDetail(res)
+          this.$refs.extraDetail.showExtraDetail(res)
+        }
+      })
+    },
+    getReviewDetail(supplierCode) {
+      reviewDetail({ supplierCode: supplierCode }).then(res => {
+        if (res !== null && res !== undefined && res !== '') {
+          this.$refs.reviewDetail.showReviewDetail(res)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.deviceDialog {
+  border-radius: 5px;
+  // overflow: hidden;
+  // padding: 10px ;
+  width: 1125px;
+  height: 100%;
+  box-sizing: border-box;
+}
+
+.selectNav {
+  border: 1px solid #999;
+  border-bottom: 3px solid #fff;
+  position: relative;
+  z-index: 9;
+  box-sizing: border-box;
+  top: 2px;
+}
+
+.content {
+  width: 100%;
+
+  .content_nav {
+    box-sizing: border-box;
+    display: flex;
+    margin: 10px 0;
+    border-bottom: 1px solid #999;
+
+    .nav_item {
+      width: 130px;
+      height: 60px;
+      margin: 0 10px;
+      line-height: 60px;
+      text-align: center;
+    }
+  }
+}
+
+.content_content {
+  // padding: 20px 0 60px 0;
+  // box-sizing: border-box;
+
+}
+
+.headInfo {
+  width: 1000px;
+
+  .inputContent {
+    // flex: 1;
+    display: flex;
+    // flex-direction: column;
+
+    justify-content: space-between;
+    align-items: center;
+  }
+}
+
+.baseInfo {
+  width: 1000px;
+  display: flex;
+
+  .inputContent {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    margin: 0 10px;
+    // justify-content: space-between;
+    // align-items: center;
+  }
+}
+
+.deviceInfo {
+  display: flex;
+  // align-items: center;
+  justify-content: space-between;
+  height: 100%;
+
+  .inputContent {
+    flex: 1;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+}
+
+.dataInfo {
+  display: flex;
+  // align-items: center;
+  justify-content: space-between;
+  height: 100%;
+
+  .inputContent {
+    flex: 1;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+}
+
+.relation {
+  .topbox {
+    .inputContent {
+      display: flex;
+      justify-content: space-between;
+
+      .input-vue {
+        // flex: 1;
+        width: 364px;
+      }
+
+      .doulbe {
+        // width: 572px;
+        width: 602px;
+        padding-left: 27px;
+        // padding-left: 4px;
+      }
+
+      .doulbe2 {
+        padding-left: 12px;
+        width: 588px;
+      }
+    }
+  }
+}
+
+.business, .reviewbox {
+  .inputContent {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .title {
+    padding: 10px 0;
+  }
+}
+
+.manage {
+  .title {
+    background-color: rgb(40, 115, 158);
+    color: #fff;
+    font-size: 22px;
+    padding: 10px;
+    font-weight: bold;
+  }
+
+  .inputContent {
+    display: flex;
+    justify-content: space-between;
+
+    .tableDown {
+      width: 200px;
+      display: flex;
+      align-items: center;
+      padding: 0 10px;
+
+      input {
+        outline: none;
+        border: none;
+        width: 140px;
+      }
+
+      span {
+        margin-left: 5px;
+      }
+
+      color: rgb(40, 115, 158);
+      border: 1px solid lightgray;
+      height: 40px;
+    }
+  }
+
+  .inputbox {
+    display: flex;
+  }
+
+}
+
+.othernfo {
+  .title {
+    background-color: rgb(40, 115, 158);
+    color: #fff;
+    font-size: 22px;
+    padding: 10px;
+    font-weight: bold;
+    margin: 10px 0;
+  }
+
+  .inputContent {
+    display: flex;
+    justify-content: space-between;
+  }
+}
+
+</style>

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
index d8cbbce..593b7cd 100644
--- a/src/api/supplier/supplier.js
+++ b/src/api/supplier/supplier.js
@@ -74,7 +74,27 @@
   }
 }
 
+const baseDetail = (data) => {
+  return instance.post('/supplierInfo/base/detail', data)
+}
+
+const certificateDetail = (data) => {
+  return instance.post('/supplierInfo/certificate/detail', data)
+}
+
+const personDetail = (data) => {
+  return instance.post('/supplierInfo/person/detail', data)
+}
+
+const businessDetail = (data) => {
+  return instance.post('/supplierInfo/business/detail', data)
+}
+
+const reviewDetail = (data) => {
+  return instance.post('/supplierInfo/review/detail', data)
+}
+
 export {
   S_list, listPage, i_list, historyInquiry, r_list, historyReview, e_list, historyEvaluate, a_list, historyAssess,
-  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo
+  inquiryAdd, reviewAdd, evaluateAdd, assessAdd, addSupplierInfo, baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail
 }
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/companyDetail/businessInfoDetail.vue b/src/views/companyDetail/businessInfoDetail.vue
index fcecf33..4703dea 100644
--- a/src/views/companyDetail/businessInfoDetail.vue
+++ b/src/views/companyDetail/businessInfoDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="业务类别">{{ businessInfo.businessTypeName }}</el-descriptions-item>
-      <el-descriptions-item label="主营品类">{{ businessInfo.mainCategory }}</el-descriptions-item>
-      <el-descriptions-item label="业务性质">{{ businessInfo.businessNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="业务类别" :label-style="labelStyle">{{ businessInfo.businessTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="主营品类" :label-style="labelStyle">{{ businessInfo.mainCategory }}</el-descriptions-item>
+      <el-descriptions-item label="业务性质" :label-style="labelStyle">{{ businessInfo.businessNatureName }}</el-descriptions-item>
       <el-descriptions-item label="经营地址">{{ businessInfo.manageAddress }}</el-descriptions-item>
       <el-descriptions-item label="办公场所性质">{{ businessInfo.officeNatureName }}</el-descriptions-item>
       <el-descriptions-item label="办公面积（平方米）">{{ businessInfo.officeSpace }}</el-descriptions-item>
@@ -16,14 +16,14 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="brandName" label="品牌名称" width="300"></el-table-column>
-      <el-table-column prop="brandProperty" label="品牌性质" width="200"></el-table-column>
-      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明">
+      <el-table-column prop="brandName" label="品牌名称"></el-table-column>
+      <el-table-column prop="brandProperty" label="品牌性质" width="300"></el-table-column>
+      <el-table-column prop="brandRegisterCertificate" label="品牌注册证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandRegisterCertificate" :disabled="scope.row.brandRegisterCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="brandAuthCertificate" label="品牌授权证明">
+      <el-table-column prop="brandAuthCertificate" label="品牌授权证明" width="200">
         <template slot-scope="scope">
           <el-link :href="baseUrl + scope.row.brandAuthCertificate" :disabled="scope.row.brandAuthCertificate === ''" type="primary" target="_blank">查看附件</el-link>
         </template>
@@ -46,7 +46,10 @@
         officeSpace: ''
       },
       busDetailBrands: [],
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/extraInfoDetail.vue b/src/views/companyDetail/extraInfoDetail.vue
new file mode 100644
index 0000000..5f46cfa
--- /dev/null
+++ b/src/views/companyDetail/extraInfoDetail.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div style="margin-top: 30px; font-size: 1rem">银行账户信息</div>
+    <el-table :data="busDetailBanks" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accountName" label="账户名称"></el-table-column>
+      <el-table-column prop="accountNumber" label="银行账号" width="300"></el-table-column>
+      <el-table-column prop="depositBank" label="开户行" width="200"></el-table-column>
+      <el-table-column prop="depositBankName" label="开户行名称" width="300"></el-table-column>
+      <el-table-column prop="depositBankNumber" label="开户行号" width="200"></el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">管理体系认证信息</div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="管理体系认证名称" :label-style="labelStyle">{{ manSystemInfo.systemCertificateName }}</el-descriptions-item>
+      <el-descriptions-item label="管理体系认证期限" :label-style="labelStyle">{{ manSystemInfo.systemCertificateTerm }}</el-descriptions-item>
+      <el-descriptions-item label="附件下载" span="2">
+        <el-link :href="baseUrl + manSystemInfo.systemCertificateScan" :disabled="manSystemInfo.systemCertificateScan === '#'" type="primary" target="_blank">管理体系扫描件</el-link>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">资质认证信息</div>
+    <el-table :data="busDetailQualifyCertificates" style="width: 100%" max-height="300px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualifyName" label="资质要求名称" width="300"></el-table-column>
+      <el-table-column prop="qualifyCode" label="资质要求编号" width="300"></el-table-column>
+      <el-table-column prop="qualifyDesc" label="资质要求描述"></el-table-column>
+      <el-table-column prop="proveMaterialDesc" label="附件下载" width="200">
+        <template slot-scope="scope">
+          <el-link :href="baseUrl + scope.row.proveMaterialDesc" :disabled="scope.row.proveMaterialDesc === ''" type="primary" target="_blank">查看附件</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExtraInfoDetail',
+  data() {
+    return {
+      manSystemInfo: {
+        systemCertificateName: '',
+        systemCertificateTerm: '',
+        systemCertificateScan: ''
+      },
+      busDetailBanks: [],
+      busDetailQualifyCertificates: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
+    }
+  },
+  methods: {
+    showExtraDetail(extra) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.manSystemInfo.systemCertificateName = extra.systemCertificateName
+      this.manSystemInfo.systemCertificateTerm = extra.systemCertificateTerm
+      this.manSystemInfo.systemCertificateScan = extra.systemCertificateScan
+
+      this.busDetailBanks = extra.bankList
+      this.busDetailQualifyCertificates = extra.qualifyCertificateList
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/companyDetail/operationInfoDetail.vue b/src/views/companyDetail/operationInfoDetail.vue
index f7346e7..0c31700 100644
--- a/src/views/companyDetail/operationInfoDetail.vue
+++ b/src/views/companyDetail/operationInfoDetail.vue
@@ -1,22 +1,22 @@
 <template>
-  <div class="el-container">
-    <div style="margin-top: 30px; font-size: 1rem">经营信息</div>
+  <div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="上年度收入">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="上年度利润">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearIncomeLabel" :label-style="labelStyle">{{ operationInfo.yearIncome }}</el-descriptions-item>
+      <el-descriptions-item :label="lastYearProfitLabel" :label-style="labelStyle">{{ operationInfo.yearProfit }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.licenseScan" :disabled="certInfo.licenseScan === '#'" type="primary" target="_blank">营业执照扫描件</el-link> |
-        <el-link :href="certInfo.organizeCodeScan" :disabled="certInfo.organizeCodeScan === '#'" type="primary" target="_blank">组织机构代码证扫描件</el-link> |
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + operationInfo.threeYearLiabilitiesTable" :disabled="operationInfo.threeYearLiabilitiesTable === '#'" type="primary" target="_blank">近三年资产负债表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearLossTable" :disabled="operationInfo.threeYearLossTable === '#'" type="primary" target="_blank">近三年损益表</el-link> |
+        <el-link :href="baseUrl + operationInfo.threeYearFlowTable" :disabled="operationInfo.threeYearFlowTable === '#'" type="primary" target="_blank">近三年现金流量表</el-link>
       </el-descriptions-item>
     </el-descriptions>
 
-    <div style="margin-top: 30px; font-size: 1rem">经营许可信息</div>
+    <div style="margin-top: 30px; margin-bottom: 10px; font-size: 1rem">经营许可信息</div>
     <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
-      <el-descriptions-item label="许可证名称">{{ certInfo.threeCertificatesInOne }}</el-descriptions-item>
-      <el-descriptions-item label="许可证期限">{{ certInfo.unifiedSocialCreditCode }}</el-descriptions-item>
+      <el-descriptions-item label="许可证名称" :label-style="labelStyle">{{ licenceInfo.licenseName }}</el-descriptions-item>
+      <el-descriptions-item label="许可证期限" :label-style="labelStyle">{{ licenceInfo.licenseTerm }}</el-descriptions-item>
       <el-descriptions-item label="附件下载" span="2">
-        <el-link :href="certInfo.taxRegisterCodeScan" :disabled="certInfo.taxRegisterCodeScan === '#'" type="primary" target="_blank">税务登记证扫描件</el-link>
+        <el-link :href="baseUrl + licenceInfo.licenseScan" :disabled="licenceInfo.licenseScan === '#'" type="primary" target="_blank">许可证扫描件</el-link>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -25,6 +25,17 @@
 <script>
 export default {
   name: 'OperationInfoDetail',
+  computed: {
+    lastYear: function() {
+      return parseInt(this.operationInfo.currentYear) - 1
+    },
+    lastYearIncomeLabel() {
+      return '上年度(' + this.lastYear + ')收入（万元）'
+    },
+    lastYearProfitLabel() {
+      return '上年度(' + this.lastYear + ')利润（万元）'
+    }
+  },
   data() {
     return {
       operationInfo: {
@@ -40,37 +51,25 @@
         licenseTerm: '',
         licenseScan: '#'
       },
+      baseUrl: '',
+      labelStyle: {
+        width: '20%'
+      }
     }
   },
   methods: {
-    showCertDetail(cert) {
-      this.certInfo.threeCertificatesInOne = cert.threeCertificatesInOne === 1 ? '是' : '否'
-      this.certInfo.unifiedSocialCreditCode = cert.unifiedSocialCreditCode
-      this.certInfo.licenseRegisterNumber = cert.licenseRegisterNumber
-      this.certInfo.registerCapital = cert.registerCapital
-      this.certInfo.registerAddress = cert.registerAddress
-      this.certInfo.legalPerson = cert.legalPerson
-      if (cert.establishDate !== '' && cert.establishDate.length > 10) {
-        this.certInfo.establishDate = cert.establishDate.substring(0, 10)
-      } else {
-        this.certInfo.establishDate = cert.establishDate
-      }
-      this.certInfo.businessTerm = cert.businessTerm
-      this.certInfo.businessScope = cert.businessScope
-      this.certInfo.organizeCode = cert.organizeCode
-      this.certInfo.taxpayerNatureName = cert.taxpayerNatureName
-      this.certInfo.taxRegisterCode = cert.taxRegisterCode
+    showOperationDetail(operation) {
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+      this.operationInfo.currentYear = operation.currentYear
+      this.operationInfo.yearIncome = operation.yearIncome
+      this.operationInfo.yearProfit = operation.yearProfit
+      this.operationInfo.threeYearLiabilitiesTable = operation.threeYearLiabilitiesTable
+      this.operationInfo.threeYearLossTable = operation.threeYearLossTable
+      this.operationInfo.threeYearFlowTable = operation.threeYearFlowTable
 
-      const baseUrl = this.baseConfig.baseUrl + '/static/'
-      if (cert.licenseScan !== '' && cert.licenseScan !== undefined && cert.licenseScan !== null) {
-        this.certInfo.licenseScan = baseUrl + cert.licenseScan
-      }
-      if (cert.organizeCodeScan !== '' && cert.organizeCodeScan !== undefined && cert.organizeCodeScan !== null) {
-        this.certInfo.organizeCodeScan = baseUrl + cert.organizeCodeScan
-      }
-      if (cert.taxRegisterCodeScan !== '' && cert.taxRegisterCodeScan !== undefined && cert.taxRegisterCodeScan !== null) {
-        this.certInfo.taxRegisterCodeScan = baseUrl + cert.taxRegisterCodeScan
-      }
+      this.licenceInfo.licenseName = operation.licenseName
+      this.licenceInfo.licenseTerm = operation.licenseTerm
+      this.licenceInfo.licenseScan = operation.licenseScan
     }
   }
 }
diff --git a/src/views/companyDetail/personInfoDetail.vue b/src/views/companyDetail/personInfoDetail.vue
index 02a6d43..449b047 100644
--- a/src/views/companyDetail/personInfoDetail.vue
+++ b/src/views/companyDetail/personInfoDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="el-container">
     <el-descriptions class="margin-top" title="" :column="3" border style="width: 100%">
-      <el-descriptions-item label="法人代表姓名">{{ personInfo.legalPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表手机号">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
-      <el-descriptions-item label="法人代表证件">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表姓名" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonName }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表手机号" :label-style="labelStyle" :content-style="contentStyle">{{ personInfo.legalPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="法人代表证件" :label-style="labelStyle">{{ personInfo.legalPersonCertificateTypeName }}  {{ personInfo.legalPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="业务负责人姓名">{{ personInfo.businessLeaderName }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人手机号">{{ personInfo.businessLeaderPhone }}</el-descriptions-item>
       <el-descriptions-item label="业务负责人证件">{{ personInfo.businessLeaderCertificateTypeName }}  {{ personInfo.businessLeaderCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="备用联系人姓名">{{ personInfo.backupPersonName }}</el-descriptions-item>
-      <el-descriptions-item label="备用联系人手机号">{{ personInfo.backupPersonPhone }}</el-descriptions-item>
+      <el-descriptions-item label="备用联系人手机号" >{{ personInfo.backupPersonPhone }}</el-descriptions-item>
       <el-descriptions-item label="备用联系人证件">{{ personInfo.backupPersonCertificateTypeName }}  {{ personInfo.backupPersonCertificateCode }}</el-descriptions-item>
 
       <el-descriptions-item label="技术负责人姓名">{{ personInfo.technicalLeaderName }}</el-descriptions-item>
@@ -69,7 +69,13 @@
         financeLeaderCertificateTypeName: '',
         financeLeaderCertificateCode: ''
       },
-      baseUrl: ''
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      },
+      contentStyle: {
+        width: '15%'
+      }
     }
   },
   methods: {
diff --git a/src/views/companyDetail/reviewInfoDetail.vue b/src/views/companyDetail/reviewInfoDetail.vue
new file mode 100644
index 0000000..5edd644
--- /dev/null
+++ b/src/views/companyDetail/reviewInfoDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="" :column="2" border style="width: 100%">
+      <el-descriptions-item label="供应商状态" :label-style="labelStyle" span="2">{{ reviewInfo.supplierStatusName }}</el-descriptions-item>
+      <el-descriptions-item label="资料预审结果" :label-style="labelStyle">{{ reviewInfo.preReviewResultName }}</el-descriptions-item>
+      <el-descriptions-item label="录库评审结果" :label-style="labelStyle">{{ reviewInfo.inputReviewResultName }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div style="margin-top: 30px; font-size: 1rem">季度评价记录</div>
+    <el-table :data="quarterlyEvaluateList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="evaluateQuarterly" label="评价季度" width="200" >
+        <template slot-scope="scope">
+          {{ scope.row.evaluateYearName }}年 {{ scope.row.evaluateQuarterlyName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="quarterlyEvaluateResultName" label="评价结果" width="100"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateIllustration" label="评价说明"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="100" />
+      <el-table-column prop="quarterlyEvaluateFile" label="评价附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.quarterlyEvaluateFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div style="margin-top: 30px; font-size: 1rem">年度考核记录</div>
+    <el-table :data="annualAssessList" style="width: 100%" max-height="400px" :highlight-current-row="true">
+      <el-table-column label="序号" width="75">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="assessAnnualName" label="考核年度" width="200" ></el-table-column>
+      <el-table-column prop="annualAssessResultName" label="考核结果" width="100"></el-table-column>
+      <el-table-column prop="annualAssessIllustration" label="考核说明"></el-table-column>
+      <el-table-column prop="annualAssessDate" label="考核日期" width="100" />
+      <el-table-column prop="annualAssessFile" label="考核附件" width="400">
+        <template slot-scope="scope">
+          <el-link v-for="(item, index) in scope.row.annualAssessFileList" :href="baseUrl + item" :disabled="item === ''" type="primary" target="_blank" style="margin-right: 10px;">附件{{ index + 1 }}</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReviewInfoDetail',
+  data() {
+    return {
+      reviewInfo: {
+        supplierStatusName: '',
+        preReviewResultName: '',
+        inputReviewResultName: ''
+      },
+      quarterlyEvaluateList: [],
+      annualAssessList: [],
+      baseUrl: '',
+      labelStyle: {
+        width: '15%'
+      }
+    }
+  },
+  methods: {
+    showReviewDetail(review) {
+      this.reviewInfo = review
+      this.quarterlyEvaluateList = review.quarterlyEvaluateList
+      this.quarterlyEvaluateList.forEach(item => {
+        if (item.quarterlyEvaluateDate !== '' && item.quarterlyEvaluateDate.length > 10) {
+          item.quarterlyEvaluateDate = item.quarterlyEvaluateDate.substring(0, 10)
+        }
+
+        if (item.quarterlyEvaluateFile !== '') {
+          item.quarterlyEvaluateFileList = item.quarterlyEvaluateFile.split(',')
+        }
+      })
+
+      this.annualAssessList = review.annualAssessList
+      this.annualAssessList.forEach(item => {
+        if (item.annualAssessDate !== '' && item.annualAssessDate.length > 10) {
+          item.annualAssessDate = item.annualAssessDate.substring(0, 10)
+        }
+        if (item.annualAssessFile !== '') {
+          item.annualAssessFileList = item.annualAssessFile.split(',')
+        }
+      })
+
+      this.baseUrl = this.baseConfig.baseUrl + '/static/'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/distributor/distributorDetail.vue b/src/views/distributor/distributorDetail.vue
index 78b2bbb..52e2bb3 100644
--- a/src/views/distributor/distributorDetail.vue
+++ b/src/views/distributor/distributorDetail.vue
@@ -29,172 +29,9 @@
       </el-tab-pane>
 
       <el-tab-pane label="其他信息" name="extraDetail">
-        其他附加
+        <extra-info-detail ref="extraDetail" />
       </el-tab-pane>
     </el-tabs>
-
-<!--    <div class="deviceDialog ">-->
-<!--      &lt;!&ndash; {{personInfo}} &ndash;&gt;-->
-<!--      <div class="headInfo">-->
-<!--      </div>-->
-<!--      <div class="content">-->
-<!--        <div class="content_nav">-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">-->
-<!--            三证信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">-->
-<!--            联系人信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">-->
-<!--            业务信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 3 }" @click="changeNav(3)">-->
-<!--            经营信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 4 }" @click="changeNav(4)">-->
-<!--            评审信息-->
-<!--          </div>-->
-<!--          <div class="nav_item" :class="{ selectNav: navSelect == 5 }" @click="changeNav(5)">-->
-<!--            其他信息-->
-<!--          </div>-->
-<!--        </div>-->
-<!--          <div v-if="navSelect == 4" class="reviewbox">-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.supplierStatusName"-->
-<!--                title="供应商状态"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.preReviewResultName"-->
-<!--                title="资料预审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="reviewInfo.inputReviewResult"-->
-<!--                title="录库评审结果"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史季度评价-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.quarterlyEvaluateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="evaluateQuarterly" label="评价季度" />-->
-<!--              <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" />-->
-<!--              <el-table-column prop="quarterlyEvaluateIllustration" label="季度评价说明" />-->
-<!--              <el-table-column prop="quarterlyEvaluateDate" label="季度评价时间" />-->
-<!--              <el-table-column prop="quarterlyEvaluateFile" label="评价详情" />-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="reviewInfo.annualAssessList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="supplierCode" label="序号" />-->
-<!--              <el-table-column prop="assessAnnual" label="考核年度" />-->
-<!--              <el-table-column prop="annualAssessResult" label="年度考核结果" />-->
-<!--              <el-table-column prop="annualAssessIllustration" label="年度考核时说明" />-->
-<!--              <el-table-column prop="annualAssessDate" label="年度考核时间" />-->
-<!--              <el-table-column prop="annualAssessFile" label="考核详情" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--          <div v-if="navSelect == 5" class="othernfo">-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.bankList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              &lt;!&ndash; <el-table-column prop="date" label="序号" > </el-table-column> &ndash;&gt;-->
-<!--              <el-table-column prop="accountName" label="账户名称" />-->
-<!--              <el-table-column prop="accountNumber" label="银行账号" />-->
-<!--              <el-table-column prop="depositBank" label="开户行" />-->
-<!--              <el-table-column prop="depositBankName" label="开户行名称" />-->
-<!--              <el-table-column prop="depositBankNumber" label="开户行号" />-->
-<!--              &lt;!&ndash; <el-table-column prop="address" label="操作"> </el-table-column> &ndash;&gt;-->
-<!--            </el-table>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <div class="inputContent">-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateName"-->
-<!--                title="管理体系认证名称"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateTerm"-->
-<!--                title="管理体系认证期限"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--              <input-vue-->
-<!--                v-model="businessInfo.systemCertificateScan"-->
-<!--                title="管理体系扫描件"-->
-<!--                width="200px"-->
-<!--                disabled="true"-->
-<!--              />-->
-<!--            </div>-->
-<!--            <div class="title">-->
-<!--              历史年度考核-->
-<!--            </div>-->
-<!--            <el-table-->
-<!--              height="200"-->
-<!--              :data="businessInfo.qualifyCertificateList"-->
-<!--              :row-class-name="tableRowClassName"-->
-<!--              :header-cell-style="{-->
-<!--                'text-align': 'center',-->
-<!--                background: '  #2483b3',-->
-<!--                color: 'white',-->
-<!--              }"-->
-<!--              :row-style="{ 'text-align': 'center' }"-->
-<!--              style="width: 100%"-->
-<!--            >-->
-<!--              <el-table-column prop="id" label="序号" />-->
-<!--              <el-table-column prop="qualifyName" label="资质需要名称" />-->
-<!--              <el-table-column prop="qualifyDesc" label="资质需求描述" />-->
-<!--              <el-table-column prop="proveMaterialDesc" label="资质要求材料" />-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
   </el-dialog>
 </template>
 
@@ -204,13 +41,14 @@
 import PersonInfoDetail from '@/views/companyDetail/personInfoDetail'
 import BusinessInfoDetail from '@/views/companyDetail/businessInfoDetail'
 import OperationInfoDetail from '@/views/companyDetail/operationInfoDetail'
+import ExtraInfoDetail from '@/views/companyDetail/extraInfoDetail'
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { certificateDetail, personDetail, businessDetail } from '@/api/distributor/distributor'
 
 export default {
   name: 'DistributorDetail',
   components: {
-    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail
+    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail, ExtraInfoDetail
   },
   data() {
     return {
@@ -225,10 +63,6 @@
         companyAddress: ''
       },
       activeTabName: 'certDetail',
-      certificateInfo: '',
-      personInfo: '',
-      businessInfo: '',
-      reviewInfo: '',
       isShowInfo: false
     }
   },
@@ -270,6 +104,8 @@
       businessDetail({ distributorCode: distributorCode }).then(res => {
         if (res !== null && res !== undefined && res !== '') {
           this.$refs.businessDetail.showBusinessDetail(res)
+          this.$refs.operationDetail.showOperationDetail(res)
+          this.$refs.extraDetail.showExtraDetail(res)
         }
       })
     }
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 683549f..3956bd0 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -51,7 +51,6 @@
     </el-table>
     <!-- 分页组件 -->
     <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
-<!--    <distributor-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />-->
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -59,7 +58,6 @@
 <script>
 // 组件
 import GroupPage from '@/components/mycomponent/groupPage'
-// import DistributorInfoDialog from '@/components/mycomponent/dialog/distributor/distributorInfoDialog'
 import DistributorDetail from '@/views/distributor/distributorDetail'
 // 逻辑
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
@@ -70,12 +68,10 @@
   components: {
     DistributorDetail,
     GroupPage
-    // DistributorInfoDialog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
-      // isShowAdd:false,//显示新增功能
       selectInfo: { // 搜索框中的数据的数据
         distributorCode: '',
         distributorName: ''
@@ -105,7 +101,7 @@
     },
     detail(row) {
       this.$refs.distributorDetail.initDialog('detail', row)
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 36e1a2d..df1f8de 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -52,6 +52,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -103,7 +104,8 @@
       selectInfo: {
         orderId: '',
         userName: ''
-      }
+      },
+      loading:false
 
     }
   },
@@ -111,12 +113,16 @@
     tableRowClassName: tableRowClassName,
 
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 1f84e63..0a1c756 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -60,6 +60,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -126,7 +127,8 @@
         itemBudget: '',
         itemDuration: ''
       },
-      busOppoId: ''
+      busOppoId: '',
+      loading:false
     }
   },
   methods: {
@@ -141,12 +143,16 @@
       this.busOppoId = row.busOppoId
     },
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
@@ -155,7 +161,7 @@
         itemBudget: '',
         itemDuration: ''
       }
-    }
+    },
   }
 }
 </script>
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index f573fd8..bed5935 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -21,7 +21,12 @@
             placeholder="请选择服务类型"
             style="width: 200px"
           >
-            <el-option v-for="item in options" :key="item.id" :label="item.typeName" :value="item.typeCode" />
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.typeCode"
+            />
           </el-select>
         </div>
       </div>
@@ -34,7 +39,14 @@
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -47,7 +59,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -64,6 +76,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -75,18 +88,10 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -117,100 +122,141 @@
 
 <script>
 // 组件
-import ManagementAddDialog from '../../components/mycomponent/dialog/server/managementAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ManagementAddDialog from "../../components/mycomponent/dialog/server/managementAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { listPage, M_batchDelete, M_delete } from '../../api/server/Management'
-import { TM_list } from '../../api/server/TypeManagement'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { listPage, M_batchDelete, M_delete } from "../../api/server/Management";
+import { TM_list } from "../../api/server/TypeManagement";
 
 export default {
   components: {
     ManagementAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        serviceName: '',
-        typeCode: ''
+        serviceName: "",
+        typeCode: "",
       },
       options: [],
-      title: ''
-    }
+      title: "",
+      loading:false
+    };
   },
   mounted() {
-    TM_list().then(res => {
-      console.log(res)
-      this.options = res
-    })
+    TM_list().then((res) => {
+      console.log(res);
+      this.options = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.title = '服务新增'
-      this.isShowAdd = true
-      this.rowInfo = ''
+      this.title = "服务新增";
+      this.isShowAdd = true;
+      this.rowInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+        id: "",
+      };
     },
     handleClick(row) {
-      this.title = '服务编辑'
-      this.isShowAdd = true
-      console.log(row)
-      this.rowInfo = row
+      this.title = "服务编辑";
+      this.isShowAdd = true;
+      console.log(row);
+      this.rowInfo = row;
+    },
+    reset() {
+      // 重置
+      this.selectInfo = {
+        serviceName: "",
+        typeCode: "",
+      };
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      M_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            M_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      M_delete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          M_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -252,7 +298,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/server/TypeManagement.vue b/src/views/server/TypeManagement.vue
index 4fe0cab..c13185a 100644
--- a/src/views/server/TypeManagement.vue
+++ b/src/views/server/TypeManagement.vue
@@ -5,21 +5,41 @@
       <div class="serveInput">
         服务类型名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.typeName" placeholder="请输入服务类型名称" clearable class="serve-input" />
+          <el-input
+            v-model="selectInfo.typeName"
+            placeholder="请输入服务类型名称"
+            clearable
+            class="serve-input"
+          />
         </div>
       </div>
       <div class="serveBtn">
         <!-- <el-button type="primary" class="btnItem">查询</el-button>
         <el-button type="success" class="btnItem bggreen" @click="addCategory">新增</el-button>
         <el-button type="danger" class="btnItem bgred">删除</el-button> -->
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
 
-        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
+        <el-button
+          type="success"
+          icon="el-icon-circle-plus-outline"
+          class="btnItem bggreen"
+          @click="addCategory"
+        >
           新增
         </el-button>
-        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
+        <el-button
+          type="danger"
+          icon="el-icon-delete-solid"
+          class="btnItem bgred"
+          @click="BatchDelete"
+        >
           删除
         </el-button>
       </div>
@@ -35,9 +55,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" :index="indexMethod" label="序号" width="55" />
+      <el-table-column
+        type="index"
+        :index="indexMethod"
+        label="序号"
+        width="55"
+      />
       <el-table-column prop="typeCode" label="服务类型编号" />
       <el-table-column prop="typeName" label="服务类型名称" />
       <el-table-column prop="description" label="描述" />
@@ -71,101 +97,148 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <typeAddDialog v-if="isShowAdd" :title="dialoaTitle" :data-info="dataInfo" @close="closeAdd" @refresh="refresh" />
+    <typeAddDialog
+      v-if="isShowAdd"
+      :title="dialoaTitle"
+      :data-info="dataInfo"
+      @close="closeAdd"
+      @refresh="refresh"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import typeAddDialog from '../../components/mycomponent/dialog/server/typeAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import typeAddDialog from "../../components/mycomponent/dialog/server/typeAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage, typeDelete, batchDelete } from '../../api/server/TypeManagement'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import {
+  listPage,
+  typeDelete,
+  batchDelete,
+} from "../../api/server/TypeManagement";
+export default {
+  // 加入分页逻辑
   components: {
-    typeAddDialog, GroupPage
+    typeAddDialog,
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       dataInfo: {},
       selectInfo: {
-        typeName: ''
+        typeName: "",
       },
-      dialoaTitle: '',
-      isShowAdd: false // 显示新增功能
-    }
+      dialoaTitle: "",
+      isShowAdd: false, // 显示新增功能
+      loading: false,
+    };
   },
   methods: {
     // 生成序号
     indexMethod(index) {
-      return index + 1
+      return index + 1;
     },
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-      this.dialoaTitle = '新增服务类型'
+      this.isShowAdd = true;
+      this.dialoaTitle = "新增服务类型";
+      this.dataInfo = {
+        typeCode: "", // 服务类型编号
+        typeName: "", // 服务类型名称
+        description: "", // 描述
+        remark: "", // 备注
+        qualifyIds: [""], // 资质要求
+      };
     },
     handleClick(row) {
-      console.log(row)
-      this.isShowAdd = true
-      this.dialoaTitle = '编辑'
-      this.dataInfo = row
+      console.log(row);
+      this.isShowAdd = true;
+      this.dialoaTitle = "编辑";
+      this.dataInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo)
+        .then((res) => {
+          console.log(res);
+          this.tableData = res;
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     dealAry(scope) {
-      const ary = scope.row.qualifys.map(item => {
-        return item.qualifyName
-      })
-      let str = ''
+      const ary = scope.row.qualifys.map((item) => {
+        return item.qualifyName;
+      });
+      let str = "";
       for (let i = 0; i < ary.length; i++) {
-        str += ary[i]
+        str += ary[i];
       }
-      return str
+      return str;
     },
     Bdelete(row) {
-      const id = row.id
-      typeDelete({ id: id }).then(res => {
-        console.log(res)
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务类型吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          const id = row.id;
+          typeDelete({ id: id }).then((res) => {
+            console.log(res);
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
     },
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的服务类型吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              if (res != "") {
+                this.$message({
+                  message: "删除成功",
+                  type: "success",
+                });
+                this.refresh();
+              }
+            });
           })
-          this.refresh()
-        }
-      })
-    }
-  }
-}
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务类型",
+          type: "error",
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/server/operation.vue b/src/views/server/operation.vue
index 40d80ad..e9a9a10 100644
--- a/src/views/server/operation.vue
+++ b/src/views/server/operation.vue
@@ -6,7 +6,7 @@
         服务名称
         <div class="inputBox" style="width: 120px">
           <el-input
-            v-model="input"
+            v-model="selectInfo.input"
             placeholder="请输入服务名称"
             clearable
             class="product-input"
@@ -18,10 +18,18 @@
           type="primary"
           icon="el-icon-search"
           class="btnItem"
+          @click="selectData"
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -34,12 +42,14 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="BatchDelete"
         >
           删除
         </el-button>
       </div>
     </div>
     <el-table
+    ref="multipleTable"
       :data="tableData"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -49,6 +59,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="date1" label="序号" />
@@ -60,18 +71,10 @@
 
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -93,97 +96,170 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <operation-add-dialog
-      :is-show-info="isShowAdd"
-      @close="closeAdd"
-    />
+    <operation-add-dialog :is-show-info="isShowAdd" @close="closeAdd" />
   </div>
 </template>
 
 <script>
 // 组件
 // import BrandAddDialog from '../../components/mycomponent/dialog/brandAddDialog.vue';
-import OperationAddDialog from '../../components/mycomponent/dialog/server/operationAddDialog.vue'
-
+import OperationAddDialog from "../../components/mycomponent/dialog/server/operationAddDialog.vue";
+import { listPage, O_batchDelete, O_delete } from "../../api/server/operation";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
 
 export default {
   components: {
-    OperationAddDialog
+    OperationAddDialog,
   },
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       tableData: [
         {
-          date1: '1',
-          date: 'fwyy001',
-          name: '4年免费换新',
-          address: '129',
-          address1: '限时9折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "1",
+          date: "fwyy001",
+          name: "4年免费换新",
+          address: "129",
+          address1: "限时9折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '2',
-          date: 'fwyy002',
-          name: '5年免费换新',
-          address: '169',
-          address1: '限时9折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "2",
+          date: "fwyy002",
+          name: "5年免费换新",
+          address: "169",
+          address1: "限时9折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '3',
-          date: 'fwyy003',
-          name: '6年全面保修',
-          address: '94',
-          address1: '限时8折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "3",
+          date: "fwyy003",
+          name: "6年全面保修",
+          address: "94",
+          address1: "限时8折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '4',
-          date: 'fwyy004',
-          name: '7年免费换新',
-          address: '110',
-          address1: '限时8折',
-          address2: '2022/06/01-2022/06/15'
-        }
+          date1: "4",
+          date: "fwyy004",
+          name: "7年免费换新",
+          address: "110",
+          address1: "限时8折",
+          address2: "2022/06/01-2022/06/15",
+        },
       ],
       options: [
         {
-          value: '选项1',
-          label: '黄金糕'
+          value: "选项1",
+          label: "黄金糕",
         },
         {
-          value: '选项2',
-          label: '双皮奶'
+          value: "选项2",
+          label: "双皮奶",
         },
         {
-          value: '选项3',
-          label: '蚵仔煎'
+          value: "选项3",
+          label: "蚵仔煎",
         },
         {
-          value: '选项4',
-          label: '龙须面'
+          value: "选项4",
+          label: "龙须面",
         },
         {
-          value: '选项5',
-          label: '北京烤鸭'
-        }
+          value: "选项5",
+          label: "北京烤鸭",
+        },
       ],
-      value: ''
-    }
+      value: "",
+      selectInfo: {
+        input: "",
+      },
+      loading:false
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-    }
-  }
-}
+      this.isShowAdd = true;
+    },
+    reset() {
+      this.inpute = "";
+    },
+    // 获取指定页面
+    getListPage(limit, offset) {
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err =>{
+        this.loading = false
+      })
+    },
+    // 批量删除
+    BatchDelete() {
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            O_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+          })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
+    },
+    // 删除
+    Bdelete(row) {
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          O_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -225,7 +301,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/supplier/supplierDetail.vue b/src/views/supplier/supplierDetail.vue
new file mode 100644
index 0000000..28f84fb
--- /dev/null
+++ b/src/views/supplier/supplierDetail.vue
@@ -0,0 +1,330 @@
+<!--供应商详情弹窗-->
+<template>
+  <el-dialog title="供应商详情" width="75%" :visible.sync="isShowInfo" append-to-body :close-on-click-modal="false">
+    <el-descriptions title="" :column="2" border>
+      <el-descriptions-item label="供应商名称">{{ baseInfo.supplierName }}</el-descriptions-item>
+      <el-descriptions-item label="供应商编号">{{ baseInfo.supplierCode }}</el-descriptions-item>
+      <el-descriptions-item label="单位性质">{{ baseInfo.companyNatureName }}</el-descriptions-item>
+      <el-descriptions-item label="单位类型">{{ baseInfo.companyTypeName }}</el-descriptions-item>
+      <el-descriptions-item label="详细地址" span="2">
+        {{ baseInfo.companyProvince }} / {{ baseInfo.companyCity }} / {{ baseInfo.companyArea }} / {{ baseInfo.companyAddress }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-tabs v-model="activeTabName" style="margin-top: 20px;">
+      <el-tab-pane label="三证信息" name="certDetail">
+        <cert-info-detail ref="certDetail"/>
+      </el-tab-pane>
+
+      <el-tab-pane label="联系人信息" name="personDetail">
+        <person-info-detail ref="personDetail" />
+      </el-tab-pane>
+
+      <el-tab-pane label="业务信息" name="businessDetail">
+        <business-info-detail ref="businessDetail" />
+      </el-tab-pane>
+
+      <el-tab-pane label="经营信息" name="operationDetail">
+        <operation-info-detail ref="operationDetail" />
+      </el-tab-pane>
+
+      <el-tab-pane label="评审信息" name="reviewDetail">
+        <review-info-detail ref="reviewDetail" />
+      </el-tab-pane>
+
+      <el-tab-pane label="其他信息" name="extraDetail">
+        <extra-info-detail ref="extraDetail" />
+      </el-tab-pane>
+    </el-tabs>
+  </el-dialog>
+</template>
+
+<script>
+
+import CertInfoDetail from '@/views/companyDetail/certInfoDetail'
+import PersonInfoDetail from '@/views/companyDetail/personInfoDetail'
+import BusinessInfoDetail from '@/views/companyDetail/businessInfoDetail'
+import OperationInfoDetail from '@/views/companyDetail/operationInfoDetail'
+import ExtraInfoDetail from '@/views/companyDetail/extraInfoDetail'
+import ReviewInfoDetail from '@/views/companyDetail/reviewInfoDetail'
+import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
+import { baseDetail, certificateDetail, personDetail, businessDetail, reviewDetail } from '@/api/supplier/supplier'
+
+export default {
+  name: 'SupplierDetail',
+  components: {
+    CertInfoDetail, PersonInfoDetail, BusinessInfoDetail, OperationInfoDetail, ExtraInfoDetail, ReviewInfoDetail
+  },
+  data() {
+    return {
+      baseInfo: {
+        supplierCode: '',
+        supplierName: '',
+        companyNatureName: '',
+        companyTypeName: '',
+        companyProvince: '',
+        companyCity: '',
+        companyArea: '',
+        companyAddress: ''
+      },
+      activeTabName: 'certDetail',
+      isShowInfo: false
+    }
+  },
+  methods: {
+    tableRowClassName: tableRowClassName,
+    initDialog(dialogStatus, row = null) {
+      this.isShowInfo = true
+      this.activeTabName = 'certDetail'
+      if (row !== null) {
+        this.baseInfo.supplierCode = row.supplierCode
+        this.baseInfo.supplierName = row.supplierName
+      }
+      this.getBaseDetail(row.id)
+      this.getCertDetail(row.supplierCode)
+      this.getPersonDetail(row.supplierCode)
+      this.getBusinessDetail(row.supplierCode)
+      this.getReviewDetail(row.supplierCode)
+    },
+    getBaseDetail(id) {
+      baseDetail({ id: id }).then(res => {
+        if (res !== null && res !== undefined && res !== '') {
+          this.baseInfo.companyNatureName = res.companyNatureName
+          this.baseInfo.companyTypeName = res.companyTypeName
+          this.baseInfo.companyProvince = res.companyProvince
+          this.baseInfo.companyCity = res.companyCity
+          this.baseInfo.companyArea = res.companyArea
+          this.baseInfo.companyAddress = res.companyAddress
+        }
+      })
+    },
+    getCertDetail(supplierCode) {
+      certificateDetail({ supplierCode: supplierCode }).then(res => {
+        if (res !== null && res !== undefined && res !== '') {
+          this.$refs.certDetail.showCertDetail(res)
+        }
+      })
+    },
+    getPersonDetail(supplierCode) {
+      personDetail({ supplierCode: supplierCode }).then(res => {
+        if (res !== null && res !== undefined && res !== '') {
+          this.$refs.personDetail.showPersonDetail(res)
+        }
+      })
+    },
+    getBusinessDetail(supplierCode) {
+      businessDetail({ supplierCode: supplierCode }).then(res => {
+        if (res !== null && res !== undefined && res !== '') {
+          this.$refs.businessDetail.showBusinessDetail(res)
+          this.$refs.operationDetail.showOperationDetail(res)
+          this.$refs.extraDetail.showExtraDetail(res)
+        }
+      })
+    },
+    getReviewDetail(supplierCode) {
+      reviewDetail({ supplierCode: supplierCode }).then(res => {
+        if (res !== null && res !== undefined && res !== '') {
+          this.$refs.reviewDetail.showReviewDetail(res)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.deviceDialog {
+  border-radius: 5px;
+  // overflow: hidden;
+  // padding: 10px ;
+  width: 1125px;
+  height: 100%;
+  box-sizing: border-box;
+}
+
+.selectNav {
+  border: 1px solid #999;
+  border-bottom: 3px solid #fff;
+  position: relative;
+  z-index: 9;
+  box-sizing: border-box;
+  top: 2px;
+}
+
+.content {
+  width: 100%;
+
+  .content_nav {
+    box-sizing: border-box;
+    display: flex;
+    margin: 10px 0;
+    border-bottom: 1px solid #999;
+
+    .nav_item {
+      width: 130px;
+      height: 60px;
+      margin: 0 10px;
+      line-height: 60px;
+      text-align: center;
+    }
+  }
+}
+
+.content_content {
+  // padding: 20px 0 60px 0;
+  // box-sizing: border-box;
+
+}
+
+.headInfo {
+  width: 1000px;
+
+  .inputContent {
+    // flex: 1;
+    display: flex;
+    // flex-direction: column;
+
+    justify-content: space-between;
+    align-items: center;
+  }
+}
+
+.baseInfo {
+  width: 1000px;
+  display: flex;
+
+  .inputContent {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    margin: 0 10px;
+    // justify-content: space-between;
+    // align-items: center;
+  }
+}
+
+.deviceInfo {
+  display: flex;
+  // align-items: center;
+  justify-content: space-between;
+  height: 100%;
+
+  .inputContent {
+    flex: 1;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+}
+
+.dataInfo {
+  display: flex;
+  // align-items: center;
+  justify-content: space-between;
+  height: 100%;
+
+  .inputContent {
+    flex: 1;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+}
+
+.relation {
+  .topbox {
+    .inputContent {
+      display: flex;
+      justify-content: space-between;
+
+      .input-vue {
+        // flex: 1;
+        width: 364px;
+      }
+
+      .doulbe {
+        // width: 572px;
+        width: 602px;
+        padding-left: 27px;
+        // padding-left: 4px;
+      }
+
+      .doulbe2 {
+        padding-left: 12px;
+        width: 588px;
+      }
+    }
+  }
+}
+
+.business, .reviewbox {
+  .inputContent {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .title {
+    padding: 10px 0;
+  }
+}
+
+.manage {
+  .title {
+    background-color: rgb(40, 115, 158);
+    color: #fff;
+    font-size: 22px;
+    padding: 10px;
+    font-weight: bold;
+  }
+
+  .inputContent {
+    display: flex;
+    justify-content: space-between;
+
+    .tableDown {
+      width: 200px;
+      display: flex;
+      align-items: center;
+      padding: 0 10px;
+
+      input {
+        outline: none;
+        border: none;
+        width: 140px;
+      }
+
+      span {
+        margin-left: 5px;
+      }
+
+      color: rgb(40, 115, 158);
+      border: 1px solid lightgray;
+      height: 40px;
+    }
+  }
+
+  .inputbox {
+    display: flex;
+  }
+
+}
+
+.othernfo {
+  .title {
+    background-color: rgb(40, 115, 158);
+    color: #fff;
+    font-size: 22px;
+    padding: 10px;
+    font-weight: bold;
+    margin: 10px 0;
+  }
+
+  .inputContent {
+    display: flex;
+    justify-content: space-between;
+  }
+}
+
+</style>
diff --git a/src/views/supplier/supplierList.vue b/src/views/supplier/supplierList.vue
index ec37280..1d51ad1 100644
--- a/src/views/supplier/supplierList.vue
+++ b/src/views/supplier/supplierList.vue
@@ -13,16 +13,14 @@
         </div>
         供应商状态
         <div class="inputBox" style="width: 200px">
-          <input-vue title="供应商状态" class="inputWidth">
-            <el-select v-model="selectInfo.supplierStatus" clearable placeholder="供应商状态" style="width: 200px">
-              <el-option
-                v-for="item in supplierStatusOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </input-vue>
+          <el-select v-model="selectInfo.supplierStatus" clearable placeholder="供应商状态" style="width: 200px">
+            <el-option
+              v-for="item in supplierStatusOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </div>
       </div>
       <div class="productBtn">
@@ -59,7 +57,7 @@
       <el-table-column prop="latestAnnualAssessResultName" label="最新年度考核结果" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleClick(scope.row)">
+          <el-button type="text" size="small" @click="detail(scope.row)">
             详情
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -69,37 +67,33 @@
     <!-- 分页组件 -->
     <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <!-- <category-add-dialog  :isShowInfo="isShowAdd"  @close ="closeAdd"></category-add-dialog> -->
-    <supplier-info-dialog :is-show-info="isShowAdd" :data-info="dataInfo" @close="closeAdd" />
+    <supplier-detail ref="supplierDetail" />
   </div>
 </template>
 
 <script>
 // 组件
 import GroupPage from '@/components/mycomponent/groupPage'
-import SupplierInfoDialog from '@/components/mycomponent/dialog/salesDialog/supplierInfoDialog'
+import SupplierDetail from '@/views/supplier/supplierDetail'
 // 逻辑
 import { tableRowClassName } from '@/utils/myUtils/changeTableTr'
 import { getDictByCode } from '@/api/system/dict'
 import { listMixin } from '@/utils/myUtils/mixins/listPage'
 import { listPage } from '@/api/supplier/supplier'
-import { outToExcel } from '@/utils/myUtils/exportToExcel'
 export default { // 加入分页逻辑
   components: {
-    SupplierInfoDialog,
+    SupplierDetail,
     GroupPage
   },
   mixins: [listMixin],
   data() {
     return {
-      isShowAdd: false, // 显示新增功能
       selectInfo: {
         supplierCode: '',
         supplierName: '',
         supplierStatus: ''
       },
-      supplierStatusOptions: [],
-      dataInfo: ''
+      supplierStatusOptions: []
     }
   },
   mounted() {
@@ -108,14 +102,6 @@
   },
   methods: {
     tableRowClassName: tableRowClassName,
-    closeAdd() {
-      this.isShowAdd = false
-    },
-    handleClick(row) {
-      this.isShowAdd = true
-
-      this.dataInfo = row
-    },
     getSupplierStatusDict() {
       getDictByCode('supplierStatus').then(response => {
         if (response.code === 200) {
@@ -124,7 +110,7 @@
       })
     },
     // 获取指定页面
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
@@ -135,16 +121,17 @@
     },
     reset() {
       this.selectInfo = {
-        distributorCode: '',
-        distributorName: ''
+        supplierCode: '',
+        supplierName: '',
+        supplierStatus: ''
       }
     },
+    detail(row) {
+      this.$refs.supplierDetail.initDialog('detail', row)
+    },
     exportToExcel() {
-      listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
-      })
-    }
 
+    }
   }
 }
 </script>