apply-clients 3.0.2 → 3.0.5-2

package/src/components/product/Process/MaterialUseList.vue

@@ -0,0 +1,159 @@
+<template>
+  <div id='app'class="flex bg-white p-10 datapanel" >
+    <criteria-paged :model="model" :pager='false'>
+      <criteria partial='criteria' @condition-changed='search'>
+        <div novalidate class="form-inline auto" partial>
+          <div class="form-group">
+            <div class="form-group">
+            <label class="control-label">分公司:</label>
+            <!--<right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source' @re-res="$parent.$parent.getRes" ></right-tree>
+            -->  <v-select :value.sync="model.f_filiale" v-model="model.f_filiale"
+                        :options='$parent.$parent.filiale' placeholder='请选择'
+                        close-on-select>
+              </v-select>
+            </div>
+            <div class="form-group">
+              <label class="control-label">报建编号:</label>
+              <!--<right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source' @re-res="$parent.$parent.getRes" ></right-tree>
+              -->  <v-select :value.sync="model.f_apply_num" v-model="model.f_apply_num"
+                           :options='$parent.$parent.appnum' placeholder='请选择'
+                           close-on-select search="">
+            </v-select>
+            </div>
+            <div class="form-group">
+              <label for="startDate" class="control-label">开始日期:</label>
+            <datepicker id="startDate" placeholder="开始日期"
+                        v-model="model.startDate"
+                        :value.sync="model.startDate"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd'"
+                        :show-reset-button="reset">
+            </datepicker></div>
+            <div class="form-group" class="control-label">
+            <label for="endDate">结束日期:</label>
+            <datepicker id="endDate" placeholder="结束日期"
+                        v-model="model.endDate"
+                        :value.sync="model.endDate"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd'"
+                        :show-reset-button="reset">
+            </datepicker></div>
+            <div class="form-group">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+            <report-print class="button_new button_spacing"  id='shexian' top='1cm' left='1cm' width='100%' height='100%'></report-print>
+            <report-excel class="button_export button_spacing"  id='shexian'></report-excel></div>
+          </div>
+        </div>
+      </criteria>
+      <div partial='list' id='shexian'>
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">报建实用材料报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+              报建编号：{{ model.applynum }}
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <th  colspan='5' style="font-weight: normal;">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </th>
+          </tr>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+
+</template>
+
+<script>
+  import { DataModel } from 'vue-client'
+
+  export default {
+    title: '报表',
+    data () {
+
+      let model =  new DataModel('rs/report/materialReport',{startDate: 'this.model.startDate', endDate: 'this.model.endDate',f_filiale: 'this.fengongsi',f_apply_num:'this.applynum'})
+      model.f_subcompany = '',
+        model.fengongsi = '',
+        model.applynum = ''
+      return {
+        filialeNameStr:'',
+        filialeCodeStr:'',
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+        model:model,
+        filiale:[],
+        appnum:[]
+
+      }
+    },
+    methods: {
+      // 获取组织结构
+      getRes(obj) {
+        console.log(obj,'se')
+        let fengongsi=obj.res.toString().split('.')
+        console.log(fengongsi,'se')
+        console.log(fengongsi[fengongsi.length-1],'se')
+        this.model.f_subcompany = obj.res
+        console.log(this.model,'se')
+        // this.model.filialeCodeStr = obj.resids
+        // this.model.filialeCodeStr = this.model.filialeCodeStr.replace(/\./g, '')
+      },
+      gethuman(){
+        console.log('获取人员')
+        this.$resetpost('rs/logic/getMaterialItem', {data: {condition: `1=1`}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          // this.params.rows.splice(index, 1)
+          console.log('获取成功',res)
+
+          let house2 = []
+          for (let row of res.data.f){
+            house2.push({label: row.f_filiale,value: row.f_filiale})
+          }
+          this.filiale = house2
+          let house3 = [
+            {label:'全部',value:''}
+          ]
+          for (let row of res.data.appnum){
+            house3.push({label: row.f_apply_num,value: row.f_apply_num})
+          }
+          this.appnum = house3
+        })
+
+      },
+    },
+    ready(){
+      this.gethuman()
+    },
+    computed: {
+      selected() {
+        return this.$refs.grid.selected
+      },
+      // outlets () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
+      // },
+      // operator () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
+      // }
+    },
+    watch :{
+      'model.model.f_filiale[0]'(val){
+
+          this.model.fengongsi = val
+
+
+      },
+      'model.model.f_apply_num[0]'(val){
+          this.model.applynum = val
+
+      },
+    }
+  }
+</script>

package/src/components/product/Process/ModifyUserFiles.vue

@@ -95,7 +95,7 @@
               <td style="text-align: center;">
                 <!-- <td style="text-align: center;" v-show= "$parent.$parent.$parent.jurisdiction.includes('档案修正权限')"> -->
                 <button type="button" name="button" class="btn btn-link" v-if="row.f_user_state === '正常'"
-                        @click.stop="$parent.$parent.$parent.modifyinfo(row)">改装</button>
+                        @click.stop="$parent.$parent.$parent.modifyinfo(row)">登记</button>
               </td>
             </template>
           </data-grid>
@@ -137,8 +137,9 @@
 
 <script>
 
-  import { PagedList } from 'vue-client'
+  import {HttpResetClass, PagedList} from 'vue-client'
   import Vue from 'vue'
+  import * as Util from "../../Util";
 
   let loadParamGem = async function (self) {
     console.log('获取登录信息，', self.$login, self.$appdata, self.$appdata.getParam('用户类型'), Vue.$login.f.name)
@@ -153,7 +154,7 @@
     'title': '用户档案',
     data () {
       return {
-        model: new PagedList('rs/sql/singleTable_OrderBy', 30, {items: '"*"', tablename: '"t_userinfo"', orderitem: '"CONVERT(int,f_userinfo_id)  desc"'}),
+        model: new PagedList('rs/sql/singleTable_OrderBy', 30, {items: '"*"', tablename: '"t_userinfo"', orderitem: '"f_userinfo_id desc"'}),
         row: null, // 选择一条用户信息，对其进行修改
         arearow: null, // 新建修改小区使用的数据小区使用
         areainfo: null, // 小区批量建档使用的数据
@@ -194,7 +195,15 @@
       search () {
         this.$refs.paged.$refs.criteria.search()
       },
-      modifyinfo (row) {
+      async modifyinfo (row) {
+        console.log('row:',row)
+        let http = new HttpResetClass()
+        let res = await http.load('POST','rs/logic/ApplyGetProcessID',{data:{filename:this.$workflow_vue.workflow_xmlfilename,start_activity:this.$workflow_vue.start_activity}}, {resolveMsg: null, rejectMsg: '获取流程ID失败，请联系开发人员'})
+        row.f_process_id = res.data.f_process_id
+        row.defname= this.$workflow_vue.start_activity
+        row.f_apply_date=Util.toStandardTimeString()
+        // row.f_apply_num= this.generateUUID()
+        row.f_apply_operator_telephone= this.$login.f.f_fgsdianhua
         this.$parent.show = true
         this.$parent.$refs.queryuser.addactive(row)
       },
@@ -280,7 +289,8 @@
         this.model.rows.unshift(data)
       },
       selfSearch (args) {
-        args.condition = `${args.condition} and f_filialeids  = '${this.$login.f.f_orgids}'`
+        // args.condition = `${args.condition} and f_filialeids  = '${this.$login.f.f_orgids}'`
+        args.condition = `${args.condition}`
         this.model.search(args.condition, args.model)
       },
       bulkOperations (name, type) {

package/src/components/product/Process/ProcessInfo/history_control.vue

@@ -1,110 +1,139 @@
-<template>
-  <div class="auto" style="padding-right:5px; padding-top: 10px;">
-    <validator name="v">
-
-      <div v-for="(index,item) in data" class="panel" v-bind:class="{'panel-default': showpanl[index].showdef, ' panel-info ' : showpanl[index].showinfo}">
-        <div :class="{'panel-heading  background-default':showpanl[index].show,'panel-heading':!showpanl[index].show}" @click ="hello(index)">
-          <h3 class="panel-title">{{item.title}}信息:{{item.person}}<span class="pull-right  glyphicon" v-bind:class="{'glyphicon-chevron-right': showpanl[index].show, 'glyphicon-chevron-down' : showpanl[index].hasError}"></span></h3>
-        </div>
-        <div class="panel-body" v-if="showpanl[index].hasError">
-          <div class="col-sm-12">
-            <div v-for="(index2,row) in item.fields">
-              <span v-if="row.hasOwnProperty('field')" class="col-sm-6">{{item.fields[index2].label}}：{{item.fields[index2].value}}</span>
-              <span v-else class="col-sm-6" v-for="(index3,arr) in row.items">{{arr.label}}：{{arr.value?'是':'否'}}</span>
-            </div>
-          </div>
-        </div>
-      </div>
-
-    </validator>
-  </div>
-</template>
-<script>
-  import  {HttpResetClass} from 'vue-client'
-  export default {
-    title: '通气点火信息',
-    data () {
-      return {
-        data:null,
-        defnames:null,
-        showpanl:[]
-      }
-    },
-    props: ['selectdata'],
-    methods: {
-      // 初始化  [{label:xx,value:vvv,filed}]
-      initializtion(){
-        let tempArray =[]
-        // 按照数据库defname的顺序排序
-        for(let i = 0;i<this.defnames.length;i++){
-          // 配置文件title循环
-          for(let j = 0;j<this.$workflow_vue.activitys.length;j++){
-            if(this.defnames[i].defname===this.$workflow_vue.activitys[j].title){
-              let temp = this.$workflow_vue.activitys[j]
-              if(this.defnames[i].hasOwnProperty('person')){
-                temp.person = this.defnames[i].person
-              }
-              this.showpanl.push({hasError:false,show:true,showdef:true,showinfo:false})
-              tempArray.push(temp)
-            }
-          }
-        }
-        // 给排序后的数组填充数据
-        for(let i=0;i<tempArray.length;i++){
-          for(let j = 0;j<tempArray[i].fields.length;j++){
-            if(tempArray[i].fields[j].hasOwnProperty('field')){
-              tempArray[i].fields[j].value = this.selectdata[tempArray[i].fields[j].field]
-            }else if(tempArray[i].fields[j].hasOwnProperty('items')){
-              for(let k = 0;k<tempArray[i].fields[j].items.length;k++){
-                tempArray[i].fields[j].items[k].value = this.selectdata[tempArray[i].fields[j].items[k].field]
-              }
-            }
-          }
-        }
-        this.data = tempArray
-      },
-      hello (index) {
-        if (!this.selectdata.defname) {
-          return
-        }
-        if (this.showpanl[index].show) {
-          this.showpanl[index].show = false
-          this.showpanl[index].hasError = true
-        } else {
-          this.showpanl[index].show = true
-          this.showpanl[index].hasError= false
-        }
-      }
-    },
-    watch:{
-      async 'selectdata'(){
-        let http = new HttpResetClass()
-        var  temp = []
-        if(this.selectdata){
-          let res = await http.load('POST','rs/sql/getdefname',{data:{processid:this.selectdata.f_process_id}},{resolveMsg:null, rejectMsg:null})
-          //循环去除回退导致重复的节点
-          for (var i = 0; i < res.data.length; i++) {
-            var flag = true
-            for (var j = 0; j< temp.length; j++){
-              if(res.data[i].defname == temp[j].defname){
-                flag = false
-              }
-            }
-            if(flag){
-              temp.push(res.data[i])
-            }
-          }
-          this.defnames = temp
-        }
-        // 初始化开始
-        this.initializtion()
-      }
-    }
-  }
-</script>
-<style scoped>
-  .background-default{
-    background-color: #F2F6FA;
-  }
-
-</style>
+<template>
+  <div class="auto" style="padding-right:5px; padding-top: 10px;" v-if="refreshed">
+    <validator name="v">
+
+      <div v-for="(index,item) in data" class="panel" v-bind:class="{'panel-default': showpanl[index].showdef, ' panel-info ' : showpanl[index].showinfo}">
+        <div :class="{'panel-heading  background-default':showpanl[index].show,'panel-heading':!showpanl[index].show}" @click ="hello(index)">
+          <h3 class="panel-title">{{item.title}}信息<span class="pull-right  glyphicon" v-bind:class="{'glyphicon-chevron-right': showpanl[index].show, 'glyphicon-chevron-down' : showpanl[index].hasError}"></span></h3>
+        </div>
+        <div class="panel-body" v-if="showpanl[index].hasError">
+          <div class="col-sm-12">
+            <div v-for="(index2,row) in item.fields">
+              <span v-if="row.hasOwnProperty('field')" class="col-sm-12">{{item.fields[index2].label}}：{{item.fields[index2].value}}</span>
+              <span v-else class="col-sm-12" v-for="(index3,arr) in row.items">{{arr.label}}：{{arr.value?'是':'否'}}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </validator>
+  </div>
+</template>
+<script>
+  import  {HttpResetClass} from 'vue-client'
+  export default {
+    title: '通气点火信息',
+    data () {
+      return {
+        data:null,
+        defnames:null,
+        refreshed:true,
+        showpanl:[]
+      }
+    },
+    props: ['selectdata'],
+    methods: {
+      // 初始化  [{label:xx,value:vvv,filed}]
+      initializtion(){
+        let tempArray =[]
+        // 按照数据库defname的顺序排序
+        for(let i = 0;i<this.defnames.length;i++){
+          // 配置文件title循环
+          for(let j = 0;j<this.$workflow_vue.activitys.length;j++){
+            if(this.defnames[i].defname===this.$workflow_vue.activitys[j].title){
+              let temp = JSON.parse(JSON.stringify(this.$workflow_vue.activitys[j]))
+              if(this.defnames[i].hasOwnProperty('person')){
+                temp.person = this.defnames[i].person
+              }
+              this.showpanl.push({hasError:false,show:true,showdef:true,showinfo:false})
+              tempArray.push(temp)
+            }
+          }
+        }
+        // 给排序后的数组填充数据
+        for(let i=0;i<tempArray.length;i++){
+          for(let j = 0;j<tempArray[i].fields.length;j++){
+            if(tempArray[i].fields[j].hasOwnProperty('field')){
+              if((tempArray[i].fields[j].label=='项目预算金额' ||
+                tempArray[i].fields[j].label=='设计费成本' ||
+                tempArray[i].fields[j].label=='材料预算成本' ||
+                tempArray[i].fields[j].label=='施工预算成本' ||
+                tempArray[i].fields[j].label=='探伤预算成本' ||
+                tempArray[i].fields[j].label=='检测预算成本' ||
+                tempArray[i].fields[j].label=='其他预算成本' ||
+                tempArray[i].fields[j].label=='首付'||
+                tempArray[i].fields[j].label=='进度款'||
+                tempArray[i].fields[j].label=='尾款' ) && this.$login.f.f_parentname !== '市场部'){
+                tempArray[i].fields[j].value = '隐藏数据'
+              }else{
+                tempArray[i].fields[j].value = this.selectdata[tempArray[i].fields[j].field]
+              }
+
+            }else if(tempArray[i].fields[j].hasOwnProperty('items')){
+              for(let k = 0;k<tempArray[i].fields[j].items.length;k++){
+                tempArray[i].fields[j].items[k].value = this.selectdata[tempArray[i].fields[j].items[k].field]
+              }
+            }
+            if(tempArray[i].fields[j].value&&typeof tempArray[i].fields[j].value =='string'&&tempArray[i].fields[j].value.startsWith('{')&&tempArray[i].fields[j].value.endsWith('}')){
+              let temp = JSON.parse(tempArray[i].fields[j].value)
+              tempArray[i].fields[j].value = temp.name
+            }
+          }
+        }
+        this.data = tempArray
+        this.refreshed =false
+        this.$nextTick(()=>{
+          this.refreshed =true
+          this.hello(9999999)
+        })
+      },
+      hello (index) {
+        if (!this.selectdata.defname) {
+          return
+        }
+        if(index==9999999){
+          console.log("this.showpanl:"+this.showpanl)
+          this.showpanl[0].hasError = true
+          return
+        }
+        if (this.showpanl[index].show) {
+          this.showpanl[index].show = false
+          this.showpanl[index].hasError = true
+        } else {
+          this.showpanl[index].show = true
+          this.showpanl[index].hasError= false
+        }
+      }
+    },
+    watch:{
+      async 'selectdata'(){
+        let http = new HttpResetClass()
+        var  temp = []
+        if(this.selectdata){
+          let res = await http.load('POST','rs/sql/getdefname',{data:{processid:this.selectdata.f_process_id}},{resolveMsg:null, rejectMsg:null})
+          //循环去除回退导致重复的节点
+          for (var i = 0; i < res.data.length; i++) {
+            var flag = true
+            for (var j = 0; j< temp.length; j++){
+              if(res.data[i].defname == temp[j].defname){
+                flag = false
+              }
+            }
+            if(flag){
+              temp.push(res.data[i])
+            }
+          }
+          this.defnames = temp
+        }
+        // 初始化开始
+        this.initializtion()
+      }
+    }
+  }
+</script>
+<style scoped>
+  .background-default{
+    background-color: #F2F6FA;
+  }
+
+</style>