Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -878,6 +878,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
         finCollectionConfirmation.setStaffDeptSid(createDeptSid);
         finCollectionConfirmation.setStaffDeptName(deptName);
+        if ("03".equals(dto.getCollectionTypeKey()) || "05".equals(dto.getCollectionTypeKey())) {
+            if (StringUtils.isNotBlank(dto.getCollectionBankNum())) {
+                return rb.setMsg("收款银行账号不能为空");
+            }
+            if (StringUtils.isNotBlank(dto.getReceivingName())) {
+                return rb.setMsg("收款银行名称不能为空");
+            }
+            if (StringUtils.isNotBlank(dto.getCollectionBank())) {
+                return rb.setMsg("收款银行不能为空");
+            }
+            if (StringUtils.isNotBlank(dto.getPayAccount())) {
+                return rb.setMsg("付款账号后4位不能为空");
+            }
+            if (StringUtils.isNotBlank(dto.getPayBank())) {
+                return rb.setMsg("付款银行不能为空");
+            }
+        }
         if ("03".equals(dto.getCollectionTypeKey()) || "05".equals(dto.getCollectionTypeKey())) {
             //收款银行账号
             finCollectionConfirmation.setCollectionBankNum(dto.getCollectionBankNum());

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue

@@ -389,7 +389,7 @@ export default {
     changeStaff(value) {
       const choosetItem = this.staff_list.filter((item) => item.staffName === value)
       this.temp.staffSid = choosetItem[0].staffSid
-      selectCustomerList({ staffSid: this.temp.staffSid, userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+      selectCustomerList({ staffSid: this.temp.staffSid, userSid: '', orgPath: '' }).then((resp) => {
         if (resp.success) {
           this.customer_list = resp.data
         }
@@ -487,7 +487,7 @@ export default {
               this.staff_list = choosetItem[0].staffinfoVoList
             }
           })
-          selectCustomerList({ staffSid: this.temp.staffSid, userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+          selectCustomerList({ staffSid: this.temp.staffSid, userSid: '', orgPath: '' }).then((resp) => {
             if (resp.success) {
               this.customer_list = resp.data
             }

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue

@@ -32,17 +32,17 @@
                 <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="销售部门">
-                <el-select v-model="listQuery.params.orgDeptSid" class="addinputw" placeholder="" @change="changeOrg">
+                <el-select v-model="listQuery.params.orgDeptSid" filterable class="addinputw" placeholder="" @change="changeOrg">
                   <el-option v-for="item in org_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptSid"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="销售专员">
-                <el-select v-model="listQuery.params.staffSid" class="addinputw" placeholder="">
+                <el-select v-model="listQuery.params.staffSid" filterable class="addinputw" placeholder="">
                   <el-option v-for="item in staff_list" :key="item.staffSid" :label="item.staffName" :value="item.staffSid"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="分公司">
-                <el-select v-model="listQuery.params.orgSid" class="addinputw" placeholder="">
+                <el-select v-model="listQuery.params.orgSid" filterable class="addinputw" placeholder="">
                   <el-option v-for="item in userOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
                 </el-select>
               </el-form-item>