apply-clients 5.0.35-4 → 5.0.35-40

package/src/components/product/Common/ApplyValidateBill.vue

@@ -13,6 +13,7 @@
 
     let http = new HttpResetClass()
     let param = {
+      f_process_id:self.data.f_process_id,
       f_bill_user: self.$login.f.name, // 票据使用人
       f_bill_type: self.data.f_bill_type, // 票据类型
       f_filialeids: self.$login.f.f_orgids, //所属分公司
@@ -37,17 +38,23 @@
       }
     },
     props: ['data','show'],
-    ready () {
-
+   async ready () {
+      /*debugger
       console.log(this.data.f_bill_type)
       if (this.data.f_bill_type) {
-        getCurrentBill(this)
+        await  getCurrentBill(this)
+        console.log('打印参数',this.data.f_process_id)
 
-      }
+      }*/
     },
     watch : {
-      'show' (val) {
-          getCurrentBill(this)
+      data:{
+        deep:true,
+        immediate:true,
+        async handler(){
+          console.log('1111155555')
+          await getCurrentBill(this)
+        }
       }
     }
   }

package/src/components/product/Function/InstallInfoSelect.vue

@@ -181,7 +181,7 @@
                 <nobr>{{row.f_install_num}}</nobr>
               </td>
               <td style="text-align: center;">
-                <dropdown v-if="row.defname != '完工'">
+                <dropdown>
                   <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
                     <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
                   </button>

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()
+          }
         }
       }
     },