fix:合同管理优化

src/http/moudules/contract.js

@@ -17,6 +17,7 @@ export const getEsmInsCompany = (data) => {
         method: 'post',
         data
     })
+    10
 }
 //获取数据权限字典
 export async function getContractType(data) {

src/views/Core/KtTable.vue

@@ -1,163 +1,237 @@
 <template>
   <div>
     <!--表格栏-->
-    <el-table :data="data.content" :highlight-current-row="highlightCurrentRow" @selection-change="selectionChange"
-          @current-change="handleCurrentChange" v-loading="loading" :element-loading-text="$t('action.loading')" :border="border" :stripe="stripe"
-          :show-overflow-tooltip="showOverflowTooltip" :max-height="maxHeight" :height="height" :size="size" :align="align" style="width:100%;" >
-      <el-table-column type="selection" width="40" v-if="showBatchDelete & showOperation"></el-table-column>
-      <el-table-column v-for="column in columns" header-align="center" align="center"
-        :prop="column.prop" :label="column.label" :width="column.width" :min-width="column.minWidth"
-        :fixed="column.fixed" :key="column.prop" :type="column.type" :formatter="column.formatter"
-        :sortable="column.sortable==null?true:column.sortable">
+    <el-table
+      :data="data.content"
+      :highlight-current-row="highlightCurrentRow"
+      @selection-change="selectionChange"
+      @current-change="handleCurrentChange"
+      v-loading="loading"
+      :element-loading-text="$t('action.loading')"
+      :border="border"
+      :stripe="stripe"
+      :show-overflow-tooltip="showOverflowTooltip"
+      :max-height="maxHeight"
+      :height="height"
+      :size="size"
+      :align="align"
+      style="width: 100%"
+    >
+      <el-table-column
+        type="selection"
+        width="40"
+        v-if="showBatchDelete & showOperation"
+      ></el-table-column>
+      <el-table-column
+        v-for="column in columns"
+        header-align="center"
+        align="center"
+        :prop="column.prop"
+        :label="column.label"
+        :width="column.width"
+        :min-width="column.minWidth"
+        :fixed="column.fixed"
+        :key="column.prop"
+        :type="column.type"
+        :formatter="column.formatter"
+        :sortable="column.sortable == null ? true : column.sortable"
+      >
       </el-table-column>
-      <el-table-column :label="$t('action.operation')" width="185" fixed="right" v-if="showOperation" header-align="center" align="center">
+      <el-table-column
+        :label="$t('action.operation')"
+        width="185"
+        fixed="right"
+        v-if="showOperation"
+        header-align="center"
+        align="center"
+      >
         <template slot-scope="scope">
-          <kt-button icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" />
-          <kt-button icon="fa fa-trash" :label="$t('action.delete')" :perms="permsDelete" :size="size" type="danger" @click="handleDelete(scope.$index, scope.row)" />
+          <kt-button
+            icon="fa fa-edit"
+            :label="$t('action.edit')"
+            :perms="permsEdit"
+            :size="size"
+            @click="handleEdit(scope.$index, scope.row)"
+          />
+          <kt-button
+            icon="fa fa-trash"
+            :label="$t('action.delete')"
+            :perms="permsDelete"
+            :size="size"
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          />
         </template>
       </el-table-column>
     </el-table>
     <!--分页栏-->
-    <div class="toolbar" style="padding:10px;">
-      <kt-button :label="$t('action.batchDelete')" :perms="permsDelete" :size="size" type="danger" @click="handleBatchDelete()"
-        :disabled="this.selections.length===0" style="float:left;" v-if="showBatchDelete & showOperation"/>
-      <el-pagination layout="total, prev, pager, next, jumper" @current-change="refreshPageRequest"
-        :current-page="pageRequest.pageNum" :page-size="pageRequest.pageSize" :total="data.totalSize" style="float:right;">
+    <div class="toolbar" style="padding: 10px">
+      <kt-button
+        :label="$t('action.batchDelete')"
+        :perms="permsDelete"
+        :size="size"
+        type="danger"
+        @click="handleBatchDelete()"
+        :disabled="this.selections.length === 0"
+        style="float: left"
+        v-if="showBatchDelete & showOperation"
+      />
+      <el-pagination
+        layout="total, prev, pager, next, jumper"
+        @current-change="refreshPageRequest"
+        :current-page="pageRequest.pageNum"
+        :page-size="pageRequest.pageSize"
+        :total="data.totalSize"
+        style="float: right"
+      >
       </el-pagination>
     </div>
   </div>
 </template>
 <script>
-import KtButton from "@/views/Core/KtButton"
+import KtButton from "@/views/Core/KtButton";
 export default {
-  name: 'KtTable',
-  components:{
-			KtButton
-	},
+  name: "KtTable",
+  components: {
+    KtButton,
+  },
   props: {
     columns: Array, // 表格列配置
     data: Object, // 表格分页数据
-    permsEdit: String,  // 编辑权限标识
-    permsDelete: String,  // 删除权限标识
-    size: { // 尺寸样式
+    permsEdit: String, // 编辑权限标识
+    permsDelete: String, // 删除权限标识
+    size: {
+      // 尺寸样式
       type: String,
-      default: 'mini'
+      default: "mini",
     },
-    align: {  // 文本对齐方式
+    align: {
+      // 文本对齐方式
       type: String,
-      default: 'left'
+      default: "left",
     },
-    maxHeight: {  // 表格最大高度
+    maxHeight: {
+      // 表格最大高度
       type: Number,
-      default: 420
+      default: 420,
     },
-    height: {  // 表格最大高度
+    height: {
+      // 表格最大高度
       type: Number,
-      default: 250
+      default: 250,
     },
-    showOperation: {  // 是否显示操作组件
+    showOperation: {
+      // 是否显示操作组件
       type: Boolean,
-      default: true
+      default: true,
     },
-    border: {  // 是否显示边框
+    border: {
+      // 是否显示边框
       type: Boolean,
-      default: true
+      default: true,
     },
-    stripe: {  // 是否显示斑马线
+    stripe: {
+      // 是否显示斑马线
       type: Boolean,
-      default: true
+      default: true,
     },
-    highlightCurrentRow: {  // // 是否高亮当前行
+    highlightCurrentRow: {
+      // // 是否高亮当前行
       type: Boolean,
-      default: true
+      default: true,
     },
-    showOverflowTooltip: {  // 是否单行显示
+    showOverflowTooltip: {
+      // 是否单行显示
       type: Boolean,
-      default: true
+      default: true,
     },
-    showBatchDelete: {  // 是否显示操作组件
+    showBatchDelete: {
+      // 是否显示操作组件
       type: Boolean,
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
       // 分页信息
-			pageRequest: {
-				pageNum: 1,
-        pageSize: 10
+      pageRequest: {
+        pageNum: 1,
+        pageSize: 10,
       },
-      loading: false,  // 加载标识
-      selections: []  // 列表选中列
-    }
+      loading: false, // 加载标识
+      selections: [], // 列表选中列
+    };
   },
   methods: {
     // 分页查询
     findPage: function () {
-        this.loading = true
-        let callback = res => {
-          this.loading = false
-        }
-      this.$emit('findPage', {pageRequest:this.pageRequest, callback:callback})
+      this.loading = true;
+      let callback = (res) => {
+        this.loading = false;
+      };
+      this.$emit("findPage", {
+        pageRequest: this.pageRequest,
+        callback: callback,
+      });
     },
     // 选择切换
     selectionChange: function (selections) {
-      this.selections = selections
-      this.$emit('selectionChange', {selections:selections})
+      this.selections = selections;
+      this.$emit("selectionChange", { selections: selections });
     },
     // 选择切换
     handleCurrentChange: function (val) {
-      this.$emit('handleCurrentChange', {val:val})
+      this.$emit("handleCurrentChange", { val: val });
     },
     // 换页刷新
-		refreshPageRequest: function (pageNum) {
-      this.pageRequest.pageNum = pageNum
-      this.findPage()
+    refreshPageRequest: function (pageNum) {
+      this.pageRequest.pageNum = pageNum;
+      this.findPage();
     },
     // 编辑
-		handleEdit: function (index, row) {
-      this.$emit('handleEdit', {index:index, row:row})
-		},
+    handleEdit: function (index, row) {
+      this.$emit("handleEdit", { index: index, row: row });
+    },
     // 删除
-		handleDelete: function (index, row) {
-			this.delete(row.id)
-		},
-		// 批量删除
-		handleBatchDelete: function () {
-			let ids = this.selections.map(item => item.id).toString()
-			this.delete(ids)
-		},
-		// 删除操作
-		delete: function (ids) {
-			this.$confirm('确认删除选中记录吗？', '提示', {
-				type: 'warning'
-			}).then(() => {
-				let params = []
-				let idArray = (ids+'').split(',')
-				for(var i=0; i<idArray.length; i++) {
-					params.push({'id':idArray[i]})
-        }
-        this.loading = true
-        let callback = res => {
-          if(res.code == 200) {
-            this.$message({message: '删除成功', type: 'success'})
-            this.findPage()
-          } else {
-            this.$message({message: '操作失败, ' + res.msg, type: 'error'})
+    handleDelete: function (index, row) {
+      this.delete(row.id);
+    },
+    // 批量删除
+    handleBatchDelete: function () {
+      let ids = this.selections.map((item) => item.id).toString();
+      this.delete(ids);
+    },
+    // 删除操作
+    delete: function (ids) {
+      this.$confirm("确认删除选中记录吗？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          let params = [];
+          let idArray = (ids + "").split(",");
+          for (var i = 0; i < idArray.length; i++) {
+            params.push({ id: idArray[i] });
           }
-          this.loading = false
-        }
-        this.$emit('handleDelete', {params:params, callback:callback})
-			}).catch(() => {
-			})
-		}
+          this.loading = true;
+          let callback = (res) => {
+            if (res.code == 200) {
+              this.$message({ message: "删除成功", type: "success" });
+              this.findPage();
+            } else {
+              this.$message({ message: "操作失败, " + res.msg, type: "error" });
+            }
+            this.loading = false;
+          };
+          this.$emit("handleDelete", { params: params, callback: callback });
+        })
+        .catch(() => {});
+    },
   },
   mounted() {
-    this.refreshPageRequest(1)
-  }
-}
+    this.refreshPageRequest(1);
+  },
+};
 </script>
 
 <style scoped>
-
 </style>

src/views/FinancialManagement/ContractManagement/ContractManagement.vue

@@ -1168,7 +1168,11 @@ export default {
                     })
                   : [];
               if (commad == "supplement") {
+                this.$nextTick(() => {
+                  this.$refs.ruleForm.clearValidate();
+                });
                 this.dialogVisible = true;
+                this.title = "补充协议";
               }
               if (commad == "watch") {
                 this.fileDialog = true;
@@ -1224,7 +1228,18 @@ export default {
           })
           .then((res) => {
             if (res.code === 200) {
-              this.statusTable = [...res.data];
+              let arr = [];
+              res.data.forEach((v, i) => {
+                arr.push(v);
+                v.contractFileEntityList.forEach((item, index) => {
+                  arr[i].contractFileEntityList[index] = {
+                    name: item.fileName,
+                    url: item.url,
+                  };
+                });
+              });
+              // console.log(arr);
+              this.statusTable = [...arr];
             }
           });
       }
@@ -1291,6 +1306,10 @@ export default {
               .then((res) => {
                 if (res.code === 200) {
                   this.$message.success(res.msg);
+                  this.dialogVisible = false;
+                  this.$nextTick(() => {
+                    this.$refs.ruleForm.clearValidate();
+                  });
                 }
               });
           } else {
@@ -1306,6 +1325,10 @@ export default {
               .then((res) => {
                 if (res.code === 200) {
                   this.$message.success(res.msg);
+                  this.dialogVisible = false;
+                  this.$nextTick(() => {
+                    this.$refs.ruleForm.clearValidate();
+                  });
                 }
               });
           }
@@ -1428,6 +1451,10 @@ export default {
       this.title = "新增";
       this.operation = "add";
       this.form = { ...this.resetForm };
+
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate();
+      });
     },
     edit(row) {
       this.title = "编辑";