apply-clients 4.1.65 → 4.1.66-weinan

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -1,194 +1,200 @@
-<template>
-  <div class="auto clearfix">
-    <show-back-reason :selectdata="data"></show-back-reason>
-  </div>
-  <service-view v-ref:service_show :data="data" v-if="showview"></service-view>
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  // Date格式化
-  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
-  }
-  export default {
-    title: '报建监控控制层',
-    props: {
-      selectdata: {
-        type: Object
-      },
-      nodeSnapshot: {
-        type: Boolean,
-        default: false
-      }
-    },
-    data() {
-      return {
-        data: null,    // 展示的数据
-        json_datas: null, // json配置数据结构
-        showview: false // 控制显示层显示
-      }
-    },
-    created () {
-      this.initial()
-    },
-    methods: {
-      // 初始化模块
-      async initial() {
-        this.showview = false
-        this.json_datas = this.$workflow_vue
-        let sum = 0
-        let jsonData = {}
-        this.json_datas.activitys.forEach(item => {
-          if (this.selectdata.defname === item.title) {
-            jsonData = item
-            sum++
-          }
-        })
-        if (sum === 0) {
-          this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
-          return
-        }
-        if (sum === 1) {
-          this.data = jsonData
-          this.data = Object.assign({}, this.data, this.selectdata)
-
-          await this.initializtion()
-          this.showview = true
-          return
-        }
-        this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
-      },
-      // json配置数据处理
-      async initializtion() {
-        this.data.fields.forEach(item => {
-          if (this.selectdata[item.field]) {
-            item.value = this.selectdata[item.field]
-          }
-          // 如果配置类型为select,获取options
-          if(item.type==='select'){
-            item.options=[]
-          }
-          if (typeof item.value === 'string' && item.value.startsWith("{") && item.value.endsWith("}")) {
-            item.value = JSON.parse(item.value)
-          }
-        })
-
-        // 控制组件
-        if (this.data.components) {
-          this.data.components.forEach(item => {
-            item.mark = 1
-          })
-        }
-
-
-        // onetomany 数据获取
-        if (this.data.onetomany) {
-          for (let index = 0; index < this.data.onetomany.length; index++) {
-            let http = new HttpResetClass()
-            let data = {
-              tablename: this.data.onetomany[index].tables[0],
-              condition: `f_process_id='${this.selectdata.f_process_id}'`
-            }
-
-            let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
-              resolveMsg: null,
-              rejectMsg: 'onetomany查询失败'
-            })
-
-            // 初始化 onetomany
-            this.data.onetomany[index].rows = res.data
-
-            // 初始化onetomany中的fields
-            for (let j = 0; j < this.data.onetomany[index].fields.length; j++) {
-              // 如果配置类型为select,优先从参数列表获取options
-              if (this.data.onetomany[index].fields[j].type === 'select') {
-                let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                if (temp && temp.length > 0) {
-                  this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                }
-              }
-            }
-          }
-        }
-        // 去除button
-        this.data.buttons = null
-
-
-        // 查询是否有当前节点快照信息,如果有使用快照数据，没有则展示最新数据
-        if (this.nodeSnapshot && this.data.nodeSnapshot) {
-          let http = new HttpResetClass()
-          let data = {
-            tablename: 't_node_snapshot',
-            condition: `actid = '${this.selectdata.actid}' and f_process_id='${this.selectdata.f_process_id}'`
-          }
-          let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
-            resolveMsg: null,
-            rejectMsg: null
-          })
-          if (res.data.length > 0) {
-            data = JSON.parse(res.data[0].f_node_data)
-
-            this.data.fields = data.fields
-            this.data.onetomany = data.onetomany
-            this.data.title = data.title
-          }
-        }
-
-
-        // 将所有field都不可修改，不可操作
-        this.data.fields.forEach(item => {
-          item.readonly = true
-          item.disabled = true
-        })
-        // 去除所有onetomany的操作
-        if (this.data.onetomany) {
-          this.data.onetomany.forEach(item => {
-            item.hiddenOperate = true
-          })
-        }
-
-        // 完成时间和完成人,部门，分公司
-        if (this.selectdata.state === '结束') {
-          let http = new HttpResetClass()
-          let res = await http.load('POST', 'rs/search', {
-            source: 'this.getInfo()',
-            userid: this.selectdata.userid
-          }, {resolveMsg: null, rejectMsg: null})
-          let user = res.data
-          this.data.operate_date = new Date(this.selectdata.finishtime).Format('yyyy-MM-dd')
-          this.data.operator = this.selectdata.person
-          this.data.f_filiale = user.orgs
-          this.data.f_parentname = user.deps
-        }
-      }
-    },
-    events:{
-    },
-    watch: {
-      deep: true
-    }
-  }
-</script>
-<style scoped>
-  /*清除model中的浮动*/
-  .clearfix:after,.clearfix:before{
-    display: table;
-  }
-  .clearfix:after{
-    clear: both;
-  }
-</style>
+<template>
+  <div class="auto clearfix">
+    <show-back-reason :selectdata="data"></show-back-reason>
+  </div>
+  <service-view v-ref:service_show :data="data" v-if="showview"></service-view>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  // Date格式化
+  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
+  }
+  export default {
+    title: '报建监控控制层',
+    props: {
+      selectdata: {
+        type: Object
+      },
+      nodeSnapshot: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        data: null,    // 展示的数据
+        json_datas: null, // json配置数据结构
+        showview: false // 控制显示层显示
+      }
+    },
+    created () {
+      this.initial()
+    },
+    methods: {
+      // 初始化模块
+      async initial() {
+        this.showview = false
+        this.json_datas = this.$workflow_vue
+        let sum = 0
+        let jsonData = {}
+        this.json_datas.activitys.forEach(item => {
+          if (this.selectdata.defname === item.title) {
+            jsonData = item
+            sum++
+          }
+        })
+        if (sum === 0) {
+          this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
+          return
+        }
+        if (sum === 1) {
+          this.data = jsonData
+          this.data = Object.assign({}, this.data, this.selectdata)
+
+          await this.initializtion()
+          this.showview = true
+          return
+        }
+        this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
+      },
+      // json配置数据处理
+      async initializtion() {
+        this.data.fields.forEach(item => {
+          if (this.selectdata[item.field]) {
+            item.value = this.selectdata[item.field]
+          }
+          // 如果配置类型为select,获取options
+          if(item.type==='select'){
+            item.options=[]
+          }
+          if (typeof item.value === 'string' && item.value.startsWith("{") && item.value.endsWith("}")) {
+            item.value = JSON.parse(item.value)
+          }
+        })
+
+        // 控制组件
+        if (this.data.components) {
+          this.data.components.forEach(item => {
+            item.mark = 1
+          })
+        }
+
+
+        // onetomany 数据获取
+        if (this.data.onetomany) {
+          for (let index = 0; index < this.data.onetomany.length; index++) {
+            let http = new HttpResetClass()
+            let data = {
+              tablename: this.data.onetomany[index].tables[0],
+              condition: `f_process_id='${this.selectdata.f_process_id}'`
+            }
+
+            let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+              resolveMsg: null,
+              rejectMsg: 'onetomany查询失败'
+            })
+
+            // 初始化 onetomany
+            this.data.onetomany[index].rows = res.data
+
+            // 初始化onetomany中的fields
+            for (let j = 0; j < this.data.onetomany[index].fields.length; j++) {
+              // 如果配置类型为select,优先从参数列表获取options
+              if (this.data.onetomany[index].fields[j].type === 'select') {
+                let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                if (temp && temp.length > 0) {
+                  this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                }
+              }
+            }
+          }
+        }
+        // 去除button
+        this.data.buttons = null
+
+
+        // 查询是否有当前节点快照信息,如果有使用快照数据，没有则展示最新数据
+        if (this.nodeSnapshot && this.data.nodeSnapshot) {
+          let http = new HttpResetClass()
+          let data = {
+            tablename: 't_node_snapshot',
+            condition: `actid = '${this.selectdata.actid}' and f_process_id='${this.selectdata.f_process_id}'`
+          }
+          let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+            resolveMsg: null,
+            rejectMsg: null
+          })
+          if (res.data.length > 0) {
+            data = JSON.parse(res.data[0].f_node_data)
+
+            this.data.fields = data.fields
+            this.data.onetomany = data.onetomany
+            this.data.title = data.title
+          }
+        }
+
+
+        // 将所有field都不可修改，不可操作
+        this.data.fields.forEach(item => {
+          item.readonly = true
+          item.disabled = true
+        })
+        // 去除所有onetomany的操作
+        if (this.data.onetomany) {
+          this.data.onetomany.forEach(item => {
+            item.hiddenOperate = true
+          })
+        }
+
+        // 完成时间和完成人,部门，分公司
+        if (this.selectdata.state === '结束') {
+          let http = new HttpResetClass()
+          let res = await http.load('POST', 'rs/search', {
+            source: 'this.getInfo()',
+            userid: this.selectdata.userid
+          }, {resolveMsg: null, rejectMsg: null})
+          let user = res.data
+          this.data.operate_date = new Date(this.selectdata.finishtime).Format('yyyy-MM-dd')
+          this.data.operator = this.selectdata.person
+          this.data.f_filiale = user.orgs
+          this.data.f_parentname = user.deps
+        }
+        for (const item of this.data.fields) {
+          debugger
+          if(item.label==='气价名称'){
+            item.value=this.data.f_price_name
+          }
+        }
+      }
+    },
+    events:{
+    },
+    watch: {
+      deep: true
+    }
+  }
+</script>
+<style scoped>
+  /*清除model中的浮动*/
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+</style>

package/src/components/product/Supervisory/SupervisoryControl.vue

@@ -13,7 +13,7 @@
             <tab :header='selectdata.defname'>
               <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
             </tab>
-            <tab header='附件'>
+<!--            <tab header='附件'>
               <apply-upload :blodid="selectdata.f_process_id"
                             :isupload = "false"
                             :isdelete="false"
@@ -23,7 +23,7 @@
                             :issearch="true"
                             :defname="selectdata.defname">
               </apply-upload>
-            </tab>
+            </tab>-->
           </tabset>
         </div>
       </div>
@@ -86,9 +86,14 @@
           this.xmlname = '散户集体报建流程'
         } else if (this.selectdata.f_apply_type === '煤改气报建') {
           this.xmlname = '散户集体报建流程'
+        } else if (this.selectdata.f_apply_type === '拆改装报建') {
+          this.xmlname = '拆改装流程'
         } else if (this.selectdata.f_apply_type === '综合报建') {
           this.xmlname = '报建流程'
-        } else {
+        }  else if (this.selectdata.f_apply_type === '居民报建') {
+          this.xmlname  = '居民报建流程'
+        }
+        else {
           this.$showMessage('暂无此类报装')
           return
         }

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -6,20 +6,20 @@
           <div class="row">
             <div class="form-group col-sm-4">
               <label class="font_normal_body">项目名称:</label>
-              <input type="text" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="search" condition=" f_entry_name = '{}' " placeholder='请输入'>
+              <input type="text" class="input_search" v-model="model.f_entry_name"
+                     v-on:keyup.enter="search" condition=" f_entry_name like '%{}%' " placeholder='请输入'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">报建编号：</label>
               <input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="search"
-                     condition="f_apply_num = '{}'">
+                     condition="f_apply_num like '%{}%'">
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">合同编号：</label>
               <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
                    v-on:keyup.enter="search"
-                     condition="f_contract_number = '{}'">
+                     condition="f_contract_number 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>
@@ -58,6 +58,18 @@
                 :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_sub_state"
+                placeholder='流程状态'
+                condition="f_sub_state = '{}'"
+                :value.sync="model.f_sub_state"
+                :options='$parent.$parent.f_sub_state'
+                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>-->
 <!--              <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"-->
@@ -164,7 +176,8 @@
             orgid: this.$login.f.orgid
           }
         }),
-        defnames: [{label: '全部', value: ''}], // 流程节点
+        f_sub_state: [{label: '全部', value: ''}, {label: '完工', value: '完工'}, {label: '正在进行', value: '正在进行'}, {label: '终止', value: '终止'}],
+        defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
         criteriaShow: false
       }
     },
@@ -193,7 +206,7 @@
             this.defnames = [{label: '全部', value: ''}, ...res.data]
           })
         } else {
-          this.defnames = [{label: '全部', value: ''}]
+          this.defnames = [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')]
         }
       },
       check (val) {

package/src/components/product/Supervisory/SupervisoryhCart.vue

@@ -48,15 +48,8 @@
       },
       //点击获取节点名
       getdefname(row){
-        if(row.defname === this.$workflow_vue.start_activity){
           row = Object.assign({},this.selectdata,row)
           this.$dispatch('apply', row)
-        }else if(this.check(row.actorexpression)){
-          row = Object.assign({},this.selectdata,row)
-          this.$dispatch('apply', row)
-        }else{
-          this.$showMessage("对不起，您没有查看此节点的权限！")
-        }
       },
       // 检测是否有权限
       check(actorexpression){

package/src/components/product/Test.vue

@@ -1,7 +1,5 @@
 <template>
-  <div class="basic-main" style="height: 100%">
-    {{{ model }}}
-  </div>
+
 </template>
 
 <script>
@@ -32,5 +30,11 @@
 </script>
 
 <style scoped>
-
+.my-swipe .van-swipe-item {
+  color: #fff;
+  font-size: 20px;
+  line-height: 150px;
+  text-align: center;
+  background-color: #39a9ed;
+}
 </style>