scorpioyq hace 2 años
padre
commit
6e5d4ba0fe
Se han modificado 5 ficheros con 93 adiciones y 90 borrados
  1. 0 1
      package.json
  2. 24 0
      src/api/contract/index.js
  3. 32 32
      src/components/uploads.vue
  4. 35 3
      src/views/contract/component/info2.vue
  5. 2 54
      yarn.lock

+ 0 - 1
package.json

@@ -23,7 +23,6 @@
     "pinia-plugin-persistedstate": "^2.1.1",
     "vite-plugin-pages": "^0.25.0",
     "vite-plugin-vue-layouts": "^0.7.0",
-    "vite-plugin-windicss": "^1.8.7",
     "vue": "^3.2.37",
     "vue-qr": "^4.0.9",
     "vue-router": "^4.1.2",

+ 24 - 0
src/api/contract/index.js

@@ -47,6 +47,30 @@ export default {
             'json'
         )
     },
+    /**
+     * 修改台账
+     * @param params
+     * @returns {Promise<unknown>}
+     */
+    ledgerUpdate(params) {
+        return fetch(
+            '/blade-project-manage-v2/accountinformation/update',
+            params,
+            'post',
+            'json'
+        )
+    },
+    /**
+     * 删除凭证
+     * @param params
+     */
+    voucherDel(params) {
+        return fetch(
+            '/blade-project-manage-v2/accountinformationfile/remove',
+            params,
+            'post',
+        )
+    },
     /**
      * 删除合同
      * @param params

+ 32 - 32
src/components/uploads.vue

@@ -1,26 +1,26 @@
 <template>
   <div>
     <el-upload
-      ref="upload"
-      :accept="accept"
-      :action="action"
-      :data="data"
-      :auto-upload="auto"
-      :drag="drag"
-      :file-list="tmpFileList"
-      :headers="headers"
-      :limit="max"
-      :list-type="listType"
-      :multiple="max > 1"
-      :on-change="handleChange"
-      :on-exceed="maxChange"
-      :on-progress="progress"
-      :on-remove="remove"
-      :on-error="onError"
-      :on-success="success"
-      :before-upload="beforeUp"
-      :show-file-list="showList"
-      style="width: 100%"
+        ref="upload"
+        :accept="accept"
+        :action="action"
+        :data="data"
+        :auto-upload="auto"
+        :drag="drag"
+        :file-list="tmpFileList"
+        :headers="headers"
+        :limit="max"
+        :list-type="listType"
+        :multiple="max > 1"
+        :on-change="handleChange"
+        :on-exceed="maxChange"
+        :on-progress="progress"
+        :on-remove="remove"
+        :on-error="onError"
+        :on-success="success"
+        :before-upload="beforeUp"
+        :show-file-list="showList"
+        style="width: 100%"
     >
       <div v-if="drag">
         <i class="el-icon-upload"></i>
@@ -30,13 +30,13 @@
       </div>
       <div v-else class="flex flex-justify-start">
         <el-button
-          v-if="showBtn"
-          :loading="loading"
-          icon="el-icon-upload"
-          plain
-          size="mini"
-          type="primary"
-          >{{ btnText }}
+            v-if="showBtn"
+            :loading="loading"
+            icon="el-icon-upload"
+            plain
+            size="mini"
+            type="primary"
+        >{{ btnText }}
         </el-button>
       </div>
       <slot></slot>
@@ -45,8 +45,8 @@
 </template>
 
 <script>
-import { Base64 } from 'js-base64'
-import { getToken } from '../utils/auth.js'
+import {Base64} from 'js-base64'
+import {getToken} from '../utils/auth.js'
 import website from '@/config/website'
 import api from '@/api'
 
@@ -107,7 +107,7 @@ export default {
       fileList: [],
       headers: {
         Authorization: `Basic ${Base64.encode(
-          `${website.clientId}:${website.clientSecret}`
+            `${website.clientId}:${website.clientSecret}`
         )}`,
         'Blade-Auth': 'bearer ' + getToken()
       }
@@ -141,7 +141,7 @@ export default {
         console.log(file)
       }
       if (file.status === 'uploading') {
-        this.loading = true
+        // this.loading = true
       } else if (file.status === 'success') {
         this.loading = false
       }
@@ -167,7 +167,7 @@ export default {
     },
     success() {
       const finishList = this.tmpFileList.filter(
-        sub => sub.status === 'success'
+          sub => sub.status === 'success'
       )
       if (finishList.length === this.tmpFileList.length) {
         this.$emit('success', {

+ 35 - 3
src/views/contract/component/info2.vue

@@ -12,6 +12,7 @@
           :before-open="beforeOpen"
           @row-del="rowDel"
           @row-save="handleRowSave"
+          @row-update="rowUpdate"
           @on-load="onLoad"
       >
         <template #fileIds-form="{ row, type }">
@@ -27,6 +28,14 @@
             </div>
           </div>
           <div v-if="type === 'edit'">
+            <div v-if="form.accountInformationFileList && form.accountInformationFileList.length === 0">
+              <uploads :max="9" @success="uploadSucc" :auto="true"/>
+              <div>
+                <div v-for="item in fileList" :key="item.id">
+                  {{ item.originalFileName }}
+                </div>
+              </div>
+            </div>
             <div
                 v-for="i in form.accountInformationFileList"
                 :key="i.id"
@@ -59,7 +68,6 @@
 <script>
 import uploads from '../../../components/uploads.vue'
 import api from '@/api/index.js'
-import {include} from "vite-plugin-windicss";
 
 export default {
   name: 'info',
@@ -207,7 +215,6 @@ export default {
     this.id = this.$route.query.id
   },
   methods: {
-    include,
     onLoad() {
       this.$api.contract.ledgerList({contractId: this.id}).then(res => {
         if (res.code === 200) {
@@ -245,10 +252,35 @@ export default {
           }
       ).then(res => {
         if (res === 'confirm') {
-          item.type = add
+          this.$api.contract.voucherDel({ids: item.id}).then(res => {
+            if (res.code === 200) {
+              item = item.filter(
+                  sub => sub.id !== item
+              )
+              this.$message.success(msg)
+            }
+          })
         }
       })
     },
+    rowUpdate(row, index, done, loading) {
+      loading()
+      const data = Object.assign(row, {contractId: this.id})
+      this.$api.contract.ledgerUpdate(data).then(res => {
+            if (res.code === 200) {
+              this.$message.success(res.msg)
+            } else {
+              this.$message.error(res.msg)
+            }
+            done(row)
+            this.onLoad()
+          },
+          error => {
+            window.console.log(error)
+            loading()
+          }
+      )
+    },
     handleRowSave(row, done, loading) {
       loading()
       const data = Object.assign(row, {contractId: this.id})

+ 2 - 54
yarn.lock

@@ -7,11 +7,6 @@
   resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
-"@antfu/utils@^0.7.2":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-0.7.4.tgz#b1c11b95f89f13842204d3d83de01e10bb9257db"
-  integrity sha512-qe8Nmh9rYI/HIspLSTwtbMFPj6dISG6+dJnOguTlPNXtCvS2uezdxscVBb7/3DrmNbQK49TDqpkSQ1chbRGdpQ==
-
 "@babel/parser@^7.20.15", "@babel/parser@^7.21.3":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea"
@@ -579,28 +574,6 @@
   dependencies:
     vue-demi "*"
 
-"@windicss/config@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@windicss/config/-/config-1.9.0.tgz#a5cb18653477284095e1694e962b42442a770446"
-  integrity sha512-QO4+udbmDIgZwAi89tqUt5nGwBq3IgyELjLn83twZXiIqzOw+77ecCuM0oPSbzWmIbCqXq3wRQHd6Z1u5E/5zQ==
-  dependencies:
-    debug "^4.3.4"
-    jiti "^1.18.2"
-    windicss "^3.5.6"
-
-"@windicss/plugin-utils@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@windicss/plugin-utils/-/plugin-utils-1.9.0.tgz#a38a5e37abf47ce43bb2cd8332cdecc647531f6a"
-  integrity sha512-omAacM5ExIr9XBUI2z47CyCXJBke4imJZqXW41YgHhRLbahTngbScFk5yxa6dXivDXUpUKqasOPXBJgA4bhHCg==
-  dependencies:
-    "@antfu/utils" "^0.7.2"
-    "@windicss/config" "1.9.0"
-    debug "^4.3.4"
-    fast-glob "^3.2.12"
-    magic-string "^0.30.0"
-    micromatch "^4.0.5"
-    windicss "^3.5.6"
-
 abbrev@^1.0.0, abbrev@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -1743,7 +1716,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
   integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9:
+fast-glob@^3.2.11, fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
   integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
@@ -2396,11 +2369,6 @@ jackspeak@^2.0.3:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
-jiti@^1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd"
-  integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==
-
 js-base64@^3.7.2:
   version "3.7.5"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.5.tgz#21e24cf6b886f76d6f5f165bfcd69cc55b9e3fca"
@@ -2475,11 +2443,6 @@ just-diff@^5.0.1:
   resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.2.0.tgz#60dca55891cf24cd4a094e33504660692348a241"
   integrity sha512-6ufhP9SHjb7jibNFrNxyFZ6od3g+An6Ai9mhGRvcYe8UJlH0prseN64M+6ZBBUoKYHZsitDP42gAJ8+eVWr3lw==
 
-kolorist@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c"
-  integrity sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -2723,7 +2686,7 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -4052,16 +4015,6 @@ vite-plugin-vue-layouts@^0.7.0:
     debug "^4.3.3"
     fast-glob "^3.2.11"
 
-vite-plugin-windicss@^1.8.7:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/vite-plugin-windicss/-/vite-plugin-windicss-1.9.0.tgz#0b635c3cf3557267d2f97bc42e3f9842a67360af"
-  integrity sha512-w0unPfcbVU5eaISAsFTLgIb41SLhmXoUF75Othu8NqFioe8+DEqiuvJ7/k/LRuEuvI8Rt/OKrY6cNzrB+dykaA==
-  dependencies:
-    "@windicss/plugin-utils" "1.9.0"
-    debug "^4.3.4"
-    kolorist "^1.8.0"
-    windicss "^3.5.6"
-
 vite@^3.0.0:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/vite/-/vite-3.2.7.tgz#35a62826bd4d6b778ae5db8766d023bcd4e7bef3"
@@ -4199,11 +4152,6 @@ wide-align@^1.1.5:
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
-windicss@^3.5.6:
-  version "3.5.6"
-  resolved "https://registry.yarnpkg.com/windicss/-/windicss-3.5.6.tgz#30a34da76894d952a96c9a1921f2e91e13932183"
-  integrity sha512-P1mzPEjgFMZLX0ZqfFht4fhV/FX8DTG7ERG1fBLiWvd34pTLVReS5CVsewKn9PApSgXnVfPWwvq+qUsRwpnwFA==
-
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"