apply-clients 5.0.35-48 → 5.0.35-50

package/src/components/product/EngineeringManagement/EngineerUpload.vue

@@ -17,7 +17,7 @@
         <button type="button" class="btn btn-primary item_btn" @click="showUpload = !showUpload">本地上传</button>
       </div>
       <div class="form-group col-sm-2" style="text-align: center" v-if="takeimg">
-        <button type="button" class="btn btn-primary item_btn" @click="upload()">拍照</button>
+        <button type="button" class="btn btn-primary item_btn" @click="upload()">高拍仪</button>
       </div>
     </div>
     <hr style="width: 90%;margin: 0px auto;border: #999999 1px solid;"/>
@@ -52,14 +52,12 @@
       </div>
     </div>
   </div>
-  <apply-high-meter
-    v-if="showhighmeter"
-    :show.sync="showhighmeter"
-    :isusetype="isusetype"
-    :isremark="isremark"
-    @photo-finish="newPhoto"
-    v-ref:ltgao
-  ></apply-high-meter>
+  <high-meter :show.sync="showhighmeter"
+              @photo-finish="newPhoto"
+              v-if="showhighmeter"
+              :isusetype="isusetype"
+              :isremark="isremark"
+              v-ref:ltgao></high-meter>
   <modal  :show.sync="showUpload" v-ref:modal backdrop="false">
     <header slot="modal-header" class="modal-header">
       <button type="button" class="close" @click="close"><span class="glyphicon glyphicon-remove"></span></button>

package/src/components/product/EngineeringManagement/EngineeringManagement.vue

@@ -26,6 +26,7 @@
                              :isremark = "true"
                              :issearch = "true"
                              :isupload = "true"
+                             :takeimg = "true"
                              :defname="selectdata.defname"
 
             ></engineer-upload>

package/src/components/product/EngineeringManagement/EngineeringSelect.vue

@@ -247,7 +247,8 @@ export default {
       model: new PagedList('rs/sql/checkuser', 20, {
         data: {
           id: this.$login.f.id,
-          fengongsi: this.$login.f.f_fengongsi
+          fengongsi: this.$login.f.f_fengongsi,
+          f_product_id : 1
         }
       }),
       fapplytype: this.$appdata.getParam('用户类型'),
@@ -255,7 +256,7 @@ export default {
       department: this.$appdata.getParam('受理部门'),
       derection: this.$appdata.getParam('方向'),
       containt: this.$appdata.getParam('工作内容'),
-      condition: '',
+      condition:'',
       select: '',
       alloptions:[],
       button_name:"查询",
@@ -361,7 +362,8 @@ export default {
         f_process_id: res.data.f_process_id,
         f_apply_date: Util.toStandardTimeString(),
         f_apply_num: this.generateUUID(),
-        f_apply_operator_telephone: this.$login.f.f_fgsdianhua
+        f_apply_operator_telephone: this.$login.f.f_fgsdianhua,
+        f_product_id: res.data.f_product_id
       }
       // // 如果是改装,将modify装入val
       // if(modify){
@@ -489,7 +491,6 @@ export default {
     },
 
     eachFind() {
-      debugger
       let arr = this.$refs.cp.$refs.grid.model.rows
       let overNumString1=''
       let flagNum1=1
@@ -518,9 +519,7 @@ export default {
           }
         }
       }
-      debugger
       if(hourfals!=0){
-        debugger
         this.speckText('请注意：第：'+overNumString1+'数据一小时后过期')
         this.$showMessage("请注意：第:" + overNumString1 + "数据一小时后过期")
       }

package/src/components/product/EngineeringSupervisory/EngineeringApplyStopInfo.vue

@@ -0,0 +1,281 @@
+<template>
+  <div class="d1 flex">
+    <div class="left col-sm-12">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
+          <form novalidate class="" partial>
+            <div class="row">
+              <div class="col-sm-2">
+                <label class="col-sm-4 control-label ">联系人</label>
+                <div class="col-sm-8">
+                  <input type="text" class="form-control" v-model="model.f_user_name" v-on:keyup.enter="search"
+                         condition="u.f_user_name like '{}%'" placeholder="联系人">
+                </div>
+              </div>
+              <div class="col-sm-2">
+                <label class="col-sm-4 control-label ">项目名称</label>
+                <div class="col-sm-8">
+                  <input type="text" class="form-control" v-model="model.f_entry_name" v-on:keyup.enter="search"
+                         condition="u.f_entry_name like '{}%'" placeholder="项目名称">
+                </div>
+              </div>
+              <div class="col-sm-2">
+                <label class="col-sm-4 control-label ">报建编号</label>
+                <div class="col-sm-8">
+                  <input type="text" class="form-control" v-model="model.f_apply_num" v-on:keyup.enter="search"
+                         condition="u.f_apply_num like '{}%'" placeholder="报建编号">
+                </div>
+              </div>
+
+              <div class="col-sm-2">
+                <label class="col-sm-4 control-label ">小区</label>
+                <div class="col-sm-8">
+                  <input type="text" class="form-control" v-model="model.f_residential_area" v-on:keyup.enter="search"
+                         condition="f_residential_area like '{}%'" placeholder="小区">
+                </div>
+              </div>
+              <div class="col-sm-2 ">
+                <label class="col-sm-4 control-label ">开始日期</label>
+                <div class="col-sm-8">
+                  <datepicker @change="$dispatch('setQueryCondition',model)" id="startDate" placeholder="开始日期"
+                              style="display: block"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="u.f_apply_date >= '{}'">
+                  </datepicker>
+                </div>
+              </div>
+            </div>
+            <div class="row" style="margin-top:5px;">
+              <div class="col-sm-2">
+                <label class="col-sm-4 control-label ">终止日期</label>
+                <div class="col-sm-8">
+                  <datepicker @change="$dispatch('setQueryCondition',model)" id="endDate" placeholder="终止日期"
+                              style="display: block"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="u.f_apply_date <= '{}'">
+                  </datepicker>
+                </div>
+              </div>
+
+              <div class="col-sm-2">
+                <label class="col-sm-4 control-label ">用户类型</label>
+                <div class="col-sm-8">
+                  <v-select :options="$parent.$parent.usertype" placeholder='用户类型' condition="f_user_type  like '{}'"
+                            :width="100" style="width:100%"
+                            v-model="model.f_user_type" :value.sync="model.f_user_type" close-on-select>
+                  </v-select>
+                </div>
+            </div>
+
+              <div class="col-sm-2">
+                <label class="col-sm-4 control-label ">报建类型</label>
+                <div class="col-sm-8">
+                  <v-select :options="$parent.$parent.applytype" placeholder='报建类型' condition="f_apply_type  like '{}%'"
+                            :width="100"
+                            v-model="model.f_apply_type" :value.sync="model.f_apply_type" style="width: 100%" close-on-select>
+                  </v-select>
+                </div>
+              </div>
+              <div class="col-sm-4">
+                    <button class="btn btn-primary btn-sm" type="button" @click="search(),$parent.$parent.showpager()" style="margin-left:10%">
+                      <span class="glyphicon glyphicon-search"></span>查询</button>
+                    <button class="btn-primary btn btn-sm" @click.prevent="$parent.$parent.clear()">清空</button>
+              </div>
+            </div>
+
+          </form>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid  class="list_area" is-fixed='false'>
+          <template partial='head'>
+            <tr class="title">
+              <th>
+                <nobr>序号</nobr>
+              </th>
+              <th>
+                <nobr>项目名称</nobr>
+              </th>
+              <th>
+                <nobr>终止流程</nobr>
+              </th>
+              <th>
+                <nobr>报建编号</nobr>
+              </th>
+              <th>
+                <nobr>联系人</nobr>
+              </th>
+              <th>
+                <nobr>小区</nobr>
+              </th>
+              <th v-if="!this.$login.f.f_fengongsi.includes('中燃')">
+                <nobr>用户类型</nobr>
+              </th>
+              <th>
+                <nobr>报建类型</nobr>
+              </th>
+              <th>
+                <nobr>报建日期</nobr>
+              </th>
+              <th>
+                <nobr>终止日期</nobr>
+              </th>
+              <th>
+                <nobr>项目状态</nobr>
+              </th>
+              <th>
+                <nobr>终止人</nobr>
+              </th>
+              <th>
+                <nobr>终止原因</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td  style="text-align: center;">
+                <nobr>{{$index+1}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_entry_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+              <nobr>{{row.f_apply_num}}</nobr>
+            </td>
+              <td style="text-align: center;">
+                <nobr>{{row.defname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+
+              <td style="text-align: center;">
+                <nobr>{{row.f_residential_area}}</nobr>
+              </td>
+              <td style="text-align: center;" v-if="!this.$login.f.f_fengongsi.includes('中燃')">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_apply_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_apply_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_sub_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><button @click="$parent.$parent.$parent.stopinfoshow($index)">查看终止原因</button></nobr>
+              </td>
+
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+    <modal :show.sync="showstopinfoflag" v-ref:modal backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closestopinfo"><span>&times;</span></button>
+        <h4 class="modal-title">终止原因</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <p >{{stopremarks}}</p>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      "M+": this.getMonth() + 1, //月份
+      "d+": this.getDate(), //日
+      "H+": this.getHours(), //小时
+      "m+": this.getMinutes(), //分
+      "s+": this.getSeconds(), //秒
+      "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+      "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+      if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+  }
+    import {
+        PagedList
+    } from 'vue-client'
+  import * as Util from '../../Util'
+
+    export default {
+        title: '报建终止查询',
+        data() {
+            return {
+                usertype: this.$appdata.getParam('用户类型'),
+                defnameType: this.$appdata.getParam('流程状态'),
+                applytype: this.$appdata.getParam('报建类型'),
+                //中燃 专用
+                fapplytype: this.$appdata.getParam('用户类型'),
+                showbtn: false,
+                model: new PagedList('rs/sql/checkproduceStop', 20, {
+                    data: {
+                        id: this.$login.f.id,
+                        fengongsi: this.$login.f.f_fengongsi,
+                        f_product_id: 1
+                    }
+                }),
+                condition: '',
+                showstopinfoflag:false,
+                stopremarks:""
+            }
+        },
+        ready() {
+          this.$refs.cp.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
+          this.$refs.cp.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+          this.$refs.cp.$refs.cri.search()
+        },
+        methods: {
+          clear(){
+              this.$refs.cp.$refs.cri.model = {}
+          },
+            stopinfoshow(index){
+                this.showstopinfoflag = true;
+                let remakrs = this.model.rows[index].f_stop_remarks;
+                console.log(JSON.stringify(remakrs))
+                console.log(remakrs)
+
+                this.stopremarks= remakrs;
+            },
+            clifun(row) {
+                this.$refs.cp.$refs.grid.model.rows = [row]
+                this.$refs.cp.pager = false
+                this.$dispatch('showbtn', row)
+            },
+            showpager() {
+                this.$refs.cp.pager = true
+                this.$dispatch('hiddenbtn')
+            },
+            closestopinfo(){
+                this.showstopinfoflag = close;
+            }
+        }
+    }
+</script>
+<style scoped>
+  label {
+    display: flex;
+    justify-content:center;
+    align-items:Center;
+    padding-top: 8px;
+  }
+</style>

package/src/components/product/EngineeringSupervisory/EngineeringSupervisoryControl.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="col-sm-12" style="overflow:auto;">
+    <div class="tops" v-bind:style="{ height: topheight }">
+      <engineer-list v-ref:queryuser></engineer-list>
+    </div>
+    <div v-show="showtotal" v-bind:style="{ height: botheight }">
+      <div class="col-sm-2" v-show="showbasic">
+        <supervisory-chart :selectdata="selectdata"></supervisory-chart>
+      </div>
+      <div class="col-sm-9">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='header'>
+            <supervisory-service-control  :selectdata="selectdata" ></supervisory-service-control>
+          </tab>
+          <tab header='档案信息'>
+            <record-message v-ref:record :selectdata="selectdata" :key="tittle1" :edit = "false"></record-message>
+          </tab>
+          <tab header='附件'>
+            <engineer-upload v-ref:file :blodid = "selectdata.f_process_id" :isusetype = "true" :isremark = "true"  :defname="selectdata.defname"></engineer-upload>
+<!--
+            <upload v-ref:file :blodid = "selectdata.f_process_id" :isusetype = "false" :isremark ="true"
+                    :isupload = "true"
+                    :takeimg = "true"
+                    :edit = "false">
+            </upload>-->
+          </tab>
+        </tabset>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import  {HttpResetClass} from 'vue-client'
+    export default {
+      title: '流程监控',
+      props: [ 'defname'],
+      data() {
+        return {
+          flagl:false,
+          flagg: false,
+          showbasic: false,
+          showtotal: false,
+          header: null,
+          selectdata: {},
+          botheight: '0%',
+          topheight: '100%',
+          tittle1:'户档案管理',
+          tittle2:'表档案管理',
+          tittle3:'设备管理',
+          info: '流程监控'
+        }
+      },
+      created(){
+        let http = new HttpResetClass()
+        http.load('POST','rs/logic/ApplyGetConfigs', {data:this.$login.f}, {resolveMsg: null, rejectMsg: null}
+        ).then((res)=>{
+          if(res.data.code && res.data.code == 200){
+            Vue.supervisory_vue = Vue.prototype.$supervisory_vue = res.data.workflow_vue
+          }else{
+            this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
+            return
+          }
+        })
+        console.log("$supervisory_vue:"+JSON.stringify(this.$supervisory_vue))
+      },
+      events: {
+        'addactive'() {
+          this.$refs.queryuser.$refs.cp.$refs.cri.search()
+          this.hidden()
+          this.showbasic = true
+          this.topheight = '20%'
+          this.botheight = '80%'
+        },
+        'changeheight'() {
+          this.show = false
+          this.botheight = '0%'
+        },
+        'check'(val) {
+          this.selectdata = ''
+          this.selectdata = val
+          console.log("节点编号:"+this.selectdata.actdefid,"节点名称:"+this.selectdata.defname)
+          this.topheight = '20%'
+          this.botheight = '80%'
+          this.$refs.queryuser.$refs.cp.$refs.grid.model.rows = [val]
+          this.$refs.queryuser.$refs.cp.pager = false
+          this.showbasic = true
+          let msg = val.defname
+          this.header = msg
+          this.hidden()
+        },
+        'selfsearch'() {
+          this.$refs.queryuser.$refs.cp.$refs.cri.search()
+        },
+        'close'() {
+          this.hidden()
+          this.showtotal = false
+          this.topheight = '100%'
+          this.botheight = '0%'
+          this.$refs.queryuser.$refs.cp.pager = true
+        }
+      },
+      methods: {
+        hidden() {
+          this.showtotal = true
+        },
+        close() {
+          this.hidden()
+          this.topheight = '100%'
+          this.botheight = '0%'
+        }
+      },
+      watch: {
+        'selectdata'(val) {
+          console.log('selectdata:', val)
+        },
+        'selectdata.f_customer_type'() {
+          if (this.selectdata.f_customer_type == '企业') {
+            this.flagg = true
+          }
+        },
+        'selectdata.f_apply_type'() {
+          if (this.selectdata.f_apply_type=="集体报建" || this.selectdata.f_apply_type=="集体报建流程") {
+            this.flagl = true
+          }
+        }
+      },
+
+    }
+</script>