apply-clients 5.0.35-ezhou-3 → 5.0.35-ezhou-4

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>
@@ -8,10 +8,12 @@
         <div class="col-sm-11 form-group">
           <div v-for="(index,item) in data.fields">
             <!--input-->
-            <div v-if="item.type==='input'" v-show="!item.hidden"
+            <div v-if="item.type==='input' ||item.type === 'tel' " v-show="!item.hidden"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
               <label
-                :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{ item.label }}：</label>
+                :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{
+                  item.label
+                }}：</label>
               <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
                 <input class="form-control"
                        :type="item.type"
@@ -20,7 +22,7 @@
                        :value="data.fields[index].value"
                        :readonly="item.readonly"
                        :disable="item.disable"
-                       @change="disabled_check(index,data.fields[index].required,data.fields[index].value)"
+                       @change="select_change(index),disabled_check(index,data.fields[index].required,data.fields[index].value)"
                        @blur="check_disable"
                 />
               </div>
@@ -29,7 +31,9 @@
             <div v-if="item.type==='number'" v-show="!item.hidden"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
               <label
-                :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{ item.label }}：</label>
+                :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{
+                  item.label
+                }}：</label>
               <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
                 <input class="form-control"
                        :type="item.type"
@@ -48,7 +52,9 @@
             <div v-if="item.type==='datepicker'"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-xs-12 form-group']">
               <label style="margin-top: 0.7em"
-                     :class="item.label_bootstraped?item.label_bootstraped +' control-label':'control-label col-sm-6'">{{ item.label }}：</label>
+                     :class="item.label_bootstraped?item.label_bootstraped +' control-label':'control-label col-sm-6'">{{
+                  item.label
+                }}：</label>
               <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
                 <datepicker
                   :placeholder="item.placeholder"
@@ -70,7 +76,9 @@
             <div v-if="item.type==='textarea'"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-12 form-group']">
               <label
-                :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{ item.label }}：</label>
+                :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{
+                  item.label
+                }}：</label>
               <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-10'">
                 <textarea
                   :readonly="item.readonly"
@@ -89,7 +97,9 @@
             <div v-if="item.type==='radio'"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-12 form-group']">
               <label v-if="item.label"
-                     :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{ item.label }}：</label>
+                     :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{
+                  item.label
+                }}：</label>
               <div class="col-xs-12">
                 <div
                   :class="item.value_bootstraped?item.value_bootstraped:item.items.length%2 == 0?'col-xs-5': 'col-xs-3'"
@@ -108,7 +118,9 @@
             <div v-if="item.type==='select'"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
               <label
-                :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{ item.label }}：</label>
+                :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{
+                  item.label
+                }}：</label>
               <input-select :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'" @blur="check_disable"
                             @change="select_change(index),disabled_check(index,data.fields[index].required,data.fields[index].value)"
                             :readonly="item.readonly" :disable="item.disabled" :value.sync="data.fields[index].value"
@@ -121,20 +133,20 @@
             <div v-if="item.type==='checkbox'"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-12 form-group']">
               <label v-if="item.label"
-                     :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{ item.label }}：</label>
-              <div style="margin-top: 0.7em"
+                     :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{item.label }}</label>
+              <div style="margin-top: 6px"
                    :class="item.value_bootstraped?item.value_bootstraped:'control-label col-sm-2'"
                    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>
 
 
           </div>
         </div>
-        <div class="form-group col-sm-11" v-show="isshow">
+        <div class="form-group col-sm-11">
           <label class="text-left font">现场照片</label>
 
           <div class="auto">
@@ -160,7 +172,7 @@
             </div>
           </div>
         </div>
-        <div class="form-group col-sm-11" v-show="isshow">
+        <div class="form-group col-sm-11" v-show="true">
           <label class="text-left font">用户签名</label>
           <div class="auto">
             <div class="panel">
@@ -202,6 +214,15 @@
 
 
         </div>
+
+
+
+        <div class="col-sm-11 form-group" v-for="item in onetomany" style="text-align: center">
+
+          <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;" @click="gotoOneToMany(item)">前往{{item.title}}</button>
+
+        </div>
+
         <div class="col-sm-11 form-group">
           <div class="form-group  col-sm-6">
             <label class=" col-sm-4 control-label">分公司：</label>
@@ -277,6 +298,8 @@
 <script>
 
 // Date格式化
+
+
 Date.prototype.Format = function (fmt) {
   var o = {
     "M+": this.getMonth() + 1, //月份
@@ -295,7 +318,7 @@ Date.prototype.Format = function (fmt) {
 
 import Vue from 'vue'
 import * as Util from '../../Util'
-
+import  {HttpResetClass} from 'vue-client'
 export default {
   title: '报建业务通用组件',
   props: ['data', 'model'],
@@ -305,11 +328,12 @@ export default {
       isshow: true,
       kchege: false,
       kcbuhege: false,
-
       countmoney: [0, 0, 0],
       data: null,
       showmodal: false,
-      disable_button: true
+      disable_button: true,
+      onetomany: [],
+      refresh: true // 控制重新渲染
     }
   },
   created() {
@@ -318,12 +342,18 @@ export default {
     this.initializtion()
   },
   methods: {
-    gotohetong(val) {
+    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) {
       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({
@@ -336,7 +366,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)
@@ -367,13 +397,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 {
@@ -381,11 +411,7 @@ export default {
         this.model[prop] = null
       }
     },
-    sign() {
-      // if(!this.model.f_read_instructions){
-      //   this.$showMessage('请先阅读并勾选用户须知内容后进行签名！')
-      //   return
-      // }
+    sign () {
       this.delAudioFile('f_sign_path', this.model.f_sign_path)
       let prop = 'f_sign_path'
       let idx = 'aofeng'
@@ -403,7 +429,7 @@ export default {
         callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
       })
     },
-    delfile(prop, fileName, index) {
+    delfile (prop, fileName, index) {
       if (fileName == Vue.nopic)
         return
       else {
@@ -417,12 +443,13 @@ export default {
       }
     },
     // 初始化数据
-    initializtion() {
-
-      if (this.data.title == '安装通气') {
+    initializtion () {
+      if (this.data.title == '现场勘查' || this.data.title == '现场勘查定价') {
         this.isshow = false
       }
       console.log("5555555555555")
+      console.log("f_apply_num",this.data.f_apply_num)
+      console.log("f_filiale",this.data.f_filiale)
       console.log(this.data.f_user_type)
       console.log(this.isshow)
       Vue.nopic = 'file:///android_asset/nopic.png'
@@ -431,16 +458,15 @@ export default {
       console.log('!this.model.f_overall_imgs==>' + !this.model.f_overall_imgs)
       if (!this.model.f_overall_imgs) {
         let imgs = []
-        // imgs.push({f_overall_path:Vue.nopic})
         this.$set('model.f_overall_imgs', imgs)
         console.log('进入setmodel.f_overall_imgs')
       }
       console.log('进入serviceview的initializtion方法')
       console.log(JSON.stringify(this.data))
-      // let temp = this.data
-      // let temp = JSON.parse()
-      // this.data = temp
-      // datepicker 没有值给当时值
+      if(this.data.onetomany){
+        console.log(JSON.stringify(this.data.onetomany))
+        this.onetomany = this.data.onetomany
+      }
       if (this.data.fields) {
         for (let i = 0; i < this.data.fields.length; i++) {
           if (this.data.fields[i].value) {
@@ -453,6 +479,15 @@ export default {
           if (this.data.fields[i].type === 'datepicker' && !this.data.fields[i].value) {
             this.data.fields[i].value = new Date().Format("yyyy-MM-dd HH:mm:ss")
           }
+          if(this.data.f_user_type ==='非民用'){
+            this.data.fields[i].required = false
+          }
+          if (this.data.fields[i].label==='气价名称'){
+              this.data.fields[i].options=Vue.prototype.$qijia
+          }
+          if (this.data.fields[i].label==='气表品牌'){
+              this.data.fields[i].options=Vue.prototype.$pinpai
+          }
         }
       }
 
@@ -482,7 +517,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
       }
@@ -490,17 +525,39 @@ 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){
+          this.$showMessage("必须有现场照片")
+          return;
+        }
+        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
+        })
+      }
+
+
+      // if ((this.data.title == '现场勘查' || this.data.title == '现场勘查定价') && button.button_name=='提交') {
+      //   if (!this.model.f_overall_imgs || this.model.f_overall_imgs.length == 0){
+      //     this.$showMessage("必须有现场照片")
+      //     return;
+      //   }
+      // }
       if (this.kchege == 'true') {
         console.log(this.model.f_hege)
         if (this.model.f_hege != 'true') {
@@ -552,16 +609,22 @@ 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)
       console.log(value)
       console.log(this.data.title)
+      if (this.data.fields[index].label=='气表品牌'){
+        console.log("进入改变气表型号")
+        const pinpai = Vue.prototype.$pinpai.filter(res=>res.value===value);
+        const arr = Vue.prototype.$xinghao.filter(res=>res.id==pinpai[0].id)
+        this.$set(`data.fields[${index+1}].options`,arr)
+      }
       if (this.data.title == '现场勘查') {
         if (index == 4) {
           if (value == '合格') {
@@ -576,19 +639,19 @@ export default {
         }
       }
       if (this.data.title == '现场勘查定价') {
-        if (index == 6 || index == 7 || index == 5) {
-          this.countmoney[index - 5] = parseInt(this.data.fields[index].value)
-          console.log(this.data.fields[index].value)
-          console.log("做出了改变")
-        }
-        console.log(JSON.stringify(this.countmoney))
-        let money = 0
-        for (let i = 0; i < this.countmoney.length; i++) {
-          money += this.countmoney[i]
-        }
-        this.$set('data.fields[8].value', money)
-        this.$set('data.fields[9].value', money)
-        if (index == 10) {
+        // if (index == 6 || index == 7 || index == 5) {
+        //   this.countmoney[index - 5] = parseInt(this.data.fields[index].value)
+        //   console.log(this.data.fields[index].value)
+        //   console.log("做出了改变")
+        // }
+        // console.log(JSON.stringify(this.countmoney))
+        // let money = 0
+        // for (let i = 0; i < this.countmoney.length; i++) {
+        //   money += this.countmoney[i]
+        // }
+        // this.$set('data.fields[8].value', money)
+        // this.$set('data.fields[9].value', money)
+        if (index == 7) {
           console.log("1111111111" + value)
           if (value == '合格') {
             this.kchege = true
@@ -613,7 +676,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) {
@@ -622,7 +697,7 @@ export default {
 
       }
     },
-    'data.operate_date'() {
+    'data.operate_date' () {
       if (this.data.filiale) {
         this.model.f_filiale = this.data.filiale
       } else {
@@ -644,6 +719,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/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/Common/PrintBill.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="auto form-horizontal" >
-    <modal :show.sync="show"  v-ref:modal large backdrop="false">
+    <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>
@@ -11,8 +11,8 @@
 <!--        </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 class="row" style="display: flex;justify-content: center;" id='normal-bill_xx' v-if="bill.data" v-html="bill.data">
+
             </div>
           </form>
         </validator>
@@ -24,7 +24,7 @@
           </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>
+        <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>
@@ -35,6 +35,7 @@
   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=
@@ -50,11 +51,11 @@
         model: {
           f_using_number: null
         },
-        bill: {},
+        bill: {data:''},
         messShow: false
       }
     },
-    props: ['show', 'data', 'billData', 'billConfig','titleName'],
+    props: ['show', 'data', 'billData', 'billConfig','titleName','billDataantai'],
     ready () {
       console.log('打票！！！！！！！！！！！！！！！！！')