|
@@ -110,6 +110,16 @@
|
|
|
>导出
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
+ <el-radio-group
|
|
|
+ style="margin-left: 100px"
|
|
|
+ v-model="orderType"
|
|
|
+ size="mini"
|
|
|
+ @change="orderTypeChange"
|
|
|
+ >
|
|
|
+ <el-radio-button :label="0">全部</el-radio-button>
|
|
|
+ <el-radio-button :label="1">库存</el-radio-button>
|
|
|
+ <el-radio-button :label="2">生产</el-radio-button>
|
|
|
+ </el-radio-group>
|
|
|
<right-toolbar
|
|
|
:showCount.sync="showCount"
|
|
|
:showSearch.sync="showSearch"
|
|
@@ -217,12 +227,12 @@
|
|
|
class-name="small-padding fixed-width"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button
|
|
|
+ <!-- <el-button
|
|
|
type="info"
|
|
|
size="default"
|
|
|
@click="handleEdit(scope.$index, scope.row)"
|
|
|
>编辑</el-button
|
|
|
- >
|
|
|
+ > -->
|
|
|
|
|
|
<Menu
|
|
|
:row="scope.row"
|
|
@@ -609,6 +619,7 @@ import {
|
|
|
addTableData,
|
|
|
batchEdit,
|
|
|
getStatisticList,
|
|
|
+ getTableList1,
|
|
|
} from "@/api/tablelist/commonTable";
|
|
|
import { listData } from "@/api/system/tenant/data";
|
|
|
import { getToken } from "@/utils/auth";
|
|
@@ -631,6 +642,7 @@ export default {
|
|
|
// k-form-build组件渲染弹窗
|
|
|
kOpen: false,
|
|
|
// 新的自定义数据 start
|
|
|
+ orderType: 0, //新的条件查询参数
|
|
|
productIds: [], //货品Ids
|
|
|
isEdit: false,
|
|
|
formData: {
|
|
@@ -735,6 +747,7 @@ export default {
|
|
|
pageSize: 10, // 每页大小
|
|
|
orderByColumn: "", // 根据某列排序
|
|
|
isAsc: "", // desc(降序)或 asc(升序)
|
|
|
+ saleOrderOrderType: "",
|
|
|
// 基本查询参数
|
|
|
basicMap: {
|
|
|
tableName: "drag_form",
|
|
@@ -802,6 +815,8 @@ export default {
|
|
|
}),
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 订单类型改变回调
|
|
|
+ orderTypeChange(type) {},
|
|
|
// 重置审计表单数据
|
|
|
resetFormData() {
|
|
|
Object.assign(this.formData, {
|
|
@@ -957,6 +972,23 @@ export default {
|
|
|
});
|
|
|
// 获取操作列的按钮数据
|
|
|
this.excuteBtnArr = res.data.resultMap.button;
|
|
|
+ console.log(this.excuteBtnArr);
|
|
|
+ this.excuteBtnArr[0].children.push(
|
|
|
+ {
|
|
|
+ btnName: "编辑",
|
|
|
+ btnType: "myEdit",
|
|
|
+ btnIcon: "",
|
|
|
+ btnShowCondition: "",
|
|
|
+ children: [],
|
|
|
+ },
|
|
|
+ {
|
|
|
+ btnName: "详情",
|
|
|
+ btnType: "myDetail",
|
|
|
+ btnIcon: "",
|
|
|
+ btnShowCondition: "",
|
|
|
+ children: [],
|
|
|
+ }
|
|
|
+ );
|
|
|
this.queryParams.orderByColumn =
|
|
|
res.data.resultMap.querySql.orderByColumn;
|
|
|
this.sortOrder = JSON.parse(res.data.resultMap.querySql.sortOrder);
|
|
@@ -1240,7 +1272,11 @@ export default {
|
|
|
(this.formData.saleOrderEstimatedTime = saleOrderEstimatedTime);
|
|
|
this.productionTableData = sale_products;
|
|
|
this.productIds = sale_products.map((item) => item.saleProductNo);
|
|
|
+
|
|
|
await this.getDropDownData();
|
|
|
+ if (this.formData.saleCustomNo) {
|
|
|
+ this.customChangeHandler(this.formData.saleCustomNo);
|
|
|
+ }
|
|
|
this.title = "编辑审计单";
|
|
|
this.open = true;
|
|
|
}
|
|
@@ -2120,6 +2156,9 @@ export default {
|
|
|
window.open("http://" + url, "_blank");
|
|
|
}
|
|
|
},
|
|
|
+ handleDetail(row) {
|
|
|
+ console.log(row);
|
|
|
+ },
|
|
|
|
|
|
// 操作列回调
|
|
|
excuteHandler(btnData, row) {
|
|
@@ -2151,6 +2190,12 @@ export default {
|
|
|
case "DELETE":
|
|
|
this.handleDelete(row, btnData);
|
|
|
break;
|
|
|
+ case "myEdit":
|
|
|
+ this.handleEdit("1", row);
|
|
|
+ break;
|
|
|
+ case "myDetail":
|
|
|
+ this.handleDetail(row);
|
|
|
+ break;
|
|
|
default:
|
|
|
break;
|
|
|
}
|