apply-clients 7.1.36-yuchuan-13 → 7.1.36-yuchuan-16

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

@@ -847,7 +847,7 @@ export default {
     async getAreaList () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale = '${Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用'`
+        condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(
@@ -869,7 +869,7 @@ export default {
       let pcdText = `and f_residential_area like '%${val}%'`
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale = '${Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用' ${pcdText}`
+        condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用' ${pcdText}`
       }
       new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/applySingleTable`, {data:data}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
         console.log('请求发送完成！！！！！'+JSON.stringify(res))

package/src/components/android/Sign/AppSignTask.vue

@@ -88,7 +88,7 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/signcheckuser`, 20, {
         data: {
           userid: Vue.user.id,
-          f_filiale:Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'
+          f_filiale:Vue.user.orgs
         }
       }),
       criteriaShow: false,

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

@@ -213,7 +213,7 @@
         model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/appSupervisory`, 20, {
           data: {
             id: Vue.user.id,
-            f_filiale: Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'
+            f_filiale: Vue.user.orgs
           }
         }),
         criteriaShow: false,

package/src/components/android/Task/GuanXianJianShe/AppExplorationGuanXian.vue

@@ -117,7 +117,7 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getGuanXianApply`, 20, {
         data: {
           userid: Vue.user.id,
-          f_filiale: Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'
+          f_filiale: Vue.user.orgs
         }
       }),
       criteriaShow: false,
@@ -210,7 +210,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale = '${Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用'`
+        condition: `f_filiale like '%${Vue.user.f_filiale}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(

package/src/components/android/Task/ShiGongXinXi/AppShowBuildUser.vue

@@ -233,7 +233,7 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/showBuildCheckuser`, 20, {
         data: {
           userid: Vue.user.id,
-          f_filiale: Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'
+          f_filiale: Vue.user.orgs
         }
       }),
       criteriaShow: false,
@@ -335,7 +335,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale = '${Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用'`
+        condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(

package/src/components/android/Task/yiban/AppShowDone.vue

@@ -234,7 +234,7 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/yiBanSupervisory`, 20, {
         data: {
           userid: Vue.user.id,
-          f_filiale: Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'
+          f_filiale: Vue.user.orgs
         }
       }),
       criteriaShow: false,
@@ -346,7 +346,7 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale = '${Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用'`
+        condition: `f_filiale like '%${Vue.user.orgs}%' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(

package/src/components/android/Task/yiban/ShowDone.vue

@@ -1,95 +1,95 @@
-<template>
-  <div>
-    <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab2" :active.sync="active">
-      <tab header='任务列表' style="width: auto">
-        <app-build-done v-ref:exploration :defname="defname"   :title="title" :f_lat="f_lat" :f_lng="f_lng"></app-build-done>
-      </tab>
-    </tabset>
-  </div>
-</template>
-<script>
-import {HttpResetClass, PagedList} from 'vue-client'
-import Vue from 'vue'
-
-export default {
-  title: '已办信息',
-  data () {
-    return {
-      labelmarksarray: [],
-      tasknumber: 0,
-      active: 0,
-      f_lat: null,
-      f_lng: null,
-      defname: '已办信息',
-      title: '已办信息'
-    }
-  },
-  ready () {
-    this.getApplyTaskDot()
-  },
-  methods: {
-    diyspotmouseclick (data) {
-      this.f_lat = data.f_lat
-      this.f_lng = data.f_lng
-
-      this.active = 1
-    },
-    async getApplyTaskDot () {
-      console.log('==========查询任务点==============')
-      this.tasknumber = 0
-      let http = new HttpResetClass()
-      let data = {
-        defname: this.defname,
-        userid: Vue.user.id
-      }
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/getApplyTaskDot`,
-        {data: data},
-        {
-          resolveMsg: null,
-          rejectMsg: '任务点获取失败！！！'
-        })
-      this.labelmarksarray = res.data.map(item => {
-        this.tasknumber += item.count
-        return {
-          data: {
-            data: item,
-            content: `<p>任务数：${item.count}</p>`
-          },
-          position: [item.f_lng, item.f_lat],
-          isclearmarker: false,
-          islabel: false
-        }
-      })
-    }
-  },
-  events: {
-    'refreshDot' () {
-      this.getApplyTaskDot()
-    }
-  },
-  watch: {
-  },
-  computed: {
-  }
-}
-</script>
-<style scoped>
-.tip{
-  position: absolute;
-  z-index: 1000;
-  color: red;
-  font-size: 24px;
-  right: 30px;
-  padding-top: 20px;
-}
-</style>
-<style lang="less">
-.nav-apply-tab2 {
-  li {
-    width: 100%;
-    text-align: center;
-  }
-}
-</style>
+<template>
+  <div>
+    <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab2" :active.sync="active">
+      <tab header='任务列表' style="width: auto">
+        <app-build-done v-ref:exploration :defname="defname"   :title="title" :f_lat="f_lat" :f_lng="f_lng"></app-build-done>
+      </tab>
+    </tabset>
+  </div>
+</template>
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '已办信息',
+  data () {
+    return {
+      labelmarksarray: [],
+      tasknumber: 0,
+      active: 0,
+      f_lat: null,
+      f_lng: null,
+      defname: '已办信息',
+      title: '已办信息'
+    }
+  },
+  ready () {
+    this.getApplyTaskDot()
+  },
+  methods: {
+    diyspotmouseclick (data) {
+      this.f_lat = data.f_lat
+      this.f_lng = data.f_lng
+
+      this.active = 1
+    },
+    async getApplyTaskDot () {
+      console.log('==========查询任务点==============')
+      this.tasknumber = 0
+      let http = new HttpResetClass()
+      let data = {
+        defname: this.defname,
+        userid: Vue.user.id
+      }
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/getApplyTaskDot`,
+        {data: data},
+        {
+          resolveMsg: null,
+          rejectMsg: '任务点获取失败！！！'
+        })
+      this.labelmarksarray = res.data.map(item => {
+        this.tasknumber += item.count
+        return {
+          data: {
+            data: item,
+            content: `<p>任务数：${item.count}</p>`
+          },
+          position: [item.f_lng, item.f_lat],
+          isclearmarker: false,
+          islabel: false
+        }
+      })
+    }
+  },
+  events: {
+    'refreshDot' () {
+      this.getApplyTaskDot()
+    }
+  },
+  watch: {
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.tip{
+  position: absolute;
+  z-index: 1000;
+  color: red;
+  font-size: 24px;
+  right: 30px;
+  padding-top: 20px;
+}
+</style>
+<style lang="less">
+.nav-apply-tab2 {
+  li {
+    width: 100%;
+    text-align: center;
+  }
+}
+</style>

package/src/components/android/Task/yiban/satisfactionShow.vue

@@ -1,166 +1,166 @@
-<template>
-  <div class="p-10">
-        <div partial class="auto">
-          <div class="row form-group app-input">
-            <label class="">客户名称：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=selectdata.f_user_name />
-            </div>
-          </div>
-          <div class="row form-group app-input" >
-            <label class="">联系电话：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=selectdata.f_phone />
-            </div>
-          </div>
-          <div class="row form-group app-input" >
-            <label class="">证件类型：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=selectdata.f_credentials />
-            </div>
-          </div>
-          <div class="row form-group app-input" >
-            <label class="">证件号码：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=selectdata.f_idnumber />
-            </div>
-          </div>
-          <div class="row form-group app-input" >
-            <label class="">工程编号：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=selectdata.f_apply_num  />
-            </div>
-          </div>
-          <div class="row form-group app-input" >
-            <label class="">用户地址：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=selectdata.f_address  />
-            </div>
-          </div>
-          <div class="row form-group app-input" >
-            <label class="">报建类型：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=selectdata.f_apply_type  />
-            </div>
-          </div>
-          <div class="row form-group app-input" >
-            <label class="">报建性质：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=selectdata.f_apply_nature  />
-            </div>
-          </div>
-          <div class="row form-group app-input" >
-            <label class="">客户类型：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=selectdata.f_user_type  />
-            </div>
-          </div>
-        </div>
-
-    <div class="col-sm-12 col-xs-12">
-      <accordion one-at-a-time="true">
-        <panel header='附件' :is-open="false" type="primary">
-          <app-upload :blodid="selectdata.f_process_id"
-                      :isupload="true"
-                      :isdelete="true"
-                      :isusetype="true"
-                      :isremark="true"
-                      :takeimg="true"
-                      :issearch="true"
-                      :defname="selectdata.defname">
-          </app-upload>
-        </panel>
-      </accordion>
-    </div>
-  </div>
-
-</template>
-<script>
-import {getNowDate, isEmpty} from '../../../Util'
-// Date格式化
-Date.prototype.Format = function (fmt) {
-  var o = {
-    'M+': this.getMonth() + 1, // 月份
-    'd+': this.getDate(), // 日
-    'H+': this.getHours(), // 小时
-    'm+': this.getMinutes(), // 分
-    's+': this.getSeconds(), // 秒
-    'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
-    'S': this.getMilliseconds() // 毫秒
-  }
-  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
-  for (var k in o) {
-    if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
-  }
-  return fmt
-}
-
-export default {
-  title: '完工',
-  props: ['selectdata', 'title'],
-  data () {
-    return {
-    }
-  },
-  ready () {
-    console.log(this.selectdata)
-  },
-  methods: {
-  },
-  events: {},
-  computed: {},
-  watch: {}
-}
-</script>
-<style scoped>
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.font{
-  font: 15px PingFang-SC-Medium;
-  color: #666666;
-}
-
-.button_shrink_top {
-  width: 34px;
-  height: 34px;
-  border: solid 1px #6aa6e2;
-  background-size: 100%;
-  background-image: url("../../../../../static/newStyle/stretch_top.png")
-}
-
-.button_shrink_bottom {
-  width: 34px;
-  height: 34px;
-  border: solid 1px #6aa6e2;
-  background-size: 100%;
-  background-image: url("../../../../../static/newStyle/stretch_bottom.png")
-}
-</style>
-<style lang="less">
-.app-input {
-  label {
-    float: left;
-  }
-  .select {
-    button {
-      border: none;
-      outline: none;
-      text-align: left;
-      .btn-placeholder {
-        color: #ACA899
-      }
-    }
-  }
-  .datepicker {
-    .form-control:focus {
-      border: none!important;
-      outline: none!important;
-      -webkit-box-shadow: none;
-      box-shadow: none;
-    }
-  }
-}
-</style>
+<template>
+  <div class="p-10">
+        <div partial class="auto">
+          <div class="row form-group app-input">
+            <label class="">客户名称：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=selectdata.f_user_name />
+            </div>
+          </div>
+          <div class="row form-group app-input" >
+            <label class="">联系电话：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=selectdata.f_phone />
+            </div>
+          </div>
+          <div class="row form-group app-input" >
+            <label class="">证件类型：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=selectdata.f_credentials />
+            </div>
+          </div>
+          <div class="row form-group app-input" >
+            <label class="">证件号码：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=selectdata.f_idnumber />
+            </div>
+          </div>
+          <div class="row form-group app-input" >
+            <label class="">工程编号：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=selectdata.f_apply_num  />
+            </div>
+          </div>
+          <div class="row form-group app-input" >
+            <label class="">用户地址：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=selectdata.f_address  />
+            </div>
+          </div>
+          <div class="row form-group app-input" >
+            <label class="">报建类型：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=selectdata.f_apply_type  />
+            </div>
+          </div>
+          <div class="row form-group app-input" >
+            <label class="">报建性质：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=selectdata.f_apply_nature  />
+            </div>
+          </div>
+          <div class="row form-group app-input" >
+            <label class="">客户类型：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=selectdata.f_user_type  />
+            </div>
+          </div>
+        </div>
+
+    <div class="col-sm-12 col-xs-12">
+      <accordion one-at-a-time="true">
+        <panel header='附件' :is-open="false" type="primary">
+          <app-upload :blodid="selectdata.f_process_id"
+                      :isupload="true"
+                      :isdelete="true"
+                      :isusetype="true"
+                      :isremark="true"
+                      :takeimg="true"
+                      :issearch="true"
+                      :defname="selectdata.defname">
+          </app-upload>
+        </panel>
+      </accordion>
+    </div>
+  </div>
+
+</template>
+<script>
+import {getNowDate, isEmpty} from '../../../Util'
+// Date格式化
+Date.prototype.Format = function (fmt) {
+  var o = {
+    'M+': this.getMonth() + 1, // 月份
+    'd+': this.getDate(), // 日
+    'H+': this.getHours(), // 小时
+    'm+': this.getMinutes(), // 分
+    's+': this.getSeconds(), // 秒
+    'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+    'S': this.getMilliseconds() // 毫秒
+  }
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (var k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+  }
+  return fmt
+}
+
+export default {
+  title: '完工',
+  props: ['selectdata', 'title'],
+  data () {
+    return {
+    }
+  },
+  ready () {
+    console.log(this.selectdata)
+  },
+  methods: {
+  },
+  events: {},
+  computed: {},
+  watch: {}
+}
+</script>
+<style scoped>
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+
+.button_shrink_top {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../../static/newStyle/stretch_top.png")
+}
+
+.button_shrink_bottom {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../../static/newStyle/stretch_bottom.png")
+}
+</style>
+<style lang="less">
+.app-input {
+  label {
+    float: left;
+  }
+  .select {
+    button {
+      border: none;
+      outline: none;
+      text-align: left;
+      .btn-placeholder {
+        color: #ACA899
+      }
+    }
+  }
+  .datepicker {
+    .form-control:focus {
+      border: none!important;
+      outline: none!important;
+      -webkit-box-shadow: none;
+      box-shadow: none;
+    }
+  }
+}
+</style>

package/src/components/android/newPackage/customerServiceManager.vue

@@ -136,7 +136,7 @@ export default {
             condition: '1=1',
             data: {
               id: Vue.user.id,
-              f_filiale: Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'
+              f_filiale: Vue.user.orgs
               // id: this.$login.f.id,
               // f_filiale: this.$login.f.f_fengongsi
             }

package/src/components/android/newPackage/projectPrice.vue

@@ -136,7 +136,7 @@ export default {
             condition: '1=1',
             data: {
               id: Vue.user.id,
-              f_filiale: Vue.user.f_fengongsi?Vue.user.f_fengongsi:'榆林.榆川天然气'
+              f_filiale: Vue.user.orgs
               // id: this.$login.f.id,
               // f_filiale: this.$login.f.f_fengongsi
             }