From fad705c1301cc3fd6f113364f42249f2aa946b2b Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 13 Sep 2023 19:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop_contract/details.vue |  4 +--
 src/views/shop_contract/index.vue   | 52 ++++++++++++++++++++++++++---
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/views/shop_contract/details.vue b/src/views/shop_contract/details.vue
index 93ce94b..8d34ac7 100644
--- a/src/views/shop_contract/details.vue
+++ b/src/views/shop_contract/details.vue
@@ -138,11 +138,11 @@
       :rules="formRules"
       class="select"
     >
-      <el-form-item label="公司名称" prop="company_name" required>
+      <el-form-item label="商户名称" prop="company_name" required>
         <el-input
           disabled
           v-model="compenyB.company_name"
-          placeholder="请输入公司名称"
+          placeholder="请输入商户名称"
         />
       </el-form-item>
       <el-form-item label="社会代码" prop="organization_code" required>
diff --git a/src/views/shop_contract/index.vue b/src/views/shop_contract/index.vue
index 5ea28cf..698022c 100644
--- a/src/views/shop_contract/index.vue
+++ b/src/views/shop_contract/index.vue
@@ -67,14 +67,26 @@
             prop="contract_no"
             show-overflow-tooltip
           />
-          <el-table-column label="甲方" prop="party_a" show-overflow-tooltip />
-          <el-table-column label="乙方" prop="party_b" show-overflow-tooltip />
           <el-table-column
-            label="片区经理"
-            prop="area_manager"
+            label="甲方"
+            prop="party_a_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="乙方"
+            prop="party_b_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="片区经理"
+            prop="area_manager_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="合同类型"
+            prop="type_name"
             show-overflow-tooltip
           />
-          <el-table-column label="合同类型" prop="type" show-overflow-tooltip />
           <el-table-column
             label="证据包"
             prop="evidence_url"
@@ -285,3 +297,33 @@ const sendMsg = async () => {
 getLists();
 </script>
 
+<style scoped lang="scss">
+.btn {
+  position: absolute;
+}
+h1 {
+  text-align: center;
+  font-weight: bold;
+  font-size: 30px;
+  color: red;
+  margin-bottom: 10px;
+}
+
+.content {
+  font-size: 20px;
+}
+
+.info {
+  color: red;
+  font-weight: bold;
+  font-size: 18px;
+  display: inline-block;
+  margin: 0 5px;
+}
+
+.btn_menu {
+  margin-top: 10vh;
+  display: flex;
+  justify-content: space-around;
+}
+</style>
\ No newline at end of file