apply-clients 3.5.4-7 → 3.5.4-71

package/src/filiale/yangchunboneng/android/AppServiceControl.vue

@@ -12,7 +12,7 @@
         <app-sign :blobid="selectdata.f_process_id" :defname="selectdata.defname" @sign-success="signSuccess" :file-path="selectdata.f_process_id"@sign-clean="signClean"></app-sign>
       </panel>
       <panel header="附件" :is-open="false" type="primary" v-if="selectdata.f_process_id">
-        <app-upload :blobid="selectdata.f_process_id" :isdelete="true" ></app-upload>
+        <app-upload :blobid="selectdata.f_process_id" :pblobid="selectdata.f_parent_process_id" :isdelete="true" :defname="selectdata.defname"></app-upload>
       </panel>
     </accordion>
   </div>
@@ -670,6 +670,22 @@ export default {
       }
       throw '用户信息确认！！！'
     },
+    //通气前置，添加设备
+    async addDeviceBefore () {
+      let http = new HttpResetClass()
+      var condition1=`f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+      let data = {
+        condition: condition1
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getUserFilesAndDevicesAmount`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '获取表具失败！！！'
+      })
+      if (res.data.amount===0) {
+        this.$showMessage('请添加设备！！！', 'warning', 3000)
+        throw null
+      }
+    },
     // 缴费前置
     async chargeBefore () {
       if (Number(this.show_data.f_due_money) > Number(this.show_data.f_cumulative_payment_money) || Number(this.show_data.f_surplus_money) > 0) {
@@ -693,6 +709,23 @@ export default {
           this.$showMessage(`还有${res.data[0].num}户表具未安装，无法提交`, 'warning', 3000)
           throw `还有${res.data[0].num}户表具未安装，无法提交`
         }
+        let  condition1=''
+        if(this.selectdata.f_sub_state ==='完工'){
+          condition1=`f_userinfo_id = '${this.selectdata.f_userinfo_id}' and f_table_state='正常'`
+        }else{
+          condition1=`f_userinfo_id = '${this.selectdata.f_userinfo_id}' and f_table_state='待开通'`
+        }
+        data = {
+          condition: condition1
+        }
+        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getUserFilesAndDevicesAmount`, {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '获取设备失败！！！'
+        })
+        if (res1.data[0].amount < 2) {
+          this.$showMessage(`设备必须添加2个，否则无法提交`, 'warning', 3000)
+          throw `设备必须添加2个，否则无法提交`
+        }
       }
     },
     // 施工前置