Commit d994b19d by qiaoyanqi

获取bill.action方式变更

parent ac81753e
...@@ -7,7 +7,8 @@ export default { ...@@ -7,7 +7,8 @@ export default {
let name = GMS.$hideContainer.addComponent(addInfoModal, {}, function (c) { let name = GMS.$hideContainer.addComponent(addInfoModal, {}, function (c) {
component = c; component = c;
c.bill = bill; 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; let tableName = null;
if(arr.length>0){ if(arr.length>0){
c.actionParam = arr[0]; c.actionParam = arr[0];
......
...@@ -19,7 +19,8 @@ export default { ...@@ -19,7 +19,8 @@ export default {
let that = this; let that = this;
let buidData = bill.getBuillData(); let buidData = bill.getBuillData();
console.log("buidData:", buidData); 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 detailData = [];
let arrApi1 = []; let arrApi1 = [];
if ( if (
......
...@@ -44,7 +44,8 @@ export default { ...@@ -44,7 +44,8 @@ export default {
let that = this; let that = this;
let buidData = bill.getBuillData(); let buidData = bill.getBuillData();
console.log('buidData:', buidData); console.log('buidData:', buidData);
let controlArr = bill.action.filter( let action = bill.curForm.content.actions;
let controlArr = action.filter(
(v) => v.execute == "searchBillAction" (v) => v.execute == "searchBillAction"
); );
let detailData = []; let detailData = [];
......
import Bridge from '../components-control/util/bridge'
import typesBill from '../components-control/typesBill.vue';
import errorMessageUtil from "./util/errorMessageUtil"; import errorMessageUtil from "./util/errorMessageUtil";
import { getUUID } from "../query-actions/util/lib";
export default { export default {
execute: function (bill, param) { execute: function (bill, param) {
if (param && param.param && param.param.budgetcontrol) { if (param && param.param && param.param.budgetcontrol) {
......
...@@ -15,7 +15,8 @@ export default { ...@@ -15,7 +15,8 @@ export default {
saveData(bill, param) { saveData(bill, param) {
let that = this; let that = this;
let buidData = bill.getBuillData(); 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 detailData = [];
let arrApi1 = []; let arrApi1 = [];
if ( if (
......
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
* @date 2022-01-24 * @date 2022-01-24
*/ */
export function actionIgnoreField(bill) { export function actionIgnoreField(bill) {
if (bill.action && bill.action.length > 0) { let action = bill.curForm.content.actions;
let obj = bill.action.find(v=>v.execute =='customerSelectAction')//引用申请单动作 if (action && action.length > 0) {
let obj = action.find(v=>v.execute =='customerSelectAction')//引用申请单动作
let str ='' let str =''
if(obj && obj.param && obj.param.field){ if(obj && obj.param && obj.param.field){
str += Object.keys(obj.param.field).join(); str += Object.keys(obj.param.field).join();
......
...@@ -123,7 +123,8 @@ export default { ...@@ -123,7 +123,8 @@ export default {
GMS.vbus.$off("closeModal"); GMS.vbus.$off("closeModal");
}); });
GMS.vbus.$on("cacheEcho", (param) => { 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" (v) => v.execute == "searchBillAction"
); );
if (controlArr.length == 0) { if (controlArr.length == 0) {
...@@ -148,7 +149,7 @@ export default { ...@@ -148,7 +149,7 @@ export default {
this.$message.error("没有匹配的字段"); this.$message.error("没有匹配的字段");
return; return;
} }
let arr = this.bill.action.filter((v) => v.execute == "editAction"); let arr = action.filter((v) => v.execute == "editAction");
if (arr.length > 0) { if (arr.length > 0) {
obj["BILLID"] = param.id; //记录一下id obj["BILLID"] = param.id; //记录一下id
obj["BILLNAME"] = param.billDefine; //记录一下单据标识; obj["BILLNAME"] = param.billDefine; //记录一下单据标识;
...@@ -248,8 +249,9 @@ export default { ...@@ -248,8 +249,9 @@ export default {
if (arr1.length == 0) { if (arr1.length == 0) {
return obj; return obj;
} }
let action = this.bill.curForm.content.actions;
let targetTableName = arr1[0].targetTableName; let targetTableName = arr1[0].targetTableName;
let controlArr = this.bill.action.filter( let controlArr = action.filter(
(v) => v.execute == "searchBillAction" (v) => v.execute == "searchBillAction"
); );
let tableName = controlArr[0].param.field[0].targetTableName; 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