From bb1368e4c5154b006b2e678261cbfa01e317b3b6 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 21 十一月 2024 16:38:53 +0800
Subject: [PATCH] 1.订单工单 新增重量、总料 字段
---
src/views/workOrder/produceOrderList.vue | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 280 insertions(+), 5 deletions(-)
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index 4b78001..af352e4 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -12,6 +12,14 @@
<div style="display: flex">
<el-button
v-waves
+ type="success"
+ icon="el-icon-download"
+ @click="download"
+ >瀵煎嚭瀛愪欢
+ </el-button>
+
+ <el-button
+ v-waves
type="primary"
icon="el-icon-bottom"
@click="batchHandle"
@@ -288,6 +296,26 @@
>
<template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
</el-table-column>
+
+ <el-table-column
+ prop="weight"
+ label="閲嶉噺"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="totalnumber"
+ label="鎬绘枡"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template>
+ </el-table-column>
+
<el-table-column
prop="clerkuser"
label="閿�鍞笟鍔″憳"
@@ -375,7 +403,7 @@
<el-table-column
label="鎿嶄綔"
fixed="right"
- width="120"
+ width="150"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -405,6 +433,16 @@
@click="orderDel(row.id)"
/>
</el-tooltip>
+
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鏄庣粏" placement="top">
+ <i
+ class="el-icon-tickets"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-left: 15px"
+ @click="orderDetail(row.sbid)"
+ />
+ </el-tooltip>
+
</div>
</template>
</el-table-column>
@@ -499,6 +537,19 @@
/>
</el-form-item>
+ <el-form-item label="閲嶉噺">
+ <el-input
+ v-model="dialogForm.weight"
+ style="width: 200px"
+ />
+ </el-form-item>
+ <el-form-item label="鎬绘枡">
+ <el-input
+ v-model="dialogForm.totalnumber"
+ style="width: 200px"
+ />
+ </el-form-item>
+
<el-form-item label="閿�鍞笟鍔″憳" prop="">
<el-input
v-model="dialogForm.clerkuser"
@@ -533,6 +584,157 @@
</div>
</span>
</el-dialog>
+
+ <!-- 鏄庣粏-->
+ <el-dialog
+ v-el-drag-dialog
+ title="鏄庣粏"
+ :visible.sync="dialogDetailVisible"
+ width="1500px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleDetailClose"
+ @close="handleDetailClose"
+ >
+
+ <div>
+
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableDataDetail"
+ height="500px"
+ border
+ row-class-name="custom-row"
+ :style="{width: 100+'%',height:'500px'}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange2"
+ >
+ <el-table-column
+ prop="rowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="SortSeq"
+ label="瀛愪欢琛屽彿"
+ show-overflow-tooltip
+ min-width="105"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partcode"
+ label="瀛愪欢缂栫爜"
+ show-overflow-tooltip
+ min-width="105"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partname"
+ label="瀛愪欢鍚嶇О"
+ sortable="custom"
+ show-overflow-tooltip
+ min-width="105"
+ />
+ <el-table-column
+ prop="partspec"
+ label="瀛愪欢瑙勬牸"
+ show-overflow-tooltip
+ min-width="105"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ row.partspec?row.partspec:'/' }}
+ </template>
+ </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="stockcode"-->
+ <!-- label="浠撳簱缂栫爜"-->
+ <!-- show-overflow-tooltip-->
+ <!-- width="105"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <el-table-column
+ prop="stockname"
+ label="浠撳簱鍚嶇О"
+ show-overflow-tooltip
+ min-width="105"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="unitname"
+ label="璁￠噺鍗曚綅"
+ show-overflow-tooltip
+ min-width="105"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="BaseQtyN"
+ label="鍩烘湰鐢ㄩ噺"
+ show-overflow-tooltip
+ min-width="105"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="BaseQtyD"
+ label="鍩虹鏁伴噺"
+ show-overflow-tooltip
+ min-width="105"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="CompScrap"
+ label="瀛愪欢鎹熻�楃巼(%)"
+ show-overflow-tooltip
+ min-width="140"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="exqty"
+ label="浣跨敤鏁伴噺"
+ show-overflow-tooltip
+ min-width="105"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="Qty"
+ min-width="105"
+ label="搴旈鏁伴噺"
+ show-overflow-tooltip
+ sortable="custom"
+ />
+ </el-table>
+
+ <!--鍒嗛〉-->
+ <pagination
+ style="margin-top: 10px;"
+ :total="tableDataDetailTotal"
+ :page.sync="formDetail.page"
+ :limit.sync="formDetail.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes,jumper"
+ popper-class="select_bottom"
+ @pagination="getErpOrderSubItemSearch"
+ />
+ </div>
+
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="dialogVisibleDetailCancel">杩� 鍥�</el-button>
+ <!-- <el-button-->
+ <!-- v-waves-->
+ <!-- type="primary"-->
+ <!-- :loading="$store.state.app.buttonIsDisabled"-->
+ <!-- :disabled="$store.state.app.buttonIsDisabled"-->
+ <!-- @click="dialogVisibleDeatilConfirm"-->
+ <!-- >纭� 瀹�</el-button>-->
+ </div>
+ </span>
+ </el-dialog>
+
</div>
</template>
@@ -543,8 +745,8 @@
import waves from '@/directive/waves'
import {
ClosedErpOrder,
- DeleteErpOrder,
- ErpOrderSearch,
+ DeleteErpOrder, ErpOrderExcelSearch,
+ ErpOrderSearch, ErpOrderSubItemSearch,
MarkBatchSaveErpOrder,
MarkSaveErpOrder
} from '@/api/WorkOrder'
@@ -632,7 +834,10 @@
'injectnumber': '', // 娉ㄥ鏈哄彿
'customercode': '', // 瀹㈡埛缂栧彿
'customername': '', // 瀹㈡埛鍚嶇О
- 'colour': ''// 棰滆壊
+ 'colour': '', // 棰滆壊
+
+ weight: '', // 閲嶉噺
+ totalnumber: ''// 鎬绘枡
},
operation: '',
@@ -659,7 +864,18 @@
return time.getTime() < Date.now() - 8.64e7
}
},
- multipleSelection: []
+ multipleSelection: [],
+
+ dialogDetailVisible: false,
+ tableDataDetail: [],
+ tableDataDetailTotal: 10,
+ formDetail: {
+ MoDID: '', // 鐢熶骇璁㈠崟鏄庣粏ID
+ prop: 'SortSeq', // 鎺掑簭瀛楁
+ order: 'asc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ }
// expireTimeOption: {
// disabledDate(time) {
@@ -680,6 +896,49 @@
this.getHeight()
},
methods: {
+ // 璁㈠崟瀵煎嚭
+ async download() {
+ const res = await ErpOrderExcelSearch(this.form)
+ window.location.href = res.data
+ },
+ // 鏄庣粏
+ orderDetail(val) {
+ this.formDetail.MoDID = val
+ this.getErpOrderSubItemSearch()
+ this.dialogDetailVisible = true
+ },
+ // 鑾峰彇鏄庣粏鎺ュ彛
+ async getErpOrderSubItemSearch() {
+ const res = await ErpOrderSubItemSearch(this.formDetail)
+ this.tableDataDetail = res.data
+ this.tableDataDetailTotal = res.count
+ },
+ handleDetailClose() {
+ this.tableDataDetail = []
+ this.formDetail = {
+ MoDID: '', // 鐢熶骇璁㈠崟鏄庣粏ID
+ prop: 'SortSeq', // 鎺掑簭瀛楁
+ order: 'asc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ }
+ },
+ dialogVisibleDetailCancel() {
+ this.dialogDetailVisible = false
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange2({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getErpOrderSearch()
+ },
async getPrentOrganizationNoCompany() {
const { data: res } = await PrentOrganizationNoCompany()
this.wkshopcodeArr = res
@@ -778,6 +1037,7 @@
this.form.payenddate = ''
this.form.creatuser = ''
this.form.erpordercode = ''
+ this.form.saleordercode = ''
this.form.createdate = ''
this.getErpOrderSearch()
},
@@ -868,6 +1128,8 @@
'customercode': i.customercode,
'customername': i.customername,
'colour': i.colour,
+ 'weight': i.weight,
+ 'totalnumber': i.totalnumber,
// 'saleOrderDeliveryDate': i.saleOrderDeliveryDate
'saleOrderDeliveryDate': handleDatetime(new Date()) + ' 00:00:00'
})
@@ -934,6 +1196,9 @@
this.dialogForm.customercode = row.customercode
this.dialogForm.customername = row.customername
this.dialogForm.colour = row.colour
+
+ this.dialogForm.weight = row.weight
+ this.dialogForm.totalnumber = row.totalnumber
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -958,6 +1223,14 @@
markqty: '', // 涓嬪崟鏁伴噺
ordernum: '', // 涓嬪崟鍗曟暟
relse_qty: '', // 宸蹭笅鍗曟暟閲�
+
+ injectnumber: '',
+ customercode: '',
+ customername: '',
+ colour: '',
+
+ weight: '',
+ totalnumber: '',
saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
}
@@ -1001,6 +1274,8 @@
'customercode': this.dialogForm.customercode, // 瀹㈡埛缂栧彿
'customername': this.dialogForm.customername, // 瀹㈡埛鍚嶇О
'colour': this.dialogForm.colour, // 棰滆壊
+ 'weight': this.dialogForm.weight, // 棰滆壊
+ 'totalnumber': this.dialogForm.totalnumber, // 棰滆壊
'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
}
--
Gitblit v1.9.3