apply-clients 5.0.35-19 → 5.0.35-22

package/package.json

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

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

@@ -291,6 +291,8 @@
 <script>
 
 // Date格式化
+
+
 Date.prototype.Format = function (fmt) {
   var o = {
     "M+": this.getMonth() + 1, //月份
@@ -309,7 +311,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'],
@@ -319,7 +321,6 @@ export default {
       isshow: true,
       kchege: false,
       kcbuhege: false,
-
       countmoney: [0, 0, 0],
       data: null,
       showmodal: false,
@@ -396,10 +397,6 @@ export default {
       }
     },
     sign() {
-      // if(!this.model.f_read_instructions){
-      //   this.$showMessage('请先阅读并勾选用户须知内容后进行签名！')
-      //   return
-      // }
       this.delAudioFile('f_sign_path', this.model.f_sign_path)
       let prop = 'f_sign_path'
       let idx = 'aofeng'
@@ -441,7 +438,7 @@ export default {
       console.log(this.isshow)
       Vue.nopic = 'file:///android_asset/nopic.png'
       if (!this.model.f_sign_path)
-      this.$set('model.f_sign_path', Vue.nopic)
+        this.$set('model.f_sign_path', Vue.nopic)
       console.log('!this.model.f_overall_imgs==>' + !this.model.f_overall_imgs)
       if (!this.model.f_overall_imgs) {
         let imgs = []
@@ -462,6 +459,54 @@ 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.fields[i].label==='气价名称'){
+            console.log(this.data.fields[i].options)
+            let data={
+              items:"f_price_name",
+              tablename:"t_stairprice",
+              condition:`f_filialeids = '${Vue.user.f_orgids}' and f_state= '有效' and getdate()>=f_perform_date and getdate()<=f_end_date `,
+              orderitem:'id'
+            }
+            let qijia=[]
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+              console.log("66666666666666666666")
+              console.log(JSON.stringify(res))
+              console.log(typeof res)
+              //console.log(JSON.stringify(res.data[0]))
+              let result=res.data
+              result.forEach(ress=>{
+                qijia.push({
+                  label:ress.f_price_name,
+                  value:ress.f_price_name
+                })
+              })
+              this.data.fields[i].options=qijia
+            })
+          }
+          if (this.data.fields[i].label==='气表品牌'){
+            console.log(this.data.fields[i].options)
+            let data={
+              items:"f_meter_brand",
+              tablename:"t_gasbrand",
+              condition:`f_filialeids = '${Vue.user.f_orgids}'`,
+              orderitem:'id'
+            }
+            let pinpai=[]
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+              console.log("666666666666666666662")
+              console.log(JSON.stringify(res))
+              console.log(typeof res)
+              //console.log(JSON.stringify(res.data[0]))
+              let result=res.data
+              result.forEach(ress=>{
+                pinpai.push({
+                  label:ress.f_meter_brand,
+                  value:ress.f_meter_brand
+                })
+              })
+              this.data.fields[i].options=pinpai
+            })
+          }
         }
       }
 
@@ -510,15 +555,23 @@ export default {
     // 点击按钮
     clicked(index, button) {
       console.log(`点击了按钮index:${index}+button:${JSON.stringify(button)}`);
-      if (this.data.title != '现场勘查' && this.data.title != '现场勘查定价' && this.button.button_name=='提交') {
+      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;
-        }else if(!this.model.f_sign_path){
+        }
+        if(Vue.nopic==this.model.f_sign_path){
           this.$showMessage("必须有签名照片")
           return;
         }
-      }else{
+        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;
@@ -585,6 +638,32 @@ export default {
       console.log(required)
       console.log(value)
       console.log(this.data.title)
+      if (this.data.fields[index].label=='气表品牌'){
+        console.log("进入改变气表型号")
+        console.log(this.data.fields[index+1].options)
+        this.data.fields[index+1].options=[]
+        let data={
+          items:"gm.f_meter_style",
+          tablename:"t_gasmodel gm left join t_gasbrand gb on  gm.f_gasbrand_id=gb.id",
+          condition:`gb.f_filialeids = '${Vue.user.f_orgids}' and  gb.f_meter_brand='${value}'`,
+          orderitem:'gm.id'
+        }
+        let xinghao=[]
+        new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+          console.log("66666666666666666666")
+          console.log(JSON.stringify(res))
+          console.log(typeof res)
+          //console.log(JSON.stringify(res.data[0]))
+          let result=res.data
+          result.forEach(ress=>{
+            xinghao.push({
+              label:ress.f_meter_style,
+              value:ress.f_meter_style
+            })
+          })
+          this.data.fields[index+1].options=xinghao
+        })
+      }
       if (this.data.title == '现场勘查') {
         if (index == 4) {
           if (value == '合格') {