diff --git a/src/api/shopOrder/shopOrder.js b/src/api/shopOrder/shopOrder.js
index a9c0927..a14d0fe 100644
--- a/src/api/shopOrder/shopOrder.js
+++ b/src/api/shopOrder/shopOrder.js
@@ -30,6 +30,7 @@ export const searchProductionDispatchList = data => createAPI(`/shopOrder/search
// -------------查询-生产订单--------------
export const searchShopOrder = data => createAPI(`/shopOrder/searchShopOrder`, 'post', data)
+export const searchShopOrderByPaging = data => createAPI(`/shopOrder/searchShopOrderByPaging`, 'post', data)
// -------------生产订单--------------
export const getShopOrderData = data => createAPI(`/shopOrder/getShopOrderData`, 'post', data)
diff --git a/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue b/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue
index 4b7ffb1..5fe5fa1 100644
--- a/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue
+++ b/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue
@@ -42,16 +42,7 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -136,11 +139,22 @@
-
+
+
+
+
{{ labels.shopOrderCountQty}}
-
+
{{ labels.inStockedQty }}
-
+
@@ -164,7 +178,8 @@
} from "@/api/table.js";
import {
- searchShopOrder
+ searchShopOrder,
+ searchShopOrderByPaging
} from "@/api/shopOrder/shopOrder.js";
import {
@@ -184,8 +199,7 @@
- //var cityOptions = ['已计划', '已下达', '已排产', '已发料', '已入库', '已关闭', '已取消', '已停工', '已开工'];
- let cityOptions = [];
+
export default {
//查询-生产订单
name: "searchShopOrder",
@@ -220,6 +234,7 @@
projectNo: '项目编码：',
shopOrderRemark: '销售订单备注：',
orderNo: '生产订单号：',
+ status: '生产订单状态：',
shopOrder: '销售订单号：',
isMaterialIssued: '是否排料：',
materialStatus: '物料状态',
@@ -237,7 +252,7 @@
otherProduct: '其他',
planedLabel: '已计划',
releasedLabel: '已下达',
- scheduledLabel: '已计划',
+ scheduledLabel: '已排产',
materialIssuedLabel: '已发料',
inStockedLabel: '已入库',
closedLabel: '已关闭',
@@ -263,17 +278,15 @@
exportHeader: ["查询生产订单"],
exportFooter: [],
// 导出 end
- checkAll: true,
- checkedCities: [],
- // checkedCities: [this.labels.planedLabel, this.labels.releasedLabel, this.labels.scheduledLabel, this.labels.materialIssuedLabel, this.labels.inStockedLabel, this.labels.closedLabel, this.labels.canceledLabel, this.labels.stoppedLabel, this.labels.startedLabel],
- cities: cityOptions,
- isIndeterminate: true,
height: 200,
modelFlag:false,
modelInputFlag:true,
selectList:[],
sum1:0,
sum2:0,
+ pageIndex: 1,
+ pageSize: 20,
+ totalPage: 0,
searchData: {
orderType:'',
planner:'',
@@ -287,11 +300,14 @@
orderRef1:'',
costRollUpFlag:'',
status:'',
+ orderStatus:'',
date1:'',
date2:'',
date3:'',
date4:'',
- user:this.$store.state.user.name
+ user:this.$store.state.user.name,
+ page: 1,
+ limit: 20,
},
dataList:[],
dataListLoading: false,
@@ -461,10 +477,10 @@
{
userId: this.$store.state.user.name,
functionId: 6028,
- serialNumber: '6028TableXXX',
+ serialNumber: '6028TableStatus',
tableId: "6028Table",
tableName: "查询生产订单表",
- columnProp: "XXX",
+ columnProp: "status",
headerAlign: "center",
align: "left",
columnLabel: "订单状态",
@@ -479,10 +495,28 @@
{
userId: this.$store.state.user.name,
functionId: 6028,
- serialNumber: '6028TableStatus',
+ serialNumber: '6028TableBatchNo',
tableId: "6028Table",
tableName: "查询生产订单表",
- columnProp: "status",
+ columnProp: "batchNo",
+ headerAlign: "center",
+ align: "left",
+ columnLabel: "合约号码",
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 160
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 6028,
+ serialNumber: '6028TableCustomerName',
+ tableId: "6028Table",
+ tableName: "查询生产订单表",
+ columnProp: "customerName",
headerAlign: "center",
align: "left",
columnLabel: "客户名称",
@@ -1196,43 +1230,49 @@
this.$refs.baseList.init(val,strVal)
})
},
- handleCheckAllChange(val) {
- this.checkedCities = val ? cityOptions : [];
- this.isIndeterminate = false;
- },
- handleCheckedCitiesChange(value) {
- let checkedCount = value.length;
- this.checkAll = checkedCount === this.cities.length;
- this.isIndeterminate = checkedCount > 0 && checkedCount < this.cities.length;
- },
getData(){
- if(this.checkedCities.length==0){
- this.$alert(this.labels.pleaseSelectOrderStatus, this.labels.errorInfo, {
- confirmButtonText: this.labels.confirmLabel
- })
- }
- let newStr='(';
- for (let i = 0; i < this.checkedCities.length-1; i++) {
- newStr+='\''+this.checkedCities[i]+'\','
+ // 如果选择了状态，则构建查询条件
+ if(this.searchData.status && this.searchData.status !== ''){
+ this.searchData.status = this.searchData.status;
+ } else {
+ // 如果没有选择状态，则查询所有状态
+ this.searchData.status = '';
}
- newStr+='\''+this.checkedCities[this.checkedCities.length-1]+'\')';
- this.searchData.status=newStr;
- searchShopOrder(this.searchData).then(({data}) => {
- this.dataList = data.rows;
- this.sum1=0;
- this.sum2=0;
- if(this.dataList.length==0){
+ this.searchData.limit = this.pageSize
+ this.searchData.page = this.pageIndex
+ searchShopOrderByPaging(this.searchData).then(({data}) => {
+ if (data.code === 0) {
+ this.dataList = data.page.list
+ this.pageIndex = data.page.currPage
+ this.pageSize = data.page.pageSize
+ this.totalPage = data.page.totalCount
+
+ //this.dataList = data.rows;
this.sum1=0;
this.sum2=0;
- }else {
+ if(this.dataList.length==0){
+ this.sum1=0;
+ this.sum2=0;
+ }else {
- for (let i = 0; i < this.dataList.length; i++) {
- this.sum2 =this.decimalUtil.add(this.sum2,this.dataList[i].lotSize);
- this.sum2 =this.decimalUtil.add(this.sum2,this.dataList[i].finishedQty);
+ for (let i = 0; i < this.dataList.length; i++) {
+ this.sum2 =this.decimalUtil.add(this.sum2,this.dataList[i].lotSize);
+ this.sum2 =this.decimalUtil.add(this.sum2,this.dataList[i].finishedQty);
+ }
}
}
})
},
+ // 分页处理
+ sizeChangeHandle(val) {
+ this.pageSize = val
+ this.pageIndex = 1
+ this.getData()
+ },
+ currentChangeHandle(val) {
+ this.pageIndex = val
+ this.getData()
+ },
//导出excel
createExportData() {
@@ -1379,19 +1419,8 @@
}
});
//重置页面的固定参数
- this.loadOrderStatusData();
},
- //加载相关数据
- loadOrderStatusData(){
- //重置对象
- this.cityOptions = [this.labels.planedLabel, this.labels.releasedLabel, this.labels.scheduledLabel, this.labels.materialIssuedLabel, this.labels.inStockedLabel,
- this.labels.closedLabel, this.labels.canceledLabel, this.labels.stoppedLabel, this.labels.startedLabel];
-
- this.checkedCities = [this.labels.planedLabel, this.labels.releasedLabel, this.labels.scheduledLabel, this.labels.materialIssuedLabel, this.labels.inStockedLabel,
- this.labels.closedLabel, this.labels.canceledLabel, this.labels.stoppedLabel, this.labels.startedLabel];
- }
-
},
created() {
this.getMultiLanguageList();//刷新多语言的信息