From 79b8fd1acd4d6b94d6ee9bfb06b3547313be07f1 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 22 Jul 2021 09:26:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=89=93=E5=8D=B0=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addFeePrintSpec/addFeePrintSpec.html      | 19 +++++++++++++------
 .../addFeePrintSpec/addFeePrintSpec.js        | 14 ++++++++++++++
 .../editFeePrintSpec/editFeePrintSpec.html    |  7 +++++++
 .../editFeePrintSpec/editFeePrintSpec.js      | 16 ++++++++++++++--
 .../feePrintSpecManage.html                   |  2 ++
 5 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/public/components/property/addFeePrintSpec/addFeePrintSpec.html b/public/components/property/addFeePrintSpec/addFeePrintSpec.html
index 78b0fafec..a56458584 100755
--- a/public/components/property/addFeePrintSpec/addFeePrintSpec.html
+++ b/public/components/property/addFeePrintSpec/addFeePrintSpec.html
@@ -1,5 +1,5 @@
 <div id="addFeePrintSpecModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-     aria-hidden="true">
+    aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -17,12 +17,19 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addFeePrintSpecInfo.printName" type="text" placeholder="必填，请填写名称"
+                                        class="form-control">
+                                </div>
+                            </div>
+
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">图片</label>
                                 <div class="col-sm-10">
                                     <vc:create path="frame/uploadImage" callBackListener="addFeePrintSpec"
-                                               callBackFunction="notifyUploadImage" imageCount="1"
-                                               namespace="addFeePrintSpec">
+                                        callBackFunction="notifyUploadImage" imageCount="1" namespace="addFeePrintSpec">
                                     </vc:create>
                                 </div>
                             </div>
@@ -30,16 +37,16 @@
                                 <label class="col-sm-2 col-form-label">内容</label>
                                 <div class="col-sm-10">
                                     <textarea v-model="addFeePrintSpecInfo.content" placeholder="必填，请填写内容"
-                                              class="form-control" rows="5"></textarea>
+                                        class="form-control" rows="5"></textarea>
                                 </div>
                             </div>
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
-                                        v-on:click="saveFeePrintSpecInfo()">
+                                    v-on:click="saveFeePrintSpecInfo()">
                                     <i class="fa fa-check"></i>&nbsp;保存
                                 </button>
                                 <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                        data-dismiss="modal">
+                                    data-dismiss="modal">
                                     <i class="fa fa-times"></i>&nbsp;取消
                                 </button>
                             </div>
diff --git a/public/components/property/addFeePrintSpec/addFeePrintSpec.js b/public/components/property/addFeePrintSpec/addFeePrintSpec.js
index fa7143b20..b555e19bd 100755
--- a/public/components/property/addFeePrintSpec/addFeePrintSpec.js
+++ b/public/components/property/addFeePrintSpec/addFeePrintSpec.js
@@ -10,6 +10,7 @@
                 specCd: '',
                 content: '',
                 qrImg: '',
+                printName: '',
             }
         },
         _initMethod: function () {
@@ -39,6 +40,18 @@
                             errInfo: "规格不是有效数字"
                         },
                     ],
+                    'addFeePrintSpecInfo.printName': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "名称不能为空"
+                        },
+                        {
+                            limit: "maxLength",
+                            param: "128",
+                            errInfo: "名称太长"
+                        },
+                    ],
                     'addFeePrintSpecInfo.content': [
                         {
                             limit: "required",
@@ -100,6 +113,7 @@
                     specCd: '',
                     content: '',
                     qrImg: '',
+                    printName: '',
                 };
             }
         }
diff --git a/public/components/property/editFeePrintSpec/editFeePrintSpec.html b/public/components/property/editFeePrintSpec/editFeePrintSpec.html
index 80a988740..0db66302b 100755
--- a/public/components/property/editFeePrintSpec/editFeePrintSpec.html
+++ b/public/components/property/editFeePrintSpec/editFeePrintSpec.html
@@ -16,6 +16,13 @@
                                         <option value="2020">收据打印说明</option>
                                     </select> </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editFeePrintSpecInfo.printName" type="text" placeholder="必填，请填写名称"
+                                        class="form-control">
+                                </div>
+                            </div>
 
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">必填</label>
diff --git a/public/components/property/editFeePrintSpec/editFeePrintSpec.js b/public/components/property/editFeePrintSpec/editFeePrintSpec.js
index f317527b5..2c4206ee1 100755
--- a/public/components/property/editFeePrintSpec/editFeePrintSpec.js
+++ b/public/components/property/editFeePrintSpec/editFeePrintSpec.js
@@ -7,7 +7,7 @@
                 specCd: '',
                 content: '',
                 qrImg: '',
-
+                printName:'',
             }
         },
         _initMethod: function () {
@@ -49,6 +49,18 @@
                             errInfo: "规格不是有效数字"
                         },
                     ],
+                    'editFeePrintSpecInfo.printName': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "名称不能为空"
+                        },
+                        {
+                            limit: "maxLength",
+                            param: "128",
+                            errInfo: "名称太长"
+                        },
+                    ],
                     'editFeePrintSpecInfo.content': [
                         {
                             limit: "required",
@@ -106,7 +118,7 @@
                     specCd: '',
                     content: '',
                     qrImg: '',
-
+                    printName:'',
                 }
             }
         }
diff --git a/public/pages/property/feePrintSpecManage/feePrintSpecManage.html b/public/pages/property/feePrintSpecManage/feePrintSpecManage.html
index 053f6eaa0..f92581715 100755
--- a/public/pages/property/feePrintSpecManage/feePrintSpecManage.html
+++ b/public/pages/property/feePrintSpecManage/feePrintSpecManage.html
@@ -16,6 +16,7 @@
                         <thead>
                         <tr>
                             <th class="text-center">图片</th>
+                            <th class="text-center">名称</th>
                             <th class="text-center">规格</th>
                             <th class="text-center">编码</th>
                             <th class="text-center">操作</th>
@@ -27,6 +28,7 @@
                                 <img :src="feePrintSpec.qrImg" style="border-radius: 5px;" width="100px"
                                      height="100px"/>
                             </td>
+                            <td class="text-center">{{feePrintSpec.printName}}</td>
                             <td class="text-center">{{feePrintSpec.specCd == '1010'?'催缴打印说明':'收据打印说明'}}</td>
                             <td class="text-center">{{feePrintSpec.printId}}</td>
                             <td class="text-center">