apply-clients 5.0.35-62 → 5.0.35-65

package/src/components/app_apply/ServiceControl.vue

@@ -261,11 +261,11 @@ export default {
     'checkboxSelectControl'(index,index2){
       if(this.$refs.service_show.data.fields[index].label=="施工提交资料"){
         for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
-
           if(this.$refs.service_show.data.fields[i].label=="施工已上传文件"){
             //增加和删除框中的内容
             if(this.$refs.service_show.data.fields[index].items[index2].value == false){
-              this.$refs.service_show.data.fields[i].value+=this.$refs.service_show.data.fields[index].items[index2].label+" ";
+              // this.$refs.service_show.data.fields[i].value+=this.$refs.service_show.data.fields[index].items[index2].label+" ";
+              this.$refs.service_show.data.fields[i].value=this.$refs.service_show.data.fields[i].value==undefined?'':this.$refs.service_show.data.fields[i].value+this.$refs.service_show.data.fields[index].items[index2].label+" ";
               this.$refs.service_show.data.fields[index].items[index2].value=true;
             }else{
               let deleteValue = this.$refs.service_show.data.fields[index].items[index2].label;
@@ -286,7 +286,7 @@ export default {
           if(this.$refs.service_show.data.fields[i].label=="验收已上传文件"){
             //增加和删除框中的内容
             if(this.$refs.service_show.data.fields[index].items[index2].value == false){
-              this.$refs.service_show.data.fields[i].value+=this.$refs.service_show.data.fields[index].items[index2].label+" ";
+              this.$refs.service_show.data.fields[i].value=this.$refs.service_show.data.fields[i].value==undefined?'':this.$refs.service_show.data.fields[i].value+this.$refs.service_show.data.fields[index].items[index2].label+" ";
               this.$refs.service_show.data.fields[index].items[index2].value=true;
             }else{
               let deleteValue = this.$refs.service_show.data.fields[index].items[index2].label;
@@ -301,6 +301,7 @@ export default {
           }
         }
       }
+      this.$refs.service_show.update()
     },
     // 任意select选中时触发事件
     async 'select_cascade'(index){
@@ -341,7 +342,8 @@ export default {
                 streetrs.push(temp)
               }
               this.$refs.service_show.data.fields[i].options = [{label: '全部', value: ''}, ...streetrs]
-              console.log('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~option:', this.$refs.service_show.data.fields[i].options)
+              // console.log('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~option:', this.$refs.service_show.data.fields[i].options)
+              this.$refs.service_show.update()
             })
           }
         }
@@ -368,7 +370,8 @@ export default {
                 arears.push(temp)
               }
               this.$refs.service_show.data.fields[i].options = [{label: '全部', value: ''}, ...arears]
-              console.log('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~option:', this.$refs.service_show.data.fields[i].options)
+              // console.log('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~option:', this.$refs.service_show.data.fields[i].options)
+              this.$refs.service_show.update()
             })
           }
         }

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="auto select-overspread">
+  <div class="auto select-overspread" v-if="refresh">
     <div v-if="data.back_reason" class="panel panel-info">
       <span style="color: red">    请注意被退回原因为:{{ data.back_reason }}</span>
     </div>
@@ -141,7 +141,7 @@
                    v-for="(index2,row) in item.items">
                 <label class="font-size form-group col-sm-6">{{ row.label }}</label>
                 <input :readonly="item.readonly" :disabled="item.disabled" type="checkbox" class="col-sm-6"
-                       :id="row.label" v-model="data.fields[index].items[index2].value">
+                       :id="row.label" v-model="data.fields[index].items[index2].value" @click="checkboxSelect(index,index2)">
               </div>
             </div>
 
@@ -334,7 +334,8 @@ export default {
       data: null,
       showmodal: false,
       disable_button: true,
-      onetomany:[]
+      onetomany: [],
+      refresh: true // 控制重新渲染
     }
   },
   created() {
@@ -343,18 +344,18 @@ export default {
     this.initializtion()
   },
   methods: {
-    gotoOneToMany(item){
+    gotoOneToMany (item){
       item.f_process_id = this.data.f_process_id
       item.f_filiale = this.data.f_filiale
       item.f_apply_num = this.data.f_apply_num
       this.$dispatch('onetomany', item)
     },
-    gotohetong(val) {
+    gotohetong (val) {
       console.log(val)
       console.log("进入goto")
       this.$dispatch('gotonewpage', val)
     },
-    cameraCallBack(prop, fileName) {
+    cameraCallBack (prop, fileName) {
       if (prop == 'f_overall_path') {
         let f_overall_path = fileName + '?' + Math.random()
         HostApp.__this__.model.f_overall_imgs.push({
@@ -367,7 +368,7 @@ export default {
       HostApp.__callback__ = null
       HostApp.__this__ = null
     },
-    takePic(prop, title, index) {
+    takePic (prop, title, index) {
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       console.log("prop:" + prop)
@@ -398,13 +399,13 @@ export default {
         }
       })
     },
-    signCallback(prop, fileName) {
+    signCallback (prop, fileName) {
       // HostApp.alert('绑定属性:' + prop + ' 文件全路径如file:///storage/sdcard0/safecheck/abc.jpg：' + fullFileName)
       HostApp.__this__.$set('model.f_sign_path', fileName)
       HostApp.__callback__ = null
       HostApp.__this__ = null
     },
-    delAudioFile(prop, fileName) {
+    delAudioFile (prop, fileName) {
       if (!fileName)
         return
       else {
@@ -412,7 +413,7 @@ export default {
         this.model[prop] = null
       }
     },
-    sign() {
+    sign () {
       this.delAudioFile('f_sign_path', this.model.f_sign_path)
       let prop = 'f_sign_path'
       let idx = 'aofeng'
@@ -430,7 +431,7 @@ export default {
         callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
       })
     },
-    delfile(prop, fileName, index) {
+    delfile (prop, fileName, index) {
       if (fileName == Vue.nopic)
         return
       else {
@@ -444,7 +445,7 @@ export default {
       }
     },
     // 初始化数据
-    initializtion() {
+    initializtion () {
 
       if (this.data.title == '现场勘查' || this.data.title == '现场勘查定价') {
         this.isshow = false
@@ -561,7 +562,7 @@ export default {
       }
     },
     // 模态框点击确定按钮
-    acknowledge() {
+    acknowledge () {
       for (let i = 0; i < this.data.buttons[this.model.button.button_index].button_fields.length; i++) {
         this.model.button.button_fields[this.data.buttons[this.model.button.button_index].button_fields[i].field] = this.data.buttons[this.model.button.button_index].button_fields[i].value
       }
@@ -569,16 +570,16 @@ export default {
       this.$dispatch('button', this.model)
     },
     // 关闭模态框
-    closemodal() {
+    closemodal () {
       this.showmodal = false
     },
-    watchmoney(val1, val2) {
+    watchmoney (val1, val2) {
       console.log("监听改变的值")
       console.log(val1)
       console.log(val2)
     },
     // 点击按钮
-    clicked(index, button) {
+    clicked (index, button) {
       console.log(`点击了按钮index:${index}+button:${JSON.stringify(button)}`);
       if (button.button_name=='提交') {
         if (!this.model.f_overall_imgs || this.model.f_overall_imgs.length == 0){
@@ -653,11 +654,11 @@ export default {
       }
     },
     // 级联操作预留
-    select_change(index) {
+    select_change (index) {
       this.$dispatch('select_cascade', index)
     },
     // 检测按钮的disable
-    disabled_check(index, required, value) {
+    disabled_check (index, required, value) {
       console.log("被检测到的值是什么")
       console.log(index)
       console.log(required)
@@ -740,7 +741,19 @@ export default {
         }
         this.disable_button = flag
       }
-    }
+    },
+    checkboxSelect (index,index1){
+      console.log("chufa事件");
+      this.$dispatch('checkboxSelectControl', index, index1)
+    },
+    // 强制刷新
+    update (){
+      this.refresh = false
+      this.$nextTick(() => {
+        this.refresh = true
+      })
+      this.initializtion()
+    },
   },
   watch: {
     'data.filed[12].value'(val) {
@@ -749,7 +762,7 @@ export default {
 
       }
     },
-    'data.operate_date'() {
+    'data.operate_date' () {
       if (this.data.filiale) {
         this.model.f_filiale = this.data.filiale
       } else {
@@ -771,6 +784,13 @@ export default {
         this.model.f_operator = Vue.user.name
       }
     },
+    'data.fields' () {
+      this.refresh = false
+      this.$nextTick(() => {
+        this.refresh = true
+      })
+      this.initializtion()
+    },
     deep: true
   },
   computed: {

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

@@ -1,121 +1,121 @@
-<template>
-  <div class="auto form-horizontal" >
-    <modal  :show.sync="show"  v-ref:modal large backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <h3 style="color:black" class="modal-title" >{{billConfig.billtype}}</h3>
-        <button type="button" class="close" @click="closebuyerinfo"><span>&times;</span></button>
-      </header>
-      <article slot="modal-body" class="modal-body">
-<!--        <div v-if="bill.data">-->
-<!--          {{{bill.data}}}-->
-<!--        </div>-->
-        <validator name='v'>
-          <form class="form-horizontal  select-overspread">
-            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' v-if="bill.data">
-              {{{bill.data}}}
-            </div>
-          </form>
-        </validator>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <div v-if="billConfig.hasBillManage">
-          <div class="col-sm-2" >
-            <span><strong>发票号:{{model.f_using_number}}</strong></span>
-          </div>
-        </div>
-        <button type="button" class="btn btn-success" @click='print()'>打印</button>
-        <report-print id='normal-bill' top='15mm' left='5mm'  width='90%'  height='70%' :notrepeat="false" :showbtn="false" v-ref:reportprint></report-print>
-        <button type="button" class="btn btn-default"  @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-  import { DataModel } from 'vue-client'
-  import Vue from "vue";
-
-  let getBillData = async function(self, val) {
-    debugger
-    self.bill = new DataModel(self.billData.url, {reprint: "'正常'"})
-    await self.bill.search(self.data.chargeid)
-    // self.bill.condition=
-    // 获取发票号
-    self.model.f_using_number = self.billData.bill.number
-    console.log(self.bill)
-  }
-
-  export default {
-    title: '收费发票',
-    data () {
-      return {
-        model: {
-          f_using_number: null
-        },
-        bill: {},
-        messShow: false
-      }
-    },
-    props: ['show', 'data', 'billData', 'billConfig','titleName','billDataantai'],
-    ready () {
-      console.log('打票！！！！！！！！！！！！！！！！！')
-
-
-    },
-    methods: {
-        closebuyerinfo(){
-            this.show=false;
-        },
-      cancel  () {
-        this.$dispatch('toggle')
-      },
-
-
-      async print () {
-        // 更新系统发票
-          this.data.f_operator=this.$login.f.name,
-          this.data.f_filiale= this.$login.f.f_fengongsi,
-          this.data.f_outlets= this.$login.f.f_parentname,
-          this.data.f_orgstr=this.$login.f.orgpathstr,
-          this.data.f_filialeids=this.$login.f.f_orgids
-
-        try {
-          if (this.billConfig.hasBillManage) {
-            console.log("进入hasBillManage====================================")
-            await this.$commonService.openPaperBill(this.data.chargeid, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常',this.data.f_operator,this.data.f_filiale,this.data.f_outlets,this.data.f_orgstr,this.data.f_filialeids)
-          }
-          //票据打印！！！！！！！！！！！！！！！！！！！！
-          this.$refs.reportprint.print()
-          this.$dispatch('selfsearch')
-          this.$parent.model.f_charge_money=0
-          this.$parent.model.f_amount_words=0
-          this.$parent.model.f_amount_words=0
-          this.show=false
-        } catch (error) {
-          this.$dispatch('refresh')
-        }
-      }
-    },
-    watch: {
-      'show' (val) {
-        if (val) {
-          getBillData(this, val).then(() => {
-                }).catch((error) => {
-
-            this.$emit('error', error)
-          })
-        }
-      }
-    },
-    events: {
-      'print' () {
-        this.$dispatch('printok', '发票打印', this.data)
-      },
-      'print-error' () {
-        this.$dispatch('error', '发票打印', this.data, null)
-      }
-    }
-  }
-
-</script>
-<style >
-</style>
+<template>
+  <div class="auto form-horizontal" >
+    <modal  :show.sync="show" v-if="show"  v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title" >{{billConfig.billtype}}</h3>
+        <button type="button" class="close" @click="closebuyerinfo"><span>&times;</span></button>
+      </header>
+      <article slot="modal-body" class="modal-body">
+<!--        <div v-if="bill.data">-->
+<!--          {{{bill.data}}}-->
+<!--        </div>-->
+        <validator name='v'>
+          <form class="form-horizontal  select-overspread">
+            <div class="row" style="display: flex;justify-content: center;" id='normal-bill_xx' v-if="bill.data" v-html="bill.data">
+
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <div v-if="billConfig.hasBillManage">
+          <div class="col-sm-2" >
+            <span><strong>发票号:{{model.f_using_number}}</strong></span>
+          </div>
+        </div>
+        <button type="button" class="btn btn-success" @click='print()'>打印</button>
+        <report-print :id="'normal-bill_xx'" top='15mm' left='5mm'  width='90%'  height='70%' :notrepeat="false" :showbtn="false" v-ref:reportprint></report-print>
+        <button type="button" class="btn btn-default"  @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  import { DataModel } from 'vue-client'
+  import Vue from "vue";
+
+  let getBillData = async function(self, val) {
+    debugger
+    self.bill = new DataModel(self.billData.url, {reprint: "'正常'"})
+    await self.bill.search(self.data.chargeid)
+    // self.bill.condition=
+    // 获取发票号
+    self.model.f_using_number = self.billData.bill.number
+    console.log(self.bill)
+  }
+
+  export default {
+    title: '收费发票',
+    data () {
+      return {
+        model: {
+          f_using_number: null
+        },
+        bill: {data:''},
+        messShow: false
+      }
+    },
+    props: ['show', 'data', 'billData', 'billConfig','titleName','billDataantai'],
+    ready () {
+      console.log('打票！！！！！！！！！！！！！！！！！')
+
+
+    },
+    methods: {
+        closebuyerinfo(){
+            this.show=false;
+        },
+      cancel  () {
+        this.$dispatch('toggle')
+      },
+
+
+      async print () {
+        // 更新系统发票
+          this.data.f_operator=this.$login.f.name,
+          this.data.f_filiale= this.$login.f.f_fengongsi,
+          this.data.f_outlets= this.$login.f.f_parentname,
+          this.data.f_orgstr=this.$login.f.orgpathstr,
+          this.data.f_filialeids=this.$login.f.f_orgids
+
+        try {
+          if (this.billConfig.hasBillManage) {
+            console.log("进入hasBillManage====================================")
+            await this.$commonService.openPaperBill(this.data.chargeid, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常',this.data.f_operator,this.data.f_filiale,this.data.f_outlets,this.data.f_orgstr,this.data.f_filialeids)
+          }
+          //票据打印！！！！！！！！！！！！！！！！！！！！
+          this.$refs.reportprint.print()
+          this.$dispatch('selfsearch')
+          this.$parent.model.f_charge_money=0
+          this.$parent.model.f_amount_words=0
+          this.$parent.model.f_amount_words=0
+          this.show=false
+        } catch (error) {
+          this.$dispatch('refresh')
+        }
+      }
+    },
+    watch: {
+      'show' (val) {
+        if (val) {
+          getBillData(this, val).then(() => {
+                }).catch((error) => {
+
+            this.$emit('error', error)
+          })
+        }
+      }
+    },
+    events: {
+      'print' () {
+        this.$dispatch('printok', '发票打印', this.data)
+      },
+      'print-error' () {
+        this.$dispatch('error', '发票打印', this.data, null)
+      }
+    }
+  }
+
+</script>
+<style >
+</style>