apply-clients 3.3.68 → 3.3.71-2

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

@@ -110,10 +110,10 @@
             <div class="col-xs-8" >
               <v-select
                 width="100%"
-                v-model="model.f_is_later"
+                v-model="model.f_no_valid"
                 placeholder='稍后处理'
-                condition="f_is_later = '{}'"
-                :value.sync="model.f_is_later"
+                condition="lp.f_no_valid = '{}'"
+                :value.sync="model.f_no_valid"
                 :options='$parent.$parent.laterList'
                 class="select select_list"
                 :value-single="true"
@@ -123,6 +123,7 @@
           <div class="row form-group text-right" style="">
             <button class="btn btn-primary" @click="$parent.$parent.search()">查询</button>
             <button class="btn btn-info" @click="$parent.$parent.clear()">清空</button>
+            <button class="btn btn-info" @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
             <button class="btn" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></button>
           </div>
         </div>
@@ -148,7 +149,7 @@
             </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>客户编号：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_userinfo_code }}</p>
+              <p :class="[ row.defname =='通气点火' && (row.f_apply_nature=='热水器' || row.f_apply_nature=='壁挂炉') ? 'redy' : (row.f_apply_nature=='热水器' || row.f_apply_nature=='壁挂炉' ? 'pred': (row.defname =='通气点火' ? 'p1':''))]" class="col-xs-9 text-left input-font">{{ row.f_userinfo_code }}</p>
             </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
@@ -171,14 +172,79 @@
               <p class="col-xs-9 text-left input-font">{{ row.f_construction_remarks }}</p>
             </div>
 
+            <div class="col-xs-12" v-if="row.f_no_valid != null">
+              <p class="col-xs-4 text-left font"><b>稍后处理备注：</b></p>
+              <p class="col-xs-8 text-left input-font" style="color: red">{{row.f_later_remarks}}</p>
+            </div>
+
+            <div class="col-xs-12" v-if="row.f_back_reason != null">
+              <p class="col-xs-4 text-left font"><b>退回备注：</b></p>
+              <p class="col-xs-8 text-left input-font">
+                <span style="color: red;font-family: 微软雅黑;font-weight: bold;font-size: 18px">请注意被退回原因为:{{row.f_back_reason}} 退回时间：{{row.f_date}}</span>
+              </p>
+            </div>
+
             <div class="col-xs-12 text-right">
-              <button class="btn btn-info" @click="$parent.$parent.$parent.later(row)" v-if="row.f_is_later !== '是'">稍后处理</button>
+              <button class="btn btn-info" type="button" @click="$parent.$parent.$parent.openLater(row) " v-if="row.f_no_valid !== '有效'">稍后处理</button>
               <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">处理</button>
             </div>
           </div>
         </div>
       </list>
+
     </criteria-paged>
+    <validator name="v">
+      <modal v-if="showLater" :show.sync="showLater" v-ref:modal :large="true" :backdrop="false" title="稍后处理">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+          <h4 class="modal-title">稍后处理</h4>
+        </header>
+
+        <article slot="modal-body" class="modal-body clearfix">
+          <div class="form-group col-sm-12">
+            <label class="col-sm-2 control-label">稍后处理备注：</label>
+            <div class="col-sm-10">
+              <input type="textarea"
+                     class="form-control input_view"
+                     style="width: 100%"
+                     v-model="laterapply.f_later_remarks" />
+            </div>
+          </div>
+        </article>
+
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="later()">稍后处理</button>
+        </footer>
+      </modal>
+    </validator>
+    <validator name="v">
+      <modal
+        v-if="showModal"
+        :show.sync="showModal"
+        backdrop="false"
+        title="工程类型"
+        cancel-text="取消"
+        ok-text="确认"
+        :callback="apply"
+      >
+        <div class="form-horizontal" slot="modal-body">
+          <div class="form-group" style="margin: 10px auto">
+            <label class="col-sm-3 control-label">报建类型：</label>
+            <div class="col-sm-9">
+              <v-select
+                v-model="applyType"
+                placeholder='请选择需要发起的工程类型'
+                :value.sync="applyType"
+                :options='applyTypes'
+                :value-single="true"
+                class="select select_list"
+                :search="false"
+                close-on-select ></v-select>
+            </div>
+          </div>
+        </div>
+      </modal>
+    </validator>
   </div>
 </template>
 <script>
@@ -189,42 +255,56 @@ export default {
   title: '报建流程',
   data () {
     return {
+      selectdate: {},
+      showLater: false,
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`, 20, {
-      // model: new PagedList('rs/sql/checkuser', 20, {
         data: {
           id: Vue.user.id,
           orgid: Vue.user.orgid
-          // id: '51953',
-          // orgid: '10101'
-        }
+        },
       }),
+      showModal: false,
+      applyType: '',  // 报建类型
+      //applyTypes:this.$appdata.getParam("报建类型"),
+      applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'},{label:'团购报建',value:'团购报建'},{label:'改管报建',value:'改管报建'},{label:'增容报建',value:'增容报建'},{label:'退款报建',value:'退款报建'},{label:'团购转散户',value:'团购转散户'}],
       criteriaShow: false,
-      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
+    //  applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
+      applytype: [{label: '全部', value: ''},  ...this.$appdata.getParam('报建类型') || [] ], // 所有报建类型
       defnames: [{label: '全部', value: ''}],
       applyNatures: [{label: '全部', value: ''}], // 报建性质
       laterList: [
         {label: '全部', value: ''},
-        {label: '是', value: '是'},
-        {label: '否', value: '否'}
-      ]
+        {label: '有效', value: '有效'}
+      ],
+      laterapply: {}
     }
   },
   ready () {
     this.search()
   },
   methods: {
-    async later (row) {
-      let res = await this.$showMessage('您确定要将此任务加入稍后处理吗？', ['confirm'])
-
-      if (res === 'confirm') {
-        row.f_is_later = '是'
-        let res = await this.$resetpost(
-          `${this.$androidUtil.getProxyUrl()}rs/entity/t_apply`,
-          row
-        )
-
-        this.$refs.cp.$refs.cri.search()
+    openLater (row) {
+      this.selectdate = row
+      this.showLater=true
+    },
+    async later () {
+      let http = new HttpResetClass()
+      let data = {
+        laterapply: this.laterapply,
+        selectdata: this.selectdate,
+        user: Vue.user
       }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/laterprocessing`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '稍后处理记录保存失败！！！'
+      })
+      this.closeModal()
+    },
+    closeModal() {
+      this.selectdate = null
+      this.showLater = false
+      this.laterapply = {}
+      this.search()
     },
     dialNumber (phone) {
       this.$showMessage(`是否拨打电话：${phone}`, ['confirm']).then((res) => {
@@ -243,7 +323,7 @@ export default {
       this.$refs.cp.$refs.cri.search()
     },
     searchCondition (args) {
-      args.condition += `and act.defname in ${this.appDefnames}`
+      //args.condition += `and act.defname in ${this.appDefnames}`
       this.model.search(args.condition, args.model)
     },
     click (row) {
@@ -271,7 +351,68 @@ export default {
 
         this.applyNatures = [{label: '全部', value: ''}]
       }
-    }
+    },
+    // 报装申请
+    async apply () {
+      if (this.applyType === '' || this.applyType === null) {
+        this.$showAlert('请选择需要发起的类型', 'warning', 3000)
+        return
+      }
+      let data = {
+        f_apply_type: this.applyType
+      }
+      if (this.applyType === '散户报建') {
+        data.processname = '散户报建流程'
+        data.defname = '报装申请'
+      } else if (this.applyType === '工商户报建') {
+        data.processname = '工商户报建流程'
+        data.defname = '报装申请'
+      } else if (this.applyType === '改管报建') {
+        data.processname = '改管报建流程'
+        data.defname = '报装申请'
+      } else if (this.applyType === '增容报建') {
+        data.processname = '增容报建流程'
+        data.defname = '报装申请'
+      } else if (this.applyType === '团购报建') {
+        data.processname = '团购报建流程'
+        data.defname = '报装申请'
+      } else if (this.applyType === '退款报建') {
+        data.processname = '退款报建流程'
+        data.defname = '终止报建'
+      } else if (this.applyType === '团购转散户') {
+        data.processname = '团购转散户报建流程'
+        data.defname = '信息确认'
+      } else {
+        this.$showMessage('暂无此类报装')
+        return
+      }
+
+      data.f_sub_state = "新增"
+      data.f_apply_source = "线下发起"
+      data.f_process_id = await this.getProcessId(data.processname)
+
+      // 调用ExplorationUser事件
+
+      this.click(data)
+
+      //this.applyType = null
+      //this.showModal = false
+    },
+    // 获取流程id
+    async getProcessId(processname) {
+      let data = {
+        workname: processname
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/getProcessId`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '流程标识获取失败！！！'}
+      )
+
+      return res.data
+    },
   },
   events: {
   },
@@ -279,7 +420,7 @@ export default {
   },
   computed: {
     appDefnames () {
-      // let list = [{label: '报装缴费', value: '报装缴费'}, {label: '通气点火', value: '通气点火'}]
+      // let list = [{label: '报装缴费', value: '报装缴费'}, {label: '通气点火', value: '通气点火'},{label: '工程施工', value: '工程施工'},{label: '工程派工', value: '工程派工'},{label: '点火派单', value: '点火派单'}]
       let list = this.$appdata.getParam('手机节点')
       return `(${list.map(item => `'${item.value}'`).toString()})`
     }
@@ -287,6 +428,15 @@ export default {
 }
 </script>
 <style scoped>
+  .pred{
+    color: red;
+  }
+  .p1 {
+    color: #ffaf4f;
+  }
+  .redy{
+    color: deeppink;
+  }
   .panel-self{
     border-radius: 10px;
     border:1px solid #499EDF;

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

@@ -7,6 +7,9 @@
       <panel header="拍照" :is-open="false" type="primary" v-if="selectdata.f_process_id">
         <app-take-pic :blobid="selectdata.f_process_id" :defname="selectdata.defname" :isdelete="true" :istakepic="true" :istype="true"></app-take-pic>
       </panel>
+      <panel header="签字" :is-open="false" type="primary" v-if="selectdata.f_process_id">
+        <app-sign @sign-success="signSuccess" :file-path="selectdata.f_process_id" @sign-clean="signClean"></app-sign>
+      </panel>
     </accordion>
   </div>
 </template>
@@ -135,7 +138,7 @@ export default {
               }
             }
           }
-
+          console.log("item.ready"+item.ready)
           if (item.ready) {
             item.options = await this[item.ready]()
           }
@@ -291,6 +294,14 @@ export default {
         this.showview = true
       })
     },
+    signClean () {
+      this.selectdata.f_construction_sign = null
+    },
+    signSuccess (fileUrl) {
+      console.log('==============签字回调==================')
+      console.log(fileUrl)
+      this.selectdata.f_construction_sign = fileUrl
+    },
     // 金额转大写
     smalltoBIG(n) {
       let fraction = ['角', '分'];
@@ -518,7 +529,51 @@ export default {
       this.$dispatch('loadPage')
 
       throw '终止报建！！！'
+    },
+    // 获取片区
+    async getSliceArea () {
+      let data = {
+        source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+        userid: Vue.user.id
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+              'POST',
+              `${this.$androidUtil.getProxyUrl()}/rs/search`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '片区查询失败！！！'}
+      )
+
+      return res.data.map(item => {
+        return {
+          label: item.name,
+          value: item.name
+        }
+      })
+    },
+    // 获取区县
+    async getPcd () {
+      let data = {
+        tablename: 't_pcd',
+        condition: `f_filialeid = '${Vue.user.orgid}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+              'POST',
+              `${this.$androidUtil.getProxyUrl()}rs/sql/singleTable`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '区县查询失败！！！'}
+      )
+
+      return res.data.map(item => {
+        return {
+          label: item.f_pcd,
+          value: item.f_pcd
+        }
+      })
     }
+
   },
   events: {
     'complyInstallation' (index) {
@@ -782,6 +837,178 @@ export default {
         }
       }
     },
+    // 合同金额失去焦点
+    async 'contractMoneyChange' (index) {
+      let data = {
+        operator: '+',
+        num1: this.show_data.f_contract_money || 0,
+        num2: this.getLableValue('追加金额') || 0
+      }
+      let res = await this.$resetpost(
+              `${this.$androidUtil.getProxyUrl()}/rs/logic/compute`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '金额计算失败！！！'}
+      )
+
+      this.setLabelValue('应交金额', res.data)
+    },
+    // 街道失去焦点
+    async 'streetChange' (index) {
+      if (isEmpty(this.show_data.f_street)) {
+        return
+      }
+
+      this.setLabelValue('集收单位', null)
+
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+              'POST',
+              `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+      )
+
+      this.setLabelOptions('集收单位', res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
+    // 区县失去焦点
+    async 'pcdChange' (index) {
+      if (isEmpty(this.show_data.f_pcd)) {
+        return
+      }
+
+      this.setLabelValue('街道/乡镇', null)
+      this.setLabelValue('集收单位', null)
+
+
+
+      let data = {
+        tablename: 't_street',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
+      }
+      let f_address_type = this.getLableValue('地址类型')
+
+      if (f_address_type === '民用市区') {
+        data.condition = `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
+      }
+      if (f_address_type === '民用乡镇') {
+        data.condition = `f_filialeid = '${Vue.user.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '乡镇'`
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+              'POST',
+              `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+      )
+
+      this.setLabelOptions('街道/乡镇', res.data.map(item => {
+        return {
+          label: item.f_street,
+          value: item.f_street
+        }
+      }))
+    },
+    // 地址类型失去焦点
+    'addressTypeChange' (index) {
+      this.setLabelValue('街道/乡镇', null)
+      this.setLabelValue('集收单位', null)
+      let f_address_type = this.show_data.fields[index].value
+      for (const item of this.show_data.fields) {
+        if (f_address_type === '民用市区') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+            item.hidden = false
+            item.required = true
+            item.value = null
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+            item.hidden = false
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '地址') {
+            item.readonly = true
+            item.value = null
+          }
+        }
+        if (f_address_type === '民用乡镇') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+            item.hidden = false
+            item.required = true
+            item.value = null
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+            item.hidden = false
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '楼层') {
+            item.hidden = true
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '地址') {
+            item.readonly = true
+            item.value = null
+          }
+        }
+        if (f_address_type === '特殊地址') {
+          if (item.label === '区/县' || item.label === '街道/乡镇') {
+            item.hidden = false
+            item.required = true
+            item.value = null
+          }
+          if (item.label === '集收单位') {
+            item.hidden = false
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
+            item.hidden = true
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '地址') {
+            item.readonly = false
+            item.value = null
+          }
+        }
+      }
+    },
+    // 搜索小区
+    async 'searchArea' (area, index) {
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}' and f_residential_area like '%${area}%'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+              'POST',
+              `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+      )
+
+      if (res.data.length === 0) {
+        return
+      }
+
+      this.setLabelOptions('集收单位', res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
     'onblur' (index) {},
     'oninput' (index) {},
     'initializtionView' () {},

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

@@ -1,46 +1,46 @@
-<template>
-  <app-sign @sign-success="signSuccess" :file-path="selectdata.f_construction_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_construction_sign = null
-    },
-    signSuccess (fileUrl) {
-      console.log('==============签字回调==================')
-      console.log(fileUrl)
-      this.selectdata.f_construction_sign = fileUrl
-    }
-  },
-  events: {
-  },
-  computed: {
-  },
-  watch: {
-  }
-}
-</script>
-<style scoped lang="less">
-</style>
+<template>
+  <app-sign @sign-success="signSuccess" :file-path="selectdata.f_construction_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_construction_sign = null
+    },
+    signSuccess (fileUrl) {
+      console.log('==============签字回调==================')
+      console.log(fileUrl)
+      this.selectdata.f_construction_sign = fileUrl
+    }
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped lang="less">
+</style>