manage-client 4.0.86 → 4.0.87

package/package.json

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

package/src/components/sale/report/aode/DayReportList.vue

@@ -4,7 +4,7 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <res-select-group :style="$parent.$parent.style" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" :style="$parent.$parent.style" v-ref:sel></res-select-group>
+            <res-select-group :style="$parent.$parent.style" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="true" :style="$parent.$parent.style" v-ref:sel></res-select-group>
             <div :class="$parent.$parent.style" >
               <label for="startDate" class="font_normal_body">开始日期</label>
               <datepicker  placeholder="开始日期" style="width:60%"

package/src/filiale/lixianV3/RecordInfoQuery.vue

@@ -539,7 +539,7 @@
                   <th colspan="5">
                     <nobr>建档信息</nobr>
                   </th>
-                  <th colspan="6">
+                  <th colspan="8">
                     <nobr>燃气表</nobr>
                   </th>
                   <th colspan="63">
@@ -584,6 +584,9 @@
                   <th>
                     <nobr>铅封编号</nobr>
                   </th>
+                  <th>
+                    <nobr>有无铅封</nobr>
+                  </th>
                   <th>
                     <nobr>品牌</nobr>
                   </th>
@@ -737,9 +740,6 @@
                     <!--<nobr>换表时间</nobr>-->
                     <data-order field="f_maxdate" name="换表时间" :order.sync="$parent.$parent.$parent.orderFields.f_maxdate"></data-order>
                   </th>
-                  <th>
-                    <nobr>有无铅封</nobr>
-                  </th>
                   <th>
                     <nobr>灶具信息</nobr>
                   </th>
@@ -763,7 +763,7 @@
                 <td style="text-align: center;"><nobr>{{row.f_defendcard}}</nobr></td>
 
                 <td style="text-align: center;"><nobr>{{row.f_seal_number}}</nobr></td>
-
+                <td style="text-align: center;"><nobr>{{row.f_hasseal}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_meter_type}}</nobr></td>
@@ -877,7 +877,6 @@
                 </td>
                 <td style="text-align: center;"><nobr>{{row.f_alarm_code}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_maxdate}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_hasseal}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
               </template>
@@ -1205,6 +1204,9 @@
         if(this.IdCardInfo!=''){
           args.condition+=` and f_idnumber='${this.IdCardInfo}'`
         }
+        if(this.f_hasseal!=''){
+          args.condition +=` and f_hasseal='${this.f_hasseal}'`
+        }
         this.conditon2 = args.condition
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;