|
|
@@ -1,23 +1,20 @@
|
|
|
<template>
|
|
|
- <div>
|
|
|
- <layout>
|
|
|
- <layout-content >
|
|
|
- <el-main>
|
|
|
- <div class="gva-table-box">
|
|
|
- <h1 style="margin: 0%;margin-bottom: 10px;">裁切完工报工</h1>
|
|
|
- <el-row :gutter="24" style="margin-bottom: 20px;">
|
|
|
+ <div>
|
|
|
+ <layout>
|
|
|
+ <layout-content >
|
|
|
+ <div class="gva-table-box">
|
|
|
+ <h1 style="margin: 0%;margin-bottom: 10px;">裁切完工报工</h1>
|
|
|
+ <el-row :gutter="24" style="margin-bottom: 5px;">
|
|
|
<el-input v-model="add_searchInfo" placeholder="扫描订单编号获取订单信息"
|
|
|
@keyup.enter="add_onSubmit"
|
|
|
id="searchInput"
|
|
|
- style="width: 270px;margin: 5px;height: 50px;">
|
|
|
+ style="width: 230px;margin: 5px;height: 50px;">
|
|
|
</el-input>
|
|
|
<el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>
|
|
|
-
|
|
|
-
|
|
|
</el-row>
|
|
|
|
|
|
<el-row :gutter="24">
|
|
|
- <el-form-item label="尺码:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 10px;">
|
|
|
+ <el-form-item label="尺码:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 5px;">
|
|
|
<el-input v-model="cmformdata.cm1" disabled style="width: 90px;height: 40px;"/>
|
|
|
<el-input v-model="cmformdata.cm2" disabled style="width: 90px;height: 40px;"/>
|
|
|
<el-input v-model="cmformdata.cm3" disabled style="width: 90px;height: 40px;"/>
|
|
|
@@ -33,7 +30,7 @@
|
|
|
</el-row>
|
|
|
|
|
|
<el-row :gutter="24">
|
|
|
- <el-form-item label="制单数" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 10px;">
|
|
|
+ <el-form-item label="制单数" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin:5px;">
|
|
|
<el-input v-model="zdsformdata.zds1" disabled style="width: 90px;height: 40px;" id="zds1"/>
|
|
|
<el-input v-model="zdsformdata.zds2" disabled style="width: 90px;height: 40px;" id="zds2"/>
|
|
|
<el-input v-model="zdsformdata.zds3" disabled style="width: 90px;height: 40px;" id="zds3"/>
|
|
|
@@ -49,7 +46,7 @@
|
|
|
</el-row>
|
|
|
|
|
|
<el-row :gutter="24">
|
|
|
- <el-form-item label="实裁数" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 10px;">
|
|
|
+ <el-form-item label="实裁数" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 5px;">
|
|
|
<el-input v-model="scsformdata.scs1" style="width: 90px;height: 40px;" id="scs1" @keydown="handleKeyDown($event, 'scs10', 'scs1', 'scs2')"/>
|
|
|
<el-input v-model="scsformdata.scs2" style="width: 90px;height: 40px;" id="scs2" @keydown="handleKeyDown($event, 'scs1', 'scs2', 'scs3')"/>
|
|
|
<el-input v-model="scsformdata.scs3" style="width: 90px;height: 40px;" id="scs3"/>
|
|
|
@@ -66,8 +63,8 @@
|
|
|
|
|
|
<el-row :gutter="24" style="margin-bottom: 15px;">
|
|
|
<el-table ref="multipleTable" style="width: 100%;height: 41vh" tooltip-effect="dark"
|
|
|
- :row-style="{ height: '20px' }" :header-cell-style="{ padding: '0px' }"
|
|
|
- :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
+ :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
|
|
|
+ :cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
|
|
|
:data="add_tableData" border row-key="ID"
|
|
|
size="small"
|
|
|
highlight-current-row="true" @row-dblclick="updateCompanyFunc"
|
|
|
@@ -75,16 +72,16 @@
|
|
|
@selection-change="handleSelectionChange">
|
|
|
<!-- <el-table-column type="selection" width="55" /> -->
|
|
|
<el-table-column sortable align="center" label="订单编号" prop="订单编号" width="120"/>
|
|
|
- <el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="120"/>
|
|
|
+ <el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="130"/>
|
|
|
<el-table-column sortable align="left" label="生产款号" prop="生产款号" width="120" />
|
|
|
<el-table-column sortable align="left" label="款式" prop="款式" width="110" />
|
|
|
<el-table-column sortable align="left" label="颜色" prop="颜色" width="80" />
|
|
|
- <el-table-column sortable align="left" label="制单总数" prop="制单总数" width="100" />
|
|
|
- <el-table-column sortable align="left" label="实裁总数" prop="实裁总数" width="110" />
|
|
|
+ <el-table-column sortable align="left" label="制单总数" prop="zdtotal" width="110" />
|
|
|
+ <el-table-column sortable align="left" label="实裁总数" prop="sctotal" width="110" />
|
|
|
<el-table-column sortable align="left" label="单位" prop="单位" width="80" />
|
|
|
- <el-table-column sortable align="left" label="工序" prop="工序" width="80" />
|
|
|
- <el-table-column sortable align="left" label="验片人" prop="验片人" width="90" />
|
|
|
- <el-table-column sortable align="left" label="日期" prop="日期" width="120" />
|
|
|
+ <!-- <el-table-column sortable align="left" label="工序" prop="工序" width="80" /> -->
|
|
|
+ <el-table-column sortable align="left" label="验片人" prop="Sys_id" width="100" />
|
|
|
+ <el-table-column sortable align="left" label="日期" prop="Sys_rq" width="160" />
|
|
|
</el-table>
|
|
|
</el-row>
|
|
|
<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
|
|
|
@@ -101,7 +98,7 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
- </el-main>
|
|
|
+ <!-- </el-main> -->
|
|
|
</layout-content>
|
|
|
</layout>
|
|
|
</div>
|
|
|
@@ -308,25 +305,32 @@ const add_Dialog = async ()=>{
|
|
|
if(_order.value === ''){
|
|
|
ElMessage({type: 'warning',message: '请扫描子订单后，再操作此功能'})
|
|
|
}else{
|
|
|
- let params = {}
|
|
|
- for (let i = 1; i <= 10; i++) {
|
|
|
- const key = `scs${i}`; // 动态构建键名
|
|
|
- if (scsformdata.hasOwnProperty(key)) { // 检查 scsformdata 是否包含该属性
|
|
|
- params[key] = scsformdata[key]; // 将属性复制到 params
|
|
|
- }
|
|
|
- }
|
|
|
- params.sctotal = scsformdata['sctotal'];
|
|
|
- params.order = _order.value;
|
|
|
- console.log(params)
|
|
|
- // const ck_gettab = await getSpotTab(params);
|
|
|
- // if (ck_gettab.code === 0) {
|
|
|
- // ElMessage({type: 'success',message: '出库成功'});
|
|
|
- // const getSpotToLists = await getSpotToList();
|
|
|
- // add_tableData.splice(0,add_tableData.length,...getSpotToLists.data.data);//表格数据
|
|
|
- // add_searchInfo.value = ''
|
|
|
- // } else {
|
|
|
- // ElMessage({ type: 'error',message: '出库失败'})
|
|
|
- // }
|
|
|
+ if (_order.value.indexOf('-') !== -1) {
|
|
|
+ let params = {}
|
|
|
+ for (let i = 1; i <= 10; i++) {
|
|
|
+ const key = `scs${i}`; // 动态构建键名
|
|
|
+ if (scsformdata.hasOwnProperty(key)) { // 检查 scsformdata 是否包含该属性
|
|
|
+ params[key] = scsformdata[key]; // 将属性复制到 params
|
|
|
+ }
|
|
|
+ }
|
|
|
+ params.sctotal = scsformdata['sctotal'];
|
|
|
+ params.order = _order.value;//子订单编号
|
|
|
+ params.rq = currentDates;//时间
|
|
|
+ console.log(params)
|
|
|
+ //裁切完工报工
|
|
|
+ // const baogong_getInfo = await getInfo(params);
|
|
|
+ // if (baogong_getInfo.code === 0) {
|
|
|
+ // ElMessage({type: 'success',message: '报工成功'});
|
|
|
+ // const getSpotToLists = await getSpotToList();
|
|
|
+ // add_tableData.splice(0,add_tableData.length,...getSpotToLists.data.data);
|
|
|
+ // add_searchInfo.value = ''
|
|
|
+ // } else {
|
|
|
+ // ElMessage({ type: 'error',message: '出库失败'})
|
|
|
+ // }
|
|
|
+ } else {
|
|
|
+ ElMessage({type: 'warning',message: '请扫描子订单后，再操作此功能'})
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
