Sfoglia il codice sorgente

refactor: 预付款附件上传、删除逻辑变更

lanjianrong 4 anni fa
parent
commit
ac2caa30d3
3 ha cambiato i file con 17 aggiunte e 7 eliminazioni
  1. 3 1
      app/controller/advance_controller.js
  2. 10 5
      app/public/js/advance_audit.js
  3. 4 1
      sql/update.sql

+ 3 - 1
app/controller/advance_controller.js

@@ -365,13 +365,14 @@ module.exports = app => {
         async upload(ctx) {
         async upload(ctx) {
             let stream;
             let stream;
             try {
             try {
-                this._checkAdvanceFileCanModify(ctx);
+                // this._checkAdvanceFileCanModify(ctx);
                 const parts = this.ctx.multipart({
                 const parts = this.ctx.multipart({
                     autoFields: true,
                     autoFields: true,
                 });
                 });
                 const files = [];
                 const files = [];
                 const create_time = Date.parse(new Date()) / 1000;
                 const create_time = Date.parse(new Date()) / 1000;
                 let idx = 0;
                 let idx = 0;
+                const extra_upload = ctx.advance.status === auditConst.status.checked;
                 while ((stream = await parts()) !== undefined) {
                 while ((stream = await parts()) !== undefined) {
                     if (!stream.filename) {
                     if (!stream.filename) {
                         // 如果没有传入直接返回
                         // 如果没有传入直接返回
@@ -401,6 +402,7 @@ module.exports = app => {
                         filesize: ctx.helper.bytesToSize(idx === 'isString' ? parts.field.size : parts.field.size[idx]),
                         filesize: ctx.helper.bytesToSize(idx === 'isString' ? parts.field.size : parts.field.size[idx]),
                         filename: file.name,
                         filename: file.name,
                         fileext: file.ext,
                         fileext: file.ext,
+                        extra_upload,
                     };
                     };
                     return newFile;
                     return newFile;
                 });
                 });

+ 10 - 5
app/public/js/advance_audit.js

@@ -335,15 +335,20 @@ $(document).ready(function () {
     })
     })
     function handleFileList(files = []) {
     function handleFileList(files = []) {
         $('#file-content').empty()
         $('#file-content').empty()
-        const { uncheck, checkNo } = auditConst.status
+        // const { uncheck, checkNo } = auditConst.status
         const newFiles = files.map(file => {
         const newFiles = files.map(file => {
             let showDel = false;
             let showDel = false;
             if (file.uid === cur_uid) {
             if (file.uid === cur_uid) {
-                if (!curAuditor) {
-                    advance.status === uncheck && cur_uid === advance.uid && (showDel = true)
-                    advance.status === checkNo && cur_uid === advance.uid && (showDel = true)
+                // if (!curAuditor) {
+                //     advance.status === uncheck && cur_uid === advance.uid && (showDel = true)
+                //     advance.status === checkNo && cur_uid === advance.uid && (showDel = true)
+                // } else {
+                //     curAuditor.audit_id === cur_uid && (showDel = true)
+                // }
+                if (advance.status === auditConst.status.checked) {
+                    showDel = Boolean(file.extra_upload )
                 } else {
                 } else {
-                    curAuditor.audit_id === cur_uid && (showDel = true)
+                    showDel = true
                 }
                 }
             }
             }
             return {...file, showDel}
             return {...file, showDel}

+ 4 - 1
sql/update.sql

@@ -13,4 +13,7 @@ ALTER TABLE `zh_revise_bills`
 ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
 ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
 
 
 ALTER TABLE `zh_revise_pos`
 ALTER TABLE `zh_revise_pos`
-ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
+ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
+
+ALTER TABLE `zh_advance_file`
+ADD COLUMN `extra_upload` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '是否为审核通过后再次上传的文件,0为否' AFTER `fileext`;