顾客发票管理

ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue

@@ -25,6 +25,11 @@
                 <a-input placeholder="请输入名称/姓名" v-model="queryParam.name"></a-input>
               </a-form-item>
             </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="开户行">
+                <j-search-select-tag placeholder="请选择开户行" v-model="queryParam.bankDeposit" dict="zybank,bankname,id"/>
+              </a-form-item>
+            </a-col>
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -103,19 +108,20 @@
           <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
-          <a-dropdown>
+<!--          <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
-              <a-menu-item>
+              <a-menu-item>-->
                 <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
+           <a-divider type="vertical" />
-              <a-menu-item>
+<!--              </a-menu-item>
+              <a-menu-item>-->
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
-              </a-menu-item>
+<!--              </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown>-->
         </span>
 
       </a-table>
@@ -198,7 +204,7 @@
           {
             title:'开户行',
             align:"center",
-            dataIndex: 'bankDeposit'
+            dataIndex: 'bankDeposit_dictText'
           },
 
           {

ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceForm.vue

@@ -7,7 +7,7 @@
           <a-col :span="24">
             <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
               <j-popup
-                style="max-width:none; width: 200%"
+                style="max-width:none; width: 100%"
                 v-model="model.username"
                 field="username"
                 org-fields="id,realname"
@@ -50,12 +50,12 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
-              <a-textarea v-model="model.address" rows="4" placeholder="请输入地址" style="max-width:none; width: 200%"/>
+              <a-textarea v-model="model.address" rows="4" placeholder="请输入地址" style="max-width:none; width: 200% ; height: 55px"/>
             </a-form-model-item>
           </a-col>
         </a-row>
         <a-row>
-          <a-col :span="24">
+          <a-col :span="24" v-if="this.model.customerType==2">
             <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone">
               <a-input v-model="model.telephone" placeholder="请输入电话"  style="max-width:none; width: 200%"></a-input>
             </a-form-model-item>
@@ -63,7 +63,7 @@
         </a-row>
 
         <a-row>
-          <a-col :span="24">
+          <a-col :span="24"  v-if="this.model.customerType==2">
             <a-form-model-item label="账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accountNumber">
               <a-input v-model="model.accountNumber" placeholder="请输入账号"  style="max-width:none; width: 200%"></a-input>
             </a-form-model-item>
@@ -71,12 +71,28 @@
         </a-row>
 
 
-        <a-row>
+<!--        <a-row>
           <a-col :span="24">
             <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankDeposit">
               <a-input style="max-width:none; width: 200%" v-model="model.bankDeposit" placeholder="请输入开户行"  disabled></a-input>
             </a-form-model-item>
           </a-col>
+        </a-row>-->
+
+        <a-row>
+          <a-col :span="24" v-if="this.model.customerType==2">
+            <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankzh">
+              <j-popup
+                v-model="model.bankzh"
+                field="bankzh"
+                org-fields="id,bankname"
+                dest-fields="bankDeposit,bankzh"
+                code="findyh"
+                :multi="true"
+                @input="popupCallback"
+              />
+            </a-form-model-item>
+          </a-col>
         </a-row>
 
         <a-row>
@@ -103,6 +119,7 @@
 
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
+  import store from '@/store'
 
   export default {
     name: 'CustomerInvoiceForm',
@@ -119,6 +136,10 @@
     data () {
       return {
         model:{
+          invoiceType : 2,
+          customerType : 1,
+          name : store.getters.userInfo.realname
+
          },
         labelCol: {
           xs: { span: 24 },
@@ -130,6 +151,9 @@
         },
         confirmLoading: false,
         validatorRules: {
+          accountNumber: [
+            { required: true, message: '请输入账号!'},
+          ],
            username: [
               { required: true, message: '请输入用户!'},
            ],
@@ -146,6 +170,16 @@
               { required: false},
               { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
            ],
+ /*         sort: [
+           /!* { required: true, message: '请输入胸围!'},*!/
+            {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}
+          ],*/
+
+
+          sort: [
+            { required: false},
+            { validator: (rule, value, callback) => validateDuplicateValue('customer_invoice', 'sort', value, this.model.id, callback)},
+          ],
         },
         url: {
           add: "/customerinvoice/customerInvoice/add",

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java

@@ -87,27 +87,30 @@ public class CustomerInvoiceController extends JeecgController<CustomerInvoice,
 		int flag=0;
 		UnifiedCreditCodeUtil unifiedCreditCodeUtil = new UnifiedCreditCodeUtil();
 		BankUtil bankUtil = new BankUtil();
-		if (UnifiedCreditCodeUtil.checkUnifiedCreditCode(customerInvoice.getTaxIdentificationNumber())){
+		if (customerInvoice.getCustomerType().equals("2")) {
-
+			if (UnifiedCreditCodeUtil.checkUnifiedCreditCode(customerInvoice.getTaxIdentificationNumber())) {
-		}else {
+			} else {
-			flag=1;
+				flag = 1;
 				return Result.error("请输入正确纳税人识别号");
-		}
+			}	}
-
+		if (customerInvoice.getCustomerType().equals("2")) {
-
+			if (bankUtil.checkBankCard(customerInvoice.getAccountNumber())) {
-		if (bankUtil.checkBankCard(customerInvoice.getAccountNumber())){
 				customerInvoice.setBankDeposit(bankUtil.getNameOfBank(customerInvoice.getAccountNumber()));
-		}else{
+			} else {
-			flag=1;
+				flag = 1;
 				return Result.error("请输入正确银行卡号码");
 			}
+		}
 
-		if(customerInvoice.getSort()>0){
+			/*if (customerInvoice.getSort()!=null) {
+				if (customerInvoice.getSort() > 0) {
 
-		}else{
+				} else {
-			flag=1;
+					flag = 1;
 					return Result.error("排序必须大于0");
 				}
+			}*/
+
 
 		if(flag==0){
 			customerInvoiceService.save(customerInvoice);
@@ -136,28 +139,31 @@ public class CustomerInvoiceController extends JeecgController<CustomerInvoice,
 		int flag=0;
 		UnifiedCreditCodeUtil unifiedCreditCodeUtil = new UnifiedCreditCodeUtil();
 		BankUtil bankUtil = new BankUtil();
-		if (UnifiedCreditCodeUtil.checkUnifiedCreditCode(customerInvoice.getTaxIdentificationNumber())){
+		if (customerInvoice.getCustomerType().equals("2")) {
+			if (UnifiedCreditCodeUtil.checkUnifiedCreditCode(customerInvoice.getTaxIdentificationNumber())) {
 
-		}else {
+			} else {
-			flag=1;
+				flag = 1;
 				return Result.error("请输入正确纳税人识别号");
 			}
+		}
 
-
+		if (customerInvoice.getCustomerType().equals("2")) {
-		if (bankUtil.checkBankCard(customerInvoice.getAccountNumber())){
+			if (bankUtil.checkBankCard(customerInvoice.getAccountNumber())) {
 				customerInvoice.setBankDeposit(bankUtil.getNameOfBank(customerInvoice.getAccountNumber()));
-		}else{
+			} else {
-			flag=1;
+				flag = 1;
 				return Result.error("请输入正确银行卡号码");
 			}
+		}
 
-		if(customerInvoice.getSort()>0){
+		/*if(customerInvoice.getSort()>0){
 
 		}else{
 			flag=1;
 			return Result.error("排序必须大于0");
 		}
-
+*/
 		if(flag==0){
 			customerInvoiceService.updateById(customerInvoice);
 			return Result.OK("编辑成功!");

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/entity/CustomerInvoice.java

@@ -90,9 +90,14 @@ public class CustomerInvoice implements Serializable {
     @ApiModelProperty(value = "电话")
     private java.lang.String telephone;
     /**开户行*/
-	@Excel(name = "开户行", width = 15)
+    @Excel(name = "开户行", width = 15, dictTable = "zybank", dicText = "bankname", dicCode = "id")
+    @Dict(dictTable = "zybank", dicText = "bankname", dicCode = "id")
     @ApiModelProperty(value = "开户行")
     private java.lang.String bankDeposit;
+    /**开户行*/
+    @Excel(name = "开户行", width = 15)
+    @ApiModelProperty(value = "开户行")
+    private java.lang.String bankzh;
     /**账号*/
     @Excel(name = "账号", width = 15)
     @ApiModelProperty(value = "账号")