diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java index 32601a9173..ee24c59876 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java +++ b/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); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 8884ed1b03..7afd04a44e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/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 map=new HashMap<>(); map.put("@KD_FDATE",aPPayable.getApplicationDate()); APPayable.cloneKingDeeParams(map,readJsonFile,fEntityDetail_,fEntityPlan_); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 3b0535e6f0..14ec2eb93d 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/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> getVehinspectItemInfo(String vehInspectSid) { return null; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.xml index 7e47770f03..b7301ec3b5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.xml @@ -41,12 +41,12 @@ - select si.itemContent, si.sortNo from scm_vehicle_inspectdetail si where si.itemSid = #{sid} - select si.imgTitle, si.imgTempUrl as imgUrl from scm_vehicle_inspectimgtemp si where si.itemSid = #{sid} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java index e6737bac7d..ad677bf6dc 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java +++ b/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> getVehinspectItemInfo(String vehInspectSid) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-ui/src/styles/index.scss b/anrui-scm/anrui-scm-ui/src/styles/index.scss index 775bbaf53f..5da55039b4 100644 --- a/anrui-scm/anrui-scm-ui/src/styles/index.scss +++ b/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; } diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue index 81569c81af..b61fdc5a37 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue +++ b/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{ diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue index 1bebd6befa..cb01644b07 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue +++ b/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 diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue index 0327c2f0dc..ccbf5e8d97 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue @@ -1,121 +1,124 @@ @@ -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') diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue index af08748401..d82a497009 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue @@ -1,6 +1,6 @@