apply-clients 3.4.19 → 3.4.21

package/build/dev-server.js

@@ -8,8 +8,8 @@ var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://219.138.226.181:8401'
-var applyinstall = 'http://219.138.226.181:8401'
+var ldap = 'http://117.33.181.102:8400'
+var applyinstall = 'http://117.33.181.102:8400'
 
 var proxyTable = {
   '/rs/logic/getSaleInitData': {

package/package.json

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

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

@@ -163,6 +163,10 @@
               <p class="col-xs-3 text-left font"><b>地&emsp;&emsp;址：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_address }}</p>
             </div>
+            <div class="col-xs-12" v-if="row.f_order_date !=null">
+              <p class="col-xs-3 text-left font"><b>预约日期：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_order_date }}</p>
+            </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_apply_date }}</p>

package/src/components/product/Process/ExplorationUser.vue

@@ -1,189 +1,189 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
-        <exploration-select v-ref:query :show-data="showData"></exploration-select>
-      </div>
-      <div v-if="showtotal" style="height: 89%">
-        <tabset v-ref:tabs :close="false">
-          <tab :header='selectdata.defname'>
-            <service-control  v-ref:service :selectdata="selectdata"></service-control>
-          </tab>
-          <tab header='附件'>
-            <apply-upload :blodid="selectdata.f_process_id"
-                          :isupload = "true"
-                          :isdelete="true"
-                          :isusetype="true"
-                          :isremark = "true"
-                          :takeimg="true"
-                          :issearch="true"
-                          :defname="selectdata.defname">
-            </apply-upload>
-          </tab>
-        </tabset>
-      </div>
-
-      <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>
-    </div>
-  </div>
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建流程',
-    data () {
-      return {
-        showQuery: true,       // 控制查询页
-        showData: true,     // 控制列表数据
-        showtotal: false, // 详情显示
-        selectdata: {},
-        xmlname: '',        // 配置文件名
-        showLater: false,
-        laterapply: {}
-      }
-    },
-    ready () {
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
-
-        let data = {
-          workname: this.selectdata.processname
-        }
-        let http = new HttpResetClass()
-        let res = await http.load(
-          'POST',
-          'rs/logic/ApplyGetConfigs',
-          {data: data},
-          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
-        )
-
-        Vue.prototype.$workflow_vue = res.data
-      },
-      async later () {
-        let http = new HttpResetClass()
-        let data = {
-          laterapply: this.laterapply,
-          selectdata: this.selectdata,
-          user: this.$login.f
-        }
-        let res = await http.load('POST', 'rs/logic/laterprocessing', {data:data}, {
-          resolveMsg: null,
-          rejectMsg: '稍后处理记录保存失败！！！'
-        })
-        this.closeModal()
-      },
-      closeModal () {
-        this.selectdata = null
-        this.showLater = false
-        this.laterapply = {}
-
-        this.$refs.query.loadPage()
-      }
-    },
-    events: {
-      'onMessage' (data) {
-        console.log('接收消息')
-        console.log(data)
-        if (data.type === 'apply-task') {
-          this.$refs.query.$refs.cp.$refs.cri.search()
-        }
-      },
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-
-        if (servicedata.id) {
-          let data = {
-            condition: `u.id = ${servicedata.id}`,
-            data: {
-              id: this.$login.f.id,
-              orgid: this.$login.f.orgid
-            }
-          }
-          let res = await this.$resetpost(
-            'rs/sql/checkuser',
-            {data: data},
-            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
-          )
-
-          this.selectdata = res.data[0]
-        } else {
-          this.selectdata = servicedata
-        }
-
-        this.showtotal = false
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-
-      },
-      async openLater (row) {
-        this.selectdata = row
-        this.showLater = true
-      },
-      // 初始化
-      async 'apply' (val) {
-        this.showtotal = false
-        this.selectdata = val
-
-        // 次方法必须同步执行，否则后续会出问题
-        // 获取页面json配置文件
-        await this.loadName()
-
-        // 显示详细
-        this.showtotal = true
-        // 关闭列表数据
-        this.showData = false
-        // 关闭分页
-        this.$refs.query.$refs.cp.pager = false
-      },
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      },
-      'loadPage' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
-      }
-    },
-    watch: {
-    }
-  }
-</script>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
+        <exploration-select v-ref:query :show-data="showData"></exploration-select>
+      </div>
+      <div v-if="showtotal" style="height: 89%">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='selectdata.defname'>
+            <service-control  v-ref:service :selectdata="selectdata"></service-control>
+          </tab>
+          <tab header='附件'>
+            <apply-upload :blodid="selectdata.f_process_id"
+                          :isupload = "true"
+                          :isdelete="true"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="false"
+                          :issearch="true"
+                          :defname="selectdata.defname">
+            </apply-upload>
+          </tab>
+        </tabset>
+      </div>
+
+      <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>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建流程',
+    data () {
+      return {
+        showQuery: true,       // 控制查询页
+        showData: true,     // 控制列表数据
+        showtotal: false, // 详情显示
+        selectdata: {},
+        xmlname: '',        // 配置文件名
+        showLater: false,
+        laterapply: {}
+      }
+    },
+    ready () {
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+
+        let data = {
+          workname: this.selectdata.processname
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          'rs/logic/ApplyGetConfigs',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+
+        Vue.prototype.$workflow_vue = res.data
+      },
+      async later () {
+        let http = new HttpResetClass()
+        let data = {
+          laterapply: this.laterapply,
+          selectdata: this.selectdata,
+          user: this.$login.f
+        }
+        let res = await http.load('POST', 'rs/logic/laterprocessing', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '稍后处理记录保存失败！！！'
+        })
+        this.closeModal()
+      },
+      closeModal () {
+        this.selectdata = null
+        this.showLater = false
+        this.laterapply = {}
+
+        this.$refs.query.loadPage()
+      }
+    },
+    events: {
+      'onMessage' (data) {
+        console.log('接收消息')
+        console.log(data)
+        if (data.type === 'apply-task') {
+          this.$refs.query.$refs.cp.$refs.cri.search()
+        }
+      },
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+
+        if (servicedata.id) {
+          let data = {
+            condition: `u.id = ${servicedata.id}`,
+            data: {
+              id: this.$login.f.id,
+              orgid: this.$login.f.orgid
+            }
+          }
+          let res = await this.$resetpost(
+            'rs/sql/checkuser',
+            {data: data},
+            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
+          )
+
+          this.selectdata = res.data[0]
+        } else {
+          this.selectdata = servicedata
+        }
+
+        this.showtotal = false
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+
+      },
+      async openLater (row) {
+        this.selectdata = row
+        this.showLater = true
+      },
+      // 初始化
+      async 'apply' (val) {
+        this.showtotal = false
+        this.selectdata = val
+
+        // 次方法必须同步执行，否则后续会出问题
+        // 获取页面json配置文件
+        await this.loadName()
+
+        // 显示详细
+        this.showtotal = true
+        // 关闭列表数据
+        this.showData = false
+        // 关闭分页
+        this.$refs.query.$refs.cp.pager = false
+      },
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      'loadPage' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+      }
+    },
+    watch: {
+    }
+  }
+</script>

package/src/components/product/Process/Service/ServiceControl.vue

@@ -320,6 +320,7 @@
             })
           }
         }
+
         // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
         let temp = JSON.parse(JSON.stringify(this.selectdata))
         console.log('打印下temp',temp)
@@ -1664,116 +1665,116 @@
         if (this.show_data.button.after) {
           this[this.show_data.button.after]()
         }
-        // 改管报建 增容报建 优化
-        if((this.show_data.f_apply_type === '改管报建'||this.show_data.f_apply_type === '增容报建') && this.show_data.defname === '报装申请' && this.show_data.button.button_name === '缴费'){
-          let datagg = {
-            condition: `t.f_process_id='${this.show_data.f_process_id}'`,
-          }
-          let http = new HttpResetClass()
-          let restgg = await http.load(
-            'POST',
-            `rs/sql/checkusertwo`,
-            {data: datagg},
-            {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
-          )
-          debugger
-          if(this.show_data.f_apply_type === '改管报建'){
-            restgg.data[0].processname = '改管报建流程'
-            restgg.data[0].defname = '报装缴费'
-          }else{
-            restgg.data[0].processname = '增容报建流程'
-            restgg.data[0].defname = '报装缴费'
-          }
-          restgg.data[0].actid = restgg.data[0].actid + 1
-          this.$dispatch('apply',restgg.data[0])
-
-        }
-
-        // 退款报建 优化
-        if(this.show_data.f_apply_type === '退款报建' && this.show_data.defname === '终止报建' && this.show_data.button.button_name === '提交'){
-          let datatk = {
-            condition: `t.f_process_id='${this.show_data.f_process_id}'`,
-          }
-          let http = new HttpResetClass()
-          let resttk = await http.load(
-            'POST',
-            `rs/sql/checkusertwo`,
-            {data: datatk},
-            {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
-          )
-          debugger
-          resttk.data[0].processname = '退款报建流程'
-          resttk.data[0].defname = '退款'
-          this.$dispatch('apply',resttk.data[0])
-
-        }
-
-
-        if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装申请' && this.show_data.button.button_name === '合同'){
-          let data = {
-            tablename: 't_apply',
-            condition: `f_process_id='${this.show_data.f_process_id}'`
-          }
-          let http = new HttpResetClass()
-          let restp = await http.load(
-            'POST',
-            `rs/sql/singleTable`,
-            {data: data},
-            {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
-          )
-          debugger
-          restp.data[0].processname = '散户报建流程'
-          restp.data[0].defname = '合同签订'
-          this.$dispatch('apply',restp.data[0])
-
-        } else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && this.show_data.button.button_name === '提交'){
-          let data2 = {
-            condition: `u.id = ${this.show_data.id}`,
-            data: {
-              id: this.$login.f.id,
-              orgid: this.$login.f.orgid
-            }
-          }
-          let http = new HttpResetClass()
-          let restp1 = await http.load(
-            'POST',
-            `rs/sql/checkuser`,
-            {data: data2},
-            {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
-          )
-          debugger
-          console.log('有没有发请求打印查询的内容restp1',restp1)
-          // restp1.data[0].processname = '散户报建流程'
-          // restp1.data[0].defname = '报装缴费'
-          this.$dispatch('apply',restp1.data[0])
-        }else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装缴费' && this.show_data.button.button_name === '提交'){
-          let data3 = {
-            condition: `u.id = ${this.show_data.id}`,
-            data: {
-              id: this.$login.f.id,
-              orgid: this.$login.f.orgid
-            }
-          }
-          let http = new HttpResetClass()
-          let restp2 = await http.load(
-            'POST',
-            `rs/sql/checkuser`,
-            {data: data3},
-            {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
-          )
-          debugger
-          console.log('打印查询的内容',restp2)
-          if(restp2.length>0){
-            this.$dispatch('apply',restp2.data[0])
-          }else{
-            debugger
-            this.$dispatch('loadPage')
-          }
-        }
-        else{
-          this.$dispatch('loadPage')
-        }
-
+        // // 改管报建 增容报建 优化
+        // if((this.show_data.f_apply_type === '改管报建'||this.show_data.f_apply_type === '增容报建') && this.show_data.defname === '报装申请' && this.show_data.button.button_name === '缴费'){
+        //   let datagg = {
+        //     condition: `t.f_process_id='${this.show_data.f_process_id}'`,
+        //   }
+        //   let http = new HttpResetClass()
+        //   let restgg = await http.load(
+        //     'POST',
+        //     `rs/sql/checkusertwo`,
+        //     {data: datagg},
+        //     {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        //   )
+        //   debugger
+        //   if(this.show_data.f_apply_type === '改管报建'){
+        //     restgg.data[0].processname = '改管报建流程'
+        //     restgg.data[0].defname = '报装缴费'
+        //   }else{
+        //     restgg.data[0].processname = '增容报建流程'
+        //     restgg.data[0].defname = '报装缴费'
+        //   }
+        //   restgg.data[0].actid = restgg.data[0].actid + 1
+        //   this.$dispatch('apply',restgg.data[0])
+        //
+        // }
+        //
+        // // 退款报建 优化
+        // if(this.show_data.f_apply_type === '退款报建' && this.show_data.defname === '终止报建' && this.show_data.button.button_name === '提交'){
+        //   let datatk = {
+        //     condition: `t.f_process_id='${this.show_data.f_process_id}'`,
+        //   }
+        //   let http = new HttpResetClass()
+        //   let resttk = await http.load(
+        //     'POST',
+        //     `rs/sql/checkusertwo`,
+        //     {data: datatk},
+        //     {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        //   )
+        //   debugger
+        //   resttk.data[0].processname = '退款报建流程'
+        //   resttk.data[0].defname = '退款'
+        //   this.$dispatch('apply',resttk.data[0])
+        //
+        // }
+        //
+        //
+        // if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装申请' && this.show_data.button.button_name === '合同'){
+        //   let data = {
+        //     tablename: 't_apply',
+        //     condition: `f_process_id='${this.show_data.f_process_id}'`
+        //   }
+        //   let http = new HttpResetClass()
+        //   let restp = await http.load(
+        //     'POST',
+        //     `rs/sql/singleTable`,
+        //     {data: data},
+        //     {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        //   )
+        //   debugger
+        //   restp.data[0].processname = '散户报建流程'
+        //   restp.data[0].defname = '合同签订'
+        //   this.$dispatch('apply',restp.data[0])
+        //
+        // } else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && this.show_data.button.button_name === '提交'){
+        //   let data2 = {
+        //     condition: `u.id = ${this.show_data.id}`,
+        //     data: {
+        //       id: this.$login.f.id,
+        //       orgid: this.$login.f.orgid
+        //     }
+        //   }
+        //   let http = new HttpResetClass()
+        //   let restp1 = await http.load(
+        //     'POST',
+        //     `rs/sql/checkuser`,
+        //     {data: data2},
+        //     {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        //   )
+        //   debugger
+        //   console.log('有没有发请求打印查询的内容restp1',restp1)
+        //   // restp1.data[0].processname = '散户报建流程'
+        //   // restp1.data[0].defname = '报装缴费'
+        //   this.$dispatch('apply',restp1.data[0])
+        // }else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装缴费' && this.show_data.button.button_name === '提交'){
+        //   let data3 = {
+        //     condition: `u.id = ${this.show_data.id}`,
+        //     data: {
+        //       id: this.$login.f.id,
+        //       orgid: this.$login.f.orgid
+        //     }
+        //   }
+        //   let http = new HttpResetClass()
+        //   let restp2 = await http.load(
+        //     'POST',
+        //     `rs/sql/checkuser`,
+        //     {data: data3},
+        //     {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        //   )
+        //   debugger
+        //   console.log('打印查询的内容',restp2)
+        //   if(restp2.length>0){
+        //     this.$dispatch('apply',restp2.data[0])
+        //   }else{
+        //     debugger
+        //     this.$dispatch('loadPage')
+        //   }
+        // }
+        // else{
+        //   this.$dispatch('loadPage')
+        // }
+        this.$dispatch('loadPage')
       },
       // 失去焦点出触发事件
       'onchange' (index) {