apply-clients 3.3.217 → 3.3.222

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.217",
+  "version": "3.3.222",
   "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

@@ -43,7 +43,8 @@ export default function (filiale) {
   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) {

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

@@ -0,0 +1,141 @@
+<template>
+  <div style="background-color: aliceblue">
+  <validator name='v'>
+  <div partial class="auto" >
+    <div  style="width:auto;height: 50px; background-color: #0b87e2;margin-top: 40px ">
+     <label style="color:white;margin-top:10px ;font-size: 20px;margin-left: 20px;">报装预约</label>
+     </div>
+    <div class="row form-group app-input" style="margin-top: 10px">
+      <img src="../../image/name.png" style="width: 20px;height: 20px; margin-top: 15px; float: left;">
+      <label class="font_normal_body">用&ensp;户&ensp;名</label>
+      <input type="text" class="input" placeholder='请输入用户名' style="margin-top: 15px;" v-model="selectdata.f_user_name" v-validate:f_user_name = "['required']"/>
+    </div>
+    <div class="row form-group app-input">
+      <img src="../../image/phone.png" style="width: 20px;height: 20px; margin-top: 15px;float: left;">
+      <label class="font_normal_body">电&ensp;&ensp;&ensp;&ensp;话</label>
+    <input type="number" class="input" style="margin-top: 15px;"placeholder='请输入用户人电话' v-model="selectdata.f_phone" v-validate:f_phone = "['required']" />
+    </div>
+    <div class="row form-group app-input">
+      <img src="../../image/dizhi.png" style="width: 20px;height: 20px; margin-top: 15px;float: left;">
+      <label class="font_normal_body">地&ensp;&ensp;&ensp;&ensp;址</label>
+    <input type="text" class="input" style="margin-top: 15px;" placeholder='请输入用户人地址' v-model="selectdata.f_address" v-validate:f_address = "['required']" />
+    </div>
+    <div class="row form-group app-input">
+      <img src="../../image/danwei.png" style="width: 20px;height: 20px;margin-top: 15px; float: left;">
+      <label class="font_normal_body">预约公司</label>
+      <v-select
+        v-model="selectdata.f_orgname"
+        class="select select_list"
+        :options='orgnames'
+        :value-single="true"
+        :search="false"
+        placeholder='请选择要预约的公司'
+        style="margin-top: 15px;"
+        width="77%"
+        close-on-select >
+      </v-select>
+    </div>
+<!--    <div class="row form-group app-input">-->
+<!--    <label class="font_normal_body">公&ensp;&ensp;&ensp;司</label>-->
+<!--&lt;!&ndash;    <input type="text" class="input_search" v-model="selectdata.f_orgname" v-validate:f_orgname = "['required']" />&ndash;&gt;-->
+<!--    </div>-->
+    <div class="row form-group app-input">
+      <img src="../../image/type.png" style="width: 20px;height: 20px; margin-top: 15px;float: left;">
+      <label class="font_normal_body">用气位置</label>
+      <input type="text" class="input" style="margin-top: 15px;" placeholder='请输入用气位置' v-model="selectdata.f_usegasposition" v-validate:f_usegasposition = "['required']" />
+      </div>
+      <div class="row form-group app-input">
+        <img src="../../image/我的.png" style="width: 20px;height: 20px;margin-top: 15px; float: left;">
+        <label class="font_normal_body">用戶类型</label>
+    <input type="text" class="input" style="margin-top: 15px;"placeholder='请输入用户类型' v-model="selectdata.f_user_type" v-validate:f_user_type = "['required']" />
+      </div>
+      <div class="row form-group app-input">
+   <img src="../../image/zizhukaitong.png" style="width: 20px;height: 20px;margin-top: 15px; float: left">
+        <label class="font_normal_body">省&ensp;市&ensp;区</label>
+       <input type="text" class="input" style="margin-top: 15px;"placeholder='请输入所在省市区' v-model="selectdata.f_pcd" v-validate:f_pcd = "['required']" />
+      </div>
+      <div class="row form-group app-input">
+        <img src="../../image/phone.png" style="width: 20px;height: 20px; margin-top: 15px; float: left;">
+        <label class="font_normal_body">备用电话</label>
+    <input type="number" class="input" style="margin-top: 15px;" placeholder='请输入备用电话'  v-model="selectdata.f_spare_phone" v-validate:f_spare_phone = "['required']" />
+      </div>
+      <div class="row form-group app-input">
+        <img src="../../image/zizhukaitong.png" style="width: 20px;height: 20px; margin-top: 15px; float: left;">
+        <label class="font_normal_body">安装情况</label>
+    <input type="text" class="input" style="margin-top: 15px;" placeholder='请输入安装情况' 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'
+            @click="checkOrder()">保存</button>
+    <button class="button_clear button_spacing" @click="clear()">清除</button>
+  </div>
+  </div>
+  </validator>
+  </div>
+</template>
+
+<script>
+    import Vue from "vue";
+
+    export default {
+      title: '预约报装',
+      name: "ApplyOrder",
+      data() {
+        return {
+          selectdata: null,
+          orgnames:null
+          // orgnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('预约公司')]
+        }
+      },
+      methods: {
+        async GS(){
+          let res = await this.$resetpost(
+            `rs/sql/ApplyOrder`,
+            {"data":{}},
+            {resolveMsg: null, rejectMsg: '公司查询失败,请检查内容！！！'}
+          )
+          this.orgnames=res.data
+        },
+
+
+        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
+          })
+        }
+      },
+      ready(){
+        this.GS()
+      }
+    }
+</script>
+
+<style scoped>
+  /*查询输入框*/
+  .input {
+    padding: 6px;
+    width: 77%;
+    height: 28px;
+    background-color: #ffffff;
+    border-radius: 2px;
+    border: solid 1px #c7c7c7;
+    color: #333333;
+    font-size: 12px;
+    font-family: PingFang;
+  }
+</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/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: ''}]
       }

package/src/components/product/Order/OrderMessage.vue

@@ -218,7 +218,8 @@ export default {
   computed: {
     applyType () {
       return this.$appdata.getParam("报建类型").filter(item => {
-        return item.label === '工商户报建' || item.label === '散户报建' || item.label ==='开发商集体报建' || item.label ==='预埋管报建'
+        debugger
+        return item.label === '工商户代建' || item.label === '居民散户代建' || item.label ==='居民社区代建' || item.label ==='预埋管报建'
       })
     }
   },