apply-clients 3.5.5-9 → 3.5.5-90

package/src/filiale/yangchunboneng/pc/ServiceControl.vue

@@ -692,7 +692,7 @@
                 data: res.data[i],
                 user: this.$login.f
               }
-              http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/stopApply`, {data: data}, {resolveMsg: null, rejectMsg: null})
+              new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/stopApply`, {data: data}, {resolveMsg: null, rejectMsg: null})
             }
           }
         })
@@ -1823,6 +1823,8 @@
           num = 'GA'
         }else if (this.show_data.fields[index].value == '内投合同' ){
           num = 'NT'
+        }else if (this.show_data.fields[index].value == '公用合同' ){
+          num = 'GA'
         }
         this.setLabelValue('性质代码', num)
       },
@@ -1942,7 +1944,7 @@
           await http.load('post',`rs/sql/apply_singleTable`,{data: data},{rejectMsg:null,resolveMsg:null}).then( res=>{
           //判断res.data.length == 0，则子流程已经完工，然后将付流程进行到下一步
             if (res.data.length == 0){
-              http.load('post',`rs/sql/checkuser`,{data: {condition:` f_process_id= '${this.show_data.f_parent_process_id}'`, data: {id: this.$login.f.id,orgid: this.$login.f.orgid}}},{resolveMsg:null,rejectMsg:null}).then(row=>{
+              http.load('post',`rs/sql/supervisory`,{data: {condition:` u.f_process_id= '${this.show_data.f_parent_process_id}'`, data: {id: this.$login.f.id,orgid: this.$login.f.orgid}}},{resolveMsg:null,rejectMsg:null}).then(row=>{
                const show_data = row.data[0]
                 show_data.user = this.$login.f
                 show_data.start_activity ='报装申请'

package/src/filiale/yangchunboneng/pc/StopApplyList.vue

@@ -0,0 +1,294 @@
+<template>
+  <div class="col-sm-12">
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+
+            <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_apply_num"
+                     v-on:keyup.enter="search"
+                     condition="f_apply_num like '%{}%'">
+            </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_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_user_name like '%{}%'" placeholder='客户名称'>
+            </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"
+                     v-on:keyup.enter="search"
+                     condition="f_address like '%{}%'">
+            </div>
+            <div class="form-group col-sm-2 button-range">
+              <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</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}"
+                @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
+                class="button_spacing"
+                style="float: right">
+              </div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">组织机构：</label>
+              <res-select
+                restype='organization'
+                :initresid='$parent.$parent.curorgid'
+                @res-select="$parent.$parent.getorg"
+                is-mul="false"
+              ></res-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_userinfo_code"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_userinfo_code like '%{}%'">
+            </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_phone"
+                     v-on:keyup.enter="search"
+                     condition="f_phone like '%{}%'">
+            </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_contract_number"
+                     v-on:keyup.enter="search"
+                     condition="f_contract_number = '{}'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建类型：</label>
+              <v-select
+                v-model="model.f_apply_type"
+                placeholder='报建类型'
+                condition="f_apply_type = '{}'"
+                :value.sync="model.f_apply_type"
+                :options='$parent.$parent.applytype'
+                class="select select_list"
+                :value-single="true"
+                @change="$parent.$parent.applyTypeChange()"
+                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_type"
+                placeholder='报建类型'
+                condition="f_type = '{}'"
+                :value.sync="model.f_type"
+                :options='$parent.$parent.types'
+                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>
+              <v-select
+                v-model="model.defname"
+                placeholder='办理环节'
+                condition="defname = '{}'"
+                :value.sync="model.defname"
+                :options='$parent.$parent.defnames'
+                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>
+              <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  for="startDate" class="font_normal_body">开始时间：</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="f_apply_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body">结束时间：</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="f_apply_date <= '{}'">
+              </datepicker>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <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>
+            <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>
+            <th style="white-space: nowrap;">终止人</th>
+            <th style="white-space: nowrap;">撤销原因</th>
+            <th style="white-space: nowrap;">撤销时间</th>
+            <th style="white-space: nowrap;">撤销人</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align: center;">
+              <nobr>{{$index+1}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <dropdown v-if="row.f_type === '暂停报建' && row.f_state === '有效' && $parent.$parent.$parent.stopStart ">
+                <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
+                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
+                </button>
+                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-left">
+                  <li>
+                    <a href="#" @click="$parent.$parent.$parent.click(row)">撤销</a>
+                  </li>
+                </ul>
+              </dropdown>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_apply_num}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_user_name}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_contact}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_phone}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_apply_type}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.defname}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_type}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_state}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_stop_reason}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_stop_date}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_operator}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_cancel_reason}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_cancel_date}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_cancel_operator}}</nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import {isEmpty} from '../../../components/Util'
+export default {
+  title: '勘探详情',
+  data () {
+    return {
+      model: new PagedList('rs/sql/getStopApply', 20, {
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }),
+      curorgid: [this.$login.f.orgid],
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      types: [{label: '全部', value: ''},{label: '暂停报建', value: '暂停报建'}, {label: '终止报建', value: '终止报建'}],
+      defnames: [{label: '全部', value: ''}], // 流程节点
+      applyNatures: [{label: '全部', value: ''}], // 报建性质
+      criteriaShow: false
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  events: {
+  },
+  methods: {
+    // 查询
+    search () {
+      this.$dispatch('search')
+    },
+    click (row) {
+      this.$dispatch('cancelStopApply', row)
+    },
+    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.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: ''}]
+      }
+    },
+    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]
+    }
+  },
+  computed: {
+    stopStart () {
+      return this.$login.r.includes('暂停报建撤销')
+    },
+  }
+}
+</script>
+<style scoped>
+</style>

package/src/filiale/yangchunboneng/pc/SupervisoryControl.vue

@@ -0,0 +1,141 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'">
+        <supervisory-list v-ref:query :show-data="showData"></supervisory-list>
+      </div>
+      <div v-if="showtotal" style="height: 89%">
+        <div class="col-sm-2" style="margin-top: 20px">
+          <supervisory-chart :selectdata="selectdata"></supervisory-chart>
+        </div>
+        <div class="col-sm-10" style="margin-top: 20px">
+          <tabset v-ref:tabs :close="false">
+            <tab :header='selectdata.defname'>
+              <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
+            </tab>
+            <tab header='附件'>
+              <apply-upload :blodid="selectdata.f_process_id"
+                            :pblobid="selectdata.f_parent_process_id"
+                            :isupload = "true"
+                            :isdelete="true"
+                            :isusetype="true"
+                            :isremark = "true"
+                            :takeimg="false"
+                            :issearch="true"
+                            :defname="selectdata.defname">
+              </apply-upload>
+            </tab>
+          </tabset>
+        </div>
+        <div style="height: 1%">
+
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '流程监控',
+    data () {
+      return {
+        showtotal: false, // 控制详细信息显示
+        showData: true,
+        selectdata: {},
+        xmlname: '' // 配置文件名称
+      }
+    },
+    created () {
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+        let data = {
+          workname: this.selectdata.processname
+        }
+
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetConfigs',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+
+        Vue.prototype.$workflow_vue = res.data
+      }
+    },
+    events: {
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+
+        if (servicedata.id) {
+          let data = {
+            condition: `u.id = ${servicedata.id}`,
+            data: {
+              orgid: this.$login.f.orgid
+            }
+          }
+          let res = await this.$resetpost(
+            'rs/sql/supervisory',
+            {data: data},
+            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
+          )
+          this.selectdata = Object.assign({}, this.selectdata, res.data[0])
+        } else {
+          this.selectdata = servicedata
+        }
+
+        this.showtotal = false
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+
+      },
+      'onMessage' (data) {
+        console.log('接收消息')
+        console.log(data)
+        if (data.type === 'apply-task') {
+          this.$refs.queryuser.$refs.cp.$refs.cri.search()
+        }
+      },
+      async 'apply' (val) {
+        this.selectdata = null
+        this.selectdata = val
+        this.showtotal = false
+
+        // 获取配置文件
+        await this.loadName()
+
+        this.$refs.query.$refs.cp.pager = false
+        this.showData = false
+
+        this.showtotal = true
+      },
+      '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>