manage-client 3.3.218 → 3.3.220

package/package.json

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

package/src/components/SellReport/ChManageBusSummary.vue

@@ -192,7 +192,7 @@
         this.printTime = this.$login.toStandardTimeString()
         this.orgCondtionStr='1=1'
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid = ' + this.f_orgid
+          this.orgCondtionStr += ' and f_orgid = ' + `'${this.f_orgid[0]}'`
         }
         if (this.f_depid[0]) {
           this.orgCondtionStr += ` and  f_depid = '${this.f_depid}'`

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -39,7 +39,7 @@
                                 <input style="width:60%" type="text" class="input_search"
                                        v-model="model.f_meternumber" placeholder='表号'
                                        @keyup.enter="search"
-                                       condition="f_meternumber like '%{}%'"
+                                       condition="f_meternumber = '{}'"
                                        v-next-el='meternumber' v-el:meternumber>
                             </div>
                             <div style="float:right">

package/src/filiale/bayan/webmeter/MeterExceptionList.vue

@@ -39,7 +39,7 @@
                 <input style="width:60%" type="text" class="input_search"
                        v-model="model.f_meternumber" placeholder='表号'
                        @keyup.enter="search"
-                       condition="f_meternumber like '%{}%'"
+                       condition="f_meternumber = '{}'"
                        v-next-el='meternumber' v-el:meternumber>
               </div>
               <div style="float:right">

package/src/filiale/ningjin/MeterExceptionList.vue

@@ -39,7 +39,7 @@
                                 <input style="width:60%" type="text" class="input_search"
                                        v-model="model.f_meternumber" placeholder='表号'
                                        @keyup.enter="search"
-                                       condition="f_meternumber like '%{}%'"
+                                       condition="f_meternumber = '{}'"
                                        v-next-el='meternumber' v-el:meternumber>
                             </div>
                             <div style="float:right">

package/src/filiale/qianneng/RecordInfoQuery.vue

@@ -537,7 +537,7 @@
                   <th><nobr>账户余额</nobr></th>
                   <th>
                     <!--<nobr>最后抄表日期</nobr>-->
-                    <data-order field="f_hand_date" name="最后抄表日期" :order.sync="$parent.$parent.$parent.orderFields.f_hand_date"></data-order>
+                    <data-order field="f_createfile_date" name="最后抄表日期" :order.sync="$parent.$parent.$parent.orderFields.f_createfile_date"></data-order>
                   </th>
                   <!--<th><nobr>最后购气日期</nobr></th>-->
                   <th><nobr>通讯日期</nobr></th>

package/src/filiale/yuncheng/MeterQuery.vue

@@ -234,6 +234,20 @@
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_balance_amount"
                            condition="f_balance_amount < '{}'" placeholder='余额小于'>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="checkstartDate" class="font_normal_body">校验日期</label>
+                    <datepicker id="checkstartDate" placeholder="开始日期" style="width:60%" v-model="model.checkstartDate"
+                                :value.sync="model.checkstartDate" :format="'yyyy-MM-dd'" :show-reset-button="true"
+                                condition="f_check_time >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="checkendDate" class="font_normal_body">校验日期</label>
+                    <datepicker id="checkendDate" placeholder="结束日期" style="width:60%" v-model="model.checkendDate"
+                                :value.sync="model.checkendDate" :format="'yyyy-MM-dd'" :show-reset-button="true"
+                                condition="f_check_time <= '{} 23:59:59'">
+                    </datepicker>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -323,6 +337,11 @@
                     <data-order field="f_input_date" name="建表时间"
                                 :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
                   </th>
+                  <th>
+                    <!--<nobr>建表时间</nobr>-->
+                    <data-order field="f_check_time" name="校验日期"
+                                :order.sync="$parent.$parent.$parent.orderFields.f_check_time"></data-order>
+                  </th>
                   <th>
                     <nobr>气表状态</nobr>
                   </th>
@@ -416,6 +435,9 @@
                 <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{ row.f_input_date }}</nobr>
                 </td>
+                <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{ row.f_check_time }}</nobr>
+                </td>
                 <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{ row.f_table_state }}</nobr>
                 </td>

package/src/filiale/yuncheng/config/exportConfig.js

@@ -157,6 +157,7 @@ export default {
     'f_gas_person': '通气人',
     'f_gas_date': '通气时间',
     'f_input_date': '建表时间',
+    'f_check_time': '校验日期',
     'f_table_state': '气表状态',
     'isbgl': '是否壁挂炉',
     'f_valve_state': '阀门状态',

package/.npmignore

@@ -1,10 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-yarn.lock

package/build/.npmignore

@@ -1 +0,0 @@
-