From 14498c5bbefe6526371dc15d18ecd461237697f4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 13 Nov 2021 23:37:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addComponentCondition.html                    | 10 +++++++++-
 .../addComponentCondition.js                      | 15 ++++++++++++++-
 .../editComponentCondition.html                   | 10 +++++++++-
 .../editComponentCondition.js                     | 15 ++++++++++++++-
 .../commonReportTable/commonReportTable.html      |  4 ++--
 .../commonReportTable/commonReportTable.js        |  2 ++
 .../componentConditionManage.html                 |  4 +++-
 7 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/public/components/dev/addComponentCondition/addComponentCondition.html b/public/components/dev/addComponentCondition/addComponentCondition.html
index 4f7b392ad..583d19736 100644
--- a/public/components/dev/addComponentCondition/addComponentCondition.html
+++ b/public/components/dev/addComponentCondition/addComponentCondition.html
@@ -33,10 +33,18 @@
                 <div class="col-sm-10">
                     <select class="custom-select" v-model="addComponentConditionInfo.type">
                       <option selected disabled value="">必填，请选择类型</option>
-                      <option value="input">文本框</option>
+                      <option value="text">文本框</option>
+                      <option value="date">日期</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="addComponentConditionInfo.seq" 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">
diff --git a/public/components/dev/addComponentCondition/addComponentCondition.js b/public/components/dev/addComponentCondition/addComponentCondition.js
index db35f17bc..adb68090b 100644
--- a/public/components/dev/addComponentCondition/addComponentCondition.js
+++ b/public/components/dev/addComponentCondition/addComponentCondition.js
@@ -13,6 +13,7 @@
                 param: '',
                 type: '',
                 remark: '',
+                seq:''
             }
         },
         _initMethod: function () {
@@ -89,6 +90,18 @@
                             errInfo: "类型不能超过12"
                         },
                     ],
+                    'addComponentConditionInfo.seq': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "排序不能为空"
+                        },
+                        {
+                            limit: "num",
+                            param: "",
+                            errInfo: "排序必须是数字"
+                        },
+                    ],
                     'addComponentConditionInfo.remark': [
                         {
                             limit: "maxLength",
@@ -147,7 +160,7 @@
                     param: '',
                     type: '',
                     remark: '',
-
+                    seq:''
                 };
             }
         }
diff --git a/public/components/dev/editComponentCondition/editComponentCondition.html b/public/components/dev/editComponentCondition/editComponentCondition.html
index ddaec1172..4dd150a8c 100644
--- a/public/components/dev/editComponentCondition/editComponentCondition.html
+++ b/public/components/dev/editComponentCondition/editComponentCondition.html
@@ -33,10 +33,18 @@
                 <div class="col-sm-10">
                   <select class="custom-select" v-model="editComponentConditionInfo.type">
                     <option selected disabled value="">必填，请选择类型</option>
-                    <option value="input">文本框</option>
+                    <option value="text">文本框</option>
+                    <option value="date">日期</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="editComponentConditionInfo.seq" 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">
diff --git a/public/components/dev/editComponentCondition/editComponentCondition.js b/public/components/dev/editComponentCondition/editComponentCondition.js
index e5e533b98..491dbf92e 100644
--- a/public/components/dev/editComponentCondition/editComponentCondition.js
+++ b/public/components/dev/editComponentCondition/editComponentCondition.js
@@ -10,6 +10,7 @@
                 param: '',
                 type: '',
                 remark: '',
+                seq:''
             }
         },
         _initMethod: function () {
@@ -87,6 +88,18 @@
                             errInfo: "类型不能超过12"
                         },
                     ],
+                    'editComponentConditionInfo.seq': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "排序不能为空"
+                        },
+                        {
+                            limit: "num",
+                            param: "",
+                            errInfo: "排序必须为数字"
+                        },
+                    ],
                     'editComponentConditionInfo.remark': [
                         {
                             limit: "maxLength",
@@ -141,7 +154,7 @@
                     param: '',
                     type: '',
                     remark: '',
-
+                    seq:''
                 }
             }
         }
diff --git a/public/components/property/commonReportTable/commonReportTable.html b/public/components/property/commonReportTable/commonReportTable.html
index 6b5207beb..2dc5a67e8 100644
--- a/public/components/property/commonReportTable/commonReportTable.html
+++ b/public/components/property/commonReportTable/commonReportTable.html
@@ -11,8 +11,8 @@
                     <div class="row">
                         <div class="col-sm-3" v-for="(conditionItem,conditionIndex) in item.conditions">
                             <div class="form-group">
-                                <input type="text" :placeholder="conditionItem.holdpace"
-                                    v-model="conditionItem.value" class=" form-control">
+                                <input :type="conditionItem.type" :placeholder="conditionItem.holdpace"
+                                    v-model="conditionItem.value" class=" form-control" :class="">
                             </div>
                         </div>
                         <div class="col-sm-1">
diff --git a/public/components/property/commonReportTable/commonReportTable.js b/public/components/property/commonReportTable/commonReportTable.js
index ad0ada42b..5788a1860 100644
--- a/public/components/property/commonReportTable/commonReportTable.js
+++ b/public/components/property/commonReportTable/commonReportTable.js
@@ -74,6 +74,8 @@
                         let _componentConditionManageInfo = JSON.parse(json);
                         _component.conditions = _componentConditionManageInfo.data;
                         $that.$forceUpdate();
+                        //处理日期类型
+                        
                     }, function (errInfo, error) {
                         console.log('请求失败处理');
                     }
diff --git a/public/pages/dev/componentConditionManage/componentConditionManage.html b/public/pages/dev/componentConditionManage/componentConditionManage.html
index b8ad4b53a..d4e5fefd9 100644
--- a/public/pages/dev/componentConditionManage/componentConditionManage.html
+++ b/public/pages/dev/componentConditionManage/componentConditionManage.html
@@ -26,6 +26,7 @@
                                 <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>
                                 <th class="text-center">操作</th>
                             </tr>
@@ -36,7 +37,8 @@
                                 <td class="text-center">{{componentCondition.name}}</td>
                                 <td class="text-center">{{componentCondition.holdpace}}</td>
                                 <td class="text-center">{{componentCondition.param}}</td>
-                                <td class="text-center">{{componentCondition.type == 'input'?'文本框':'未知'}}</td>
+                                <td class="text-center">{{componentCondition.type == 'text'?'文本框':'日期'}}</td>
+                                <td class="text-center">{{componentCondition.seq}}</td>
                                 <td class="text-center">{{componentCondition.remark}}</td>
                                 <td class="text-center">
                                     <div class="btn-group">