sale-client 3.5.5 → 3.5.7-dg

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/build/dev-server.js

@@ -10,16 +10,16 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://127.0.0.1:8080',bendi1 = 'http://121.36.106.17:8400/'
+var bendi = 'http://192.168.50.4:8400/', bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
-var fuwu = 'http://192.168.50.4: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/'
-//铜川测试
+// 铜川测试
 // var fuwu = 'http://61.134.55.234:9999/'
 // var fuwu = 'http://60.222.250.39:8300/'
-//韶关
+// 韶关
 // var fuwu = 'http://119.146.1.106:8300/'
 // 巩义测试服务
 // var fuwu = 'http://192.168.0.227:8400'
@@ -54,7 +54,7 @@ var proxyTable = {
   '/rs/logic/getSaleInitData': {
     target: fuwu
   },
-  '/invoice':{
+  '/invoice': {
     target: fuwu
   },
   // 用户登录服务地址
@@ -95,7 +95,7 @@ var proxyTable = {
     target: fuwu
   },
   '/webmeter': {
-    target: 'http://192.168.50.4:8450'
+    target: fuwu
   },
   '/rs': {
     // target: 'http://192.168.30.63:8081/'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.5",
+  "version": "3.5.7-dg",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
     "yarn": "^1.22.10"
   },
   "devDependencies": {
-    "address-client": "3.2.27",
+    "address-client": "3.2.29",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
@@ -86,9 +86,9 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.0-2",
+    "system-clients": "3.2.25",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.52",
+    "vue-client": "1.24.67",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/components/FilesManage/FileUserFiles.vue

@@ -42,6 +42,7 @@
                           class="form-group button-range">
                     <!--<button class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.showFileInfo()">查看批量状态-->
                     <!--</button>-->
+                    <button class="button_search button_spacing" type="button" @click="$parent.$parent.goChargeManage()">去收费</button>
 
                     <button @click="search(), $parent.$parent.clean()" class="button_search button_spacing"
                             style="float: right">查询
@@ -57,8 +58,6 @@
                     <button @click="$parent.$parent.importFile" class="button_export button_spacing"
                             style="float: right" v-if="false">导入
                     </button>
-                    <button  class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载
-                    </button>
                     <!--                    <button class="button_search" style="width: 90px" @click=" $parent.$parent.selectaddress()">选择地址</button>-->
                     <button @click="$parent.$parent.xiaohu()"
                             class="button_delete button_spacing"
@@ -66,6 +65,7 @@
                             v-if="$parent.$parent.rows  && $parent.$parent.rows.length > 1 && this.$login.r.includes('批量销户')">
                       批量销户
                     </button>
+                    <import-excel v-if="$parent.$parent.bacthPin === '销户导入'" template-btn-name= "销户模板" template-name= "销户模板" btn-name="导入销户" logic-name="batchpinusers" import-json="pinuser.json"></import-excel>
                     <button  @click="$parent.$parent.bulkOperations('批量销户', 'batch-cancellation')"
                             class="button_delete button_spacing"
                             style="float: right"
@@ -228,7 +228,7 @@
                   </div>
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
-                          class="form-group" v-if="titleShow">
+                          class="form-group" >
                     <label class="font_normal_body">使用类型</label>
                     <v-select :options='$parent.$parent.useoptions' :search='true'
                               :value.sync="model.f_usetype"
@@ -238,7 +238,7 @@
                   </div>
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
-                          class="form-group" v-if="titleShow">
+                          class="form-group" >
                     <label class="font_normal_body">用户等级</label>
                     <v-select :options='$parent.$parent.userlevel' :search='true'
                               :value.sync="model.userlevel"
@@ -248,7 +248,7 @@
                   </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
-                    class="form-group" v-if="titleShow">
+                    class="form-group" >
                     <label class="font_normal_body">工业备注</label>
                     <v-select :options='$parent.$parent.industrycomments' :value.sync="model.f_gongye_type"
                               close-on-select condition="f_gongye_type='{}'"
@@ -331,7 +331,7 @@
                   <th v-if="!$parent.$parent.$parent.createFile">
                     <nobr>状态</nobr>
                   </th>
-                  <th v-if="titleShow">
+                  <th >
                     <nobr>用户等级</nobr>
                   </th>
                   <!--<th>-->
@@ -362,7 +362,7 @@
                 <td style="text-align: center;">{{row.f_whether_hairpin}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_userfiles_address}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_user_state}}</td>
-                <td style="text-align: center;" v-if="titleShow">{{row.f_user_level}}</td>
+                <td style="text-align: center;" >{{row.f_user_level}}</td>
                 <td style="text-align: center;">
                   <button type="button" name="button" class="button_search-2 button_spacing width-60"
                           v-if="row.f_user_state === '正常' || row.f_user_state==='预备'"
@@ -405,9 +405,11 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
-    <modal :show.sync="batchMeterShow" width="500px" title="文件导入" v-ref:modal large backdrop="false">
+    <modal :show.sync="batchMeterShow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <button  class="button_clear btn-gn"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="downloadFiles()">模板下载
+        </button>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>
@@ -503,6 +505,7 @@ let loadParamGem = async function (self) {
           createType: ['address', 'area'],  // 建档方式： address-地址建档  area-小区建档
           hasLimit: true
         },
+        bacthPin: '',
         model: new PagedList('rs/sql/filemanage_getUserfies', 30, {orderitem: '"f_userinfo_id DESC"'}),
         row: null, // 选择一条客户信息，对其进行修改
         areainfo: null, // 小区批量建档使用的数据
@@ -581,6 +584,7 @@ let loadParamGem = async function (self) {
         newdata: {},
         resdata: '',
         resshow: false,
+        batchpinshow: false, // 导入销户
         titleShow: true, //是否显示部分档案信息类的筛选框
         useoptions: this.$appdata.getParam('使用类型'),
 
@@ -590,6 +594,7 @@ let loadParamGem = async function (self) {
     ready () {
       loadParamGem(this)
       this.titleShow = this.$appdata.getSingleValue('是否显示筛选框') == null? true : this.$appdata.getSingleValue('是否显示筛选框')
+      this.getAuthority()
     },
     compiled () {
       window.onresize = () => {
@@ -599,6 +604,11 @@ let loadParamGem = async function (self) {
       }
   },
     methods: {
+      getAuthority () {
+        if (this.$login.r.find(value => value == '销户导入')) {
+          this.bacthPin = '销户导入'
+        }
+      },
       getRes (obj) {
         console.log("-----------------")
         this.orgcondition = obj
@@ -848,6 +858,9 @@ let loadParamGem = async function (self) {
       importFile () {
         this.show = true
       },
+      pin () {
+        this.batchpinshow = true
+      },
       clear () {
         Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
           this.$refs.paged.$refs.criteria.model[key] = []

package/src/components/FilesManage/MeterinfoTest.vue

@@ -43,7 +43,7 @@
             <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
                    v-validate:brand='{required: true }'>
             <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' v-ref:brand></v-select>
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
             <label for="gasmodel" class="font_normal_body">气表型号</label>
@@ -51,7 +51,7 @@
                    v-validate:model='{required: true }'>
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
                       close-on-select
-                      v-model='row.gasmodel' :disabled='row.gasbrand.length === 0 ' v-ref:model></v-select>
+                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
@@ -185,7 +185,8 @@
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">表具使用年限</label>
-            <input type="number" class="input_search" style="width:60%" v-model="fireinfo.f_use_limit"
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"
+                   :value.sync="row.f_use_limit"
                    placeholder='表具使用年限' >
           </div>
           <div class="col-sm-4 form-group">
@@ -202,6 +203,7 @@
             <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>
@@ -565,10 +567,10 @@
         templat: '' //  临时纬度
       }
     },
-    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id','overdueset'],
+    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
-      this.row = Object.assign(this.row, this.meter, {})
+      this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
       if(this.row.f_meter_classify){
         if(this.row.f_meter_classify==='物联网表'){
           this.isiot=true
@@ -586,6 +588,16 @@
       co(meterBookGen(this))
     },
     methods: {
+      gasDateChange () {
+        if (!this.row.f_scrap_date && this.row.f_gas_date) {
+          if (this.row.f_use_limit) {
+            let date = new Date(this.row.f_gas_date)
+            let year = date.getFullYear() + (this.row.f_use_limit / 1)
+            this.$set('row.f_scrap_date', year + this.row.f_gas_date.slice(4))
+
+          }
+        }
+      },
       // 获取集中器下拉框
       async getConcentrators () {
         let condition = {
@@ -795,7 +807,6 @@
           this.ratioshow = false
         }
       }
-
     },
     computed: {
 

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -106,6 +106,13 @@
             <input type="text" v-model="baseinfo.base.f_zuhu_phone" class="input_search" style="width:60%"
                    placeholder="租户电话">
           </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-8 form-group">
+            <label for="f_zuhu_idnumber" class="font_normal_body">租户身份证</label>
+            <input type="text" v-model="baseinfo.base.f_zuhu_idnumber" class="input_search" style="width:80%"
+                   placeholder="租户身份证">
+          </div>
           <div style="" class="col-sm-4 form-group">
             <label for="f_is_mgq" class="font_normal_body ">&ensp;付款类型</label>
             <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_cost_type"  v-model="baseinfo.base.f_cost_type"
@@ -127,12 +134,12 @@
           </div>
         </div>
         <div class="row">
-<!--          <div style="" class="col-sm-4 form-group">-->
-<!--            <label for="f_user_level" class="font_normal_body ">&ensp;用户等级</label>-->
-<!--            <v-select :value.sync="baseinfo.base.f_user_level" :search="false" :value-single="true"-->
-<!--                      :options='userlevel' placeholder='用户等级' close-on-select>-->
-<!--            </v-select>-->
-<!--          </div>-->
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_user_level" class="font_normal_body ">&ensp;用户等级</label>
+            <v-select :value.sync="baseinfo.base.f_user_level" :search="false" :value-single="true"
+                      :options='userlevel' placeholder='用户等级' close-on-select>
+            </v-select>
+          </div>
           <div class="col-sm-4 form-group">
             <label for="f_user_nature" class="font_normal_body" title="用户性质">&ensp;用气类型</label>
             <input type="text" v-show="false" v-model="baseinfo.base.f_user_nature">

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -17,7 +17,7 @@
       </div>
 
       <div style="height: auto;width: 100%">
-        <file-user-meter-info :meterinfo.sync="data.meterinfo" :f_filialeid="f_filialeid" :metervalid.sync="meterInfo" :overdueset="overdueset"
+        <file-user-meter-info :meterinfo.sync="data.meterinfo" :f_filialeid="f_filialeid" :metervalid.sync="meterInfo" :overdueset="overdueset" :curuser="row"
                          :f_userinfo_id="data.baseinfo.base.f_userinfo_id" :addressinfo="data.addressinfo" :baseinfo.sync="data.baseinfo.base" v-ref:meter></file-user-meter-info>
       </div>
 
@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
@@ -102,6 +102,7 @@
       </footer>
     </modal>
   </div>
+  <work-busy :is-busy="seaching"></work-busy>
 </template>
 
 <script>
@@ -150,6 +151,7 @@ export default {
       data: {
         baseinfo: {
           base: {
+            f_user_name: '',
             f_user_state: '',
             f_credentials: '',
             f_cost_type: '',
@@ -209,7 +211,8 @@ export default {
       },
       // 档案变更明细
       filechangeDetails: {rows: []},
-      filechangeDetailsShow: false
+      filechangeDetailsShow: false,
+      seaching: false // 保存中
     }
   },
   async ready () {
@@ -299,6 +302,7 @@ export default {
       if (this.row) {
         this.data.baseinfo.base.version = this.row.version
       }
+      this.seaching = true
       console.log('档案保存之前，。。。', this.data)
       if (this.data.meterinfo[0].f_gas_date != null) {
         this.data.addressinfo.f_address_state = '已通气'
@@ -314,6 +318,7 @@ export default {
           this.fileSaveData.modifyReason = ''
         }
         let details = await this.$resetpost('rs/logic/filechangeDetails', {data: this.fileSaveData}, {resolveMsg: null, rejectMsg: '获取修改明细出错!'})
+        this.seaching = false
         this.filechangeDetails.rows = details.data.changeDetails
         this.filechangeDetailsShow = details.data.isChange
       }
@@ -342,6 +347,7 @@ export default {
           this.$error('重复提交')
           return
         }
+        this.seaching = false
         this.$dispatch('error', '档案保存', this.data, error)
       })
     },
@@ -439,7 +445,7 @@ export default {
         } else if (row.f_fire_state === '0') {
           row.f_fire_state1 = false
         }
-        row.f_install_date = row.f_install_date ? row.f_install_date : ''
+        row.f_install_date = row.f_install_date ? row.f_install_date : null
         row.f_gas_date = row.f_gas_date ? row.f_gas_date : null
         row.f_changetube_date = row.f_changetube_date ? row.f_changetube_date : null
         row.f_aroundmeter = row.f_aroundmeter ? row.f_aroundmeter : ''
@@ -581,7 +587,10 @@ export default {
           devicesinfo: [], // 设备信息
           f_hand_month: '', // 抄表月份
           fireinfo: {}, // 用气信息
-          f_meter_book_num: ''
+          f_meter_book_num: '',
+          f_use_limit: '',
+          f_gas_date: this.$login.toStandardDateString(),
+          f_install_date: this.$login.toStandardDateString()
         }],
         devicesinfo: []
       }
@@ -642,6 +651,9 @@ export default {
           f_hand_month: row.f_hand_month,
           f_usetype: ''
         }
+        if (!temp.f_install_date) {
+          delete temp.f_install_date
+        }
         Object.assign(this.data.meterinfo[0], this.data.meterinfo[0], temp)
         console.log('====1.=====', temp, row)
         this.checkout('area')

package/src/components/FilesManage/UserMeterInfoTest.vue

@@ -9,7 +9,7 @@
         <button class="button_search" style="width: max-content" @click="showDevices($index, row)">用气设备信息</button>
         <button class="button_search" style="width: max-content" @click="showFire($index, row)">点火信息</button>
       </div>
-      <file-meter-info :meter="row" :f_filialeid="f_filialeid" :usertype="usertype" :gasproperties="gasproperties" :overdueset="overdueset" @self-valid='valida'
+      <file-meter-info :curuser="curuser" :meter="row" :f_filialeid="f_filialeid" :usertype="usertype" :gasproperties="gasproperties" :overdueset="overdueset" @self-valid='valida'
                   @delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id"></file-meter-info>
       <file-user-fire-info @clearfire="clearfire(row)" :addressinfo="addressinfo" :fireinfo.sync="fireinfo" :show_fire.sync="show_fire"  :meter.sync="row"  :baseinfo.sync="baseinfo"
                            :userinfoid='data.baseinfo.base.f_userinfo_id'></file-user-fire-info>
@@ -55,7 +55,8 @@ export default {
       baseinfo:{},
       f_filialeid: {},
       f_userinfo_id: {},
-      overdueset:{}
+      overdueset:{},
+      curuser: {}
     },
     ready () {
       console.log('表具信息，，，，', this.meterinfo)

package/src/components/UserFiles/AdjustableBox/AddBox.vue

@@ -140,18 +140,18 @@
 </template>
 <script>
 
-import {HttpResetClass} from "vue-client";
+import {HttpResetClass} from 'vue-client'
 
 export default {
   data () {
     return {
       isshow: false,
       tempPosition: {
-        position: { //经纬度信息
-          lng: 0, //经度
-          lat: 0  //纬度
+        position: { // 经纬度信息
+          lng: 0, // 经度
+          lat: 0  // 纬度
         },
-        formattedAddress: '' //地址信息
+        formattedAddress: '' // 地址信息
       },
       model: {
         f_adjustable_id: '',
@@ -165,11 +165,11 @@ export default {
         f_open_date: '',
         f_manufacturer: '',
         f_remark: '',
-        f_adjustable_lng: '', //经度
-        f_adjustable_lat: '',  //纬度
+        f_adjustable_lng: '', // 经度
+        f_adjustable_lat: ''  // 纬度
       },
-      riser:[{}],
-      delrow:[],
+      riser: [{}],
+      delrow: [],
       haveid: false,
       havename: false,
       changedate: true,
@@ -206,44 +206,46 @@ export default {
       this.model.f_depid = this.$login.f.depids
       this.model.f_depname = this.$login.f.deps
       let http = new HttpResetClass()
-      let res=await http.load('post', `rs/entity/t_adjustablebox`, this.model,{resolveMsg:'调压箱保存成功', rejectMsg: '保存失败!!!'})
-          if(this.riser[0]){
-            for(var i=0;i<this.riser.length;i++){
-              var params={
-                id:this.riser[i].id,
-                f_table_name:`t_adjustablebox`,
-                f_field_name:'id',
-                f_parent_id:res.data.id,
-                f_value:this.riser[i].f_value,
-                f_chinese_name:'立管编号',
-                f_operator : this.$login.f.name,
-                f_operatorid : this.$login.f.id,
-                f_orgid : this.$login.f.orgid,
-                f_orgname : this.$login.f.orgs,
-                f_depid : this.$login.f.depids,
-                f_depname : this.$login.f.deps
-              }
-              if(this.riser[i].f_value){
-                await http.load('post', `rs/entity/t_attribute`, params, {resolveMsg: null, rejectMsg: null})
-              }else{
-                await this.$resetdelete('rs/entity/t_attribute', {id: this.riser[i].id}, {warnMsg:null,resolveMsg: null, rejectMsg: null})
-              }
-            }
+      let res = await http.load('post', `rs/entity/t_adjustablebox`, this.model, {resolveMsg: '调压箱保存成功', rejectMsg: '保存失败!!!'})
+      if (this.riser[0]) {
+        for (var i = 0; i < this.riser.length; i++) {
+          var params = {
+            id: this.riser[i].id,
+            f_table_name: `t_adjustablebox`,
+            f_field_name: 'id',
+            f_parent_id: res.data.id,
+            f_value: this.riser[i].f_value,
+            f_chinese_name: '立管编号',
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps
           }
-          if(this.delrow.length>0){
-            for(var i=0;i<this.delrow.length;i++){
-              await this.$resetdelete('rs/entity/t_attribute', {id: this.delrow[i]}, {warnMsg:null,resolveMsg: null, rejectMsg: null})
-            }
+          if (this.riser[i].f_value) {
+            await http.load('post', `rs/entity/t_attribute`, params, {resolveMsg: null, rejectMsg: null})
+          } else {
+            await this.$resetdelete('rs/entity/t_attribute', {id: this.riser[i].id}, {warnMsg: null, resolveMsg: null, rejectMsg: null})
           }
-       this.$dispatch('success', '调压箱保存成功', this.model, res)
-       this.riser=[{}]
-       this.delrow=[]
+        }
+      }
+      if (this.delrow.length > 0) {
+        for (var i = 0; i < this.delrow.length; i++) {
+          await this.$resetdelete('rs/entity/t_attribute', {id: this.delrow[i]}, {warnMsg: null, resolveMsg: null, rejectMsg: null})
+        }
+      }
+      // 操作了调压箱 清空分公司initdata缓存
+      await http.load('POST', 'rs/logic/delSaleInitData', {data: {}}, {resolveMsg: null, rejectMsg: null})
 
+      this.$dispatch('success', '调压箱保存成功', this.model, res)
+      this.riser = [{}]
+      this.delrow = []
     },
-    delriser (index,row) {
+    delriser (index, row) {
       if (this.riser.length > 1) {
         this.riser.splice(index, 1)
-        if(row.id){
+        if (row.id) {
           this.delrow.push(row.id)
         }
       }
@@ -252,7 +254,7 @@ export default {
       this.riser.push({})
     },
     async datatomodel () {
-      this.delrow=[]
+      this.delrow = []
       this.$nextTick(() => {
         if (JSON.stringify(this.data) === '{}') {
           Object.assign(this.$data.model, this.$options.data().model)
@@ -270,13 +272,13 @@ export default {
           this.model.f_operate_date ? this.changedate = false : this.changedate = true
         }
       })
-      if(this.data.id){
-        var data=await this.$resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_attribute', condition: `f_table_name = 't_adjustablebox' and f_parent_id = '${this.data.id}' and f_chinese_name ='立管编号'`}}, {resolveMsg: null, rejectMsg: '获取调压箱失败'})
-        this.riser=data.data
+      if (this.data.id) {
+        var data = await this.$resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_attribute', condition: `f_table_name = 't_adjustablebox' and f_parent_id = '${this.data.id}' and f_chinese_name ='立管编号'`}}, {resolveMsg: null, rejectMsg: '获取调压箱失败'})
+        this.riser = data.data
       }
 
-      if (this.riser.length===0){
-        this.riser=[{}]
+      if (this.riser.length === 0) {
+        this.riser = [{}]
       }
     },
     cancel () {
@@ -305,7 +307,7 @@ export default {
       this.isshow = true
     },
     closeModal () {
-      this.isshow = false;
+      this.isshow = false
     },
     getmylocation (res) {
       this.tempPosition = res
@@ -314,7 +316,7 @@ export default {
       this.model.f_adjustable_address = this.tempPosition.formattedAddress
       this.model.f_adjustable_lng = this.tempPosition.position.lng
       this.model.f_adjustable_lat = this.tempPosition.position.lat
-      this.isshow = false;
+      this.isshow = false
     }
   }
 }