sale-client 3.6.163 → 3.6.164

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://39.99.85.14:8400/', 'http://39.99.85.14:8400/']
+const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -152,6 +152,17 @@
             <label class="font_normal_body">&ensp;卡&emsp;&emsp;号</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_card_id" placeholder='卡号' @blur="checkCardId" :disabled="!jurisdiction.includes('卡号修改')">
           </div>
+          <div class="col-sm-4 form-group" :class="[$m.f_force_measure.required ? 'has-error' : '']"
+               v-show="(formconfig && formconfig.f_force_measure && formconfig.f_force_measure.required) || !onlyshowmust"
+               v-if="getConfigShowItem('f_force_measure',false)">
+            <label class="font_normal_body">{{getConfigLabelName('f_force_measure','三项强制措施')}}</label>
+            <input type="text" v-model="$refs.measure.selectedItems" v-show="false"
+                   v-validate:f_force_measure=getConfigValidate("f_force_measure",false)>
+            <v-select :value.sync="row.f_force_measure" v-model="row.f_force_measure"
+                      :options='forceMeasure' placeholder='三项强制措施' :multiple="true"
+                      v-ref:measure>
+            </v-select>
+          </div>
         </div>
         <div>
           <a style="font-size: 16px;font-weight: 500;">气价信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
@@ -492,16 +503,6 @@
                       :options='overdueset' placeholder='违约金规则'
                       close-on-select></v-select>
           </div>
-          <div class="col-sm-4 form-group" :class="[$m.f_force_measure.required ? 'has-error' : '']"
-               v-show="(formconfig && formconfig.f_force_measure && formconfig.f_force_measure.required) || !onlyshowmust"
-               v-if="getConfigShowItem('f_force_measure',false)">
-            <label class="font_normal_body">{{getConfigLabelName('f_force_measure','三项强制措施')}}</label>
-            <input type="text" v-model="row.f_force_measure" v-show="false"
-                   v-validate:f_force_measure=getConfigValidate("f_force_measure",false)>
-            <v-select :value.sync="row.f_force_measure" v-model="row.f_force_measure"
-                      :options='forceMeasure' placeholder='三项强制措施'
-                      close-on-select></v-select>
-          </div>
 
           <template v-if="config.stuckFlowmeterShow">
             <div class="col-sm-4 form-group">
@@ -743,6 +744,9 @@
       if (this.row.pricetype === '混合气价') {
         this.ratioshow = true
       }
+      if (this.row.f_force_measure[0]) {
+        this.row.f_force_measure = this.row.f_force_measure[0].split(',')
+      }
       if (this.row.f_meternumber) {
         this.meterNumberDisabled = true
       }

package/src/components/FilesManageNew/MeterinfoTest.vue

@@ -172,7 +172,6 @@
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
                         v-ref:f_gas_date
-                        @change="gasDateChange"
                         :value.sync="row.f_gas_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
             ></datepicker>
@@ -356,11 +355,12 @@
                v-show="(formconfig && formconfig.f_force_measure && formconfig.f_force_measure.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_force_measure',false)">
             <label class="font_normal_body">{{getConfigLabelName('f_force_measure','三项强制措施')}}</label>
-            <input type="text" v-model="row.f_force_measure" v-show="false"
+            <input type="text" v-model="$refs.measure.selectedItems" v-show="false"
                    v-validate:f_force_measure=getConfigValidate("f_force_measure",false)>
             <v-select :value.sync="row.f_force_measure" v-model="row.f_force_measure"
-                      :options='forceMeasure' placeholder='三项强制措施'
-                      close-on-select></v-select>
+                      :options='forceMeasure' placeholder='三项强制措施' :multiple="true"
+                      v-ref:measure>
+            </v-select>
           </div>
         </div>
       </form>
@@ -472,9 +472,9 @@ let meterBookGen = function * (self) {
       }
     },
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'formconfig', 'onlyshowmust'],
-    ready () {
+    async ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
-      this.row = Object.assign(this.row, this.meter, {})
+      this.row = await Object.assign(this.row, this.meter, {})
 
       this.oldrow = this.row
       this.isdecimal = this.row.gasbrand.length > 0 ? this.row.gasbrand.f_isdecimal : '否'
@@ -483,6 +483,15 @@ let meterBookGen = function * (self) {
         this.ratioshow = true
       }
       co(meterBookGen(this))
+      this.$nextTick(() => {
+        console.log('this.row', this.row)
+        console.log('this.row.f_force_measure', this.row.f_force_measure)
+        if (this.row) {
+          if (this.row.f_force_measure[0]) {
+            this.row.f_force_measure = this.row.f_force_measure[0].split(',')
+          }
+        }
+      })
     },
     methods: {
       getConfigValidate (name, defaultVal) {

package/src/filiale/shexian/FilesManage/FileUserFiles.vue

@@ -618,28 +618,32 @@ let loadParamGem = async function (self) {
             }
           }
         }
+        console.log('stringValue', stringValue)
         return stringValue
       },
       getMeterType () {
         if (this.$refs.paged.$refs.criteria.model.f_meter_brand.length > 0) {
           this.meterstyles = [{label: '全部', value: ''}]
-          let condition = `f_meter_brand in (${this.appendCondition(this.$refs.paged.$refs.criteria.model.f_meter_brand)}) and ui.f_orgid like '${this.$login.f.orgid}%'`
-          let self = this
-          let load = new HttpResetClass()
-          load.load('POST', 'rs/sql/getMeterStyleAndBrand1', {
-            data: {
-              condition: condition,
-              groupname: 'f_meter_style'
-            }
-          }, {warnMsg: null, resolveMsg: null}).then((res) => {
-            for (let i = 0; i < res.data.length; i++) {
-              let dr = {}
-              dr.label = res.data[i].f_meter_style
-              dr.value = res.data[i].f_meter_style
-              // 气表类型
-              self.meterstyles.push(dr)
-            }
-          })
+          let con = this.appendCondition(this.$refs.paged.$refs.criteria.model.f_meter_brand)
+          if (con) {
+            let condition = `f_meter_brand in (${con}) and ui.f_orgid like '${this.$login.f.orgid}%'`
+            let self = this
+            let load = new HttpResetClass()
+            load.load('POST', 'rs/sql/getMeterStyleAndBrand1', {
+              data: {
+                condition: condition,
+                groupname: 'f_meter_style'
+              }
+            }, {warnMsg: null, resolveMsg: null}).then((res) => {
+              for (let i = 0; i < res.data.length; i++) {
+                let dr = {}
+                dr.label = res.data[i].f_meter_style
+                dr.value = res.data[i].f_meter_style
+                // 气表类型
+                self.meterstyles.push(dr)
+              }
+            })
+          }
         }
       },
       getAuthority () {

package/src/filiale/tongchuan/MeterMessage.vue

@@ -100,12 +100,6 @@
           }else {
             if (this.metermessage.gasmodel.length>0){
               console.log("打印型号",this.metermessage.gasmodel)
-              if (this.metermessage.gasmodel[0].f_meter_style.indexOf('流量计') !==-1||this.metermessage.gasmodel[0].f_type.indexOf('流量计') !==-1){
-                if (this.metermessage.f_meter_base > 500){
-                  this.$showAlert(`所选表品牌是流量计,新表底数不能大于500请重新输入新表底数`, 'warning', 3000)
-                  this.metermessage.f_meter_base = 0
-                }
-              }
             }
           }
         }

package/src/main.js

@@ -4,7 +4,7 @@ import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
 // import wenxi from './filiale/rizhao/sale'
-import FilialeSale from './filiale/zhongsheng/sale'
+import FilialeSale from './filiale/liaoyuan/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'

package/src/plugins/FileManageService.js

@@ -150,13 +150,15 @@ let FileManageService = {
       meter.f_fire_state = meter.f_fire_state1 ? '1' : '0'
       let forcemeasure = meter.f_force_measure
       meter.f_force_measure = ''
-      if (forcemeasure.length > 0) {
-        for (var c = 0; c < forcemeasure.length; c++) {
-          if (forcemeasure[c]) {
-            if (c !== forcemeasure.length - 1) {
-              meter.f_force_measure = meter.f_force_measure + forcemeasure[c] + ','
-            } else {
-              meter.f_force_measure = meter.f_force_measure + forcemeasure[c]
+      if (forcemeasure != undefined && Object.prototype.toString.call(forcemeasure) === '[object Array]') {
+        if (forcemeasure.length > 0) {
+          for (var c = 0; c < forcemeasure.length; c++) {
+            if (forcemeasure[c]) {
+              if (c !== forcemeasure.length - 1) {
+                meter.f_force_measure = meter.f_force_measure + forcemeasure[c] + ','
+              } else {
+                meter.f_force_measure = meter.f_force_measure + forcemeasure[c]
+              }
             }
           }
         }