FinalYu 2 сар өмнө
parent
commit
2c3a3c4424

+ 11 - 0
nasc-system/src/main/java/com/nasc/custom/domain/NascPrint.java

@@ -28,6 +28,9 @@ public class NascPrint {
     /** 打印内容:不予受理通知书 */
     private String denyContent;
 
+    /** 打印内容:一次性告知单 */
+    private String disposableContent;
+
     /** 打印人员ID */
     private Long printBy;
 
@@ -84,6 +87,14 @@ public class NascPrint {
         this.printBy = printBy;
     }
 
+    public String getDisposableContent() {
+        return disposableContent;
+    }
+
+    public void setDisposableContent(String disposableContent) {
+        this.disposableContent = disposableContent;
+    }
+
     public Date getPrintTime() {
         return printTime;
     }

+ 2 - 1
nasc-system/src/main/resources/mapper/custom/NascMatterMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="content"    column="content"   />
         <result property="missContent"    column="miss_content"   />
         <result property="denyContent"    column="deny_content"   />
+        <result property="disposableContent"    column="disposable_content"   />
         <result property="printBy"    column="print_by"  />
         <result property="printTime"  column="print_ime" />
     </resultMap>
@@ -92,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getMatterInfo" parameterType="NascMatter" resultMap="matterResult">
         SELECT nm.id, nm.item_name, nm.dept_id, nm.prefix_question, nm.contacts, nm.contacts_phone, nm.sort_num, nm.del_flag, nm.create_by, nm.create_time, nm.update_by, nm.update_time,
                d.dept_name, d.dept_id, d.parent_id,
-               np.id AS printId, np.matter_id, np.content, np.miss_content, np.deny_content, np.print_by, np.print_time
+               np.id AS printId, np.matter_id, np.content, np.miss_content, np.deny_content, np.disposable_content, np.print_by, np.print_time
         FROM nasc_matter nm
         LEFT JOIN sys_dept d ON nm.dept_id = d.dept_id
         LEFT JOIN nasc_print np ON nm.id = np.matter_id

+ 4 - 3
nasc-system/src/main/resources/mapper/custom/NascPrintMapper.xml

@@ -10,13 +10,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="content"    column="content"   />
         <result property="missContent"    column="miss_content"   />
         <result property="denyContent"    column="deny_content"   />
+        <result property="disposableContent"    column="disposable_content"   />
         <result property="printBy"    column="print_by"  />
         <result property="printTime"  column="print_ime" />
     </resultMap>
 
     <insert id="insertPrint" parameterType="NascPrint" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO nasc_print (matter_id, content, miss_content, deny_content, print_by, print_time)
-        VALUES (#{matterId}, #{content}, #{missContent}, #{denyContent}, #{printBy}, sysdate())
+        INSERT INTO nasc_print (matter_id, content, miss_content, deny_content, disposable_content, print_by, print_time)
+        VALUES (#{matterId}, #{content}, #{missContent}, #{denyContent}, #{disposableContent}, #{printBy}, sysdate())
     </insert>
 
     <update id="updatePrint" parameterType="NascPrint">
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <select id="getPrintByMatterId" parameterType="Long" resultMap="printResult">
-        SELECT np.id, np.matter_id, np.content, np.miss_content, np.deny_content, np.print_by, np.print_time
+        SELECT np.id, np.matter_id, np.content, np.miss_content, np.deny_content, np.disposable_content, np.print_by, np.print_time
         FROM nasc_print np
         WHERE np.matter_id = #{matterId}
     </select>

+ 42 - 0
nasc-ui/src/views/matter/deal_record/index.vue

@@ -81,6 +81,37 @@
         <pagination v-show="total1 > 0" :total="total1" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize" @pagination="getDeal1List"/>
       </el-tab-pane>
+      <el-tab-pane label="一次性告知单" style="height: calc(-180px + 100vh); overflow: auto;" name="five">
+        <el-table :data="dealRecord5List">
+          <el-table-column label="受理编号" align="center" prop="serialNumber"/>
+          <el-table-column label="业务类型" align="center" prop="withType">
+            <template slot-scope="scope">
+              <span v-if="scope.row.withType === 1">个人</span>
+              <span v-if="scope.row.withType === 2">企业</span>
+            </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">
+            <template slot-scope="scope">
+              <span v-if="scope.row.userName">{{ scope.row.userName }}({{ scope.row.deptName }})</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="打印时间" align="center" prop="printTime" width="160">
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-button size="mini" type="text" icon="el-icon-document" @click="handleDealDetail(scope.row)">详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total5 > 0" :total="total5" :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize" @pagination="getDeal5List"/>
+      </el-tab-pane>
       <el-tab-pane label="补正材料告知书" style="height: calc(-180px + 100vh); overflow: auto;" name="third">
         <el-table :data="dealRecord2List">
           <el-table-column label="受理编号" align="center" prop="serialNumber"/>
@@ -289,11 +320,13 @@ export default {
       total1: 0,
       total2: 0,
       total3: 0,
+      total5: 0,
       // 受理记录数据
       dealRecordList: [],
       dealRecord1List: [],
       dealRecord2List: [],
       dealRecord3List: [],
+      dealRecord5List: [],
       currDealRecord: null,
       currPrintDetailInfo: null,
       detailKey: 0,
@@ -317,6 +350,7 @@ export default {
     this.getDeal1List();
     this.getDeal2List();
     this.getDeal3List();
+    this.getDeal5List();
   },
   methods: {
     handleTabClick(tab, event) {
@@ -344,6 +378,14 @@ export default {
         this.total1 = response.total;
       });
     },
+    getDeal5List() {
+      let params = JSON.parse(JSON.stringify(this.queryParams))
+      params.printType = 5
+      listPrintLogList(params).then(response => {
+        this.dealRecord5List = response.rows;
+        this.total5 = response.total;
+      });
+    },
     getDeal2List() {
       let params = JSON.parse(JSON.stringify(this.queryParams))
       params.printType = 2

+ 20 - 3
nasc-ui/src/views/matter/index/index.vue

@@ -70,9 +70,13 @@
             <el-button type="primary" @click="handleBtnSaveDealWith(0)">保存</el-button>
             <el-button type="warning" @click="handleBtnSaveDealWith(1)">物料流转</el-button>
             <el-button type="success" @click="handlePrintDealWith('print_suc')">受理通知单</el-button>
+            <el-button style="background-color: forestgreen;border-color: forestgreen;color: white;"
+                       @click="handlePrintDealWith('print_onegzd')">一次性告知单</el-button>
             <el-button type="info" @click="handlePrintDealWith('print_fail')">补正材料告知书</el-button>
             <el-button type="danger" @click="handlePrintDealWith('print_deny')">不予受理通知书</el-button>
             <el-button id="print_suc" type="success" v-print="printSuccessObj" style="display: none;">受理通知单</el-button>
+            <el-button id="print_onegzd" style="background-color: forestgreen;border-color: forestgreen;color: white;display: none;"
+                       v-print="printYcxgzdObj">一次性告知单</el-button>
             <el-button id="print_fail" type="info" v-print="printFailObj" style="display: none;">补正材料告知书</el-button>
             <el-button id="print_deny" type="info" v-print="printDenyObj" style="display: none;">不予受理通知书</el-button>
             <el-button @click="handleConnDesktop">远程连接</el-button>
@@ -472,6 +476,16 @@ export default {
         closeCallback(vue) {
         }
       },
+      printYcxgzdObj: {
+        id: "print_ycxgzd",
+        popTitle: "一次性告知单",
+        extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
+        openCallback(vue) {
+          vue.savePrintLog('print_ycxgzd', 5)
+        },
+        closeCallback(vue) {
+        }
+      },
       printFailObj: {
         id: "print_ycxgzd_fail",
         popTitle: "补正材料告知书",
@@ -673,9 +687,12 @@ export default {
      * {$materialConditions}:申请条件
      * {$materialList}:材料列表
      */
-    dealWithPrintInfo(objs) {
+    dealWithPrintInfo(objs, elm) {
       let printObj = this.currMatter.print ? this.currMatter.print : {}
       let pintContent = printObj.content ? printObj.content : ''
+      if (elm == 'print_onegzd') {
+        pintContent = printObj.disposableContent ? printObj.disposableContent : ''
+      }
       pintContent = pintContent.replace(/{\$materialNum}/g, objs.length)
       pintContent = pintContent.replace(/{\$materialConditions}/g, this.currMaterial.conditions)
       let itemHtml = ''
@@ -975,14 +992,14 @@ export default {
     handlePrintDealWith(elm) {
       this.$refs['dealWithForm'].validate((valid) => {
         if (valid) {
-          if (elm == 'print_suc') {
+          if (elm == 'print_suc' || elm == 'print_onegzd') {
             let materialList = this.dealWithForm.materials
             let objs = materialList.filter(obj => obj.reasonFlag)
             if (materialList.length > 0 && objs.length == 0) {
               this.$modal.msgError("请选择相关材料")
               return
             }
-            this.dealWithPrintInfo(objs)
+            this.dealWithPrintInfo(objs, elm)
             document.getElementById(elm).click()
           }
           if (elm == 'print_fail') {