|
|
@@ -94,15 +94,15 @@
|
|
|
:header-cell-style="{ padding: '0px' }"
|
|
|
:show-overflow-tooltip="true"
|
|
|
highlight-current-row="true"
|
|
|
- @row-click="ystableclick"
|
|
|
+ @row-click="tableclick"
|
|
|
@row-dblclick="ysupdateCompanyFunc"
|
|
|
- style="width: 100%;height: 36vh" border show-summary
|
|
|
- :summary-method="getSummaries" tooltip-effect="dark" :data="ystableData" row-key="ID" >
|
|
|
+ style="width: 100%;height: 36vh" border
|
|
|
+ :summary-method="getSummaries" tooltip-effect="dark" :data="cktableData" row-key="ID" >
|
|
|
<el-table-column align="left" sortable label="订单编号" prop="订单编号" width="140"/>
|
|
|
<el-table-column align="left" sortable label="款号" prop="款号" width="180"/>
|
|
|
<el-table-column align="left" sortable label="数量" prop="数量" width="105"/>
|
|
|
- <el-table-column align="left" sortable label="出库时间" prop="出库时间" width="105"/>
|
|
|
- <el-table-column align="left" sortable label="上报机台" prop="上报机台" width="120"/>
|
|
|
+ <el-table-column align="left" sortable label="出库时间" prop="出库时间" width="160"/>
|
|
|
+ <el-table-column align="left" sortable label="上报机台" prop="上报机台" width="160"/>
|
|
|
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
@@ -118,12 +118,12 @@
|
|
|
@row-dblclick="gdgyupdateCompanyFunc"
|
|
|
@row-click="clickybupdate2"
|
|
|
:row-class-name="rowClassStyle2"
|
|
|
- style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="gytableData" row-key="ID">
|
|
|
+ style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="thtableData" row-key="ID">
|
|
|
<el-table-column align="left" sortable label="订单编号" prop="订单编号" width="140"/>
|
|
|
<el-table-column align="left" sortable label="款号" prop="款号" width="180"/>
|
|
|
<el-table-column align="left" sortable label="数量" prop="数量" width="105"/>
|
|
|
- <el-table-column align="left" sortable label="出库时间" prop="出库时间" width="105"/>
|
|
|
- <el-table-column align="left" sortable label="上报机台" prop="上报机台" width="120"/>
|
|
|
+ <el-table-column align="left" sortable label="出库时间" prop="出库时间" width="160"/>
|
|
|
+ <el-table-column align="left" sortable label="上报机台" prop="上报机台" width="160"/>
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
|
@@ -151,7 +151,7 @@ export default {
|
|
|
// 全量引入格式化工具 请按需保留
|
|
|
import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
|
|
|
import {ref, reactive} from 'vue'
|
|
|
-import {getSpotList,getSpotTab,orderSearch,outReport,orderBomList} from '@/api/mes/job'
|
|
|
+import {getSpotList,getSpotTab,orderSearch,outReport,orderBomList,FabricDetail} from '@/api/mes/job'
|
|
|
import {ElMessage} from "element-plus";
|
|
|
// import { get } from 'scriptjs';
|
|
|
defineOptions({name: 'Company'})
|
|
|
@@ -312,7 +312,7 @@ const res_bomenterDialog = async() => {
|
|
|
order_id: ddhformData.ddh,
|
|
|
款号: ddhformData.kh,
|
|
|
物料名称: item.物料名称 !== null ? item.物料名称 : "",
|
|
|
- number: item.领用 !== null ? item.领用 : "",
|
|
|
+ number: item.领用 ?? "0",
|
|
|
rq: currentDate,
|
|
|
name: "出库",
|
|
|
sys_id: _username.value
|
|
|
@@ -336,13 +336,18 @@ const res_bomcloseDialog = () => {
|
|
|
|
|
|
|
|
|
//=============出库退还记录==================
|
|
|
+const cktableData = reactive([])
|
|
|
+const thtableData = reactive([])
|
|
|
const pickingaddvisible = ref(false)//弹窗
|
|
|
// const detailData = reactive({})
|
|
|
const add_prinkformData = reactive({});
|
|
|
//详情按钮
|
|
|
const details_onSubmit = async ()=>{
|
|
|
pickingaddvisible.value = true
|
|
|
-
|
|
|
+ const FabricDetaillist = await FabricDetail({order:_orderid.value});
|
|
|
+ console.log(FabricDetaillist)
|
|
|
+ cktableData.splice(0,FabricDetaillist.length,...FabricDetaillist.data['出库记录']);
|
|
|
+ thtableData.splice(0,FabricDetaillist.length,...FabricDetaillist.data['退还记录']);
|
|
|
}
|
|
|
//领料取消
|
|
|
const ckth_closeDialog = async ()=>{
|
