apply-clients 3.3.92 → 3.3.94-2

package/src/components/android/Supervisory/AppSupervisoryCart.vue

@@ -37,7 +37,7 @@
       </div>
     </div>
     <div class="row" v-for="(i,row) in defnames">
-        <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'">
+        <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'" @click="shouju(row)">
           {{row.defname}}
           <span v-if="row.state === '结束'">({{ row.person }})</span>
           <span v-if="row.state !== '结束' && row.actorexpression !== null && row.actorexpression.indexOf('PI') === 0">
@@ -48,6 +48,9 @@
         </div>
         <div class="arrow glyphicon glyphicon-menu-down" v-if="i != defnames.length-1" aria-hidden="true"></div>
       </div>
+    <div class="row" v-for="(i,row) in shoufeis">
+      <apply-print-charge :selectdata="selectdata" :charge="shoufeis[i]" v-ref:print v-if="shouju2"></apply-print-charge>
+    </div>
   </div>
 </template>
 
@@ -58,13 +61,38 @@ export default {
   props: ['selectdata'],
   data () {
     return {
-      defnames: []
+      defnames: [],
+      shouju2:false,
+      shoufeis:[]
     }
   },
   ready () {
     this.initial()
   },
   methods: {
+    async shouju(row){
+      delete row.id
+      row = Object.assign({},this.selectdata,row)
+      if(row.defname =='报装缴费'){
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_charge_record',
+          condition: `f_process_id = '${this.selectdata.f_process_id}'`
+        }
+        let res = await http.load('POST', 'rs/sql/singleTable', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '收费信息查询失败！！！'
+        })
+        debugger
+        if(res.data.length >0){
+          this.shoufeis=res.data
+          this.shouju2=!this.shouju2
+        }else{
+          this.$showAlert('该数据没有缴费记录！！！', 'warning', 3000)
+          return
+        }
+      }
+    },
     async initial() {
       // 获取流程节点信息
       let http = new HttpResetClass()

package/src/components/product/Material/MaterialDetailed.vue

@@ -80,12 +80,6 @@
                        v-on:keyup.enter="$parent.$parent.search()"
                        condition="ma.f_material_number = '{}'">
               </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.person"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="ac.person = '{}'">
-              </div>
               <div class="form-group col-sm-3">
                 <label  for="startDate" class="font_normal_body">开始时间：</label>
                 <datepicker id="startDate" placeholder="开始日期"
@@ -123,7 +117,6 @@
               <th>材料单位</th>
               <th>材料数量</th>
               <th>操作人</th>
-              <th>材料审核</th>
               <th>操作时间</th>
             </tr>
           </template>
@@ -156,9 +149,6 @@
               <td style="text-align: center;">
                 <nobr><font>{{row.f_operator}}</font></nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.person}}</font></nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr><font>{{row.f_operation_date}}</font></nobr>
               </td>
@@ -206,7 +196,6 @@ export default {
         'f_material_style': '材料型号',
         'f_material_unit': '材料单位',
         'f_material_number': '材料数量',
-        'person': '材料审核',
         'f_operator': '操作人',
         'f_operation_date': '操作时间'
       }

package/src/main.js

@@ -1,27 +1,26 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import {ldap} from 'ldap-clients'
-import {system} from 'system-clients'
-//import { systemphonegrid } from 'system-phone'
-import {sale} from 'sale-client'
-import {material} from 'material-client'
-
-import apply from './apply'
-
-//import applyAndroid from './applyAndroid'
-
-all()
-apply()
-//applyAndroid()
-ldap()
-sale()
-material()
-system(false)
-//systemphonegrid(false)
-require('system-clients/src/styles/less/bootstrap.less')
-require('./expandcss.less')
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import {ldap} from 'ldap-clients'
+import {system} from 'system-clients'
+import {sale} from 'sale-client'
+import {material} from 'material-client'
+
+import apply from './apply'
+
+// import applyAndroid from './applyAndroid'
+
+all()
+apply()
+// applyAndroid()
+ldap()
+sale()
+material()
+system(false)
+
+require('system-clients/src/styles/less/bootstrap.less')
+require('./expandcss.less')
+new Vue({
+  el: 'body',
+  components: { App }
+})