yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
989ef54bce c9e47821af
commit
8d3b80018a
10 changed files with 106 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java
  2. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java
  3. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java
  4. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java
  5. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
  6. 17
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
  7. 105
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue
  8. 17
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
  9. 17
      anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
  10. 10
      anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java
View File

@ -486,6 +486,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid(); String businessSid = bv.getBusinessSid();
BaseDiscountpackageApply baseDiscountpackageApply = this.fetchBySid(businessSid); BaseDiscountpackageApply baseDiscountpackageApply = this.fetchBySid(businessSid);
String orgSidPath = baseDiscountpackageApply.getOrgSidPath();
if (bv.getTaskId().equals(baseDiscountpackageApply.getTaskId())) { if (bv.getTaskId().equals(baseDiscountpackageApply.getTaskId())) {
bv.setOrgSidPath(baseDiscountpackageApply.getOrgSidPath()); bv.setOrgSidPath(baseDiscountpackageApply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@ -526,6 +527,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
handoverDto.setUseOrgSid(baseDiscountpackageApply.getUseOrgSid()); handoverDto.setUseOrgSid(baseDiscountpackageApply.getUseOrgSid());
handoverDto.setCreateOrgName(baseDiscountpackageApply.getCreateOrgName()); handoverDto.setCreateOrgName(baseDiscountpackageApply.getCreateOrgName());
handoverDto.setUseOrgName(baseDiscountpackageApply.getUseOrgName()); handoverDto.setUseOrgName(baseDiscountpackageApply.getUseOrgName());
handoverDto.setOrgSidPath(orgSidPath);
SysUser sysUser = userFeign.selectBySid(baseDiscountpackageApply.getCreateBySid()).getData(); SysUser sysUser = userFeign.selectBySid(baseDiscountpackageApply.getCreateBySid()).getData();
if (null != sysUser) { if (null != sysUser) {
if (StringUtils.isNotBlank(sysUser.getMobile())) { if (StringUtils.isNotBlank(sysUser.getMobile())) {

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java
View File

@ -5,6 +5,7 @@ import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
/** /**
@ -58,4 +59,5 @@ public class BusDiscountpackageHandover extends BaseEntity {
private String transferPhone; private String transferPhone;
@ApiModelProperty("移交备注") @ApiModelProperty("移交备注")
private String transferRemarks; private String transferRemarks;
private String orgSidPath;
} }

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java
View File

@ -71,4 +71,5 @@ public class BusDiscountpackageHandoverDto implements Dto {
private String transferPhone; private String transferPhone;
@ApiModelProperty("移交备注") @ApiModelProperty("移交备注")
private String transferRemarks; private String transferRemarks;
private String orgSidPath;
} }

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java
View File

@ -38,11 +38,7 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove
public ResultBean save(BusDiscountpackageHandoverDto dto) { public ResultBean save(BusDiscountpackageHandoverDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
boolean issuccess = busDiscountpackageHandoverService.saveOrUpdateDto(dto); boolean issuccess = busDiscountpackageHandoverService.saveOrUpdateDto(dto);
if (issuccess) { return rb.success();
return rb.success().setMsg("添加成功");
} else {
return rb.fail().setMsg("添加失败");
}
} }
@Override @Override

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
View File

@ -278,6 +278,9 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
*/ */
public boolean saveOrUpdateDto(BusDiscountpackageHandoverDto dto) { public boolean saveOrUpdateDto(BusDiscountpackageHandoverDto dto) {
BusDiscountpackageHandover entity = new BusDiscountpackageHandover(); BusDiscountpackageHandover entity = new BusDiscountpackageHandover();
if (dto.getBusDiscountpackageHandoverLists().isEmpty()) {
return false;
}
String sid = entity.getSid(); String sid = entity.getSid();
dto.setSid(sid); dto.setSid(sid);
dto.fillEntity(entity); dto.fillEntity(entity);

17
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
View File

@ -178,11 +178,18 @@ export default {
this.$refs['divadd'].showEdit(row) this.$refs['divadd'].showEdit(row)
}, },
handleCancellation(row) { handleCancellation(row) {
req.cancal({ sid: row.sid }).then((res) => { const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
if (res.success) { this.$confirm(tip, '提示', {
this.$message({ showClose: true, type: 'success', message: '操作成功' }) confirmButtonText: '确定',
this.loadList() cancelButtonText: '取消',
} type: 'warning'
}).then(() => {
req.cancal({ sid: row.sid }).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.loadList()
}
})
}) })
}, },
handleLooK(row) { handleLooK(row) {

105
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue
View File

@ -80,6 +80,11 @@
<span>{{ scope.row.purchaseSystemName }}</span> <span>{{ scope.row.purchaseSystemName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购类型" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.manPurOrderTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="排产订单编号" align="center" width="130"> <el-table-column label="排产订单编号" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.orderingNo }}</span> <span>{{ scope.row.orderingNo }}</span>
@ -90,129 +95,129 @@
<span>{{ scope.row.nodeState }}</span> <span>{{ scope.row.nodeState }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="贴息" align="center" width="90"> <el-table-column label="车型(配置简述)" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.factoryDiscount }}</span> <span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.modelName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="中介返利" align="center" width="100"> <el-table-column label="车架号" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.distributorPriceAll }}</span> <span>{{ scope.row.vinNo }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="开票类型" align="center" width="120"> <el-table-column label="销售部门" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.kpType }}</span> <span>{{ scope.row.orgName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" align="center" width="100"> <el-table-column label="销售专员" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.materialName }}</span> <span>{{ scope.row.staffName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料编码" align="center" width="100"> <el-table-column label="客户名称" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.materialCode }}</span> <span>{{ scope.row.customerName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="车架号" align="center" width="90"> <el-table-column label="实际购车人" align="center" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span> <span>{{ scope.row.realityBuyCarName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="车型(配置简述)" align="center" width="130"> <el-table-column label="手机号码" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.modelName }}</span> <span>{{ scope.row.mobile }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="内部编码" align="center" width="120"> <el-table-column label="成交价(元)" align="center" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.insideCode }}</span> <span>{{ scope.row.price }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="销售类型" align="center" width="100"> <el-table-column label="贴息" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.type }}</span> <span>{{ scope.row.factoryDiscount }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购类型" align="center" width="120"> <el-table-column label="销售折让" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.manPurOrderTypeValue }}</span> <span>{{ scope.row.salesAllowance }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="销售日期" align="center" width="100"> <el-table-column label="赠品价值(元)" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.saleDate }}</span> <span>{{ scope.row.giftsDescription }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成交价(元)" align="center" width="110"> <el-table-column label="中介人1" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.price }}</span> <span>{{ scope.row.middleOne }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="销售部门" align="center" width="100"> <el-table-column label="返利金额1" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.orgName }}</span> <span>{{ scope.row.rebateMoneyOne }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="销售专员" align="center" width="100"> <el-table-column label="中介人2" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.staffName }}</span> <span>{{ scope.row.middleTwo }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合同编号" align="center" width="100"> <el-table-column label="返利金额2" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.concatNo }}</span> <span>{{ scope.row.rebateMoneyTwo }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际购车人" align="center" width="140"> <el-table-column label="开票类型" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.realityBuyCarName }}</span> <span>{{ scope.row.kpType }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="客户名称" align="center" width="100"> <el-table-column label="出库类型" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.customerName }}</span> <span>{{ scope.row.ckType }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手机号码" align="center" width="120"> <el-table-column label="欠款时长(天)" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.mobile }}</span> <span>{{ scope.row.qkDate }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="赠品价值(元)" align="center" width="120"> <el-table-column label="销售类型" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.giftsDescription }}</span> <span>{{ scope.row.type }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="销售折让" align="center" width="120"> <el-table-column label="销售日期" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.salesAllowance }}</span> <span>{{ scope.row.saleDate }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="中介人1" align="center" width="120"> <el-table-column label="内部引荐人" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.middleOne }}</span> <span>{{ scope.row.innerName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="返利金额1" align="center" width="120"> <el-table-column label="合同编号" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.rebateMoneyOne }}</span> <span>{{ scope.row.concatNo }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="中介人2" align="center" width="120"> <el-table-column label="物料名称" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.middleTwo }}</span> <span>{{ scope.row.materialName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="返利金额2" align="center" width="120"> <el-table-column label="物料编码" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.rebateMoneyTwo }}</span> <span>{{ scope.row.materialCode }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="内部引荐人" align="center" width="120"> <el-table-column label="内部编码" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.innerName }}</span> <span>{{ scope.row.insideCode }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

17
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
View File

@ -229,11 +229,18 @@ export default {
this.$refs['divinfo'].showInfo(sid, row) this.$refs['divinfo'].showInfo(sid, row)
}, },
toTermination(row) { toTermination(row) {
req.cancal({ sid: row.sid }).then((res) => { const tip = '请确认是否终止该记录?'
if (res.success) { this.$confirm(tip, '提示', {
this.$message({ showClose: true, type: 'success', message: '操作成功' }) confirmButtonText: '确定',
this.loadList() cancelButtonText: '取消',
} type: 'warning'
}).then(() => {
req.cancal({ sid: row.sid }).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.loadList()
}
})
}) })
}, },
hangleLook(row) { hangleLook(row) {

17
anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
View File

@ -307,11 +307,18 @@ export default {
}) })
}, },
handCancellation(row) { handCancellation(row) {
req.cancel({ sid: row.sid }).then((res) => { const tip = '请确认是否作废该记录?'
if (res.success) { this.$confirm(tip, '提示', {
this.$message({ showClose: true, type: 'success', message: '操作成功' }) confirmButtonText: '确定',
this.getList() cancelButtonText: '取消',
} type: 'warning'
}).then(() => {
req.cancel({ sid: row.sid }).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.getList()
}
})
}) })
}, },
handleGetCheck(row) { handleGetCheck(row) {

10
anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue
View File

@ -255,9 +255,11 @@
<tr> <tr>
<td>可操作功能列表</td> <td>可操作功能列表</td>
<td> <td>
<el-tree v-loading="loading" :data="treedata" ref="funTree" show-checkbox accordion node-key="sid" <div style="height:230px;line-height:120px;overflow:auto;overflow-x:hidden;">
:default-checked-keys="checkedId" :props="defaultProps" @check-change="checkchange"> <el-tree v-loading="loading" :data="treedata" ref="funTree" show-checkbox accordion node-key="sid"
</el-tree> :default-checked-keys="checkedId" :props="defaultProps" @check-change="checkchange">
</el-tree>
</div>
</td> </td>
</tr> </tr>
</table> </table>
@ -289,7 +291,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-table :key="tableKey" :data="formobj.tableData" :index="index" border style="width: 100%"> <el-table :key="tableKey" :data="formobj.tableData" :index="index" border style="width: 100%" max-height="300">
<el-table-column type="index" label="序号" :index="index + 1" width="80" align="center"> <el-table-column type="index" label="序号" :index="index + 1" width="80" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="菜单名称" header-align="center" align="left"> <el-table-column prop="name" label="菜单名称" header-align="center" align="left">

Write Preview
Loading…
Cancel
Save