apply-clients 4.1.32-weinan → 4.1.34-weinan

package/package.json

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

package/src/components/app_apply/AppChargeManagement.vue

@@ -106,7 +106,7 @@
           </div>
         </div>
         <div v-for="(index,payment) in charge.payment_terms">
-<!--          <div class="form-group row vertical-center" :class="payment.f_payment_term ? '':'has-error'">
+          <div class="form-group row vertical-center" :class="payment.f_payment_term ? '':'has-error'">
             <label class="col-xs-4 control-label">收费项目：</label>
             <div class="col-xs-8">
               <input-select class="select select_list"
@@ -116,7 +116,7 @@
                             :value-single="true"
                             close-on-select ></input-select>
             </div>
-          </div>-->
+          </div>
           <div class="form-group row vertical-center" :class="payment.f_charge_money ? '':'has-error'">
             <label class="col-xs-4 control-label">收费金额：</label>
             <div class="col-xs-8">

package/src/components/app_apply/AppInstallationDetails.vue

@@ -214,13 +214,13 @@
           <div class="form-group col-sm-6" :class="[$v.f_install_date.required ? 'has-error' : '']">
             <label class="col-sm-4 control-label">安装日期：</label>
             <div class="col-sm-8">
+              <input type="text" v-show="false" v-model="item.f_install_date" :value.sync="item.f_install_date" v-validate:f_install_date = "['required']" >
               <datepicker
                 placeholder="安装日期"
                 :value.sync="item.f_install_date"
                 v-model="item.f_install_date"
                 format="yyyy-MM-dd HH:mm:ss"
                 :disabled="mark === 1"
-                v-validate:f_install_date = "['required']"
                 :show-reset-button="reset">
               </datepicker>
             </div>

package/src/components/app_apply/ServiceControl.vue

@@ -337,6 +337,17 @@
           this.stopapply(model1,model)
           return
         }
+        if( this.selectdata.defname ==='入户安装'&& model.button.button_name == '提交'){
+          let data1 = {
+            tablename: 't_userfiles',
+            condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+          }
+          let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data1}, {resolveMsg: null, rejectMsg: '获取数据失败'})
+            if (res1<=0){
+              this.$showMessage("请填写表具信息！！！")
+              return
+            }
+        }
         if(this.selectdata.defname =='现场勘察'  && this.selectdata.f_apply_type == '工商户报建'&& model.button.button_name == '提交'){
           let http = new HttpResetClass()
           let data = {

package/src/components/product/Process/Processes/InstallationDetails.vue

@@ -205,13 +205,13 @@
           <div class="form-group col-sm-6" :class="[$v.f_install_date.required ? 'has-error' : '']">
             <label class="col-sm-4 control-label">安装日期：</label>
             <div class="col-sm-8">
+              <input type="text" v-show="false" v-model="item.f_install_date" :value.sync="item.f_install_date" v-validate:f_install_date = "['required']" >
               <datepicker
                 placeholder="安装日期"
                 :value.sync="item.f_install_date"
                 v-model="item.f_install_date"
                 format="yyyy-MM-dd HH:mm:ss"
                 :disabled="mark === 1"
-                v-validate:f_install_date = "['required']"
                 :show-reset-button="reset">
               </datepicker>
             </div>
@@ -301,7 +301,8 @@ export default {
         resolveMsg: null,
         rejectMsg: '表具添加失败！！！'
       })
-      this.$dispatch('breakControl', this.selectdata)
+      this.showUserFile = false
+      this.search()
     },
     // 检查表号是否存在
     async meternumberValidate(i) {

package/src/components/product/Process/Service/ServiceControl.vue

@@ -801,6 +801,22 @@ export default {
         this.stopapply(model1,model)
         return
       }
+      if( this.selectdata.defname ==='入户安装'&& model.button.button_name == '提交'){
+        let data = {
+          condition: " 1=1",
+          f_process_id: this.selectdata.f_process_id
+        }
+        let res1 = await http.load('POST', 'rs/sql/getAddresAndUserinfoAndUserfilesAmount', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
+        debugger
+        if (res1.data[0].f_userfiles_num===null){
+          this.$showMessage("请填写表具信息！！！")
+          return
+        }
+
+      }
       let requestData = {
         tables: this.data.tables,
         start_activity: this.$workflow_vue.start_activity,