manage-client 3.2.292 → 3.2.294

package/AutoTest/requirements.txt

@@ -0,0 +1,9 @@
+BeautifulReport==0.0.7
+selenium==3.141.0
+robotframework==3.2.2
+robotframework-pythonlibcore==2.2.1
+robotframework-ride==1.7.4.2
+robotframework-seleniumlibrary==5.1.0
+Pillow==8.1.1
+common==0.1.2
+

package/AutoTest/search_test_run.py

@@ -0,0 +1,24 @@
+import os
+import unittest
+import time
+from BeautifulReport import BeautifulReport
+
+
+# 方法：执行用例的方法，并且把用例的执行结果写入到测试报告文件中（html文件中）
+def zhixing_yongli():
+    # 1. 准备测试套件： 把用例放入到测试套件中。 discover套件
+    dangqian_lujing = os.path.dirname(__file__)
+    case_path = os.path.join(dangqian_lujing, "." , "all_case/search")
+    taojian = unittest.defaultTestLoader.discover(case_path, pattern='as_SummaryQueryScript2.py')
+    # 2. 准备测试报告。（准备测试报告的路径  + 测试报告的文件名 xxxxx.html 系统时间+项目名.html)r
+    baogao_lujing = os.path.join(dangqian_lujing, ".", "report")
+    sys_time = time.strftime("%Y%m%d%H%M%S")
+    baogao_wenjianming = sys_time + "ranqikefu.html"
+
+    # 3. 执行测试套件中的用例，并且把执行结果写入到测试报告文件。(采用开源的beautifulreport来执行用例生成报告）
+    jieguo = BeautifulReport(taojian)
+    jieguo.report(description="燃气客服的自动化测试", filename="查询部分测试报告", report_dir=baogao_lujing)
+
+
+if __name__ == '__main__':
+    zhixing_yongli()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.292",
+  "version": "3.2.294",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/filiale/huayin/ChargeQuery.vue

@@ -734,7 +734,7 @@
               汇总信息
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              气量合计:&emsp;{{sumsmodel.f_pregas}}
+              气量合计:&emsp;{{sumsmodel.f_pregas.toFixed(2)}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               应交金额合计:&emsp;{{sumsmodel.fee}}

package/src/filiale/shanxian/AreaGeneralQuery.vue

@@ -174,6 +174,36 @@
                     close-on-select
                   ></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label for="startDate1" class="font_normal_body"
+                  >开始日期</label
+                  >
+                  <datepicker
+                    id="startDate1"
+                    placeholder="建档开始日期"
+                    style="width: 60%"
+                    v-model="model.startDate1"
+                    :value.sync="model.startDate1"
+                    :format="'yyyy-MM-dd'"
+                    :show-reset-button="true"
+                    condition="f_createfile_date >= '{} 00:00:00'">
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate1" class="font_normal_body">结束日期</label>
+                  <datepicker
+                    id="endDate1"
+                    placeholder="建档结束日期"
+                    style="width: 60%"
+                    v-model="model.endDate1"
+                    :value.sync="model.endDate1"
+                    :format="'yyyy-MM-dd'"
+                    condition="f_createfile_date <= '{} 23:59:59'">
+                    :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
                 <!--<div class="col-sm-2 form-group">-->
                 <!--<label class="font_normal_body">气表类型</label>-->
                 <!--<v-select :value.sync="model.f_meter_type" multiple-->

package/src/filiale/shanxian/ChangeMeterQuery.vue

@@ -6,31 +6,21 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">开始日期</label>
-                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_operate_date >= '{}'">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">结束日期</label>
-                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_operate_date <= '{}'">
-                  </datepicker>
-                </div>
                 <div class="col-sm-2 form-group ">
                   <label class="font_normal_body">用户编号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
                          condition="f_userinfo_code = '{}' " placeholder="用户编号">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="用户名称">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户地址</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                         condition="f_address like '%{}%'" placeholder='用户地址'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" title="旧用户编号">档案编号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
@@ -60,22 +50,33 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres" :cascade =true  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">用户名称</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="f_user_name like '%{}%'" placeholder="用户名称">
+                  <label class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_operate_date >= '{}'">
+                  </datepicker>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_operate_date <= '{}'">
+                  </datepicker>
+                </div>
+                <res-select-group :initres="$parent.$parent.initres" :cascade =true  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户电话</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
                          condition="f_user_phone like '%{}%'" placeholder="用户电话">
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">用户地址</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
-                         condition="f_address like '%{}%'" placeholder='用户地址'>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户类型</label>
                   <v-select :value.sync="model.f_user_type"