Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -6800,6 +6800,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
         saveContract(orderContractQuery);
         ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(sid);
+        busSalesOrder = fetchBySid(sid);
         AppOrderDetailsVo vo = details.getData();
         //为三方金融和担保贷款
         if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue

@@ -48,7 +48,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item>
-                <el-input v-model="temp.projectCost" class="addinputw" placeholder="" clearable @keyup.native="oninput"/>
+                <el-input v-model="temp.projectCost" :disabled="temp.salesPolicyKey === '0001'" class="addinputw" placeholder="" clearable @keyup.native="oninput"/>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,27 +13,26 @@ import lombok.Data;
 public class FinSelectReceivablesDetailedVo implements Vo {
     private static final long serialVersionUID = -1672232048017802807L;
 
-    @ApiModelProperty("应收未收款项sid")
-    private String sid; // 应收未收款项sid
-    @ApiModelProperty("合同sid")
-    private String contractSid; // 合同sid
+    @ApiModelProperty("当前行sid")
+    private String sid;
+    @ApiModelProperty("应收未收记录sid")
+    private String receivablesSid;
     @ApiModelProperty("合同编号")
-    private String contractNo; // 合同编号
+    private String contractNo;
     @ApiModelProperty("客户sid")
-    private String customerSid; // 客户sid
+    private String customerSid;
     @ApiModelProperty("客户名称")
-    private String customerName; // 客户名称
+    private String customerName;
     @ApiModelProperty("车架号")
-    @JsonProperty("VIN")
-    private String VIN; // 车架号
+    private String vinNo;
     @ApiModelProperty("联系电话")
-    private String customerPhone; // 联系电话
+    private String customerPhone;
     @ApiModelProperty("应收项目名称")
-    private String receivablesName; // 应收项目名称
-    @ApiModelProperty("当前应收金额")
-    private String currentReceivableMoney; // 当前应收金额
+    private String receivablesName;
+    @ApiModelProperty("当前应收")
+    private String currentReceivableMoney;
 
-    @ApiModelProperty("应收金额")
+    @ApiModelProperty("剩余应收")
     private String reveivableMoney;
     @ApiModelProperty("业务车辆sid")
     private String busVinSid;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -288,7 +288,18 @@
 
     <select id="selectPageList"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo">
-        select fd.*
+        select fd.sid,
+        fd.receivablesSid,
+        fd.contractNo,
+        fd.customerSid,
+        fd.customerName,
+        fd.customerPhone,
+        fd.receivablesName,
+        fd.currentReceivableMoney,
+        0 as reveivableMoney,
+        furd.busVinSid,
+        furd.payType,
+        furd.payTypeKey
         from fin_selected_receivables_detailed fd
         left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid
         where fd.receivablesName != '订金'

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java

@@ -24,4 +24,6 @@ public interface SysFlowableConfigMapper extends BaseMapper<SysFlowableConfig> {
     int deleteBySid(String userSid);
 
     String selectBySid(String changeUserSid);
+
+    int updateDateByUserSid(String userSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.portal.biz.sysflowableconfig.SysFlowableConfigMapper">
     <select id="selectByUserSid" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig">
         select * from sys_flowable_config where userSid = #{userSid}
-        and(startDate is null or startDate &lt;#{nowDate})
+        and(startDate &lt;#{nowDate})
         and(endDate is null or endDate>#{nowDate})
     </select>
 
@@ -29,4 +29,8 @@
         left join sys_staffinfo si on si.sid = su.staffSid
         where su.sid = #{changeUserSid}
     </select>
+
+    <update id="updateDateByUserSid">
+        update sys_flowable_config set startDate = NULL,endDate = NULL WHERE userSid = #{userSid}
+    </update>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java

@@ -50,6 +50,8 @@ public class SysFlowableConfigService extends MybatisBaseService<SysFlowableConf
     }
 
     public ResultBean setBlank(String userSid) {
-        return null;
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.updateDateByUserSid(userSid);
+        return rb.success();
     }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -11,7 +11,6 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
-import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.QRCodeUtil;
@@ -131,6 +130,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
             sysOrganization.setManagerName(sysStaffinfo.getName());
             SysUserVo sysUser = sysUserService.selectByStaffsid(zgStaffSid);
             sysOrganization.setManagerSid(sysUser.getSid());
+        }else{
+            sysOrganization.setManagerName("");
+            sysOrganization.setManagerSid("");
         }
         //删除关联关系中的所有主管与分管的人员关系
         sysStaffOrgService.delZGAndFGByOrgSid(sid);

anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue

@@ -502,6 +502,10 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请检查保险状态需选择是或否' })
         return
       }
+      if (this.temp.scmVehicleGressionVehs.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })
+        return
+      }
       if (this.temp.applicantFunds === '') {
         this.temp.applicantFunds = '0'
       }

anrui-system-ui/src/views/organizationManage/organizationManage.vue

@@ -36,7 +36,7 @@
         <tr>
           <td>主管人员</td>
           <td>
-            <el-select v-model="form.zgStaffSid" style="width:300px" filterable>
+            <el-select v-model="form.zgStaffSid" style="width:300px" filterable clearable>
               <el-option v-for="item in staffdata" :key="item.sid" :label="item.name" :value="item.sid"/>
             </el-select>
           </td>
@@ -210,7 +210,7 @@
           <tr>
             <td>主管人员</td>
             <td>
-              <el-select v-model="form.zgStaffSid" style="width:300px" filterable>
+              <el-select v-model="form.zgStaffSid" style="width:300px" filterable clearable>
                 <el-option v-for="item in staffdata" :key="item.sid" :label="item.name" :value="item.sid"/>
               </el-select>
             </td>