diff --git a/src/views/bst/order/edit/components/orderProdList.vue b/src/views/bst/order/edit/components/orderProdList.vue index 804afcd..a14b515 100644 --- a/src/views/bst/order/edit/components/orderProdList.vue +++ b/src/views/bst/order/edit/components/orderProdList.vue @@ -29,6 +29,9 @@ + + + diff --git a/src/views/bst/order/edit/edit.vue b/src/views/bst/order/edit/edit.vue index 7a19526..5467ec9 100644 --- a/src/views/bst/order/edit/edit.vue +++ b/src/views/bst/order/edit/edit.vue @@ -139,7 +139,7 @@ export default { methods: { // 下载导入模板 downloadTemplate() { - window.open('https://api.ccttiot.com/伟旺-生产订单导入模板-1740733089263.xlsx', '_blank'); + window.open('https://api.ccttiot.com/伟旺-生产订单导入模板-1741308962476.xlsx', '_blank'); }, handleImportSuccess(data) { let head = data.head; diff --git a/src/views/bst/order/view/view.vue b/src/views/bst/order/view/view.vue index d13d53d..ee7f8fc 100644 --- a/src/views/bst/order/view/view.vue +++ b/src/views/bst/order/view/view.vue @@ -84,7 +84,7 @@
未完成数
-
{{ detail.totalNum - detail.reportNum | dv }}
+
{{ detail.totalNum - detail.reportNum - detail.num | dv }}
diff --git a/src/views/bst/orderProd/components/ProdTable.vue b/src/views/bst/orderProd/components/ProdTable.vue index aa17238..6ba79b9 100644 --- a/src/views/bst/orderProd/components/ProdTable.vue +++ b/src/views/bst/orderProd/components/ProdTable.vue @@ -95,6 +95,7 @@ export default { {key: 'picture', visible: true, label: '图片', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"}, {key: 'name', visible: true, label: '产品名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'workType', visible: true, label: '加工商', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"}, + {key: 'contractNo', visible: true, label: '合同单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"}, {key: 'materialNo', visible: true, label: '物料编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: true, align: 'center', width: null}, {key: 'isEnd', visible: true, label: '成品', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, diff --git a/src/views/bst/orderProd/index.vue b/src/views/bst/orderProd/index.vue index 195de74..4b8cb13 100644 --- a/src/views/bst/orderProd/index.vue +++ b/src/views/bst/orderProd/index.vue @@ -19,6 +19,14 @@ /> + + + 全部 diff --git a/src/views/bst/prodProcess/index.vue b/src/views/bst/prodProcess/index.vue index b56cfee..33941e7 100644 --- a/src/views/bst/prodProcess/index.vue +++ b/src/views/bst/prodProcess/index.vue @@ -128,7 +128,6 @@ :sum="sum" @view="handleView" @selection-change="handleSelectionChange" - @sort-change="onSortChange" />