sale-client 3.5.94 → 3.5.96

package/build/dev-server.js

@@ -12,7 +12,7 @@ var compiler = webpack(config)
 // https://github.com/chimurai/http-proxy-middleware
 var bendi = 'http://127.0.0.1:8080', bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
-var fuwu = 'http://39.108.82.124: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/'
@@ -36,9 +36,9 @@ var proxyTable = {
   '/rs/logic/saleGetExportProgress': {
     target: fuwu
   },
-  // '/rs/logic/getWarningMsg': {
-  //   // target: 'http://localhost:8080/'
-  // },
+  '/rs/logic/getWarningMsg': {
+    target: 'http://localhost:8080/'
+  },
   '/rs/file': {
     target: fuwu
   },
@@ -88,6 +88,9 @@ var proxyTable = {
   '/rs/sql/getLicenseById': {
     target: fuwu
   },
+  '/rs/sql/getGasPriceInfo': {
+    target: 'http://127.0.0.1:8080'
+  },
   '/rs/sql/manage_getarealist': {
     target: fuwu
   },
@@ -101,7 +104,7 @@ var proxyTable = {
     target: fuwu
   },
   '/webmeter': {
-    target: 'http://39.108.82.124:8400/'
+    target: 'http://192.168.50.4:8450'
   },
   '/rs': {
     // target: 'http://192.168.30.63:8081/'

package/package.json

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

package/src/components/revenue/comprehen/StairPrice/GasPriceList.vue

@@ -76,6 +76,14 @@
                         close-on-select v-ref:type>
               </v-select>
             </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价状态</label>
+              <v-select :value.sync="model.f_price_state" v-model="model.f_price_state"
+                        placeholder='气价状态' :options="$parent.$parent.price_states"
+                        condition="f_price_state = '{}'"
+                        close-on-select v-ref:type>
+              </v-select>
+            </div>
           </div>
         </div>
 
@@ -198,6 +206,7 @@
         f_orgid: '',
         gasproperties: [],
         custom: [{label: '全部', value: ''}, {label: '正常气价', value: '正常气价'}, {label: '自定义气价', value: '自定义气价'}],
+        price_states: [{label: '全部', value: ''}, {label: '使用中', value: '使用中'}, {label: '删除', value: '删除'}, {label: '已作废', value: '已作废'}],
         usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : []
       }
     },
@@ -215,13 +224,14 @@
     },
     ready () {
       this.$refs.paged.$refs.cri.model.performDate = this.$login.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.f_price_state = '使用中'
       this.search()
     },
     methods: {
-      batchAdjust(){
-        this.$parent.usershow=true
-        this.$parent.priceid=null
-        this.$parent.priceorgid=null
+      batchAdjust () {
+        this.$parent.usershow = true
+        this.$parent.priceid = null
+        this.$parent.priceorgid = null
       },
       showhistory (row) {
         this.show = true

package/src/components/webMeter/paramSave/ParamSet.vue

@@ -52,6 +52,15 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2" >
+              <label class="font_normal_body">组织机构</label>
+              <res-select :initresid='$parent.$parent.curorgid'
+                          @res-select="$parent.$parent.getorg"
+                          class="select select_list"
+                          restype='organization'
+                          style="width: 60%">
+              </res-select>
+            </div>
             <div class="col-sm-2 ">
               <label class="font_normal_body">表&emsp;号&emsp;</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
@@ -259,6 +268,8 @@ export default {
       user: [],
       meterbrand: [],
       meterstyle: {},
+      curorgid: [this.$login.f.orgid],
+      f_orgid: '',
       model: new PagedList('rs/sql/iot_getOpertionList', 20),
       searchshow: false,
       showParame: false,
@@ -321,6 +332,9 @@ export default {
     // this.model.search('1=1')
   },
   methods: {
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+    },
     //    let condition = 'f_meter_type = "物联网表"'
     // this.$resetpost('/rs/sql/getAllBrands',{data:{condition:condition}},{}).then((res)=>{
     //   let arr=[]
@@ -415,11 +429,15 @@ export default {
       this.search()
     },
     selfSearch (args) {
-      args.condition = `${args.condition} `
+      if (this.f_orgid) {
+        args.condition = `f_orgid in ${this.f_orgid} and ${args.condition}`
+      }
       if (this.f_gasbrand_id.length > 0) {
         args.condition += ' and f_gasbrand_id=' + this.f_gasbrand_id[0]
         this.condition = args.condition
         this.model.search(args.condition, args.model)
+      } else {
+        this.$showAlert(`请先选择气表品牌`, 'warning', 0)
       }
       // this.isCheckAll = false
     },