apply-clients 4.1.30-weinan → 4.1.31-weinan

package/package.json

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

package/src/components/app_apply/AppdevicesDetails.vue

@@ -211,6 +211,7 @@
                      type="number"
                      placeholder="使用年限"
                      v-model="item.f_service_life"
+                     @change="outdate(item)"
                      :value="item.f_service_life"
                      :readonly="mark === 1"/>
             </div>
@@ -633,6 +634,7 @@ export default {
         rejectMsg: '设备添加失败！！！'
       })
       this.showUserFile = false
+      this.search()
     },
     // 打开设备明细
     async showUserFileModal (row) {
@@ -772,6 +774,22 @@ export default {
       this.query = {}
       this.condition = "1 = 1"
     },
+    outdate(item){
+      console.log("数据",item)
+      debugger
+      if (item.f_make_date){
+        debugger
+        var t = new Date(item.f_make_date);//你已知的时间
+        var Y = t.getFullYear()+parseInt(item.f_service_life)+ '-'
+        var M = (t.getMonth()+1 < 10 ? '0'+(t.getMonth()+1):t.getMonth()+1) + '-'
+        var D = (t.getDate()< 10 ? '0'+t.getDate():t.getDate())+ ' '
+        var h = (t.getHours() < 10 ? '0'+t.getHours():t.getHours())+ ':'
+        var m = (t.getMinutes() < 10 ? '0'+t.getMinutes():t.getMinutes())+ ':'
+        var s = t.getSeconds() < 10 ? '0'+t.getSeconds():t.getSeconds()
+        item.f_expire_date = Y+M+D+h+m+s
+      }
+
+    }
   },
   events: {
     async 'onFileUpload'(file, result) {

package/src/components/app_apply/ServiceControl.vue

@@ -274,7 +274,13 @@
       },
       // 任意select选中时触发事件
       'select_cascade'(index){
-        console.log("sihoennoojooinoi",this.selectdata.f_stair_price_name,this.$refs.service_show.data)
+        if (this.data.fields[index].label === '是否具备安装条件'&& this.show_data.fields[index].value === '否') {
+          this.show_data.fields[index+9].required = false
+          this.show_data.fields[index+10].required = false
+          this.show_data.fields[index+11].required = false
+          this.show_data.fields[index+12].required = false
+          this.show_data.fields[index+13].required = false
+        }
         // this.$refs.service_show.model_temp // 子业务显示组件
         // 级联操作示例：
         /*
@@ -317,14 +323,14 @@
         model=Object.assign({},this.selectdata,model)
         console.log('合并selectdata与model后的model=>' + JSON.stringify(model))
         let http = new HttpResetClass()
-        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装') && model.f_is_have == '否'&& model. model.button.button_name == '提交'){
+        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装') && model.f_is_have == '否'&& model.button.button_name == '提交'){
           let model1 ={
             f_stop_remarks : '不具备安装条件'
           }
           this.stopapply(model1,model)
           return
         }
-        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装')  && model.f_is_aerate == '否' && model. model.button.button_name == '提交'){
+        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装')  && model.f_is_aerate == '否' && model.button.button_name == '提交'){
           let model1 ={
             f_stop_remarks : '未通气'
           }

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

@@ -725,6 +725,7 @@
                    v-validate:f_idnumber="['required']"
                    placeholder="证件号码"
                    v-model="userinfo.f_idnumber"
+                   @change="idnumber()"
                    :value="userinfo.f_idnumber"
                    :readonly="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'"/>
           </div>
@@ -1517,8 +1518,15 @@ export default {
         this.$showAlert('电话号码格式不正确，请重新输入。', 'info', 2000)
       }
     },
-    onchange(){
+    idnumber(){
       debugger
+       let num = this.userinfo.f_idnumber
+       if (!(/^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(num))){
+         this.userinfo.f_idnumber = ""
+         this.$showAlert('身份证号格式不正确，请重新输入。', 'info', 2000)
+       }
+     },
+    onchange(){
       if (this.userinfo.f_credentials ==='身份证'){
         this.flag = false
         this.flag1 = true