diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java index 5e004966fa..9be5378676 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java @@ -18,7 +18,9 @@ import org.springframework.stereotype.Service; import org.springframework.util.ResourceUtils; import java.io.*; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -65,25 +67,36 @@ public class FinKingDeeFeignService { */ public ResultBean draftEntryBill(APPayable aPPayable) { ResultBean rb=ResultBean.fireFail(); - String readJsonFile = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata2.json"); + String readJsonFile = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json"); String fEntityData_ = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_data.json"); String fEntityModel_ = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_model.json"); - String fEntityDetail_ = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail2.json"); - // String fEntityPlan_ = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityPlan.json"); - Map map=new HashMap<>(); - map.put("@KD_FDATE",aPPayable.getApplicationDate()); + String fEntityDetail_ = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json"); JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField); + Map map_fEntityModel_=new HashMap<>(); + //单据编号 + map_fEntityModel_.put("FBillNo",aPPayable.getApplicationCode()==null?"":aPPayable.getApplicationCode()); + //业务日期 + map_fEntityModel_.put("FDATE",aPPayable.getApplicationDate()==null?"":aPPayable.getApplicationDate()); + //供应商:FSUPPLIERID (必填项) + map_fEntityModel_.put("FSUPPLIERID","01"); JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); - JSONArray jsonfEntityDetail_= JSONArray.parseArray(fEntityDetail_); - jsonFEntityModel_.put("FEntityDetail",jsonfEntityDetail_); - jsonFEntityData_.put("Model",jsonFEntityModel_); - // JSONObject fEntityData_= JSONObject.parseObject(fEntityData_); + fEntityModel_=replaceTemplateParams(fEntityModel_, map_fEntityModel_); + List vehicleList = aPPayable.getVehicleList()==null?new ArrayList<>():aPPayable.getVehicleList(); + List list_fEntityDetail_=new ArrayList<>(); + for(int i=0;i map_fEntityDetail_=new HashMap<>(); + //物料编码:FMATERIALID + map_fEntityDetail_.put("FMATERIALID",aPPayable.getApplicationCode()==null?"":aPPayable.getApplicationCode()); + //物料说明:FMaterialDesc + map_fEntityDetail_.put("FMaterialDesc",aPPayable.getApplicationCode()==null?"":aPPayable.getApplicationCode()); + fEntityDetail_=replaceTemplateParams(fEntityDetail_, map_fEntityDetail_); + list_fEntityDetail_.add(fEntityDetail_); + } + jsonFEntityModel_.put("FEntityDetail",JSONArray.parseArray(JSON.toJSONString(list_fEntityDetail_))); + jsonFEntityData_.put("Model",JSONObject.parseObject(fEntityModel_,Feature.OrderedField)); jsonObj.put("data",jsonFEntityData_.toJSONString()); - // readJsonFile= readJsonFile.replace("@KD_data",fEntityData_); - //readJsonFile= readJsonFile.replace("@KD_FEntityDetail",fEntityDetail_); - String j= jsonObj.toString(); - // readJsonFile=APPayable.cloneKingDeeParams(map,readJsonFile,fEntityDetail_,fEntityPlan_); + String j= jsonObj.toString(); try { return saveBill(KingDeeBillId.AP_PAYABLE.getID(),j); } catch (Exception e) { @@ -92,6 +105,13 @@ public class FinKingDeeFeignService { return rb; } + private String replaceTemplateParams(String template, Map params) { + for (Map.Entry entry : params.entrySet()) { + template = template.replace("@KD_"+entry.getKey(),entry.getValue()); + } + return template; + } + /** * 生成的应付单的数据，推送到金蝶的平台中 * @param APPayable diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/data.json deleted file mode 100644 index 2b683cf985..0000000000 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/data.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "Creator":"@KD_Creator", - "NeedUpDateFields":[], - "NeedReturnFields":[], - "IsDeleteEntry":"True", - "SubSystemId":"", - "IsVerifyBaseDataField":"false", - "IsEntryBatchFill":"True", - "ValidateFlag":"True", - "NumberSearch":"True", - "InterationFlags":"", - "Model":{ - "FID":0, - "FBillTypeID":{ - "FNUMBER":"YFD01_SYS" - }, - "FBillNo":"123123", - "FISINIT":false, - "FDATE":"2022-07-1800:00:00", - "FENDDATE_H":"2022-07-1800:00:00", - "FDOCUMENTSTATUS":"Z", - "FSUPPLIERID":{ - "FNumber":"010001" - }, - "FCURRENCYID":{ - "FNumber":"PRE001" - }, - "FPayConditon":{ - "FNumber":"FKTJ01_SYS" - }, - "FISPRICEEXCLUDETAX":true, - "FBUSINESSTYPE":"CG", - "FISTAX":true, - "FSETTLEORGID":{ - "FNumber":"101" - }, - "FPAYORGID":{ - "FNumber":"101" - }, - "FSetAccountType":"2", - "FISTAXINCOST":false, - "FAP_Remark":"1231", - "FISHookMatch":false, - "FPURCHASEDEPTID":{ - "FNumber":"01" - }, - "FCancelStatus":"A", - "FISBYIV":false, - "FISGENHSADJ":false, - "FISINVOICEARLIER":false, - "F_PAEZ_Text":"231231231231", - "F_PMZC_Assistant1":{ - "FNumber":"00" - }, - "FsubHeadSuppiler":{ - "FORDERID":{ - "FNumber":"010001" - }, - "FTRANSFERID":{ - "FNumber":"010001" - }, - "FChargeId":{ - "FNumber":"010001" - } - }, - "FsubHeadFinc":{ - "FACCNTTIMEJUDGETIME":"2022-07-1800:00:00", - "FMAINBOOKSTDCURRID":{ - "FNumber":"PRE001" - }, - "FEXCHANGETYPE":{ - "FNumber":"HLTX01_SYS" - }, - "FExchangeRate":1.0, - "FTaxAmountFor":0.98, - "FNoTaxAmountFor":98.02 - }, - "FEntityDetail":[ - { - "FMATERIALID":{ - "FNumber":"&12" - }, - "FMaterialDesc":"@KD_FMaterialDesc", - "FPRICEUNITID":{ - "FNumber":"ba" - }, - "FPrice":99.01, - "FPriceQty":1.0, - "FTaxPrice":100.0, - "FPriceWithTax":99.0, - "FEntryTaxRate":1.0, - "F_PMZC_Assistant":{ - "FNumber":"1904110789" - }, - "F_PMZC_Base":{ - "FNUMBER":"0001F" - }, - "F_PMZC_Base1":{ - "FNUMBER":"01.001" - }, - "FEntryDiscountRate":1.0, - "FDISCOUNTAMOUNTFOR":1.0, - "FNoTaxAmountFor_D":98.02, - "FTAXAMOUNTFOR_D":0.98, - "FALLAMOUNTFOR_D":99.0, - "FINCLUDECOST":false, - "FISOUTSTOCK":false, - "FIsFree":false, - "FStockUnitId":{ - "FNumber":"ba" - }, - "FStockQty":1.0, - "FStockBaseQty":1.0, - "FPriceBaseDen":1.0, - "FStockBaseNum":1.0 - } - ], - "FEntityPlan":[ - { - "FENDDATE":"2022-07-1800:00:00", - "FPAYAMOUNTFOR":99.0, - "FPAYRATE":100.0 - } - ] - } -} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json index b506b0a6d1..4015621acb 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json @@ -1 +1,4 @@ -{"Creator":"","NeedUpDateFields":[],"NeedReturnFields":[],"IsDeleteEntry":"True","SubSystemId":"","IsVerifyBaseDataField":"false","IsEntryBatchFill":"True","ValidateFlag":"True","NumberSearch":"True","InterationFlags":"","Model":{"FID":0,"FBillTypeID":{"FNUMBER":"@KD_FBillTypeID"},"FISINIT":false,"FDATE":"@KD_FDATE","FENDDATE_H":"","FDOCUMENTSTATUS":"@KD_FDOCUMENTSTATUS","FSUPPLIERID":{"FNumber":"@KD_FSUPPLIERID"},"FCURRENCYID":{"FNumber":"@KD_FCURRENCYID"},"FPayConditon":{"FNumber":"@KD_FPayConditon"},"FISPRICEEXCLUDETAX":true,"FBUSINESSTYPE":"@KD_FBUSINESSTYPE","FISTAX":true,"FSETTLEORGID":{"FNumber":"@KD_FSETTLEORGID"},"FPAYORGID":{"FNumber":"@KD_FPAYORGID"},"FSetAccountType":"","FISTAXINCOST":false,"FAP_Remark":"","FISHookMatch":false,"FPURCHASEDEPTID":{"FNumber":"@KD_FPURCHASEDEPTID"},"FCancelStatus":"@KD_FCancelStatus","FISBYIV":false,"FISGENHSADJ":false,"FISINVOICEARLIER":false,"F_PAEZ_Text":"","F_PMZC_Assistant1":{"FNumber":""},"FsubHeadSuppiler":{"FORDERID":{"FNumber":""},"FTRANSFERID":{"FNumber":""},"FChargeId":{"FNumber":""}},"FsubHeadFinc":{"FACCNTTIMEJUDGETIME":"","FMAINBOOKSTDCURRID":{"FNumber":""},"FEXCHANGETYPE":{"FNumber":""},"FExchangeRate":1.0,"FTaxAmountFor":0,"FNoTaxAmountFor":0},"FEntityDetail":[@KD_FEntityDetail],"FEntityPlan": [@KD_FEntityPlan]}} \ No newline at end of file +{ + "formId": "AP_Payable", + "data": "@KD_data" +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata2.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata2.json deleted file mode 100644 index 4015621acb..0000000000 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata2.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "formId": "AP_Payable", - "data": "@KD_data" -} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json index eee83e0b7f..3a061b64f4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json @@ -1 +1,38 @@ -{"FMATERIALID":{"FNumber":"@KD_FMATERIALID"},"FMaterialDesc":"@KD_FMaterialDesc","FPRICEUNITID":{"FNumber":"@KD_FPRICEUNITID"},"FPrice":@KD_FPrice@,"FPriceQty":@KD_FPriceQty,"FTaxPrice":@KD_FTaxPrice@,"FPriceWithTax":@KD_FPriceWithTax,"FEntryTaxRate":@KD_FEntryTaxRate,"F_PMZC_Assistant":{"FNumber":"@KD_F_PMZC_Assistant"},"F_PMZC_Base":{"FNUMBER":"@KD_F_PMZC_Base"},"F_PMZC_Base1":{"FNUMBER":"@KD_F_PMZC_Base1"},"FEntryDiscountRate":@KD_FEntryDiscountRate,"FDISCOUNTAMOUNTFOR":@KD_FDISCOUNTAMOUNTFOR,"FNoTaxAmountFor_D":@KD_FNoTaxAmountFor_D,"FTAXAMOUNTFOR_D":@KD_FTAXAMOUNTFOR_D,"FALLAMOUNTFOR_D":@KD_FALLAMOUNTFOR_D,"FINCLUDECOST":false,"FISOUTSTOCK":false,"FIsFree":false,"FStockUnitId":{"FNumber":"@KD_FStockUnitId"},"FStockQty":@KD_FStockQty,"FStockBaseQty":@KD_FStockBaseQty,"FPriceBaseDen":@KD_FPriceBaseDen,"FStockBaseNum":@KD_FStockBaseNum} \ No newline at end of file +{ + "FMATERIALID": { + "FNumber": "@KD_FMATERIALID" + }, + "FMaterialDesc": "@KD_FMaterialDesc", + "FPRICEUNITID": { + "FNumber": "" + }, + "FPrice": 0, + "FPriceQty": 0, + "FTaxPrice": 0, + "FPriceWithTax": 0, + "FEntryTaxRate": 0, + "F_PMZC_Assistant": { + "FNumber": "" + }, + "F_PMZC_Base": { + "FNUMBER": "" + }, + "F_PMZC_Base1": { + "FNUMBER": "" + }, + "FEntryDiscountRate": 0, + "FDISCOUNTAMOUNTFOR": 0, + "FNoTaxAmountFor_D": 0, + "FTAXAMOUNTFOR_D": 0, + "FALLAMOUNTFOR_D": 0, + "FINCLUDECOST": false, + "FISOUTSTOCK": false, + "FIsFree": false, + "FStockUnitId": { + "FNumber": "" + }, + "FStockQty": 0, + "FStockBaseQty": 0, + "FPriceBaseDen": 0, + "FStockBaseNum": 0 +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail2.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail2.json deleted file mode 100644 index e42185b3de..0000000000 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail2.json +++ /dev/null @@ -1,38 +0,0 @@ -[{ - "FMATERIALID": { - "FNumber": "&12" - }, - "FMaterialDesc": "@KD_FMaterialDesc", - "FPRICEUNITID": { - "FNumber": "ba" - }, - "FPrice": 99.01, - "FPriceQty": 1.0, - "FTaxPrice": 100.0, - "FPriceWithTax": 99.0, - "FEntryTaxRate": 1.0, - "F_PMZC_Assistant": { - "FNumber": "1904110789" - }, - "F_PMZC_Base": { - "FNUMBER": "0001F" - }, - "F_PMZC_Base1": { - "FNUMBER": "01.001" - }, - "FEntryDiscountRate": 1.0, - "FDISCOUNTAMOUNTFOR": 1.0, - "FNoTaxAmountFor_D": 98.02, - "FTAXAMOUNTFOR_D": 0.98, - "FALLAMOUNTFOR_D": 99.0, - "FINCLUDECOST": false, - "FISOUTSTOCK": false, - "FIsFree": false, - "FStockUnitId": { - "FNumber": "ba" - }, - "FStockQty": 1.0, - "FStockBaseQty": 1.0, - "FPriceBaseDen": 1.0, - "FStockBaseNum": 1.0 -}] \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityPlan.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityPlan.json deleted file mode 100644 index 9845c16174..0000000000 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityPlan.json +++ /dev/null @@ -1 +0,0 @@ -{"FENDDATE":"@KD_FENDDATE","FPAYAMOUNTFOR":@KD_FPAYAMOUNTFOR,"FPAYRATE":@KD_FPAYRATE} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_model.json index 65ecd5eda8..e6a57134ca 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_model.json @@ -3,13 +3,13 @@ "FBillTypeID": { "FNUMBER": "YFD01_SYS" }, - "FBillNo": "22996688aassddff", + "FBillNo": "@KD_FBillNo", "FISINIT": false, - "FDATE": "2022-07-29 00:00:00", - "FENDDATE_H": "2022-07-29 00:00:00", + "FDATE": "@KD_FDATE", + "FENDDATE_H": "", "FDOCUMENTSTATUS": "Z", "FSUPPLIERID": { - "FNumber": "010001" + "FNumber": "@KD_FSUPPLIERID" }, "FCURRENCYID": { "FNumber": "PRE001" @@ -35,14 +35,14 @@ "FISINVOICEARLIER": false, "FsubHeadSuppiler": {}, "FsubHeadFinc": { - "FACCNTTIMEJUDGETIME": "2022-07-29 00:00:00", + "FACCNTTIMEJUDGETIME": "", "FMAINBOOKSTDCURRID": { "FNumber": "PRE001" }, "FEXCHANGETYPE": { "FNumber": "HLTX01_SYS" }, - "FExchangeRate": 1.0 + "FExchangeRate": 0 }, "FEntityDetail": [] } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java index a4d89e0032..b40437ffb3 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java @@ -237,8 +237,7 @@ public class FlowTaskController implements FlowTaskFeign { @Override public ResultBean businessFlowRecord(String procInsId, String deployId) { - ResultBean flowRecordVoResultBean = flowTaskService.businessFlowRecord(procInsId, deployId); - return flowRecordVoResultBean; + return flowTaskService.businessFlowRecord(procInsId, deployId); } @Override 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 38b09879f5..2b62857f55 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 @@ -496,7 +496,7 @@ public class FlowTaskService extends MybatisBaseService pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(sysUserVoResultBean.getData().getSid()); String ogrName=""; if(pathSidByUserSid.getData()!=null){ ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(pathSidByUserSid.getData()); @@ -701,7 +701,19 @@ public class FlowTaskService extends MybatisBaseService sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString()); flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); - flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName()); + // ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(historicProcessInstance.getStartUserId()); + if(sysUserVoResultBean.getData()!=null){ + flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); + flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); + ResultBean pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(sysUserVoResultBean.getData().getSid()); + String ogrName=""; + if(pathSidByUserSid.getData()!=null){ + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(pathSidByUserSid.getData()); + ogrName=sysOrganizationVoResultBean.getData().getName(); + } + flowTask.setStartDeptName(ogrName+"-"+sysUserVoResultBean.getData().getOrganizationName()); + } + // flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName()); HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskId(flowTask.getTaskId()).singleResult(); flowTask.setProcessVariables(historicTaskInstance.getProcessVariables()); Object end_act_id = histTask.get("end_act_id_"); diff --git a/anrui-system-ui/src/views/Process/index.vue b/anrui-system-ui/src/views/Process/index.vue index b443dabe2b..615921caf3 100644 --- a/anrui-system-ui/src/views/Process/index.vue +++ b/anrui-system-ui/src/views/Process/index.vue @@ -239,12 +239,19 @@ export default { const targetTask = this.taskList.find(m => m.key === nn.targetRef.id) if (targetTask) { if (todoTask && completeTask.key === todoTask.key && !todoTask.completed){ - canvas.addMarker(nn.id, todoTask.completed ? 'highlight' : 'highlight-todo') - canvas.addMarker(nn.targetRef.id, todoTask.completed ? 'highlight' : 'highlight-todo') + // canvas.addMarker(nn.id, todoTask.completed ? 'highlight' : 'highlight-todo') + // canvas.addMarker(nn.targetRef.id, todoTask.completed ? 'highlight' : 'highlight-todo') + canvas.addMarker(n.id,'highlight-todo') }else { canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo') canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo') } + } else { + if (todoTask && completeTask.key === todoTask.key && !todoTask.completed){ + // canvas.addMarker(nn.id, todoTask.completed ? 'highlight' : 'highlight-todo') + // canvas.addMarker(nn.targetRef.id, todoTask.completed ? 'highlight' : 'highlight-todo') + canvas.addMarker(n.id,'highlight-todo') + } } }) } diff --git a/anrui-system-ui/src/views/flow/todoList.vue b/anrui-system-ui/src/views/flow/todoList.vue index 77df1a44ad..e8d45bc1d3 100644 --- a/anrui-system-ui/src/views/flow/todoList.vue +++ b/anrui-system-ui/src/views/flow/todoList.vue @@ -285,8 +285,8 @@ export default { } selectUrl(this.selectUrl_list).then((response) => { if (response.code === '200') { - // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) - this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + //this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) console.log('已办拼接url:',this.url) } else { this.$notify({