manage-client 3.3.219 → 3.3.221

package/package.json

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

package/src/components/sale/config/exportConfig.js

@@ -1890,7 +1890,7 @@ export default {
     'f_meter_classify': '表具类型',
     'f_meter_title': '表描述',
     'f_price_name': '气价名称',
-    'f_user_nature': '用气类型',
+    'f_user_type': '用户类型',
     'f_gasproperties': '用气性质',
     'f_balance': '期初余额',
     'f_last_tablebase': '起方',

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">
@@ -312,6 +312,11 @@
                 startDate: '',
                 endDate: '',
                 meterbrands: [],
+                initres: {
+                  org:[this.$login.f.orgid],
+                  dep:[],
+                  user:[],
+                },
                 other: [],
                 sumsmodel: {},
                 f_error_type:'',
@@ -427,14 +432,14 @@
                 this.startDate = this.$refs.paged.$refs.cri.model.startDate
                 this.endDate = this.$refs.paged.$refs.cri.model.endDate
                 this.f_error_type=this.$refs.paged.$refs.cri.model.f_error_type
-                console.log('1231321312312321')
                 /* if (this.endDate == '' || this.startDate == '') {
                    return this.$showMessage("时间区间的开始和结束时间不能为空！")
                  }*/
-                this.condition = this.$refs.paged.$refs.cri.condition +  this.orgCondtionStr
-
-                args.condition = this.condition
-                this.model.search(args.condition, args.model)
+              if (this.orgCondtionStr){
+                args.condition = `${args.condition}` + this.orgCondtionStr
+              }
+              this.condition = args.condition
+              this.model.search(args.condition, args.model)
             },
             SaveAsFile(str) {
                 this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {

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/kelai/NewGasStatistics.vue

@@ -73,7 +73,6 @@
                   <label class="font_normal_body">气价类型</label>
                   <v-select :value.sync="model.pricetype" v-model="model.pricetype"
                             placeholder='气价类型' :options="$parent.$parent.pricetypes"
-                            condition="ss.f_price_type = '{}'"
                             close-on-select>
                   </v-select>
                 </div>
@@ -310,7 +309,7 @@ let readySomething = async function (self) {
   self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
 }
 export default {
-  title: '用气量统计表',
+  title: '新用气分析',
   data () {
     return {
       show:false,

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/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/src/main.js

@@ -46,11 +46,11 @@ ldap()
 system(false)
 
 saleManage()
-ShanXianSaleManage()
 webmeterManage()
 ManageHome()
 newmanage()
 reportManage()
+ShanXianSaleManage()
 require('system-clients/src/styles/less/bootstrap.less')
 require('./components/qinhua/Style/qinhuaStyle.less')
 // require('./bootstrap/less/manageStyle/manageChile.less')