sale-client 3.5.59 → 3.5.61

package/build/dev-server.js

@@ -1,164 +1,164 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://192.168.50.4:8400', bendi1 = 'http://121.36.106.17:8400/'
-// 公司测试服务
-var fuwu = 'http://192.168.50.4:8400'
-// var fuwu = 'http://121.36.106.17:8400/'
-// 铜川正式
-//  var fuwu = 'http://61.134.55.234:9999/'
-// 铜川测试
-// var fuwu = 'http://61.134.55.234:9999/'
-// var fuwu = 'http://60.222.250.39:8300/'
-// 韶关
-// var fuwu = 'http://119.146.1.106:8300/'
-// 巩义测试服务
-// var fuwu = 'http://192.168.0.227:8400'
-// 燎原测试服务
-// var fuwu = 'http://121.41.19.238:8400  '
-// var fuwu = 'http://121.41.19.238:9001/'
-
-// var fuwu = 'http://139.214.92.34:8301/'
-
-var proxyTable = {
-  '/rs/logic/saleExport': {
-    target: fuwu
-  },
-  '/rs/logic/saleGetExportProgress': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData': {
-    target: fuwu
-  },
-  '/invoice': {
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getarealist': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getstreetlist': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: 'http://121.36.106.17:8400/'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/webmeter': {
-    target: 'http://192.168.50.4:8450'
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://121.36.106.17:8400/'
-    target: bendi
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
+// 公司测试服务
+var fuwu = 'http://121.36.106.17:8400'
+// var fuwu = 'http://121.36.106.17:8400/'
+// 铜川正式
+//  var fuwu = 'http://61.134.55.234:9999/'
+// 铜川测试
+// var fuwu = 'http://61.134.55.234:9999/'
+// var fuwu = 'http://60.222.250.39:8300/'
+// 韶关
+// var fuwu = 'http://119.146.1.106:8300/'
+// 巩义测试服务
+// var fuwu = 'http://192.168.0.227:8400'
+// 燎原测试服务
+// var fuwu = 'http://121.41.19.238:8400  '
+// var fuwu = 'http://121.41.19.238:9001/'
+
+// var fuwu = 'http://139.214.92.34:8301/'
+
+var proxyTable = {
+  '/rs/logic/saleExport': {
+    target: fuwu
+  },
+  '/rs/logic/saleGetExportProgress': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData': {
+    target: fuwu
+  },
+  '/invoice': {
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getarealist': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getstreetlist': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: 'http://121.36.106.17:8400/'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/webmeter': {
+    target: 'http://192.168.50.4:8450'
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    // target: 'http://121.36.106.17:8400/'
+    target: bendi
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8089, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -153,7 +153,7 @@ export default {
           base: {
             f_user_name: '',
             f_user_state: '',
-            f_user_type:'',
+            f_user_type: '',
             f_credentials: '',
             f_cost_type: '',
             f_bz_type: '',
@@ -337,6 +337,17 @@ export default {
       if (this.fileSaveData.reason && this.fileSaveData.reason !== '其他') {
         this.fileSaveData.modifyReason = this.fileSaveData.reason
       }
+      console.log('row-------->',this.row)
+      for (let item in this.filechangeDetails.rows){
+        if (item.f_field_name === '通气日期') {
+          let name = this.$login.f.name
+          let parentname = this.$login.f.f_parentname
+          console.log('验证进来了--------------->',name,parentname)
+          this.fileSaveData.userinfo.f_operator = name
+          this.fileSaveData.userinfo.f_depname = parentname
+        }
+      }
+
       this.$FileManageService.fileSave(this.fileSaveData).then((res) => {
         this.$parent.resdata = res.data.result[0].f_userinfo_code
         if (!this.row) {

package/src/components/MaterialsManage/MaterialsBase.vue

@@ -10,14 +10,16 @@
         <input type="text"
                :disabled="look"
                v-model="model.name" style="width:60%"
-               class="input_search full-with" placeholder="项目类别">
+               class="input_search full-with" placeholder="名称">
       </div>
       <div class="col-sm-6">
         <label class="font_normal_body">类别</label>
-        <input type="text"
-               :disabled="look" disabled
-               v-model="model.type" style="width:60%"
-               class="input_search full-with" placeholder="项目类别">
+        <v-select :disabled="look"
+                  v-model="model.type"
+                  placeholder='项目类别'
+                  :value.sync="model.type"
+                  :value-single="true"
+                  :options='types'></v-select>
       </div>
     </div>
     <div class="row" style="margin-top:1rem;" v-if="model.type ==='型号'">
@@ -35,6 +37,13 @@
                v-model="model.code" style="width:60%"
                class="input_search full-with" id="name" placeholder="物料编码">
       </div>
+      <div class="col-sm-6">
+        <label class="font_normal_body">单价</label>
+        <input type="text"
+               :disabled="look"
+               v-model="model.price" style="width:60%"
+               class="input_search full-with" id="name" placeholder="物料单价">
+      </div>
     </div>
     <!--  按钮  -->
     <div class="row col-sm-12" style="margin-top: 1rem">
@@ -46,6 +55,8 @@
         <span class=" glyphicon glyphicon-log-out"></span>返回
       </button>
     </div>
+    <div class="row col-sm-12" style="margin-top: 18rem">
+    </div>
     <work-busy :is-busy="isbusy"></work-busy>
   </div>
 </template>
@@ -68,7 +79,11 @@ export default {
       },
       type: '',
       isbusy: false,
-      types: [{label: '普通模式', value: '普通模式'}, {label: 'markDown模式', value: 'markDown模式'}],
+      types: this.$appdata.getParam('材料管理-项目类别') ? this.$appdata.getParam('材料管理-项目类别') : [{
+        label: '型号',
+        value: '型号'
+      }, {label: '燃气具设备', value: '燃气具设备'}, {label: '报建', value: '报建'},
+        {label: '规格', value: '规格'}, {label: '材料', value: '材料'}, {label: '品名', value: '品名'}],
       showFile: 'false',
       file: []
     }
@@ -118,7 +133,7 @@ export default {
       this.$dispatch('cancel')
     },
     async confirm () {
-      await this.$resetpost('ncc/rs/entity/t_material_info', this.model).then(res =>
+      await this.$resetpost('rs/entity/t_material_info', this.model).then(res =>
         this.$parent.$refs.funlist.searchData()
       )
     },
@@ -127,7 +142,7 @@ export default {
     },
     delFile (row) {
       if (!this.look) {
-        this.$resetdelete(`ncc/rs/entity/t_material_info`, {id: row.id}).then(res =>
+        this.$resetdelete(`rs/entity/t_material_info`, {id: row.id}).then(res =>
           this.initdata()
         )
       }

package/src/components/MaterialsManage/MaterialsList.vue

@@ -122,7 +122,7 @@ export default {
         condition: condition || '1 = 1'
       }
       this.seaching = true
-      let temp = await this.$resetpost('ncc/rs/logic/query_material', {data}, {rejectMsg: null, resolveMsg: null})
+      let temp = await this.$resetpost('rs/logic/query_material', {data}, {rejectMsg: null, resolveMsg: null})
       if (!model) {
         this.model = handleTree(temp.data)
       }
@@ -149,7 +149,7 @@ export default {
         this.$showAlert('请先删除子目录！', 'warning', 2000)
         return
       }
-      this.$resetdelete(`ncc/rs/entity/t_material_info`, {id: obj.data.id}).then(res =>
+      this.$resetdelete(`rs/entity/t_material_info`, {id: obj.data.id}).then(res =>
         this.searchData()
       )
     },
@@ -162,7 +162,7 @@ export default {
         depict: '',
         type: '普通模式'
       }
-      await this.$resetpost('ncc/rs/entity/t_material_info', model).then(res =>
+      await this.$resetpost('rs/entity/t_material_info', model).then(res =>
         this.searchData()
       )
     }

package/src/components/MaterialsManage/MaterialsManage.vue

@@ -1,12 +1,12 @@
 <template>
   <div id="unit" class="flex-row">
     <material-display @select-changed='selected' @modify-res="modifyRes"
-                 @add-res="addRes"
-                 class="basic-main" style="width:auto;" v-ref:funlist>
+                      @add-res="addRes"
+                      class="basic-main" style="width:auto;" v-ref:funlist>
     </material-display>
     <div class="binary-right" style="width: 40%;overflow-x: hidden; overflow-y: scroll;" v-if="row">
       <materials-base  :look='look' :data="row" :title="title"
-               :parent="row.parent_name" @cancel="cancel">
+                       :parent="row.parent_name" @cancel="cancel">
       </materials-base>
     </div>
   </div>

package/src/components/revenue/Common/PrintBill.vue

@@ -1,132 +1,132 @@
-<template>
-  <div class="auto form-horizontal" >
-    <modal :show.sync="show &&!billConfig.autoPrint"  v-ref:modal large backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <h3 style="color:black" class="modal-title">收费发票</h3>
-      </header>
-      <article slot="modal-body" class="modal-body">
-<!--        <div v-if="bill.data">-->
-<!--          {{{bill.data}}}-->
-<!--        </div>-->
-        <validator name='v'>
-          <form class="form-horizontal  select-overspread">
-            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' v-if="bill.data">
-              {{{bill.data}}}
-            </div>
-          </form>
-        </validator>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <div v-if="billConfig.hasBillManage">
-          <div class="col-sm-2" >
-            <span><strong>发票号:{{model.f_using_number}}</strong></span>
-          </div>
-        </div>
-        <button type="button" class="btn btn-success" @click='print(true)'>选择打印机打印</button>
-        <button type="button" class="btn btn-success" @click='print()' @keyup.enter="print()" v-el:confirmbutton>打印</button>
-        <report-print id='normal-bill' top='5mm' left='5mm'  width='90%'  height='80%' :notrepeat="true" :showbtn="false" v-ref:reportprint></report-print>
-        <button type="button" class="btn btn-default"  @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-  import { DataModel } from 'vue-client'
-
-  let getBillData = async function (self, val) {
-    console.log('temp:', self)
-    let temp = {
-      reprint: "'正常'",
-      operator: `'${self.$login.f.name}'`,
-      condition: self.data.id
-    }
-    if (self.data.fillgasid) {
-      temp.condition = `"${self.data.fillgasid}"`
-    }
-    console.log('self.billData.url:', self.billData.url)
-    self.bill = new DataModel(self.billData.url, temp)
-    await self.bill.search(self.data.id)
-    // 获取发票号
-    self.model.f_using_number = self.billData.bill.number
-  }
-
-  export default {
-    title: '收费发票',
-    data () {
-      return {
-        model: {
-          f_using_number: null
-        },
-        bill: {},
-        messShow: false
-      }
-    },
-    props: ['show','data','billData', 'billConfig'],
-    ready () {
-      console.log('打票', this.billConfig, this.billData)
-    },
-    methods: {
-      // 确认按钮获得焦点
-      confirmbuttonfocus () {
-        this.$nextTick(() => {
-          this.$els.confirmbutton.focus()
-        })
-      },
-      cancel  () {
-        this.$dispatch('toggle')
-      },
-      getbill () {
-        this.$refs.reportprint.isPrint = true
-        let val = true
-        getBillData(this, val).then(() => {
-          this.$emit('ready')
-        }).catch((error) => {
-          this.$emit('error', error)
-        })
-      },
-      async print (select) {
-        // 更新系统发票
-        try {
-          if (this.billConfig.hasBillManage) {
-            if (this.data.f_bill_type != '清算单') { await this.$CommonService.openPaperBill(this.data.id, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常') }
-          } else {
-            await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {resolveMsg: null, rejectMsg: '票据补打出错！！'})
-          }
-          if (select) {
-            this.$refs.reportprint.print(true)
-          } else {
-            this.$refs.reportprint.print()
-          }
-        } catch (error) {
-          this.$dispatch('refresh')
-        }
-      }
-    },
-    watch: {
-      'show' (val) {
-        if (val) {
-          getBillData(this, val).then(() => {
-            if(this.billConfig.autoPrint){
-              this.print()
-            }
-            this.$emit('ready')
-          }).catch((error) => {
-            this.$emit('error', error)
-          })
-          this.confirmbuttonfocus()
-        }
-      }
-    },
-    events: {
-      'print' () {
-        // 对票据明细进行更新或插入操作
-        this.$dispatch('printok', '发票打印', this.data)
-      },
-      'print-error' () {
-        this.$dispatch('error', '发票打印', this.data, null)
-      }
-    }
-  }
-</script>
-<style >
-</style>
+<template>
+  <div class="auto form-horizontal" >
+    <modal :show.sync="show &&!billConfig.autoPrint"  v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title">收费发票</h3>
+      </header>
+      <article slot="modal-body" class="modal-body">
+<!--        <div v-if="bill.data">-->
+<!--          {{{bill.data}}}-->
+<!--        </div>-->
+        <validator name='v'>
+          <form class="form-horizontal  select-overspread">
+            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' v-if="bill.data">
+              {{{bill.data}}}
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <div v-if="billConfig.hasBillManage">
+          <div class="col-sm-2" >
+            <span><strong>发票号:{{model.f_using_number}}</strong></span>
+          </div>
+        </div>
+        <button type="button" class="btn btn-success" @click='print(true)'>选择打印机打印</button>
+        <button type="button" class="btn btn-success" @click='print()' @keyup.enter="print()" v-el:confirmbutton>打印</button>
+        <report-print id='normal-bill' top='5mm' left='5mm'  width='90%'  height='80%' :notrepeat="true" :showbtn="false" v-ref:reportprint></report-print>
+        <button type="button" class="btn btn-default"  @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  import { DataModel } from 'vue-client'
+
+  let getBillData = async function (self, val) {
+    console.log('temp:', self)
+    let temp = {
+      reprint: "'正常'",
+      operator: `'${self.$login.f.name}'`,
+      condition: self.data.id
+    }
+    if (self.data.fillgasid) {
+      temp.condition = `"${self.data.fillgasid}"`
+    }
+    console.log('self.billData.url:', self.billData.url)
+    self.bill = new DataModel(self.billData.url, temp)
+    await self.bill.search(self.data.id)
+    // 获取发票号
+    self.model.f_using_number = self.billData.bill.number
+  }
+
+  export default {
+    title: '收费发票',
+    data () {
+      return {
+        model: {
+          f_using_number: null
+        },
+        bill: {},
+        messShow: false
+      }
+    },
+    props: ['show','data','billData', 'billConfig'],
+    ready () {
+      console.log('打票', this.billConfig, this.billData)
+    },
+    methods: {
+      // 确认按钮获得焦点
+      confirmbuttonfocus () {
+        this.$nextTick(() => {
+          this.$els.confirmbutton.focus()
+        })
+      },
+      cancel  () {
+        this.$dispatch('toggle')
+      },
+      getbill () {
+        this.$refs.reportprint.isPrint = true
+        let val = true
+        getBillData(this, val).then(() => {
+          this.$emit('ready')
+        }).catch((error) => {
+          this.$emit('error', error)
+        })
+      },
+      async print (select) {
+        // 更新系统发票
+        try {
+          if (this.billConfig.hasBillManage) {
+            if (this.data.f_bill_type != '清算单') { await this.$CommonService.openPaperBill(this.data.id, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常') }
+          } else {
+            await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {resolveMsg: null, rejectMsg: '票据补打出错！！'})
+          }
+          if (select) {
+            this.$refs.reportprint.print(true)
+          } else {
+            this.$refs.reportprint.print()
+          }
+        } catch (error) {
+          this.$dispatch('refresh')
+        }
+      }
+    },
+    watch: {
+      'show' (val) {
+        if (val) {
+          getBillData(this, val).then(() => {
+            if(this.billConfig.autoPrint){
+              this.print()
+            }
+            this.$emit('ready')
+          }).catch((error) => {
+            this.$emit('error', error)
+          })
+          this.confirmbuttonfocus()
+        }
+      }
+    },
+    events: {
+      'print' () {
+        // 对票据明细进行更新或插入操作
+        this.$dispatch('printok', '发票打印', this.data)
+      },
+      'print-error' () {
+        this.$dispatch('error', '发票打印', this.data, null)
+      }
+    }
+  }
+</script>
+<style >
+</style>

package/src/components/revenue/base/UserList.vue

@@ -312,10 +312,29 @@ export default {
       this.model.rows = ''
     },
     operate (title, name, row) {
-      this.asideTitle = this.componentName = title
-      // 单条业务逻辑操作不管批量操作是否为true统一都修改为false
-      this.bulkType = null
-      this.$dispatch('select-oper', title, name, row)
+      // 换表前需要校验
+      if (title == '换表管理') {
+        this.$resetpost('rs/logic/checkHandPlan', {data: {f_userinfo_id: row.f_userinfo_id}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          // 收费成功，打票
+          console.log('校验换表数据结果：', res)
+          if (res.data.resultData.length > 0) {
+            this.$showAlert(res.data.resultData, 'warning', 3000)
+            return
+          }
+          this.asideTitle = this.componentName = title
+          // 单条业务逻辑操作不管批量操作是否为true统一都修改为false
+          this.bulkType = null
+          this.$dispatch('select-oper', title, name, row)
+        })
+      } else {
+        // if (parseInt(row.f_balance) < 0) {
+        //   this.$showMessage('账户当前欠费未缴清', ['confirm'])
+        // } else {
+        this.asideTitle = this.componentName = title
+        // 单条业务逻辑操作不管批量操作是否为true统一都修改为false
+        this.bulkType = null
+        this.$dispatch('select-oper', title, name, row)
+      }
     },
     IOTCenter (row) {
       row.f_calculation !== '预付费' ? this.operate('物联网表收费', 'machine-charge', row) : this.operate('物联网表收费', 'iot-meter-center', row)

package/src/components/revenue/base/rightview/CardList.vue

@@ -344,7 +344,10 @@
             left join t_sellinghand tsh on th.id=tsh.f_hand_id
             where th.f_hand_state = '有效' and th.f_input_date > '${row.f_operate_date}' and tsh.f_debt_money>0
             and  th.f_userfiles_id = '${row.f_userfiles_id}' and tsh.f_state='有效'`
-            let getwate = await this.$resetpost('rs/logic/sqlquery', {data: {sql: sql}})
+            let getwate = await this.$resetpost('rs/logic/sqlquery', {data: {sql: sql}}, {
+              resolveMsg: null,
+              rejectMsg: '获取记录详情出错！！'
+            })
             if (getwate.data.length > 0) {
               this.$showAlert('此次机表收费之后有自动下账，不能撤销此纪录', 'warning', 1500)
               return

package/src/components/revenue/comprehen/handAudit/MeterReadAudit.vue

@@ -15,8 +15,8 @@
                         placeholder='处理状态'
                         :value.sync="model.f_hand_state"
                         :options='$parent.$parent.states'
-                        condition= "f_hand_state = {}"
                         close-on-select
+                        condition= " {} "
                         @change="$parent.$parent.search">
               </v-select>
             </div>
@@ -149,7 +149,7 @@
           <td style="text-align:center">{{row.f_meter_source}}</td>
           <td style="text-align:center">{{row.f_audit_person}}</td>
           <td style="text-align:center">{{row.f_audit_date}}</td>
-          <td style="text-align: center" v-if="row.f_hand_state == '待审核'">
+          <td style="text-align: center" v-if="row.f_meter_state === '待审核' && row.f_hand_state === '有效'">
             <button type="button" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.success(row)">通过</button>
             <br>
             <button type="button" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.faild(row)">不通过</button>
@@ -201,13 +201,13 @@
         pushdata: {openid: '', cause: ''},
         row: null,
         model: new PagedList('rs/sql/meterReadAudit', 20),
-        states: [{label: '待审核', value: `'待审核'`}, {label: '未通过', value: `'无效'`}, {label: '已通过', value: `'有效'`}],
+        states: [{label: '待审核', value: ` f_meter_state = '待审核' and f_hand_state ='有效'`}, {label: '未通过', value: ` f_hand_state = '无效'`}, {label: '已通过', value: `f_meter_state = '已抄表' and f_hand_state ='有效'`}],
         meterbooks: [{label: '全部', value: ''}]
       }
     },
     ready () {
       readyGen(this)
-      this.$refs.paged.$refs.cri.model.f_hand_state[0] =`'待审核'`
+      this.$refs.paged.$refs.cri.model.f_hand_state[0] = ` f_meter_state = '待审核'`
     },
     methods: {
       loadMeterBooks () {

package/src/components/revenue/machineHandManage/machineUploaded.vue

@@ -0,0 +1,316 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <div class="flex">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' v-ref:cri @condition-changed="$parent.selfSearch">
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <!--<div class="col-sm-6">-->
+              <!--style="border: 1px solid #a6d5ea; box-shadow: darkgrey 1px 1px 1px 2px;padding: 0.5%">-->
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">抄表日期</label>
+                <datepicker placeholder="开始日期"
+                            style="width:60%"
+                            class="datepicker"
+                            v-model="model.startDate"
+                            :value.sync="model.startDate"
+                            condition="f_input_date >='{} 00:00:00'"
+                            :format="'yyyy-MM-dd'"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">&emsp;&emsp;至&emsp;</label>
+                <datepicker placeholder="抄表日期"
+                            style="width:60%"
+                            v-model="model.endDate"
+                            :value.sync="model.endDate"
+                            condition="f_input_date <='{} 23:59:59'"
+                            :format="'yyyy-MM-dd'"
+                ></datepicker>
+              </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 class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
+                <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                <export-excel
+                  :data="{condition: $parent.$parent.excelCondition}"
+                  :field="$parent.$parent.fields"
+                  sqlurl="rs/logic/saleExport" progress="saleGetExportProgress" sql-name="getAuditMachineHand"
+                  template-name='抄表审核导出'
+                  :choose-col="true">
+                </export-excel>
+                <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>
+            <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_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 like '%{}%'">
+              </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">楼&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 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"
+                          :options='$parent.$parent.inputtores' placeholder='抄表员'
+                          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_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;册</label>
+                <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
+                          :options='$parent.$parent.meterbooks' placeholder='抄表册'
+                          style="width:60%"
+                          :multiple="true"
+                          condition="f_meter_book_num in {}"></v-select>
+              </div>
+              <res-select-group :show-component="['company','department','operator']" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"
+                                v-ref:sel></res-select-group>
+            </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><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>
+              <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>{{row.f_userinfo_code}}</td>
+            <td> <nobr>{{row.f_user_name}}&nbsp;&nbsp;{{row.f_address}} </nobr></td>
+            <td>{{row.f_user_level}}</td>
+            <td>{{row.f_balance}}</td>
+            <td>{{row.f_meternumber}}</td>
+            <td>{{row.f_last_tablebase}}</td>
+            <td id="hand-creat" style="display: flex;justify-content: space-between;align-items: center"><b>{{row.f_tablebase}}</b></td>
+            <td><nobr>{{row.f_last_input_date}}</nobr></td>
+            <td><nobr>{{row.f_hand_date}}</nobr></td>
+            <td><nobr>{{row.f_input_date}}</nobr></td>
+            <td> <nobr>{{row.f_book_name}} </nobr></td>
+            <td>{{row.f_inputtor}}</td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+
+</template>
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+
+  let readyGen = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+    await self.$LoadParams.loadMeterBook(self.f_filialeid)
+    self.loadMeterBooks()
+    self.getaddress()
+  }
+
+  export default {
+    title: '已上传抄表查询',
+    data () {
+      return {
+        timer: null,
+        model: new PagedList('rs/sql/getMachineUploaded', 50),
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: []
+        },
+        config: {
+          examine: false
+        },
+        imgfilename: '',
+        // 小区
+        residentialArea: [],
+        imgshow: false,
+        criteriaShow: false,
+        orgCondtionStr: '',
+        excelCondition: '',
+        fields: {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户名称',
+          'f_address': '客户地址',
+          'f_balance': '上期结余',
+          'f_meternumber': '表号',
+          'f_last_tablebase': '上期底数',
+          'f_tablebase': '本期底数',
+          'f_last_input_date': '上次抄表录入日期',
+          'f_hand_date': '下发日期',
+          'f_input_date': '抄表录入日期',
+          'f_book_name': '抄表册',
+          'f_inputtor': '抄表员'
+        },
+        auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
+        auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
+        meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
+        resultstate: this.$appdata.getParam('抄表结果状态'),
+        meterstates: this.$appdata.getParam('抄表状态') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('抄表状态')] : [],
+        usertypes: this.$appdata.getParam('客户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户类型')] : [],
+        userlevels: this.$appdata.getParam('用户等级') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')] : [],
+        adjustablename: this.$appdata.getParam('调压箱名称') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('调压箱名称')] : [],
+        meterbooks: [],
+        // 公司下拉
+        curorgid: [this.$login.f.orgid]
+      }
+    },
+    props: [],
+    beforeDestroy () {
+      // 销毁定时器
+      if (this.timer) clearInterval(this.timer)
+    },
+    ready () {
+      this.model.pageSizeMax = 9999999
+      readyGen(this)
+    },
+    methods: {
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes (obj) {
+        this.orgCondtionStr = obj
+      },
+      view (row) {
+        this.$parent.showupload = true
+        this.$parent.row = row
+      },
+      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
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      clear () {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      selfSearch (args) {
+        if (!this.orgCondtionStr) {
+          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+        } else {
+          args.condition = `${args.condition}` + this.orgCondtionStr
+        }
+        this.excelCondition = args.condition
+        this.$refs.paged.$refs.grid.selectInit()
+        this.model.search(args.condition, args.model)
+      },
+      loadMeterBooks () {
+        this.meterbooks = this.$GetSaleParam.getMeterBooks()
+      }
+    },
+    computed: {
+      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]
+      }
+    },
+    watch: {
+
+    }
+  }
+</script>

package/src/sale.js

@@ -325,6 +325,8 @@ export default function (filiale) {
   Vue.component('machine-hand-manager', (resolve) => { require(['./components/revenue/machineHandManage/machineHandManager'], resolve) })
   // 机表抄表审核
   Vue.component('machine-hand-audit', (resolve) => { require(['./components/revenue/machineHandManage/machineHandAudit'], resolve) })
+  // 机表抄表已上传未同步
+  Vue.component('machine-uploaded', (resolve) => { require(['./components/revenue/machineHandManage/machineUploaded'], resolve) })
   // 机表抄表
   Vue.component('machine-hand', (resolve) => { require(['./components/revenue/machineHandManage/machineHand'], resolve) })
   // 计划下发