apply-clients 5.0.35-20 → 5.0.35-24

package/.npmignore

@@ -0,0 +1,13 @@
+.idea/
+.DS_Store
+node_modules/
+dist/
+dist-android/
+build
+package-lock.json
+npm-debug.log
+selenium-debug.log
+test/unit/coverage
+test/e2e/reports
+/node_modules.rar
+/node_modules.zip

package/package.json

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

package/src/apply.js

@@ -145,7 +145,8 @@ export default function () {
   Vue.component('apply-accept-bill', (resolve) => { require(['./components/product/Process/Processes/Service/ApplyAcceptBill'], resolve) })
 // 售气发票打印
   Vue.component('bjpaper-ticket-bill', (resolve) => { require(['./components/product/Process/Processes/Service/PaperTicketBill'], resolve) })
-
+// APP图片显示
+  Vue.component('apply-upload', (resolve) => { require(['./components/product/Function/functions/ApplyUpload'], resolve) })
 
   Vue.component('apply-stop', (resolve) => { require(['./components/product/stopInfo/ApplyStopInfo'], resolve) })
 

package/src/components/app_apply/ServiceControl.vue

@@ -157,7 +157,9 @@ export default {
           console.log('$appdata中的缓存参数与单值=>' + JSON.stringify(this.$appdata))
           var param = this.$appdata.getParam(this.data.fields[i].label)
           console.log(param)
-          this.data.fields[i].options = param
+          if (param){
+            this.data.fields[i].options = param
+          }
 
         }
       }

package/src/components/app_apply/ezhou/ServiceView.vue

@@ -560,10 +560,14 @@ export default {
           this.$showMessage("必须有现场照片")
           return;
         }
-        if(!this.model.f_sign_path){
+        if(Vue.nopic==this.model.f_sign_path){
           this.$showMessage("必须有签名照片")
           return;
         }
+        this.model.f_overall_imgs.push({
+          f_overall_path: this.model.f_sign_path,
+          f_overall_name: this.data.title
+        })
       }
 
 

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -20,6 +20,8 @@
     <stop-install :stopapply="selectdata" v-if="showstop"></stop-install>
     <!-- 领料记录 -->
     <material_recording :infee="selectdata" v-if="show_material"></material_recording>
+    <!-- APP附件 -->
+    <apply-upload :appupload="selectdata" v-if="show_upload"></apply-upload>
   </div>
 </template>
 <script>
@@ -42,7 +44,8 @@
         showstop: false, // 终止报建
         showbill: false, // 打印票据
         showpreparation: false, // 预付款
-        show_material:false//报建材料
+        show_material:false,//报建材料
+        show_upload: false //APP附件
       }
     },
     methods: {
@@ -65,6 +68,7 @@
         this.showcontract = false
         this.showbill = false
         this.showpreparation = false
+        this.show_upload = false
       },
       // 派工单
       receiveBatch(){
@@ -85,6 +89,7 @@
         this.showcontract = false
         this.showbill = false
         this.showpreparation = false
+        this.show_upload = false
       },
       // 领料记录
       materialRecord(){
@@ -105,6 +110,7 @@
         this.showcontract = false
         this.showbill = false
         this.showpreparation = false
+        this.show_upload = false
       },
       // 预付款
       preparation(){
@@ -125,6 +131,7 @@
         this.showcontract = false
         this.showbill = false
         this.showpreparation = true
+        this.show_upload = false
       },
       // 票据打印
       bill(){
@@ -145,6 +152,7 @@
         this.showpreparation = false
         this.showbill = true
         this.show_material = false
+        this.show_upload = false
       },
       // 补充合同
       contract() {
@@ -165,6 +173,7 @@
         this.showpreparation = false
         this.showcontract = true
         this.show_material = false
+        this.show_upload = false
       },
       // 收费
       instalfee(str) {
@@ -185,6 +194,7 @@
         this.showprestorefee = false
         this.showinfee = false
         this.show_material = false
+        this.show_upload = false
         // 采用开发商预付款方式收费
         if(str==='预付扣款'){
           this.showprestorefee = true
@@ -211,6 +221,28 @@
         this.showpreparation = false
         this.showstop = true
         this.show_material = false
+        this.show_upload = false
+      },
+      // APP附件
+      appUpload() {
+        this.$parent.$refs.installselect.clifun(this.selectdata)
+        // this.selectdata = row
+        this.$parent.clishow= true
+        this.$parent.show = false
+
+        this.showreceivebatch = false
+        this.showbuyer = false
+        this.showview = false
+        this.showbill = false
+        this.showinfee = false
+        this.showprestorefee = false
+        this.showupfee = false
+        this.showreducefee = false
+        this.showcontract = false
+        this.showpreparation = false
+        this.showstop = false
+        this.show_material = false
+        this.show_upload = true
       },
 
 
@@ -250,6 +282,7 @@
           this.showreceivebatch = false
           this.showbuyer = false
           this.show_material = false
+          this.show_upload = false
         }else{
           if(this.funcdata.title==='终止报建'){
             this.stopInstall()
@@ -278,6 +311,9 @@
           if(this.funcdata.title==='派工单'){
             this.receiveBatch()
           }
+          if(this.funcdata.title==='APP附件'){
+            this.appUpload()
+          }
         }
       }
     },