增加企业查询

nasc-system/src/main/java/com/nasc/custom/domain/NascDealRecord.java

@@ -33,8 +33,8 @@ public class NascDealRecord {
     /** 身份证号码/社会信用代码 */
     private String idCard;
 
-    /** 打印内容 */
-    private String content;
+    /** 企业名称 */
+    private String enterpriseName;
 
     /** 受理单状态 0 草稿 1 物料流转 */
     private Long withStatus;
@@ -112,12 +112,12 @@ public class NascDealRecord {
         this.idCard = idCard;
     }
 
-    public String getContent() {
-        return content;
+    public String getEnterpriseName() {
+        return enterpriseName;
     }
 
-    public void setContent(String content) {
-        this.content = content;
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
     }
 
     public Long getWithStatus() {

nasc-system/src/main/java/com/nasc/custom/domain/NascPrintLog.java

@@ -46,6 +46,9 @@ public class NascPrintLog {
     /** 打印内容 */
     private String content;
 
+    /** 企业名称 */
+    private String enterpriseName;
+
     /** 打印类型 1 受理通知单 2 补正材料告知书 3 不予受理通知书 4 物料流转 */
     private Long printType;
 
@@ -157,4 +160,12 @@ public class NascPrintLog {
     public void setPrintTime(Date printTime) {
         this.printTime = printTime;
     }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
 }

nasc-system/src/main/resources/mapper/custom/NascDealRecordMapper.xml

@@ -6,9 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insertDealRecord" parameterType="NascDealRecord" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO nasc_deal_record (serial_number, barcode, with_type, contacts, phone, id_card, with_status,
-                                    materials, matter_id, deal_user, create_time)
+                                      enterprise_name, materials, matter_id, deal_user, create_time)
         VALUES (#{serialNumber}, #{barcode}, #{withType}, #{contacts}, #{phone}, #{idCard}, #{withStatus},
-            #{materials}, #{matterId}, #{dealUser}, sysdate());
+            #{enterpriseName}, #{materials}, #{matterId}, #{dealUser}, sysdate());
     </insert>
 
     <resultMap id="dealRecordResult" type="java.util.HashMap">
@@ -26,11 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName" column="item_name"/>
         <result property="userName" column="user_name"/>
         <result property="deptName" column="dept_name"/>
+        <result property="enterpriseName" column="enterprise_name"/>
     </resultMap>
 
     <select id="selectDealRecordList" parameterType="NascDealRecord" resultMap="dealRecordResult">
         SELECT dr.id, dr.serial_number, dr.with_type, dr.contacts, dr.barcode, dr.matter_id,
-               dr.phone, dr.id_card, dr.with_status, dr.materials,
+               dr.phone, dr.id_card, dr.with_status, dr.materials, dr.enterprise_name,
                DATE_FORMAT(dr.create_time, '%Y-%m-%d %H:%i:%s') AS create_time,
                m.item_name, u.user_name, d.dept_name
         FROM nasc_deal_record dr
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getDealRecordById" resultMap="dealRecordResult">
         SELECT dr.id, dr.serial_number, dr.with_type, dr.contacts, dr.barcode,
-               dr.phone, dr.id_card, dr.with_status, dr.materials,
+               dr.phone, dr.id_card, dr.with_status, dr.materials, dr.enterprise_name,
                DATE_FORMAT(dr.create_time, '%Y-%m-%d %H:%i:%s') AS create_time,
                m.item_name, u.user_name
         FROM nasc_deal_record dr

nasc-system/src/main/resources/mapper/custom/NascPrintLogMapper.xml

@@ -6,9 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insertPrintLog" parameterType="NascPrintLog" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO nasc_print_log (serial_number, user_id, user_name, matter, matter_name, with_type, contacts,
-                                    phone, id_card, content, print_type, print_time)
+                                    phone, id_card, content, enterprise_name, print_type, print_time)
         VALUES (#{serialNumber}, #{userId}, #{userName}, #{matter}, #{matterName}, #{withType}, #{contacts},
-            #{phone}, #{idCard}, #{content}, #{printType}, sysdate());
+            #{phone}, #{idCard}, #{content}, #{enterpriseName}, #{printType}, sysdate());
     </insert>
 
     <resultMap id="printLogResult" type="java.util.HashMap">
@@ -22,13 +22,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="idCard" column="id_card"/>
         <result property="content" column="content"/>
         <result property="printType" column="print_type"/>
+        <result property="enterpriseName" column="enterprise_name"/>
         <result property="deptName" column="dept_name"/>
         <result property="printTime" column="print_time"/>
     </resultMap>
 
     <select id="selectPrintLogList" resultMap="printLogResult">
         SELECT pl.id, pl.serial_number, pl.user_name, pl.matter_name, pl.with_type, pl.contacts, pl.phone,
-               pl.id_card, pl.content, pl.print_type, d.dept_name,
+               pl.id_card, pl.content, pl.enterprise_name, pl.print_type, d.dept_name,
                DATE_FORMAT(pl.print_time, '%Y-%m-%d %H:%i:%s') AS print_time
         FROM nasc_print_log pl
         LEFT JOIN sys_user u ON u.user_id = pl.user_id

nasc-ui/src/views/matter/deal_record/index.vue

@@ -25,6 +25,7 @@
                   <span v-if="scope.row.withType === 2">企业</span>
                 </template>
               </el-table-column>
+              <el-table-column label="企业名称" align="center" prop="enterpriseName"/>
               <el-table-column label="联系人" align="center" prop="contacts" width="100"/>
               <el-table-column label="联系电话" align="center" prop="phone" width="120"/>
               <el-table-column label="受理人" align="center" prop="userName">
@@ -59,6 +60,7 @@
             </template>
           </el-table-column>
           <el-table-column label="事项名称" align="center" prop="matterName"/>
+          <el-table-column label="企业名称" align="center" prop="enterpriseName"/>
           <el-table-column label="联系人" align="center" prop="contacts" width="100"/>
           <el-table-column label="联系电话" align="center" prop="phone" width="120"/>
           <el-table-column label="打印人" align="center" prop="userName">
@@ -89,6 +91,7 @@
             </template>
           </el-table-column>
           <el-table-column label="事项名称" align="center" prop="matterName"/>
+          <el-table-column label="企业名称" align="center" prop="enterpriseName"/>
           <el-table-column label="联系人" align="center" prop="contacts" width="100"/>
           <el-table-column label="联系电话" align="center" prop="phone" width="120"/>
           <el-table-column label="打印人" align="center" prop="userName">
@@ -119,6 +122,7 @@
             </template>
           </el-table-column>
           <el-table-column label="事项名称" align="center" prop="matterName"/>
+          <el-table-column label="企业名称" align="center" prop="enterpriseName"/>
           <el-table-column label="联系人" align="center" prop="contacts" width="100"/>
           <el-table-column label="联系电话" align="center" prop="phone" width="120"/>
           <el-table-column label="打印人" align="center" prop="userName">
@@ -242,6 +246,13 @@
         </el-descriptions>
       </el-row>
     </el-dialog>
+    <el-dialog title="详情" :visible.sync="printDetailDialog" :close-on-click-modal="false" width="60%"
+               destroy-on-close append-to-body> <el-row id="print_ycxgzd" style="height: auto; padding: 10px;">
+      <el-row style="overflow: auto; height: 70vh">
+        <div class="matter-material" style="background-color: #fff;" v-html="currPrintDetailInfo"></div>
+      </el-row>
+    </el-row>
+    </el-dialog>
   </div>
 </template>
 
@@ -262,6 +273,7 @@ export default {
       // 遮罩层
       loading: true,
       dealDetailDialog: false,
+      printDetailDialog: false,
       activeName: 'first',
       // 显示搜索条件
       showSearch: true,
@@ -283,6 +295,7 @@ export default {
       dealRecord2List: [],
       dealRecord3List: [],
       currDealRecord: null,
+      currPrintDetailInfo: null,
       detailKey: 0,
       printObj: {
         id: "print_deal_detail",
@@ -348,7 +361,9 @@ export default {
       });
     },
     handleDealDetail(row) {
-
+      console.log(row)
+      this.currPrintDetailInfo = row.content
+      this.printDetailDialog = true
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -436,4 +451,7 @@ export default {
 };
 </script>
 <style scoped>
+.ql-align-center {
+  text-align: center;
+}
 </style>

nasc-ui/src/views/matter/index/index.vue

@@ -201,15 +201,31 @@
             <el-radio :label="2">企业</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item :label="dealWithForm.withType == 1 ? '姓名' : '联系人'" prop="contacts">
-          <el-input v-model="dealWithForm.contacts" maxlength="20"></el-input>
-        </el-form-item>
-        <el-form-item :label="dealWithForm.withType == 1 ? '身份证号码' : '社会信用代码'" prop="idCard">
-          <el-input v-model="dealWithForm.idCard" maxlength="50"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话" prop="phone">
-          <el-input v-model="dealWithForm.phone" maxlength="11"></el-input>
-        </el-form-item>
+        <template v-if="dealWithForm.withType == 1">
+          <el-form-item label="姓名" prop="contacts">
+            <el-input v-model="dealWithForm.contacts" maxlength="20"></el-input>
+          </el-form-item>
+          <el-form-item label="身份证号码" prop="idCard">
+            <el-input v-model="dealWithForm.idCard" maxlength="50"></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="phone">
+            <el-input v-model="dealWithForm.phone" maxlength="11"></el-input>
+          </el-form-item>
+        </template>
+        <template v-else>
+          <el-form-item label="企业名称" prop="enterpriseName">
+            <el-input v-model="dealWithForm.enterpriseName" maxlength="100"></el-input>
+          </el-form-item>
+          <el-form-item label="社会信用代码" prop="idCard">
+            <el-input v-model="dealWithForm.idCard" maxlength="50"></el-input>
+          </el-form-item>
+          <el-form-item label="联系人" prop="contacts">
+            <el-input v-model="dealWithForm.contacts" maxlength="20"></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="phone">
+            <el-input v-model="dealWithForm.phone" maxlength="11"></el-input>
+          </el-form-item>
+        </template>
         <el-table
           ref="multipleTable"
           :data="dealWithForm.materials"
@@ -493,6 +509,7 @@ export default {
       dealWithForm: {
         serialNumber: '',
         withType: 1,
+        enterpriseName: '',
         contacts: '',
         idCard: '',
         phone: '',
@@ -502,6 +519,9 @@ export default {
         withType: [
           {required: true, message: '请选择办理类型', trigger: 'change'}
         ],
+        enterpriseName: [
+          {required: true, message: '请输入企业名称', trigger: 'change'}
+        ],
         contacts: [
           {required: true, validator: validateDealWithUser}
         ],
@@ -639,7 +659,13 @@ export default {
       content = content.replace(/{\$matter}/g, this.currMatter.itemName)
       const username = Cookies.get("username");
       content = content.replace(/{\$dealWithUser}/g, username)
-      content = content.replace(/{\$approveUser}/g, this.dealWithForm.contacts)
+      let approveUser = ''
+      if (this.dealWithForm.withType == 1) {
+        approveUser = this.dealWithForm.contacts
+      } else {
+        approveUser = this.dealWithForm.enterpriseName
+      }
+      content = content.replace(/{\$approveUser}/g, approveUser)
       content = content.replace(/{\$serialNumber}/g, this.dealWithForm.serialNumber)
       return content
     },

sql/p_bysltzs.html

@@ -8,7 +8,7 @@
         </strong>
         {$serialNumber}
     </p>
-    <p class="ql-align-center" style=" font-size: 26px;">
+    <p class="ql-align-center" style=" font-size: 26px; text-align: center;">
         <strong>
             不予受理通知书（存根联）
         </strong>
@@ -39,7 +39,7 @@
             签字日期：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;年&nbsp;&nbsp;&nbsp;&nbsp;月&nbsp;&nbsp;&nbsp;&nbsp;日
         </p>
     </div>
-    <p class="ql-align-right" style=" text-align: right;">
+    <p class="ql-align-right" style=" text-align: right; text-align: center;">
         受理机构（专用章）
     </p>
     <p class="ql-align-right" style=" text-align: right;">

sql/p_bzclgzs.html

@@ -8,7 +8,7 @@
         </strong>
         {$serialNumber}
     </p>
-    <p class="ql-align-center" style=" font-size: 26px;">
+    <p class="ql-align-center" style=" font-size: 26px; text-align: center;">
         <strong>
             补正材料一次性告知书（存根联）
         </strong>
@@ -53,7 +53,7 @@
         </strong>
         {$serialNumber}
     </p>
-    <p class="ql-align-center" style=" font-size: 26px;">
+    <p class="ql-align-center" style=" font-size: 26px; text-align: center;">
         <strong>
             补正材料一次性告知书（回执联）&nbsp;
         </strong>

sql/p_sltzd.html

@@ -8,7 +8,7 @@
         </strong>
         {$serialNumber}
     </p>
-    <p class="ql-align-center" style=" font-size: 26px;">
+    <p class="ql-align-center" style=" font-size: 26px; text-align: center;">
         <strong>
             受理通知单（存根联）
         </strong>
@@ -51,7 +51,7 @@
         </strong>
         {$serialNumber}
     </p>
-    <p class="ql-align-center" style=" font-size: 26px;">
+    <p class="ql-align-center" style=" font-size: 26px; text-align: center;">
         <strong>
             受理通知单（回执联）
         </strong>