manage-client 4.1.91 → 4.1.92

package/src/filiale/bayan/ManageMaterialUsageDetails.vue

@@ -24,6 +24,26 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+            <div class="col-sm-2 form-group">
+              <label  class="font_normal_body">金额大于</label>
+              <input style="width:60%" type="number" class="input_search"
+                     v-model="model.f_money" placeholder='大于等于'
+                     condition="f_material_price>={}"
+                     @keyup.enter="search"
+                     v-el:xq v-next-el='f_day' v-el:area
+              >
+            </div>
+            <div class="col-sm-2 form-group">
+              <label  class="font_normal_body">小于</label>
+              <input style="width:60%" type="number" class="input_search"
+                     v-model="model.f_money_end" placeholder='小于等于'
+                     condition="f_material_price <= {}"
+                     @keyup.enter="search"
+                     v-el:xq v-next-el='f_day' v-el:area
+              >
+            </div>
+            </div>
+          <div class="row">
             <div class="col-sm-2">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
               <right-tree @re-res="$parent.$parent.getRes"></right-tree>

package/src/filiale/bayan/ManageOtherCharge.vue

@@ -24,6 +24,26 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+            <div class="col-sm-2 form-group">
+              <label  class="font_normal_body">金额大于</label>
+              <input style="width:60%" type="number" class="input_search"
+                     v-model="model.f_money" placeholder='大于等于'
+                     condition="f_collection>={}"
+                     @keyup.enter="search"
+                     v-el:xq v-next-el='f_day' v-el:area
+              >
+            </div>
+            <div class="col-sm-2 form-group">
+              <label  class="font_normal_body">小于</label>
+              <input style="width:60%" type="number" class="input_search"
+                     v-model="model.f_money_end" placeholder='小于等于'
+                     condition="f_collection <= {}"
+                     @keyup.enter="search"
+                     v-el:xq v-next-el='f_day' v-el:area
+              >
+            </div>
+          </div>
+          <div class="row">
             <div class="col-sm-2">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
               <right-tree @re-res="$parent.$parent.getRes"></right-tree>
@@ -36,7 +56,6 @@
                           :parentresid="$parent.$parent.depresid"
                           :initresid='$parent.$parent.depid'>
               </res-select>
-
             </div>
             <div class="col-sm-2">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>

package/src/filiale/bayan/OtherChargeQuery.vue

@@ -191,6 +191,24 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_bill_number_end"
                          condition="f_bill_number <= '{}'" placeholder="收据终止编号">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label  class="font_normal_body">金额大于</label>
+                  <input style="width:60%" type="number" class="input_search"
+                         v-model="model.f_money" placeholder='大于等于'
+                         condition="f_money>={}"
+                         @keyup.enter="search"
+                         v-el:xq v-next-el='f_day' v-el:area
+                  >
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label  class="font_normal_body">小于</label>
+                  <input style="width:60%" type="number" class="input_search"
+                         v-model="model.f_money_end" placeholder='小于等于'
+                         condition="f_money < {}"
+                         @keyup.enter="search"
+                         v-el:xq v-next-el='f_day' v-el:area
+                  >
+                </div>
               </div>
             </div>
           </criteria>
@@ -565,10 +583,6 @@
         args.condition = `${args.condition}` + this.orgCondtionStr
       await this.model.search(args.condition, args.model)
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-      this.sumsmodel.hushu =[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
-      if(this.sumsmodel.hushu===null){
-        this.sumsmodel.hushu = 0
-      }
     },
       clear() {
         //清空部门和人员

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

@@ -1906,7 +1906,6 @@ export default {
     'f_gasproperties': '用气性质',
     'f_last_gas': '期初余量',
     'f_last_balance': '期初余额',
-    'f_last_balance_gongshi': '期初余额【公式】',
     'f_last_tablebase': '起方',
     'f_last_shengyu_gas': '起方（液晶）',
     'f_tablebase': '止方',
@@ -1919,8 +1918,6 @@ export default {
     'f_collection': '期间充值金额',
     'f_bq_f_pregas': '期间补气量',
     'f_bq_preamount': '期间补气金额',
-    'f_hbbq_f_pregas': '期间换表补气量',
-    'f_hbbq_preamount': '期间换表补气金额',
     'f_remain_gas': '期末余量',
     'f_remain_curbalance': '期末余额',
     'f_remain_stair1price': '一阶剩余单价',