apply-clients 5.0.361 → 6.0.3

package/src/components/build/Install/ProcessInfo/zhongran/ZR_ignition_transfer_info.vue

@@ -0,0 +1,104 @@
+<template>
+  <div class="auto" style="padding-right:5px; padding-top: 10px;">
+    <validator name="v">
+      <div class="panel"  v-bind:class="{'panel-default': showdef, ' panel-info' : showinfo}">
+        <div class="panel-heading" @click ="hello()">
+          <h3 class="panel-title">资料移交信息<span class="pull-right  glyphicon" v-bind:class="{'glyphicon-chevron-right': show, 'glyphicon-chevron-down' : hasError}"></span></h3>
+        </div>
+        <div class="panel-body" v-if="hasError">
+          <div class="col-sm-12">
+            <span class="col-sm-6">资料是否齐全：{{model.f_iscomplete_information == true?"是":"否"}}</span>
+            <span class="col-sm-12">移交点火通气备注：{{model.f_ignitionventilation_transfer_remark}}</span>
+          </div>
+        </div>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+  export default {
+    title: '资料移交信息',
+    data () {
+      return {
+        title: '材料计划',
+        actdefid: 9,
+        hasError: false,
+        show: true,
+        showdef: true,
+        showinfo: false,
+        model: {
+        }
+      }
+    },
+    props: ['transfer'],
+    ready() {
+      this.model = Object.assign({}, this.model, this.transfer)
+      if (!this.transfer.f_project_startdate) {
+        this.model.f_project_startdate = '无'
+        this.model.f_project_material = '无'
+        this.model.f_blue_print = '无'
+        this.model.f_indoor_startdate = '无'
+        this.model.f_indoor_enddate = '无'
+        this.model.f_outdoors_startdate = '无'
+        this.model.f_outdoors_enddate = '无'
+        this.model.f_project_remarks = '无'
+      }
+      this.show = false
+      this.hasError = false
+      if (this.transfer.defname === this.title) {
+        this.hasError = true
+      } else {
+        this.hasError = false
+        this.show = true
+      }
+      if (this.actdefid <= this.model.actdefid) {
+        this.showdef = false
+        this.showinfo = true
+      } else {
+        this.showdef = true
+        this.showinfo = false
+      }
+    },
+    methods: {
+      hello () {
+        if (!this.transfer.defname) {
+          return
+        }
+        if (this.actdefid > this.transfer.actdefid) {
+          return
+        }
+        if (this.show) {
+          this.show = false
+          this.hasError = true
+        } else {
+          this.show = true
+          this.hasError = false
+        }
+      },
+      flush () {
+        this.transfer = ''
+        this.model = ''
+      }
+    },
+    watch: {
+      'transfer' () {
+        this.model = Object.assign({}, this.model, this.transfer)
+        this.show = false
+        this.hasError = false
+        if (this.transfer.defname === this.title) {
+          this.hasError = true
+        } else {
+          this.hasError = false
+          this.show = true
+        }
+        if (this.actdefid <= this.model.actdefid) {
+          this.showdef = false
+          this.showinfo = true
+        } else {
+          this.showdef = true
+          this.showinfo = false
+        }
+      }
+    }
+  }
+</script>

package/src/components/{product/Bill → build/Install/bill}/BillXSDMakeInfo.vue

@@ -65,7 +65,7 @@
 
 <script>
   import {HttpResetClass} from 'vue-client'
-  import * as Util from '../../Util'
+  import * as Util from '../../../Util'
 
   export default {
     title: "售单销信息",

package/src/components/build/Install/monitor/SupervisoryControl.vue

@@ -0,0 +1,178 @@
+<template>
+  <div class="col-sm-12" style="overflow:auto;">
+    <div class="tops" v-bind:style="{ height: topheight }">
+      <supervisory-list v-ref:queryuser></supervisory-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'>
+            <route v-ref:route></route>
+            <route :comp="{name: 'customer-essential-info'}" v-if = "r1" ></route>
+          </tab>
+          <tab header='户档案信息'>
+            <customer-record-message v-ref:record :selectdata="selectdata" :key="tittle1" :edit = "false"></customer-record-message>
+          </tab>
+          <tab header='表档案信息'>
+            <customer-record-message v-ref:record :selectdata="selectdata" :key="tittle2" :edit = "false"></customer-record-message>
+          </tab>
+          <tab header='设备信息' v-if="selectdata.f_user_type =='非民用'">
+          <customer-equipment-message v-ref:equipment :selectdata="selectdata" :key="tittle3" :edit = "false"></customer-equipment-message>
+          </tab>
+          <tab header='材料信息'>
+            <customer-material-message v-ref:material :selectdata="selectdata" :edit = "false"></customer-material-message>
+          </tab>
+          <tab header='附件'>
+            <upload v-ref:file :blodid = "selectdata.f_process_id" :isusetype = "false" :isremark ="false"
+                    :isupload = "true"
+                    :takeimg = "true"
+                    :edit = "false">
+            </upload>
+          </tab>
+        </tabset>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+    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: '流程监控'
+        }
+      },
+      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%'
+          if (this.$refs.binfo) {
+            this.$refs.pinfo.flush()
+            this.$refs.jinfo.flush()
+            this.$refs.binfo.flush()
+            this.$refs.finfo.flush()
+            this.$refs.cinfo.flush()
+            this.$refs.fvinfo.flush()
+            this.$refs.minfo.flush()
+            this.$refs.dinfo.flush()
+            this.$refs.buinfo.flush()
+            this.$refs.ninfo.flush()
+            this.$refs.iinfo.flush()
+          }
+        },
+        '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()
+         if(this.$login.f.f_fengongsi.includes("西昌")){
+            if(msg === '测绘申请'){
+              this.$refs.route.init('zr_placecontroler', {selectdata: this.selectdata,edit : false})//zr_placecontroler  zr_receivingnote
+            }
+           if(msg === '测绘设计'){
+             console.log('测绘设计')
+             this.$refs.route.init('zr_testdesign', {selectdata: this.selectdata,edit : false})//zr_placecontroler  zr_receivingnote
+           }
+            if (msg === '报建登记') {
+              console.log(this.selectdata)
+              this.$refs.route.init('zr_customeressentialinfo', {selectdata: this.selectdata,edit : false})
+              console.log(this.$refs.record)
+            }
+            if (msg === '收费标准制定') {
+              this.$refs.route.init('zr_feenorme', {selectdata: this.selectdata,edit : false})
+            }
+            if (msg === '合同签订') {
+              this.$refs.route.init('zr_contratsigne', {selectdata: this.selectdata,edit : false})
+            }
+            if (msg === '材料计划') {
+              this.$refs.route.init('zr_materialplan', {selectdata: this.selectdata,edit : false})
+            }
+            if (msg === '施工报建') {
+              this.$refs.route.init('zr_construction', {selectdata: this.selectdata,edit : false})
+            }
+            if (msg === '工程施工任务书') {
+              this.$refs.route.init('zr_dispatchingjob', {selectdata: this.selectdata,edit : false})
+            }
+            if (msg === '竣工验收') {
+              this.$refs.route.init('zr_receivingnote', {selectdata: this.selectdata,edit : false})
+            }
+            if (msg === '资料移交') {
+              this.$refs.route.init('zr_ignitionventilation_transfer', {selectdata: this.selectdata,edit : false})
+            }
+            if (msg === '通气点火') {
+              this.$refs.route.init('zr_ignitionventilation', {selectdata: this.selectdata,edit : false})
+            }
+            if (msg === '完工') {
+              this.$refs.route.init('zr_end')
+            }
+          }
+        },
+        '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>

package/src/components/build/Install/monitor/SupervisoryList.vue

@@ -0,0 +1,209 @@
+<template>
+  <div class="d1">
+    <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="col-sm-12">
+              <div class="col-sm-2">
+                <label class="col-sm-6 label">客户名称:</label>
+                <div class="col-sm-6">
+                  <input type="text" class="form-control" placeholder='客户名称' v-model="model.f_user_name"
+                         v-on:keyup.enter="search"
+                         condition="f_user_name like '{}%'">
+                </div>
+              </div>
+
+              <!--<div class="col-sm-2">-->
+              <!--<input type="text" class="form-control" placeholder='报建编号' v-model="model.f_apply_num"-->
+              <!--v-on:keyup.enter="search"-->
+              <!--condition="f_apply_num like '{}%'">-->
+              <!--</div>-->
+              <div class="col-sm-2">
+                <label class="col-sm-6 label">用户地址:</label>
+                <div class="col-sm-6">
+                  <input type="text" class="form-control" placeholder='用户地址' v-model="model.f_address"
+                         v-on:keyup.enter="search"
+                         condition="f_address like '{}%'">
+                </div>
+              </div>
+              <div class="col-sm-2">
+                <label class="col-sm-6 label">小区名称:</label>
+                <div class="col-sm-6">
+                  <input type="text" class="form-control" placeholder='小区名称' v-model="model.f_residential_area"
+                         v-on:keyup.enter="search"
+                         condition="f_residential_area like '{}%'">
+                </div>
+              </div>
+              <div class="col-sm-1"></div>
+              <div class="col-sm-2">
+                <label class="col-sm-6 label">报装类型:</label>
+                <div class="col-sm-6">
+                  <v-select :options="$parent.$parent.applytype" placeholder='报装类型' condition="f_apply_type  like '{}%'"
+                            v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>
+                  </v-select>
+                </div>
+              </div>
+              <div class="col-sm-1"></div>
+              <div class="col-sm-1">
+                <button class="btn btn-primary btn-sm width-80" type="button" @click="search(),$parent.$parent.close()">
+                  <span class="glyphicon glyphicon-search"></span>查询
+                </button>
+              </div>
+            </div>
+          </form>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid class="data-grid" is-fixed='false' style="overflow-x:auto">
+          <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>
+                <nobr>地址</nobr>
+              </th>
+              <th>
+                <nobr>流程状态</nobr>
+              </th>
+              <th>
+                <nobr>报装类型</nobr>
+              </th>
+              <th>
+                <nobr>报建日期</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td @click="$parent.$parent.$parent.check(row)">
+                <nobr>{{$index+1}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)">
+                <nobr>{{row.f_sub_state}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)">
+                <nobr>{{row.f_apply_num}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)">
+                <nobr>{{row.f_phone}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)">
+                <nobr>{{row.defname}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)">
+                <nobr>{{row.f_apply_type}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)">
+                <nobr>{{row.f_apply_date}}</nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+<script>
+  import AppData from '../../../../stores/AppData.js'
+  import {
+    PagedList
+  } from 'vue-client'
+  import getNowDate from '../../../getNowDate.js'
+
+  export default {
+    title: '勘探详情',
+    data() {
+      return {
+        model: new PagedList('rs/sql/supervisory', 20, {
+          data: {
+            id: `${this.$login.f.name}`,
+            fengongsi: `${this.$login.f.f_fengongsi}`
+          }
+        }),
+        condition: '',
+        select: ''
+      }
+    },
+    ready() {
+      this.$refs.cp.$refs.cri.search()
+    },
+    methods: {
+      generateUUID() {
+        var d = new Date().getTime()
+        var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          var r = (d + Math.random() * 16) % 16 | 0
+          d = Math.floor(d / 16)
+          return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16)
+        })
+        return uuid
+      },
+      check(val) {
+        this.$dispatch('check', val)
+      },
+      close() {
+        this.$dispatch('close')
+      },
+      compare(val) {
+        val === '完工'
+        console.log('完工', val)
+        return false
+      }
+    },
+    computed: {
+      date() {
+        return getNowDate()
+      },
+      selected() {
+        return this.$refs.cp.$refs.grid.selected
+      },
+      usertype() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      defnameType() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('流程状态')]
+      },
+      applytype() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('报装类型')]
+      }
+    }
+  }
+</script>
+<style>
+  tr.title {
+    background-color: #6666ff;
+  }
+
+  .label {
+    display: flex;
+    justify-content: center;
+    align-items: Center;
+    color: black;
+    padding-top: 8px;
+  }
+
+</style>

package/src/components/{product/Supervisory → build/Install/monitor}/SupervisoryhCart.vue

@@ -21,41 +21,20 @@
       methods :{
         //点击获取节点名
         getdefname(row){
-          if(this.$login.r.includes('报装流程监控')){
-            // 仅留保存按钮
+          if(row.defname == '报建登记'){
             row = Object.assign({},this.selectdata,row)
             this.$dispatch('check', row)
-            return
-          }
-            this.$supervisory_vue.start_activity=this.$supervisory_vue.activitys[0].title;
-            if(row.defname === this.$supervisory_vue.start_activity){
-            row = Object.assign({},this.selectdata,row)
-            this.$dispatch('check', row)
-          }else if(this.check(row.actorexpression)){
+          }else if(this.$login.f.rolesnames.includes(row.actorexpression.split("$")[1]) ){
             row = Object.assign({},this.selectdata,row)
             this.$dispatch('check', row)
           }else{
             this.$showMessage("对不起，您没有查看此节点的权限！")
           }
-        },
-        // 检测是否有权限
-        check(actorexpression){
-          let array = this.$login.f.rolesnames.split(',')
-          for(let i=0;i<array.length;i++){
-            if(array[i] && actorexpression.includes(array[i])){
-              return true
-            }else if(actorexpression.includes(this.$login.f.id)){ // P(张三)  // 张三
-              return true
-            }else if(array[i]=='报装流程监控'){
-              return true
-            }
-          }
-          return false
         }
       },
       watch:{
         async 'selectdata'(){
-          // 获取流程节点信息
+          debugger
           let http = new HttpResetClass()
           var  temp = []
           if(this.selectdata){
@@ -65,10 +44,6 @@
               var flag = true
               for (var j = 0; j< temp.length; j++){
                 if(res.data[i].defname == temp[j].defname){
-                  // 获取每个满足条件节点信息的人的分公司和部门
-
-                  http = new HttpResetClass()
-
                   flag = false
                 }
               }
@@ -77,7 +52,6 @@
               }
             }
             this.defnames = temp
-
           }
         }
       }