From b0738534e7ead827f7bc0830b4f74ebd4f0130ac Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Fri, 21 Apr 2023 09:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicInformation/areasetting/index.vue    |  2 +-
 .../basicInformation/contractfile/Detail.vue  | 57 +++++++++++++++++--
 .../basicInformation/contractfile/index.vue   |  8 +--
 .../scm/basicInformation/customer/index.vue   |  8 +--
 .../basicInformation/inventoryOrd/index.vue   |  2 +-
 .../basicInformation/monitormanage/index.vue  |  2 +-
 .../scm/basicInformation/natural/index.vue    | 10 ++--
 .../basicInformation/reservoirarea/index.vue  |  2 +-
 .../scm/basicInformation/warehouse/index.vue  |  2 +-
 9 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/SC-web/src/views/scm/basicInformation/areasetting/index.vue b/SC-web/src/views/scm/basicInformation/areasetting/index.vue
index 6ff6f454..83507b2b 100644
--- a/SC-web/src/views/scm/basicInformation/areasetting/index.vue
+++ b/SC-web/src/views/scm/basicInformation/areasetting/index.vue
@@ -120,7 +120,7 @@
             sortable
             align="center"
           />
-          <el-table-column label="操作" fixed="right" width="100">
+          <el-table-column label="操作" fixed="right" width="100" align="center">
             <template slot-scope="scope">
               <el-button
                 type="text"
diff --git a/SC-web/src/views/scm/basicInformation/contractfile/Detail.vue b/SC-web/src/views/scm/basicInformation/contractfile/Detail.vue
index 3dcd1f7b..fcd9444f 100644
--- a/SC-web/src/views/scm/basicInformation/contractfile/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/contractfile/Detail.vue
@@ -32,7 +32,7 @@
             <el-col :span="8">
               <el-form-item label="合同状态"
                             prop="status">
-                <p>{{dataForm.status}}</p>
+                <p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -84,7 +84,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="供应商/客户编"
+              <el-form-item label="供应商/客户编号"
                             prop="code">
                 <p>{{dataForm.code}}</p>
               </el-form-item>
@@ -134,7 +134,7 @@
             <el-col :span="24">
               <el-form-item label="合同分类 "
                             prop="classification">
-                <p>{{dataForm.classification}}</p>
+                <p>{{ dataForm.classification | dynamicText(classificationOptions) }} </p>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -310,8 +310,57 @@
           contract_item1List: []
         },
         activemdfrsi: '0',
-        contractTypeOptions: [{ 'fullName': '选项一', 'id': '1' }, { 'fullName': '选项二', 'id': '2' }]
+        contractTypeOptions: [
+          {
+            fullName: "采购合同",
+            id: "0",
+          },
+          {
+            fullName: "销售合同",
+            id: "1",
+          },
+          {
+            fullName: "租赁合同",
+            id: "3",
+          },
+          {
+            fullName: "仓储合同",
+            id: "4",
+          },
+          {
+            fullName: "运输合同",
+            id: "5",
+          },
+          {
+            fullName: "施工合同",
+            id: "6",
+          },
 
+        ],
+        statusOptions: [
+          {
+            fullName: "进行中",
+            id: "0",
+          },
+          {
+            fullName: "审批中",
+            id: "1",
+          },
+          {
+            fullName: "审批结束",
+            id: "2",
+          },
+        ],
+        classificationOptions: [
+          {
+            fullName: "采购类",
+            id: "0",
+          },
+          {
+            fullName: "销售类",
+            id: "1",
+          },
+        ],
       }
     },
     computed: {},
diff --git a/SC-web/src/views/scm/basicInformation/contractfile/index.vue b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
index b97f51a8..e9a4647d 100644
--- a/SC-web/src/views/scm/basicInformation/contractfile/index.vue
+++ b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
@@ -126,21 +126,21 @@
           <el-table-column
             prop="contractCode"
             label="合同编码"
-            width="200"
+            width="180"
             align="center"
             sortable
           />
           <el-table-column
             prop="contractName"
             label="合同名称"
-            width="200"
+            width="270"
             align="center"
             sortable
           />
           <el-table-column
             prop="contractNo"
             label="对方合同号"
-            width="200"
+            width="180"
             align="center"
             sortable
           />
@@ -222,7 +222,7 @@
           />
 
           <el-table-column
-            label="单据状态"
+            label="合同状态"
             width="120"
             sortable
             prop="status"
diff --git a/SC-web/src/views/scm/basicInformation/customer/index.vue b/SC-web/src/views/scm/basicInformation/customer/index.vue
index f585825c..ebd42919 100644
--- a/SC-web/src/views/scm/basicInformation/customer/index.vue
+++ b/SC-web/src/views/scm/basicInformation/customer/index.vue
@@ -117,7 +117,7 @@
           <el-table-column
             prop="supplierNm"
             label="客户名称"
-            width="200"
+            width="250"
             align="center"
             sortable
           />
@@ -174,7 +174,7 @@
           <el-table-column
             prop="bank"
             label="开户行"
-            width="200"
+            width="270"
             align="center"
             sortable
           />
@@ -194,7 +194,7 @@
           <el-table-column
             prop="bankAccount"
             label="银行账号"
-            width="0"
+            width="200"
             align="center"
           />
 
@@ -213,7 +213,7 @@
           <el-table-column
             prop="address"
             label="地址"
-            width="120"
+            width="250"
             align="center"
             sortable="custom"
           />
diff --git a/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue b/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
index e0888ea8..eb64aa62 100644
--- a/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
+++ b/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
@@ -79,7 +79,7 @@
             width="0"
             align="left"
           />
-          <el-table-column label="操作" fixed="right" width="100">
+          <el-table-column label="操作" fixed="right" width="100" align="center">
             <template slot-scope="scope">
               <!--              <el-button type="text"  v-has="'btn_edit'"-->
               <!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
diff --git a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
index 66cc21b3..f5d3ba2d 100644
--- a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
+++ b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
@@ -156,7 +156,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" fixed="right" width="100">
+          <el-table-column label="操作" fixed="right" width="100" align="center">
             <template slot-scope="scope">
               <el-button
                 type="text"
diff --git a/SC-web/src/views/scm/basicInformation/natural/index.vue b/SC-web/src/views/scm/basicInformation/natural/index.vue
index 75f56ccc..43e195ea 100644
--- a/SC-web/src/views/scm/basicInformation/natural/index.vue
+++ b/SC-web/src/views/scm/basicInformation/natural/index.vue
@@ -140,34 +140,34 @@
             sortable
           />
           <el-table-column
-            width="120"
+            width="200"
             prop="identity"
             label="身份证"
             align="center"
             sortable
           />
           <el-table-column
-            width="120"
+            width="200"
             prop="bankAccount"
             label="银行账户"
             align="center"
             sortable
           />
           <el-table-column
-            width="120"
+            width="200"
             prop="bank"
             label="开户行"
             align="center"
             sortable
           />
           <el-table-column
-            width="120"
+            width="200"
             prop="bankNo"
             label="行号"
             align="center"
             sortable
           />
-          <el-table-column label="操作" fixed="right" width="100">
+          <el-table-column label="操作" fixed="right" width="100" align="center">
             <template slot-scope="scope">
               <el-button
                 type="text"
diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
index eda6f5ef..a48c5a55 100644
--- a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
+++ b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
@@ -144,7 +144,7 @@
             align="center"
             sortable
           />
-          <el-table-column label="操作" fixed="right" width="100">
+          <el-table-column label="操作" fixed="right" width="100" align="center">
             <template slot-scope="scope">
               <el-button
                 type="text"
diff --git a/SC-web/src/views/scm/basicInformation/warehouse/index.vue b/SC-web/src/views/scm/basicInformation/warehouse/index.vue
index e6abc72d..706b8461 100644
--- a/SC-web/src/views/scm/basicInformation/warehouse/index.vue
+++ b/SC-web/src/views/scm/basicInformation/warehouse/index.vue
@@ -155,7 +155,7 @@
             align="center"
             sortable
           />
-          <el-table-column label="操作" fixed="right" width="100">
+          <el-table-column label="操作" fixed="right" width="100" align="center">
             <template slot-scope="scope">
               <el-button
                 type="text"