|
@@ -505,6 +505,7 @@
|
|
|
row-key="ID"
|
|
row-key="ID"
|
|
|
@row-click="tableRowClick"
|
|
@row-click="tableRowClick"
|
|
|
highlight-current-row="true"
|
|
highlight-current-row="true"
|
|
|
|
|
+ :cell-class-name="tableDataCellClass"
|
|
|
@row-dblclick="updateCompanyFunc"
|
|
@row-dblclick="updateCompanyFunc"
|
|
|
@selection-change="handleSelectionChange"
|
|
@selection-change="handleSelectionChange"
|
|
|
:show-overflow-tooltip="true">
|
|
:show-overflow-tooltip="true">
|
|
@@ -530,12 +531,6 @@
|
|
|
<el-table-column align="left" label="更新时间" prop="更新时间" width="160" />
|
|
<el-table-column align="left" label="更新时间" prop="更新时间" width="160" />
|
|
|
</el-table>
|
|
</el-table>
|
|
|
<!-- 分页 -->
|
|
<!-- 分页 -->
|
|
|
-<!-- <div class="gva-pagination">-->
|
|
|
|
|
-<!-- <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page"-->
|
|
|
|
|
-<!-- :page-size="pageSize" :total="total" :page-sizes="[10, 30, 50, 100]"-->
|
|
|
|
|
-<!-- @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
|
|
|
|
|
-<!-- </div>-->
|
|
|
|
|
-
|
|
|
|
|
<div class="gva-pagination">
|
|
<div class="gva-pagination">
|
|
|
<el-pagination
|
|
<el-pagination
|
|
|
@size-change="handleSizeChange"
|
|
@size-change="handleSizeChange"
|
|
@@ -546,16 +541,6 @@
|
|
|
:total="total">
|
|
:total="total">
|
|
|
</el-pagination>
|
|
</el-pagination>
|
|
|
</div>
|
|
</div>
|
|
|
-
|
|
|
|
|
-<!-- <div class="gva-pagination">-->
|
|
|
|
|
-<!-- <el-pagination layout="total" :current-page="page" :page-size="pageSize"-->
|
|
|
|
|
-<!-- :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
|
|
|
|
|
-<!-- <!– <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]"–>-->
|
|
|
|
|
-<!-- <!– :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />–>-->
|
|
|
|
|
-<!-- </div>-->
|
|
|
|
|
-<!-- -->
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<!-- 印件资料、工艺资料、BOM资料列表 -->
|
|
<!-- 印件资料、工艺资料、BOM资料列表 -->
|
|
@@ -632,6 +617,7 @@
|
|
|
:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
:header-cell-style="{ padding: '0px' }"
|
|
:header-cell-style="{ padding: '0px' }"
|
|
|
:show-overflow-tooltip="true"
|
|
:show-overflow-tooltip="true"
|
|
|
|
|
+ :cell-class-name="planUsageCellClass"
|
|
|
highlight-current-row="true"
|
|
highlight-current-row="true"
|
|
|
@row-dblclick="gdbomupdateCompanyFunc"
|
|
@row-dblclick="gdbomupdateCompanyFunc"
|
|
|
style="width: 100%;height: 40vh" 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">
|
|
@@ -639,7 +625,7 @@
|
|
|
<el-table-column align="left" label="方案" prop="方案" width="120"/>
|
|
<el-table-column align="left" label="方案" prop="方案" width="120"/>
|
|
|
<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="400"/>
|
|
<el-table-column align="left" label="物料名称" prop="物料名称" width="400"/>
|
|
|
- <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="120"/>
|
|
<el-table-column align="left" label="建档用户" prop="建档用户" width="120"/>
|
|
|
<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"/>
|
|
@@ -650,29 +636,29 @@
|
|
|
|
|
|
|
|
<!-- 修改工单资料弹窗 -->
|
|
<!-- 修改工单资料弹窗 -->
|
|
|
<el-dialog v-model="dialogFormVisible" :before-close="closeDialog"
|
|
<el-dialog v-model="dialogFormVisible" :before-close="closeDialog"
|
|
|
- style="width: 80%;height: 750px;; bottom: 7%"
|
|
|
|
|
|
|
+ style="width: 75%;height: 77%; bottom: 7%"
|
|
|
:title="'修改工单资料'" destroy-on-close>
|
|
:title="'修改工单资料'" destroy-on-close>
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" >
|
|
<el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" >
|
|
|
<!-- 第一排 -->
|
|
<!-- 第一排 -->
|
|
|
<el-row :gutter="24">
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="重点工单:" prop="keyOrder">
|
|
|
|
|
- <el-input v-model="scgdformData['重点工单']" placeholder="" style="width: 180px;"/>
|
|
|
|
|
|
|
+ <el-form-item label="重点工单:" prop="keyOrder" class="mab">
|
|
|
|
|
+ <el-input v-model="scgdformData['重点工单']" placeholder="" style="width: 170px;"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="开单日期" prop="orderDate">
|
|
|
|
|
|
|
+ <el-form-item label="开单日期" prop="orderDate" class="mab">
|
|
|
<el-date-picker v-model="scgdformData['开单日期']" type="date" placeholder="" style="width: 280px;" />
|
|
<el-date-picker v-model="scgdformData['开单日期']" type="date" placeholder="" style="width: 280px;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
<el-col :span="5">
|
|
|
- <el-form-item label="工单编号:" prop="orderNumber">
|
|
|
|
|
|
|
+ <el-form-item label="工单编号:" prop="orderNumber" class="mab">
|
|
|
<el-input v-model="scgdformData['工单编号']" placeholder="" style="width: 140px;"/>
|
|
<el-input v-model="scgdformData['工单编号']" placeholder="" style="width: 140px;"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
<el-col :span="5">
|
|
|
- <el-form-item label="生产类型:" prop="productionType">
|
|
|
|
|
|
|
+ <el-form-item label="生产类型:" prop="productionType" class="mab">
|
|
|
<el-input v-model="scgdformData['生产类型']" placeholder="" style="width: 140px;" />
|
|
<el-input v-model="scgdformData['生产类型']" placeholder="" style="width: 140px;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -680,12 +666,12 @@
|
|
|
<!-- 第二排 -->
|
|
<!-- 第二排 -->
|
|
|
<el-row :gutter="24">
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="客户代号:" prop="customerCode">
|
|
|
|
|
|
|
+ <el-form-item label="客户代号:" prop="customerCode" class="mab">
|
|
|
<el-input v-model="scgdformData['客户代号']" placeholder="" style="width: 180px;" />
|
|
<el-input v-model="scgdformData['客户代号']" placeholder="" style="width: 180px;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="16">
|
|
<el-col :span="16">
|
|
|
- <el-form-item label="客户名称:" prop="customerName">
|
|
|
|
|
|
|
+ <el-form-item label="客户名称:" prop="customerName" class="mab">
|
|
|
<el-input v-model="scgdformData['客户名称']" placeholder="" />
|
|
<el-input v-model="scgdformData['客户名称']" placeholder="" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -693,12 +679,12 @@
|
|
|
<!-- 第三排 -->
|
|
<!-- 第三排 -->
|
|
|
<el-row :gutter="24">
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="产品代码:" prop="productCode">
|
|
|
|
|
|
|
+ <el-form-item label="产品代码:" prop="productCode" class="mab">
|
|
|
<el-input v-model="scgdformData['产品代号']" placeholder="" style="width: 180px;"/>
|
|
<el-input v-model="scgdformData['产品代号']" placeholder="" style="width: 180px;"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="16">
|
|
<el-col :span="16">
|
|
|
- <el-form-item label="产品名称:" prop="productName">
|
|
|
|
|
|
|
+ <el-form-item label="产品名称:" prop="productName" class="mab">
|
|
|
<el-input v-model="scgdformData['产品名称']" placeholder="" />
|
|
<el-input v-model="scgdformData['产品名称']" placeholder="" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -706,12 +692,12 @@
|
|
|
<!-- 第四排 -->
|
|
<!-- 第四排 -->
|
|
|
<el-row :gutter="24">
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="印件代码:" prop="customerCode">
|
|
|
|
|
|
|
+ <el-form-item label="印件代码:" prop="customerCode" class="mab">
|
|
|
<el-input v-model="scgdformData['印件代号']" placeholder="" style="width: 180px;"/>
|
|
<el-input v-model="scgdformData['印件代号']" placeholder="" style="width: 180px;"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="16">
|
|
<el-col :span="16">
|
|
|
- <el-form-item label="印件名称:" prop="customerName">
|
|
|
|
|
|
|
+ <el-form-item label="印件名称:" prop="customerName" class="mab">
|
|
|
<el-input v-model="scgdformData['印件名称']" placeholder="" />
|
|
<el-input v-model="scgdformData['印件名称']" placeholder="" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -719,23 +705,23 @@
|
|
|
<!-- 第五排 -->
|
|
<!-- 第五排 -->
|
|
|
<el-row :gutter="24">
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="订单数量:" prop="orderQuantity">
|
|
|
|
|
|
|
+ <el-form-item label="订单数量:" prop="orderQuantity" class="mab">
|
|
|
<el-input v-model="scgdformData['订单数量']" placeholder="" style="width: 180px;" />
|
|
<el-input v-model="scgdformData['订单数量']" placeholder="" style="width: 180px;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="交货日期:" prop="deliveryDate">
|
|
|
|
|
|
|
+ <el-form-item label="交货日期:" prop="deliveryDate" class="mab">
|
|
|
<el-date-picker v-model="scgdformData['交货日期']" type="date" placeholder="选择日期" style="width: 280px;" />
|
|
<el-date-picker v-model="scgdformData['交货日期']" type="date" placeholder="选择日期" style="width: 280px;" />
|
|
|
<!-- <el-input v-model="scgdformData['交货日期']" type="date" placeholder="" style="width: 140px;" />-->
|
|
<!-- <el-input v-model="scgdformData['交货日期']" type="date" placeholder="" style="width: 140px;" />-->
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
<el-col :span="5">
|
|
|
- <el-form-item label="投料率:" prop="feedRate">
|
|
|
|
|
|
|
+ <el-form-item label="投料率:" prop="feedRate" class="mab">
|
|
|
<el-input v-model="scgdformData['投料率']" placeholder="" style="width: 140px;" />
|
|
<el-input v-model="scgdformData['投料率']" placeholder="" style="width: 140px;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
<el-col :span="5">
|
|
|
- <el-form-item label="平均合格率:" prop="passRate">
|
|
|
|
|
|
|
+ <el-form-item label="平均合格率:" prop="passRate" class="mab">
|
|
|
<el-input v-model="scgdformData['平均合格率']" placeholder="" style="width: 140px;" />
|
|
<el-input v-model="scgdformData['平均合格率']" placeholder="" style="width: 140px;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -743,23 +729,23 @@
|
|
|
<!-- 第六排 -->
|
|
<!-- 第六排 -->
|
|
|
<el-row :gutter="24">
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="平张投料:" prop="flatFeed">
|
|
|
|
|
|
|
+ <el-form-item label="平张投料:" prop="flatFeed" class="mab">
|
|
|
<el-input v-model="scgdformData['平张投料']" placeholder="" style="width: 180px;" />
|
|
<el-input v-model="scgdformData['平张投料']" placeholder="" style="width: 180px;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="万小张:" prop="perTenThousand">
|
|
|
|
|
- <el-input v-model="scgdformData['万小张']" placeholder="" style="width: 110px;" />
|
|
|
|
|
- <el-input v-model="scgdformData['单位']" placeholder="" style="width: 60px;" />
|
|
|
|
|
|
|
+ <el-form-item label="万小张:" prop="perTenThousand" class="mab">
|
|
|
|
|
+ <el-input v-model="scgdformData['万小张']" placeholder="" style="width: 100px;" />
|
|
|
|
|
+ <el-input v-model="scgdformData['单位']" placeholder="" style="width: 50px;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
<el-col :span="5">
|
|
|
- <el-form-item label="投料大箱:" prop="feedBox">
|
|
|
|
|
|
|
+ <el-form-item label="投料大箱:" prop="feedBox" class="mab">
|
|
|
<el-input v-model="scgdformData['投料大箱']" placeholder="" style="width: 140px;" />
|
|
<el-input v-model="scgdformData['投料大箱']" placeholder="" style="width: 140px;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
|
|
- <el-form-item label="库存大箱:" prop="stockBox">
|
|
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="库存大箱:" prop="stockBox" class="mab">
|
|
|
<el-input v-model="scgdformData['库存大箱']" placeholder="" style="width: 140px;" />
|
|
<el-input v-model="scgdformData['库存大箱']" placeholder="" style="width: 140px;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -768,7 +754,7 @@
|
|
|
<!-- 第七排 -->
|
|
<!-- 第七排 -->
|
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="20">
|
|
<el-col :span="20">
|
|
|
- <el-form-item label="销售订单号:" prop="salesOrder">
|
|
|
|
|
|
|
+ <el-form-item label="销售订单号:" prop="salesOrder" class="mab">
|
|
|
<el-input v-model="scgdformData['销售订单号']" placeholder="" />
|
|
<el-input v-model="scgdformData['销售订单号']" placeholder="" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -777,7 +763,7 @@
|
|
|
<!-- 第八排 -->
|
|
<!-- 第八排 -->
|
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="20">
|
|
<el-col :span="20">
|
|
|
- <el-form-item label="警语版面:" prop="warningLayout">
|
|
|
|
|
|
|
+ <el-form-item label="警语版面:" prop="warningLayout" class="mab" label-width="85px">
|
|
|
<el-input v-model="scgdformData['警语版面']" placeholder="" />
|
|
<el-input v-model="scgdformData['警语版面']" placeholder="" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -786,12 +772,12 @@
|
|
|
<!-- 第九排 -->
|
|
<!-- 第九排 -->
|
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="版本号:" prop="versionNumber">
|
|
|
|
|
|
|
+ <el-form-item label="版本号:" prop="versionNumber" class="mab" label-width="85px">
|
|
|
<el-input v-model="scgdformData['版本号']" placeholder="" />
|
|
<el-input v-model="scgdformData['版本号']" placeholder="" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="14">
|
|
<el-col :span="14">
|
|
|
- <el-form-item label="客户ERP编码:" prop="customerErpCode">
|
|
|
|
|
|
|
+ <el-form-item label="客户ERP编码:" prop="customerErpCode" class="mab">
|
|
|
<el-input v-model="scgdformData['客户ERP编码']" placeholder="" />
|
|
<el-input v-model="scgdformData['客户ERP编码']" placeholder="" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -800,12 +786,12 @@
|
|
|
<!-- 第十排 -->
|
|
<!-- 第十排 -->
|
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="码源数量:" prop="codeSourceQuantity">
|
|
|
|
|
|
|
+ <el-form-item label="码源数量:" prop="codeSourceQuantity" class="mab">
|
|
|
<el-input v-model="scgdformData['码源数量']" placeholder="" style="width: 170px;" />
|
|
<el-input v-model="scgdformData['码源数量']" placeholder="" style="width: 170px;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="14">
|
|
<el-col :span="14">
|
|
|
- <el-form-item label="进程备注:" prop="processNote">
|
|
|
|
|
|
|
+ <el-form-item label="进程备注:" prop="processNote" class="mab">
|
|
|
<el-input v-model="scgdformData['进程备注']" placeholder="" />
|
|
<el-input v-model="scgdformData['进程备注']" placeholder="" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -813,19 +799,17 @@
|
|
|
|
|
|
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="20">
|
|
<el-col :span="20">
|
|
|
- <el-form-item label="备注说明:" prop="remark">
|
|
|
|
|
|
|
+ <el-form-item label="备注说明:" prop="remark" class="mab">
|
|
|
<el-input type="textarea" v-model="scgdformData['备注']" :rows="2" :clearable="true" placeholder="" style="width: 100%;" />
|
|
<el-input type="textarea" v-model="scgdformData['备注']" :rows="2" :clearable="true" placeholder="" style="width: 100%;" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
- <template #footer>
|
|
|
|
|
- <div class="dialog-footer" style="text-align: right;">
|
|
|
|
|
- <el-button @click="closeDialog">取 消</el-button>
|
|
|
|
|
- <el-button type="primary" @click="enterDialog">确 定</el-button>
|
|
|
|
|
- </div>
|
|
|
|
|
- </template>
|
|
|
|
|
|
|
+ <div class="dialog-footer" style="text-align: right;">
|
|
|
|
|
+ <el-button @click="closeDialog">取 消</el-button>
|
|
|
|
|
+ <el-button type="primary" @click="enterDialog">确 定</el-button>
|
|
|
|
|
+ </div>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
|
|
|
<!-- 修改印件资料弹窗 -->
|
|
<!-- 修改印件资料弹窗 -->
|
|
@@ -1051,14 +1035,14 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
|
|
import { ref, reactive } from 'vue'
|
|
import { ref, reactive } from 'vue'
|
|
|
import {
|
|
import {
|
|
|
DataList,
|
|
DataList,
|
|
|
- WorkList,gdzl_MachineList,
|
|
|
|
|
- Craft, U8workOrder,ProcessDetailEdit,PrintedEdit,PrintJobOrder,
|
|
|
|
|
- Printed,WorkOrderEdit,ReferenceWorkOrder,
|
|
|
|
|
- Bom,editGyWaste,U8DataCorrection,AccountingParameterEdit,
|
|
|
|
|
|
|
+ WorkList, gdzl_MachineList,
|
|
|
|
|
+ U8workOrder, ProcessDetailEdit, PrintedEdit, PrintJobOrder,
|
|
|
|
|
+ WorkOrderEdit, ReferenceWorkOrder,
|
|
|
|
|
+ editGyWaste, U8DataCorrection, AccountingParameterEdit,
|
|
|
ProductInformation, TestCoefficient,
|
|
ProductInformation, TestCoefficient,
|
|
|
DataCorrection, U8Trial, ProcessFlow, AccountingParameter,
|
|
DataCorrection, U8Trial, ProcessFlow, AccountingParameter,
|
|
|
setProductStatus,
|
|
setProductStatus,
|
|
|
- getProduct, getProductGy, ProductInformationEdit,
|
|
|
|
|
|
|
+ getProduct, getProductGy, ProductInformationEdit, workOrderListDetail,
|
|
|
} from "@/api/yunyin/yunying";
|
|
} from "@/api/yunyin/yunying";
|
|
|
defineOptions({name: 'Company'})
|
|
defineOptions({name: 'Company'})
|
|
|
|
|
|
|
@@ -1263,17 +1247,17 @@ 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.push(...val.map(item => item.序号));
|
|
|
|
|
+// }
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
//查改U8工单(工单删除)
|
|
//查改U8工单(工单删除)
|
|
|
const oncgugdclickdel = async ()=>{
|
|
const oncgugdclickdel = async ()=>{
|
|
@@ -1451,9 +1435,9 @@ const oneditgxclhsclick = () => {
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
//工序产量核算【确定】
|
|
//工序产量核算【确定】
|
|
|
-const gxclhshandleConfirm = () => {tlsslist.value = false;};
|
|
|
|
|
|
|
+const gxclhshandleConfirm = () => {gxclhslist.value = false;};
|
|
|
//工序产量核算【取消】
|
|
//工序产量核算【取消】
|
|
|
-const gxclhshandleCancel = () => {tlsslist.value = false;};
|
|
|
|
|
|
|
+const gxclhshandleCancel = () => {gxclhslist.value = false;};
|
|
|
// =========== U8投料试算 ===========
|
|
// =========== U8投料试算 ===========
|
|
|
const tlsslist = ref(false);
|
|
const tlsslist = ref(false);
|
|
|
const tlsstableData = ref([]);
|
|
const tlsstableData = ref([]);
|
|
@@ -1531,10 +1515,7 @@ const onyycpzllist = ref(false);
|
|
|
const onyycpzlclick = () => {
|
|
const onyycpzlclick = () => {
|
|
|
if(_Gd_gdbh.value == null){
|
|
if(_Gd_gdbh.value == null){
|
|
|
onyycpzllist.value = false;
|
|
onyycpzllist.value = false;
|
|
|
- ElMessage({
|
|
|
|
|
- type: 'warning',
|
|
|
|
|
- message: '请选择具体的工单后,再操作此功能'
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ ElMessage({type: 'warning',message: '请选择具体的工单后,再操作此功能'})
|
|
|
}else{
|
|
}else{
|
|
|
yycpzlformData['gdbh'] = _Gd_gdbh.value;
|
|
yycpzlformData['gdbh'] = _Gd_gdbh.value;
|
|
|
_ProductInformations();
|
|
_ProductInformations();
|
|
@@ -1548,17 +1529,27 @@ const yycpzlProductValue = async () => {
|
|
|
//引用产品资料->获取产品资料
|
|
//引用产品资料->获取产品资料
|
|
|
const _ProductInformations = async ()=>{
|
|
const _ProductInformations = async ()=>{
|
|
|
let workOrder = yycpzlformData['gdbh'];
|
|
let workOrder = yycpzlformData['gdbh'];
|
|
|
- try {
|
|
|
|
|
|
|
+ // try {
|
|
|
const ProductInformations = await ProductInformation({workOrder:workOrder});
|
|
const ProductInformations = await ProductInformation({workOrder:workOrder});
|
|
|
- console.log(ProductInformations);
|
|
|
|
|
- yycpzlformData['gdbh'] = ProductInformations.data['工单编号'];
|
|
|
|
|
- yycpzlformData['khdh'] = ProductInformations.data['客户代号'];
|
|
|
|
|
- yycpzlformData['khmc'] = ProductInformations.data['客户名称'];
|
|
|
|
|
- yycpzlformData['cpdh'] = ProductInformations.data['产品代号'];
|
|
|
|
|
- yycpzlformData['cpmc'] = ProductInformations.data['产品名称'];
|
|
|
|
|
- } catch (error) {
|
|
|
|
|
- console.error(error);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ console.log(ProductInformation);
|
|
|
|
|
+ if(ProductInformations.msg === '未找到工单信息'){
|
|
|
|
|
+ yycpzlformData['khdh'] = '';
|
|
|
|
|
+ yycpzlformData['khmc'] = '';
|
|
|
|
|
+ yycpzlformData['cpdh'] = '';
|
|
|
|
|
+ yycpzlformData['cpmc'] = '';
|
|
|
|
|
+ ElMessage({type: 'warning',message: '未找到工单信息'})
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }else{
|
|
|
|
|
+ yycpzlformData['gdbh'] = ProductInformations.data['工单编号'];
|
|
|
|
|
+ yycpzlformData['khdh'] = ProductInformations.data['客户代号'];
|
|
|
|
|
+ yycpzlformData['khmc'] = ProductInformations.data['客户名称'];
|
|
|
|
|
+ yycpzlformData['cpdh'] = ProductInformations.data['产品代号'];
|
|
|
|
|
+ yycpzlformData['cpmc'] = ProductInformations.data['产品名称'];
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // } catch (error) {
|
|
|
|
|
+ // console.error(error);
|
|
|
|
|
+ // }
|
|
|
}
|
|
}
|
|
|
//引用产品资料【执行】
|
|
//引用产品资料【执行】
|
|
|
const yycpzlhandleConfirm = async () => {
|
|
const yycpzlhandleConfirm = async () => {
|
|
@@ -1597,7 +1588,7 @@ const defaultProps = {
|
|
|
children: 'children',
|
|
children: 'children',
|
|
|
label: 'label'
|
|
label: 'label'
|
|
|
};
|
|
};
|
|
|
-
|
|
|
|
|
|
|
+//工单资料菜单列表
|
|
|
const DataListdata = async () => {
|
|
const DataListdata = async () => {
|
|
|
try {
|
|
try {
|
|
|
const data = await DataList();
|
|
const data = await DataList();
|
|
@@ -1629,14 +1620,33 @@ const handleNodeClick = async (node) => {
|
|
|
_Gd_khdh.value = node.label.substring(0, 4);
|
|
_Gd_khdh.value = node.label.substring(0, 4);
|
|
|
_WorkList_page();
|
|
_WorkList_page();
|
|
|
};
|
|
};
|
|
|
|
|
+//工单资料
|
|
|
const _WorkList_page = async () => {
|
|
const _WorkList_page = async () => {
|
|
|
- console.log(pageSize.value)
|
|
|
|
|
- console.log(page.value)
|
|
|
|
|
try {
|
|
try {
|
|
|
const WorkListdata = await WorkList({ Gd_khdh:_Gd_khdh.value,limit:pageSize.value,page:page.value});//接口调用函数
|
|
const WorkListdata = await WorkList({ Gd_khdh:_Gd_khdh.value,limit:pageSize.value,page:page.value});//接口调用函数
|
|
|
tableData.splice(0,tableData.length,...WorkListdata.data.data);//表格数据
|
|
tableData.splice(0,tableData.length,...WorkListdata.data.data);//表格数据
|
|
|
- // total.value = tableData.length;//共多少条
|
|
|
|
|
- total.value = 999;//共多少条
|
|
|
|
|
|
|
+ total.value =WorkListdata.data.total;//共多少条
|
|
|
|
|
+ } catch (error) {
|
|
|
|
|
+ console.error(error);
|
|
|
|
|
+ }
|
|
|
|
|
+};
|
|
|
|
|
+
|
|
|
|
|
+//搜索查询
|
|
|
|
|
+const searchInfo = ref('')
|
|
|
|
|
+//查询按钮
|
|
|
|
|
+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});//接口调用函数
|
|
|
|
|
+ tableData.splice(0,tableData.length,...WorkListdata.data.data);//表格数据
|
|
|
|
|
+ total.value = tableData.length;//共多少条
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
console.error(error);
|
|
console.error(error);
|
|
|
}
|
|
}
|
|
@@ -1658,8 +1668,7 @@ const handleSizeChange = (val) => {
|
|
|
_WorkList_page();
|
|
_WorkList_page();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-//点击表格行 获取下方表格数据列表
|
|
|
|
|
|
|
+//点击表格行获取下方表格数据列表
|
|
|
//印件资料
|
|
//印件资料
|
|
|
const yjtableData = ref([])
|
|
const yjtableData = ref([])
|
|
|
//工艺资料
|
|
//工艺资料
|
|
@@ -1672,55 +1681,31 @@ const _Gd_gdbh = ref(null)
|
|
|
const _Gd_cpdh = ref(null)
|
|
const _Gd_cpdh = ref(null)
|
|
|
//全局调用产品名称
|
|
//全局调用产品名称
|
|
|
const _Gd_cpmc = ref(null)
|
|
const _Gd_cpmc = ref(null)
|
|
|
|
|
+//工单印件、工艺、BOM详情
|
|
|
const tableRowClick = async (row) => {
|
|
const tableRowClick = async (row) => {
|
|
|
_Gd_gdbh.value = row.工单编号;
|
|
_Gd_gdbh.value = row.工单编号;
|
|
|
_Gd_cpdh.value = row.产品代号;
|
|
_Gd_cpdh.value = row.产品代号;
|
|
|
_Gd_cpmc.value = row.产品名称;
|
|
_Gd_cpmc.value = row.产品名称;
|
|
|
- const Gd_gdbh = row.工单编号;
|
|
|
|
|
- const yjres = await Printed({ Gd_gdbh:Gd_gdbh});
|
|
|
|
|
- const gyres = await Craft({ Gd_gdbh:Gd_gdbh});
|
|
|
|
|
- const bomres = await Bom({ Gd_gdbh:Gd_gdbh});
|
|
|
|
|
- yjtableData.value = yjres.data;
|
|
|
|
|
- gytableData.value = gyres.data;
|
|
|
|
|
- bomtableData.value = bomres.data;
|
|
|
|
|
-};
|
|
|
|
|
-
|
|
|
|
|
-// 搜索查询
|
|
|
|
|
-const searchInfo = ref('')
|
|
|
|
|
-//点击【查询】按钮
|
|
|
|
|
-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});//接口调用函数
|
|
|
|
|
- tableData.splice(0,tableData.length,...WorkListdata.data);//表格数据
|
|
|
|
|
- total.value = tableData.length;//共多少条
|
|
|
|
|
- } catch (error) {
|
|
|
|
|
- console.error(error);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ console.log(_Gd_gdbh.value)
|
|
|
|
|
+ const workOrderListDetail_data = await workOrderListDetail({Gd_gdbh:_Gd_gdbh.value});
|
|
|
|
|
+ console.log(workOrderListDetail_data.data.printList)
|
|
|
|
|
+ console.log(workOrderListDetail_data.data.processList)
|
|
|
|
|
+ console.log(workOrderListDetail_data.data.BOM)
|
|
|
|
|
+ yjtableData.value = workOrderListDetail_data.data.printList;
|
|
|
|
|
+ gytableData.value = workOrderListDetail_data.data.processList;
|
|
|
|
|
+ bomtableData.value = workOrderListDetail_data.data.BOM;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
-// // 多选数据
|
|
|
|
|
-// const multipleSelection = ref([])
|
|
|
|
|
-// // 多选
|
|
|
|
|
-// const handleSelectionChange = (val) => {
|
|
|
|
|
-// multipleSelection.value = val
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+// 多选数据
|
|
|
|
|
+const multipleSelection = ref([])
|
|
|
|
|
+// 多选
|
|
|
|
|
+const handleSelectionChange = (val) => {
|
|
|
|
|
+ multipleSelection.value = val
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
// 行为控制标记(弹窗内部需要增还是改)
|
|
// 行为控制标记(弹窗内部需要增还是改)
|
|
|
const type = ref('')
|
|
const type = ref('')
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
//=========表格列表修改========
|
|
//=========表格列表修改========
|
|
|
let scgdformData = ref([])
|
|
let scgdformData = ref([])
|
|
|
//双击修改
|
|
//双击修改
|
|
@@ -1793,6 +1778,7 @@ const gdyjupdateCompanyFunc = async(row) => {
|
|
|
}
|
|
}
|
|
|
//印件列表修改【确定】
|
|
//印件列表修改【确定】
|
|
|
const gdyjenterDialog = async () => {
|
|
const gdyjenterDialog = async () => {
|
|
|
|
|
+ console.log(gdyjformData)
|
|
|
const formattedData = {
|
|
const formattedData = {
|
|
|
Uniqid: gdyjformData['Uniqid'],
|
|
Uniqid: gdyjformData['Uniqid'],
|
|
|
yjno: gdyjformData['印件号'] ? gdyjformData['印件号'] : "",
|
|
yjno: gdyjformData['印件号'] ? gdyjformData['印件号'] : "",
|
|
@@ -1842,14 +1828,13 @@ const gdzl_MachineList_address = reactive({
|
|
|
const _cjmc = ref(null);
|
|
const _cjmc = ref(null);
|
|
|
//双击修改
|
|
//双击修改
|
|
|
const gdgyupdateCompanyFunc = async(row) => {
|
|
const gdgyupdateCompanyFunc = async(row) => {
|
|
|
- console.log("双击了")
|
|
|
|
|
console.log(row)
|
|
console.log(row)
|
|
|
-
|
|
|
|
|
if(row['车间名称']){
|
|
if(row['车间名称']){
|
|
|
_cjmc.value = row['车间名称']
|
|
_cjmc.value = row['车间名称']
|
|
|
}else{
|
|
}else{
|
|
|
_cjmc.value = '';
|
|
_cjmc.value = '';
|
|
|
}
|
|
}
|
|
|
|
|
+ //通过车间名称查询机台
|
|
|
const MachineList_jitai = await gdzl_MachineList({address:_cjmc.value});
|
|
const MachineList_jitai = await gdzl_MachineList({address:_cjmc.value});
|
|
|
gdzl_MachineList_address.data = MachineList_jitai.data;
|
|
gdzl_MachineList_address.data = MachineList_jitai.data;
|
|
|
|
|
|
|
@@ -1928,8 +1913,27 @@ const gdgycloseDialog = () => {
|
|
|
gdgydialogFormVisible.value = false
|
|
gdgydialogFormVisible.value = false
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+//=========BOM列表修改========
|
|
|
|
|
+// const bomdialogFormVisible = ref(false)
|
|
|
|
|
+// //双击修改
|
|
|
|
|
+// const gdbomdialogFormVisible = async(row) => {
|
|
|
|
|
+// Object.assign(scgdformData,row);
|
|
|
|
|
+// bomdialogFormVisible.value = true
|
|
|
|
|
+// }
|
|
|
|
|
+// // BOM列表修改【确定】
|
|
|
|
|
+// const bomenterDialog = () => {
|
|
|
|
|
+// bomdialogFormVisible.value = false
|
|
|
|
|
+// }
|
|
|
|
|
+// // BOM列表修改【关闭弹窗】
|
|
|
|
|
+// const bomcloseDialog = () => {
|
|
|
|
|
+// bomdialogFormVisible.value = false
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
-//颜色变黄
|
|
|
|
|
|
|
+//截取印件前两位
|
|
|
|
|
+const clickybupdate2 = (row,column,event) => {
|
|
|
|
|
+ currentGy0_yjno.value = row['印件-工序'].substr(0, 2)
|
|
|
|
|
+}
|
|
|
|
|
+//背景颜色变黄
|
|
|
const currentGy0_yjno = ref(null)
|
|
const currentGy0_yjno = ref(null)
|
|
|
const rowClassStyle2 = ({row,rowIndex}) =>{
|
|
const rowClassStyle2 = ({row,rowIndex}) =>{
|
|
|
if(row['印件-工序'].substr(0, 2)==currentGy0_yjno.value){
|
|
if(row['印件-工序'].substr(0, 2)==currentGy0_yjno.value){
|
|
@@ -1937,41 +1941,35 @@ const rowClassStyle2 = ({row,rowIndex}) =>{
|
|
|
}
|
|
}
|
|
|
return "warning-row"
|
|
return "warning-row"
|
|
|
}
|
|
}
|
|
|
-const clickybupdate2 = (row,column,event) => {
|
|
|
|
|
- currentGy0_yjno.value = row['印件-工序'].substr(0, 2)
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
const attachList = ref([])
|
|
const attachList = ref([])
|
|
|
const attachChange = (val) => {
|
|
const attachChange = (val) => {
|
|
|
attachList.value = val
|
|
attachList.value = val
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
const addGongyiAttach = () =>
|
|
const addGongyiAttach = () =>
|
|
|
{
|
|
{
|
|
|
attachList.value.map(row => gylctztableData.value.push(row))
|
|
attachList.value.map(row => gylctztableData.value.push(row))
|
|
|
gdzlfjxx.value = false
|
|
gdzlfjxx.value = false
|
|
|
}
|
|
}
|
|
|
|
|
+//表格文字变色
|
|
|
|
|
+const tableDataCellClass = ({row, column, rowIndex, columnIndex}) =>{
|
|
|
|
|
+ if (column.property === '订单数量') {
|
|
|
|
|
+ return 'plan-usage-low';
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
-//=========BOM列表修改========
|
|
|
|
|
-// const bomdialogFormVisible = ref(false)
|
|
|
|
|
-// //双击修改
|
|
|
|
|
-// const gdbomdialogFormVisible = async(row) => {
|
|
|
|
|
-// Object.assign(scgdformData,row);
|
|
|
|
|
-// bomdialogFormVisible.value = true
|
|
|
|
|
-// }
|
|
|
|
|
-// // BOM列表修改【确定】
|
|
|
|
|
-// const bomenterDialog = () => {
|
|
|
|
|
-// bomdialogFormVisible.value = false
|
|
|
|
|
-// }
|
|
|
|
|
-// // BOM列表修改【关闭弹窗】
|
|
|
|
|
-// const bomcloseDialog = () => {
|
|
|
|
|
-// bomdialogFormVisible.value = false
|
|
|
|
|
-// }
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+//bom计划用量文字变色
|
|
|
|
|
+const planUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
|
|
|
|
|
+ if (column.property === '计划用量') {
|
|
|
|
|
+ return 'plan-usage-low';
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
</script>
|
|
</script>
|
|
|
<style scoped>
|
|
<style scoped>
|
|
|
-
|
|
|
|
|
|
|
+/*bom计划用量文字变色【表格中单独文字变色】*/
|
|
|
|
|
+:deep(.plan-usage-low div) {
|
|
|
|
|
+ color: red !important;
|
|
|
|
|
+}
|
|
|
|
|
+/*印件背景颜色变黄*/
|
|
|
:deep(.el-table__body .warning-row) {
|
|
:deep(.el-table__body .warning-row) {
|
|
|
background: #FFFF80 !important;
|
|
background: #FFFF80 !important;
|
|
|
}
|
|
}
|
|
@@ -2004,8 +2002,6 @@ const addGongyiAttach = () =>
|
|
|
:deep(.el-table__body tr.current-row) > td {
|
|
:deep(.el-table__body tr.current-row) > td {
|
|
|
background: #ff80ff !important;
|
|
background: #ff80ff !important;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
</style>
|
|
</style>
|
|
|
<style scoped>
|
|
<style scoped>
|
|
|
:deep(.el-table td .cell) {
|
|
:deep(.el-table td .cell) {
|
|
@@ -2035,4 +2031,5 @@ const addGongyiAttach = () =>
|
|
|
.mab{
|
|
.mab{
|
|
|
margin-bottom: 5px;
|
|
margin-bottom: 5px;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
</style>
|
|
</style>
|