apply-clients 4.1.25-weinan → 4.1.27-weinan

package/package.json

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

package/src/components/app_apply/AppInstallationDetails.vue

@@ -299,6 +299,7 @@ export default {
         resolveMsg: null,
         rejectMsg: '表具添加失败！！！'
       })
+      this.showUserFile = false
       this.$dispatch('breakControl', this.selectdata)
     },
     // 检查表号是否存在

package/src/components/app_apply/AppdevicesDetails.vue

@@ -340,7 +340,7 @@
             <!--            <avatar-upload :img-src.sync="row.img.content" :filename.sync="row.img.filename"></avatar-upload>-->
             <form class="form-horizontal select-overspread " style="flex: 1;">
               <div style="margin-top: 2%">
-                <img style="margin-top: -2px;margin-left: 2px" src="../../../../../static/images/lefticon/矩形1183.png">
+                <img style="margin-top: -2px;margin-left: 2px" src="../../../static/images/lefticon/矩形1183.png">
                 <a style="font-size: 16px;font-weight: 500;">民用点火信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
               </div>
               <div class="row auto" style="margin-top: 10px;margin-left: 10px;">
@@ -441,7 +441,7 @@
             <!--            <avatar-upload :img-src.sync="row.img.content" :filename.sync="row.img.filename"></avatar-upload>-->
             <form class="form-horizontal select-overspread " style="flex: 1;">
               <div style="margin-top: 2%">
-                <img style="margin-top: -2px;margin-left: 2px" src="../../../../../static/images/lefticon/矩形1183.png">
+                <img style="margin-top: -2px;margin-left: 2px" src="../../../static/images/lefticon/矩形1183.png">
                 <a style="font-size: 16px;font-weight: 500;">非民用点火基本信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
               </div>
               <div class="row auto" style="margin-top: 10px;margin-left: 10px;">
@@ -551,14 +551,12 @@
         <button type="button" class="btn btn-success" @click='confirm()'>确定</button>
       </footer>
     </modal>
-    <apply-file-user-fire-info v-if="showFilePage" :fireinfo="fireinfo" :showFilePage="showFilePage"></apply-file-user-fire-info>
+<!--    <apply-file-user-fire-info v-if="showFilePage" :fireinfo="fireinfo" :showFilePage="showFilePage"></apply-file-user-fire-info>-->
   </validator>
 </template>
 <script>
 import Vue from 'vue'
-import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
-import {isEmpty} from '../../../Util'
 
 export default {
   title: '设备信息',
@@ -747,7 +745,7 @@ export default {
       let data = {
         fireinfo: this.fireinfo
       }
-      let res = await http.load('POST', this.$androidUtil.getProxyUrl() +'/rs/logic/addInstallationDetailsFire', {data:data}, {
+      let res = await http.load('POST', this.$androidUtil.getProxyUrl() +'/rs/entity/t_userfire', this.fireinfo, {
         resolveMsg: "添加成功",
         rejectMsg: "添加失败"
       }).then((res) => {

package/src/components/app_apply/ServiceControl.vue

@@ -124,7 +124,9 @@
                 }
               }
             }
-
+            if (this.data.fields[i].ready) {
+              this.data.fields[i].options = await this[this.data.fields[i].ready]()
+            }
           }
         }
         // 初始化 buttons_fields
@@ -235,24 +237,44 @@
           }
         })
       },
+      getLableValue(label) {
+        for (const item of this.show_data.fields) {
+          if (item.label === label && item.type !== 'number') {
+            return item.value || ''
+          }
+          if (item.label === label && item.type === 'number') {
+            return item.value || 0
+          }
+        }
+      },
+      setLabelValue(label, value) {
+        for (const item of this.show_data.fields) {
+          if (item.label === label) {
+            item.value = value
+          }
+        }
+      },
     },
     events: {
       // 选择气价
       'priceChange'(index) {
-        if (isEmpty(this.show_data.f_stair_price_name)) {
+       /* if (isEmpty(this.show_data.f_stair_price_name)) {
           return
-        }
-
+        }*/
         let stairPrice = this.getLableValue('气价名称')
         console.log("气价信息", stairPrice)
         this.setLabelValue('气价类型', stairPrice.f_price_type)
         this.setLabelValue('用气性质', stairPrice.f_gasproperties)
         this.setLabelValue('气价', stairPrice.f_price)
-        this.show_data.f_price_id = stairPrice.f_price_id
-        this.show_data.f_price_name = stairPrice.f_price_name
+
+
+        this.selectdata.f_price_id = stairPrice.f_price_id
+        this.selectdata.f_price_name = stairPrice.f_price_name
+        this.$refs.service_show.update()
       },
       // 任意select选中时触发事件
       'select_cascade'(index){
+        console.log("sihoennoojooinoi",this.selectdata.f_stair_price_name,this.$refs.service_show.data)
         // this.$refs.service_show.model_temp // 子业务显示组件
         // 级联操作示例：
         /*

package/src/components/app_apply/ServiceView.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="auto select-overspread">
+  <div class="auto select-overspread" v-if="refresh">
     <div  v-if="data.back_reason"  class="panel panel-info">
       <span style="color: red">    请注意被退回原因为:{{data.back_reason}}</span>
     </div>
@@ -201,7 +201,8 @@
         },
         data:null,
         showmodal:false,
-        disable_button:true
+        disable_button:true,
+        refresh: true // 控制重新渲染
       }
     },
     created(){
@@ -322,6 +323,9 @@
       // 级联操作预留
       select_change(index){
         this.disableButton()
+        if (this.data.fields[index].onchange) {
+          this.$dispatch(this.data.fields[index].onchange, index)
+        }
         this.$dispatch('select_cascade',index)
       },
       // 检测按钮的disable
@@ -338,6 +342,14 @@
           }
           this.disable_button = flag
         }
+      },
+      // 强制刷新
+      update (){
+        this.refresh = false
+        this.$nextTick(() => {
+          this.refresh = true
+        })
+        this.initializtion()
       }
     },
     watch:{