apply-clients 3.5.5-7 → 3.5.5-71

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})
             }
           }
         })
@@ -1942,7 +1942,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/SupervisoryList.vue

@@ -34,7 +34,7 @@
               <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>
-              <export-excel :data="$parent.$parent.getCondition"
+              <export-excel v-if="$parent.$parent.projectImport" :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
                             sqlurl="rs/logic/applyExportfile"
                             sql-name="supervisory"
@@ -177,12 +177,12 @@
               <input type="text" style="width:60%" class="input_search" v-model="model.f_construction_unit"
                      v-on:keyup.enter="$parent.$parent.search()" condition="f_construction_unit like '%{}%'" placeholder='施工单位'>
             </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">表&emsp;&emsp;号：</label>
-              <input type="text" style="width:60%" class="input_search" placeholder='表号' v-model="model.f_meternumber"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="meternumber like '%{}%'">
-            </div>
+<!--            <div class="form-group col-sm-3">-->
+<!--              <label class="font_normal_body">表&emsp;&emsp;号：</label>-->
+<!--              <input type="text" style="width:60%" class="input_search" placeholder='表号' v-model="model.f_meternumber"-->
+<!--                     v-on:keyup.enter="$parent.$parent.search()"-->
+<!--                     condition="meternumber 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.lyr"-->
@@ -199,7 +199,7 @@
               <label class="font_normal_body">发起人：</label>
               <input type="text" style="width:60%" class="input_search" placeholder='发起人' v-model="model.f_operator"
                      v-on:keyup.enter="$parent.$parent.search()"
-                     condition="f_operator like '%{}%'">
+                     condition="u.f_operator like '%{}%'">
             </div>
 <!--            <div class="form-group col-sm-3">-->
 <!--              <label class="font_normal_body">领用状态：</label>-->
@@ -338,6 +338,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>
             <th style="white-space: nowrap;">用户评价</th>
             <th style="white-space: nowrap;">发起人</th>
@@ -345,100 +346,103 @@
         </template>
         <template partial='body'>
           <tr>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{$index+1}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_userinfo_code}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_user_name}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_user_type}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_contract_number}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_phone}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_address}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_source}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_type}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.defname}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_sub_state}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_date}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_finish_date}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_shenqing_person}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_tongqi_person}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_hetong_person}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_fangan_person}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_gogncheng_person}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_yanshou_person}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.ftime}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_install_project}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_construction_unit}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_construction_remarks}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_construction_date}}</nobr>
             </td>
-<!--            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+<!--            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row['热水器']}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row['灶具']}}</nobr>
             </td>-->
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_cumulative_payment_money}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_acceptance_time}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_completion_time}}</nobr>
+            </td>
+            <td @dblclick="$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;">
+            <td @dblclick="$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;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_operator}}</nobr>
             </td>
           </tr>
@@ -465,7 +469,7 @@
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
         usertype: [{label: '全部', value: ''}, {label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
         defnames: [{label: '全部', value: ''},...this.$appdata.getParam('办理环节')], // 流程节点
-        applyNatures: [{label: '全部', value: ''}], // 报建性质
+        applyNatures: [{label: '全部', value: ''},...this.$appdata.getParam('报建性质')], // 报建性质
         criteriaShow: false,
         satisfied: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建服务评价')],
         subStates: [
@@ -506,6 +510,7 @@
           'f_construction_unit': '施工单位',
           'f_construction_date': '施工时间',
           'f_construction_remarks': '施工备注',
+          'f_completion_time': '开工时间',
           'f_budget_people':'施工人',
           'f_acceptance_time':'验收时间',
           'f_user_satisfied':'服务评价'
@@ -578,7 +583,11 @@
       },
       clear () {
         Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-          this.$refs.cp.$refs.cri.model[key] = null
+          if (Array.isArray(this.$refs.cp.$refs.cri.model[key])) {
+            this.$refs.cp.$refs.cri.model[key] = [];
+          } else {
+            this.$refs.cp.$refs.cri.model[key] = null;
+          }
         })
       },
       getorg (val) {
@@ -597,6 +606,9 @@
             orgid: this.orgid
           }
         }
+      },
+      projectImport () {
+        return this.$login.r.includes('流程监控-导出')
       }
     }
   }

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

@@ -28,7 +28,7 @@
               <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>
-              <export-excel :data="$parent.$parent.getCondition"
+              <export-excel v-if="$parent.$parent.projectImport" :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
                             sqlurl="rs/logic/applyExportfile"
                             sql-name="supervisory"
@@ -552,6 +552,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
     },
     ready () {
       // 调用查询
+      this.$refs.cp.$refs.cri.model.f_check_state = '未检查'
       this.search()
       this.getaudituser()
       this.getcheckuser()
@@ -675,6 +676,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
             orgid: this.orgid
           }
         }
+      },
+      projectImport () {
+        return this.$login.r.includes('审核抽查-导出')
       }
     }
   }

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

@@ -611,7 +611,7 @@ export default {
         this.$showMessage(`您没有抽查权限!!!`)
         return
       }
-      if(this.data.f_check_state!=='' && this.data.f_check_state!==null){
+      if(this.data.f_check_state!=='' && this.data.f_check_state!==null && this.data.f_check_state!== '未检查'){
         this.$showMessage(`此报建已被${this.data.f_check_user}抽查!!!`)
         return
       }