Browse Source

分摊比例导入功能 前后端代码

yurk 3 năm trước cách đây
mục cha
commit
73f3deb71a

+ 14 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -417,6 +417,16 @@
                 <el-button type="primary" @click="setPercentSetting()" >确定</el-button>
             </div>
         </el-dialog>
+        <!-- 导入结果说明 -->
+        <el-dialog title="分摊比例导入结果" v-if="showImportResult" :visible.sync="showImportResult" customClass="customWidth" width="500px">
+            <div>
+                <span>{{importResultMsg}}</span>
+                
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="showImportResult=false">确定</el-button>
+            </span>
+        </el-dialog>
     </section>
 </template>
 <style scoped>
@@ -494,6 +504,8 @@ import { error } from 'dingtalk-jsapi';
                 xzList: [],
                 intoAmortizationDialog : false ,
                 importingData: false,
+                importResultMsg:null,
+                showImportResult:false,
             };
         },
         methods: {
@@ -1353,16 +1365,14 @@ import { error } from 'dingtalk-jsapi';
                     let formData = new FormData();
                     formData.append("file", item.file);
                     formData.append("companyId", this.user.companyId);
-                    this.http.uploadFile('/report/importData', formData,
+                    this.http.uploadFile('/project-percentage/importData', formData,
                     res => {
                         this.$refs.upload.clearFiles();
                         this.importingData = false;
                         this.showImportResult = true;
                         if (res.code == "ok") {
                             //换成弹出框,以免有人等了半天回来啥也没看到
-                            this.importResultMsg = "成功导入"+res.data+"条分摊比例数据。"+(res.msg?res.msg:"");;
-                            this.getReportList();
-                            this.importWXDialog = false;
+                            this.importResultMsg = "成功导入"+res.data+"条分摊比例数据。"+(res.msg?res.msg:"");
                         } else {
                             this.importResultMsg = "导入失败:"+res.msg;
                         }