Commit 0c23ee37 by 乔延琦

Merge branch 'develop-qiaoyanqi' into 'develop'

获取bill.action方式变更

See merge request GFP/RBC/rbc-frontend!77
parents ac81753e d994b19d
......@@ -7,7 +7,8 @@ export default {
let name = GMS.$hideContainer.addComponent(addInfoModal, {}, function (c) {
component = c;
c.bill = bill;
let arr = bill.action.filter(v=>v.execute=="searchBillAction");
let action = bill.curForm.content.actions;
let arr = action.filter(v=>v.execute=="searchBillAction");
let tableName = null;
if(arr.length>0){
c.actionParam = arr[0];
......
......@@ -19,7 +19,8 @@ export default {
let that = this;
let buidData = bill.getBuillData();
console.log("buidData:", buidData);
let controlArr = bill.action.filter((v) => v.execute == "searchBillAction");
let action = bill.curForm.content.actions;
let controlArr = action.filter((v) => v.execute == "searchBillAction");
let detailData = [];
let arrApi1 = [];
if (
......
......@@ -44,7 +44,8 @@ export default {
let that = this;
let buidData = bill.getBuillData();
console.log('buidData:', buidData);
let controlArr = bill.action.filter(
let action = bill.curForm.content.actions;
let controlArr = action.filter(
(v) => v.execute == "searchBillAction"
);
let detailData = [];
......
import Bridge from '../components-control/util/bridge'
import typesBill from '../components-control/typesBill.vue';
import errorMessageUtil from "./util/errorMessageUtil";
import { getUUID } from "../query-actions/util/lib";
export default {
execute: function (bill, param) {
if (param && param.param && param.param.budgetcontrol) {
......
......@@ -15,7 +15,8 @@ export default {
saveData(bill, param) {
let that = this;
let buidData = bill.getBuillData();
let controlArr = bill.action.filter((v) => v.execute === "searchBillAction");
let action = bill.curForm.content.actions;
let controlArr = action.filter((v) => v.execute === "searchBillAction");
let detailData = [];
let arrApi1 = [];
if (
......
......@@ -10,8 +10,9 @@
* @date 2022-01-24
*/
export function actionIgnoreField(bill) {
if (bill.action && bill.action.length > 0) {
let obj = bill.action.find(v=>v.execute =='customerSelectAction')//引用申请单动作
let action = bill.curForm.content.actions;
if (action && action.length > 0) {
let obj = action.find(v=>v.execute =='customerSelectAction')//引用申请单动作
let str =''
if(obj && obj.param && obj.param.field){
str += Object.keys(obj.param.field).join();
......
......@@ -123,7 +123,8 @@ export default {
GMS.vbus.$off("closeModal");
});
GMS.vbus.$on("cacheEcho", (param) => {
let controlArr = this.bill.action.filter(
let action = this.bill.curForm.content.actions;
let controlArr = action.filter(
(v) => v.execute == "searchBillAction"
);
if (controlArr.length == 0) {
......@@ -148,7 +149,7 @@ export default {
this.$message.error("没有匹配的字段");
return;
}
let arr = this.bill.action.filter((v) => v.execute == "editAction");
let arr = action.filter((v) => v.execute == "editAction");
if (arr.length > 0) {
obj["BILLID"] = param.id; //记录一下id
obj["BILLNAME"] = param.billDefine; //记录一下单据标识;
......@@ -248,8 +249,9 @@ export default {
if (arr1.length == 0) {
return obj;
}
let action = this.bill.curForm.content.actions;
let targetTableName = arr1[0].targetTableName;
let controlArr = this.bill.action.filter(
let controlArr = action.filter(
(v) => v.execute == "searchBillAction"
);
let tableName = controlArr[0].param.field[0].targetTableName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment