fix bug

src/views/contract/index.vue

@@ -4,55 +4,55 @@
       <div class="flex">
         <div class="flex flex-center mt-15 mr-10">
           <el-form-item
-              label="关键字"
-              class="full-width"
-              style="margin-left: -50px"
+            label="关键字"
+            class="full-width"
+            style="margin-left: -50px"
           >
             <el-input
-                v-model="params.name"
-                placeholder="输入合同关键字"
-                prefix-icon="Search"
-                clearable
+              v-model="params.name"
+              placeholder="输入合同关键字"
+              prefix-icon="Search"
+              clearable
             />
           </el-form-item>
           <el-form-item class="full-width" label="合同类别">
             <el-select v-model="params.type" clearable>
               <el-option
-                  v-for="item in typelist"
-                  :key="item.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey"
+                v-for="item in typelist"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
               />
             </el-select>
           </el-form-item>
           <el-form-item class="full-width" label="合同状态">
             <el-select v-model="params.status" clearable>
               <el-option
-                  v-for="item in dicList"
-                  :key="item.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey"
+                v-for="item in dicList"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
               />
             </el-select>
           </el-form-item>
         </div>
         <div class="flex flex-center ml-20">
-          <base-button type="0" title="重置" icon="Refresh" @click="clearUp"/>
-          <base-button class="ml-20" @click="onLoad"/>
+          <base-button type="0" title="重置" icon="Refresh" @click="clearUp" />
+          <base-button class="ml-20" @click="onLoad" />
         </div>
       </div>
     </el-form>
     <avue-crud
-        :option="option"
-        :data="data"
-        ref="crud"
-        v-model="form"
-        v-model:page="page"
-        :before-open="beforeOpen"
-        @row-del="rowDel"
-        @current-change="currentChange"
-        @size-change="sizeChange"
-        @refresh-change="refreshChange"
+      :option="option"
+      :data="data"
+      ref="crud"
+      v-model="form"
+      v-model:page="page"
+      :before-open="beforeOpen"
+      @row-del="rowDel"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
     >
       <template #title="{ row }">
         <div>{{ row.fileFolder.title }}</div>
@@ -67,19 +67,14 @@
 <route>
 {
 name: '合同管理',
-<<<<<<< HEAD
 meta: { layout: 'empty','path':'/home/details','title':'资料管理','showMsg' : "请先通过资料管理，在对应的相关合同类别下上传合同文件，系统将自动识别所有相关文件并展示在以下列表中。"}
-=======
-meta: { layout: 'empty','path':'/home/details','title':'资料管理','showMsg' :
-"请先通过资料管理，在对应的相关合同类别下上传合同文件，系统将自动识别所有相关文件并展示在以下列表中。"}
->>>>>>> develop
 }
 </route>
 <script>
 import BaseButton from '@/components/base-button.vue'
 
 export default {
-  components: {BaseButton},
+  components: { BaseButton },
   data() {
     return {
       projectId: '',
@@ -143,7 +138,7 @@ export default {
             label: '合同状态',
             prop: 'contractsStatus',
             dicUrl:
-                '/api/blade-system/dict-biz/dictionary?code=contract-status',
+              '/api/blade-system/dict-biz/dictionary?code=contract-status',
             props: {
               label: 'dictValue',
               value: 'dictKey'
@@ -177,7 +172,7 @@ export default {
   },
   methods: {
     getDic(code) {
-      this.$api.common.dicList({code}).then(res => {
+      this.$api.common.dicList({ code }).then(res => {
         if (res.code === 200) {
           if (code === 'contract-status') {
             this.dicList = res.data
@@ -189,24 +184,24 @@ export default {
     },
     onLoad() {
       this.loading = true
-      const data = Object.assign(this.params, {projectId: this.projectId})
+      const data = Object.assign(this.params, { projectId: this.projectId })
       this.$api.contract
-          .contractList(Object.assign(this.page, data))
-          .then(res => {
-            this.data = res.data.records.map(ele => {
-              if (ele.contractsStatus === -1) {
-                ele.contractsStatus = ''
-              }
-              if (ele.type === -1) {
-                ele.type = ''
-              }
-              return ele
-            })
-            this.page.total = res.data.total
-          })
-          .finally(() => {
-            this.loading = false
+        .contractList(Object.assign(this.page, data))
+        .then(res => {
+          this.data = res.data.records.map(ele => {
+            if (ele.contractsStatus === -1) {
+              ele.contractsStatus = ''
+            }
+            if (ele.type === -1) {
+              ele.type = ''
+            }
+            return ele
           })
+          this.page.total = res.data.total
+        })
+        .finally(() => {
+          this.loading = false
+        })
     },
     clearUp() {
       this.params.name = ''
@@ -218,7 +213,7 @@ export default {
       if (type === 'view') {
         const data = this.$router.resolve({
           path: '/contract/detail',
-          query: {id: this.form.id}
+          query: { id: this.form.id }
         })
         window.open(data.href, '_blank')
       }
@@ -229,7 +224,7 @@ export default {
       }).then(res => {
         console.log(res)
         if (res === 'confirm') {
-          this.$api.contract.contractRemove({ids: row.id}).then(res => {
+          this.$api.contract.contractRemove({ ids: row.id }).then(res => {
             if (res.code === 200) {
               this.$message.success(res.msg)
               this.onLoad()