sale-client 3.6.495 → 3.6.497

package/package.json

@@ -1,120 +1,120 @@
-{
-  "name": "sale-client",
-  "version": "3.6.495",
-  "description": "收费模块前台组件",
-  "main": "src/index.js",
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "webpack-dev-server --config ./build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/product.git"
-  },
-  "dependencies": {
-    "crypto-js": "^4.1.1",
-    "examples": "^0.1.0",
-    "js-file-download": "0.4.12",
-    "less-loader": "^2.2.3",
-    "qrcodejs2": "^0.0.2",
-    "vue": "^1.0.17",
-    "webpack-dev-server": "^2.11.5",
-    "vue-client": "1.24.162",
-    "yarn": "^1.22.10"
-  },
-  "devDependencies": {
-    "address-client": "3.2.111-2",
-    "axios": "0.15.3",
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "co": "^4.6.0",
-    "compression-webpack-plugin": "1.1.2",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^3.19.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^3.0.0",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "terser-webpack-plugin-legacy": "^1.2.5",
-    "file-loader": "^0.8.4",
-    "filemanager-webpack-plugin": "^2.0.5",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.96",
-    "system-clients": "3.3.2",
-    "less": "^2.7.3",
-    "manage-client": "3.1.8-88",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "moment": "2.24.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "qrcodejs2": "0.0.2",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "url-loader": "^0.5.7",
-    "vue-clipboard2": "0.3.1",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^3.12.0",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "webpack-parallel-uglify-plugin": "^1.0.0",
-    "weixin-js-sdk": "^1.2.0"
-  },
-  "keywords": [
-    "selling-clients"
-  ],
-  "author": "张桥",
-  "license": "ISC",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  }
-}
+{
+  "name": "sale-client",
+  "version": "3.6.497",
+  "description": "收费模块前台组件",
+  "main": "src/index.js",
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "webpack-dev-server --config ./build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/product.git"
+  },
+  "dependencies": {
+    "crypto-js": "^4.1.1",
+    "examples": "^0.1.0",
+    "js-file-download": "0.4.12",
+    "less-loader": "^2.2.3",
+    "qrcodejs2": "^0.0.2",
+    "vue": "^1.0.17",
+    "webpack-dev-server": "^2.11.5",
+    "vue-client": "1.24.162",
+    "yarn": "^1.22.10"
+  },
+  "devDependencies": {
+    "address-client": "3.2.111-2",
+    "axios": "0.15.3",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "co": "^4.6.0",
+    "compression-webpack-plugin": "1.1.2",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^3.19.0",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-friendly-formatter": "^3.0.0",
+    "eslint-loader": "^1.7.1",
+    "eslint-plugin-html": "^3.0.0",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-node": "^5.2.0",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "terser-webpack-plugin-legacy": "^1.2.5",
+    "file-loader": "^0.8.4",
+    "filemanager-webpack-plugin": "^2.0.5",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "ldap-clients": "3.0.96",
+    "system-clients": "3.3.2",
+    "less": "^2.7.3",
+    "manage-client": "3.1.8-88",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "moment": "2.24.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "qrcodejs2": "0.0.2",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "url-loader": "^0.5.7",
+    "vue-clipboard2": "0.3.1",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^3.12.0",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "webpack-parallel-uglify-plugin": "^1.0.0",
+    "weixin-js-sdk": "^1.2.0"
+  },
+  "keywords": [
+    "selling-clients"
+  ],
+  "author": "张桥",
+  "license": "ISC",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  }
+}

package/src/components/FilesManageNew/MeterinfoTest.vue

@@ -21,8 +21,7 @@
                v-if="getConfigShowItem('f_defendcard',false)">
             <label class="font_normal_body">防盗卡号1</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard"
-                   v-validate:f_defendcard=getConfigValidate("f_defendcard",false)
-                   :value.sync="row.f_defendcard"
+                   v-validate:f_defendcard="getConfigValidate('f_defendcard',false)"
                    placeholder='防盗卡号1' >
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_defendcard_two.required ? 'has-error' : '']"
@@ -30,8 +29,7 @@
                v-if="getConfigShowItem('f_defendcard_two',false)">
             <label class="font_normal_body">防盗卡号2</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard_two"
-                   v-validate:f_defendcard_two=getConfigValidate("f_defendcard_two",false)
-                   :value.sync="row.f_defendcard_two"
+                   v-validate:f_defendcard_two="getConfigValidate('f_defendcard_two',false)"
                    placeholder='防盗卡号2' >
           </div>
           <div class="col-sm-4 form-group" v-if="getConfigShowItem('f_meter_base')"
@@ -147,7 +145,7 @@
                v-show="(formconfig && formconfig.f_aroundmeter && formconfig.f_aroundmeter.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_aroundmeter')">
             <input type="text" v-show="false" v-model="row.f_aroundmeter"
-                   v-validate:f_aroundmeter=getConfigValidate("f_aroundmeter",false)>
+                   v-validate:f_aroundmeter="getConfigValidate('f_aroundmeter',false)">
             <label for="gasmodel" class="font_normal_body w2" style="width: auto;letter-spacing: 2em;margin-right: -2em;margin-left: -2em;">&ensp;{{getConfigLabelName('f_aroundmeter','表向')}}</label>
             <v-select :value.sync="row.f_aroundmeter" :options='aroundmeters'
                       :placeholder="getConfigPlaceholder('f_aroundmeter','表向')"
@@ -160,19 +158,18 @@
             <label for="f_gas_person" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em"
                    class="font_normal_body">&ensp;{{getConfigLabelName('f_gas_person','通气人')}}</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_gas_person"
-                   v-validate:f_gas_person=getConfigValidate("f_gas_person",false)
-                   placeholder='通气人'></input>
+                   v-validate:f_gas_person="getConfigValidate('f_gas_person',false)"
+                   placeholder='通气人'>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_gas_date.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_gas_date && formconfig.f_gas_date.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_gas_date')">
             <input type="text" v-model="$refs.f_gas_date.value" v-show="false"
-                   v-validate:f_gas_date=getConfigValidate("f_gas_date",false)>
+                   v-validate:f_gas_date="getConfigValidate('f_gas_date',false)">
             <label for="f_gas_date" class="font_normal_body">&ensp;{{getConfigLabelName('f_gas_date','通气日期')}}</label>
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
                         v-ref:f_gas_date
-                        :value.sync="row.f_gas_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
             ></datepicker>
           </div>
@@ -182,16 +179,16 @@
                v-if="getConfigShowItem('f_gas_date')">
             <label for="f_position" class="font_normal_body"  title="参数:安装位置">&ensp;{{getConfigLabelName('f_position','安装位置')}}</label>
             <input type="text" v-model="row.f_position" v-show="false"
-                   v-validate:f_position=getConfigValidate("f_position",false)>
+                   v-validate:f_position="getConfigValidate('f_position',false)">
             <v-select :value.sync="row.f_position" v-model="row.f_position"
                       :options='positions' placeholder='安装位置'
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group"  v-show="false">
             <label for="f_remanent_gas" class="font_normal_body">剩余气量</label>
-            <input type="number" class="input_search" style="width:60%" style="width:60%" v-model="row.f_remanent_gas"
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_remanent_gas"
                    placeholder='剩余气量'
-                   :disabled="f_userinfo_id"></input>
+                   :disabled="f_userinfo_id">
             <!--<button type="button" name="button" class="btn btn-link" @click="modefiy('f_remanent_gas')" v-if="f_userinfo_id">修改</button>-->
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_install_person.required ? 'has-error' : '']"
@@ -199,7 +196,7 @@
                v-if="getConfigShowItem('f_install_person')">
             <label for="f_install_person" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_install_person','安装人')}}</label>
             <input type="text" v-model="row.f_install_person" v-show="false"
-                   v-validate:f_install_person=getConfigValidate("f_install_person",false)>
+                   v-validate:f_install_person="getConfigValidate('f_install_person',false)">
             <v-select :value.sync="row.f_install_person" v-model="row.f_install_person"
                       :options='installperson' placeholder='安装人'
                       close-on-select></v-select>
@@ -209,10 +206,9 @@
                v-if="getConfigShowItem('f_subscribe_date')">
             <label for="f_subscribe_date" class="font_normal_body">&ensp;{{getConfigLabelName('f_subscribe_date','预约时间')}}</label>
             <input type="text" v-model="row.f_subscribe_date" v-show="false"
-                   v-validate:f_subscribe_date=getConfigValidate("f_subscribe_date",false)>
+                   v-validate:f_subscribe_date="getConfigValidate('f_subscribe_date',false)">
             <datepicker style="width:60%" placeholder="预约通气时间"
                         v-model="row.f_subscribe_date"
-                        :value.sync="row.f_subscribe_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
             ></datepicker>
           </div>
@@ -220,7 +216,7 @@
                v-if="getConfigShowItem('f_meter_book_num')">
             <label for="f_position" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_meter_book_num','抄表册')}}</label>
             <input type="text" v-model="row.f_meter_book_num" v-show="false"
-                   v-validate:f_meter_book_num=getConfigValidate("f_meter_book_num",false)>
+                   v-validate:f_meter_book_num="getConfigValidate('f_meter_book_num',false)">
             <v-select :value.sync="row.f_meter_book_num" v-model="row.f_meter_book_num"
                       :options='meterbookoptions' placeholder='抄表册'
                       close-on-select></v-select>
@@ -229,14 +225,12 @@
                v-show="(formconfig && formconfig.f_install_date && formconfig.f_install_date.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_install_date')">
             <input type="text" v-model="row.f_install_date" v-show="false"
-                   v-validate:f_install_date=getConfigValidate("f_install_date",false)>
+                   v-validate:f_install_date="getConfigValidate('f_install_date',false)">
             <label for="f_install_date" class="font_normal_body">&ensp;{{getConfigLabelName('f_install_date','安装日期')}}</label>
             <datepicker style="width:60%" id="startDate" placeholder="安装日期" width='100%'
                         v-model="row.f_install_date"
-                        :value.sync="row.f_install_date"
-                        class="datepicker"
-                        v-ref:f_install_date
                         :format="'yyyy-MM-dd HH:mm:ss'"
+                        v-ref:f_install_date
                         :show-reset-button="true">
             </datepicker>
           </div>
@@ -245,7 +239,7 @@
                v-if="getConfigShowItem('f_adjustable')">
             <label for="f_adjustable" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_adjustable','调压箱')}}</label>
             <input type="text" v-model="row.f_adjustable" v-show="false"
-                   v-validate:f_adjustable=getConfigValidate("f_adjustable",false)>
+                   v-validate:f_adjustable="getConfigValidate('f_adjustable',false)">
             <v-select :value.sync="row.f_adjustable" :options='adjustables' placeholder='调压箱' close-on-select
                       v-model='row.f_adjustable' :search='true'></v-select>
           </div>
@@ -254,11 +248,9 @@
                v-if="getConfigShowItem('f_hand_date')">
             <label for="f_hand_date" class="font_normal_body">&ensp;{{getConfigLabelName('f_hand_date','上次抄表')}}</label>
             <input type="text" v-model="row.f_hand_date" v-show="false"
-                   v-validate:f_hand_date=getConfigValidate("f_hand_date",false)>
+                   v-validate:f_hand_date="getConfigValidate('f_hand_date',false)">
             <datepicker style="width:60%" id="f_hand_date" placeholder="上次抄表日期"
                         v-model="row.f_hand_date"
-                        :value.sync="row.f_hand_date"
-                        class="datepicker"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true">
             </datepicker>
@@ -268,8 +260,7 @@
                v-if="getConfigShowItem('f_price_ratio')">
             <label for="f_ratio" class="font_normal_body" style="width: auto;letter-spacing: 2em;margin-right: -2em;margin-left: -2em">&ensp;{{getConfigLabelName('f_price_ratio','比率')}}</label>
             <input type="number" class="input_search" style="width:60%"  v-model="row.f_price_ratio"
-                   :value.sync="row.f_price_ratio"
-                   v-validate:f_price_ratio=getConfigValidate("f_price_ratio",false)
+                   v-validate:f_price_ratio="getConfigValidate('f_price_ratio',false)"
                    placeholder='比率'>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_scrap_date.required ? 'has-error' : '']"
@@ -277,11 +268,9 @@
                v-if="getConfigShowItem('f_scrap_date')">
             <label for="f_scrap_date" class="font_normal_body">&ensp;{{getConfigLabelName('f_scrap_date','报废日期')}}</label>
             <input type="text" v-model="row.f_scrap_date" v-show="false"
-                   v-validate:f_scrap_date=getConfigValidate("f_scrap_date",false)>
+                   v-validate:f_scrap_date="getConfigValidate('f_scrap_date',false)">
             <datepicker style="width:60%" id="ScrapDate" placeholder="报废日期" width='100%'
                         v-model="row.f_scrap_date"
-                        :value.sync="row.f_scrap_date"
-                        class="datepicker"
                         :format="'yyyy-MM-dd'"
                         :show-reset-button="true">
             </datepicker>
@@ -296,7 +285,7 @@
                v-if="getConfigShowItem('f_garbage_fee')">
             <label for="gasmodel" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_garbage_fee','垃圾费')}}</label>
             <input type="text" v-model="row.f_garbage_fee" v-show="false"
-                   v-validate:f_garbage_fee=getConfigValidate("f_garbage_fee",false)>
+                   v-validate:f_garbage_fee="getConfigValidate('f_garbage_fee',false)">
             <v-select :value.sync="row.f_garbage_fee" :options='garbagefee' placeholder='垃圾费' close-on-select
                       :value-single="true"
                       v-model='row.f_garbage_fee'></v-select>
@@ -306,7 +295,7 @@
                v-if="getConfigShowItem('f_inputtor')">
             <label class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_inputtor','抄表员')}}</label>
             <input type="text" v-model="row.f_inputtor" v-show="false"
-                   v-validate:f_inputtor=getConfigValidate("f_inputtor",false)>
+                   v-validate:f_inputtor="getConfigValidate('f_inputtor',false)">
             <v-select :value.sync="row.f_inputtor" v-model='row.f_inputtor'
                       style="width:60%"
                       :options='inputtores' placeholder='抄表员'
@@ -318,7 +307,7 @@
                v-if="getConfigShowItem('f_usetype')">
             <label for="f_usetype" class="font_normal_body" title="参数:使用类型">&ensp;{{getConfigLabelName('f_usetype','使用类型')}}</label>
             <input type="text" v-model="row.f_usetype" v-show="false"
-                   v-validate:f_usetype=getConfigValidate("f_usetype",false)>
+                   v-validate:f_usetype="getConfigValidate('f_usetype',false)">
             <v-select :value.sync="row.f_usetype" v-model="row.f_usetype"
                       :options='usetype' placeholder='使用类型'
                       close-on-select></v-select>
@@ -328,7 +317,7 @@
                v-if="getConfigShowItem('f_usestate')">
             <label for="f_position" class="font_normal_body" title="参数:使用状态">&ensp;{{getConfigLabelName('f_usestate','使用状态')}}</label>
             <input type="text" v-model="row.f_usestate" v-show="false"
-                   v-validate:f_usestate=getConfigValidate("f_usestate",false)>
+                   v-validate:f_usestate="getConfigValidate('f_usestate',false)">
             <v-select :value.sync="row.f_usestate" v-model="row.f_usestate"
                       :options='usestate' placeholder='使用状态'
                       close-on-select></v-select>
@@ -339,8 +328,8 @@
             <label for="f_userfiles_address"
                    class="font_normal_body">&ensp;{{getConfigLabelName('f_userfiles_address','安装地址')}}</label>
             <input type="text" class="input_search" style="width:80%" v-model="row.f_userfiles_address"
-                   v-validate:f_userfiles_address=getConfigValidate("f_userfiles_address",false)
-                   placeholder='安装地址'></input>
+                   v-validate:f_userfiles_address="getConfigValidate('f_userfiles_address',false)"
+                   placeholder='安装地址'>
           </div>
           <div  class="col-sm-4 form-group" :class="[$m.f_alarm_code.required ? 'has-error' : '']"
                 v-show="(formconfig && formconfig.f_alarm_code && formconfig.f_alarm_code.required) || !onlyshowmust"
@@ -348,15 +337,15 @@
             <label for="f_alarm_code"
                    class="font_normal_body">&ensp;{{getConfigLabelName('f_alarm_code','报警器编码')}}</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_alarm_code"
-                   v-validate:f_alarm_code=getConfigValidate("f_alarm_code",false)
-                   placeholder='报警器编码'></input>
+                   v-validate:f_alarm_code="getConfigValidate('f_alarm_code',false)"
+                   placeholder='报警器编码'>
           </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-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>
@@ -658,7 +647,7 @@ let meterBookGen = function * (self) {
         }
       },
       'row.f_user_type' (val) {
-        if (val.length === 1) {
+        if (val && val.length === 1) {
           if (val[0] === '非民用') {
             this.showindustry = true
           } else {