apply-clients 3.3.216 → 3.3.220

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.216",
+  "version": "3.3.220",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -93,7 +93,7 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "system-clients": "3.1.87",
-    "system-phone": "1.1.18",
+    "system-phone": "1.2.81-1",
     "url-loader": "^0.5.7",
     "vue-client": "1.24.25",
     "vue-hot-reload-api": "^1.2.0",

package/src/apply.js

@@ -81,6 +81,7 @@ export default function (filiale) {
   Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
   Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/GaoPaiYi/HighMeter'], resolve) })
 
+  // Vue.component('apply-order', (resolve) => { require(['./components/android/Order/ApplyOrder'], resolve) })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/pc`).specialComp
     for (let key in filialeComp) {

package/src/applyAndroid.js

@@ -1,53 +1,54 @@
-import Vue from 'vue'
-import { all } from 'vue-client'
-Vue.config.silent = true
-import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
-import ApplyLoadParams from './stores/ApplyLoadParams'
-/** ****************服务插件*********************/
-
-export default function (filiale) {
-  Vue.use(ApplyGetSaleParam)
-  Vue.use(ApplyLoadParams)
-  /** ***************************报建模块*********************************/
-  // 报建 总入口
-  Vue.component('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
-  Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
-  Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
-  Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
-  Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
-  Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
-  //签字
-  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
-  //市场部负责人签字
-  Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
-  //技术部负责人签字
-  Vue.component('app-technology-sign', (resolve) => { require(['./components/android/Process/Processes/ApptechnologySign'], resolve) })
-  //调研表甲方负责人签字：
-  Vue.component('app-jiafang-sign', (resolve) => { require(['./components/android/Process/Processes/AppjiafangSign'], resolve) })
-  //告知单甲方负责人签字：
-  Vue.component('app-jia-sign', (resolve) => { require(['./components/android/Process/Processes/AppjiaSign'], resolve) })
-
-  Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
-  Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
-  Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
-
-  Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
-  Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
-  Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
-  Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
-   //收费
-  Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
-  // 施工安装明细
-  Vue.component('installation-details', (resolve) => { require(['./components/product/Process/Processes/InstallationDetails'], resolve) })
-  // 调研表打印单
-  Vue.component('market_survey', (resolve) => { require(['./components/product/Function/MarketSurvey'], resolve) })
-  // 安装标准告知单
-  Vue.component('inform', (resolve) => { require(['./components/product/Function/Inform'], resolve) })
-
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/android`).specialComp
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
-}
+import Vue from 'vue'
+import { all } from 'vue-client'
+Vue.config.silent = true
+import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
+import ApplyLoadParams from './stores/ApplyLoadParams'
+/** ****************服务插件*********************/
+
+export default function (filiale) {
+  Vue.use(ApplyGetSaleParam)
+  Vue.use(ApplyLoadParams)
+  /** ***************************报建模块*********************************/
+  // 报建 总入口
+  Vue.component('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
+  Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
+  Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
+  Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
+  Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
+  Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
+  //签字
+  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
+  //市场部负责人签字
+  Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
+  //技术部负责人签字
+  Vue.component('app-technology-sign', (resolve) => { require(['./components/android/Process/Processes/ApptechnologySign'], resolve) })
+  //调研表甲方负责人签字：
+  Vue.component('app-jiafang-sign', (resolve) => { require(['./components/android/Process/Processes/AppjiafangSign'], resolve) })
+  //告知单甲方负责人签字：
+  Vue.component('app-jia-sign', (resolve) => { require(['./components/android/Process/Processes/AppjiaSign'], resolve) })
+
+  Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
+  Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
+  Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
+
+  Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
+  Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
+  Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
+  Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
+   //收费
+  Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
+  // 施工安装明细
+  Vue.component('installation-details', (resolve) => { require(['./components/product/Process/Processes/InstallationDetails'], resolve) })
+  // 调研表打印单
+  Vue.component('market_survey', (resolve) => { require(['./components/product/Function/MarketSurvey'], resolve) })
+  // 安装标准告知单
+  Vue.component('inform', (resolve) => { require(['./components/product/Function/Inform'], resolve) })
+  //手机预约报装页面
+  Vue.component('apply-order', (resolve) => { require(['./components/android/Order/ApplyOrder'], resolve) })
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/android`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}

package/src/components/android/Order/ApplyOrder.vue

@@ -0,0 +1,86 @@
+<template>
+  <validator name='v'>
+  <div partial class="auto">
+    <div class="row form-group app-input" style="margin-top: 20px">
+      <label class="font_normal_body">用&ensp;户&ensp;名</label>
+      <input type="text" class="input_search" v-model="selectdata.f_user_name" v-validate:f_user_name = "['required']"/>
+    </div>
+    <div class="row form-group app-input">
+    <label class="font_normal_body">电&ensp;&ensp;&ensp;话</label>
+    <input type="text" class="input_search" v-model="selectdata.f_phone" v-validate:f_phone = "['required']" />
+    </div>
+    <div class="row form-group app-input">
+    <label class="font_normal_body">地&ensp;&ensp;&ensp;址</label>
+    <input type="text" class="input_search" v-model="selectdata.f_address" v-validate:f_address = "['required']" />
+    </div>
+    <div class="row form-group app-input">
+    <label class="font_normal_body">公&ensp;&ensp;&ensp;司</label>
+    <input type="text" class="input_search" v-model="selectdata.f_orgname" v-validate:f_orgname = "['required']" />
+    </div>
+      <div class="row form-group app-input">
+    <label class="font_normal_body">用气位置</label>
+    <input type="text" class="input_search" v-model="selectdata.f_usegasposition" v-validate:f_usegasposition = "['required']" />
+      </div>
+      <div class="row form-group app-input">
+    <label class="font_normal_body">用戶类型</label>
+    <input type="text" class="input_search" v-model="selectdata.f_user_type" v-validate:f_user_type = "['required']" />
+      </div>
+      <div class="row form-group app-input">
+    <label class="font_normal_body">省&ensp;市&ensp;区</label>
+    <input type="text" class="input_search" v-model="selectdata.f_pcd" v-validate:f_pcd = "['required']" />
+      </div>
+      <div class="row form-group app-input">
+    <label class="font_normal_body">备用电话</label>
+    <input type="text" class="input_search"  v-model="selectdata.f_spare_phone" v-validate:f_spare_phone = "['required']" />
+      </div>
+      <div class="row form-group app-input">
+    <label class="font_normal_body">安装情况</label>
+    <input type="text" class="input_search" v-model="selectdata.f_installation_situation" v-validate:f_installation_situation = "['required']" />
+      </div>
+
+      <div class="row form-group text-right" style="">
+    <button class="button_search button_spacing" :disabled='!$v.valid'
+            v-if="type !== 'view'"
+            @click="checkOrder()">保存</button>
+    <button class="button_clear button_spacing" @click="clear()">清除</button>
+  </div>
+  </div>
+  </validator>
+</template>
+
+<script>
+    export default {
+      title: '预约报装',
+      name: "ApplyOrder",
+      data() {
+        return {
+          selectdata: null
+        }
+      },
+      methods: {
+        async checkOrder() {
+          let data = {
+            selectdata: this.selectdata,
+            check: this.check,
+            user: this.$login.f
+          }
+
+          let res = await this.$resetpost(
+            `rs/logic/ApplyOrder`,
+            data,
+            {resolveMsg: null, rejectMsg: '申请报装失败,请检查内容！！！'}
+          )
+          this.clear()
+        },
+         clear() {
+          Object.keys(this.selectdata).forEach((key) => {
+            this.selectdata[key] = null
+          })
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/android/Process/AppExplorationUser.vue

@@ -157,7 +157,7 @@ export default {
         }
       }),
       criteriaShow: false,
-      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
+      applytype: this.$appdata.getParam('报建类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')]:[{label: '全部', value: ''}], // 所有报建类型
       // applytype: [{label: '全部', value: ''},{label: '散户报建', value: '散户报建'}], // 所有报建类型
 
       defnames: [{label: '全部', value: ''}]

package/src/components/android/Process/Processes/AppjiafangSign.vue

@@ -1,47 +1,47 @@
-<template>
-  <h3>调研表甲方负责人签字：</h3>
-  <app-sign @sign-success="signSuccess" :file-path="selectdata.f_jiafang_sign" @sign-clean="signClean"></app-sign>
-</template>
-<script>
-import {getNowDate,isEmpty} from '../../../Util'
-import {HttpResetClass} from 'vue-client'
-import Vue from "vue";
-
-export default {
-  title: '调研表甲方负责人签字',
-  props: {
-    selectdata: {
-      type: Object
-    },
-    mark: {
-      type: Number,
-      default: 0
-    }
-  },
-  data () {
-    return {
-    }
-  },
-  ready () {
-    console.log('===========调研表甲方负责人签字================')
-  },
-  methods: {
-    signClean () {
-      this.selectdata.f_jiafang_sign = null
-    },
-    signSuccess (fileUrl) {
-      console.log('==============调研表和调研表回调==================')
-      console.log(fileUrl)
-      this.selectdata.f_jiafang_sign = fileUrl
-    }
-  },
-  events: {
-  },
-  computed: {
-  },
-  watch: {
-  }
-}
-</script>
-<style scoped lang="less">
-</style>
+<template>
+  <h3>调研表甲方负责人签字：</h3>
+  <app-sign @sign-success="signSuccess" :file-path="selectdata.f_jiafang_sign" @sign-clean="signClean"></app-sign>
+</template>
+<script>
+import {getNowDate,isEmpty} from '../../../Util'
+import {HttpResetClass} from 'vue-client'
+import Vue from "vue";
+
+export default {
+  title: '调研表甲方负责人签字',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+    }
+  },
+  ready () {
+    console.log('===========调研表甲方负责人签字================')
+  },
+  methods: {
+    signClean () {
+      this.selectdata.f_jiafang_sign = null
+    },
+    signSuccess (fileUrl) {
+      console.log('==============调研表和调研表回调==================')
+      console.log(fileUrl)
+      this.selectdata.f_jiafang_sign = fileUrl
+    }
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped lang="less">
+</style>

package/src/components/android/Supervisory/AppProcessSupervisory.vue

@@ -162,7 +162,7 @@
           }
         }),
         criteriaShow: false,
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
+        applytype: this.$appdata.getParam('报建类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')]:[{label: '全部', value: ''}], // 所有报建类型
         // applytype: [{label: '全部', value: ''},{label: '散户报建', value: '散户报建'}], // 所有报建类型
         defnames: [{label: '全部', value: ''}]
       }