diff --git a/dist.zip b/dist.zip
index edf644f..ecbaf13 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ

diff --git a/dist.zip b/dist.zip
index edf644f..ecbaf13 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 1ec5a4c..85e22d1 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -9,79 +9,44 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.busOppoId"
-            title="商机编号"
-            disabled
-            placeholder="请输入项目名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.busOppoId" title="商机编号" disabled placeholder="请输入项目名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemName"
-            title="项目名称"
-            disabled
-            placeholder="请输入项目名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemName" title="项目名称" disabled placeholder="请输入项目名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemBudget"
-            title="项目预算"
-            disabled
-            placeholder="请输入项目预算"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemBudget" title="项目预算" disabled placeholder="请输入项目预算" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="预计工期" class="inputWidth">
-            <el-date-picker v-model="dataInfo.itemDuration" disabled type="date" placeholder="选择日期" style="width:350px" />
+            <el-date-picker v-model="dataInfo.itemDuration" disabled type="date" placeholder="选择日期"
+              style="width:350px" />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemManager"
-            title="商机负责人"
-            disabled
-            placeholder="请输入商机负责人姓名"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemManager" title="商机负责人" disabled placeholder="请输入商机负责人姓名" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.phone"
-            title="联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.phone" title="联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.organization"
-            title="单位组织"
-            disabled
-            placeholder="请输入单位组织"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.organization" title="单位组织" disabled placeholder="请输入单位组织" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
@@ -93,14 +58,7 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemAddress"
-            title="项目地址"
-            disabled
-            placeholder="请输入详细地址"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="address" title="项目地址" disabled placeholder="请输入详细地址" class="inputWidth" width="350px" />
         </div>
       </div>
     </div>
@@ -111,141 +69,69 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerName"
-            title="业主方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerName" title="业主方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerContacts"
-            title="业主方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerContacts" title="业主方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerPhone"
-            title="业主方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerPhone" title="业主方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractName"
-            title="总包方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractName" title="总包方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractContacts"
-            title="总包方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractContacts" title="总包方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractPhone"
-            title="总包方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractPhone" title="总包方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructName"
-            title="施工方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructName" title="施工方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructContacts"
-            title="施工方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructContacts" title="施工方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructPhone"
-            title="施工方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructPhone" title="施工方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentName"
-            title="代理商名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentName" title="代理商名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentContacts"
-            title="代理商联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentContacts" title="代理商联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentPhone"
-            title="代理商联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentPhone" title="代理商联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
     </div>
@@ -293,7 +179,13 @@
       val: '',
       datevalue: '',
       options: [],
-      tableData: []
+      tableData: [],
+    }
+  },
+  computed: {
+    address() {
+      const { dataInfo } = this
+      return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress
     }
   },
   mounted() {

diff --git a/dist.zip b/dist.zip
index edf644f..ecbaf13 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 1ec5a4c..85e22d1 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -9,79 +9,44 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.busOppoId"
-            title="商机编号"
-            disabled
-            placeholder="请输入项目名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.busOppoId" title="商机编号" disabled placeholder="请输入项目名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemName"
-            title="项目名称"
-            disabled
-            placeholder="请输入项目名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemName" title="项目名称" disabled placeholder="请输入项目名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemBudget"
-            title="项目预算"
-            disabled
-            placeholder="请输入项目预算"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemBudget" title="项目预算" disabled placeholder="请输入项目预算" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="预计工期" class="inputWidth">
-            <el-date-picker v-model="dataInfo.itemDuration" disabled type="date" placeholder="选择日期" style="width:350px" />
+            <el-date-picker v-model="dataInfo.itemDuration" disabled type="date" placeholder="选择日期"
+              style="width:350px" />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemManager"
-            title="商机负责人"
-            disabled
-            placeholder="请输入商机负责人姓名"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemManager" title="商机负责人" disabled placeholder="请输入商机负责人姓名" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.phone"
-            title="联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.phone" title="联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.organization"
-            title="单位组织"
-            disabled
-            placeholder="请输入单位组织"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.organization" title="单位组织" disabled placeholder="请输入单位组织" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
@@ -93,14 +58,7 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemAddress"
-            title="项目地址"
-            disabled
-            placeholder="请输入详细地址"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="address" title="项目地址" disabled placeholder="请输入详细地址" class="inputWidth" width="350px" />
         </div>
       </div>
     </div>
@@ -111,141 +69,69 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerName"
-            title="业主方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerName" title="业主方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerContacts"
-            title="业主方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerContacts" title="业主方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerPhone"
-            title="业主方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerPhone" title="业主方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractName"
-            title="总包方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractName" title="总包方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractContacts"
-            title="总包方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractContacts" title="总包方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractPhone"
-            title="总包方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractPhone" title="总包方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructName"
-            title="施工方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructName" title="施工方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructContacts"
-            title="施工方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructContacts" title="施工方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructPhone"
-            title="施工方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructPhone" title="施工方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentName"
-            title="代理商名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentName" title="代理商名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentContacts"
-            title="代理商联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentContacts" title="代理商联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentPhone"
-            title="代理商联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentPhone" title="代理商联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
     </div>
@@ -293,7 +179,13 @@
       val: '',
       datevalue: '',
       options: [],
-      tableData: []
+      tableData: [],
+    }
+  },
+  computed: {
+    address() {
+      const { dataInfo } = this
+      return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress
     }
   },
   mounted() {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index ad94c61..3a2ce10 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -82,7 +82,7 @@
       <el-table-column prop="index" label="序号" />
       <el-table-column prop="serviceCode" label="服务编号" />
       <el-table-column prop="serviceName" label="服务名称" />
-      <el-table-column prop="typeCode" label="服务类型" />
+      <el-table-column prop="typeCodeName" label="服务类型" />
       <el-table-column prop="description" label="服务描述" />
       <el-table-column prop="serviceTime" label="服务时间" />
       <el-table-column prop="remark" label="备注" />

diff --git a/dist.zip b/dist.zip
index edf644f..ecbaf13 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 1ec5a4c..85e22d1 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -9,79 +9,44 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.busOppoId"
-            title="商机编号"
-            disabled
-            placeholder="请输入项目名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.busOppoId" title="商机编号" disabled placeholder="请输入项目名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemName"
-            title="项目名称"
-            disabled
-            placeholder="请输入项目名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemName" title="项目名称" disabled placeholder="请输入项目名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemBudget"
-            title="项目预算"
-            disabled
-            placeholder="请输入项目预算"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemBudget" title="项目预算" disabled placeholder="请输入项目预算" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="预计工期" class="inputWidth">
-            <el-date-picker v-model="dataInfo.itemDuration" disabled type="date" placeholder="选择日期" style="width:350px" />
+            <el-date-picker v-model="dataInfo.itemDuration" disabled type="date" placeholder="选择日期"
+              style="width:350px" />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemManager"
-            title="商机负责人"
-            disabled
-            placeholder="请输入商机负责人姓名"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemManager" title="商机负责人" disabled placeholder="请输入商机负责人姓名" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.phone"
-            title="联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.phone" title="联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.organization"
-            title="单位组织"
-            disabled
-            placeholder="请输入单位组织"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.organization" title="单位组织" disabled placeholder="请输入单位组织" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
@@ -93,14 +58,7 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemAddress"
-            title="项目地址"
-            disabled
-            placeholder="请输入详细地址"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="address" title="项目地址" disabled placeholder="请输入详细地址" class="inputWidth" width="350px" />
         </div>
       </div>
     </div>
@@ -111,141 +69,69 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerName"
-            title="业主方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerName" title="业主方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerContacts"
-            title="业主方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerContacts" title="业主方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerPhone"
-            title="业主方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerPhone" title="业主方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractName"
-            title="总包方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractName" title="总包方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractContacts"
-            title="总包方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractContacts" title="总包方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractPhone"
-            title="总包方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractPhone" title="总包方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructName"
-            title="施工方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructName" title="施工方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructContacts"
-            title="施工方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructContacts" title="施工方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructPhone"
-            title="施工方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructPhone" title="施工方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentName"
-            title="代理商名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentName" title="代理商名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentContacts"
-            title="代理商联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentContacts" title="代理商联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentPhone"
-            title="代理商联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentPhone" title="代理商联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
     </div>
@@ -293,7 +179,13 @@
       val: '',
       datevalue: '',
       options: [],
-      tableData: []
+      tableData: [],
+    }
+  },
+  computed: {
+    address() {
+      const { dataInfo } = this
+      return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress
     }
   },
   mounted() {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index ad94c61..3a2ce10 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -82,7 +82,7 @@
       <el-table-column prop="index" label="序号" />
       <el-table-column prop="serviceCode" label="服务编号" />
       <el-table-column prop="serviceName" label="服务名称" />
-      <el-table-column prop="typeCode" label="服务类型" />
+      <el-table-column prop="typeCodeName" label="服务类型" />
       <el-table-column prop="description" label="服务描述" />
       <el-table-column prop="serviceTime" label="服务时间" />
       <el-table-column prop="remark" label="备注" />
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index 83e36a6..3be46e0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -53,7 +53,7 @@
             {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
           </template>
         </el-table-column>
-        <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" width="150" />
+        <el-table-column prop="quarterlyEvaluateResultName" label="季度评价结果" width="150" />
         <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" width="150"/>
         <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">

diff --git a/dist.zip b/dist.zip
index edf644f..ecbaf13 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 1ec5a4c..85e22d1 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -9,79 +9,44 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.busOppoId"
-            title="商机编号"
-            disabled
-            placeholder="请输入项目名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.busOppoId" title="商机编号" disabled placeholder="请输入项目名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemName"
-            title="项目名称"
-            disabled
-            placeholder="请输入项目名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemName" title="项目名称" disabled placeholder="请输入项目名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemBudget"
-            title="项目预算"
-            disabled
-            placeholder="请输入项目预算"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemBudget" title="项目预算" disabled placeholder="请输入项目预算" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="预计工期" class="inputWidth">
-            <el-date-picker v-model="dataInfo.itemDuration" disabled type="date" placeholder="选择日期" style="width:350px" />
+            <el-date-picker v-model="dataInfo.itemDuration" disabled type="date" placeholder="选择日期"
+              style="width:350px" />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemManager"
-            title="商机负责人"
-            disabled
-            placeholder="请输入商机负责人姓名"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.itemManager" title="商机负责人" disabled placeholder="请输入商机负责人姓名" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.phone"
-            title="联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.phone" title="联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.organization"
-            title="单位组织"
-            disabled
-            placeholder="请输入单位组织"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.organization" title="单位组织" disabled placeholder="请输入单位组织" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
@@ -93,14 +58,7 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.itemAddress"
-            title="项目地址"
-            disabled
-            placeholder="请输入详细地址"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="address" title="项目地址" disabled placeholder="请输入详细地址" class="inputWidth" width="350px" />
         </div>
       </div>
     </div>
@@ -111,141 +69,69 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerName"
-            title="业主方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerName" title="业主方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerContacts"
-            title="业主方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerContacts" title="业主方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.ownerPhone"
-            title="业主方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.ownerPhone" title="业主方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractName"
-            title="总包方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractName" title="总包方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractContacts"
-            title="总包方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractContacts" title="总包方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.contractPhone"
-            title="总包方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.contractPhone" title="总包方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructName"
-            title="施工方名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructName" title="施工方名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructContacts"
-            title="施工方联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructContacts" title="施工方联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.constructPhone"
-            title="施工方联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.constructPhone" title="施工方联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentName"
-            title="代理商名称"
-            disabled
-            placeholder="请输入名称"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentName" title="代理商名称" disabled placeholder="请输入名称" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentContacts"
-            title="代理商联系人"
-            disabled
-            placeholder="请输入联系人"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentContacts" title="代理商联系人" disabled placeholder="请输入联系人" class="inputWidth"
+            width="350px" />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue
-            v-model="dataInfo.agentPhone"
-            title="代理商联系方式"
-            disabled
-            placeholder="请输入联系方式"
-            class="inputWidth"
-            width="350px"
-          />
+          <inputVue v-model="dataInfo.agentPhone" title="代理商联系方式" disabled placeholder="请输入联系方式" class="inputWidth"
+            width="350px" />
         </div>
       </div>
     </div>
@@ -293,7 +179,13 @@
       val: '',
       datevalue: '',
       options: [],
-      tableData: []
+      tableData: [],
+    }
+  },
+  computed: {
+    address() {
+      const { dataInfo } = this
+      return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress
     }
   },
   mounted() {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index ad94c61..3a2ce10 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -82,7 +82,7 @@
       <el-table-column prop="index" label="序号" />
       <el-table-column prop="serviceCode" label="服务编号" />
       <el-table-column prop="serviceName" label="服务名称" />
-      <el-table-column prop="typeCode" label="服务类型" />
+      <el-table-column prop="typeCodeName" label="服务类型" />
       <el-table-column prop="description" label="服务描述" />
       <el-table-column prop="serviceTime" label="服务时间" />
       <el-table-column prop="remark" label="备注" />
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index 83e36a6..3be46e0 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -53,7 +53,7 @@
             {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
           </template>
         </el-table-column>
-        <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" width="150" />
+        <el-table-column prop="quarterlyEvaluateResultName" label="季度评价结果" width="150" />
         <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" width="150"/>
         <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
index dc5ecbc..6e17830 100644
--- a/src/views/supplier/historyEvaluateDialog.vue
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -19,7 +19,7 @@
           {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
         </template>
       </el-table-column>
-      <el-table-column prop="evaluateQuarterlyName" label="评价结果" width="150"></el-table-column>
+      <el-table-column prop="quarterlyEvaluateResultName" label="评价结果" width="150"></el-table-column>
       <el-table-column prop="quarterlyEvaluateIllustration" label="评价结果说明"></el-table-column>
       <el-table-column prop="quarterlyEvaluateDate" label="评价日期" width="150" />
       <el-table-column label="评价结果附件" width="300">