sale-client 3.6.109 → 3.6.110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.109",
+  "version": "3.6.110",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/UserDeviceInfoTest.vue

@@ -336,17 +336,21 @@ export default {
       }
     },
     async initParams () {
-      let http = new HttpResetClass()
-      let data = {
-        items: 'id,f_brand',
-        tablename: 't_iot_device_brand',
-        condition: `1=1`,
-        orderitem: 'id'
-      }
-      let res = await http.load('post', 'rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取设备品牌失败!'})
-      this.brands = []
-      for (let row of res.data) {
-        this.brands.push({label: row.f_brand, value: `${row.id}`})
+      try {
+        let http = new HttpResetClass()
+        let data = {
+          items: 'id,f_brand',
+          tablename: 't_iot_device_brand',
+          condition: `1=1`,
+          orderitem: 'id'
+        }
+        let res = await http.load('post', 'rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取设备品牌失败!'})
+        this.brands = []
+        for (let row of res.data) {
+          this.brands.push({label: row.f_brand, value: `${row.id}`})
+        }
+      } catch (e) {
+        console.log(e)
       }
     },
     showTableBtn () {

package/src/filiale/liaoyuan/NewPriceAdjustment.vue

@@ -92,17 +92,17 @@
                             condition="f_change_price1 {}"
                             close-on-select></v-select>
                 </div>
-                <div class="form-group col-sm-2">
-                  <label class="font_normal_body">气表类型</label>
-                  <v-select id="f_source"
-                            v-model="model.f_source"
-                            placeholder='气表类型'
-                            style="width: 60%"
-                            :value.sync="model.f_source"
-                            :options='$parent.$parent.source'
-                            condition="f_source='{}'"
-                            close-on-select></v-select>
-                </div>
+<!--                <div class="form-group col-sm-2">-->
+<!--                  <label class="font_normal_body">气表类型</label>-->
+<!--                  <v-select id="f_source"-->
+<!--                            v-model="model.f_source"-->
+<!--                            placeholder='气表类型'-->
+<!--                            style="width: 60%"-->
+<!--                            :value.sync="model.f_source"-->
+<!--                            :options='$parent.$parent.source'-->
+<!--                            condition="f_source='{}'"-->
+<!--                            close-on-select></v-select>-->
+<!--                </div>-->
                 <div class="form-group col-sm-2">
                   <label class="font_normal_body">用户类型</label>
                   <v-select id="f_user_tye"
@@ -140,36 +140,36 @@
                             close-on-select></v-select>
                 </div>
 
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">抄&ensp;表&ensp;员</label>
-                  <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
-                            style="width:60%"
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">抄&ensp;表&ensp;员</label>-->
+<!--                  <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'-->
+<!--                            style="width:60%"-->
 
-                            :options='$parent.$parent.inputtoreser' placeholder='抄表员'
-                            @change="$parent.$parent.inputtorchange"
-                            close-on-select
-                            v-el:cc></v-select>
-                </div>
-                <!--表册片区-->
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">表册片区</label>
-                  <v-select :value.sync="model.f_book_slice_area" v-model="model.f_book_slice_area"
-                            :options='$parent.$parent.bookSliceArea' placeholder='表册片区'
-                            multiple
-                            style="width:60%"
-                            @change="$parent.$parent.sliceChange"
-                            close-on-select
-                            condition="f_book_slice_area in {}"></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">抄&ensp;表&ensp;册</label>
-                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
-                            :options='$parent.$parent.meterbooks' placeholder='抄表册'
-                            multiple
-                            style="width:60%"
-                            close-on-select
-                            condition="f_meter_book_num in {}"></v-select>
-                </div>
+<!--                            :options='$parent.$parent.inputtoreser' placeholder='抄表员'-->
+<!--                            @change="$parent.$parent.inputtorchange"-->
+<!--                            close-on-select-->
+<!--                            v-el:cc></v-select>-->
+<!--                </div>-->
+<!--                &lt;!&ndash;表册片区&ndash;&gt;-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">表册片区</label>-->
+<!--                  <v-select :value.sync="model.f_book_slice_area" v-model="model.f_book_slice_area"-->
+<!--                            :options='$parent.$parent.bookSliceArea' placeholder='表册片区'-->
+<!--                            multiple-->
+<!--                            style="width:60%"-->
+<!--                            @change="$parent.$parent.sliceChange"-->
+<!--                            close-on-select-->
+<!--                            condition="f_book_slice_area in {}"></v-select>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">抄&ensp;表&ensp;册</label>-->
+<!--                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"-->
+<!--                            :options='$parent.$parent.meterbooks' placeholder='抄表册'-->
+<!--                            multiple-->
+<!--                            style="width:60%"-->
+<!--                            close-on-select-->
+<!--                            condition="f_meter_book_num in {}"></v-select>-->
+<!--                </div>-->
               </div>
             </div>
           </criteria>
@@ -374,7 +374,13 @@
     self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString()
     self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
     self.$refs.paged.$refs.criteria.model.f_change_date = ''
-    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.$login.f.orgid}}, {
+    getPrice(self)
+    self.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
+    self.pricechange = false
+
+  }
+  let getPrice = async function(self) {
+    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.f_filialeid}}, {
       resolveMsg: null,
       rejectMsg: null
     }).then((res) => {
@@ -391,9 +397,7 @@
       }
       console.log(rs)
       self.pricers = [ ...rs]
-      self.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
-      self.pricechange = false
-      //self.$refs.paged.$refs.criteria.search()
+      self.priceTypeChange()
     })
   }
   let asyncReadyGen = async function (self) {
@@ -855,7 +859,7 @@
         this.$refs.paged.$refs.criteria.model.f_inputtor = []
         this.meterbooks = [{label: '全部', value: ''}]
         if (this.f_filialeid) {
-          this.updateParams()
+          getPrice(this)
         }
       }
     }

package/src/filiale/liaoyuan/NewPriceAdjustmentWebmeter.vue

@@ -143,13 +143,13 @@
                   <nobr>三阶气量</nobr>
                 </th>
                 <th>
-                  <nobr>一阶补差单价</nobr>
+                  <nobr>一阶单价</nobr>
                 </th>
                 <th>
-                  <nobr>二阶补差单价</nobr>
+                  <nobr>二阶单价</nobr>
                 </th>
                 <th>
-                  <nobr>三阶补差单价</nobr>
+                  <nobr>三阶单价</nobr>
                 </th>
                 <th>
                   <nobr>一阶补差单价</nobr>
@@ -303,8 +303,18 @@
   let readySomething = async function (self) {
     self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString()
     self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
-    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.f_filialeid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      console.log(res.data)
+    self.$refs.paged.$refs.criteria.model.f_change_date = ''
+    getPrice(self)
+    self.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
+    self.pricechange = false
+
+  }
+  let getPrice = async function(self) {
+    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.f_filialeid}}, {
+      resolveMsg: null,
+      rejectMsg: null
+    }).then((res) => {
+      console.log('气价信息-------->',res.data)
       let rs = []
       for (let i = 0; i < res.data.length; i++) {
         let temp = {
@@ -317,7 +327,7 @@
       }
       console.log(rs)
       self.pricers = [ ...rs]
-      self.$refs.paged.$refs.criteria.search()
+      self.priceTypeChange()
     })
   }
 
@@ -572,6 +582,16 @@
     computed: {
     },
     watch: {
+      async 'f_filialeid' (val) {
+        // 更新抄表册
+        this.$refs.paged.$refs.criteria.model.f_meter_book = []
+        this.$refs.paged.$refs.criteria.model.f_book_slice_area = []
+        this.$refs.paged.$refs.criteria.model.f_inputtor = []
+        this.meterbooks = [{label: '全部', value: ''}]
+        if (this.f_filialeid) {
+          getPrice(this)
+        }
+      }
     }
   }
 </script>

package/src/filiale/lixianV3/iotHand.vue

@@ -0,0 +1,709 @@
+<template>
+  <div class="flex-row" id="machineHandManager">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged @sort="sort">
+        <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+
+            <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"
+                              v-ref:sel></res-select-group>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">客户类型</label>
+              <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
+                        :options='$parent.$parent.usertypes' placeholder='客户类型'
+                        style="width:60%"
+                        close-on-select
+                        condition="f_user_type = '{}'"></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">小&ensp;&ensp;&ensp;&ensp;区</label>
+              <v-select :value.sync="model.f_residential_area"
+                        class="select_list select"
+                        enter-push
+                        v-model="model.f_residential_area"
+                        style="width: 60%"
+                        multiple="true"
+                        :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                        close-on-select v-el:cc>
+              </v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">抄&ensp;表&ensp;员</label>
+              <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
+                        style="width:60%"
+                        multiple="true"
+                        condition="f_inputtor in {}"
+                        :options='$parent.$parent.inputtores' placeholder='抄表员'
+                        close-on-select
+                        v-el:cc></v-select>
+            </div>
+            <div class="row">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">表&emsp;&emsp;号</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                       condition="f_meternumber 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_user_name"
+                       placeholder='客户姓名'
+                       condition="f_user_name = '{}'">
+              </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="span" style="float:right;">-->
+<!--                <button v-if="$parent.$parent.jurisdiction.includes('单户抄表')"-->
+<!--                        class="button_search button_spacing" style="width:90px" @click="$parent.$parent.danhuShow()">-->
+<!--                  单户抄表-->
+<!--                </button>-->
+
+                <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
+                <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>
+              </div>
+
+            <div class="row" v-show="$parent.$parent.criteriaShow">
+
+
+
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">楼&emsp;&emsp;栋</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_building"
+                       condition="f_building = '{}'" placeholder='楼栋'>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">单&emsp;&emsp;元</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_unit"
+                       condition="f_unit = '{}'" placeholder='单元'>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">楼&emsp;&emsp;层</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_floor"
+                       condition="f_floor = '{}'" placeholder='楼层'>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">门&ensp;牌&ensp;号</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_room"
+                       condition="f_room 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>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid id="hand_manager_grid">
+          <template partial='head'>
+            <tr>
+              <!--<th><input type='checkbox' v-model="$parent.$parent.$parent.all" @change="$parent.$parent.$parent.chooseAll"></th>-->
+              <th>
+                <nobr>序号</nobr>
+              </th>
+              <th>
+                <nobr>
+                  <data-order field="f_userinfo_code" name="客户编号"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                </nobr>
+              </th>
+              <th>
+                <nobr>
+                  <data-order field="f_address" name="基本信息"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                </nobr>
+              </th>
+              <th>
+                <nobr>身份证号</nobr>
+              </th>
+
+              <th>
+                <nobr>卡号</nobr>
+              </th>
+              <th>
+                <nobr>表号</nobr>
+              </th>
+              <th>
+                <nobr>表具状态</nobr>
+              </th>
+              <th>
+                <nobr>上期底数</nobr>
+              </th>
+              <th>
+                <nobr>本期底数</nobr>
+              </th>
+              <th>
+                <nobr>抄表员</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center;">{{ $index + 1 }}</td>
+            <td>{{ row.f_userinfo_code }}</td>
+            <td>{{ row.f_user_name }}&nbsp;&nbsp;{{ row.f_address }}</td>
+            <td>{{ row.f_idnumber }}</td>
+            <td>{{ row.f_card_id }}</td>
+            <td>{{ row.f_meternumber }}</td>
+            <td>{{ row.f_table_state }}</td>
+            <td>{{ row.f_meter_base }}</td>
+            <td id="hand-creat" >
+              <div class="form-group" style="margin-bottom:0px;display: contents;" :class="{
+                       'has-success has-feedback': !row.error,
+                       'has-error has-feedback': row.error}"
+              >
+                <input title="只能录入整数" type="text" class="input_search" v-model="row.f_tablebase"
+                       @blur="$parent.$parent.$parent.beforenter($index, row)"
+                       v-next-el="{id: $index+2}" :id="$index+1" style="width: 100px;padding: 6px;"
+                       @focus="$parent.$parent.$parent.clearError(row)"
+                       :disabled="row.state === '开始'">
+              </div>
+            <td>{{ row.f_inputtor }}</td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+<script>
+import MixPriceInfo from '../../components/revenue/base/leftview/MixPriceInfo'
+import {PagedList, HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+import co from 'co'
+export default {
+  title: '物联网表抄表',
+  components: {MixPriceInfo},
+  data() {
+    return {
+      priceModel: false,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      },
+      sumsmodel: [],
+      orgCondtionStr: '',
+      priceSplit: false,
+      deletestate: false,
+      criteriaShow: false,
+      model: new PagedList('rs/sql/getIotHand', 50, {orderitem: this.orderDefault ? '"' + this.orderDefault + ' "' : `'f_hand_date desc'`}),
+      meter_state: false, // 是否显示计划下发按钮
+      downModel: {
+        downDate: Vue.$login.toStandardTimeString(),
+        downWay: 'downWithUserfiles',
+        downInputtor: []
+      },
+      inputtorModel: {
+        inputtor: [],
+        reason: ''
+      },
+      auditState: [{label: '全部', value: ''}, {label: '未抄表', value: '未抄表'}, {
+        label: '待审核',
+        value: '待审核'
+      }, {label: '已抄表', value: '已抄表'}],
+      // 小区
+      residentialArea: [],
+      //  downDate: this.$login.toStandardYearMonth().replace("-", ""),
+      msg: '',
+      condition: '',
+      headers: {'username': Vue.$login.f.name, 'blodid': Vue.$login.guid()},
+      orderDefault: 'f_hand_date',
+      orderFields: {
+        f_userinfo_id: 'no'
+      },
+      getfield: {},
+      outlet: '',
+      filiale: '',
+      condition2: '',
+      area: [],
+      inputtouPerson: [],
+      usertypes: this.$appdata.getParam('客户类型') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('客户类型')] : [],
+      f_filialeid: this.$login.f.orgid,
+      upshow: false,
+      inputid: 0,
+      examineshow: false,
+      examinerow: null,
+      showfiles: false,
+      uploadText: '抄表',
+      examinetype: false,
+      err: '',
+      // 请求对象(批量导入,查询进度使用)
+      HttpReset: new HttpResetClass(),
+      // 气价使用详情展示
+      detailsShow: false,
+      row: null,
+      // 应抄底数
+      should_base: 0
+    }
+  },
+  ready() {
+    this.getaddress()
+  },
+  methods: {
+    async getaddress() {
+      console.log('开始获取小区')
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+        data: {
+          condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+      console.log('小区', data)
+      let house = []
+      house.push()
+      for (let row of data.data) {
+        console.log('开始保存小区')
+        house.push({label: row.f_residential_area, value: row.f_residential_area})
+      }
+      this.residentialArea = house
+    },
+    getRes(obj) {
+      this.orgCondtionStr = obj
+    },
+
+    hidden() {
+      console.log(this.criteriaShow )
+      this.criteriaShow = !this.criteriaShow
+      console.log(this.criteriaShow )
+    },
+    clear() {
+      Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+        this.$refs.paged.$refs.criteria.model[key] = []
+      })
+    },
+
+    search() {
+      // 查询前清空选择项
+      this.$refs.paged.$refs.criteria.search()
+    },
+
+    selfSearch(args) {
+      if (!this.orgCondtionStr) {
+        args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+      } else {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+      }
+      // 抄表员查询条件
+      // this.inputtouPerson = this.$refs.paged.$refs.criteria.model.f_inputtor
+      // if (this.inputtouPerson.length !== 0) {
+      //   let str = JSON.stringify(this.inputtouPerson)
+      //   str = str.replace(/"/g, `'`)
+      //   str = str.replace(/\[/g, ``)
+      //   str = str.replace(/\]/g, ``)
+      //   console.log('=====抄表员model22222222222绑定====', str)
+      //   // 查询多个抄表员时条件
+      //   args.condition += ` and f_inputtor in  ( ${str} )`
+      // }
+      // 小区查询条件
+      this.area = this.$refs.paged.$refs.criteria.model.f_residential_area
+      console.log('=====小区model绑定====', this.area)
+      if (this.area.length !== 0) {
+        let str = JSON.stringify(this.area)
+        str = str.replace(/"/g, `'`)
+        str = str.replace(/\[/g, ``)
+        str = str.replace(/\]/g, ``)
+        console.log('=====小区model22222222222绑定====', str)
+        // 查询多个小区时条件
+        args.condition += ` and f_residential_area in  ( ${str} )`
+      }
+
+      this.model.search(args.condition, this.model)
+    },
+    reflash() {
+      this.$refs.paged.$refs.criteria.model.f_orgid = `${Vue.$login.f.orgid}`
+      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStartAndEndDateString()[0]
+      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStartAndEndDateString()[1]
+      this.search()
+    },
+    beforenter(index, row) {
+      this.inputid = index + 1
+      // 限制本次抄表不能低于上次
+      if (row.f_tablebase) {
+        if (row.f_tablebase < 0) {
+          row.state = '失败'
+          Vue.set(row, 'error', '底数不能小于0')
+          this.speckText('底数不能小于0，请注意!')
+        } else if (row.f_tablebase - parseInt(row.f_tablebase) !== 0) {
+          row.state = '失败'
+          Vue.set(row, 'error', '底数只能输入整数')
+          this.speckText('底数只能输入整数，请注意!')
+        } else if (row.f_tablebase < row.f_last_tablebase && !row.f_capacity) {
+          row.state = '失败'
+          Vue.set(row, 'error', '本期表底数不能低于上期表底数')
+          this.speckText('本期表底数不能低于上期表底数，请注意!')
+        } else {
+          if (row.f_tablebase < row.f_last_tablebase) {
+            this.$showMessage('本次抄表已超越最大量程, 请熟知!')
+          }
+
+        }
+      }
+    },
+
+    clearError(row) {
+      if (row.f_tablebase === 0) {
+        row.f_tablebase = ''
+      }
+      Vue.set(row, 'error', null)
+    },
+    async speckText(str) {
+      var url = 'http://tts.baidu.com/text2audio?lan=zh&ie=UTF-8&spd=6&text=' + encodeURI(str)
+      await new Audio(url).play()
+      this.err = str
+      this.showerr = true
+      this.paycodefocus()
+    },
+    closeerr() {
+      this.showerr = false
+    },
+    fileUpload() {
+      this.uploadshow = true
+    },
+    // 删除这条计划
+    delectHand(row) {
+      this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          this.$resetpost('rs/logic/deletePlan', {data: row}).then(() => {
+            this.$dispatch('refresh', '删除计划', row)
+            this.search()
+          })
+        }
+      })
+    },
+    cancelHand4(row) {
+      this.examinerow = row
+      this.examineshow = true
+      this.examinetype = true
+    },
+    cancelHand2(row) {
+      if (this.config.examine) {
+        let handdate = new Date(row.f_hand_date)
+        console.log('获取月份', handdate.getMonth())
+        let ima = new Date()
+        console.log('获取月份', ima.getMonth())
+        if (handdate.getMonth() == ima.getMonth()) {
+          this.cancelHand3(row)
+        } else {
+          if (!this.$login.r.find(value => value == '抄表隔月冲正')) {
+            this.$showMessage('当前登录用户没有隔月冲正权限, 请联系管理员!')
+          } else {
+            this.cancelHand3(row)
+          }
+        }
+      } else {
+        this.cancelHand3(row)
+      }
+    },
+    async cancelHand5() {
+      let sqldata = `update t_handplan set f_audit_state ='已审核',f_audit_person='${this.$login.f.name}',
+        f_audit_date='${this.$login.toStandardTimeString()}' where  id ='${this.examinerow.id}'`
+      await this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {
+        resolveMsg: null,
+        rejectMsg: '更新收费记录订单号失败'
+      })
+
+      this.cancelHand3(this.examinerow)
+    },
+    cancelHand3(row) {
+      // 抄表加入权限
+      if (!this.$login.r.find(value => value == '机表抄表冲正')) {
+        this.$showMessage('当前登录用户没有冲正权限, 请联系管理员!')
+        return
+      }
+      // console.log('抄表冲正。、。。、', row)
+      let param = {
+        f_hand_id: row.id,
+        operInfo: {
+          f_operator: this.$login.f.name,
+          f_operatorid: this.$login.f.id,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depid: this.$login.f.depids,
+          f_depname: this.$login.f.deps
+        }
+      }
+      let url = 'rs/logic/sale_commonEnterCancel'
+      this.$resetpost(url, {data: param}, {warnMsg: '确定对这条记录进行撤销吗？'}).then(() => {
+        this.search()
+        this.close()
+      })
+    },
+    down(type, condition, data) {
+      co(downGen(type, condition, data, this))
+    },
+    // 单条下发计划
+    downHand(row) {
+      console.log('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~' + row.f_userfiles_id)
+      this.down('single', `f_userfiles_id = '${row.f_userfiles_id}'`, row)
+    },
+    // 批量下发计划
+    batchDownHand() {
+      this.down('batch', this.model.condition, this.model.count)
+    },
+    // batchDownHand () {
+    //   this.condition = ''
+    //   let count = 0
+    //   for (let plan of this.plans){
+    //     if(plan.state){
+    //       this.condition = this.condition + plan.id + ','
+    //       count = count + 1
+    //     }
+    //   }
+    //   this.down('batch', `f_user_id in (${this.condition.substring(0,this.condition.length-1)})`,count)
+    // },
+    // allDownHand () {
+    //   this.down('all', this.model.condition, this.model.count)
+    // },
+
+    validateDate() {
+      let currentDown = new Date(this.downModel.downDate)
+      console.log(new Date(this.$refs.paged.$refs.criteria.model.startDate))
+      console.log(new Date(this.$refs.paged.$refs.criteria.model.endDate))
+      return currentDown >= new Date(this.$refs.paged.$refs.criteria.model.startDate + ' 00:00:00') && currentDown <= new Date(this.$refs.paged.$refs.criteria.model.endDate + ' 23:59:59')
+    },
+
+    async examineconfirm() {
+      let sqldata = `update t_handplan set f_audit_state ='审核中',f_examinereason='${this.examinerow.f_examinereason}' where  id ='${this.examinerow.id}'`
+      await this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: null})
+      this.close()
+      this.search()
+    },
+    // 关闭下发计划得弹出框
+    close() {
+      this.show = false
+      this.inputtor_show = false
+      this.downConfirm = false
+      this.examineshow = false
+      this.examinetype = false
+      this.detailsShow = false
+      this.priceModel = false
+      // 初始化模态框数据
+      this.initModal()
+      if (this.uploadshow) {
+        this.uploadshow = false
+        // 讲选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+      }
+    },
+    initModal() {
+      this.downModel = {
+        downDate: Vue.$login.toStandardDateString(),
+        downWay: 'downWithUserfiles',
+        downInputtor: []
+      }
+      this.inputtorModel = {
+        inputtor: [],
+        reason: ''
+      }
+    },
+    // 判断当前登陆人是不是子公司的人员
+    isHead() {
+      return this.$login.f.parent.parent.name.includes('统一资源管理')
+    },
+    sort(field, rule) {
+      // 将所有排序方式设为不排序，实现相互排斥
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
+        } else {
+          this.orderFields[key] = 'no'
+        }
+      }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderDefault}'`
+      } else {
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
+      }
+      this.search()
+    },
+    guid() {
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        let r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8)
+        return v.toString(16)
+      })
+    },
+    computeAmount(event) {
+      let money = event.target.value
+      if (this.row.f_price_type === '固定气价') {
+        let price = this.$refs.mix_price.model.f_price
+        // 可以购买的总气量
+        let purchaseSum = (money / price).toFixed(2)
+        // 计算应抄底数
+        this.should_base = (this.row.f_last_tablebase - 0) + (purchaseSum - 0)
+        // 计算公式
+        this.designFormulas = `${purchaseSum}X${price}`
+      } else {
+        let mydata = this.$refs.statir.mydata
+        // 剩余1阶气量
+        let surplus1 = (mydata.f_stair1ceiling - (mydata.f_hasuse1 > 0 ? mydata.f_hasuse1 : 0))
+        // 把1阶买完的钱
+        let price1 = surplus1 * mydata.f_stair1price
+        // 剩余2阶气量
+        let surplus2 = (mydata.f_stair2ceiling - mydata.f_stair1ceiling - (mydata.f_hasuse2 > 0 ? mydata.f_hasuse2 : 0)).toFixed(2)
+        // 把2阶买完的钱
+        let price2 = surplus2 * mydata.f_stair2price
+        // 兼容一下
+        if (this.$refs.statir.jt != 3) {
+          this.$showMessage('暂不支持该气价类型的运算,请联系开发人员!')
+        }
+        // 开始计算
+        // 可以购买各阶梯量
+        let purchase1 = 0
+        let purchase2 = 0
+        let purchase3 = 0
+        if (money <= price1) {
+          purchase1 = (money / mydata.f_stair1price).toFixed(2)
+        } else if (money <= (price1 + price2)) {
+          purchase1 = surplus1
+          purchase2 = ((money - price1) / mydata.f_stair2price).toFixed(2)
+        } else {
+          purchase1 = surplus1
+          purchase2 = surplus2
+          purchase3 = ((money - price1 - price2) / mydata.f_stair3price).toFixed(2)
+        }
+        // 可以购买的总气量
+        let purchaseSum = (purchase1 - 0) + (purchase2 - 0) + (purchase3 - 0)
+        // 计算应抄底数
+        this.should_base = (this.row.f_last_tablebase - 0) + purchaseSum
+        // 计算公式
+        this.designFormulas = `${purchase1}X${mydata.f_stair1price} + ${purchase2}X${mydata.f_stair2price} + ${purchase3}X${mydata.f_stair3price}`
+      }
+      this.should_base = this.should_base.toFixed(2) - 0
+    }
+  },
+  watch: {
+    'downModel.downWay'(val) {
+      if (val === 'downWithSelf') {
+        console.log('抄表员。。', this.inputtores2)
+        if (this.inputtores2.length > 0) {
+          this.downModel.downInputtor = [this.inputtores2[0].value]
+        }
+      }
+    },
+    'detailsShow'(val) {
+      if (!val) {
+        this.should_base = 0
+        this.designFormulas = null
+        this.$els.inputmoney.value = 0
+      }
+    }
+    // 'model.rows'(val){
+    //   console.log('页面切换',val)
+    //   if(this.isChooseAll(val)){
+    //     this.all = true
+    //   }else{
+    //     this.all = false
+    //   }
+    // },
+  },
+  computed: {
+    danhutitle() {
+      return '单户抄表    当前计划年月：' + this.downModel.downDate
+    },
+    getCondition() {
+      // return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      return {
+        startDate: this.$refs.paged.$refs.criteria.model.startDate,
+        endDate: this.$refs.paged.$refs.criteria.model.endDate,
+        orderitem: this.orderDefault ? this.orderDefault : 'id',
+        condition: this.condition2
+      }
+    },
+
+    inputtores() {
+      // 获取抄表员
+      console.log('获取抄表员', this.$login.f)
+      let rs = []
+      if (this.$login.f.f_gasman.length > 0) {
+        for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+          let temp = {
+            label: this.$login.f.f_gasman[i].name,
+            value: this.$login.f.f_gasman[i].name
+          }
+          rs.push(temp)
+        }
+      }
+      this.inputtores2 = rs
+      return [...rs]
+    },
+    whetherpaies() {
+      return [
+        {label: '全部', value: ''},
+        {label: '已缴费', value: '是'},
+        {label: '未缴费', value: '否'}
+      ]
+    },
+    // 界面细节权限
+    jurisdiction() {
+      console.log('抄表界面细节', this.$login.r)
+      return this.$login.r ? this.$login.r : []
+    }
+  }
+}
+</script>
+<style lang="less">
+#handManager {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+
+  .btn {
+    margin: 0px;
+  }
+
+  .hand-loading {
+    border: 3px solid #ccc;
+    border-right-color: #337ab7;
+    border-radius: 50%;
+    animation: spin 0.6s linear;
+    position: absolute;
+    animation-iteration-count: infinite;
+    top: 0;
+    right: 50%;
+    z-index: 2;
+    display: block;
+    width: 28px;
+    height: 28px;
+    line-height: 28px;
+    text-align: center;
+    pointer-events: none;
+  }
+
+  @keyframes spin {
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+
+  .detail-panel {
+    text-align: center;
+    color: #31708f;
+    background-color: #e8f1f9;
+    border-color: #F2F6FA;
+  }
+}
+
+#hand_manager_grid {
+  thead {
+    position: relative;
+    z-index: 2;
+  }
+}
+
+#machineHandManager {
+  .color-red {
+    color: red;
+  }
+}
+</style>

package/src/filiale/lixianV3/sale.js

@@ -1,6 +1,6 @@
 // 分公司特殊组件页面注册
-
+import Vue from 'vue'
 export default function () {
   // 换表 挪到公共 加配置了
-  // Vue.component('change-meter', (resolve) => { require(['./ChangeMeter'], resolve) })
+  // Vue.component('machine-hand', (resolve) => { require(['./iotHand'], resolve) })
 }