Эх сурвалжийг харах

修改开票信息的发票号

qzyReal 3 жил өмнө
parent
commit
dfe169083f

+ 0 - 7
sp-admin/sa-view-sp/sp-admin/admin-list.html

@@ -27,13 +27,6 @@
 					<sa-item type="text" name="用户名" v-model="p.name"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<br>
-<!--					<sa-item name="综合排序" class="s-radio-text">-->
-<!--						<el-radio-group v-model="p.sort_type">-->
-<!--							<el-radio :label="0">最近添加</el-radio>-->
-<!--							<el-radio :label="2">最近登录</el-radio>-->
-<!--							<el-radio :label="3">登录次数</el-radio>-->
-<!--						</el-radio-group>-->
-<!--					</sa-item>-->
 				</el-form>
 				<!-- ------------- 快捷按钮 ------------- -->
 				<sa-item type="fast-btn" show="add,get,delete,reset"></sa-item>

+ 21 - 10
sp-admin/sa-view/tb-invoice-info/tb-invoice-info-list.html

@@ -47,13 +47,19 @@
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
 					<sa-td name="编号" prop="no" width="129"></sa-td>
-					<sa-td name="客户名称" prop="customerName" ></sa-td>
+					<sa-td name="客户名称" prop="customerName" width="180"></sa-td>
 					<sa-td name="账单金额" prop="totalMoney" ></sa-td>
 					<sa-td name="开票状态" prop="status" type="enum" :jv="{0: '未开票', 1: '已开票'}"></sa-td>
 					<sa-td name="开票种类" prop="isElec" type="enum" :jv="{0: '纸质普票', 1: '电子普票', 2:'纸质专票'}"></sa-td>
 					<sa-td name="开票时间" prop="invoiceTime" ></sa-td>
-					<sa-td name="发票号" prop="invoiceNo" width="150"></sa-td>
-					<el-table-column label="主体名称">
+					<sa-td name="发票号" prop="invoiceNo" width="150">
+						<template slot-scope="s">
+							<div>{{s.row.invoiceNo}}
+							<i @click="updateInvoiceNo(s.row)" class="el-icon-edit" v-if="s.row.status===1" style="cursor: pointer;padding-left: 10px;color: blue;"></i>
+							</div>
+						</template>
+					</sa-td>
+					<el-table-column label="主体名称" width="180">
 						<template slot-scope="s">
 							<span>{{s.row.entityName}}</span>
 						</template>
@@ -63,12 +69,7 @@
 							<span>{{s.row.taxIdNo}}</span>
 						</template>
 					</el-table-column>
-<!--					<sa-td name="地址" prop="address" ></sa-td>-->
-<!--					<sa-td name="电话" prop="phone" ></sa-td>-->
-<!--					<sa-td name="开户银行" prop="bank" ></sa-td>-->
-<!--					<sa-td name="银行账号" prop="bankNo" ></sa-td>-->
-<!--					<sa-td name="邮箱" prop="email" ></sa-td>-->
-					<el-table-column label="操作"  width="240px">
+					<el-table-column label="操作"  width="280px">
 						<template slot-scope="s">
 							<el-button v-if="s.row.status==0 && currentCustomerId==1" class="c-btn" type="primary"  @click="completeFn(s.row.id)">线下开票</el-button>
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
@@ -80,11 +81,12 @@
 				<!-- ------------- 分页 ------------- -->
 				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
 			</div>
-			<el-dialog title="完成开票" :visible.sync="completeDate.visible" width="38%">
+			<el-dialog title="线下开票" :visible.sync="completeDate.visible" width="400px">
 				<div class="c-item">
 					<label class="c-label">开票时间:</label>
 					<el-date-picker type="datetime" value-format="yyyy-MM-dd HH:mm:ss" v-model="completeDate.form.invoiceTime"></el-date-picker>
 				</div>
+				<br />
 				<sa-item type="text" name="发票号" v-model="completeDate.form.invoiceNo"></sa-item>
 				<span slot="footer" class="dialog-footer">
 					<el-button @click="completeDate.visible = false">取 消</el-button>
@@ -141,6 +143,15 @@
 					},
 				},
 				methods: {
+					updateInvoiceNo(data){
+						layer.prompt({title: '修改发票号'}, function(pass, index){
+							layer.close(index);
+							sa.ajax('/TbInvoiceInfo/updateInvoiceNo', {id: data.id, invoiceNo: pass}, function(res){
+								data.invoiceNo = pass;
+								layer.msg('修改成功');
+							}.bind(this))
+						});
+					},
 					completeFn(id){
 						this.completeDate.visible = true;
 						this.completeDate.form.id = id;

+ 2 - 1
sp-server/src/main/java/com/pj/project/tb_invoice_info/TbInvoiceInfo.java

@@ -92,7 +92,8 @@ public class TbInvoiceInfo implements Serializable {
 	 * 创建时间 
 	 */
 	private Date createTime;
-
+	private String updateBy;
+	private Date updateTime;
 
 
     /**

+ 105 - 88
sp-server/src/main/java/com/pj/project/tb_invoice_info/TbInvoiceInfoController.java

@@ -1,5 +1,6 @@
 package com.pj.project.tb_invoice_info;
 
+import java.util.Date;
 import java.util.List;
 
 import cn.hutool.core.util.StrUtil;
@@ -20,126 +21,142 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 
 /**
  * Controller: tb_invoice_info -- 开票信息表
- * @author lzm 
+ *
+ * @author lzm
  */
 @RestController
 @RequestMapping("/TbInvoiceInfo/")
 public class TbInvoiceInfoController {
 
-	/** 底层 Service 对象 */
-	@Autowired
-	TbInvoiceInfoService tbInvoiceInfoService;
-
-	/** 增 */  
-	@RequestMapping("add")
-	@SaCheckPermission(TbInvoiceInfo.PERMISSION_CODE)
-	@Transactional(rollbackFor = Exception.class)
-	public AjaxJson add(TbInvoiceInfo t){
-		tbInvoiceInfoService.add(t);
-		t = tbInvoiceInfoService.getById(SP.publicMapper.getPrimarykey());
-		return AjaxJson.getSuccessData(t);
-	}
-
-	/** 删 */  
-	@RequestMapping("delete")
-	@SaCheckPermission(TbInvoiceInfo.PERMISSION_CODE)
-	public AjaxJson delete(Long id){
-		int line = tbInvoiceInfoService.delete(id);
-		return AjaxJson.getByLine(line);
-	}
-	
-	/** 删 - 根据id列表 */  
-	@RequestMapping("deleteByIds")
-	@SaCheckPermission(TbInvoiceInfo.PERMISSION_CODE)
-	public AjaxJson deleteByIds(){
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
-		int line = SP.publicMapper.deleteByIds(TbInvoiceInfo.TABLE_NAME, ids);
-		return AjaxJson.getByLine(line);
-	}
-	
-	/** 改 */  
-	@RequestMapping("update")
-	@SaCheckPermission(TbInvoiceInfo.PERMISSION_CODE)
-	public AjaxJson update(TbInvoiceInfo t){
-		int line = tbInvoiceInfoService.update(t);
-		return AjaxJson.getByLine(line);
-	}
-
-	/** 查 - 根据id */  
-	@RequestMapping("getById")
-	public AjaxJson getById(Long id){
-		TbInvoiceInfo t = tbInvoiceInfoService.getById(id);
-		return AjaxJson.getSuccessData(t);
-	}
-
-    /** 查 - 根据id */
+    /**
+     * 底层 Service 对象
+     */
+    @Autowired
+    TbInvoiceInfoService tbInvoiceInfoService;
+
+    /**
+     * 增
+     */
+    @RequestMapping("add")
+    @SaCheckPermission(TbInvoiceInfo.PERMISSION_CODE)
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxJson add(TbInvoiceInfo t) {
+        tbInvoiceInfoService.add(t);
+        t = tbInvoiceInfoService.getById(SP.publicMapper.getPrimarykey());
+        return AjaxJson.getSuccessData(t);
+    }
+
+    /**
+     * 删
+     */
+    @RequestMapping("delete")
+    @SaCheckPermission(TbInvoiceInfo.PERMISSION_CODE)
+    public AjaxJson delete(Long id) {
+        int line = tbInvoiceInfoService.delete(id);
+        return AjaxJson.getByLine(line);
+    }
+
+    /**
+     * 删 - 根据id列表
+     */
+    @RequestMapping("deleteByIds")
+    @SaCheckPermission(TbInvoiceInfo.PERMISSION_CODE)
+    public AjaxJson deleteByIds() {
+        List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
+        int line = SP.publicMapper.deleteByIds(TbInvoiceInfo.TABLE_NAME, ids);
+        return AjaxJson.getByLine(line);
+    }
+
+    /**
+     * 改
+     */
+    @RequestMapping("update")
+    @SaCheckPermission(TbInvoiceInfo.PERMISSION_CODE)
+    public AjaxJson update(TbInvoiceInfo t) {
+        int line = tbInvoiceInfoService.update(t);
+        return AjaxJson.getByLine(line);
+    }
+
+    /**
+     * 查 - 根据id
+     */
+    @RequestMapping("getById")
+    public AjaxJson getById(Long id) {
+        TbInvoiceInfo t = tbInvoiceInfoService.getById(id);
+        return AjaxJson.getSuccessData(t);
+    }
+
+    /**
+     * 查 - 根据id
+     */
     @RequestMapping("getEntityById")
-    public AjaxJson getEntityById(Long id){
+    public AjaxJson getEntityById(Long id) {
         TbInvoiceInfo t = tbInvoiceInfoService.getEntityById(id);
         return AjaxJson.getSuccessData(t);
     }
 
-	/** 查集合 - 根据条件(参数为空时代表忽略指定条件) */  
-	@RequestMapping("getList")
-	public AjaxJson getList() { 
-		SoMap so = SoMap.getRequestSoMap();
+    /**
+     * 查集合 - 根据条件(参数为空时代表忽略指定条件)
+     */
+    @RequestMapping("getList")
+    public AjaxJson getList() {
+        SoMap so = SoMap.getRequestSoMap();
         String cusotmerId = StpUserUtil.getCustomerId();
         if (!StrUtil.equals(UserTypeEnum.PLATFORM_ADMIN.getCustomerId(), cusotmerId)) {
             so.put("customerId", cusotmerId);
         }
-		List<TbInvoiceInfo> list = tbInvoiceInfoService.getList(so.startPage());
-		return AjaxJson.getPageData(so.getDataCount(), list);
-	}
+        List<TbInvoiceInfo> list = tbInvoiceInfoService.getList(so.startPage());
+        return AjaxJson.getPageData(so.getDataCount(), list);
+    }
 
-    /** 生成信息 */
+    /**
+     * 生成信息
+     */
     @RequestMapping("generate")
     @Transactional(rollbackFor = Exception.class)
-    public AjaxJson generate(){
+    public AjaxJson generate() {
         SoMap so = SoMap.getRequestSoMap();
         tbInvoiceInfoService.generate(so);
         return AjaxJson.getSuccess();
     }
 
-    /** 生成信息 */
+    /**
+     * 修改发票号
+     * @param id
+     * @param invoiceNo
+     * @return
+     */
+    @RequestMapping("updateInvoiceNo")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxJson updateInvoiceNo(@RequestParam Long id, @RequestParam String invoiceNo) {
+        TbInvoiceInfo tbInvoiceInfo = tbInvoiceInfoService.getById(id);
+        tbInvoiceInfo.setInvoiceNo(invoiceNo)
+                .setUpdateBy(StpUserUtil.getAdmin().getName())
+                .setUpdateTime(new Date());
+        tbInvoiceInfoService.updateById(tbInvoiceInfo);
+        return AjaxJson.getSuccess();
+    }
+
+
+    /**
+     * 生成信息
+     */
     @RequestMapping("complete")
     @Transactional(rollbackFor = Exception.class)
-    public AjaxJson complete(){
+    public AjaxJson complete() {
         SoMap so = SoMap.getRequestSoMap();
         tbInvoiceInfoService.complete(so);
         return AjaxJson.getSuccess();
     }
 
-    /** 查 收费明细 */
+    /**
+     * 查 收费明细
+     */
     @RequestMapping("getDetailsById")
-    public AjaxJson getDetailsById(String id){
+    public AjaxJson getDetailsById(String id) {
         List<FeeDeatilsGroup> feeDetails = tbInvoiceInfoService.getDetailsById(id);
         return AjaxJson.getSuccessData(feeDetails);
     }
-	
-	
-	
-	
-	// ------------------------- 前端接口 -------------------------
-	
-	
-	/** 改 - 不传不改 [G] */
-	@RequestMapping("updateByNotNull")
-	public AjaxJson updateByNotNull(Long id){
-		AjaxError.throwBy(true, "如需正常调用此接口,请删除此行代码");
-		// 鉴别身份,是否为数据创建者 
-		long userId = SP.publicMapper.getColumnByIdToLong(TbInvoiceInfo.TABLE_NAME, "user_id", id);
-		AjaxError.throwBy(userId != StpUserUtil.getLoginIdAsLong(), "此数据您无权限修改");
-		// 开始修改 (请只保留需要修改的字段)
-		SoMap so = SoMap.getRequestSoMap();
-		so.clearNotIn("id", "customerId", "customerName", "totalMoney", "status", "invoiceTime", "invoiceNo", "entityId", "entityName", "taxIdNo", "address", "phone", "bank", "bankNo", "email", "createTime").clearNull().humpToLineCase();	
-		int line = SP.publicMapper.updateBySoMapById(TbInvoiceInfo.TABLE_NAME, so, id);
-		return AjaxJson.getByLine(line);
-	}
-	
-	
-	
-	
-	
-	
+
 
 }

+ 2 - 2
sp-server/src/main/resources/application-dev.yml

@@ -6,9 +6,9 @@ spring:
     # 数据源配置
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
-        url: jdbc:mysql://47.101.143.145:3306/pco0815?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://127.0.0.1:3306/pco_system?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 1qaz@WSX
+        password: 123456
         # 是否打开sql监控台  (生产环境请务必关闭此选项)
         druid:
             stat-view-servlet: