apply-clients 3.0.4 → 3.0.5-2

package/src/components/product/Process/Processes/Service/ApplyChangeHistory.vue

@@ -0,0 +1,105 @@
+<template>
+  <div>
+    <div class="auto" v-if="show_history">
+      <partial-view v-ref:single-load>
+        <data-grid :model="history_data" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>流程节点</th>
+              <th>操作类型</th>
+              <th>报装编号</th>
+              <th>操作人</th>
+              <th>操作日期</th>
+              <th>所属部门</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center" @click="$dispatch('selectRow',row)">{{$index+1}}</td>
+            <td style="text-align: center" @click="$dispatch('selectRow',row)">{{row.defname}}</td>
+            <td style="text-align: center" @click="$dispatch('selectRow',row)">{{row.f_button_name}}</td>
+            <td style="text-align: center" @click="$dispatch('selectRow',row)">{{row.f_apply_num}}</td>
+            <td style="text-align: center" @click="$dispatch('selectRow',row)">{{row.f_operator}}</td>
+            <td style="text-align: center" @click="$dispatch('selectRow',row)">{{row.f_date}}</td>
+            <td style="text-align: center" @click="$dispatch('selectRow',row)">{{row.f_parentname}}</td>
+          </template>
+        </data-grid>
+      </partial-view>
+    </div>
+    <div class="auto" v-if="show_history_info">
+      <p class="text-right" href="#" @click="back()"><a href="#">点我返回修改历史主页</a></p>
+      <partial-view v-ref:single-load>
+        <data-grid :model="history_info_data" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>修改名称</th>
+              <th>修改前值</th>
+              <th>修改后值</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center">{{$index+1}}</td>
+            <td style="text-align: center">{{row.label}}</td>
+            <td style="text-align: center">{{typeof row.beforevalue =='object'?row.beforevalue.name:row.beforevalue}}</td>
+            <td style="text-align: center">{{typeof row.changevalue =='object'?row.changevalue.name:row.changevalue}}</td>
+          </template>
+        </data-grid>
+      </partial-view>
+    </div>
+  </div>
+
+</template>
+
+<script>
+    export default {
+      title: '报建流程业务控制层',
+      props: {
+        history_data:[]
+      },
+      data() {
+        return {
+          show_history_info:false, // 查看历史详情
+          show_history:true, // 历史数据
+          history_data:{
+            rows:[]
+          },
+          history_info_data:{
+            rows:[]
+          }
+        }
+      },
+      created(){
+        this.history_data.rows = this.history_data
+      },
+      events:{
+        selectRow(row){
+          let temp = []
+          let beforeChangeArray =  JSON.parse(row.f_before_change)
+          let ChangeArray = JSON.parse(row.f_change)
+
+          for(let i=0;i<beforeChangeArray.length;i++){
+            let object = {}
+            object.label = beforeChangeArray[i].label
+            object.beforevalue = beforeChangeArray[i].value
+            object.changevalue = ChangeArray[i].value
+            temp.push(object)
+          }
+          this.history_info_data.rows = temp
+          this.show_history = false
+          this.show_history_info = true
+        }
+      },
+      methods:{
+        // 返回修改历史主界面
+        back(){
+          this.show_history_info = false
+          this.show_history = true
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/product/Process/Processes/Service/ApplyChargeSearch.vue

@@ -6,11 +6,24 @@
       <div class="flex" style="height: 90%">
         <criteria-paged :model="model"  v-ref:paged >
           <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
+            <div class="form-group">
+              <label class="control-label">分公司:</label>
+              <v-select :value.sync="model.f_filiale" v-model="model.f_filiale"
+                        :options='$parent.$parent.filiale' placeholder='请选择'
+                        close-on-select condition="f_filiale = '%{}%'">
+              </v-select>
+            </div>
             <div novalidate class="form-inline auto" partial>
               <div class="form-group">
-                <label class="control-label">报建编号:</label>
-                <input type="text" class="form-control" v-model="model.f_apply_num"
-                       condition="f_apply_num like '%{}%'" placeholder='报建编号'>
+                <label class="control-label">合同编号:</label>
+                <input type="text" class="form-control" v-model="model.f_contract_number"
+                       condition="f_contract_number like '%{}%'" placeholder='合同编号'>
+              </div>
+              <!--<td style="text-align: center;">{{row.f_user_name}}/{{row.f_entry_name}}/{{row.f_company_name}}</td>-->
+              <div class="form-group">
+                <label class="control-label">联系人/项目名称/用户名称:</label>
+                <input type="text" class="form-control" v-model="model.f_user_name"
+                       condition=" f_user_name like '%{}%' or f_entry_name like '%{}%' or f_company_name like '%{}%' " placeholder='三选一输入'>
               </div>
               <div class="form-group">
                 <label class="control-label">操作日期:</label>
@@ -34,13 +47,7 @@
                           close-on-select condition="f_charge_collectors = '{}'">
                 </v-select>
               </div>
-              <div class="form-group">
-                <label class="control-label">分公司:</label>
-                <v-select :value.sync="model.f_filiale" v-model="model.f_filiale"
-                          :options='$parent.$parent.filiale' placeholder='请选择' style="width: 50%"
-                          close-on-select condition="f_filiale = '{}'">
-                </v-select>
-              </div>
+
               <div class="form-group">
                 <label class="control-label">是否冲正:</label>
                 <v-select :value.sync="model.f_is_correct" v-model="model.f_is_correct"
@@ -71,29 +78,35 @@
             <template partial='head'>
               <tr>
                 <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>
-                <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'>
               <td style="text-align: center;">{{$index+1}}</td>
+              <td style="text-align: center;">{{row.f_contract_number}}</td>
+              <td style="text-align: center;">{{row.f_user_name}}/{{row.f_entry_name}}/{{row.f_company_name}}</td>
+              <!--<td style="text-align: center;">{{row.f_entry_name}}</td>-->
+              <!--<td style="text-align: center;">{{row.f_company_name}}</td>-->
               <td style="text-align: center;">{{row.f_charge_money}}</td>
-              <td style="text-align: center;">{{row.f_payment_type}}</td>
+              <td style="text-align: center;">{{row.f_charge_item}}</td>
               <td style="text-align: center;">{{row.f_charge_collectors}}</td>
               <td style="text-align: center;">{{row.f_charging_status}}</td>
               <td style="text-align: center;">{{row.f_payment_method}}</td>
               <td style="text-align: center;">{{row.f_charge_date}}</td>
-              <td style="text-align: center;">{{row.f_apply_num}}</td>
               <td style="text-align: center;">{{row.f_filiale}}</td>
               <td style="text-align: center;">{{row.f_invoice_num}}</td>
+              <td style="text-align: center;">{{row.f_bill_style}}</td>
               <td style="text-align: center;">{{row.f_is_correct}}</td>
             </template>
           </data-grid>