Browse Source

fix: 计量台账跟台账分解替换附件报错

lanjianrong 4 years ago
parent
commit
72a54bdb19

+ 2 - 2
app/controller/ledger_controller.js

@@ -941,8 +941,8 @@ module.exports = app => {
                 if (stream.filename !== undefined) {
                     const create_time = Date.parse(new Date()) / 1000;
                     const fileInfo = path.parse(stream.filename);
-                    const dirName = 'app/public/upload/ledger/' + moment().format('YYYYMMDD');
-                    const fileName = 'stage' + create_time + fileInfo.ext;
+                    const dirName = `app/public/upload/${this.ctx.tender.id}/ledger`;
+                    const fileName = 'fujian_' + create_time + fileInfo.ext;
 
                     // 判断文件夹是否存在,不存在则直接创建文件夹
                     if (!fs.existsSync(path.join(this.app.baseDir, dirName))) {

+ 3 - 2
app/controller/stage_controller.js

@@ -1530,8 +1530,9 @@ module.exports = app => {
                 if (stream.filename !== undefined) {
                     const create_time = Date.parse(new Date()) / 1000;
                     const fileInfo = path.parse(stream.filename);
-                    const dirName = 'app/public/upload/stage/' + moment().format('YYYYMMDD');
-                    const fileName = 'stage' + create_time + fileInfo.ext;
+                    // const dirName = 'app/public/upload/stage/' + moment().format('YYYYMMDD');
+                    const dirName = `app/public/upload/${this.ctx.tender.id}/stage`;
+                    const fileName = 'fujian_' + create_time + fileInfo.ext;
 
                     // 判断文件夹是否存在,不存在则直接创建文件夹
                     if (!fs.existsSync(path.join(this.app.baseDir, dirName))) {

+ 3 - 3
app/public/js/ledger.js

@@ -3548,9 +3548,9 @@ $(document).ready(function() {
               $('#show-att tr').eq(0).children('td').text(data.filename + data.fileext);
               const name = data.code !== null && data.code !== '' ? data.code : (data.b_code !== null ? data.b_code : '');
               $('#show-att tr').eq(1).children('td').text($.trim(name + ' ' + data.lname));
-              $('#show-att tr').eq(3).children('td').eq(0).text(data.username);
-              $('#show-att tr').eq(3).children('td').eq(1).text(data.in_time);
-              $('#show-att tr').eq(4).children('td').text(data.remark);
+              $('#show-att tr').eq(2).children('td').eq(0).text(data.username);
+              $('#show-att tr').eq(2).children('td').eq(1).text(data.in_time);
+              $('#show-att tr').eq(3).children('td').text(data.remark);
               $('#btn-att a').eq(3).show();
               $('#btn-att a').eq(2).hide();
               $('#btn-att a').eq(4).hide();