apply-clients 3.5.4-2 → 3.5.4-21

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

@@ -486,6 +486,43 @@
           }
         })
       },
+      /*获取街道和乡镇*/
+      async getStreet() {
+        let data = {
+          tablename: 't_street',
+          condition: `f_filialeid = '${this.$login.f.orgid}' and f_iscity in ('市区','乡镇')`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/apply_singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+        )
+        return res.data.map(item => {
+          return {
+            label: item.f_street,
+            value: item.f_street
+          }
+        })
+      },
+      async streetChangeNew() {
+        if (isEmpty(this.show_data.f_street)) {
+          return
+        }
+       //设置区县和地址类型
+        let data = {
+          tablename: 't_street',
+          condition: `f_filialeid = '${this.$login.f.orgid}' and f_street = '${this.show_data.f_street}'`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/apply_singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+        )
+      },
       // 获取区县
       async getPcd () {
         let data = {
@@ -528,6 +565,22 @@
           }
         })
       },
+      //通气前置，添加设备
+      async addDeviceBefore () {
+        let http = new HttpResetClass()
+        var condition1=`f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+        let data = {
+          condition: condition1
+        }
+        let res = await http.load('POST', 'rs/sql/getUserFilesAndDevicesAmount', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '获取表具失败！！！'
+        })
+        if (res.data.amount===0) {
+          this.$showMessage('请添加设备！！！', 'warning', 3000)
+          throw null
+        }
+      },
       // 缴费前置
       async chargeBefore () {
         if (Number(this.show_data.f_due_money) > Number(this.show_data.f_cumulative_payment_money) || Number(this.show_data.f_surplus_money) > 0) {
@@ -778,6 +831,7 @@
           }
         }
       },
+
       async streetChange () {
         if (isEmpty(this.show_data.f_street)) {
           return
@@ -1149,6 +1203,7 @@
       },
       // 搜索小区
       async 'searchArea' (area, index) {
+        debugger
         let data = {
           tablename: 't_area',
           condition: `f_filialeid = '${this.$login.f.orgid}' and f_street = '${this.show_data.f_street}' and f_residential_area like '%${area}%'`
@@ -1471,6 +1526,70 @@
           }
         }))
       },
+      // 街道失去焦点
+      async 'streetChangeNew' (index) {
+        if (isEmpty(this.show_data.f_street)) {
+          return
+        }
+        //设置区县和地址类型
+        let data = {
+          tablename: 't_street',
+          condition: `f_filialeid = '${this.$login.f.orgid}' and f_street = '${this.show_data.f_street}'`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/apply_singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+        )
+       if(res.data[0].f_iscity==="市区"){
+         this.setLabelValue('地址类型',"民用市区")
+       }else if(res.data[0].f_iscity==="乡镇"){
+         this.setLabelValue('地址类型',"民用乡镇")
+       }else{
+         this.setLabelValue('地址类型', "特殊地址")
+       }
+        this.setLabelValue('区/县',res.data[0].f_pcd)
+        //获取小区
+        let data2 = {
+          tablename: 't_area',
+          condition: `f_filialeid = '${this.$login.f.orgid}' and f_street = '${this.show_data.f_street}'`
+        }
+        let http2 = new HttpResetClass()
+        let res2 = await http2.load(
+          'POST',
+          `rs/sql/apply_singleTable`,
+          {data: data2},
+          {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+        )
+
+        this.setLabelOptions('小区', res2.data.map(item => {
+          return {
+            label: item.f_residential_area,
+            value: item.f_residential_area
+          }
+        }))
+      },
+
+      async 'AreaChangeNew' (index) {
+        if (isEmpty(this.show_data.f_residential_area)) {
+          return
+        }
+        //设置区县和地址类型
+        let data = {
+          tablename: 't_area',
+          condition: `f_filialeid = '${this.$login.f.orgid}' and f_residential_area= '${this.show_data.f_residential_area}'`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/apply_singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+        )
+        this.setLabelValue('片区',res.data[0].f_slice_area)
+      },
       // 区县失去焦点
       async 'pcdChange' (index) {
         if (isEmpty(this.show_data.f_pcd)) {
@@ -1576,6 +1695,67 @@
           }
         }
       },
+      'addressTypeChangeNew' (index) {
+        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
+            }
+            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
+            }
+            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
+            }
+          }
+        }
+      },
       //报建性质改变合同类型
       'changehetong'(index){
         let nextindex = parseInt(index) + 1
@@ -1693,13 +1873,14 @@
           {data: this.show_data},
           {resolveMsg: null, rejectMsg: '数据保存失败'}
         )
-        if(this.show_data.f_apply_type == '验收审批' && this.show_data.defname === '验收审批' && this.show_data.button.button_name === '提交'){
+        if((this.show_data.f_apply_type == '验收审批' && this.show_data.defname === '验收审批' && this.show_data.button.button_name === '提交') ||(this.show_data.f_apply_type === '工程施工' && this.show_data.defname === '工程施工' && this.show_data.button.button_name === '提交' )){
           const http = new HttpResetClass()
           let data = {
             tablename: 't_apply',
-            condition: `f_parent_process_id = '${this.show_data.f_parent_process_id}' and f_apply_type = '验收审批' and f_sub_state != '完工'`
+            condition: `f_parent_process_id = '${this.show_data.f_parent_process_id}' and f_apply_type in ('验收审批','工程施工')  and f_sub_state != '完工'`
           }
           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=>{
                const show_data = row.data[0]

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

@@ -0,0 +1,140 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'">
+        <supervisory-list-new v-ref:query :show-data="showData"></supervisory-list-new>
+      </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-new :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control-new>
+            </tab>
+            <tab header='附件'>
+              <apply-upload :blodid="selectdata.f_process_id"
+                            :isupload = "false"
+                            :isdelete="false"
+                            :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>

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

@@ -95,13 +95,13 @@
               <v-select
                 v-model="model.f_apply_type"
                 placeholder='报建类型'
-                condition="f_apply_type = '{}'"
+                condition="f_apply_type in {}"
                 :value.sync="model.f_apply_type"
                 :options='$parent.$parent.applytype'
                 class="select select_list"
-                :value-single="true"
+                :multiple="true"
                 @change="$parent.$parent.applyTypeChange()"
-                close-on-select ></v-select>
+                ></v-select>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">办理环节：</label>
@@ -145,6 +145,12 @@
                      v-on:keyup.enter="search"
                      condition="f_address 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_user_appraise"
+                     v-on:keyup.enter="search"
+                     condition="f_user_appraise like '%{}%'">
+            </div>
             <div class="form-group col-sm-3">
               <label  for="startDate" class="font_normal_body">开始时间：</label>
               <datepicker id="startDate" placeholder="开始日期"
@@ -318,6 +324,7 @@
             <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>
@@ -401,6 +408,9 @@
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_budget_people}}</nobr>
             </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_user_appraise}}</nobr>
+            </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_operator}}</nobr>
             </td>
@@ -492,18 +502,49 @@
         this.$dispatch('apply', val)
       },
       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.$refs.cp.$refs.cri.model.f_apply_type是不是数组
+        if (Array.isArray(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+          if(this.$refs.cp.$refs.cri.model.f_apply_type.length>0){
+            for (let i = 0; i < this.$refs.cp.$refs.cri.model.f_apply_type.length; i++) {
+              let res = await this.$resetpost('rs/logic/getDefnameByType',
+                { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type[i] },
+                {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
+              )
+              if (!isEmpty(res.data)) {
+                const newDefnames = [{ label: '全部', value: '' }, ...res.data];
+                const newApplyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type[i]}性质`))
+                  ? [{ label: '全部', value: '' }]
+                  : [{ label: '全部', value: '' }, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type[i]}性质`)];
+                // 检查并追加 defnames
+                newDefnames.forEach(item => {
+                  if (!this.defnames.some(defname => defname.value === item.value)) {
+                    this.defnames.push(item);
+                  }
+                });
+                // 检查并追加 applyNatures
+                newApplyNatures.forEach(item => {
+                  if (!this.applyNatures.some(applyNature => applyNature.value === item.value)) {
+                    this.applyNatures.push(item);
+                  }
+                });
+              }
+            }
+          }
+        }else{
+          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]
 
-          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: ''}]
+            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 () {