Merge branch 'master' of http://111.61.77.35:9999/gengdidi/precision-effect

precision-effect-system/src/main/java/com/zehong/system/domain/TCashOperate.java

@@ -48,6 +48,16 @@ public class TCashOperate extends BaseEntity
 
     private String operateDeptName;
 
+    public String getDocumentType() {
+        return documentType;
+    }
+
+    public void setDocumentType(String documentType) {
+        this.documentType = documentType;
+    }
+
+    private String documentType;
+
     public void setOperateId(Long operateId) 
     {
         this.operateId = operateId;

precision-effect-system/src/main/java/com/zehong/system/service/impl/tradeSettlement/SettlementTrade.java

@@ -113,7 +113,8 @@ public class SettlementTrade {
         tAccount.setAbleAmount(tAccount.getAbleAmount().add(amount));
         tAccountMapper.updateTAccount(tAccount);
         //更新资金变动日志
-        TCashOperate operate = OperatorParam(tAccount.getDeptId(),amount,this.tradeProject.getReceiptNum());
+        TCashOperate operate = OperatorParam(tAccount.getDeptId(),amount,this.tradeProject.getTradeId().toString());
+        operate.setDocumentType("1");//1.交易单 2.借支单 3.外部采购单 4.借贷单
         operate.setOperateType(amount.compareTo(BigDecimal.ZERO) == 1 ? "1" : "2");
         cashOperateMapper.insertTCashOperate(operate);
     }
@@ -132,8 +133,9 @@ public class SettlementTrade {
         project.setPendingPayment(pendingPayment);
         tTradeProjectMapper.updateTTradeProject(project);
         //更新资金变动日志
-        TCashOperate operate = OperatorParam(project.getTradeDeptId(),amount,project.getReceiptNum());
+        TCashOperate operate = OperatorParam(project.getTradeDeptId(),amount,project.getTradeId().toString());
         operate.setOperateType("3");
+        operate.setDocumentType("1");//1.交易单 2.借支单 3.外部采购单 4.借贷单
         cashOperateMapper.insertTCashOperate(operate);
         return amount;
     }

precision-effect-system/src/main/resources/mapper/business/TCashOperateMapper.xml

@@ -16,10 +16,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDel"    column="is_del"    />
         <result property="remark"    column="remark"    />
         <result property="operateDeptName" column="operate_dept_name"/>
+        <result property="documentType" column="document_type"/>
+
     </resultMap>
 
     <sql id="selectTCashOperateVo">
-        select operate_id, operate_dept_id, operate_type, operate_amount, relation_doc, operate_time, create_time, update_time, is_del, remark,(SELECT dept_name FROM sys_dept WHERE dept_id = operate_dept_id)AS operate_dept_name from t_cash_operate
+        select operate_id, operate_dept_id, operate_type, operate_amount, relation_doc, operate_time, create_time, update_time, is_del, remark,document_type,(SELECT dept_name FROM sys_dept WHERE dept_id = operate_dept_id)AS operate_dept_name from t_cash_operate
     </sql>
 
     <select id="selectTCashOperateList" parameterType="TCashOperate" resultMap="TCashOperateResult">
@@ -52,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null">is_del,</if>
             <if test="remark != null">remark,</if>
+            <if test="documentType != null">document_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="operateDeptId != null">#{operateDeptId},</if>
@@ -63,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="documentType != null">#{documentType}</if>
          </trim>
     </insert>
 

precision-effect-web/src/views/account/index.vue

@@ -191,6 +191,27 @@
       width="800px"
       append-to-body
     >
+      <el-form :model="queryAccountDetailParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="98px">
+        <el-form-item label="操作类型" prop="transactionProjectName">
+
+          <el-select v-model="queryAccountDetailParams.operateType" placeholder="请选择操作类型" clearable>
+            <el-option label="收入" value="1"/>
+            <el-option label="支出" value="2" />
+            <el-option label="尾款扣除" value="3" />
+          </el-select>
+        </el-form-item>
+
+<!--        <el-form-item label="部门" prop="deptId">-->
+<!--          <div style="width: 200px">-->
+<!--            <treeselect v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" :disabled="disabled"/>-->
+<!--          </div>-->
+<!--        </el-form-item>-->
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="getOperateList">搜索</el-button>
+        </el-form-item>
+      </el-form>
+
       <el-table :data="cashOperateList">
         <el-table-column label="序号" width="50px" align="center">
           <template slot-scope="scope">
@@ -210,7 +231,15 @@
           </template>
         </el-table-column>
         <el-table-column label="金额" align="center" prop="operateAmount" />
-        <el-table-column label="操作时间" align="center" prop="operateTime" />
+        <el-table-column label="操作时间" align="center" prop="operateTime" width="150"/>
+        <el-table-column label="单据类型" align="center" prop="documentType" >
+          <template slot-scope="scope">
+            <span v-if="scope.row.documentType == '1'">项目交易单</span>
+            <span v-if="scope.row.documentType == '2'">借支申请</span>
+            <span v-if="scope.row.documentType == '3'">外部采购单</span>
+            <span v-if="scope.row.documentType == '4'">借贷申请</span>
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
         v-show="operateListTotal > 0"