修改导入bug

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java

@@ -229,10 +229,10 @@ public class ContractFileController {
     public ActionResult ImportData(@RequestBody ContractFileModel data) {
         List<ContractFileModel> dataList = JsonUtil.getJsonToList(data.getList(), ContractFileModel.class);
         for (ContractFileModel model : dataList) {
-            if (model.getNum()==null||model.getNum().equals("0")){
+            if (model.getNum()==null||model.getNum().equals(" ")){
                 return ActionResult.fail("合同导入数量是必填项");
             }
-            if (model.getAmount()==null||model.getAmount().equals("0")){
+            if (model.getAmount()==null||model.getAmount().equals(" ")){
                 return ActionResult.fail("合同导入金额是必填项");
             }
             if (model.getName()==null||model.getName().equals(" ")){

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java

@@ -71,6 +71,7 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
     @Override
     public List<ContractFileEntity> getList(ContractFilePagination contractFilePagination) {
         String userId = userProvider.get().getUserId();
+
         List<String> AllIdList = new ArrayList();
         int total = 0;
         int contractFileNum = 0;
@@ -389,7 +390,12 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
     //导入
     @Override
     public ContractfileImportVO importData(List<ContractFileModel> dt) {
-        String userId=userProvider.get().getUserId();
+        String userId = userProvider.get().getUserId();
+        String detpartment = null;
+        if (!userProvider.get().getIsAdministrator()) {
+            detpartment = userProvider.getDepartmentId(userId);
+        }
+
         for (ContractFileModel model : dt) {
             QueryWrapper<UserEntity> queryuser = new QueryWrapper<UserEntity>();
             queryuser.eq("F_Id",userId);
@@ -440,7 +446,7 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
                         model.setStatus("1");
                     }
                 }
-
+                model.setApproval("否");
 
         }
         List<ContractFileEntity> entitys = JsonUtil.getJsonToList(dt, ContractFileEntity.class);

SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog title="批量导入" :close-on-click-modal="false" :visible.sync="visible"
-    class="JNPF-dialog JNPF-dialog_center JNPF-dialog-import" lock-scroll width="1000px">
+    class="JNPF-dialog JNPF-dialog_center JNPF-dialog-import" lock-scroll width="1000px" :modal="false" :modal-append-to-body="false">
     <el-steps :active="active" align-center>
       <el-step title="上传文件"></el-step>
       <el-step title="数据预览"></el-step>
@@ -35,7 +35,7 @@
       </div>
     </div>
     <div class="import-main" v-show="active==2">
-      <p style="color: #950614">批量导入自动去重在合同档案中已经存在的合同数据</p>
+<!--      <p style="color: #950614">批量导入自动去重在合同档案中已经存在的合同数据</p>-->
       <JNPF-table v-loading="listLoading" :data="list">
 
         <el-table-column prop="contractCode" label="合同编码" width="150">