apply-clients 4.1.27-weinan → 4.1.29-weinan

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "4.1.27-weinan",
+  "version": "4.1.29-weinan",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/app_apply/AppInstallationDetails.vue

@@ -94,7 +94,15 @@
         </div>
 
         <div v-for="(i, item) in userinfo.userfiles" class="form-group col-sm-12 panel panel-info">
-          <div class="panel-heading head" style="background-color: #e8f4ff;margin-bottom: 10px">表具{{$index+1}}信息</div>
+          <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
+            <div class="col-sm-6 text-left" style="background-color: #e8f4ff;margin-bottom: 10px">表具{{$index+1}}信息</div>
+            <div class="col-sm-6 text-right"><button
+              class="button_delete button_spacing"
+              v-if="!item.f_userfiles_id"
+              @click.prevent="deleteUserFile(i)"
+            >删除</button></div>
+          </div>
+
           <div class="form-group col-sm-6" :class="[$v.gasbrand.required ? 'has-error' : '']">
             <label class="col-sm-4 control-label">气表品牌：</label>
             <div class="col-sm-8">
@@ -191,7 +199,7 @@
                 :valueSingle="true"></input-select>
             </div>
           </div>
-          <div class="form-group col-sm-6">
+<!--          <div class="form-group col-sm-6">
             <label class="col-sm-4 control-label">安装人：</label>
             <div class="col-sm-8">
               <input-select
@@ -202,7 +210,7 @@
                 :disable="mark === 1"
                 :valueSingle="true"></input-select>
             </div>
-          </div>
+          </div>-->
           <div class="form-group col-sm-6">
             <label class="col-sm-4 control-label">安装日期：</label>
             <div class="col-sm-8">
@@ -274,6 +282,10 @@ export default {
     this.installperson()
   },
   methods: {
+    // 删除未保存的表具
+    async deleteUserFile (index) {
+      this.userinfo.userfiles.splice(index, 1)
+    },
     // 追加表具
     addUserFile() {
       this.userinfo.userfiles.push({})
@@ -295,12 +307,16 @@ export default {
         userinfo: this.userinfo,
         selectdata: this.selectdata
       }
-      let res = await this.$resetpost(this.$androidUtil.getProxyUrl() +'/rs/logic/addInstallationDetails', {data:data}, {
+      await this.$resetpost(this.$androidUtil.getProxyUrl() +'/rs/logic/addInstallationDetails', {data:data}, {
         resolveMsg: null,
         rejectMsg: '表具添加失败！！！'
+      }).then(res=>{
+        this.showUserFile = false
+        this.useradders = null
+        this.userinfo = null
+        this.search()
       })
-      this.showUserFile = false
-      this.$dispatch('breakControl', this.selectdata)
+
     },
     // 检查表号是否存在
     async meternumberValidate(i) {
@@ -386,7 +402,6 @@ export default {
           }
         }
       }
-      console.log("表具信息",this.userinfo.userfiles)
       this.showUserFile = true
     },
     // 获取气表品牌

package/src/components/app_apply/AppdevicesDetails.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="col-sm-12" style="margin: 20px 0px;">
-    <div class="auto" style="overflow:auto;margin: 15px 0 0 15px;">
+<!--    <div class="auto" style="overflow:auto;margin: 15px 0 0 15px;">
       <div class="col-sm-12" style="height: 180px">
         <div class="row col-sm-12">
           <div class="from-group col-sm-3">
@@ -11,13 +11,13 @@
             </v-select>
           </div>
           <div class="form-group col-sm-5" >
-            <!--            <button  class="button_search button_spacing" @click="search()">查询</button>-->
+            &lt;!&ndash;            <button  class="button_search button_spacing" @click="search()">查询</button>&ndash;&gt;
             <button type="button" class="btn btn-default" @click="search(0)">查询</button>
             <button type="button" class="btn btn-default" @click="clear()">清空</button>
           </div>
         </div>
       </div>
-    </div>
+    </div>-->
     <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
       <template partial='head'>
         <tr>
@@ -117,7 +117,15 @@
         </div>
 
         <div v-for="(i, item) in userinfo.devices" class="form-group col-sm-12 panel panel-info">
-          <div class="panel-heading head" style="background-color: #e8f4ff;margin-bottom: 10px">设备{{$index+1}}信息</div>
+          <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
+            <div class="col-sm-6 text-left" style="background-color: #e8f4ff;margin-bottom: 10px">设备{{$index+1}}信息</div>
+            <div class="col-sm-6 text-right"><button
+              class="button_delete button_spacing"
+              v-if="!item.f_userfiles_id"
+              @click.prevent="deleteUserFile(i)"
+            >删除</button></div>
+          </div>
+
           <div class="form-group col-sm-6">
             <label class="col-sm-4 control-label">设备类型：</label>
             <div class="col-sm-8">
@@ -603,6 +611,10 @@ export default {
     this.search()
   },
   methods: {
+    // 删除未保存的表具
+    async deleteUserFile (index) {
+      this.userinfo.devices.splice(index, 1)
+    },
     // 追加表具
     addUserFile() {
       this.userinfo.devices.push({})
@@ -620,7 +632,7 @@ export default {
         resolveMsg: null,
         rejectMsg: '设备添加失败！！！'
       })
-      this.$dispatch('breakControl', this.selectdata)
+      this.showUserFile = false
     },
     // 打开设备明细
     async showUserFileModal (row) {
@@ -668,6 +680,7 @@ export default {
             }
           ]
           this.fireinfo = {}
+          this.fireinfo.f_lgniter = Vue.user.name
         }else {
           this.fireinfo = this.userinfo.fireinfo[0]
         }