apply-clients 4.1.16-weinan → 4.1.17-weinan

package/package.json

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

package/src/components/app_apply/AppTakePic.vue

@@ -59,8 +59,9 @@
 
         for (var i = 0; i < res.data.length; i++) {
           console.log('-----------地址----------------')
-          console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 3)}`)
-          res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 3)}`
+
+          console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
+          res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
         }
 
         this.fileList = res.data
@@ -92,7 +93,6 @@
       },
       cameraCallBack (fileName, fileUrl) {
         console.log('-----------cameraCallBack-----------------')
-
         let data = {
           blodid: HostApp.__this__.blobid,
           type: HostApp.__this__.type,

package/src/components/app_apply/ApplyToDoList.vue

@@ -104,7 +104,7 @@ export default{
       _this.$back()
     },
     search () {
-      var condition = "1=1  and (f_apply_type! = '居民报建' and f_apply_type! = '工商户报建'  or (f_apply_type = '居民报建' and defname = '现场勘察') or (f_apply_type = '工商户报建' and (defname = '现场勘察' or defname = '施工'))))"
+      var condition = "1=1  and (f_apply_type! = '居民报建' and f_apply_type! = '工商户报建'  or (f_apply_type = '居民报建' and defname = '入户安装') or (f_apply_type = '工商户报建' and (defname = '现场勘察' or defname = '施工')))"
       var param = {condition: condition,condValue:[],data:{"id": Vue.user.id,orgid: Vue.user.orgid}}
       let http = new HttpResetClass()
       http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,{data:param}).then(res=>{

package/src/components/app_apply/ServiceControl.vue

@@ -270,7 +270,7 @@
           this.stopapply(model1,model)
           return
         }
-        if(this.selectdata.defname =='现场勘察'  && this.selectdata.f_apply_type == '工商户报建'&& model. model.button.button_name == '提交'){
+        if(this.selectdata.defname =='现场勘察'  && this.selectdata.f_apply_type == '工商户报建'&& model.button.button_name == '提交'){
           let http = new HttpResetClass()
           let data = {
             tablename: 't_files',
@@ -281,7 +281,7 @@
             rejectMsg: '查询失败'
           })
           console.log("数据长度：" + res.data.length)
-          if (res.data.length < 0) {
+          if (res.data.length <= 0) {
              this.$showMessage("请上传照片！！！")
             return
           }

package/src/components/app_apply/ServiceView.vue

@@ -258,6 +258,17 @@
       closemodal(){
         this.showmodal=false
       },
+      // 是否禁用按钮
+      disableButton() {
+        let fields = this.data.fields
+        let flag = false
+        for (const item of fields) {
+          if (item.type === 'select' && item.label === '工程状态'&& (item.value === '正在施工' || item.value === '未开工' )&& item.disabledButton) {
+            flag = true
+          }
+        }
+        this.disable_button = flag
+      },
       // 点击按钮
       clicked(index,button){
         console.log(`点击了按钮index:${index}+button:${JSON.stringify(button)}`);
@@ -303,6 +314,7 @@
       },
       // 级联操作预留
       select_change(index){
+        this.disableButton()
         this.$dispatch('select_cascade',index)
       },
       // 检测按钮的disable

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

@@ -581,6 +581,75 @@ export default {
           throw `还有${res.data[0].num}户未安装，无法提交`
         }
       }
+      if (
+        model.f_apply_type === '工商户报建' &&
+        model.button.button_name === '提交' &&
+        (model.defname === '设计出图' || model.defname === '竣工验收' || model.defname === '合同签订'  )
+      ) {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_files',
+          condition: `defname = '${model.defname}' and f_blobid = '${this.selectdata.f_process_id}'`
+        }
+        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '查询失败'
+        })
+        console.log("数据长度：" + res.data.length)
+        if (res.data.length <= 0) {
+          throw '请上传附件！！！'
+        }
+
+      }
+      if (
+        model.f_apply_type === '工商户报建' &&
+        model.button.button_name === '提交' &&
+        model.defname === '报建登记'
+      ) {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_files',
+          condition: `defname = '${model.defname}' and f_blobid = '${this.selectdata.f_process_id}'`
+        }
+        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '查询失败'
+        })
+        console.log("数据长度：" , res.data)
+        if (res.data.length <= 0) {
+          throw '请上传附件！！！'
+        }
+        let inc=true
+        let name1 = ''
+        let wenjian = ['营业执照','身份证','非居民用户申请表','灶具五证','厨房设备布置设计图']
+        for (let name = 0;name<wenjian.length;name++){
+          let has=false
+          for (let i=0;i<res.data.length;i++){
+            if(res.data[i].f_filename.includes(wenjian[name])){
+              has=true
+            }
+          }
+          if(!has){
+            name1=name1+wenjian[name]+','
+            inc=false
+          }
+        }
+        if (inc==false){
+          throw '请上传'+name1+'附件！！！'
+        }
+        /*for (let i=0;i<res.data.length;i++){
+          if (!(
+            res.data[i].f_filename.includes('营业执照')
+            || res.data[i].f_filename.includes('身份证')
+            || res.data[i].f_filename.includes('非居民用户申请表')
+            || res.data[i].f_filename.includes('灶具五证')
+            || res.data[i].f_filename.includes('厨房设备布置设计图')
+          )){
+            throw '请检查当前节点的附件,只能上传以下文件 营业执照/'
+            return
+          }
+        }*/
+      }
       return model
     },
     // ========================= 武安 =================================
@@ -893,7 +962,7 @@ export default {
       //     }
       //   }
       // }
-      if(this.show_data.defname === '现场勘察' || this.selectdata.defname ==='入户安装') {
+      if(this.show_data.defname === '现场勘察' || this.show_data.defname ==='入户安装') {
         console.log("this.shdata",this.show_data)
         if (this.show_data.fields[index].label === '是否具备安装条件') {
           for (const button of this.show_data.buttons) {

package/src/components/product/ServiceView.vue

@@ -534,6 +534,10 @@
           if (item.type === 'select' && (item.value === '否' || item.value === '未开工') && item.disabledButton) {
             flag = true
           }
+          // 任何选择框只要是否都不能提交
+          if (item.type === 'select' && item.label === '工程状态'&& item.value === '正在施工'&& item.disabledButton) {
+            flag = true
+          }
         }
 
         let count = 0