From a34b0e257c65f3cd95f7c9c88d8db151d928c418 Mon Sep 17 00:00:00 2001
From: MO <448233645@qq.com>
Date: Tue, 31 Oct 2023 13:16:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B4=E5=BA=A6=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E6=93=8D=E4=BD=9C=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ea/electronicContracts/index.vue | 68 +++++++++++-----------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/views/ea/electronicContracts/index.vue b/src/views/ea/electronicContracts/index.vue
index 238e223f..76f6921e 100644
--- a/src/views/ea/electronicContracts/index.vue
+++ b/src/views/ea/electronicContracts/index.vue
@@ -116,7 +116,7 @@
         <el-date-picker
           popper-class="due_year"
           v-model="queryParams.year"
-          value-format="Y"
+          value-format="yyyy"
           type="year"
           placeholder="请选择会计年份"
           @keyup.enter.native="handleQuery"
@@ -150,20 +150,6 @@
           />
         </el-select>
       </el-form-item>
-      <!--      <el-form-item label="归档时间" prop="recordTime">-->
-      <!--        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"-->
-      <!--                        type="daterange"-->
-      <!--                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"-->
-      <!--                        :default-time="['00:00:00', '23:59:59']"/>-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="纸档位置" prop="position">-->
-      <!--        <el-input v-model="queryParams.position" placeholder="请输入纸档位置" clearable-->
-      <!--                  @keyup.enter.native="handleQuery"/>-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="完整性" prop="cherks">-->
-      <!--        <el-input v-model="queryParams.cherks" placeholder="请输入完整性" clearable @keyup.enter.native="handleQuery"/>-->
-      <!--      </el-form-item>-->
-
       <el-form-item label="归档状态" prop="fileStatus">
         <el-select
           v-model="queryParams.fileStatus"
@@ -254,8 +240,6 @@
       >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.signDate) }}</span>
-          <!--          <span>{{dateArray(scope.row.signDate) }}</span>-->
-          <!--          <span>{{  dateArrayTransfer(scope.row.signDate,'yyyy-MM-dd ') }}</span>-->
         </template>
       </el-table-column>
       <el-table-column
@@ -266,7 +250,6 @@
       >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.effectiveDate) }}</span>
-          <!--          <span>{{dateArray(scope.row.effectiveDate) }}</span>-->
         </template>
       </el-table-column>
       <el-table-column
@@ -277,7 +260,6 @@
       >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.expiryDate) }}</span>
-          <!--          <span>{{dateArray(scope.row.expiryDate) }}</span>-->
         </template>
       </el-table-column>
       <el-table-column label="合同状态" align="center" prop="contractStatus">
@@ -346,12 +328,9 @@
       >
       </el-table-column>
       <el-table-column label="纸档位置" align="center" prop="position" />
-      <el-table-column label="完整性" align="center" prop="cherks" >
+      <el-table-column label="完整性" align="center" prop="cherks">
         <template v-slot="scope">
-          <dict-tag
-            :type="DICT_TYPE.CHERKS"
-            :value="scope.row.cherks"
-          />
+          <dict-tag :type="DICT_TYPE.CHERKS" :value="scope.row.cherks" />
         </template>
       </el-table-column>
 
@@ -367,8 +346,18 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        fixed="right"
+        width="180px"
       >
         <template v-slot="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            v-hasPermi="['ea:electronic-contracts:update']"
+            >查看
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -439,17 +428,10 @@
       :title="title"
       :visible.sync="open"
       width="1000px"
-      v-dialogDrag
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="98px">
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="制单人" prop="createBy">
-              <el-input v-model="form.createBy" placeholder="请输入制单人" />
-            </el-form-item>
-          </el-col>
-
           <el-col :span="8">
             <el-form-item label="业务实体" prop="company">
               <el-input v-model="form.company" placeholder="请输入业务实体" />
@@ -638,9 +620,7 @@
             <el-form-item label="完整性" prop="cherks">
               <el-select v-model="form.cherks" placeholder="请选择归档状态">
                 <el-option
-                  v-for="dict in this.getDictDatas(
-                    DICT_TYPE.CHERKS
-                  )"
+                  v-for="dict in this.getDictDatas(DICT_TYPE.CHERKS)"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
@@ -667,7 +647,9 @@
       </el-form>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="optType != 'view'"
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -701,6 +683,7 @@ export default {
       imgs: null,
       // 遮罩层
       loading: true,
+      optType: undefined,
       // 导出遮罩层
       exportLoading: false,
       // 显示搜索条件
@@ -866,6 +849,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.optType = "add";
       this.title = "添加合同档案";
     },
     /* 预览按钮*/
@@ -874,9 +858,23 @@ export default {
       this.previewtitle = "附件预览";
     },
 
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.reset();
+      this.optType = "view";
+      const id = row.id;
+      getElectronicContracts(id).then((response) => {
+        this.form = response.data;
+        this.form.signDate = this.form.effectiveDate;
+        this.form.expiryDate;
+        this.open = true;
+        this.title = "查看合同档案";
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.optType = "edit";
       const id = row.id;
       getElectronicContracts(id).then((response) => {
         this.form = response.data;