Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 3 years ago
parent
commit
caab0a91ce
  1. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  3. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java
  4. 2
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  5. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemDto.java
  6. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java
  7. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java
  8. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.xml
  9. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java
  10. 2
      anrui-scm/anrui-scm-ui/src/styles/index.scss
  11. 5
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
  12. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue
  13. 225
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
  14. 22
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java

@ -104,7 +104,7 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign {
public ResultBean complete(BaseInterNalPurchaseCompleteDto bvd) {
BusinessVariables bv=new BusinessVariables();
BeanUtil.copyProperties(bvd,bv);
bv.setFormVariables(BeanUtil.beanToMap(bvd));
//bv.setFormVariables(BeanUtil.beanToMap(bvd));
bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId());
return baseInternalPurchaseService.complete(bv);
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@ -467,7 +467,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
}
ScmVehinspectItemDto scmVehinspectItemDto = new ScmVehinspectItemDto();
scmVehinspectItemDto.setVehInspectSid(resultBean1.getData());
ResultBean resultBean = scmVehinspectItemFeign.saveItem(scmVehinspectItemDto);
ResultBean resultBean = scmVehinspectItemFeign.save(scmVehinspectItemDto);
if (!resultBean.getSuccess()) {
return rb.setMsg("验车单业务模块的数据推送失败!");
}

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java

@ -54,9 +54,9 @@ public class FinKingDeeFeignService {
*/
public ResultBean draftEntryBill(APPayable aPPayable) {
ResultBean rb=ResultBean.fireFail();
String readJsonFile = readJsonFile("./src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json");
String fEntityDetail_ = readJsonFile("./src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json");
String fEntityPlan_ = readJsonFile("./src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityPlan.json");
String readJsonFile = readJsonFile("src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json");
String fEntityDetail_ = readJsonFile("src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json");
String fEntityPlan_ = readJsonFile("src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityPlan.json");
Map<String,Object> map=new HashMap<>();
map.put("@KD_FDATE",aPPayable.getApplicationDate());
APPayable.cloneKingDeeParams(map,readJsonFile,fEntityDetail_,fEntityPlan_);

2
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@ -1377,7 +1377,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
taskService.setAssignee(flowTaskVo.getTaskId(), flowTaskVo.getUserSid());
taskService.addComment(flowTaskVo.getTaskId(), processInstanceId, FlowComment.STOP.getType(), comment);
runtimeService.createChangeActivityStateBuilder().moveExecutionsToSingleActivityId(executionIds, endId).changeState();
return new ResultBean().success().setMsg("终止成功").setData(FlowComment.STOP.getType());
return new ResultBean().success().setMsg("终止成功").setData(FlowComment.STOP.getRemark());
} else {
return new ResultBean().fail().setMsg("终止失败不存在运行的流程实例");
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemDto.java

@ -47,7 +47,7 @@ import java.util.List;
* @since 1.0
*/
@Data
@ApiModel(value = "验车单中的检查表项目 数据传输对象", description = "验车单中的检查表项目 数据传输对象")
@ApiModel(value = "推送验车检查表")
public class ScmVehinspectItemDto implements Dto {
private static final long serialVersionUID = 4815903953419395568L;

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java

@ -62,11 +62,6 @@ public interface ScmVehinspectItemFeign {
@ResponseBody
public ResultBean save(@RequestBody ScmVehinspectItemDto dto);
@ApiOperation("推送验车单数据")
@PostMapping("/saveItem")
@ResponseBody
public ResultBean saveItem(@RequestBody ScmVehinspectItemDto dto);
/**
* Pc端根据验车单sid初始化车辆检查表
*

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java

@ -54,11 +54,6 @@ public class ScmVehinspectItemFeignFallback implements ScmVehinspectItemFeign {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehinspectitem/save无法访问");
}
@Override
public ResultBean saveItem(ScmVehinspectItemDto dto) {
return null;
}
@Override
public ResultBean<List<ScmVehinspectItemInfoVo>> getVehinspectItemInfo(String vehInspectSid) {
return null;

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.xml

@ -41,12 +41,12 @@
</collection>
</resultMap>
<select id="detailsList">
<select id="detailsList" resultType="com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmItemDetailVo">
select si.itemContent, si.sortNo
from scm_vehicle_inspectdetail si
where si.itemSid = #{sid}
</select>
<select id="imgList">
<select id="imgList" resultType="com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemsVo">
select si.imgTitle, si.imgTempUrl as imgUrl
from scm_vehicle_inspectimgtemp si
where si.itemSid = #{sid}

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java

@ -65,11 +65,6 @@ public class ScmVehinspectItemRest implements ScmVehinspectItemFeign {
return scmVehinspectItemService.saveItem(dto);
}
@Override
public ResultBean saveItem(ScmVehinspectItemDto dto) {
return scmVehinspectItemService.saveItem(dto);
}
@Override
public ResultBean<List<ScmVehinspectItemInfoVo>> getVehinspectItemInfo(String vehInspectSid) {
ResultBean rb = ResultBean.fireFail();

2
anrui-scm/anrui-scm-ui/src/styles/index.scss

@ -305,7 +305,7 @@ div:focus {
line-height: 42px;
.addinputw {
//padding: 5px 0;
width: 65%;
width: calc(100% - 70px);
margin-left: 80px;
line-height: 42px;
}

5
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue

@ -1049,11 +1049,10 @@ export default {
line-height: 40px !important;
font-weight: 600;
}
.addinputw02{
width: 52% !important;
.formaddcopy02 .el-row /deep/ .el-col {
padding:0 8px;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw{
width: 60%;
margin-left: 65px;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputwTwo{

2
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue

@ -80,7 +80,7 @@ export default {
handleReturn() {
this.$emit('doback')
},
showEdit() {
showCheck() {
getVehinspectItemInfo('a595bd5b-1df1-4465-916d-285d98af2039').then((resp) => {
if (resp.success) {
this.tableData = resp.data

225
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

@ -1,121 +1,124 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
<el-button type="success" size="small" @click="handlePass()">通过</el-button>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
<div v-show="isCheck">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
<el-button type="success" size="small" @click="handlePass()">通过</el-button>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
</div>
</div>
</div>
<div class="listconadd">
<div class="titwu">验车单</div>
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
<div class="yancheAdd" style="margin-top: 5px;">
<el-row class="yancheAdd-bor">
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="vin" label="车架号:">
<el-input
v-model="temp.vin"
placeholder="请输入车架号"
class="addinputw"
:readonly="temp.purchaseKey !== '01'"
/>
</el-form-item>
</el-col>
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="model" label="车型:">
<el-input
v-model="temp.model"
placeholder="请输入车型"
class="addinputw"
readonly
/>
</el-form-item>
<div class="listconadd">
<div class="titwu">验车单</div>
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
<div class="yancheAdd" style="margin-top: 5px;">
<el-row class="yancheAdd-bor">
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="vin" label="车架号:">
<el-input
v-model="temp.vin"
placeholder="请输入车架号"
class="addinputw"
:readonly="temp.purchaseKey !== '01'"
/>
</el-form-item>
</el-col>
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="model" label="车型:">
<el-input
v-model="temp.model"
placeholder="请输入车型"
class="addinputw"
readonly
/>
</el-form-item>
</el-col>
</el-row>
<el-row class="yancheAdd-bor">
<el-col :span="24" class="yancheAdd-bor">
<el-form-item prop="config" label="配置:">
<el-input
v-model="temp.config"
type="textarea"
autosize
placeholder="请输入配置"
class="addinputw addinputw_copy"
readonly/>
</el-form-item>
</el-col>
</el-row>
<el-row class="yancheAdd-bor">
<el-col :span="24" class="yancheAdd-bor">
<el-form-item prop="modelDifferenceExplain" label="车型配置差异说明:">
<el-input
v-model="temp.modelDifferenceExplain"
type="textarea"
autosize
placeholder="请输入车型配置差异说明"
class="addinputw addinputw_copy"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="guaranteeCardNo" label="保修卡号:">
<el-input
v-model="temp.guaranteeCardNo"
placeholder="请输入保修卡号"
class="addinputw"
clearable
@keyup.native="temp.guaranteeCardNo = oninput(temp.guaranteeCardNo,2)"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="price" label="洗车费:">
<el-input
v-model="temp.price"
placeholder="请输入洗车费"
class="addinputw"
clearable
@keyup.native="temp.price = oninput(temp.price,2)"
/>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="title">验车相关照片</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="imgList01" :limit="1" bucket="map" :upload-data="{type:'0001'}"></upload>
</el-col>
</el-row>
<el-row class="yancheAdd-bor">
<el-col :span="24" class="yancheAdd-bor">
<el-form-item prop="config" label="配置:">
<el-input
v-model="temp.config"
type="textarea"
autosize
placeholder="请输入配置"
class="addinputw addinputw_copy"
readonly/>
</el-form-item>
<el-row>
<el-col :span="3">
<span>厂家验车单照片</span>
</el-col>
</el-row>
<el-row class="yancheAdd-bor">
<el-col :span="24" class="yancheAdd-bor">
<el-form-item prop="modelDifferenceExplain" label="车型配置差异说明:">
<el-input
v-model="temp.modelDifferenceExplain"
type="textarea"
autosize
placeholder="请输入车型配置差异说明"
class="addinputw addinputw_copy"/>
</el-form-item>
<el-col :span="21">
<upload ref="uploadImg" v-model="imgList02" :limit="1" bucket="map" :upload-data="{type:'0001'}"></upload>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="guaranteeCardNo" label="保修卡号:">
<el-input
v-model="temp.guaranteeCardNo"
placeholder="请输入保修卡号"
class="addinputw"
clearable
@keyup.native="temp.guaranteeCardNo = oninput(temp.guaranteeCardNo,2)"
/>
</el-form-item>
<el-col :span="3">
<span>验车情况说明</span>
</el-col>
<el-col :span="12">
<el-form-item prop="price" label="洗车费:">
<el-input
v-model="temp.price"
placeholder="请输入洗车费"
class="addinputw"
clearable
@keyup.native="temp.price = oninput(temp.price,2)"
/>
</el-form-item>
<el-col :span="21">
<el-input
type="textarea"
autosize
placeholder="请输入说明"
v-model="temp.remarks">
</el-input>
</el-col>
</el-row>
</div>
<div class="title">验车相关照片</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="imgList01" :limit="1" bucket="map" :upload-data="{type:'0001'}"></upload>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>厂家验车单照片</span>
</el-col>
<el-col :span="21">
<upload ref="uploadImg" v-model="imgList02" :limit="1" bucket="map" :upload-data="{type:'0001'}"></upload>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>验车情况说明</span>
</el-col>
<el-col :span="21">
<el-input
type="textarea"
autosize
placeholder="请输入说明"
v-model="temp.remarks">
</el-input>
</el-col>
</el-row>
<!-- <el-row class="last_btn">-->
<!-- <el-button type="primary" size="small" @click="handleCreate()">车辆检查表</el-button>-->
<!-- </el-row>-->
</el-form>
<el-row class="last_btn">
<el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>
</el-row>
</el-form>
</div>
</div>
<vehiclechecklist ref="divchecklist" v-show="!isCheck" @doback="resetState"/>
</div>
</template>
@ -124,15 +127,18 @@ import { getPathSidByUserSid } from '@/api/cheliang/dictcommons.js'
import { getCarInspectedInfo, saveCarInspectedInfo, submitCarInspectedInfo } from '@/api/supplychain/yancheguanli'
import { getUseOrgByUserSid } from '@/api/cheliang/basevehicle'
import Upload from '@/components/uploadFile/uploadImg.vue'
import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist'
export default {
name: 'yancheguanliAdd',
components: {
Upload
Upload,
vehiclechecklist
},
data() {
return {
viewTitle: '',
isCheck:false,
// ---------
sid: '',
datas: null,
@ -248,6 +254,13 @@ export default {
// this.getZuZhi()
// this.getUseOrg()
// },
handleChecklist(){
this.isCheck = false
this.$refs['divchecklist'].showCheck()
},
resetState(){
this.isCheck = true
},
// 使
getUseOrg() {
const userSid = window.sessionStorage.getItem('userSid')

22
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<div>
<div v-show="isCheck">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
@ -92,12 +92,16 @@
</el-form-item>
</el-col>
</el-row>
<el-row class="last_btn">
<el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>
</el-row>
</el-form>
</div>
</div>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
<vehiclechecklist ref="divchecklist" v-show="!isCheck" @doback="resetState" />
<!-- <el-dialog :visible.sync="dialogVisible" width="1000px"-->
<!-- :close-on-click-modal="false">-->
<!-- <div class="result-cont">-->
@ -109,16 +113,20 @@
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>
<script>
import { getCarInspected } from '@/api/supplychain/yancheguanli'
import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist'
export default {
name: 'yancheguanliInfo',
data() {
return {
viewTitle: '',
isCheck:true,
// ---------
sid: '',
dialogVisible: false,
@ -156,6 +164,13 @@ export default {
}
})
},
handleChecklist(){
this.isCheck = false
this.$refs['divchecklist'].showCheck()
},
resetState(){
this.isCheck = true
},
open(val, index) {
this.dialogVisible = true
this.dialogUrl = val
@ -186,4 +201,9 @@ export default {
line-height: 40px !important;
font-weight: 600;
}
.formadd .last_btn {
float: right;
top: 30px;
}
</style>

Loading…
Cancel
Save