|
|
@@ -1,16 +1,16 @@
|
|
|
<template>
|
|
|
<div>
|
|
|
- <el-container>
|
|
|
+ <layout>
|
|
|
<!-- 左侧树形结构 -->
|
|
|
- <el-aside width="170px">
|
|
|
+ <layout-sider :resize-directions="['right']" :width="300">
|
|
|
<div class="JKWTree-tree" style="width: 100%;height: 746px">
|
|
|
<h3>工单管理</h3>
|
|
|
<el-tree :data="treeData.data" title="" @node-click="handleNodeClick"></el-tree>
|
|
|
</div>
|
|
|
- </el-aside>
|
|
|
+ </layout-sider>
|
|
|
|
|
|
<!-- 右侧内容区域 -->
|
|
|
- <el-container>
|
|
|
+ <layout-content >
|
|
|
<el-main>
|
|
|
<div class="gva-search-box">
|
|
|
|
|
|
@@ -20,7 +20,7 @@
|
|
|
<el-input v-model="searchInfo" placeholder="搜索工单编号" style="width: 200px;margin: 5px"></el-input>
|
|
|
<el-button type="primary" icon="search" @click="onSubmit" style="margin: 5px">查询</el-button>
|
|
|
<el-button type="primary" icon="edit" @click="ontlssclick" style="margin: 5px">U8投料试算</el-button>
|
|
|
- <el-button type="primary" icon="edit" @click="onyycpzlclick" style="margin: 5px">印用产品资料</el-button>
|
|
|
+ <el-button type="primary" icon="edit" @click="onyycpzlclick" style="margin: 5px">引用产品资料</el-button>
|
|
|
<el-button type="primary" icon="edit" @click="oneditgxclhsclick" style="margin: 5px">工序产量核算</el-button>
|
|
|
<el-button type="primary" icon="edit" @click="oneditgylctzclick" style="margin: 5px">工艺流程调整</el-button>
|
|
|
<el-button type="primary" icon="edit" @click="oneditugdclick" style="margin: 5px">查改U8工单</el-button>
|
|
|
@@ -35,7 +35,7 @@
|
|
|
<!--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" style="margin: 5px">投料试算</el-button>
|
|
|
- <el-button type="primary" icon="" disabled @click="onbxgxclicks" style="margin: 5px">必选工序</el-button>
|
|
|
+ <el-button type="primary" icon="" disabled @click="onbxgxclicks" style="margin: 5px">备选工序</el-button>
|
|
|
<el-button type="primary" icon="" disabled @click="onsjgxclicks" style="margin: 5px">实际工序</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;">
|
|
|
@@ -173,23 +173,19 @@
|
|
|
|
|
|
<!--工艺流程调整-->
|
|
|
<el-dialog v-model="gylctzlist" title="工艺方案附加" style="width: 100%;height: 100%;margin: 0px;padding: 0px">
|
|
|
- <el-button type="primary" @click="gylctz_fjbzgx" >附加标准工序</el-button>
|
|
|
+ <el-button type="primary" disabled @click="gylctz_gxdqcpgx" style="margin: 5px;">更新当前产品工序</el-button>
|
|
|
+ <el-button type="primary" @click="gylctz_fjbzgx" style="margin: 5px;">附加标准工序</el-button>
|
|
|
<!--工艺流程调整中 附加标准工序-->
|
|
|
<el-dialog v-model="gdzlfjxx" title="工单工艺流程附加选择" style="width: 80%;height:80%;bottom: 3%;">
|
|
|
- <el-button type="primary" disabled @click="gylctz_gxdqcpgx" style="margin: 5px;display: none">更新当前产品工序</el-button>
|
|
|
-
|
|
|
+ <div><el-button type="primary" @click="addGongyiAttach" :disabled="attachList.length === 0">执行</el-button></div>
|
|
|
<div>
|
|
|
<div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
|
|
|
-<!-- <el-form-item label="参照工单 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">-->
|
|
|
-<!-- <el-input v-model="gdzlfjxxformData['gdbh']"-->
|
|
|
-<!-- @keyup.enter="gdzlfjxxgetProductValue" placeholder="" />-->
|
|
|
-<!-- </el-form-item>-->
|
|
|
<el-form-item label="产品代号 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
|
|
|
<el-input v-model="gdzlfjxxformData['cpdh']" disabled placeholder="" />
|
|
|
<el-input v-model="gdzlfjxxformData['cpmc']" disabled placeholder="" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="工单编号:" prop="originalName" style="margin-left: 20px;">
|
|
|
- <el-select v-model="gdzlfjxxformData.cpgyfan" placeholder="请选择" >
|
|
|
+ <el-select v-model="gdzlfjxxformData.cpgyfan" placeholder="请选择" allow-create filterable >
|
|
|
<el-option v-for="option in gdzlfjxxformData.cpgyfans" @click="ongdzlfanclick" :key="option" :label="option" :value="option" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -201,7 +197,8 @@
|
|
|
:cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
|
|
|
:header-cell-style="{ padding: '0px' }"
|
|
|
style="width: 100%; height: 57vh" border tooltip-effect="dark"
|
|
|
- :data="gdzlfjxxtableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
+ :data="gdzlfjxxtableData" row-key="ID" @selection-change="attachChange">
|
|
|
+ <el-table-column type="selection" width="55" />
|
|
|
<el-table-column v-slot="scope" align="left" label="方案" width="80">
|
|
|
<el-input disabled v-model="scope.row.方案" :clearable="false"/>
|
|
|
</el-table-column>
|
|
|
@@ -360,7 +357,7 @@
|
|
|
<!--修正核算参数-->
|
|
|
<el-dialog v-model="xzhscslist" title="修正核算参数" style="width: 100%;height: 100%;margin: 0px;padding: 0px">
|
|
|
|
|
|
- <el-button type="primary" disabled @click="xzhscsConfirm">更新</el-button>
|
|
|
+ <el-button type="primary" @click="xzhscsConfirm">更新</el-button>
|
|
|
<el-button type="" @click="sxzhscsCancel">退出</el-button>
|
|
|
|
|
|
<div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
|
|
|
@@ -401,7 +398,7 @@
|
|
|
<el-input disabled v-model="scope.row.损耗率" :clearable="false"/>
|
|
|
</el-table-column>
|
|
|
<el-table-column v-slot="scope" align="left" label=新损耗代号 width="150" >
|
|
|
- <el-input v-model="scope.row.损耗代号" :clearable="false"/>
|
|
|
+ <el-input v-model="scope.row.损耗代号" :clearable="false"/>
|
|
|
</el-table-column>
|
|
|
<el-table-column v-slot="scope" align="left" label=原印刷方式 width="100" >
|
|
|
<el-input disabled v-model="scope.row.sxzhscsold_印刷方式" :clearable="false"/>
|
|
|
@@ -506,7 +503,7 @@
|
|
|
<!-- 表格列表 -->
|
|
|
<div class="gva-table-box">
|
|
|
<el-table ref="multipleTable"
|
|
|
- style="width: 100%;height: 40vh"
|
|
|
+ style="width: 100%;height: 30vh"
|
|
|
:row-style="{ height: '20px' }"
|
|
|
:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
:header-cell-style="{ padding: '0px' }"
|
|
|
@@ -559,7 +556,7 @@
|
|
|
:show-overflow-tooltip="true"
|
|
|
highlight-current-row="true"
|
|
|
@row-dblclick="gdyjupdateCompanyFunc"
|
|
|
- style="width: 100%;height: 400px" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
+ style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
<!-- <el-table-column type="selection" width="55" />-->
|
|
|
<el-table-column align="left" label="印件号" prop="印件号" width="80"/>
|
|
|
<el-table-column align="left" label="印件代号" prop="印件代号" width="120"/>
|
|
|
@@ -585,8 +582,10 @@
|
|
|
:show-overflow-tooltip="true"
|
|
|
size="small"
|
|
|
@row-dblclick="gdgyupdateCompanyFunc"
|
|
|
- style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
- <el-table-column type="selection" width="55" />
|
|
|
+ @row-click="clickybupdate2"
|
|
|
+ :row-class-name="rowClassStyle2"
|
|
|
+ style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
+<!-- <el-table-column type="selection" width="55" />-->
|
|
|
<el-table-column align="left" label="重点工序" prop="重点工序" width="100"/>
|
|
|
<el-table-column align="left" label="印件-工序" prop="印件-工序" width="100"/>
|
|
|
<el-table-column align="left" label="备选工序" prop="备选工序" width="100"/>
|
|
|
@@ -602,13 +601,17 @@
|
|
|
<el-table-column align="left" label="机检_正品板" prop="机检_正品板" width="160"/>
|
|
|
<el-table-column align="left" label="机检_次品板" prop="机检_次品板" width="160"/>
|
|
|
<el-table-column align="left" label="机检_废检" prop="机检_废检" width="100"/>
|
|
|
- <el-table-column align="left" label="开数*联数" prop="开数*联数" width="100"/>
|
|
|
+<!-- <el-table-column align="left" label="开数*联数" prop="开数*联数" width="100"/>-->
|
|
|
+ <el-table-column align="left" label="开数" prop="开数" width="70"/>
|
|
|
+ <el-table-column align="left" label="联数" prop="联数" width="70"/>
|
|
|
<el-table-column align="left" label="备注" prop="备注" width="450"/>
|
|
|
<el-table-column align="left" label="印刷方式" prop="印刷方式" width="100"/>
|
|
|
<el-table-column align="left" label="版距" prop="版距" width="100"/>
|
|
|
<el-table-column align="left" label="建档用户" prop="建档用户" width="160"/>
|
|
|
<el-table-column align="left" label="建档日期" prop="建档日期" width="160"/>
|
|
|
<el-table-column align="left" label="更新时间" prop="更新时间" width="160"/>
|
|
|
+ <el-table-column align="left" label="更新时间" prop="更新时间" width="160"/>
|
|
|
+
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
|
|
|
@@ -620,7 +623,7 @@
|
|
|
:show-overflow-tooltip="true"
|
|
|
highlight-current-row="true"
|
|
|
@row-dblclick="gdbomupdateCompanyFunc"
|
|
|
- style="width: 100%;height: 400px" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
+ style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" />
|
|
|
<el-table-column align="left" label="方案" prop="方案" width="120"/>
|
|
|
<el-table-column align="left" label="物料编号" prop="物料编号" width="100"/>
|
|
|
@@ -637,15 +640,15 @@
|
|
|
|
|
|
<!-- 修改工单资料弹窗 -->
|
|
|
<el-dialog v-model="dialogFormVisible" :before-close="closeDialog"
|
|
|
- style="width: 1300px;height: 750px;; bottom: 7%"
|
|
|
+ style="width: 80%;height: 750px;; bottom: 7%"
|
|
|
:title="'修改工单资料'" destroy-on-close>
|
|
|
<el-row>
|
|
|
- <el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" label-width="120px">
|
|
|
+ <el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" >
|
|
|
<!-- 第一排 -->
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="重点工单:" prop="keyOrder">
|
|
|
- <el-input v-model="scgdformData['重点工单']" placeholder="" style="width: 140px;"/>
|
|
|
+ <el-input v-model="scgdformData['重点工单']" placeholder="" style="width: 180px;"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
@@ -655,7 +658,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="工单编号:" prop="orderNumber">
|
|
|
- <el-input v-model="scgdformData.工单编号" placeholder="" style="width: 140px;"/>
|
|
|
+ <el-input v-model="scgdformData['工单编号']" placeholder="" style="width: 140px;"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
@@ -668,7 +671,7 @@
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="客户代号:" prop="customerCode">
|
|
|
- <el-input v-model="scgdformData['客户代号']" placeholder="" style="width: 140px;" />
|
|
|
+ <el-input v-model="scgdformData['客户代号']" placeholder="" style="width: 180px;" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="16">
|
|
|
@@ -681,7 +684,7 @@
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="产品代码:" prop="productCode">
|
|
|
- <el-input v-model="scgdformData['产品代号']" placeholder="" style="width: 140px;"/>
|
|
|
+ <el-input v-model="scgdformData['产品代号']" placeholder="" style="width: 180px;"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="16">
|
|
|
@@ -694,7 +697,7 @@
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="印件代码:" prop="customerCode">
|
|
|
- <el-input v-model="scgdformData['印件代号']" placeholder="" style="width: 140px;"/>
|
|
|
+ <el-input v-model="scgdformData['印件代号']" placeholder="" style="width: 180px;"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="16">
|
|
|
@@ -707,7 +710,7 @@
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="订单数量:" prop="orderQuantity">
|
|
|
- <el-input v-model="scgdformData['订单数量']" placeholder="" style="width: 140px;" />
|
|
|
+ <el-input v-model="scgdformData['订单数量']" placeholder="" style="width: 180px;" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
@@ -731,7 +734,7 @@
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="平张投料:" prop="flatFeed">
|
|
|
- <el-input v-model="scgdformData['平张投料']" placeholder="" style="width: 140px;" />
|
|
|
+ <el-input v-model="scgdformData['平张投料']" placeholder="" style="width: 180px;" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
@@ -810,7 +813,7 @@
|
|
|
<template #footer>
|
|
|
<div class="dialog-footer" style="text-align: right;">
|
|
|
<el-button @click="closeDialog">取 消</el-button>
|
|
|
- <el-button type="primary" disabled @click="enterDialog">确 定</el-button>
|
|
|
+ <el-button type="primary" @click="enterDialog">确 定</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
@@ -849,41 +852,41 @@
|
|
|
</el-form-item>
|
|
|
<div style="display: flex; gap: 0px;">
|
|
|
<el-form-item label="订单数量:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['订单数量']" placeholder="" style="width: 140px;"/>
|
|
|
+ <el-input v-model="gdyjformData['订单数量']" placeholder="" style="width: 100px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="平张投料:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['平张投料']" placeholder="" style="width: 140px;"/>
|
|
|
+ <el-input v-model="gdyjformData['平张投料']" placeholder="" style="width: 100px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="万小张:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['万小张']" placeholder="" style="width: 140px;"/>
|
|
|
+ <el-input v-model="gdyjformData['万小张']" placeholder="" style="width: 100px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="纸张规格:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['投料规格']" placeholder="" style="width: 140px;"/>
|
|
|
+ <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: 140px;"/>
|
|
|
+ <el-input v-model="gdyjformData['开料规格']" placeholder="" style="width: 100px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="开料开数:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['开料开数']" placeholder="" style="width: 140px;"/>
|
|
|
+ <el-input v-model="gdyjformData['开数']" placeholder="" style="width: 100px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="开料联数:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['开料联数']" placeholder="" style="width: 140px;"/>
|
|
|
+ <el-input v-model="gdyjformData['联数']" placeholder="" style="width: 100px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="核算规格:" prop="keyOrder">
|
|
|
- <el-input v-model="gdyjformData['核算规格']" placeholder="" style="width: 140px;"/>
|
|
|
+ <el-input v-model="gdyjformData['核算规格']" placeholder="" style="width: 100px;"/>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<el-form-item label="备注说明:" prop="remark">
|
|
|
- <el-input type="textarea" v-model="gdyjformData['备注说明']" rows="4" clearable placeholder="请输入备注说明" />
|
|
|
+ <el-input type="textarea" v-model="gdyjformData['备注说明']" rows="4" clearable placeholder="" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
<template #footer>
|
|
|
<div class="dialog-footer" style="text-align: right;">
|
|
|
<el-button @click="gdyjcloseDialog">取消</el-button>
|
|
|
- <el-button type="primary" disabled @click="gdyjenterDialog">确定</el-button>
|
|
|
+ <el-button type="primary" @click="gdyjenterDialog">确定</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
@@ -896,73 +899,90 @@
|
|
|
<el-form label-width=" 90px">
|
|
|
<div style="display: flex; gap: 0px;">
|
|
|
<el-form-item label="印件编号:" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['印件-工序']" placeholder="" style="width: 70px;"/>
|
|
|
+ <el-input disabled v-model="gdgyformData['印件']" placeholder="" style="width: 70px;"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="工序编号:" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['工序编号']" placeholder="" style="width: 70px;"/>
|
|
|
+ <el-form-item label="工序编号:" prop="keyOrder" label-width=" 110">
|
|
|
+ <el-input disabled v-model="gdgyformData['工序']" placeholder="" style="width: 70px;"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="重点工序:" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['重点工序']" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-form-item label="重点工序:" prop="keyOrder" label-width=" 120">
|
|
|
+ <el-input v-model="gdgyformData['重点工序']" placeholder="" style="width: 130px;"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备选工序" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['备选工序']" placeholder="" style="width: 70px;"/>
|
|
|
+ <el-form-item label="备选工序：" prop="isBanciSelected" label-width=" 130px">
|
|
|
+ <el-checkbox v-model="gdgyformData['备选工序']"></el-checkbox>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="加工开数:" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['加工开数']" placeholder="" style="width: 70px;"/>
|
|
|
+ <el-form-item label="加工开数:" prop="keyOrder" label-width=" 130">
|
|
|
+ <el-input disabled v-model="gdgyformData['开数']" placeholder="" style="width: 70px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="加工联数:" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['加工联数']" placeholder="" style="width: 70px;"/>
|
|
|
+ <el-input disabled v-model="gdgyformData['联数']" placeholder="" style="width: 70px;"/>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
|
|
|
<div style="display: flex; gap: 0px;">
|
|
|
<el-form-item label="车间名称:" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['车间名称']" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-input disabled v-model="gdgyformData['车间名称']" placeholder="" style="width: 90px;"/>
|
|
|
</el-form-item>
|
|
|
+
|
|
|
<el-form-item label="工艺名称:" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['工艺名称']" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-input disabled v-model="gdgyformData['工艺名称']" placeholder="" style="width: 100px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="工序名称:" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['工序名称']" placeholder="" style="width: 500px;"/>
|
|
|
+ <el-input disabled v-model="gdgyformData['工序名称']" placeholder="" style="width: 450px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="计损色数" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['计损色数']" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-input disabled v-model="gdgyformData['计损色数']" placeholder="" style="width: 100px;"/>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
|
|
|
<el-form-item label="设备编号:" prop="remark">
|
|
|
- <el-input type="textarea" v-model="gdyjformData['设备编号']" rows="4" clearable placeholder="请输入备注说明" />
|
|
|
+ <el-select v-model="gdgyformData['设备编号']" multiple collapse-tags placeholder="请选择设备编号" style="width: 600px; height: auto;">
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in gdzl_MachineList_address.data"
|
|
|
+ :key="index"
|
|
|
+ :label="item"
|
|
|
+ :value="item.split('-->')[0].trim()">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
<div style="display: flex; gap: 0px;">
|
|
|
- <el-form-item label="工序损耗:" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['损耗率']" placeholder="" style="width: 100px;"/>
|
|
|
- <el-input v-model="gdgyformData['工序损耗']" placeholder="" style="width: 170px;margin-left: 10px"/>
|
|
|
+ <el-form-item label="工序损耗:" prop="keyOrder" >
|
|
|
+ <el-input v-model="gdgyformData['shdh']" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-input disabled v-model="gdgyformData['工序名称']" placeholder="" style="width: 800px;margin-left: 10px"/>
|
|
|
</el-form-item>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div style="display: flex; gap: 0px;">
|
|
|
<el-form-item label="损耗系数:" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['损耗系数']" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-input v-model="gdgyformData['损耗系数']" placeholder="" style="width: 90px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="难度系数" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['难度系数']" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-input v-model="gdgyformData['难度系数']" placeholder="" style="width: 90px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="装版工时:" prop="keyOrder">
|
|
|
+ <el-input disabled v-model="gdgyformData['装版工时']" placeholder="" style="width: 90px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="排产小时产能:" prop="keyOrder" label-width=" 120px">
|
|
|
+ <el-input disabled v-model="gdgyformData['小时产能']" placeholder="" style="width: 90px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="印刷方式" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['印刷方式']" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-input disabled v-model="gdgyformData['印刷方式']" placeholder="" style="width: 100px;"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="版距" prop="keyOrder">
|
|
|
- <el-input v-model="gdgyformData['版距']" placeholder="" style="width: 100px;"/>
|
|
|
+ <el-input disabled v-model="gdgyformData['版距']" placeholder="" style="width: 100px;"/>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
|
|
|
<el-form-item label="工序备注:" prop="remark">
|
|
|
- <el-input type="textarea" v-model="gdyjformData['备注']" rows="3" clearable placeholder="" />
|
|
|
+ <el-input disabled type="textarea" v-model="gdgyformData['备注']" rows="3" clearable placeholder="" />
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item label="质量要求:" prop="remark">
|
|
|
- <el-input type="textarea" v-model="gdyjformData['质量要求']" rows="3" clearable placeholder="" />
|
|
|
+ <el-form-item label="质量要求:" prop="remark">
|
|
|
+ <el-input disabled type="textarea" v-model="gdgyformData['质量要求']" rows="3" clearable placeholder="" />
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="质量隐患:" prop="remark">
|
|
|
- <el-input type="textarea" v-model="gdyjformData['质量隐患']" rows="3" clearable placeholder="" />
|
|
|
+ <el-input disabled type="textarea" v-model="gdgyformData['质量隐患']" rows="3" clearable placeholder="" />
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
@@ -989,8 +1009,8 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
</el-main>
|
|
|
- </el-container>
|
|
|
- </el-container>
|
|
|
+ </layout-content>
|
|
|
+ </layout>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -1014,12 +1034,13 @@ export default {
|
|
|
</script>
|
|
|
<script setup>
|
|
|
// 全量引入格式化工具 请按需保留
|
|
|
+import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
|
|
import { ref, reactive } from 'vue'
|
|
|
import {
|
|
|
DataList,
|
|
|
- WorkList,
|
|
|
- Craft, U8workOrder,
|
|
|
+ WorkList,gdzl_MachineList,
|
|
|
+ Craft, U8workOrder,ProcessDetailEdit,PrintedEdit,PrintJobOrder,
|
|
|
Printed,WorkOrderEdit,ReferenceWorkOrder,
|
|
|
Bom,editGyWaste,U8DataCorrection,AccountingParameterEdit,
|
|
|
ProductInformation, TestCoefficient,
|
|
|
@@ -1073,50 +1094,26 @@ const _AccountingParameterdata = async ()=>{
|
|
|
|
|
|
//修正核算参数【更新】
|
|
|
const xzhscsConfirm = async () => {
|
|
|
- console.log(sxzhscstableData)
|
|
|
- if (sxzhscstableData._rawValue) {
|
|
|
- const rawValueArray = sxzhscstableData._rawValue;
|
|
|
- const formattedData = rawValueArray.map(item => {
|
|
|
+ if (sxzhscstableData.value) {
|
|
|
+ const formattedData = sxzhscstableData.value.map(item => {
|
|
|
return {
|
|
|
- difficulty: item.难度系数 !== null ? item.难度系数 : "",
|
|
|
- loss: item.损耗代号 !== null ? item.损耗代号 : "",
|
|
|
- printMode: item.印刷方式 !== null ? item.印刷方式 : "",
|
|
|
- plate: item.版距 !== null ? item.版距 : "",
|
|
|
- chromatic: item.计损色数 !== null ? item.计损色数 : "",
|
|
|
- wastage: item.损耗系数 !== null ? item.损耗系数 : "",
|
|
|
- Uniqid: item.UniqId
|
|
|
+ Uniqid: parseInt(item.UniqId),
|
|
|
+ chromatic: parseFloat(item.计损色数),
|
|
|
+ difficulty: parseFloat(item.难度系数),
|
|
|
+ loss: item.损耗代号 ??'',
|
|
|
+ plate: parseInt(item.版距),
|
|
|
+ printMode: item.印刷方式 ?? '',
|
|
|
+ wastage: parseFloat(item.损耗系数),
|
|
|
}
|
|
|
});
|
|
|
- // const formattedData = [
|
|
|
- // {
|
|
|
- // "difficulty": 1.000,
|
|
|
- // "loss": "001001",
|
|
|
- // "printMode": "",
|
|
|
- // "plate": 550,
|
|
|
- // "chromatic": 4.50,
|
|
|
- // "wastage": 1.100,
|
|
|
- // "Uniqid":265159
|
|
|
- // },
|
|
|
- // {
|
|
|
- // "difficulty": 1.100,
|
|
|
- // "loss": "004003002",
|
|
|
- // "printMode": "卷对张",
|
|
|
- // "plate": 50,
|
|
|
- // "chromatic": 1.50,
|
|
|
- // "wastage": 1.000,
|
|
|
- // "Uniqid":265160
|
|
|
- // }
|
|
|
- // ]
|
|
|
-
|
|
|
- console.log(formattedData);
|
|
|
- const AccountingParameterEditdata = await AccountingParameterEdit(formattedData);
|
|
|
- console.log(AccountingParameterEditdata);
|
|
|
- if (AccountingParameterEditdata.code === 0) {
|
|
|
- ElMessage({ type: 'success', message: '更新成功' });
|
|
|
- } else {
|
|
|
- ElMessage({ type: 'error', message: '更新失败' });
|
|
|
- }
|
|
|
- // xzhscslist.value = false;
|
|
|
+ const AccountingParameterEditdata = await AccountingParameterEdit(formattedData);
|
|
|
+ console.log(AccountingParameterEditdata);
|
|
|
+ if (AccountingParameterEditdata.code === 0) {
|
|
|
+ ElMessage({ type: 'success', message: '更新成功' });
|
|
|
+ } else {
|
|
|
+ ElMessage({ type: 'error', message: '更新失败' });
|
|
|
+ }
|
|
|
+ // xzhscslist.value = false;
|
|
|
} else {
|
|
|
console.error("数据错误");
|
|
|
}
|
|
|
@@ -1139,10 +1136,7 @@ const scfjfpxstableData = ref([]);
|
|
|
const onzjfpxsclick = () => {
|
|
|
if(_Gd_gdbh.value == null){
|
|
|
scfjfpxslist.value = false;
|
|
|
- ElMessage({
|
|
|
- type: 'warning',
|
|
|
- message: '请选择具体的工单后，再操作此功能'
|
|
|
- })
|
|
|
+ ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'});
|
|
|
}else{
|
|
|
scfjfpxsformData['cpdh'] = _Gd_gdbh.value;
|
|
|
_TestCoefficient();
|
|
|
@@ -1152,6 +1146,11 @@ const onzjfpxsclick = () => {
|
|
|
|
|
|
//质检废品系数【回车】
|
|
|
const scfjfpxsgetProductValue = () => {
|
|
|
+ if(scfjfpxsformData['cpdh'] === ''){
|
|
|
+ scfjfpxstableData.value = [];
|
|
|
+ ElMessage({type: 'warning',message: '输入框为空'});
|
|
|
+ return false;
|
|
|
+ }
|
|
|
_TestCoefficient();
|
|
|
};
|
|
|
//修正工单核算参数->数据获取
|
|
|
@@ -1177,7 +1176,6 @@ const _TestCoefficient = async ()=>{
|
|
|
//质检废品系数【更新】
|
|
|
const scfjfpxsConfirm = async () => {
|
|
|
const rawValueArray = scfjfpxstableData._rawValue;
|
|
|
- // console.log(rawValueArray)
|
|
|
const formattedData = rawValueArray.map(item => {
|
|
|
return {
|
|
|
UniqID: item.Uniqid,
|
|
|
@@ -1189,14 +1187,13 @@ const scfjfpxsConfirm = async () => {
|
|
|
machine_fj: item.机检废检 !== null ? item.机检废检 : ""
|
|
|
}
|
|
|
});
|
|
|
- console.log(formattedData)
|
|
|
const editGyWastes = await editGyWaste(formattedData);
|
|
|
if (editGyWastes.code === 0) {
|
|
|
+ scfjfpxslist.value = false;
|
|
|
ElMessage({type: 'success',message: '更新成功'})
|
|
|
} else {
|
|
|
ElMessage({type: 'error',message: '更新失败'})
|
|
|
}
|
|
|
- scfjfpxslist.value = false;
|
|
|
};
|
|
|
|
|
|
//质检废品系数【退出】
|
|
|
@@ -1237,10 +1234,10 @@ const cgugdProductValue = () => {
|
|
|
//查改U8工单->工单列表
|
|
|
const _U8workOrder = async ()=>{
|
|
|
let workOrder = cgugdformData['gdbh'];
|
|
|
- console.log(workOrder)
|
|
|
+ // console.log(workOrder)
|
|
|
try {
|
|
|
const U8workOrderdata = await U8workOrder({workOrder:workOrder});
|
|
|
- console.log(U8workOrderdata)
|
|
|
+ // console.log(U8workOrderdata)
|
|
|
cgugdtableData.value = U8workOrderdata.data;
|
|
|
} catch (error) {
|
|
|
console.error(error);
|
|
|
@@ -1252,21 +1249,26 @@ const multipleSelection = ref([]);
|
|
|
|
|
|
// 多选
|
|
|
const cguzlgd_del = (val) => {
|
|
|
- multipleSelection.value.push(...val.map(item => item.序号));
|
|
|
+ if (Array.isArray(val) && val.length === 0) {
|
|
|
+ multipleSelection.value = [];
|
|
|
+ } else {
|
|
|
+ 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: '删除成功'})
|
|
|
} else {
|
|
|
ElMessage({type: 'error',message: '删除失败'})
|
|
|
}
|
|
|
// 清空 multipleSelection 为空数组，只有在处理完数据后清空
|
|
|
- multipleSelection.value = [];
|
|
|
} catch (error) {
|
|
|
console.error(error);
|
|
|
}
|
|
|
@@ -1362,12 +1364,12 @@ const _ProcessFlow_xiala = async (workOrder)=>{
|
|
|
}
|
|
|
}
|
|
|
//点击附加标准工序【按钮】
|
|
|
-const gylctz_fjbzgx = () => {
|
|
|
+const gylctz_fjbzgx = async () => {
|
|
|
gdzlfjxxformData['cpdh'] = _Gd_cpdh.value;
|
|
|
gdzlfjxxformData['gdbh'] = _Gd_gdbh.value;
|
|
|
gdzlfjxxformData['cpmc'] = _Gd_cpmc.value;
|
|
|
gdzlfjxxtableData.value = [];
|
|
|
- _ReferenceWorkOrder();
|
|
|
+ await _ReferenceWorkOrder();
|
|
|
gdzlfjxx.value = true;
|
|
|
};
|
|
|
// 工艺流程调整->参照工单列表获取【展示下拉框的数据】
|
|
|
@@ -1389,6 +1391,8 @@ const _ReferenceWorkOrder = async ()=>{
|
|
|
}
|
|
|
//默认获取下拉框第一个值
|
|
|
const workOrder = gdzlfjxxformData.cpgyfan[0]
|
|
|
+ console.log(gdzlfjxxformData.cpgyfans)
|
|
|
+ gdzlfjxxformData.cpgyfan = gdzlfjxxformData.cpgyfans[0]
|
|
|
_ProcessFlow_xiala(workOrder)
|
|
|
}else{
|
|
|
console.log("该产品下没有工单")
|
|
|
@@ -1495,7 +1499,7 @@ const _U8Trial = async ()=>{
|
|
|
//U8投料试算【退出】
|
|
|
const oncloneclick = () => {tlsslist.value = false;};
|
|
|
|
|
|
-// =========== 印用产品资料 ===========
|
|
|
+// =========== 引用产品资料 ===========
|
|
|
const yycpzlformData = reactive({
|
|
|
gdbh: '',
|
|
|
khdh: '',
|
|
|
@@ -1507,7 +1511,7 @@ const yycpzlformData = reactive({
|
|
|
gyfa: '',
|
|
|
});
|
|
|
const onyycpzllist = ref(false);
|
|
|
-//点击【印用产品资料】按钮
|
|
|
+//引用产品资料【按钮】
|
|
|
const onyycpzlclick = () => {
|
|
|
if(_Gd_gdbh.value == null){
|
|
|
onyycpzllist.value = false;
|
|
|
@@ -1521,7 +1525,7 @@ const onyycpzlclick = () => {
|
|
|
onyycpzllist.value = true;
|
|
|
}
|
|
|
};
|
|
|
-//印用产品资料【回车】
|
|
|
+//引用产品资料【回车】
|
|
|
const yycpzlProductValue = async () => {
|
|
|
_ProductInformations();
|
|
|
};
|
|
|
@@ -1540,7 +1544,7 @@ const _ProductInformations = async ()=>{
|
|
|
console.error(error);
|
|
|
}
|
|
|
}
|
|
|
-//印用产品资料执行
|
|
|
+//引用产品资料【执行】
|
|
|
const yycpzlhandleConfirm = async () => {
|
|
|
// console.log(yycpzlformData)
|
|
|
_ProductInformationEdit();
|
|
|
@@ -1569,7 +1573,7 @@ const _ProductInformationEdit = async ()=>{
|
|
|
}
|
|
|
onyycpzllist.value = false;
|
|
|
}
|
|
|
-//印用产品资料放弃
|
|
|
+//引用产品资料【放弃】
|
|
|
const yycpzlhandleCancel = () => {onyycpzllist.value = false;};
|
|
|
|
|
|
// =========== 左侧树侧形结构 ===========
|
|
|
@@ -1607,7 +1611,6 @@ const handleNodeClick = async (node) => {
|
|
|
gytableData.value = [];
|
|
|
yjtableData.value = [];
|
|
|
bomtableData.value = [];
|
|
|
-
|
|
|
const Gd_khdh = node.label.substring(0, 4);
|
|
|
try {
|
|
|
const WorkListdata = await WorkList({ Gd_khdh:Gd_khdh,limit:100,page:1});//接口调用函数
|
|
|
@@ -1668,6 +1671,13 @@ const onSubmit = () => {
|
|
|
_cha_WorkList();
|
|
|
};
|
|
|
const _cha_WorkList = async (node) => {
|
|
|
+ if(searchInfo.value === ''){
|
|
|
+ ElMessage({
|
|
|
+ type: 'warning',
|
|
|
+ message: '请输入搜索的信息'
|
|
|
+ })
|
|
|
+ return false;
|
|
|
+ }
|
|
|
const search = searchInfo.value;
|
|
|
try {
|
|
|
const WorkListdata = await WorkList({ search:search,limit:1,page:1});//接口调用函数
|
|
|
@@ -1691,58 +1701,60 @@ const type = ref('')
|
|
|
|
|
|
|
|
|
//=========表格列表修改========
|
|
|
-// let scgdformData = reactive({})
|
|
|
let scgdformData = ref([])
|
|
|
-//表格工单编号
|
|
|
-const _gdbhcode = ref(null)
|
|
|
//双击修改
|
|
|
const updateCompanyFunc = async(row) => {
|
|
|
- // console.log(row)
|
|
|
- // Object.assign(scgdformData,row);
|
|
|
- // _gdbhcode.value = row['工单编号'];
|
|
|
const DataCorrection_list = await DataCorrection({ Gd_gdbh:row['工单编号']});//接口调用函数
|
|
|
+ console.log(DataCorrection_list)
|
|
|
scgdformData.value = DataCorrection_list.data;
|
|
|
- console.log(scgdformData.value.工单编号)
|
|
|
dialogFormVisible.value = true
|
|
|
}
|
|
|
// 弹窗控制标记
|
|
|
const dialogFormVisible = ref(false)
|
|
|
// 弹窗确定
|
|
|
const enterDialog = async () => {
|
|
|
+ const zdgx = /^[A-Za-z0-9\u4e00-\u9fa5\s]*$/.test(scgdformData.value['重点工单']);
|
|
|
+ if (!zdgx) {
|
|
|
+ ElMessage({ type: 'warning', message: '重点工单数据中 只允许出现中文、数字、空格' });
|
|
|
+ return false;
|
|
|
+ }
|
|
|
const formattedData = {
|
|
|
- //重点工单
|
|
|
- 'lx': scgdformData._rawValue['重点工单'],
|
|
|
- 'kdrq': scgdformData._rawValue['开单日期'],
|
|
|
- 'gdbh': scgdformData._rawValue['工单编号'],
|
|
|
- 'scfl': scgdformData._rawValue['生产分类'],
|
|
|
- 'khdh': scgdformData._rawValue['客户代号'],
|
|
|
- 'khmc': scgdformData._rawValue['客户名称'],
|
|
|
- 'cpdh': scgdformData._rawValue['产品代号'],
|
|
|
- 'cpmc': scgdformData._rawValue['产品名称'],
|
|
|
- // 'yjdh': scgdformData._rawValue['印件代号'],
|
|
|
- // 'yjmc': scgdformData._rawValue['印件名称'],
|
|
|
- 'ddsl': scgdformData._rawValue['订单数量'],
|
|
|
- 'jhrq': scgdformData._rawValue['交货日期'],
|
|
|
- 'tll': scgdformData._rawValue['投料率'],
|
|
|
- // 'avg': scgdformData._rawValue['平均合格率'],
|
|
|
- 'jhtl': scgdformData._rawValue['平张投料'],
|
|
|
- 'sjtl': scgdformData._rawValue['万小张'],
|
|
|
- 'jldw': scgdformData._rawValue['单位'],
|
|
|
- 'tldx': scgdformData._rawValue['投料大箱'],
|
|
|
- // 'kc': scgdformData._rawValue['库存大箱'],
|
|
|
- 'xsddh': scgdformData._rawValue['销售订单号'],
|
|
|
- 'jymb': scgdformData._rawValue['警语版面'],
|
|
|
- 'bbh': scgdformData._rawValue['版本号'],
|
|
|
- 'erp': scgdformData._rawValue['客户ERP编码'],
|
|
|
- 'ymsl': scgdformData._rawValue['码源数量'],
|
|
|
- 'jcbz': scgdformData._rawValue['进程备注'],
|
|
|
- 'desc': scgdformData._rawValue['备注'],
|
|
|
- 'printID': scgdformData._rawValue['印件ID'],
|
|
|
-
|
|
|
+ lx: scgdformData.value['重点工单'],
|
|
|
+ kdrq: scgdformData.value['开单日期'],
|
|
|
+ gdbh: scgdformData.value['工单编号'],
|
|
|
+ scfl: scgdformData.value['生产类型'],
|
|
|
+ khdh: scgdformData.value['客户代号'],
|
|
|
+ khmc: scgdformData.value['客户名称'],
|
|
|
+ cpdh: scgdformData.value['产品代号'],
|
|
|
+ cpmc: scgdformData.value['产品名称'],
|
|
|
+ ddsl: scgdformData.value['订单数量'],
|
|
|
+ jhrq: scgdformData.value['交货日期'],
|
|
|
+ tll: scgdformData.value['投料率'],
|
|
|
+ jhtl: scgdformData.value['平张投料'],
|
|
|
+ sjtl: scgdformData.value['万小张'],
|
|
|
+ jldw: scgdformData.value['单位'],
|
|
|
+ tldx: scgdformData.value['投料大箱'],
|
|
|
+ xsddh: scgdformData.value['销售订单号'],
|
|
|
+ jymb: scgdformData.value['警语版面'],
|
|
|
+ bbh: scgdformData.value['版本号'],
|
|
|
+ erp: scgdformData.value['客户ERP编码'],
|
|
|
+ ymsl: scgdformData.value['码源数量'],
|
|
|
+ jcbz: scgdformData.value['进程备注'],
|
|
|
+ desc: scgdformData.value['备注'],
|
|
|
+ Uniqid: scgdformData.value['Uniqid'],
|
|
|
+ yjdh: scgdformData.value['印件代号'],
|
|
|
+ yjmc: scgdformData.value['印件名称'],
|
|
|
+ kc: scgdformData.value['库存大箱'],
|
|
|
+ avg:scgdformData.value['平均合格率'] === undefined ? '' : scgdformData.value['平均合格率'],
|
|
|
+ printID: scgdformData.value['印件ID'],
|
|
|
};
|
|
|
- console.log(formattedData)
|
|
|
- const WorkOrderEdit_edit = await WorkOrderEdit(formattedData);//接口调用函数
|
|
|
- console.log(WorkOrderEdit_edit)
|
|
|
+ const WorkOrderEdit_edit = await WorkOrderEdit(formattedData);
|
|
|
+ if (WorkOrderEdit_edit.code === 0) {
|
|
|
+ dialogFormVisible.value = false
|
|
|
+ ElMessage({type: 'success',message: '更新成功' })
|
|
|
+ } else {
|
|
|
+ ElMessage({type: 'error', message: '更新失败'})
|
|
|
+ }
|
|
|
}
|
|
|
// 关闭弹窗
|
|
|
const closeDialog = () => {dialogFormVisible.value = false}
|
|
|
@@ -1753,13 +1765,45 @@ const gdyjdialogFormVisible = ref(false)
|
|
|
const gdyjformData = reactive({})
|
|
|
//双击打开印件列表修改
|
|
|
const gdyjupdateCompanyFunc = async(row) => {
|
|
|
- console.log(row)
|
|
|
+ gdyjformData['开数'] = row['开数'];
|
|
|
+ gdyjformData['联数'] = row['联数'];
|
|
|
Object.assign(gdyjformData,row);
|
|
|
gdyjdialogFormVisible.value = true
|
|
|
}
|
|
|
//印件列表修改【确定】
|
|
|
-const gdyjenterDialog = () => {
|
|
|
- gdyjdialogFormVisible.value = false
|
|
|
+const gdyjenterDialog = async () => {
|
|
|
+ const formattedData = {
|
|
|
+ Uniqid: gdyjformData['Uniqid'],
|
|
|
+ yjno: gdyjformData['印件号'] ? gdyjformData['印件号'] : "",
|
|
|
+ yjdh: gdyjformData['印件代号'] ? gdyjformData['印件代号'] : "",
|
|
|
+ yjmc: gdyjformData['印件名称'] ? gdyjformData['印件名称'] : "",
|
|
|
+ zzdh:gdyjformData['纸张代号'] ? gdyjformData['纸张代号'] : "",
|
|
|
+ zzmc:gdyjformData['纸张名称'] ? gdyjformData['纸张名称'] : "",
|
|
|
+ zzdh1:gdyjformData['zzdh1'] ? gdyjformData['zzdh1'] : "",
|
|
|
+ zzdh2:gdyjformData['zzdh2'] ? gdyjformData['zzdh2'] : "",
|
|
|
+ zzdh3:gdyjformData['zzdh3'] ? gdyjformData['zzdh3'] : "",
|
|
|
+ zzdh4:gdyjformData['zzdh4'] ? gdyjformData['zzdh4'] : "",
|
|
|
+ zzmc1:gdyjformData['zzmc1'] ? gdyjformData['zzmc1'] : "",
|
|
|
+ zzmc2:gdyjformData['zzmc2'] ? gdyjformData['zzmc2'] : "",
|
|
|
+ zzmc3:gdyjformData['zzmc3'] ? gdyjformData['zzmc3'] : "",
|
|
|
+ zzmc4:gdyjformData['zzmc4'] ? gdyjformData['zzmc4'] : "",
|
|
|
+ cpsl:gdyjformData['订单数量'] ? gdyjformData['订单数量'] : "",
|
|
|
+ pztl:gdyjformData['平张投料'] ? gdyjformData['平张投料'] : "",
|
|
|
+ sjtl:gdyjformData['万小张'] ? gdyjformData['万小张'] : "",
|
|
|
+ tlgg:gdyjformData['投料规格'] ? gdyjformData['投料规格'] : "",
|
|
|
+ klgg:gdyjformData['开料规格'] ? gdyjformData['开料规格'] : "",
|
|
|
+ ks:gdyjformData['开数'] ? gdyjformData['开数'] : "",
|
|
|
+ ls:gdyjformData['联数'] ? gdyjformData['联数'] : "",
|
|
|
+ hsgg:gdyjformData['核算规格'] ? gdyjformData['核算规格'] : "",
|
|
|
+ desc:gdyjformData['备注'] ? gdyjformData['备注'] : "",
|
|
|
+ };
|
|
|
+ const PrintedEdit_edit = await PrintedEdit(formattedData);
|
|
|
+ if (PrintedEdit_edit.code === 0) {
|
|
|
+ gdyjdialogFormVisible.value = false
|
|
|
+ ElMessage({type: 'success',message: '更新成功' })
|
|
|
+ } else {
|
|
|
+ ElMessage({type: 'error', message: '更新失败'})
|
|
|
+ }
|
|
|
}
|
|
|
// 印件列表修改【关闭弹窗】
|
|
|
const gdyjcloseDialog = () => {
|
|
|
@@ -1770,15 +1814,95 @@ const gdyjcloseDialog = () => {
|
|
|
//=========工艺列表修改========
|
|
|
const gdgydialogFormVisible = ref(false)
|
|
|
const gdgyformData = reactive({})
|
|
|
+
|
|
|
+const gdzl_MachineList_address = reactive({
|
|
|
+ data: []
|
|
|
+});
|
|
|
+const _cjmc = ref(null);
|
|
|
//双击修改
|
|
|
const gdgyupdateCompanyFunc = async(row) => {
|
|
|
+ console.log("双击了")
|
|
|
+ console.log(row)
|
|
|
+
|
|
|
+ if(row['车间名称']){
|
|
|
+ _cjmc.value = row['车间名称']
|
|
|
+ }else{
|
|
|
+ _cjmc.value = '';
|
|
|
+ }
|
|
|
+ // console.log(_cjmc.value);
|
|
|
+ const MachineList_jitai = await gdzl_MachineList({address:_cjmc.value});
|
|
|
+ gdzl_MachineList_address.data = MachineList_jitai.data;
|
|
|
+ // console.log(gdzl_MachineList_address)
|
|
|
+ // console.log(gdzl_MachineList.data)
|
|
|
+
|
|
|
+ // 示例字符串
|
|
|
+ const processName = row['工序名称'];
|
|
|
+ // 初始化工艺名称和工序名称
|
|
|
+ let technologyName = '';
|
|
|
+ let operationName = '';
|
|
|
+ // 检查字符串中是否包含【】
|
|
|
+ const bracketIndex = processName.indexOf('【');
|
|
|
+ if (bracketIndex !== -1) {
|
|
|
+ // 如果包含【】，则分割字符串
|
|
|
+ technologyName = processName.substring(0, bracketIndex).trim();
|
|
|
+ operationName = processName.substring(bracketIndex + 1, processName.indexOf('】')).trim();
|
|
|
+ } else {
|
|
|
+ // 如果没有【】，则整个字符串是工艺名称，工序名称为空
|
|
|
+ technologyName = processName.trim();
|
|
|
+ }
|
|
|
+
|
|
|
+ // 示例字符串
|
|
|
+ const printProcess = row['印件-工序'];
|
|
|
+ // 初始化印件和工序
|
|
|
+ let yinjian = '';
|
|
|
+ let gongxu = '';
|
|
|
+ // 检查字符串中是否包含 "-"
|
|
|
+ const dashIndex = printProcess.indexOf('-');
|
|
|
+ if (dashIndex !== -1) {
|
|
|
+ // 如果包含 "-"，则分割字符串
|
|
|
+ yinjian = printProcess.substring(0, dashIndex).trim();
|
|
|
+ gongxu = printProcess.substring(dashIndex + 1).trim();
|
|
|
+ } else {
|
|
|
+ // 如果没有 "-"，则整个字符串是印件，工序为空
|
|
|
+ yinjian = printProcess.trim();
|
|
|
+ }
|
|
|
+ gdgyformData['印件'] = yinjian;
|
|
|
+ gdgyformData['工序'] = gongxu;
|
|
|
+ gdgyformData['工艺名称'] = technologyName;
|
|
|
+ gdgyformData['工序名称'] = operationName;
|
|
|
+
|
|
|
Object.assign(gdgyformData,row);
|
|
|
gdgydialogFormVisible.value = true
|
|
|
}
|
|
|
|
|
|
//工艺列表修改【确定】
|
|
|
-const gdgyenterDialog = () => {
|
|
|
- gdgydialogFormVisible.value = false
|
|
|
+const gdgyenterDialog = async () => {
|
|
|
+ if(_Gd_gdbh.value){
|
|
|
+ const selectedValuesAsString = gdgyformData['设备编号'].join(' ');
|
|
|
+ if(gdgyformData['shdh'] === ''){
|
|
|
+ ElMessage({type: 'warning', message: '工序损耗不能为空'})
|
|
|
+ }
|
|
|
+ const formattedData = {
|
|
|
+ sbbh: selectedValuesAsString ? selectedValuesAsString : "",
|
|
|
+ shdh: gdgyformData['shdh'] ? gdgyformData['shdh'] : "",
|
|
|
+ shxs:gdgyformData['损耗系数'] ? gdgyformData['损耗系数'] : "",
|
|
|
+ ndxs:gdgyformData['难度系数'] ? gdgyformData['难度系数'] : "",
|
|
|
+ zdgx: gdgyformData['重点工序'] ? gdgyformData['重点工序'] : "",
|
|
|
+ bxgx: gdgyformData['备选工序'] ? 1 : "",
|
|
|
+ UniqId: gdgyformData['UniqId'],
|
|
|
+ workOrder: _Gd_gdbh.value,
|
|
|
+ };
|
|
|
+ console.log(formattedData)
|
|
|
+ const ProcessDetailEdit_edit = await ProcessDetailEdit(formattedData);
|
|
|
+ if (ProcessDetailEdit_edit.code === 0) {
|
|
|
+ gdgydialogFormVisible.value = false
|
|
|
+ ElMessage({type: 'success',message: '更新成功' })
|
|
|
+ } else {
|
|
|
+ ElMessage({type: 'error', message: '更新失败'})
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ ElMessage({type: 'error', message: '更新失败'})
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//工艺列表修改【关闭弹窗】
|
|
|
@@ -1789,6 +1913,32 @@ const gdgycloseDialog = () => {
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
+//颜色变黄
|
|
|
+const currentGy0_yjno = ref(null)
|
|
|
+const rowClassStyle2 = ({row,rowIndex}) =>{
|
|
|
+ // debugger
|
|
|
+ // console.log(row.Gy0_yjno, this.currentGy0_yjno)
|
|
|
+ if(row['印件-工序'].substr(0, 2)==currentGy0_yjno.value){
|
|
|
+ return "warning-row"
|
|
|
+ }
|
|
|
+ return "warning-row"
|
|
|
+}
|
|
|
+const clickybupdate2 = (row,column,event) => {
|
|
|
+ currentGy0_yjno.value = row['印件-工序'].substr(0, 2)
|
|
|
+}
|
|
|
+
|
|
|
+const attachList = ref([])
|
|
|
+const attachChange = (val) => {
|
|
|
+ attachList.value = val
|
|
|
+}
|
|
|
+
|
|
|
+const addGongyiAttach = () =>
|
|
|
+{
|
|
|
+ attachList.value.map(row => gylctztableData.value.push(row))
|
|
|
+ gdzlfjxx.value = false
|
|
|
+}
|
|
|
+
|
|
|
//=========BOM列表修改========
|
|
|
// const bomdialogFormVisible = ref(false)
|
|
|
// //双击修改
|
|
|
@@ -1808,6 +1958,10 @@ const gdgycloseDialog = () => {
|
|
|
|
|
|
</script>
|
|
|
<style scoped>
|
|
|
+
|
|
|
+:deep(.el-table__body .warning-row) {
|
|
|
+ background: #FFFF80 !important;
|
|
|
+}
|
|
|
:deep(.el-table td .cell) {
|
|
|
line-height: 30px !important;
|
|
|
}
|
|
|
@@ -1839,4 +1993,6 @@ const gdgycloseDialog = () => {
|
|
|
:deep(.el-table__body tr.current-row) > td {
|
|
|
background: #ff80ff !important;
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
</style>
|
