Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/precision-effect

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

@@ -119,6 +119,10 @@ public class TDebitCredit extends BaseEntity
 
     private String lendManageName;
 
+    private Long queryDebitDeptId;
+
+    private Long queryLendDeptId;
+
     public void setDebitId(Long debitId) 
     {
         this.debitId = debitId;
@@ -354,6 +358,22 @@ public class TDebitCredit extends BaseEntity
         this.lendManageName = lendManageName;
     }
 
+    public Long getQueryDebitDeptId() {
+        return queryDebitDeptId;
+    }
+
+    public void setQueryDebitDeptId(Long queryDebitDeptId) {
+        this.queryDebitDeptId = queryDebitDeptId;
+    }
+
+    public Long getQueryLendDeptId() {
+        return queryLendDeptId;
+    }
+
+    public void setQueryLendDeptId(Long queryLendDeptId) {
+        this.queryLendDeptId = queryLendDeptId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -112,6 +112,10 @@ public class TTradeProject extends BaseEntity
 
     private String applyDeptManagerName;
 
+    private Long queryApplyDeptId;
+
+    private Long queryTradeDeptId;
+
     public String getDealRemark() {
         return dealRemark;
     }
@@ -372,6 +376,22 @@ public class TTradeProject extends BaseEntity
         this.applyDeptManagerName = applyDeptManagerName;
     }
 
+    public Long getQueryApplyDeptId() {
+        return queryApplyDeptId;
+    }
+
+    public void setQueryApplyDeptId(Long queryApplyDeptId) {
+        this.queryApplyDeptId = queryApplyDeptId;
+    }
+
+    public Long getQueryTradeDeptId() {
+        return queryTradeDeptId;
+    }
+
+    public void setQueryTradeDeptId(Long queryTradeDeptId) {
+        this.queryTradeDeptId = queryTradeDeptId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -94,6 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realPaymentDate != null "> and real_payment_date = #{realPaymentDate}</if>
             <if test="realPaymentAcount != null "> and real_payment_acount = #{realPaymentAcount}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="queryDebitDeptId != null "> and debit_dept_id = #{queryDebitDeptId}</if>
+            <if test="queryLendDeptId != null "> and lend_dept_id = #{queryLendDeptId}</if>
         </where>
     </select>
     

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

@@ -115,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="attachmentUrl != null  and attachmentUrl != ''"> and attachment_url = #{attachmentUrl}</if>
             <if test="tradeStatus != null  and tradeStatus != ''"> and trade_status = #{tradeStatus}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="queryApplyDeptId != null">and apply_dept_id = #{queryApplyDeptId}</if>
+            <if test="queryTradeDeptId != null">and trade_dept_id = #{queryTradeDeptId}</if>
         </where>
         order by update_time,create_time desc
     </select>

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

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="借贷部门" prop="debitDeptId" v-if="$store.state.user.roles.findIndex(item =>item == 'deptLeader') == -1">
+      <el-form-item label="借贷部门" prop="queryDebitDeptId">
         <treeselect
-          v-model="queryParams.debitDeptId"
+          v-model="queryParams.queryDebitDeptId"
           :options="queryDeptOptions"
           :show-count="true"
           placeholder="请输入借贷部门"
           style="width: 200px"
         />
       </el-form-item>
-      <el-form-item label="出借部门" prop="lendDeptId" v-if="$store.state.user.roles.findIndex(item =>item == 'deptLeader') == -1">
+      <el-form-item label="出借部门" prop="queryLendDeptId">
         <treeselect
-          v-model="queryParams.lendDeptId"
+          v-model="queryParams.queryLendDeptId"
           :options="queryDeptOptions"
           :show-count="true"
           placeholder="请输入出借部门"
@@ -328,6 +328,8 @@ export default {
         realPaymentAcount: null,
         isDel: null,
         queryType: "all",
+        queryDebitDeptId: null,
+        queryLendDeptId: null
       },
       // 表单参数
       form: {},
@@ -370,10 +372,6 @@ export default {
     this.getDicts("t_debit_status").then((response) => {
       this.debitStatusList = response.data;
     });
-    if(this.$store.state.user.roles.findIndex(item =>item == 'deptLeader') == -1){
-      this.queryParams.queryType = "";
-    }
-
   },
   methods: {
     /** 查询借贷列表 */

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

@@ -134,11 +134,17 @@
         </template>
       </el-table-column>
      <!-- <el-table-column label="备注" align="center" prop="remark" />-->
-      <el-table-column label="审批人" align="center" prop="approvedUserName" />
+      <el-table-column label="审批人" align="center" prop="approvedUserName">
+        <template slot-scope="scope">
+          <span v-if="scope.row.approvedUserName == null">-</span>
+          <span v-else>{{scope.row.approvedUserName}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="审批状态" align="center" prop="purchaseStatus" :formatter="getPurchaseStatus" width="120"/>
       <el-table-column label="审核时间" align="center" prop="approvedTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.approvedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span v-if="scope.row.approvedUserName == null">-</span>
+          <span v-else>{{ parseTime(scope.row.approvedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">

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

@@ -37,10 +37,10 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="卖方部门" prop="applyDeptId">
+      <el-form-item label="卖方部门" prop="queryApplyDeptId">
         <div style="width: 160px">
           <treeselect
-            v-model="queryParams.applyDeptId"
+            v-model="queryParams.queryApplyDeptId"
             :options="deptOptions"
             :show-count="true"
             placeholder="请选择卖方部门"
@@ -48,10 +48,10 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="买方部门" prop="tradeDeptId">
+      <el-form-item label="买方部门" prop="queryTradeDeptId">
         <div style="width: 160px">
           <treeselect
-            v-model="queryParams.tradeDeptId"
+            v-model="queryParams.queryTradeDeptId"
             :options="deptOptions"
             :show-count="true"
             placeholder="请选择买方部门"
@@ -369,6 +369,8 @@ export default {
         tradeDeptId: null,
         tradeStatus: null,
         createTime: null,
+        queryApplyDeptId: null,
+        queryTradeDeptId: null
       },
       // 表单参数
       form: {},