safecheck-client 3.0.32 → 3.0.33-11

package/package.json

@@ -1,133 +1,133 @@
-{
-  "name": "safecheck-client",
-  "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.32",
-  "description": "安检模块 前端组件",
-  "author": "丁新 <417755458@qq.com>",
-  "license": "ISC",
-  "main": "src/index.js",
-  "keywords": [
-    "safecheck"
-  ],
-  "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",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/safecheck && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "hanwei": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.hanwei.conf.js",
-    "android": "node build/dev-android.js",
-    "unit": "karma start test/unit/karma.conf.js --single-run",
-    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh",
-    "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/product-hujiao"
-  },
-  "dependencies": {
-    "axios": "^0.27.2",
-    "benz-amr-recorder": "^1.1.3",
-    "browserslist": "^4.21.4",
-    "crypto-js": "^4.2.0",
-    "html2canvas": "^1.1.4",
-    "html2pdf.js": "^0.10.1",
-    "jspdf": "^2.3.1",
-    "less": "^4.2.0",
-    "mint-ui": "^1.0.2",
-    "node-libs-browser": "^2.2.1",
-    "pretty-error": "^4.0.0",
-    "vue": "^1.0.17",
-    "wavesurfer.js": "^3.3.3",
-    "xlsx": "^0.17.3"
-  },
-  "devDependencies": {
-    "babel-core": "^6.26.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",
-    "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": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.30.1",
-    "http-proxy-middleware": "^0.11.0",
-    "increase-memory-limit": "^1.0.7",
-    "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-phantomjs-launcher": "^1.0.2",
-    "karma-phantomjs-shim": "^1.4.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "less-loader": "^2.2.3",
-    "lolex": "^1.5.2",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "ol": "^4.6.4",
-    "phantomjs-prebuilt": "^2.1.3",
-    "proj4": "^2.2.1",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "sketch-vue3": "^1.0.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.2.76",
-    "system-phone": "1.2.100",
-    "telephone-clients": "1.1.27",
-    "terser-webpack-plugin-legacy": "^1.2.5",
-    "url-loader": "^0.5.7",
-    "vue-amap": "0.5.10",
-    "vue-client": "1.24.129",
-    "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-dev-server": "^2.9.7",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "weixin-js-sdk": "^1.2.0"
-  },
-  "directories": {
-    "doc": "docs",
-    "example": "examples",
-    "test": "test"
-  }
-}
+{
+  "name": "safecheck-client",
+  "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
+  "version": "3.0.33-11",
+  "description": "安检模块 前端组件",
+  "author": "丁新 <417755458@qq.com>",
+  "license": "ISC",
+  "main": "src/index.js",
+  "keywords": [
+    "safecheck"
+  ],
+  "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",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/safecheck && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "hanwei": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.hanwei.conf.js",
+    "android": "node build/dev-android.js",
+    "unit": "karma start test/unit/karma.conf.js --single-run",
+    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh",
+    "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/product-hujiao"
+  },
+  "dependencies": {
+    "axios": "^0.27.2",
+    "benz-amr-recorder": "^1.1.3",
+    "browserslist": "^4.21.4",
+    "crypto-js": "^4.2.0",
+    "html2canvas": "^1.1.4",
+    "html2pdf.js": "^0.10.1",
+    "jspdf": "^2.3.1",
+    "less": "^4.2.0",
+    "mint-ui": "^1.0.2",
+    "node-libs-browser": "^2.2.1",
+    "pretty-error": "^4.0.0",
+    "vue": "^1.0.17",
+    "wavesurfer.js": "^3.3.3",
+    "xlsx": "^0.17.3"
+  },
+  "devDependencies": {
+    "babel-core": "^6.26.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",
+    "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": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.30.1",
+    "http-proxy-middleware": "^0.11.0",
+    "increase-memory-limit": "^1.0.7",
+    "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-phantomjs-launcher": "^1.0.2",
+    "karma-phantomjs-shim": "^1.4.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "less-loader": "^2.2.3",
+    "lolex": "^1.5.2",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "ol": "^4.6.4",
+    "phantomjs-prebuilt": "^2.1.3",
+    "proj4": "^2.2.1",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "sketch-vue3": "^1.0.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.2.1-10",
+    "system-phone": "1.2.100",
+    "telephone-clients": "1.1.27",
+    "terser-webpack-plugin-legacy": "^1.2.5",
+    "url-loader": "^0.5.7",
+    "vue-amap": "0.5.10",
+    "vue-client": "1.24.93",
+    "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-dev-server": "^2.9.7",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "weixin-js-sdk": "^1.2.0"
+  },
+  "directories": {
+    "doc": "docs",
+    "example": "examples",
+    "test": "test"
+  }
+}

package/src/components/android/AndroidDefectDeal.vue

@@ -345,7 +345,7 @@
       </div>
       <div class="row">
         <div class="col-xs-2">
-          <p class="panel-title  text-left font" style="text-align: center">备注</p>
+          <p class="panel-title  text-left font" style="text-align: center">处理结果</p>
         </div>
         <div class="col-xs-9">
           <textarea class="input-font " v-model=deal.f_deal_remark style="width: 100%"></textarea>
@@ -486,10 +486,10 @@
       commitDealDefect() {
         //tag
         //tag)
-        if (!this.deal.f_deal_path) {
-          this.$showMessage('处理后照片必须上传')
-          return
-        }
+        // if (!this.deal.f_deal_path) {
+        //   this.$showMessage('处理后照片必须上传')
+        //   return
+        // }
         if (this.isNeedDealSign && !this.deal.f_dealsign_path) {
           this.$showMessage('签名必须上传')
           return

package/src/components/android/PhoneUpUserinfo.vue

@@ -17,6 +17,10 @@
           <label class="righttxt">用户名称:</label><input type="text" class="form-control rightipt"
                                                       v-model="userinfo.baseinfo.base.f_user_name" readonly/>
         </div>
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">身份证号:</label><input type="text" class="form-control rightipt"
+                                                      v-model="userinfo.baseinfo.base.f_idnumber" />
+        </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">用户状态:</label><input type="text" class="form-control rightipt" readonly
                                                       v-model="userinfo.baseinfo.base.f_user_state"/>
@@ -616,6 +620,7 @@
             let userinfoms = Object.assign({}, this.userinfo_old.baseinfo.base)
             // userinfoms.f_user_name=row.f_user_name
             userinfoms.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
+            userinfoms.f_idnumber = this.userinfo.baseinfo.base.f_idnumber
             userinfoms.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
             userinfoms.f_zuhu_phone = this.userinfo.baseinfo.base.f_zuhu_phone
             userinfoms.f_operator_record = Vue.user.name
@@ -680,6 +685,7 @@
             let userinfoms = Object.assign({}, this.userinfo_old.baseinfo.base)
             //userinfoms.f_user_name=row.f_user_name
             userinfoms.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
+            userinfoms.f_idnumber = this.userinfo.baseinfo.base.f_idnumber
             userinfoms.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
             userinfoms.f_zuhu_phone = this.userinfo.baseinfo.base.f_zuhu_phone
             userinfoms.f_operator_record = Vue.user.name

package/src/components/android/SafecheckOrderV.vue

@@ -1696,12 +1696,15 @@
             this.$dispatch('confirm')
           }else if(res.code == 710){
             this.$showMessage('上传照片失败,请检查网络是否正常！'+res.msg)
+            this.onlySave = true
             return
           }else if(res.code == 711){
             this.$showMessage('该安检单已被管理员调整，请联系管理员!')
+            this.onlySave = true
             return
           }else if(res.code == 712){
-            this.$showMessage('网络异常，请重新上传，多次上传失败请联系管理员!')
+            this.$showMessage('网络异常，请缓存后重新尝试上传，多次上传失败请联系管理员!')
+            this.onlySave = true
             return
           }
           else{

package/src/components/map/checkScreen.vue

@@ -227,7 +227,7 @@ export default {
         source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($需要定位人员$) != -1)`,
         userid: this.$login.f.id
       }, {resolveMsg: null, rejectMsg: null})
-      debugger
+
       let arr1 = await new HttpResetClass().load('GET', `/rs/safePsoition/getPosition`, {}, {
         resolveMsg: null,
         rejectMsg: null

package/src/components/planmanage/checkPlanList.vue

@@ -303,11 +303,11 @@
         this.model.search(args.condition, args.model, args.condValue)
       },
       checkStateChange(val){
-        if(val=='已检'){
-          this.checkResults=[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}]
-        }else{
+        if(val=='未检'){
           this.checkResults=[]
           this.$refs.paged.$refs.criteria.model.f_check_state=''
+        }else{
+          this.checkResults=[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}]
         }
       },
       //修改计划项状态为作废

package/src/components/planmanage/checkUserList.vue

@@ -111,6 +111,20 @@
                     >
                     </v-select>
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">街&emsp;&emsp;道:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_street"
+                      v-model="model.f_street"
+                      :options='$parent.$parent.streets'
+                      placeholder='请选择'
+                      condition="ua.f_street_id='{}'"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
                   <!--<div class="form-group col-sm-4" >
                     <label class="font_normal_body">小区名称:</label>
                     <input type="text" class="input_search" v-model="model.f_userinfo_code"
@@ -416,7 +430,8 @@
         checkAll:false,
         checkes:[],
         excelUserCondtion:false,
-        uploadCodeCondition:''
+        uploadCodeCondition:'',
+        streets:[]
       }
     },
     props:["selectplan","userlogin"],
@@ -452,6 +467,7 @@
       },
       loadpage(){
         this.select_search()
+        this.select_street()
         this.Mreadibook()
         this.getSliceArea()
       },
@@ -523,7 +539,10 @@
           value: ''
         }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
 
-        this.userStates=this.$appdata.getParam('安检用户状态') ? [...this.$appdata.getParam('安检用户状态')] : []
+        this.userStates=this.$appdata.getParam('安检用户状态') ? [{
+          label: '全部',
+          value: ''
+        },...this.$appdata.getParam('安检用户状态')] : [{label: '全部', value: ''}]
         this.gasproperties=this.$appdata.getParam('用气性质') ? [{
           label: '全部',
           value: ''
@@ -548,6 +567,19 @@
           //tag)
         })
       },
+      select_street(){
+        //tag
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"id,f_street",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}'`}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          //tag)
+          if(res.data.length>0){
+            this.streets=[]
+            this.streets.push({label:"全部",value:""})
+            res.data.forEach((result)=>{
+              this.streets.push({label:result.f_street,value:result.id})
+            })
+          }
+        })
+      },
       //获取抄表册
       async Mreadibook(){
         this.cbc=[]

package/src/components/rongcheng/AspiratedDevices.vue

@@ -34,7 +34,7 @@
                             v-if="row.type == 'date'"
                             v-show="row.isshow"
                             :disabled-days-of-Week="[]"
-                            :format="'yyyy-MM-dd 00:00:00'"
+                            :format=row.format
                             :show-reset-button="reset" readonly="readonly">
                 </datepicker>
               </div>
@@ -206,6 +206,12 @@
         f_issue_reading:{},
         //上期表读数
         f_prior_reading:{},
+        // 安装日期
+        f_install_date:{},
+        // 使用年限
+        f_use_limit:{},
+        // 到期日期
+        f_scrap_date:{},
         // 气量异常差值允许误差
         gasDeviation: (
           function (_this) {
@@ -625,6 +631,16 @@
         }
 
       },
+      // 计算到期日期
+      getscrapNumber() {
+        //tag
+        if(!this.f_items[this.f_install_date.index].f_item_value || !this.f_items[this.f_use_limit.index].f_item_value ){
+          return
+        }
+        let data = new Date(this.f_items[this.f_install_date.index].f_item_value)
+        data.setFullYear(data.getFullYear() + parseInt(this.f_items[this.f_use_limit.index].f_item_value))
+        this.f_items[this.f_scrap_date.index].f_item_value = data.toISOString().split('T')[0];
+      },
       readmeter(){
         if(!this.f_items[this.f_issue_reading.index].f_item_value && parseFloat(this.f_items[this.f_issue_reading.index].f_item_value).toString() == "NaN"){
           this.$showMessage("请输入本期表读数！")
@@ -738,6 +754,7 @@
           isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
           readonly: this.config[this.device.device].items[item].readonly == true?true:false,
           remark: this.config[this.device.device].items[item].remark ? this.config[this.device.device].items[item].remark : '',
+          format: this.config[this.device.device].items[item].format ? this.config[this.device.device].items[item].format : 'yyyy-MM-dd 00:00:00',
           f_path: '',
           tooltip:'',
           f_live_dispose:'',
@@ -871,6 +888,22 @@
               }
             }
           }
+          if (this.f_items[f].f_item_name == '安装日期') {
+            //tag)
+            this.f_install_date.index = f
+            this.$watch('f_items[' + f + '].f_item_value', function () {
+              this.getscrapNumber()
+            })
+          }else if (this.f_items[f].f_item_name == '使用年限') {
+            //tag)
+            this.f_use_limit.index = f
+            this.$watch('f_items[' + f + '].f_item_value', function () {
+              this.getscrapNumber()
+            })
+          }else if (this.f_items[f].f_item_name == '到期日期') {
+            //tag)
+            this.f_scrap_date.index = f
+          }
         }
         //tag)
         this.$set('piece.f_items',this.f_items)

package/src/components/rongcheng/DefectPaper.vue

@@ -407,7 +407,7 @@
         defectType:[],
         userTypes:[{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
         defectLeave:'',
-        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'}],
+        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'},{label: '其他隐患'}],
         thead: '',
         headData: ['入户状态','用户名','用户电话','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','一级隐患数','一级隐患','二级隐患数','二级隐患','三级隐患数','三级隐患','其他隐患','隐患内容'],
         bodyData: ['f_entry_status','f_user_name','f_user_phone','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_fist_count','f_fist_content','f_second_count','f_second_content','f_third_count','f_third_content','f_other_count','f_defect_content'],
@@ -468,6 +468,9 @@
           if(this.defectLeave=='三级隐患'){
             args.condition += ` and f_third_count > 0`
           }
+          if(this.defectLeave=='其他隐患'){
+            args.condition += ` and f_other_count > 0`
+          }
         }
         if(this.defectType.length>0){
           args.condition += ` and (`

package/src/components/rongcheng/SafecheckDevices.vue

@@ -34,7 +34,7 @@
                             v-if="row.type == 'date'"
                             v-show="row.isshow"
                             :disabled-days-of-Week="[]"
-                            :format="'yyyy-MM-dd 00:00:00'"
+                            :format=row.format
                             :show-reset-button="reset" readonly="readonly">
                 </datepicker>
               </div>
@@ -222,6 +222,12 @@
         f_issue_reading:{},
         //上期表读数
         f_prior_reading:{},
+        // 安装日期
+        f_install_date:{},
+        // 使用年限
+        f_use_limit:{},
+        // 到期日期
+        f_scrap_date:{},
         // 气量异常差值允许误差
         gasDeviation: (
           function (_this) {
@@ -656,6 +662,16 @@
         }
 
       },
+      // 计算到期日期
+      getscrapNumber() {
+        //tag
+        if(!this.f_items[this.f_install_date.index].f_item_value || !this.f_items[this.f_use_limit.index].f_item_value ){
+          return
+        }
+        let data = new Date(this.f_items[this.f_install_date.index].f_item_value)
+        data.setFullYear(data.getFullYear() + parseInt(this.f_items[this.f_use_limit.index].f_item_value))
+        this.f_items[this.f_scrap_date.index].f_item_value = data.toISOString().split('T')[0];
+      },
       readmeter(){
         if(!this.f_items[this.f_issue_reading.index].f_item_value && parseFloat(this.f_items[this.f_issue_reading.index].f_item_value).toString() == "NaN"){
           this.$showMessage("请输入本期表读数！")
@@ -769,6 +785,7 @@
           isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
           readonly: this.config[this.device.device].items[item].readonly == true?true:false,
           remark: this.config[this.device.device].items[item].remark ? this.config[this.device.device].items[item].remark : '',
+          format: this.config[this.device.device].items[item].format ? this.config[this.device.device].items[item].format : 'yyyy-MM-dd 00:00:00',
           f_path: '',
           f_second_path:'',
           tooltip:'',
@@ -903,6 +920,22 @@
               }
             }
           }
+          if (this.f_items[f].f_item_name == '安装日期') {
+            //tag)
+            this.f_install_date.index = f
+            this.$watch('f_items[' + f + '].f_item_value', function () {
+              this.getscrapNumber()
+            })
+          }else if (this.f_items[f].f_item_name == '使用年限') {
+            //tag)
+            this.f_use_limit.index = f
+            this.$watch('f_items[' + f + '].f_item_value', function () {
+              this.getscrapNumber()
+            })
+          }else if (this.f_items[f].f_item_name == '到期日期') {
+            //tag)
+            this.f_scrap_date.index = f
+          }
         }
         //tag)
         this.$set('piece.f_items',this.f_items)

package/src/components/rongcheng/SafecheckOrderV.vue

@@ -1795,6 +1795,7 @@ export default {
       this.$set('data.f_idnumber', this.item.f_idnumber)
       this.$set('data.f_comments', this.item.f_comments)
       this.$set('data.f_userproperties', this.item.f_userproperties)
+      this.$set('data.f_usetype', this.item.f_plan_meters[0].f_usetype)
       // this.$set('data.f_user_inhome_time', this.item.f_user_inhome_time)
       // this.$set('data.f_user_check_time', this.item.f_user_check_time)
       // this.$set('data.f_user_spare_phone', this.item.f_user_spare_phone)