1

fhKeeper/formulahousekeeper/octopus/src/views/signing/list.vue

@@ -109,31 +109,31 @@
         </el-dialog>
         <!-- 完善合同信息  需要调下样式--> 
         <el-dialog v-if="editDialogB" :visible.sync="editDialogB" title="完善合同信息" width="1200px">
-            <el-form :inline="true" :model="formInline" :rules="rulesFormInline" ref="formInline" class="heClass">
-                <el-form-item label="甲方名称：" label-width="150px">
-                    南京火石闪信网络科技有限公司
-                </el-form-item>
-                <el-form-item  label="乙方名称：" label-width="150px" prop="secondParty">
+            <el-form :inline="true" :model="formInline" :rules="rulesFormInline" ref="formInline" class="heClass">            
+                <el-form-item  label="甲方名称：" label-width="150px" prop="secondParty">
                     <el-input size="small" controls-position="right" v-model="formInline.secondParty" :disabled="finalize"  style="width: 300px"></el-input>
                 </el-form-item>
-                <el-form-item label="甲方地址：" label-width="150px">
-                    南京市江宁区秣周东路12号悠谷软件园2号楼3楼P346室
-                </el-form-item>
-                <el-form-item label="乙方地址：" label-width="150px" prop="secondPartyAddr">
+                <el-form-item label="乙方名称：" label-width="150px">
+                    南京火石闪信网络科技有限公司
+                </el-form-item>              
+                <el-form-item label="甲方地址：" label-width="150px" prop="secondPartyAddr">
                     <el-input size="small" controls-position="right" v-model="formInline.secondPartyAddr" :disabled="finalize" style="width: 400px"></el-input>
                 </el-form-item>
-                <el-form-item label="甲方联系人：" label-width="150px">
-                    屈跃庭
-                </el-form-item>
-                <el-form-item label="乙方联系人：" label-width="150px" prop="secondPartyContacts">
+                <el-form-item label="乙方地址：" label-width="150px">
+                    南京市江宁区秣周东路12号悠谷软件园2号楼3楼P346室
+                </el-form-item>               
+                <el-form-item label="甲方联系人：" label-width="150px" prop="secondPartyContacts">
                     <el-input size="small" controls-position="right" v-model="formInline.secondPartyContacts" :disabled="finalize" style="width: 150px"></el-input>
                 </el-form-item>
-                <el-form-item label="甲方电话：" label-width="150px">
-                    15895914665
+                <el-form-item label="乙方联系人：" label-width="150px">
+                    屈跃庭
                 </el-form-item>
-                <el-form-item label="乙方电话：" label-width="150px" prop="secondPartyTel">
+                <el-form-item label="甲方电话：" label-width="150px" prop="secondPartyTel">
                     <el-input size="small" controls-position="right"  maxlength="11" v-model="formInline.secondPartyTel" :disabled="finalize" style="width: 150px"></el-input>
                 </el-form-item>
+                <el-form-item label="乙方电话：" label-width="150px">
+                    15895914665
+                </el-form-item>
                 <el-form-item label="软件名称：" label-width="150px" prop="softwareName">
                     <el-input size="small" controls-position="right" v-model="formInline.softwareName" :disabled="finalize" style="width: 200px"></el-input>
                 </el-form-item>
@@ -162,25 +162,25 @@
                     <el-input-number size="small" :min="0" controls-position="right" v-model.number="formInline.firstOpenNum" :disabled="finalize" style="width: 100px"></el-input-number> 人
                 </el-form-item>
                 <el-divider><i class="el-icon-s-check"></i></el-divider>
-                <el-form-item label="甲方账号：" label-width="150px">
-                    32050188143600000075
-                </el-form-item>
-                <el-form-item label="乙方账号：" label-width="150px" prop="secondPartyAccount">
+                <el-form-item label="甲方账号：" label-width="150px" prop="secondPartyAccount">
                     <el-input size="small" controls-position="right" v-model="formInline.secondPartyAccount" :disabled="finalize" style="width: 300px"></el-input> 
                 </el-form-item>
-                <el-form-item label="甲方开户行：" label-width="150px">
-                    建设银行股份有限公司南京湖北路支行
+                <el-form-item label="乙方账号：" label-width="150px">
+                    32050188143600000075
                 </el-form-item>
-                <el-form-item label="乙方开户行：" label-width="150px" prop="secondPartyBankOfDeposit">
+                <el-form-item label="甲方开户行：" label-width="150px" prop="secondPartyBankOfDeposit">
                     <el-input size="small" controls-position="right" v-model="formInline.secondPartyBankOfDeposit" :disabled="finalize" style="width: 300px"></el-input> 
                 </el-form-item>
+                <el-form-item label="乙方开户行：" label-width="150px">
+                    建设银行股份有限公司南京湖北路支行
+                </el-form-item>
                 <!-- <el-form-item label="乙方开票名称：" label-width="150px" prop="secondPartyBillingName">
                     <el-input size="small" controls-position="right" v-model="formInline.secondPartyBillingName" :disabled="finalize" style="width: 200px"></el-input> 
                 </el-form-item> -->
-                <el-form-item label="乙方纳税人识别号：" label-width="150px" prop="secondPartyTIN">
+                <el-form-item label="甲方纳税人识别号：" label-width="150px" prop="secondPartyTIN">
                     <el-input size="small" controls-position="right" v-model="formInline.secondPartyTIN" :disabled="finalize" style="width: 200px"></el-input> 
                 </el-form-item>
-                <el-form-item label="乙方开具发票类型：" label-width="150px" prop="invoiceType">
+                <el-form-item label="甲方开具发票类型：" label-width="150px" prop="invoiceType">
                     <el-select v-model="formInline.invoiceType" placeholder="请选择" :disabled="finalize">
                         <el-option
                         v-for="invoiceItem in invoiceOptions"

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/controller/ContractDetailController.java

@@ -82,7 +82,7 @@ public class ContractDetailController {
         }
         LocalDate endDate=startDate.plusYears(contractDetail.getServiceDate());
         //根据模板生成word文件
-        InputStream ins =this.getClass().getResourceAsStream("/模板.docx");
+        InputStream ins =this.getClass().getResourceAsStream("/新模板.docx");
         /*new FileInputStream(new File("C:\\upload\\工时管家系统销售合同-模板.docx"));*/
         //注册xdocreport实例并加载FreeMarker模板引擎
         IXDocReport report = XDocReportRegistry.getRegistry().loadReport(ins,
@@ -134,38 +134,40 @@ public class ContractDetailController {
     @RequestMapping("/preview")
     public void preview(HttpServletResponse response,Integer companyId) {
         ContractDetail contractDetail = contractDetailService.getById(companyId);
-        String fileName = contractDetail.getSoftwareName()+"销售合同-"+contractDetail.getSecondParty()+".pdf";
-        String filePath = path+fileName;
-        System.out.println("filePath:" + filePath);
-        File f = new File(filePath);
-        BufferedInputStream br = null;
-        OutputStream out = null;
-        try {
-            br = new BufferedInputStream(new FileInputStream(f));
-            byte[] bs = new byte[1024];
-            int len = 0;
-            response.reset(); // 非常重要
-            // 在线打开方式
-            URL u = new URL("file:///" + path + filePath);
-            String contentType = u.openConnection().getContentType();
-            response.setContentType(contentType);
-            response.setHeader("Content-Disposition", "inline;filename="
-                    + fileName);
-            out = response.getOutputStream();
-            while ((len = br.read(bs)) > 0) {
-                out.write(bs, 0, len);
-            }
-            out.flush();
-            out.close();
-            br.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
+        if(contractDetail!=null){
+            String fileName = contractDetail.getSoftwareName()+"销售合同-"+contractDetail.getSecondParty()+".pdf";
+            String filePath = path+fileName;
+            System.out.println("filePath:" + filePath);
+            File f = new File(filePath);
+            BufferedInputStream br = null;
+            OutputStream out = null;
+            try {
+                br = new BufferedInputStream(new FileInputStream(f));
+                byte[] bs = new byte[1024];
+                int len = 0;
+                response.reset(); // 非常重要
+                // 在线打开方式
+                URL u = new URL("file:///" + path + filePath);
+                String contentType = u.openConnection().getContentType();
+                response.setContentType(contentType);
+                response.setHeader("Content-Disposition", "inline;filename="
+                        + fileName);
+                out = response.getOutputStream();
+                while ((len = br.read(bs)) > 0) {
+                    out.write(bs, 0, len);
+                }
+                out.flush();
+                out.close();
+                br.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                if (out != null) {
+                    try {
+                        out.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
                 }
             }
         }

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/service/impl/ContractDetailServiceImpl.java

@@ -37,9 +37,9 @@ public class ContractDetailServiceImpl extends ServiceImpl<ContractDetailMapper,
         ContractDetail contractDetail = contractDetailMapper.selectById(companyId);
         if(contractDetail==null){
             contractDetail=new ContractDetail();
+            contractDetail.setCompanyId(companyId);
             contractDetail.setFinalize(0);
         }
-        contractDetail.setCompanyId(companyId);
         httpRespMsg.data=contractDetail;
         return httpRespMsg;
     }