|
@@ -241,6 +241,23 @@
|
|
:limit.sync="queryParams.pageSize"
|
|
:limit.sync="queryParams.pageSize"
|
|
@pagination="pageList"
|
|
@pagination="pageList"
|
|
/>
|
|
/>
|
|
|
|
+ <!-- k-form-build 组件渲染弹窗-->
|
|
|
|
+ <el-dialog :title="title" :visible.sync="kOpen" append-to-body>
|
|
|
|
+ <k-form-build
|
|
|
|
+ v-if="jsonData"
|
|
|
|
+ class="formBuild"
|
|
|
|
+ ref="addFromRef"
|
|
|
|
+ :dynamicData="dynamicData"
|
|
|
|
+ :defaultValue="defaultValue"
|
|
|
|
+ @submit="tempSubBtn"
|
|
|
|
+ @change="formChangeHandler"
|
|
|
|
+ :value="jsonData"
|
|
|
|
+ />
|
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
|
+ <el-button type="primary" @click="editConfirmHandler">确 定</el-button>
|
|
|
|
+ <el-button @click="kCancel">取 消</el-button>
|
|
|
|
+ </div>
|
|
|
|
+ </el-dialog>
|
|
<!-- 添加或修改销售出库单:- 过磅记录生成数据对话框 -->
|
|
<!-- 添加或修改销售出库单:- 过磅记录生成数据对话框 -->
|
|
<el-dialog :title="title" :visible.sync="open" append-to-body>
|
|
<el-dialog :title="title" :visible.sync="open" append-to-body>
|
|
<!-- <iframe
|
|
<!-- <iframe
|
|
@@ -528,7 +545,6 @@
|
|
{{ nickName }}
|
|
{{ nickName }}
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
-
|
|
|
|
</el-form>
|
|
</el-form>
|
|
</el-row>
|
|
</el-row>
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -612,6 +628,8 @@ export default {
|
|
components: { Queryfrom, Menu, DialogTemplate },
|
|
components: { Queryfrom, Menu, DialogTemplate },
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ // k-form-build组件渲染弹窗
|
|
|
|
+ kOpen: false,
|
|
// 新的自定义数据 start
|
|
// 新的自定义数据 start
|
|
productIds: [], //货品Ids
|
|
productIds: [], //货品Ids
|
|
isEdit: false,
|
|
isEdit: false,
|
|
@@ -1336,6 +1354,11 @@ export default {
|
|
this.open = false;
|
|
this.open = false;
|
|
// this.reset();
|
|
// this.reset();
|
|
},
|
|
},
|
|
|
|
+ // k-form-build 取消按钮
|
|
|
|
+ kCancel() {
|
|
|
|
+ this.kOpen = false;
|
|
|
|
+ // this.reset();
|
|
|
|
+ },
|
|
// 分页查询
|
|
// 分页查询
|
|
pageList(row) {
|
|
pageList(row) {
|
|
// 调用子组件-》携带子组件参数请求后台
|
|
// 调用子组件-》携带子组件参数请求后台
|
|
@@ -1482,7 +1505,7 @@ export default {
|
|
|
|
|
|
Object.assign(this.defaultValue, resultMap);
|
|
Object.assign(this.defaultValue, resultMap);
|
|
this.jsonData = JSON.parse(res.data.template.dfVueTemplate);
|
|
this.jsonData = JSON.parse(res.data.template.dfVueTemplate);
|
|
- this.open = true;
|
|
|
|
|
|
+ this.kOpen = true;
|
|
this.title = "修改信息";
|
|
this.title = "修改信息";
|
|
this.form.password = this.initPassword;
|
|
this.form.password = this.initPassword;
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
@@ -1875,7 +1898,7 @@ export default {
|
|
}
|
|
}
|
|
this.getList();
|
|
this.getList();
|
|
this.defaultValue = {};
|
|
this.defaultValue = {};
|
|
- this.open = false;
|
|
|
|
|
|
+ this.kOpen = false;
|
|
})
|
|
})
|
|
.catch((res) => {
|
|
.catch((res) => {
|
|
console.log(res);
|
|
console.log(res);
|
|
@@ -1928,7 +1951,7 @@ export default {
|
|
}
|
|
}
|
|
this.getList();
|
|
this.getList();
|
|
this.defaultValue = {};
|
|
this.defaultValue = {};
|
|
- this.open = false;
|
|
|
|
|
|
+ this.kOpen = false;
|
|
}
|
|
}
|
|
},
|
|
},
|
|
// 使用提交数据类型的按钮获取数据
|
|
// 使用提交数据类型的按钮获取数据
|
|
@@ -2091,10 +2114,10 @@ export default {
|
|
|
|
|
|
// 操作列回调
|
|
// 操作列回调
|
|
excuteHandler(btnData, row) {
|
|
excuteHandler(btnData, row) {
|
|
- console.log("btnData", btnData, row);
|
|
|
|
let { btnType, btnParams, btnFormType } = btnData;
|
|
let { btnType, btnParams, btnFormType } = btnData;
|
|
this.currentBtnData = btnData;
|
|
this.currentBtnData = btnData;
|
|
this.currentRow = JSON.parse(JSON.stringify(row));
|
|
this.currentRow = JSON.parse(JSON.stringify(row));
|
|
|
|
+ console.log("btnData", btnType, btnData, row);
|
|
// 无表单
|
|
// 无表单
|
|
if (btnFormType == "noNeed") {
|
|
if (btnFormType == "noNeed") {
|
|
this.noNeedHandler(btnData, row);
|
|
this.noNeedHandler(btnData, row);
|