|
|
@@ -19,19 +19,19 @@
|
|
|
<el-button type="primary" icon="edit" @click="cp_gdprintonClick" class="bt" title="打印生产工单" >工单打印</el-button>
|
|
|
<el-button type="primary" icon="edit" @click="gd_gxclhconClick" class="bt" title="工序产量核查">工序产量核查</el-button>
|
|
|
<el-button type="primary" icon="edit" @click="gdlcdcxconlick" class="bt" title="流程单查询">流程单查询</el-button>
|
|
|
- <el-button type="primary" icon="edit" @click="addgd_onclick" class="bt" title="新增工单资料" >新增工单资料</el-button>
|
|
|
- <el-button type="primary" icon="edit" @click="addgdyj_onclick" class="bt" title="新增印件资料" >新增印件资料</el-button>
|
|
|
+ <el-button type="primary" icon="edit" @click="addgd_onclick" class="bt" title="新增工单资料">新增工单资料</el-button>
|
|
|
+ <el-button type="primary" icon="edit" @click="addgdyj_onclick" class="bt" title="新增印件资料">新增印件资料</el-button>
|
|
|
<el-button type="primary" icon="edit" @click="addgdgy_onclick" class="bt" title="新增工艺资料" >新增工艺资料</el-button>
|
|
|
- <el-button type="primary" icon="edit" @click="delgd_delclick" :disabled="yjSelection === '' && gySelection === ''" class="bt" title="删除（印件资料或工艺资料）" >删除</el-button>
|
|
|
+ <el-button type="primary" icon="edit" @click="delgd_delclick" :disabled="yjSelection === '' && gySelection === ''" class="bt" title="批量删除（印件资料或工艺资料）" >删除</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
<!--按钮弹窗部分-->
|
|
|
<!--U8投料试算-->
|
|
|
<el-dialog v-model="tlsslist" title="U8投料试算" style="height: 100%;width: 100%;margin: 0;padding: 0">
|
|
|
- <el-button type="primary" icon="" disabled @click="ontlssclicks" class="bt">投料试算</el-button>
|
|
|
- <el-button type="primary" icon="" disabled @click="onbxgxclicks" class="bt">备选工序</el-button>
|
|
|
- <el-button type="primary" icon="" disabled @click="onsjgxclicks" class="bt">实际工序</el-button>
|
|
|
+ <!-- <el-button type="primary" icon="" disabled @click="ontlssclicks" class="bt">投料试算</el-button>-->
|
|
|
+ <!-- <el-button type="primary" icon="" disabled @click="onbxgxclicks" class="bt">备选工序</el-button>-->
|
|
|
+ <!-- <el-button type="primary" icon="" disabled @click="onsjgxclicks" class="bt">实际工序</el-button>-->
|
|
|
<el-button type="primary" icon="" @click="oncloneclick" style="margin: 5px">退出</el-button>
|
|
|
<div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
|
|
|
<!-- 第一行 -->
|
|
|
@@ -112,7 +112,7 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<!--引用产品资料-->
|
|
|
- <el-dialog v-model="onyycpzllist" title="获取产品资料" style="width: 45%;height: 50%;">
|
|
|
+ <el-dialog v-model="onyycpzllist" title="获取产品资料">
|
|
|
<div style=" padding: 0px; align-items: center;">
|
|
|
<el-form-item label="工单编号" prop="processName" class="mab">
|
|
|
<el-input v-model="yycpzlformData['gdbh']" @keyup.enter="yycpzlProductValue" placeholder="" style="width: 23%;" />
|
|
|
@@ -233,10 +233,8 @@
|
|
|
|
|
|
<!--查改U8工单-->
|
|
|
<el-dialog v-model="cgugdlist" title="查改U8工单" style="width: 100%;height: 100%;margin: 0;padding: 0">
|
|
|
-
|
|
|
<el-button type="primary" icon="" @click="oncgugdclickdel" :disabled="multipleSelection.length === 0" style="margin: 0px 0px 20px 0px">删除</el-button>
|
|
|
<el-button type="primary" icon="" @click="oncgugdcloneclick" style="margin: 0px 0px 20px 10px">退出</el-button>
|
|
|
-
|
|
|
<div>
|
|
|
<div style="width: 100%; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;margin: 0px 0px 20px 0px">
|
|
|
<el-form-item label="当前工单:" prop="currentProcess" style="margin-right: 20px;padding: 0px">
|
|
|
@@ -472,10 +470,10 @@
|
|
|
<!-- 右侧内容区域 -->
|
|
|
<layout-content >
|
|
|
<el-main>
|
|
|
- <!-- 表格列表 -->
|
|
|
+ <!-- 工单表格列表 -->
|
|
|
<div class="gva-table-box">
|
|
|
<el-table ref="multipleTable"
|
|
|
- style="width: 100%;height: 30vh"
|
|
|
+ style="width: 100%;height: 28vh"
|
|
|
:row-style="{ height: '20px' }"
|
|
|
:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
:header-cell-style="{ padding: '0px' }"
|
|
|
@@ -534,7 +532,7 @@
|
|
|
highlight-current-row="true"
|
|
|
@row-dblclick="gdyjupdateCompanyFunc"
|
|
|
@selection-change="selectionChange($event, '印件资料')"
|
|
|
- style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID">
|
|
|
+ style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID">
|
|
|
<el-table-column type="selection" width="30" />
|
|
|
<el-table-column align="left" label="印件号" prop="印件号" width="70"/>
|
|
|
<el-table-column align="left" label="印件代号" prop="印件代号" width="98"/>
|
|
|
@@ -564,7 +562,7 @@
|
|
|
@row-click="clickybupdate2"
|
|
|
:row-class-name="rowClassStyle2"
|
|
|
@selection-change="selectionChange($event, '工艺资料')"
|
|
|
- style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="gytableData" row-key="ID">
|
|
|
+ style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="gytableData" row-key="ID">
|
|
|
<el-table-column type="selection" width="30" />
|
|
|
<el-table-column align="left" label="完工状态" prop="status" width="75"/>
|
|
|
<el-table-column align="left" label="重点工序" prop="重点工序" width="80"/>
|
|
|
@@ -604,7 +602,7 @@
|
|
|
:cell-class-name="planUsageCellClass"
|
|
|
highlight-current-row="true"
|
|
|
@row-dblclick="gdbomupdateCompanyFunc"
|
|
|
- style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
+ style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="30" />
|
|
|
<el-table-column align="left" label="方案" prop="方案" width="120"/>
|
|
|
<el-table-column align="left" label="物料编号" prop="物料编号" width="100"/>
|
|
|
@@ -624,16 +622,38 @@
|
|
|
<el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" >
|
|
|
<el-row :gutter="24">
|
|
|
<el-form-item label="重点工单:" prop="keyOrder" class="mab" label-width="90">
|
|
|
- <el-input v-model="scgdformData['重点工单']" style="width: 110px;" id="重点工单" @keydown="gdzlent($event, '备注', '重点工单', '开单日期')" />
|
|
|
+ <el-select v-model="add_gdscgdformData['重点工单']" style="width: 110px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')">
|
|
|
+ <el-option label="" value=""></el-option>
|
|
|
+ <el-option label="打样工单" value="打样工单"></el-option>
|
|
|
+ <el-option label="来料加工" value="来料加工"></el-option>
|
|
|
+ <el-option label="新产品工单" value="新产品工单"></el-option>
|
|
|
+ <el-option label="异常工单" value="异常工单"></el-option>
|
|
|
+ <el-option label="客诉工单" value="客诉工单"></el-option>
|
|
|
+ <el-option label="中试工单" value="中试工单"></el-option>
|
|
|
+ <el-option label="大试工单" value="大试工单"></el-option>
|
|
|
+ <el-option label="补数工单" value="补数工单"></el-option>
|
|
|
+ <el-option label="试机工单" value="试机工单"></el-option>
|
|
|
+ <el-option label="打样工单" value="打样工单"></el-option>
|
|
|
+ <el-option label="外发加工" value="外发加工"></el-option>
|
|
|
+ <el-option label="新华订单" value="新华订单"></el-option>
|
|
|
+ <el-option label="研发打样" value="研发打样"></el-option>
|
|
|
+ <el-option label="废码利用" value="废码利用"></el-option>
|
|
|
+ </el-select>
|
|
|
+ <!-- <el-input v-model="scgdformData['重点工单']" style="width: 110px;" id="重点工单" @keydown="gdzlent($event, '备注', '重点工单', '开单日期')" />-->
|
|
|
</el-form-item>
|
|
|
<el-form-item label="开单日期" prop="orderDate" class="mab" label-width="70">
|
|
|
- <el-date-picker v-model="scgdformData['开单日期']" type="date" style="width: 115px;" id="开单日期" @keydown="gdzlent($event, '重点工单', '开单日期', '工单编号')" />
|
|
|
+ <el-date-picker v-model="scgdformData['开单日期']" type="date" style="width: 140px;" id="开单日期" @keydown="gdzlent($event, '重点工单', '开单日期', '工单编号')" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="工单编号:" prop="orderNumber" class="mab" label-width="90">
|
|
|
<el-input v-model="scgdformData['工单编号']" style="width: 80px;" id="工单编号" @keydown="gdzlent($event, '开单日期', '工单编号', '生产类型')" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="生产类型:" prop="productionType" class="mab" label-width="90">
|
|
|
- <el-input v-model="scgdformData['生产类型']" style="width: 100px;" id="生产类型" @keydown="gdzlent($event, '工单编号', '生产类型', '客户代号')" />
|
|
|
+ <el-select v-model="add_gdscgdformData['生产类型']" style="width: 100px;" id="生产类型" @keydown="add_gdzlent($event, '工单编号', '生产类型', '客户代号')">
|
|
|
+ <el-option label="" value=""></el-option>
|
|
|
+ <el-option label="备货" value="备货"></el-option>
|
|
|
+ <el-option label="面彩" value="面彩"></el-option>
|
|
|
+ </el-select>
|
|
|
+ <!-- <el-input v-model="scgdformData['生产类型']" style="width: 100px;" id="生产类型" @keydown="gdzlent($event, '工单编号', '生产类型', '客户代号')" />-->
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
<el-row :gutter="24">
|
|
|
@@ -665,13 +685,13 @@
|
|
|
<el-input v-model="scgdformData['订单数量']" style="width: 110px;" id="订单数量" @keydown="gdzlent($event, '印件名称', '订单数量', '交货日期')" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="交货日期:" prop="deliveryDate" class="mab" label-width="75">
|
|
|
- <el-date-picker v-model="scgdformData['交货日期']" type="date" style="width: 120px;" id="交货日期" @keydown="gdzlent($event, '订单数量', '交货日期', '投料率')"/>
|
|
|
+ <el-date-picker v-model="scgdformData['交货日期']" type="date" style="width: 140px;" id="交货日期" @keydown="gdzlent($event, '订单数量', '交货日期', '投料率')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="投料率:" prop="feedRate" class="mab" label-width="80">
|
|
|
- <el-input v-model="scgdformData['投料率']" style="width: 100px;" id="投料率" @keydown="gdzlent($event, '交货日期', '投料率', '平均合格率')"/>
|
|
|
+ <el-form-item label="投料率:" prop="feedRate" class="mab" label-width="75">
|
|
|
+ <el-input v-model="scgdformData['投料率']" style="width: 90px;" id="投料率" @keydown="gdzlent($event, '交货日期', '投料率', '平均合格率')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="平均合格率:" prop="passRate" class="mab" label-width="90">
|
|
|
- <el-input v-model="scgdformData['平均合格率']" style="width: 130px;" id="平均合格率" @keydown="gdzlent($event, '投料率', '平均合格率', '平张投料')"/>
|
|
|
+ <el-input v-model="scgdformData['平均合格率']" style="width: 125px;" id="平均合格率" @keydown="gdzlent($event, '投料率', '平均合格率', '平张投料')"/>
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
<el-row :gutter="24">
|
|
|
@@ -740,10 +760,27 @@
|
|
|
<!-- 第一排 -->
|
|
|
<el-row :gutter="24">
|
|
|
<el-form-item label="重点工单:" prop="keyOrder" class="mab" label-width="90">
|
|
|
- <el-input v-model="add_gdscgdformData['重点工单']" style="width: 110px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')" />
|
|
|
+ <el-select v-model="add_gdscgdformData['重点工单']" style="width: 110px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')">
|
|
|
+ <el-option label="" value=""></el-option>
|
|
|
+ <el-option label="打样工单" value="打样工单"></el-option>
|
|
|
+ <el-option label="来料加工" value="来料加工"></el-option>
|
|
|
+ <el-option label="新产品工单" value="新产品工单"></el-option>
|
|
|
+ <el-option label="异常工单" value="异常工单"></el-option>
|
|
|
+ <el-option label="客诉工单" value="客诉工单"></el-option>
|
|
|
+ <el-option label="中试工单" value="中试工单"></el-option>
|
|
|
+ <el-option label="大试工单" value="大试工单"></el-option>
|
|
|
+ <el-option label="补数工单" value="补数工单"></el-option>
|
|
|
+ <el-option label="试机工单" value="试机工单"></el-option>
|
|
|
+ <el-option label="打样工单" value="打样工单"></el-option>
|
|
|
+ <el-option label="外发加工" value="外发加工"></el-option>
|
|
|
+ <el-option label="新华订单" value="新华订单"></el-option>
|
|
|
+ <el-option label="研发打样" value="研发打样"></el-option>
|
|
|
+ <el-option label="废码利用" value="废码利用"></el-option>
|
|
|
+ </el-select>
|
|
|
+ <!-- <el-input v-model="add_gdscgdformData['重点工单']" style="width: 110px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')" />-->
|
|
|
</el-form-item>
|
|
|
<el-form-item label="开单日期" prop="orderDate" class="mab" label-width="70">
|
|
|
- <el-date-picker v-model="add_gdscgdformData['开单日期']" type="date" style="width: 120px;" id="开单日期" @keydown="add_gdzlent($event, '重点工单', '开单日期', '工单编号')" />
|
|
|
+ <el-date-picker v-model="add_gdscgdformData['开单日期']" type="date" style="width: 140px;" id="开单日期" @keydown="add_gdzlent($event, '重点工单', '开单日期', '工单编号')" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="工单编号:" prop="orderNumber" class="mab" label-width="90">
|
|
|
<el-input v-model="add_gdscgdformData['工单编号']" style="width: 85px;" id="工单编号" @keydown="add_gdzlent($event, '开单日期', '工单编号', '生产类型')" />
|
|
|
@@ -785,13 +822,13 @@
|
|
|
<el-input v-model="add_gdscgdformData['订单数量']" style="width: 110px;" id="订单数量" @keydown="add_gdzlent($event, '印件名称', '订单数量', '交货日期')" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="交货日期:" prop="deliveryDate" class="mab" label-width="75">
|
|
|
- <el-date-picker v-model="add_gdscgdformData['交货日期']" type="date" style="width: 120px;" id="交货日期" @keydown="add_gdzlent($event, '订单数量', '交货日期', '投料率')"/>
|
|
|
+ <el-date-picker v-model="add_gdscgdformData['交货日期']" type="date" style="width: 140px;" id="交货日期" @keydown="add_gdzlent($event, '订单数量', '交货日期', '投料率')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="投料率:" prop="feedRate" class="mab" label-width="80">
|
|
|
- <el-input v-model="add_gdscgdformData['投料率']" style="width: 100px;" id="投料率" @keydown="add_gdzlent($event, '交货日期', '投料率', '平均合格率')"/>
|
|
|
+ <el-form-item label="投料率:" prop="feedRate" class="mab" label-width="75">
|
|
|
+ <el-input v-model="add_gdscgdformData['投料率']" style="width: 90px;" id="投料率" @keydown="add_gdzlent($event, '交货日期', '投料率', '平均合格率')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="平均合格率:" prop="passRate" class="mab" label-width="90">
|
|
|
- <el-input v-model="add_gdscgdformData['平均合格率']" style="width: 130px;" id="平均合格率" @keydown="add_gdzlent($event, '投料率', '平均合格率', '平张投料')"/>
|
|
|
+ <el-input v-model="add_gdscgdformData['平均合格率']" style="width: 125px;" id="平均合格率" @keydown="add_gdzlent($event, '投料率', '平均合格率', '平张投料')"/>
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
<el-row :gutter="24">
|
|
|
@@ -858,12 +895,12 @@
|
|
|
<div>
|
|
|
<el-form-item label="关键字:" class="mab" prop="keyOrder">
|
|
|
<el-space>
|
|
|
- <el-input v-model="khdh_keyword" style="width: 100%;"/>
|
|
|
+ <el-input v-model="khdh_keyword" @keyup.enter="khdh_ProductValue" style="width: 100%;"/>
|
|
|
<el-button @click="gongdanSearchHandle(khdh_keyword, '客户代号')">刷新</el-button>
|
|
|
</el-space>
|
|
|
</el-form-item>
|
|
|
<div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
|
|
|
- <el-tree :data="khdhDataList" :props="{children: 'children',label: '客户名称', value: '客户编号'}" @node-click="selectGongDanNode($event, '客户代号')" />
|
|
|
+ <el-tree :data="khdhDataList" :props="{children: 'children',label: 'name', value: '客户编号'}" @node-click="selectGongDanNode($event, '客户代号')" />
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
@@ -875,12 +912,12 @@
|
|
|
<div>
|
|
|
<el-form-item label="关键字:" class="mab" prop="keyOrder">
|
|
|
<el-space>
|
|
|
- <el-input v-model="cpdh_keyword" style="width: 100%;"/>
|
|
|
+ <el-input v-model="cpdh_keyword" @keyup.enter="cpdh_ProductValue" style="width: 100%;"/>
|
|
|
<el-button @click="gongdanSearchHandle(cpdh_keyword, '产品代号')">刷新</el-button>
|
|
|
</el-space>
|
|
|
</el-form-item>
|
|
|
<div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
|
|
|
- <el-tree :data="cpdhDataList" :props="{children: 'children',label: '产品名称', value: '产品编号'}" @node-click="selectGongDanNode($event, '产品代号')" />
|
|
|
+ <el-tree :data="cpdhDataList" :props="{children: 'children',label: 'name', value: '产品编号'}" @node-click="selectGongDanNode($event, '产品代号')" />
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
@@ -888,65 +925,65 @@
|
|
|
|
|
|
<!-- 修改印件表格资料弹窗 -->
|
|
|
<el-dialog v-model="gdyjdialogFormVisible" :before-close="gdyjcloseDialog"
|
|
|
- style="width: 70%;margin: 8px auto" :title="'修改印件资料'" destroy-on-close>
|
|
|
+ style="width: 60%;" :title="'修改印件资料'" destroy-on-close>
|
|
|
<el-form label-width="100px">
|
|
|
- <el-form-item label="印件号:" prop="keyOrder">
|
|
|
+ <el-form-item label="印件号:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="gdyjformData['印件号']" placeholder="" style="width: 140px;" id="印件号" @keydown="edit_gdyjent($event, '备注说明', '印件号', '印件代号')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="印件代码:" prop="keyOrder">
|
|
|
+ <el-form-item label="印件代码:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="gdyjformData['印件代号']" placeholder="" style="width: 140px;" id="印件代号" @keydown="edit_gdyjent($event, '印件号', '印件代号', '印件名称')"/>
|
|
|
<el-input v-model="gdyjformData['印件名称']" placeholder="" style="width: 80%; margin-left: 10px" id="印件名称" @keydown="edit_gdyjent($event, '印件代号', '印件名称', '纸张代号')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="纸张编号:" prop="keyOrder">
|
|
|
+ <el-form-item label="纸张编号:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="gdyjformData['纸张代号']" placeholder="" style="width: 140px;" id="纸张代号" @keydown="edit_gdyjent($event, '印件名称', '纸张代号', '纸张名称')"/>
|
|
|
<el-input v-model="gdyjformData['纸张名称']" placeholder="" style="width: 80%; margin-left: 10px" id="纸张名称" @keydown="edit_gdyjent($event, '纸张代号', '纸张名称', '备用纸张1')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备用纸张1:" prop="keyOrder">
|
|
|
+ <el-form-item label="备用纸张1:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="gdyjformData['备用纸张1']" placeholder="" style="width: 140px;" id="备用纸张1" @keydown="edit_gdyjent($event, '纸张名称', '备用纸张1', '纸张名称11')"/>
|
|
|
<el-input v-model="gdyjformData['纸张名称11']" placeholder="" style="width: 80%; margin-left: 10px" id="纸张名称11" @keydown="edit_gdyjent($event, '备用纸张1', '纸张名称11', '备用纸张2')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备用纸张2:" prop="keyOrder">
|
|
|
+ <el-form-item label="备用纸张2:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="gdyjformData['备用纸张2']" placeholder="" style="width: 140px;" id="备用纸张2" @keydown="edit_gdyjent($event, '纸张名称11', '备用纸张2', '纸张名称22')"/>
|
|
|
<el-input v-model="gdyjformData['纸张名称22']" placeholder="" style="width: 80%; margin-left: 10px" id="纸张名称22" @keydown="edit_gdyjent($event, '备用纸张2', '纸张名称22', '备用纸张3')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备用纸张3:" prop="keyOrder">
|
|
|
+ <el-form-item label="备用纸张3:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="gdyjformData['备用纸张3']" placeholder="" style="width: 140px;" id="备用纸张3" @keydown="edit_gdyjent($event, '纸张名称22', '备用纸张3', '纸张名称33')"/>
|
|
|
<el-input v-model="gdyjformData['纸张名称33']" placeholder="" style="width: 80%; margin-left: 10px" id="纸张名称33" @keydown="edit_gdyjent($event, '备用纸张3', '纸张名称33', '备用纸张4')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备用纸张4:" prop="keyOrder">
|
|
|
+ <el-form-item label="备用纸张4:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="gdyjformData['备用纸张4']" placeholder="" style="width: 140px;" id="备用纸张4" @keydown="edit_gdyjent($event, '纸张名称33', '备用纸张4', '纸张名称44')"/>
|
|
|
<el-input v-model="gdyjformData['纸张名称44']" placeholder="" style="width: 80%; margin-left: 10px" id="纸张名称44" @keydown="edit_gdyjent($event, '备用纸张4', '纸张名称44', '订单数量')"/>
|
|
|
</el-form-item>
|
|
|
<div style="display: flex; gap: 0px;">
|
|
|
- <el-form-item label="订单数量:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['订单数量']" placeholder="" style="width: 100px;" id="订单数量" @keydown="edit_gdyjent($event, '纸张名称44', '订单数量', '平张投料')"/>
|
|
|
+ <el-form-item label="订单数量:" class="mab" prop="keyOrder">
|
|
|
+ <el-input v-model="gdyjformData['订单数量']" placeholder="" style="width: 80px;" id="订单数量" @keydown="edit_gdyjent($event, '纸张名称44', '订单数量', '平张投料')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="平张投料:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['平张投料']" placeholder="" style="width: 100px;" id="平张投料" @keydown="edit_gdyjent($event, '订单数量', '平张投料', '万小张')"/>
|
|
|
+ <el-form-item label="平张投料:" class="mab" prop="keyOrder">
|
|
|
+ <el-input v-model="gdyjformData['平张投料']" placeholder="" style="width: 80px;" id="平张投料" @keydown="edit_gdyjent($event, '订单数量', '平张投料', '万小张')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="万小张:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['万小张']" placeholder="" style="width: 100px;" id="万小张" @keydown="edit_gdyjent($event, '平张投料', '万小张', '开料规格')"/>
|
|
|
+ <el-form-item label="万小张:" class="mab" prop="keyOrder">
|
|
|
+ <el-input v-model="gdyjformData['万小张']" placeholder="" style="width: 80px;" id="万小张" @keydown="edit_gdyjent($event, '平张投料', '万小张', '开料规格')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="纸张规格:" prop="keyOrder">
|
|
|
+ <el-form-item label="纸张规格:" class="mab" prop="keyOrder">
|
|
|
<el-input disabled v-model="gdyjformData['投料规格']" placeholder="" style="width: 240px;" />
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div style="display: flex; gap: 0px;">
|
|
|
- <el-form-item label="投料规格:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['开料规格']" placeholder="" style="width: 100px;" id="开料规格" @keydown="edit_gdyjent($event, '万小张', '开料规格', '开数')"/>
|
|
|
+ <el-form-item label="投料规格:" class="mab" prop="keyOrder">
|
|
|
+ <el-input v-model="gdyjformData['开料规格']" placeholder="" style="width: 80px;" id="开料规格" @keydown="edit_gdyjent($event, '万小张', '开料规格', '开数')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="开料开数:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['开数']" placeholder="" style="width: 100px;" id="开数" @keydown="edit_gdyjent($event, '开料规格', '开数', '联数')"/>
|
|
|
+ <el-form-item label="开料开数:" class="mab" prop="keyOrder">
|
|
|
+ <el-input v-model="gdyjformData['开数']" placeholder="" style="width: 80px;" id="开数" @keydown="edit_gdyjent($event, '开料规格', '开数', '联数')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="开料联数:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['联数']" placeholder="" style="width: 100px;" id="联数" @keydown="edit_gdyjent($event, '开数', '联数', '核算规格')"/>
|
|
|
+ <el-form-item label="开料联数:" class="mab" prop="keyOrder">
|
|
|
+ <el-input v-model="gdyjformData['联数']" placeholder="" style="width: 80px;" id="联数" @keydown="edit_gdyjent($event, '开数', '联数', '核算规格')"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="核算规格:" prop="keyOrder">
|
|
|
+ <el-form-item label="核算规格:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="gdyjformData['核算规格']" placeholder="" style="width: 240px;" id="核算规格" @keydown="edit_gdyjent($event, '联数', '核算规格', '备注说明')"/>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
- <el-form-item label="备注说明:" prop="remark">
|
|
|
- <el-input type="textarea" v-model="gdyjformData['备注说明']" resize="none" rows="3" clearable placeholder="" id="备注说明" @keydown="edit_gdyjent($event, '核算规格', '备注说明', '印件号')"/>
|
|
|
+ <el-form-item label="备注说明:" class="mab" prop="remark">
|
|
|
+ <el-input type="textarea" v-model="gdyjformData['备注']" resize="none" rows="2" clearable placeholder="" id="备注说明" @keydown="edit_gdyjent($event, '核算规格', '备注说明', '印件号')"/>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
@@ -1068,65 +1105,65 @@
|
|
|
|
|
|
<!-- 新增印件资料弹窗 -->
|
|
|
<el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog"
|
|
|
- style="width: 70%;margin: 8px auto" :title="'新增印件资料'" destroy-on-close>
|
|
|
+ style="width: 60%;" :title="'新增印件资料'" destroy-on-close>
|
|
|
<el-form label-width="100px" :model="add_yjzlformdata">
|
|
|
- <el-form-item label="印件号:" prop="yjno">
|
|
|
+ <el-form-item label="印件号:" class="mab" prop="yjno" >
|
|
|
<el-input v-model="add_yjzlformdata.yjno" placeholder="" style="width: 140px;"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="印件代码:" prop="keyOrder">
|
|
|
+ <el-form-item label="印件代码:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="add_yjzlformdata.yjdh" id="yjdhId" @keydown="openSearchModal" placeholder="" style="width: 140px;"/>
|
|
|
<el-input v-model="add_yjzlformdata.yjmc" placeholder="" style="width: 80%; margin-left: 10px"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="纸张编号:" prop="keyOrder">
|
|
|
+ <el-form-item label="纸张编号:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="add_yjzlformdata.zzdh" class="zhi" @keydown="openSearchZhiModal($event, 0)" placeholder="" style="width: 140px;"/>
|
|
|
<el-input v-model="add_yjzlformdata.zzmc" placeholder="" style="width: 80%; margin-left: 10px"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备用纸张1:" prop="keyOrder">
|
|
|
+ <el-form-item label="备用纸张1:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="add_yjzlformdata.zzdh1" class="zhi" @keydown="openSearchZhiModal($event, 1)" placeholder="" style="width: 140px;"/>
|
|
|
<el-input v-model="add_yjzlformdata.zzmc1" placeholder="" style="width: 80%; margin-left: 10px"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备用纸张2:" prop="keyOrder">
|
|
|
+ <el-form-item label="备用纸张2:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="add_yjzlformdata.zzdh2" class="zhi" @keydown="openSearchZhiModal($event, 2)" placeholder="" style="width: 140px;"/>
|
|
|
<el-input v-model="add_yjzlformdata.zzmc2" placeholder="" style="width: 80%; margin-left: 10px"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备用纸张3:" prop="keyOrder">
|
|
|
+ <el-form-item label="备用纸张3:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="add_yjzlformdata.zzdh3" class="zhi" @keydown="openSearchZhiModal($event, 3)" placeholder="" style="width: 140px;"/>
|
|
|
<el-input v-model="add_yjzlformdata.zzmc3" placeholder="" style="width: 80%; margin-left: 10px"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备用纸张4:" prop="keyOrder">
|
|
|
+ <el-form-item label="备用纸张4:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="add_yjzlformdata.zzdh4" class="zhi" @keydown="openSearchZhiModal($event, 4)" placeholder="" style="width: 140px;"/>
|
|
|
<el-input v-model="add_yjzlformdata.zzmc4" placeholder="" style="width: 80%; margin-left: 10px"/>
|
|
|
</el-form-item>
|
|
|
<div style="display: flex; gap: 0px;">
|
|
|
- <el-form-item label="订单数量:" prop="keyOrder">
|
|
|
- <el-input v-model="add_yjzlformdata.cpsl" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-form-item label="订单数量:" class="mab" prop="keyOrder">
|
|
|
+ <el-input v-model="add_yjzlformdata.cpsl" placeholder="" style="width: 80px;"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="平张投料:" prop="keyOrder">
|
|
|
- <el-input v-model="add_yjzlformdata.pztl" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-form-item label="平张投料:" class="mab" prop="keyOrder">
|
|
|
+ <el-input v-model="add_yjzlformdata.pztl" placeholder="" style="width: 80px;"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="万小张:" prop="keyOrder">
|
|
|
- <el-input disabled v-model="add_yjzlformdata.万小张" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-form-item label="万小张:" class="mab" prop="keyOrder">
|
|
|
+ <el-input disabled v-model="add_yjzlformdata.万小张" placeholder="" style="width: 80px;"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="纸张规格:" prop="keyOrder">
|
|
|
+ <el-form-item label="纸张规格:" class="mab" prop="keyOrder">
|
|
|
<el-input disabled v-model="add_yjzlformdata.tlgg" placeholder="" style="width: 240px;"/>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div style="display: flex; gap: 0px;">
|
|
|
- <el-form-item label="投料规格:" prop="keyOrder">
|
|
|
- <el-input v-model="add_yjzlformdata.klgg" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-form-item label="投料规格:" class="mab" prop="keyOrder">
|
|
|
+ <el-input v-model="add_yjzlformdata.klgg" placeholder="" style="width: 80px;"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="开料开数:" prop="keyOrder">
|
|
|
- <el-input v-model="add_yjzlformdata.ks" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-form-item label="开料开数:" class="mab" prop="keyOrder">
|
|
|
+ <el-input v-model="add_yjzlformdata.ks" placeholder="" style="width: 80px;"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="开料联数:" prop="keyOrder">
|
|
|
- <el-input v-model="add_yjzlformdata.ls" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-form-item label="开料联数:" class="mab" prop="keyOrder">
|
|
|
+ <el-input v-model="add_yjzlformdata.ls" placeholder="" style="width: 80px;"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="核算规格:" prop="keyOrder">
|
|
|
+ <el-form-item label="核算规格:" class="mab" prop="keyOrder">
|
|
|
<el-input v-model="add_yjzlformdata.hsgg" placeholder="" style="width: 240px;"/>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
- <el-form-item label="备注说明:" prop="remark">
|
|
|
- <el-input v-model="add_yjzlformdata.desc" type="textarea" resize="none" rows="3" clearable placeholder="" />
|
|
|
+ <el-form-item label="备注说明:" class="mab" prop="remark">
|
|
|
+ <el-input v-model="add_yjzlformdata.desc" type="textarea" resize="none" rows="2" clearable placeholder="" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
@@ -1149,7 +1186,7 @@
|
|
|
</el-space>
|
|
|
</el-form-item>
|
|
|
<div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
|
|
|
- <el-tree :data="getProductYjListdata" :props="{children: 'children',label: '物料名称', value: '物料代码'}" @node-click="selectNode" />
|
|
|
+ <el-tree :data="getProductYjListdata" :props="{children: 'children',label: 'label', value: '物料代码'}" @node-click="selectNode" />
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
@@ -1166,7 +1203,7 @@
|
|
|
</el-space>
|
|
|
</el-form-item>
|
|
|
<div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
|
|
|
- <el-tree :data="getProductZhiListdata" :props="{children: 'children',label: '物料名称', value: '物料代码'}" @node-click="selectZhiNode" />
|
|
|
+ <el-tree :data="getProductZhiListdata" :props="{children: 'children',label: 'label', value: '物料代码'}" @node-click="selectZhiNode" />
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
@@ -1305,9 +1342,9 @@ import { ref, reactive, computed } from 'vue'
|
|
|
import {
|
|
|
DataList,
|
|
|
WorkList, gdzl_MachineList,PrintCodeList,getProductYjList, getProductZzList,
|
|
|
- U8workOrder, ProcessDetailEdit, PrintedEdit, PrintJobOrder,WorkOrderAdd,
|
|
|
+ U8workOrder, ProcessDetailEdit, PrintedEdit, PrintJobOrder,WorkOrderAdd,PrintDetailAdd,
|
|
|
WorkOrderEdit, ReferenceWorkOrder,getOrderProcessLeft,ClientList,ProductCodeList,
|
|
|
- editGyWaste, U8DataCorrection, AccountingParameterEdit,
|
|
|
+ editGyWaste, U8DataCorrection, AccountingParameterEdit,ProcessCopy,
|
|
|
ProductInformation, TestCoefficient, capacityList,getOrderProcessRight,
|
|
|
DataCorrection, U8Trial, ProcessFlow, AccountingParameter,
|
|
|
setProductStatus,
|
|
|
@@ -1875,19 +1912,41 @@ const khdhDataList = ref()
|
|
|
const cpdhDataList = ref()
|
|
|
const khdh_keyword = ref('')
|
|
|
const cpdh_keyword = ref('')
|
|
|
+
|
|
|
+//新增工单资料客户代号【回车】
|
|
|
+const khdh_ProductValue = async (v) => {
|
|
|
+ // console.log(khdh_keyword.value)
|
|
|
+ await _gClientList(khdh_keyword.value)
|
|
|
+};
|
|
|
+//新增工单资料产品代号【回车】
|
|
|
+const cpdh_ProductValue = async (v) => {
|
|
|
+ // console.log(khdh_keyword.value)
|
|
|
+ await _ProductCodeList(cpdh_keyword.value)
|
|
|
+};
|
|
|
+//新增工单->客户列表
|
|
|
const _gClientList = async (v = '')=>{
|
|
|
try {
|
|
|
- const ClientListdata = await ClientList({client: v});
|
|
|
- khdhDataList.value = ClientListdata.data
|
|
|
+ // if(add_gdscgdformData['客户代号']){
|
|
|
+ // const ClientListdata = await ClientList({search: add_gdscgdformData['客户代号']});
|
|
|
+ // khdhDataList.value = ClientListdata.data
|
|
|
+ // }else{
|
|
|
+ const ClientListdata = await ClientList({search: v});
|
|
|
+ khdhDataList.value = ClientListdata.data
|
|
|
+ // }
|
|
|
} catch (error) {
|
|
|
console.error(error);
|
|
|
}
|
|
|
}
|
|
|
-//获取产品代号，产品名称
|
|
|
-const _ProductCodeList = async (v = '1001')=>{
|
|
|
+//新增工单->产品代号列表
|
|
|
+const _ProductCodeList = async (v = '')=>{
|
|
|
try {
|
|
|
- const ProductCodeListdata = await ProductCodeList({cilent: v});
|
|
|
- cpdhDataList.value = ProductCodeListdata.data
|
|
|
+ // if(add_gdscgdformData['产品代号']){
|
|
|
+ // const ProductCodeListdata = await ProductCodeList({cilent: add_gdscgdformData['产品代号']});
|
|
|
+ // cpdhDataList.value = ProductCodeListdata.data
|
|
|
+ // }else{
|
|
|
+ const ProductCodeListdata = await ProductCodeList({cilent: v});
|
|
|
+ cpdhDataList.value = ProductCodeListdata.data
|
|
|
+ // }
|
|
|
} catch (error) {
|
|
|
console.error(error);
|
|
|
}
|
|
|
@@ -1895,13 +1954,13 @@ const _ProductCodeList = async (v = '1001')=>{
|
|
|
|
|
|
const gongdanSearchHandle = async (v, type) => {
|
|
|
if (type === '客户代号') {
|
|
|
- await _gClientList(v)
|
|
|
+ await _gClientList(v)
|
|
|
}
|
|
|
if (type === '产品代号') {
|
|
|
await _ProductCodeList(v)
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+//点击客户代号
|
|
|
const selectGongDanNode = (node, type) => {
|
|
|
if (type === '客户代号') {
|
|
|
add_gdscgdformData['客户代号'] = node.客户编号
|
|
|
@@ -1921,13 +1980,11 @@ const selectGongDanNode = (node, type) => {
|
|
|
|
|
|
//新增工单资料弹窗 键盘 input框跳转
|
|
|
const add_gdzlent = async (event,id1,id2,id3) => {
|
|
|
- // console.log(event.keyCode)
|
|
|
-
|
|
|
- if (id2 === '客户代号' && event.key==='Tab') {
|
|
|
+ if (id2 === '客户代号' && event.key==='Tab' || id2 === '客户代号' && event.key=== 'Enter') {
|
|
|
await _gClientList()
|
|
|
khdhModal.value = true
|
|
|
}
|
|
|
- if (id2 === '产品代号' && event.key==='Tab') {
|
|
|
+ if (id2 === '产品代号' && event.key==='Tab' || id2 === '产品代号' && event.key=== 'Enter') {
|
|
|
await _ProductCodeList()
|
|
|
cpdhModal.value = true
|
|
|
}
|
|
|
@@ -1947,7 +2004,6 @@ const add_gdzlent = async (event,id1,id2,id3) => {
|
|
|
if(id1!='' && document.getElementById(id2).value==''){
|
|
|
document.getElementById(id1).focus()
|
|
|
}
|
|
|
- // console.log(document.getElementById(id2).value)
|
|
|
}else if (event.keyCode === 37) { // 向左箭头
|
|
|
if(id1!='' && document.getElementById(id2).selectionStart==0){
|
|
|
document.getElementById(id1).focus()
|
|
|
@@ -1993,18 +2049,24 @@ const gdyj_clearFormData = () => {
|
|
|
Object.keys(add_yjzlformdata).forEach(key => {
|
|
|
add_yjzlformdata[key] = '';
|
|
|
});
|
|
|
- add_yjzlformdata.yjno = yjzuidahaoma.value;
|
|
|
+ if (isNaN(yjzuidahaoma.value)) {
|
|
|
+ add_yjzlformdata.yjno = 1;
|
|
|
+ } else {
|
|
|
+ add_yjzlformdata.yjno = yjzuidahaoma.value;
|
|
|
+ }
|
|
|
add_yjzlformdata['pztl'] = 0;
|
|
|
add_yjzlformdata['ks'] = 0;
|
|
|
add_yjzlformdata['ls'] = 0;
|
|
|
add_yjzlformdata['万小张'] = 0;
|
|
|
+ console.log(add_yjzlformdata.yjno)
|
|
|
+
|
|
|
};
|
|
|
|
|
|
const searchModel = ref(false)
|
|
|
const searchZhiModel = ref(false)
|
|
|
|
|
|
const openSearchModal = (code) => {
|
|
|
- if (code.key==='Tab') {
|
|
|
+ if (code.key==='Tab' || code.key=== 'Enter') {
|
|
|
setTimeout(() =>document.querySelector('#yjdhId').focus(), 50)
|
|
|
_getProductYjList();
|
|
|
searchModel.value = true
|
|
|
@@ -2013,7 +2075,7 @@ const openSearchModal = (code) => {
|
|
|
|
|
|
const zzdhIndex = ref(null)
|
|
|
const openSearchZhiModal = (code, idx) => {
|
|
|
- if (code.key==='Tab') {
|
|
|
+ if (code.key==='Tab' || code.key=== 'Enter') {
|
|
|
setTimeout(() => document.querySelector('.zhi').focus(), 50)
|
|
|
_getProductZzList()
|
|
|
searchZhiModel.value = true
|
|
|
@@ -2037,10 +2099,11 @@ const addgdyj_onclick = () => {
|
|
|
}
|
|
|
}
|
|
|
//印件新增确定
|
|
|
-const add_gdyjenterDialog = () => {
|
|
|
- console.log(add_yjzlformdata)
|
|
|
+const add_gdyjenterDialog = async () => {
|
|
|
+ // console.log(add_yjzlformdata)
|
|
|
const formattedData = {
|
|
|
Yj_Gdbh: _Gd_gdbh.value,
|
|
|
+ yj_cpdh: _Gd_cpdh.value,
|
|
|
yj_Yjno: add_yjzlformdata['yjno'],
|
|
|
yj_Yjdh: add_yjzlformdata['yjdh'],
|
|
|
yj_yjmc: add_yjzlformdata['yjmc'],
|
|
|
@@ -2066,83 +2129,65 @@ const add_gdyjenterDialog = () => {
|
|
|
Sys_id : "[1031/谭鸿忠]",
|
|
|
// 万小张: add_yjzlformdata['万小张'],
|
|
|
};
|
|
|
- console.log(formattedData)
|
|
|
- // add_gdyjdialogFormVisible.value = false
|
|
|
+ // console.log(formattedData)
|
|
|
+ const PrintDetailAdd_add = await PrintDetailAdd(formattedData);
|
|
|
+ // console.log(PrintDetailAdd_add)
|
|
|
+ if(PrintDetailAdd_add.code === 0) {
|
|
|
+ ElMessage({type: 'success',message: '添加成功'})
|
|
|
+ add_gdyjdialogFormVisible.value = false
|
|
|
+ } else {
|
|
|
+ ElMessage({type: 'error',message: '添加失败' })
|
|
|
+ }
|
|
|
}
|
|
|
//印件新增取消
|
|
|
const add_dyjcloseDialog = () => {
|
|
|
add_gdyjdialogFormVisible.value = false
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+//印件新增【印件代码】树状图
|
|
|
const handleTreeData = (treeData) => {
|
|
|
- let data = []
|
|
|
- Object.keys(treeData).map((key, index) => {
|
|
|
- data.push({
|
|
|
- 物料代码:key.match(/\d+/)[0],
|
|
|
- 物料名称:key,
|
|
|
- children: []
|
|
|
- })
|
|
|
- if (typeof treeData[key] === 'object') {
|
|
|
- Object.keys(treeData[key]).map((c_key) => {
|
|
|
- data[index].children.push({
|
|
|
- 物料代码: c_key.match(/\d+/)[0],
|
|
|
- 物料名称: c_key,
|
|
|
- children: []
|
|
|
- })
|
|
|
- })
|
|
|
- } else if (typeof treeData[key] === 'array') {
|
|
|
- treeData[key].map(item => data[index].children.push(item))
|
|
|
- }
|
|
|
- })
|
|
|
-
|
|
|
+ const data = Object.keys(treeData).map((key)=>({
|
|
|
+ label:key,
|
|
|
+ children: Object.keys(treeData[key]).map((keys)=>({
|
|
|
+ label:keys,
|
|
|
+ children:treeData[key][keys].map(item=>({
|
|
|
+ label:`${item.物料代码} ${item.物料名称}`,
|
|
|
+ 物料代码:item.物料代码,
|
|
|
+ 物料名称:item.物料名称
|
|
|
+
|
|
|
+ }))
|
|
|
+ }))
|
|
|
+ }))
|
|
|
return data
|
|
|
}
|
|
|
|
|
|
-// "1401/糊盒类产品（含贴码）":
|
|
|
-// {
|
|
|
-// "140101/浙江中烟":
|
|
|
-// [
|
|
|
-// {
|
|
|
-// "物料代码": "140101001",
|
|
|
-// "物料名称": "利群（红利）2盒装礼盒面彩"
|
|
|
-// },
|
|
|
-// {
|
|
|
-// "物料代码": "140101002",
|
|
|
-// "物料名称": "利群（红利）两条装手提袋（糊盒前）"
|
|
|
-// },
|
|
|
-// {
|
|
|
-// "物料代码": "140101003",
|
|
|
-// "物料名称": "利群（红利）五盒装手提袋（糊盒前）（半拼，2张算1张）"
|
|
|
-// }]
|
|
|
-// }
|
|
|
-
|
|
|
-// [
|
|
|
-// { 物料代码: '1401/糊盒类产品（含贴码）',物料名称:'1401/糊盒类产品（含贴码）',
|
|
|
-// children: [{
|
|
|
-// 物料代码: '140101/浙江中烟',物料名称:'140101/浙江中烟', children: [
|
|
|
-// {
|
|
|
-// "物料代码": "140101001",
|
|
|
-// "物料名称": "利群（红利）2盒装礼盒面彩"
|
|
|
-// },
|
|
|
-// {
|
|
|
-// "物料代码": "140101002",
|
|
|
-// "物料名称": "利群（红利）两条装手提袋（糊盒前）"
|
|
|
-// },
|
|
|
-// {
|
|
|
-// "物料代码": "140101003",
|
|
|
-// "物料名称": "利群（红利）五盒装手提袋（糊盒前）（半拼，2张算1张）"
|
|
|
-// }
|
|
|
-// ]
|
|
|
-// }]
|
|
|
-// }
|
|
|
-// ]
|
|
|
+//印件新增【纸张】树状图
|
|
|
+const handleTreeDatas = (treeData) => {
|
|
|
+ console.log(treeData)
|
|
|
+ const data = Object.keys(treeData).map((key)=>({
|
|
|
+ label:key,
|
|
|
+ children: Object.keys(treeData[key]).map((keys)=>({
|
|
|
+ label:keys,
|
|
|
+ children:Object.keys(treeData[key][keys]).map((keyss)=>({
|
|
|
+ label:keyss,
|
|
|
+ children:treeData[key][keys][keyss].map(item=>({
|
|
|
+ label:`${item.物料代码} ${item.物料名称}`,
|
|
|
+ 规格:item.规格,
|
|
|
+ 物料代码:item.物料代码,
|
|
|
+ 物料名称:item.物料名称
|
|
|
+ }))
|
|
|
+ }))
|
|
|
+
|
|
|
+ }))
|
|
|
+ }))
|
|
|
+ return data
|
|
|
+}
|
|
|
|
|
|
//3.4获取印件代码及名称
|
|
|
const getProductYjListdata = ref()
|
|
|
const getProductZhiListdata = ref()
|
|
|
const yjdh_keyword = ref('')
|
|
|
const zhi_keyword = ref('')
|
|
|
+//3.4获取印件代码及名称
|
|
|
const _getProductYjList = async ()=>{
|
|
|
try {
|
|
|
const response = await getProductYjList({search:''});
|
|
|
@@ -2151,43 +2196,44 @@ const _getProductYjList = async ()=>{
|
|
|
console.error(error);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+//3.5获取纸张代号及名称
|
|
|
const _getProductZzList = async ()=>{
|
|
|
try {
|
|
|
const response = await getProductZzList({search:''});
|
|
|
- getProductZhiListdata.value = handleTreeData(response.data)
|
|
|
+ getProductZhiListdata.value = handleTreeDatas(response.data)
|
|
|
} catch (error) {
|
|
|
console.error(error);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+//3.4获取印件代码及名称
|
|
|
const searchHandle = async (v) => {
|
|
|
const response = await getProductYjList({search:v});
|
|
|
getProductYjListdata.value = handleTreeData(response.data)
|
|
|
}
|
|
|
-
|
|
|
+//3.5获取纸张代号及名称
|
|
|
const searchZhiHandle = async(v) => {
|
|
|
const response = await getProductZzList({search:v});
|
|
|
- getProductZhiListdata.value = handleTreeData(response.data)
|
|
|
+ getProductZhiListdata.value = handleTreeDatas(response.data)
|
|
|
}
|
|
|
-
|
|
|
+//印件代码tab 点击事件
|
|
|
const selectNode = (v) => {
|
|
|
- if (v.children.length === 0) {
|
|
|
+ if(v.物料名称){
|
|
|
add_yjzlformdata['yjdh'] = v.物料代码
|
|
|
- add_yjzlformdata['yjmc'] = v.物料名称
|
|
|
- searchModel.value= false
|
|
|
+ add_yjzlformdata['yjmc'] = v.物料名称
|
|
|
+ searchModel.value= false
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+//纸张tab 点击事件
|
|
|
const selectZhiNode = (v) => {
|
|
|
- if (v.children.length === 0) {
|
|
|
+ if(v.物料名称){
|
|
|
if (zzdhIndex.value == 0) {
|
|
|
- add_yjzlformdata['zzdh'] = v.物料代码
|
|
|
- add_yjzlformdata['zzmc'] = v.物料名称
|
|
|
- } else {
|
|
|
- add_yjzlformdata['zzdh' + zzdhIndex.value] = v.物料代码
|
|
|
- add_yjzlformdata['zzmc' + zzdhIndex.value] = v.物料名称
|
|
|
- }
|
|
|
+ add_yjzlformdata['zzdh'] = v.物料代码
|
|
|
+ add_yjzlformdata['zzmc'] = v.物料名称
|
|
|
+ add_yjzlformdata['tlgg'] = v.规格
|
|
|
+ } else {
|
|
|
+ add_yjzlformdata['zzdh' + zzdhIndex.value] = v.物料代码
|
|
|
+ add_yjzlformdata['zzmc' + zzdhIndex.value] = v.物料名称
|
|
|
+ }
|
|
|
searchZhiModel.value = false
|
|
|
}
|
|
|
}
|
|
|
@@ -2218,15 +2264,23 @@ const addgdgy_onclick = () => {
|
|
|
addGongYiRef.value.open(_Gd_gdbh.value, gongxu)
|
|
|
}
|
|
|
}
|
|
|
-//新增工艺资料确定
|
|
|
-const add_gdgyenterDialog = () => {
|
|
|
- console.log(add_gdgyformData)
|
|
|
- // add_gdgydialogFormVisible.value = false
|
|
|
-}
|
|
|
+// //新增工艺资料确定
|
|
|
+// const add_gdgyenterDialog = async () => {
|
|
|
+// console.log(1)
|
|
|
+// // const formattedData = {
|
|
|
+// // Yj_Gdbh: _Gd_gdbh.value,
|
|
|
+// // yj_Yjno: add_gdgyformData['yjno'],
|
|
|
+// // yj_Yjdh: add_gdgyformData['yjdh'],
|
|
|
+// // };
|
|
|
+// // console.log(formattedData)
|
|
|
+// // const ProcessDetailAdd_add = await ProcessDetailAdd(formattedData);
|
|
|
+// // console.log(ProcessDetailAdd_add)
|
|
|
+// // add_gdgydialogFormVisible.value = false
|
|
|
+// }
|
|
|
//新增工艺资料取消
|
|
|
-const add_gdgycloseDialog = () => {
|
|
|
- add_gdgydialogFormVisible.value = false
|
|
|
-}
|
|
|
+// const add_gdgycloseDialog = () => {
|
|
|
+// add_gdgydialogFormVisible.value = false
|
|
|
+// }
|
|
|
|
|
|
|
|
|
// =========== 查改U8工单 ===========
|
|
|
@@ -2271,26 +2325,30 @@ const _U8workOrder = async ()=>{
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-// // 多选数据
|
|
|
-// const multipleSelection = ref([]);
|
|
|
-//
|
|
|
-// // 多选
|
|
|
-// const cguzlgd_del = (val) => {
|
|
|
-// if (Array.isArray(val) && val.length === 0) {
|
|
|
-// multipleSelection.value = [];
|
|
|
-// } else {
|
|
|
-// multipleSelection.value.push(...val.map(item => item.序号));
|
|
|
-// }
|
|
|
-// }
|
|
|
+// 多选数据
|
|
|
+const multipleSelection = ref([]);
|
|
|
+
|
|
|
+// 多选
|
|
|
+const cguzlgd_del = (val) => {
|
|
|
+ if (Array.isArray(val) && val.length === 0) {
|
|
|
+ multipleSelection.value = [];
|
|
|
+ } else {
|
|
|
+ multipleSelection.value = [];
|
|
|
+ multipleSelection.value.push(...val.map(item => item.序号));
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
//查改U8工单（工单删除）
|
|
|
const oncgugdclickdel = async ()=>{
|
|
|
const Uniqid = multipleSelection.value.join(',');
|
|
|
+ // console.log(Uniqid)
|
|
|
try {
|
|
|
const U8DataCorrection_del = await U8DataCorrection({Uniqid:Uniqid});
|
|
|
if (U8DataCorrection_del.code === 0) {
|
|
|
multipleSelection.value = [];
|
|
|
ElMessage({type: 'success',message: '删除成功'})
|
|
|
+ const U8workOrderdata = await U8workOrder({workOrder:cgugdformData['gdbh']});
|
|
|
+ cgugdtableData.value = U8workOrderdata.data;
|
|
|
} else {
|
|
|
ElMessage({type: 'error',message: '删除失败'})
|
|
|
}
|
|
|
@@ -2484,21 +2542,22 @@ const _ReferenceWorkOrder = async ()=>{
|
|
|
|
|
|
//更新当前产品工序【按钮】
|
|
|
const gylctz_gxdqcpgx = async () => {
|
|
|
+ console.log(gylctztableData)
|
|
|
const rawValueArray = gylctztableData.value;
|
|
|
const formattedData = rawValueArray.map(item => {
|
|
|
return {
|
|
|
- workOrder: gylctzformData['gdbh'],
|
|
|
- UniqId: item.UniqId,
|
|
|
- gxh: item['工序号'],
|
|
|
+ workOrder:gylctzformData['gdbh'],
|
|
|
+ UniqId:item.UniqId,
|
|
|
+ gxh:item['工序号']
|
|
|
}
|
|
|
});
|
|
|
const ProcessCopy_edit = await ProcessCopy(formattedData);
|
|
|
- console.log(ProcessCopy_edit)
|
|
|
- // if(ProcessCopy_edit.code === 0) {
|
|
|
- // ElMessage({type: 'success',message: '更新成功'})
|
|
|
- // } else {
|
|
|
- // ElMessage({type: 'error',message: '更新失败' })
|
|
|
- // }
|
|
|
+ if(ProcessCopy_edit.code === 0) {
|
|
|
+ ElMessage({type: 'success',message: '更新成功'})
|
|
|
+ } else {
|
|
|
+ ElMessage({type: 'error',message: '更新失败' })
|
|
|
+ }
|
|
|
+ gylctzlist.value = false;
|
|
|
};
|
|
|
|
|
|
//放弃操作【按钮】
|
|
|
@@ -2525,8 +2584,14 @@ const oneditgxclhsclick = () => {
|
|
|
}
|
|
|
};
|
|
|
//工序产量核算【确定】
|
|
|
-const gxclhshandleConfirm = () => {
|
|
|
+const gxclhshandleConfirm = async () => {
|
|
|
console.log(gxclhsformData['gdbh'])
|
|
|
+ // const = await ({:gxclhsformData['gdbh']});
|
|
|
+ // if (.code === 0) {
|
|
|
+ // ElMessage({type: 'success', message: '更新成功'})
|
|
|
+ // } else {
|
|
|
+ // ElMessage({type: 'error',message: '更新失败'})
|
|
|
+ // }
|
|
|
// gxclhslist.value = false;
|
|
|
};
|
|
|
//工序产量核算【取消】
|
|
|
@@ -2553,19 +2618,19 @@ const ontlssclick = () => {
|
|
|
})
|
|
|
}else{
|
|
|
// //产品代号
|
|
|
- // if( _Gd_cpdh.value === ''){
|
|
|
- // tlsslist.value = false;
|
|
|
- // ElMessage({
|
|
|
- // type: 'warning',
|
|
|
- // message: '该产品号未查询到'
|
|
|
- // })
|
|
|
- // }else{
|
|
|
- // tlssformData['cpdh'] = _Gd_cpdh.value;
|
|
|
- tlssformData['cpdh'] = '100401101';
|
|
|
- tlssformData['cpmc'] = _Gd_cpmc.value;
|
|
|
- tlsslist.value = true;
|
|
|
- _U8Trial();
|
|
|
- // }
|
|
|
+ if( _Gd_cpdh.value === ''){
|
|
|
+ tlsslist.value = false;
|
|
|
+ ElMessage({
|
|
|
+ type: 'warning',
|
|
|
+ message: '该产品号未查询到'
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ tlssformData['cpdh'] = _Gd_cpdh.value;
|
|
|
+ // tlssformData['cpdh'] = '100401101';
|
|
|
+ tlssformData['cpmc'] = _Gd_cpmc.value;
|
|
|
+ tlsslist.value = true;
|
|
|
+ _U8Trial();
|
|
|
+ }
|
|
|
}
|
|
|
};
|
|
|
//点击U8投料试算【回车】
|
|
|
@@ -2579,12 +2644,9 @@ const tlsscpzsgetProductValue = async () => {
|
|
|
//U8投料试算
|
|
|
const _U8Trial = async ()=>{
|
|
|
let productCode = tlssformData['cpdh'];
|
|
|
- console.log(productCode)
|
|
|
try {
|
|
|
const U8Trialdata = await U8Trial({productCode:productCode});
|
|
|
- console.log(U8Trialdata)
|
|
|
tlsstableData.value = U8Trialdata.data;
|
|
|
-
|
|
|
} catch (error) {
|
|
|
console.error(error);
|
|
|
}
|
|
|
@@ -2655,15 +2717,9 @@ const _ProductInformationEdit = async ()=>{
|
|
|
try {
|
|
|
const ProductInformationEditdata = await ProductInformationEdit(params);
|
|
|
if (ProductInformationEditdata.code === 0) {
|
|
|
- ElMessage({
|
|
|
- type: 'success',
|
|
|
- message: '更新成功'
|
|
|
- })
|
|
|
+ ElMessage({type: 'success', message: '更新成功'})
|
|
|
} else {
|
|
|
- ElMessage({
|
|
|
- type: 'error',
|
|
|
- message: '更新失败'
|
|
|
- })
|
|
|
+ ElMessage({type: 'error',message: '更新失败'})
|
|
|
}
|
|
|
} catch (error) {
|
|
|
console.error(error);
|
|
|
@@ -2790,12 +2846,12 @@ const tableRowClick = async (row) => {
|
|
|
yjzuidahaoma.value = Number(tmp[0]) + 1
|
|
|
};
|
|
|
|
|
|
-// 多选数据
|
|
|
-const multipleSelection = ref([])
|
|
|
-// 多选
|
|
|
-const handleSelectionChange = (val) => {
|
|
|
- multipleSelection.value = val
|
|
|
-}
|
|
|
+// // 多选数据
|
|
|
+// const multipleSelection = ref([])
|
|
|
+// // 多选
|
|
|
+// const handleSelectionChange = (val) => {
|
|
|
+// multipleSelection.value = val
|
|
|
+// }
|
|
|
|
|
|
// 行为控制标记（弹窗内部需要增还是改）
|
|
|
const type = ref('')
|
|
|
@@ -2804,9 +2860,14 @@ const type = ref('')
|
|
|
let scgdformData = ref([])
|
|
|
//双击修改
|
|
|
const updateCompanyFunc = async(row) => {
|
|
|
- const DataCorrection_list = await DataCorrection({ Gd_gdbh:row['工单编号']});//接口调用函数
|
|
|
- scgdformData.value = DataCorrection_list.data;
|
|
|
- dialogFormVisible.value = true
|
|
|
+ // if(row['status'] === '*'){
|
|
|
+ // ElMessage({ type: 'warning', message: '未找到该工单印件资料' });
|
|
|
+ // return false;
|
|
|
+ // }else{
|
|
|
+ const DataCorrection_list = await DataCorrection({ Gd_gdbh:row['工单编号']});//接口调用函数
|
|
|
+ scgdformData.value = DataCorrection_list.data;
|
|
|
+ dialogFormVisible.value = true
|
|
|
+ // }
|
|
|
}
|
|
|
// 弹窗控制标记
|
|
|
const dialogFormVisible = ref(false)
|
|
|
@@ -3142,7 +3203,6 @@ const planUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
|
|
|
|
|
|
//修改工单资料弹窗 键盘 input框跳转
|
|
|
const gdzlent =async (event,id1,id2,id3) => {
|
|
|
-
|
|
|
if (id2 === '客户代号' && event.key==='Tab') {
|
|
|
await _gClientList()
|
|
|
khdhModal.value = true
|
|
|
@@ -3151,7 +3211,6 @@ const gdzlent =async (event,id1,id2,id3) => {
|
|
|
await _ProductCodeList()
|
|
|
cpdhModal.value = true
|
|
|
}
|
|
|
-
|
|
|
if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
|
|
|
if(id3!=''){
|
|
|
document.getElementById(id3).focus()
|
