apply-clients 3.3.222 → 3.4.2-FuGu-4

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

@@ -19,15 +19,12 @@
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="f_apply_num = '{}'">
             </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">项目名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_entry_name like '%{}%'" placeholder='项目名称'>
-            </div>
             <div class="form-group col-sm-3 button-range">
               <button class="button_new button_spacing" style="width: max-content"
+                      v-if="$parent.$parent.projectStart"
                       @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+              <button class="button_search button_spacing" @click="$parent.$parent.loadPage()">返回</button>
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
               <div
                 :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -60,7 +57,7 @@
               <v-select
                 v-model="model.f_apply_type"
                 placeholder='报建类型'
-                condition="f_apply_type like '%{}%'"
+                condition="f_apply_type = '{}'"
                 :value.sync="model.f_apply_type"
                 :options='$parent.$parent.applytype'
                 class="select select_list"
@@ -80,6 +77,18 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建性质：</label>
+              <v-select
+                v-model="model.f_apply_nature"
+                placeholder='报建性质'
+                condition="f_apply_nature = '{}'"
+                :value.sync="model.f_apply_nature"
+                :options='$parent.$parent.applyNatures'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用户地址：</label>
               <input type="text" style="width:60%" class="input_search" placeholder='用户地址' v-model="model.f_address"
@@ -92,9 +101,9 @@
                           style="width: 60%!important;"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 00:00:00'"
                           :show-reset-button="true"
-                          condition="f_apply_date >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="f_apply_date >= '{}'">
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
@@ -103,11 +112,23 @@
                           style="width: 60%!important;"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 23:59:59'"
                           :show-reset-button="true"
-                          condition="f_apply_date <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="f_apply_date <= '{}'">
               </datepicker>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">稍后处理：</label>
+              <v-select
+                v-model="model.f_is_later"
+                placeholder='稍后处理'
+                condition="f_is_later = '{}'"
+                :value.sync="model.f_is_later"
+                :options='$parent.$parent.laterList'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
           </div>
         </div>
       </criteria>
@@ -116,7 +137,6 @@
           <tr>
             <th style="white-space: nowrap;">序号</th>
             <th style="white-space: nowrap;">工程编号</th>
-            <th style="white-space: nowrap;">项目名称</th>
             <th style="white-space: nowrap;">客户名称</th>
             <th style="white-space: nowrap;">合同编号</th>
             <th style="white-space: nowrap;">电话</th>
@@ -137,9 +157,6 @@
             <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
-              <nobr><font>{{row.f_entry_name}}</font></nobr>
-            </td>
             <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
               <nobr><font>{{row.f_user_name}}</font></nobr>
             </td>
@@ -213,162 +230,172 @@
   </div>
 </template>
 <script>
-  import {PagedList} from 'vue-client'
-  import {isEmpty} from '../../Util'
+import {HttpResetClass, PagedList} from 'vue-client'
+import {isEmpty} from '../../Util'
 
-  export default {
-    title: '工程列表',
-    props: ['showData'],
-    data () {
-      return {
-        model: new PagedList('rs/sql/checkuser', 20, {
-          data: {
-            id: this.$login.f.id,
-            orgid: this.$login.f.orgid
-          }
-        }),
-        showModal: false, // 控制发起类型选择
-        applyType: '',  // 报建类型
-        curorgid: [this.$login.f.orgid],
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-        defnames: [{label: '全部', value: ''}], // 流程节点
-        criteriaShow: false
-      }
+export default {
+  title: '工程列表',
+  props: ['showData'],
+  data () {
+    return {
+      model: new PagedList('rs/sql/checkuser', 20, {
+        data: {
+          userid: this.$login.f.id,
+          orgid: this.$login.f.orgid
+        }
+      }),
+      showModal: false, // 控制发起类型选择
+      applyType: '',  // 报建类型
+      curorgid: [this.$login.f.orgid],
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      defnames: [{label: '全部', value: ''}], // 流程节点
+      applyNatures: [{label: '全部', value: ''}], // 报建性质
+      criteriaShow: false
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    // 点击操作
+    click (val) {
+      this.$dispatch('apply', val)
     },
-    ready () {
-      // 调用查询
-      this.search()
+    // 获取流程id
+    async getProcessId(processname) {
+      let data = {
+        workname: processname
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        'rs/logic/getProcessId',
+        {data: data},
+        {resolveMsg: null, rejectMsg: '流程标识获取失败！！！'}
+      )
+
+      return res.data
     },
-    methods: {
-      // 点击操作
-      click (val) {
-        this.$dispatch('apply', val)
-      },
-      // 获取流程id
-      async getProcessId(processname) {
-        let data = {
-          workname: processname
-        }
-        let res = await this.$resetpost(
-          'rs/logic/getProcessId',
-          {data: data},
-          {resolveMsg: null, rejectMsg: '流程标识获取失败！！！'}
-        )
+    // 报装申请
+    async apply () {
+      if (this.applyType === '' || this.applyType === null) {
+        this.$showAlert('请选择需要发起的类型', 'warning', 3000)
+        return
+      }
+      let data = {
+        f_apply_type: this.applyType
+      }
+      if (data.f_apply_type === '散户报建') {
+        data.defname = '申请登记'
+        data.processname = '散户报建流程'
+      } else if (data.f_apply_type === '民用集中报建') {
+        data.defname = '申请登记'
+        data.processname = '民用集中报建流程'
+      }else if (data.f_apply_type === '民用报建') {
+        data.defname = '申请登记'
+        data.processname = '民用报建流程'
+      }else if (data.f_apply_type === '非民用报建') {
+        data.defname = '申请登记'
+        data.processname = '非民用报建流程'
+      } else {
+        this.$showMessage('暂无此类报装')
+        return
+      }
 
-        return res.data
-      },
-      // 报装申请
-      async apply () {
-        if (this.applyType === '' || this.applyType === null) {
-          this.$showAlert('请选择需要发起的类型', 'warning', 3000)
-          return
-        }
-        let data = {
-          f_apply_type: this.applyType
-        }
-        debugger
-        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)
 
-        data.f_sub_state = "新增"
-        data.f_apply_source = "线下报装"
-        data.f_process_id = await this.getProcessId(data.processname)
+      // 调用ExplorationUser事件
+      this.$dispatch('apply', data)
 
-        // 调用ExplorationUser事件
-        this.$dispatch('apply', data)
+      this.applyType = null
+      this.showModal = false
+    },
+    loadPage () {
+      this.$dispatch('loadPage')
+    },
+    search () {
+      this.$dispatch('search')
+    },
+    async applyTypeChange () {
+      if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+        let res = await this.$resetpost('rs/logic/getDefnameByType',
+          { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type },
+          {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
+        )
 
-        this.applyType = null
-        this.showModal = false
-      },
-      search () {
-        this.$dispatch('search')
-      },
-      async applyTypeChange () {
-        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
-          let res = await this.$resetpost('rs/logic/getDefnameByType',
-            { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type },
-            {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
-          )
+        this.defnames = [{label: '全部', value: ''}, ...res.data]
 
-          this.defnames = [{label: '全部', value: ''}, ...res.data]
-        } else {
-          this.defnames = [{label: '全部', value: ''}]
-        }
-      },
-      clear () {
-        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-          this.$refs.cp.$refs.cri.model[key] = null
-        })
-      },
-      getorg (val) {
-        if (val.length <= 0) {
-          return
-        }
-        this.model.params.data.orgid = val[0]
+        this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
+      } else {
+        this.defnames = [{label: '全部', value: ''}]
+
+        this.applyNatures = [{label: '全部', value: ''}]
       }
     },
-    computed: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
     },
-    watch: {
-      'model.rows': {
-        handler: function () {
-          let isover = []           // 过期(超时)数据
-          let isbeforeover = []     // 未过期 提前提醒
-          for (let i = 0; i < this.model.rows.length; i++) {
-            let item = this.model.rows[i]
-            if (item.isover === '过期') {
-              isover.push(i + 1)
-            }
-            if (item.isbeforeover === '预期提醒') {
-              isbeforeover.push(i + 1)
-            }
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.model.params.data.orgid = val[0]
+    }
+  },
+  computed: {
+    projectStart () {
+      return this.$login.r.includes('报建发起')
+    }
+  },
+  watch: {
+    'model.rows': {
+      handler: function () {
+        let isover = []           // 过期(超时)数据
+        let isbeforeover = []     // 未过期 提前提醒
+        for (let i = 0; i < this.model.rows.length; i++) {
+          let item = this.model.rows[i]
+          if (item.isover === '过期') {
+            isover.push(i + 1)
           }
-          let msg = null
-          if (isover.length > 0) {
-            msg = `第${isover.toString()}条数据已过期`
-            this.$showAlert(msg, 'warning', 3000)
+          if (item.isbeforeover === '预期提醒') {
+            isbeforeover.push(i + 1)
           }
+        }
+        let msg = null
+        if (isover.length > 0) {
+          msg = `第${isover.toString()}条数据已过期`
+          this.$showAlert(msg, 'warning', 3000)
+        }
 
-          if (isbeforeover.length > 0) {
-            msg = `第${isbeforeover.toString()}条数据即将过期`
-            if (isover.length > 0) {
-              setTimeout(() => {
-                this.$showAlert(msg, 'warning', 3000)
-              }, 4000)
-            } else {
+        if (isbeforeover.length > 0) {
+          msg = `第${isbeforeover.toString()}条数据即将过期`
+          if (isover.length > 0) {
+            setTimeout(() => {
               this.$showAlert(msg, 'warning', 3000)
-            }
+            }, 4000)
+          } else {
+            this.$showAlert(msg, 'warning', 3000)
           }
         }
       }
     }
+  },
+  events: {
   }
+}
 </script>
 <style scoped>
 
-  .p1 {
-    color: #dc0b12;
-    font-weight:bold
-  }
-  .p {
-    color: #ffaf4f;
-  }
+.p1 {
+  color: #dc0b12;
+  font-weight:bold
+}
+.p {
+  color: #ffaf4f;
+}
 </style>

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

@@ -7,7 +7,7 @@
       <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>
+            <service-control v-ref:service :selectdata="selectdata"></service-control>
           </tab>
           <tab header='附件'>
             <apply-upload :blodid="selectdata.f_process_id"
@@ -15,7 +15,7 @@
                           :isdelete="true"
                           :isusetype="true"
                           :isremark = "true"
-                          :takeimg="false"
+                          :takeimg="true"
                           :issearch="true"
                           :defname="selectdata.defname">
             </apply-upload>
@@ -26,103 +26,113 @@
   </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: ''        // 配置文件名
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '报建流程',
+  data () {
+    return {
+      showQuery: true,       // 控制查询页
+      showData: true,     // 控制列表数据
+      showtotal: false, // 详情显示
+      selectdata: {},
+      xmlname: ''        // 配置文件名
+    }
+  },
+  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
+    }
+  },
+  events: {
+    'onMessage' (data) {
+      console.log('接收消息')
+      console.log(data)
+      if (data.type === 'apply-task') {
+        this.$refs.query.$refs.cp.$refs.cri.search()
       }
     },
-    ready () {
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
+    // 刷新控制层
+    async 'breakControl' (servicedata) {
 
+      if (servicedata.id) {
         let data = {
-          workname: this.selectdata.processname
+          condition: `u.id = ${servicedata.id}`,
+          data: {
+            userid: this.$login.f.id,
+            orgid: this.$login.f.orgid
+          }
         }
-        let http = new HttpResetClass()
-        let res = await http.load(
-          'POST',
-          'rs/logic/ApplyGetConfigs',
+        let res = await this.$resetpost(
+          'rs/sql/checkuser',
           {data: data},
-          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+          {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
         )
 
-        Vue.prototype.$workflow_vue = res.data
+        this.selectdata = res.data[0]
+      } else {
+        this.selectdata = servicedata
       }
-    },
-    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
-        })
+      this.showtotal = false
+      this.$nextTick(() => {
+        this.showtotal = true
+      })
 
-      },
-      // 初始化
-      async 'apply' (val) {
-        this.showtotal = false
-        this.selectdata = val
+    },
+    // 初始化
+    async 'apply' (val) {
+      this.showtotal = false
+      this.selectdata = val
 
-        // 次方法必须同步执行，否则后续会出问题
-        // 获取页面json配置文件
-        await this.loadName()
+      // 次方法必须同步执行，否则后续会出问题
+      // 获取页面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()
-      }
+      // 显示详细
+      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()
     },
-    watch: {
+    '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>