Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -81,7 +81,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
@@ -2147,7 +2146,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
-                ufVo.setProcInsId(commonContract.getProcInstId());
+                messageFlowVo.setProcInsId(commonContract.getProcInstId());
+                messageFlowVo.setProcDefId(commonContract.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
@@ -2249,15 +2249,18 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
                 String procId = commonContract.getProcInstId();
-                ufVo.setProcInsId(procId);
+                messageFlowVo.setProcInsId(procId);
+                messageFlowVo.setProcDefId(commonContract.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
                 messageFlowableQuery.setModuleName("合同审核申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBean.getData().get(0).getName_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) {
+//                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) {
+                if ("销售专员申请".equals(nextName)) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                 } else {
                     messageFlowableQuery.setMsgContent(commonContract.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue

@@ -117,7 +117,7 @@
                   <span>{{ scope.row.payBank }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="备注" align="center" width="300">
+              <el-table-column label="备注" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.remarks }}</span>
                 </template>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -133,19 +133,17 @@
           <el-col :span="4" class="tleftb">
             <el-form-item><span>打款凭证</span></el-form-item>
           </el-col>
-          <el-col :span="20" class="trightb">
+          <el-col :span="8" class="trightb">
             <el-form-item>
               <Upload v-show="forbidden !== true" style="float:left;" ref="remit" @handleSuccess="remitAdd" @handleRemove="remitRemove" />
               <span v-show="forbidden == true" v-for="(item, index) in list1" :key="index">{{ item.name }}
               </span>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="4" class="tleftb">
             <el-form-item><span>汇款确认书</span></el-form-item>
           </el-col>
-          <el-col :span="20" class="trightb">
+          <el-col :span="8" class="trightb">
             <el-form-item>
               <Upload style="float:left;" ref="remittance" @handleSuccess="remittanceAdd" @handleRemove="remittanceRemove" />
             </el-form-item>
@@ -249,7 +247,7 @@
                     {{ scope.row.VIN }}
                   </template>
                 </el-table-column>
-                <el-table-column label="客户名称" align="center" width="100">
+                <el-table-column label="客户名称" align="center" width="90">
                   <template slot-scope="scope">
                     {{ scope.row.customerName }}
                   </template>
@@ -264,21 +262,26 @@
                     {{ scope.row.receivablesName }}
                   </template>
                 </el-table-column>
-                <el-table-column label="当前应收金额" align="center" width="120">
+                <el-table-column label="当前应收" align="center" width="100">
                   <template slot-scope="scope">
                     {{ scope.row.currentReceivableMoney }}
                   </template>
                 </el-table-column>
-                <el-table-column label="认款金额" align="center" width="140">
+                <el-table-column label="认款金额" align="center" width="130">
                   <template slot-scope="scope">
                     <el-input v-model="scope.row.subscriptionMoney" @input="changeMoney(scope.row)" @change="changeSubscriptionMoney" placeholder="" clearable/>
                   </template>
                 </el-table-column>
-                <el-table-column label="剩余应收" align="center">
+                <el-table-column label="剩余应收" align="center" width="100">
                   <template slot-scope="scope">
                     <span>{{ scope.row.surplusReceivable }}</span>
                   </template>
                 </el-table-column>
+                <el-table-column label="认款申请日期" align="center" width="120">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.subscriptionDate }}</span>
+                  </template>
+                </el-table-column>
               </el-table>
             </div>
           </el-col>
@@ -608,6 +611,13 @@ export default {
       if (this.formobj.collectionMoney === '') {
         this.$message({ showClose: true, type: 'error', message: '请先填写收款金额' })
       } else {
+        var nowDate = new Date()
+        var date = {
+          year: nowDate.getFullYear(),
+          month: nowDate.getMonth() + 1,
+          day: nowDate.getDate()
+        }
+        var dayDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
         this.formobj.finSelectedReceivablesDetaileds.push({
           createByName: window.sessionStorage.getItem('name'),
           contractSid: row.contractSid,
@@ -622,7 +632,7 @@ export default {
           lastSubscriptionMoney: '',
           subscriptionMoney: '',
           surplusReceivable: '',
-          subscriptionDate: '',
+          subscriptionDate: dayDate,
           collSid: '',
           receivablesSid: row.sid,
           sid: row.sid