manage-client 4.0.68 → 4.0.70

package/build/dev-server.js

@@ -12,14 +12,14 @@ var compiler = webpack(config)
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan = 'http://119.146.1.106:8300/'
-var qtx= 'http://36.103.222.144:6300/'
+var qtx = 'http://36.103.222.144:6300/'
 // var bendi = 'http://220.194.141.253:8600/'
 // var bendi = 'http://203.57.101.233:9001'
 // var bendi = 'http://172.168.1.11:9001/'
 // var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.67:31567/'
+var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://119.187.112.234:8400/'
 var wode = 'http://203.57.101.233:9001/'
 // 192.168.
@@ -33,8 +33,14 @@ var proxyTable = {
     target: 'http://203.57.101.233:9001/'
 
   },
+  '/api/af-revenue/sql/compreQuery': {
+    pathRewrite: {
+      '^/api/af-revenue': '/'
+    },
+    target: 'http://127.0.0.1:9026/'
+  },
   '/api': {
-    target: bendi
+    target: 'http://192.168.50.67:31567/'
 
   },
   '/rs/sql/chargeQuery_by_gasproperties': {
@@ -48,7 +54,7 @@ var proxyTable = {
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: bendi
+    target: 'http://192.168.50.67:31567/'
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
@@ -90,7 +96,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/vue': {
-    target: bendi
+    target: 'http://192.168.50.67:31567/'
   },
   '/rs/file': {
     target: bendi
@@ -99,7 +105,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs': {
-    target: bendi
+    target: wode
   }
 }
 
@@ -131,14 +137,60 @@ Object.keys(proxyTable).forEach(function (context) {
 
 // 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'))
 
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
 module.exports = app.listen(8015, function (err) {
   if (err) {
     console.log(err)

package/package.json

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

package/src/filiale/yangchun/HandplanQuery.vue

@@ -318,6 +318,17 @@
                 <!--                            condition="f_bgl = '{}'"-->
                 <!--                            close-on-select></v-select>-->
                 <!--                </div>-->
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">使用类型</label>
+                  <v-select :value.sync="model.f_usetype"
+                            v-model="model.f_usetype"
+                            :options='$parent.$parent.usetype'
+                            placeholder='使用类型'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_usetype = '{}'">
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">总&ensp;分&ensp;表</label>
                   <v-select :value.sync="model.f_totalsplit_type"
@@ -511,6 +522,9 @@
                 <th>
                   <nobr>剩余抵扣金额</nobr>
                 </th>
+                <th>
+                  <nobr>使用类型</nobr>
+                </th>
                 <th>
                   <nobr>附件</nobr>
                 </th>
@@ -676,6 +690,9 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_remaining_deduct_amount }}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_usetype }}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>
                   <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">
@@ -1338,6 +1355,9 @@ export default {
     usertypes() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
     },
+    usetype() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
+    },
     accountsState() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('下账状态')]
     },

package/src/filiale/yangchun/NewGasStatistics.vue

@@ -182,6 +182,17 @@
                             condition="f_gasproperties = '{}'"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">使用类型</label>
+                  <v-select :value.sync="model.f_usetype"
+                            v-model="model.f_usetype"
+                            :options='$parent.$parent.usetype'
+                            placeholder='使用类型'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_usetype = '{}'">
+                  </v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -212,6 +223,7 @@
                 <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>
@@ -246,6 +258,7 @@
                 <th style="text-align:center"><nobr>{{row.f_collection}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_gas_state}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_usetype}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_changetable_state}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_first_input_date}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_input_date}}</nobr></th>
@@ -506,6 +519,9 @@
       tableState() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
       },
+      usetype() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
+      },
       gasState() {
         return [{label:'正常', value:'正常'},
           {label:'异常', value:'异常'},

package/src/filiale/yangchun/RecordInfoQuery.vue

@@ -516,6 +516,11 @@
                                 condition="f_uservent_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">拥有附件</label>
+                    <v-select :value.sync="model.hasBlob" v-model="model.hasBlob" :options='$parent.$parent.truefalse'
+                             :search="false" placeholder='请选择' condition=" {} " close-on-select></v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -769,7 +774,12 @@
                 <td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_user_name}}
-                  <img style="width: 20%;" src="../../../static/img/hasFile.png" v-if="row.f_blobid != null && row.f_blobid !== ''" >
+                  <img
+                    style="width: 25%; cursor: pointer;"
+                    src="../../../static/img/hasFile.png"
+                    @click="$parent.$parent.$parent.showFile(row)"
+                    v-if="row.f_blobid != null && row.f_blobid !== ''"
+                  >
                 </nobr>
                 </td>
                 <td style="text-align: center;"><nobr>{{row.f_idnumber}}</nobr></td>
@@ -952,8 +962,16 @@
         <div class="flex" v-if="show">
           <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
         </div>
-      </div></div></div>
-  <high-meter-idcard :show.sync="false"  v-ref:highcard  ></high-meter-idcard>
+      </div>
+    </div>
+    <modal :show.sync="showfiles" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+      <article slot="modal-body">
+          <upload-idcard :blodid="blodid" :isupload="true" isremark="true" style="width:auto" fusetype="档案信息"></upload-idcard>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
 </template>
 
 <script>
@@ -1044,8 +1062,11 @@
         bookSlice:[{label: '全部',value: ''}],
         meterStyle:[{label: '全部',value: ''}],
         pricenames:[],
+        truefalse:[{label:"全部",value:""},{label:"是",value:" u.f_blobid is not null "},{label:"否",value:" u.f_blobid is null "}],
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
         networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : [],
+        showfiles:false,
+        blodid:''
       }
     },
     ready(){
@@ -1058,6 +1079,10 @@
       })
     },
     methods: {
+      showFile(row){
+        this.blodid = row.f_blobid
+        this.showfiles = true
+      },
       recombine (param) {
         // 条件拼接数据，多用于in （）。将数组转成字符串时加上单引号处理
         let str = ''

package/src/filiale/yangchun/WebhandMonthGas.vue

@@ -168,6 +168,17 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                          condition="f_meternumber = '{}' " placeholder="表号">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">使用类型</label>
+                  <v-select :value.sync="model.f_usetype"
+                            v-model="model.f_usetype"
+                            :options='$parent.$parent.usetype'
+                            placeholder='使用类型'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_usetype = '{}'">
+                  </v-select>
+                </div>
 <!--                <div class="col-sm-2 form-group">-->
 <!--                  <label class="font_normal_body">气表品牌</label>-->
 <!--                  <v-select :value.sync="model.f_meter_brand" multiple-->
@@ -204,6 +215,7 @@
                 <th><nobr>用气金额</nobr></th>
                 <th><nobr>期间实收金额</nobr></th>
                 <th><nobr>期末余额</nobr></th>
+                <th><nobr>使用类型</nobr></th>
                 <th><nobr>公司</nobr></th>
               </tr>
             </template>
@@ -260,6 +272,9 @@
               <td>
                 <nobr>{{row.f_curbalance}}</nobr>
               </td>
+              <td>
+                <nobr>{{row.f_usetype}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
@@ -757,6 +772,9 @@ export default {
     usertypes() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
     },
+    usetype() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
+    },
     // meterstate() {
     //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表状态')]
     // },

package/src/main.js

@@ -6,9 +6,8 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/fugou/sale'
-import ShanXianwebSaleManage from './filiale/shexian/webmeterManage'
-import OtherreportManage from './filiale/beifangshiye/reportManage'
+import ShanXianSaleManage from './filiale/yangchun/sale'
+import ShanXianwebSaleManage from './filiale/yangchun/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'
@@ -19,7 +18,7 @@ import AMap from 'vue-amap'
 Vue.config.silent = true
 // Vue.mmType = 'AES'
 
-Vue.use(AMap);
+Vue.use(AMap)
 
 // 初始化vue-amap
 AMap.initAMapApiLoader({
@@ -27,18 +26,18 @@ AMap.initAMapApiLoader({
   key: '3cec9ae8e2349207f7ac29279e3f4abe',
   // 插件集合 （插件按需引入）
   plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+    'AMap.Autocomplete', // 输入提示插件
+    'AMap.PlaceSearch', // POI搜索插件
+    'AMap.Scale', // 右下角缩略图插件 比例尺
+    'AMap.OverView', // 地图鹰眼插件
+    'AMap.ToolBar', // 地图工具条0
+    'AMap.MapType', // 类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    'AMap.PolyEditor', // 编辑 折线多，边形
+    'AMap.CircleEditor', // 圆形编辑器插件
+    'AMap.Geolocation' // 定位控件，用来获取和展示用户主机所在的经纬度位置
   ],
-  uiVersion: "1.0"
-});
+  uiVersion: '1.0'
+})
 /** **************************通用组件******************************/
 
 Vue.prototype.$echarts = echarts
@@ -53,14 +52,13 @@ ManageHome()
 newmanage()
 ShanXianwebSaleManage()
 reportManage()
-OtherreportManage()
 ShanXianSaleManage()
 require('system-clients/src/styles/less/bootstrap.less')
 require('./components/qinhua/Style/qinhuaStyle.less')
 // require('./bootstrap/less/manageStyle/manageChile.less')
 // require('./bootstrap/less/manageStyle/safeStyle.less')
 
-//大屏展示要放开的样式
+// 大屏展示要放开的样式
 // require('system-clients/src/styles/less/manageStyle/manageChile.less')
 // require('system-clients/src/styles/less/manageStyle/safeStyle.less')
 // require('system-clients/src/styles/less/manageStyle/manageStyle.less')