From e211c9e16d54fc198eb861494fcf95b76383ba51 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期一, 15 一月 2024 15:56:02 +0800
Subject: [PATCH] 更新首页饼状图标题
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 372 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 233 insertions(+), 139 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 7628926..4f1359c 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -2,33 +2,26 @@
<div class="app-container">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label-width="80" label="鐢熶骇宸ュ崟鍙�" prop="workOrderNo">
- <el-input
- v-model="queryParams.workOrderNo"
- placeholder="璇疯緭鍏ョ敓浜у伐鍗曞彿"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-form-item label-width="100" label="鐢熶骇閫氱煡鍗�" prop="productName">
+ <el-input v-model="queryParams.productionNotice" placeholder="璇疯緭鍏ョ敓浜ч�氱煡鍗�" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" prop="productName">
- <el-input
- v-model="queryParams.productName"
- placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-form-item label-width="80" label="鐢熶骇璁㈠崟" prop="workOrderNo">
+ <el-input v-model="queryParams.workOrderNo" placeholder="璇疯緭鍏ョ敓浜ц鍗�" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
+<!-- <el-form-item label="浜у搧鍚嶇О" prop="productName">-->
+<!-- <el-input v-model="queryParams.productName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" clearable @keyup.enter.native="handleQuery"/>-->
+<!-- </el-form-item>-->
<el-form-item label="宸ュ崟鐘舵��" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="璇烽�夋嫨宸ュ崟鐘舵��" clearable>
<el-option
v-for="dict in dict.type.order_state"
:key="dict.value"
:label="dict.label"
- :value="dict.value"
- />
+ :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item style="float: right">
+ <el-button type="warning" icon="el-icon-download" size="mini" @click="getProductionNotice">鎺ユ敹</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -36,61 +29,25 @@
</el-form>
<el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px">
<el-form-item style="margin-left: 14px" label="浜у搧缂栧彿" prop="productCode">
- <el-input
- v-model="queryParams.productCode"
- placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="璁㈠崟缂栧彿" prop="salesOrderCode">
- <el-input
- v-model="queryParams.salesOrderCode"
- placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.salesOrderCode" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="杞﹂棿缂栧彿" prop="workshopCode">
- <el-input
- v-model="queryParams.workshopCode"
- placeholder="璇疯緭鍏ヨ溅闂寸紪鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.workshopCode" placeholder="璇疯緭鍏ヨ溅闂寸紪鍙�" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="浜х嚎缂栧彿" prop="lineCode">
- <el-input
- v-model="queryParams.lineCode"
- placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.lineCode" placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item style="margin-left: 7px" label-width="80" label="浜у搧BOM" prop="bomCode">
- <el-input
- v-model="queryParams.bomCode"
- placeholder="璇疯緭鍏ヤ骇鍝丅OM"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.bomCode" placeholder="璇疯緭鍏ヤ骇鍝丅OM" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="宸ヨ壓娴佺▼" prop="routeCode">
- <el-input
- v-model="queryParams.routeCode"
- placeholder="璇疯緭鍏ュ伐鑹烘祦绋�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.routeCode" placeholder="璇疯緭鍏ュ伐鑹烘祦绋�" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
-
<el-form-item label="宸ヨ壓閰嶆柟" prop="recipeCode">
- <el-input
- v-model="queryParams.recipeCode"
- placeholder="璇疯緭鍏ュ伐鑹洪厤鏂�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.recipeCode" placeholder="璇疯緭鍏ュ伐鑹洪厤鏂�" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
</el-form>
</el-card>
@@ -159,15 +116,15 @@
@click="moveUp(val => val, 'down')"
>涓嬬Щ</el-button>
</el-col>
-
<el-col :span="1.5">
<el-button
type="primary"
plain
- icon="el-icon-plus"
+ icon="el-icon-createUpdate"
size="mini"
- @click="handleAdd"
- v-hasPermi="['om:productionOrde:add']"
+ :disabled="single"
+ @click="CreatehandleUpdate"
+ v-hasPermi="['om:productionOrde:createUpdate']"
>鐢熸垚</el-button>
</el-col>
@@ -176,85 +133,96 @@
<el-table border v-loading="loading" :data="productionOrdeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鐢熶骇宸ュ崟鍙�" width="160" align="center">
+ <el-table-column label="鐢熶骇閫氱煡鍗曞彿" width="160" align="center" prop="productionNotice">
+ </el-table-column>
+ <el-table-column label="鐢熶骇璁㈠崟" width="160" align="center">
<template slot-scope="scope">
<router-link :to="{path: '/main/workReport-data/index/', query: {workOrderNo: scope.row.workOrderNo} }" class="link-type">
<span>{{ scope.row.workOrderNo }}</span>
</router-link>
</template>
</el-table-column>
- <el-table-column label="璁㈠崟缂栧彿" width="140" align="center" prop="salesOrderCode">
+ <el-table-column label="鏈哄瀷" width="160" align="center" prop="typeZ">
</el-table-column>
- <el-table-column label="浜у搧缂栧彿" width="140" align="center" prop="productCode">
+ <el-table-column label="闇�姹傛暟閲�" align="center" prop="planQty">
</el-table-column>
- <el-table-column label="浜у搧鍚嶇О" width="160" align="center" prop="productName">
+ <el-table-column label="鐗╂枡绫诲瀷" width="140" align="center" prop="productCode">
</el-table-column>
- <el-table-column label="绉嶇被" width="160" align="center" prop="typeZ">
+ <el-table-column label="瀹為檯鏁伴噺" width="160" align="center" prop="actualQty">
</el-table-column>
<el-table-column label="宸ュ崟鐘舵��" align="center" prop="orderStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>
</template>
</el-table-column>
- <el-table-column label="杞﹂棿缂栧彿" align="center" prop="workshopCode">
+ <el-table-column label="宸ュ巶" align="center" prop="workshopCode">
</el-table-column>
- <el-table-column label="浜х嚎缂栧彿" align="center" prop="lineCode">
+ <el-table-column label="浠撳簱" align="center">
</el-table-column>
- <el-table-column label="宸ヨ壓娴佺▼" width="140" align="center" prop="routeCode">
+ <el-table-column label="浜х嚎" align="center" prop="lineCode">
</el-table-column>
- <el-table-column label="浜у搧BOM" width="140" align="center" prop="bomCode">
+ <el-table-column label="璁㈠崟绫诲瀷" align="center">
</el-table-column>
- <el-table-column label="宸ヨ壓閰嶆柟" width="140" align="center" prop="recipeCode">
+ <el-table-column label="ZWS" align="center">
</el-table-column>
- <el-table-column label="璁″垝鏁伴噺" align="center" prop="planQty">
+
+<!-- <el-table-column label="宸ヨ壓娴佺▼" width="140" align="center" prop="routeCode">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="浜у搧BOM" width="140" align="center" prop="bomCode">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="宸ヨ壓閰嶆柟" width="140" align="center" prop="recipeCode">-->
+<!-- </el-table-column>-->
+
+<!-- <el-table-column label="瀹為檯鏁伴噺" align="center" prop="actualQty">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="瀹為檯涓婄嚎鏁伴噺" width="100" align="center" prop="actualOnlineQty">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="闇�姹傛棩鏈�" align="center" prop="demandDate" width="180">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="璁″垝寮�濮嬫椂闂�" width="160" align="center" prop="planStartTime">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="璁″垝缁撴潫鏃堕棿" width="160" align="center" prop="planEndTime">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="瀹為檯寮�濮嬫椂闂�" width="160" align="center" prop="actualStartTime">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="瀹為檯缁撴潫鏃堕棿" width="160" align="center" prop="actualEndTime">-->
+<!-- </el-table-column>-->
+
+<!-- <el-table-column width="160" label="鏇存柊鏃堕棿" align="center" prop="updateTime">-->
+<!-- </el-table-column>-->
+ <el-table-column label="閫氱煡鍗曞埗鍗曚汉" width="80" align="center" prop="createUser">
</el-table-column>
- <el-table-column label="瀹為檯鏁伴噺" align="center" prop="actualQty">
+ <el-table-column width="160" label="閫氱煡鐢熸垚鏃ユ湡" align="center" prop="createTime">
</el-table-column>
- <el-table-column label="瀹為檯涓婄嚎鏁伴噺" width="100" align="center" prop="actualOnlineQty">
+ <el-table-column label="鎴愬搧鎻忚堪" width="160" align="center" prop="productName">
</el-table-column>
- <el-table-column label="闇�姹傛棩鏈�" align="center" prop="demandDate" width="180">
- </el-table-column>
- <el-table-column label="璁″垝寮�濮嬫椂闂�" width="160" align="center" prop="planStartTime">
- </el-table-column>
- <el-table-column label="璁″垝缁撴潫鏃堕棿" width="160" align="center" prop="planEndTime">
- </el-table-column>
- <el-table-column label="瀹為檯寮�濮嬫椂闂�" width="160" align="center" prop="actualStartTime">
- </el-table-column>
- <el-table-column label="瀹為檯缁撴潫鏃堕棿" width="160" align="center" prop="actualEndTime">
- </el-table-column>
- <el-table-column width="160" label="鍒涘缓鏃堕棿" align="center" prop="createTime">
- </el-table-column>
- <el-table-column width="160" label="鏇存柊鏃堕棿" align="center" prop="updateTime">
- </el-table-column>
- <el-table-column label="鍒涘缓浜�" width="80" align="center" prop="createUser">
- </el-table-column>
- <el-table-column label="淇敼浜�" width="80" align="center" prop="updateUser">
- </el-table-column>
- <el-table-column label="澶囨敞" width="100" align="center" prop="remarks">
- </el-table-column>
- <el-table-column label="娴佹按鍙�" align="center" prop="streamNumber">
- </el-table-column>
- <el-table-column label="瀹㈡埛" width="80" align="center" prop="custom">
- </el-table-column>
- <el-table-column fixed="right" width="350" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <!-- 宸ュ崟鐘舵�侊紙1鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂級 -->
- <el-button type="success" :disabled="scope.row.orderStatus !== '1'" style="width: 72px" plain @click="handleCommand('3',scope.row.id)" size="mini">
- 寮�濮�</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '2' && scope.row.orderStatus !== '3'" v-if="scope.row.orderStatus !== '2'&& scope.row.orderStatus !== '4'" plain @click="handleCommand('4',scope.row.id)" type="warning" size="mini">
- 鍐荤粨</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '4'" v-if="scope.row.orderStatus === '4'" plain @click="handleCommand('3',scope.row.id)" type="warning" size="mini">
- 瑙ｅ喕</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '1'" plain @click="handleCommand('6',scope.row.id)" v-if="scope.row.orderStatus === '1'||scope.row.orderStatus === '3'||scope.row.orderStatus === '4'||scope.row.orderStatus === '5'" type="danger" size="mini">
- 鍏抽棴</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">
- 鍚敤</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus === '4'||scope.row.orderStatus === '6'" v-if="scope.row.orderStatus !== '5'" @click="handleCommand('5',scope.row.id)" type="success" size="mini">
- 瀹屾垚</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus === '5'" v-if="scope.row.orderStatus === '5'" type="success" size="mini">宸插畬宸�</el-button> <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">
- 鍚敤</el-button>
- </template>
- </el-table-column>
+<!-- <el-table-column label="淇敼浜�" width="80" align="center" prop="updateUser">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="澶囨敞" width="100" align="center" prop="remarks">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="娴佹按鍙�" align="center" prop="streamNumber">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="瀹㈡埛" width="80" align="center" prop="custom">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column fixed="right" width="350" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">-->
+<!-- <template slot-scope="scope">-->
+<!-- <!– 宸ュ崟鐘舵�侊紙1鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂級 –>-->
+<!-- <el-button type="success" :disabled="scope.row.orderStatus !== '1'" style="width: 72px" plain @click="handleCommand('3',scope.row.id)" size="mini">-->
+<!-- 寮�濮�</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '2' && scope.row.orderStatus !== '3'" v-if="scope.row.orderStatus !== '2'&& scope.row.orderStatus !== '4'" plain @click="handleCommand('4',scope.row.id)" type="warning" size="mini">-->
+<!-- 鍐荤粨</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '4'" v-if="scope.row.orderStatus === '4'" plain @click="handleCommand('3',scope.row.id)" type="warning" size="mini">-->
+<!-- 瑙ｅ喕</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '1'" plain @click="handleCommand('6',scope.row.id)" v-if="scope.row.orderStatus === '1'||scope.row.orderStatus === '3'||scope.row.orderStatus === '4'||scope.row.orderStatus === '5'" type="danger" size="mini">-->
+<!-- 鍏抽棴</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">-->
+<!-- 鍚敤</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus === '4'||scope.row.orderStatus === '6'" v-if="scope.row.orderStatus !== '5'" @click="handleCommand('5',scope.row.id)" type="success" size="mini">-->
+<!-- 瀹屾垚</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus === '5'" v-if="scope.row.orderStatus === '5'" type="success" size="mini">宸插畬宸�</el-button> <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">-->
+<!-- 鍚敤</el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
</el-card>
@@ -275,7 +243,7 @@
</span>
<el-form ref="form" inline :model="form" :rules="rules" label-width="80px">
<el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
- <el-input v-model="form.workOrderNo" placeholder="璇疯緭鍏ョ敓浜у伐鍗曞彿" />
+ <el-input v-model="form.workOrderNo" placeholder="璇疯緭鍏ョ敓浜ц鍗�" />
</el-form-item>
<el-form-item label="璁㈠崟缂栧彿" prop="salesOrderCode">
<el-input v-model="form.salesOrderCode" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
@@ -289,8 +257,11 @@
<el-form-item label="浜у搧鍚嶇О" prop="productName">
<el-input v-model="form.productName" disabled placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" prop="productName">
+ <el-form-item label="绉嶇被" prop="productName">
<el-input v-model="form.typeZ" disabled placeholder="璇疯緭鍏ョ绫�" />
+ </el-form-item>
+ <el-form-item label="瀹為檯鏁伴噺" prop="actualQty">
+ <el-input v-model="form.actualQty" placeholder="璇疯緭鍏ュ疄闄呮暟閲�" />
</el-form-item>
<el-form-item label="杞﹂棿缂栧彿" prop="workshopCode">
<el-select style="width: 93%" @change="handleSelectChange(form.workshopCode)" v-model="form.workshopCode" placeholder="璇烽�夋嫨杞﹂棿缂栧彿">
@@ -365,6 +336,52 @@
</div>
</el-dialog>
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="Createopen" width="400px" append-to-body>
+ <span slot="title">
+ <i class="el-icon-s-order"></i>
+ {{titleName}}
+ </span>
+ <el-form ref="form" inline :model="form" :rules="CreateRules"label-width="80px">
+ <el-form-item label="绉嶇被" prop="typeZ">
+ <el-input disabled v-model="form.typeZ" placeholder="璇疯緭鍏ョ绫�" />
+ </el-form-item>
+ <el-form-item label="骞翠唤" prop="year">
+ <el-select @change="changeYear(form.year)" v-model="form.year" placeholder="璇烽�夋嫨骞翠唤" clearable>
+ <el-option v-for="dict in dict.type.year"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"/>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏈堜唤" prop="month">
+ <el-select @change="changeMonth(form.month)" v-model="form.month" placeholder="璇烽�夋嫨鏈堜唤" clearable>
+ <el-option v-for="dict in dict.type.month"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"/>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏃ユ湡" prop="day">
+ <el-select @change="changeDay(form.day)" v-model="form.day" placeholder="璇烽�夋嫨鏃ユ湡" clearable>
+ <el-option v-for="dict in dict.type.day"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"/>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏁伴噺" prop="actualQty">
+ <el-input disabled v-model="form.actualQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ </el-form-item>
+ <el-form-item label="缂栫爜" prop="adds">
+ <el-input disabled v-model="form.adds" placeholder="璇风敓鎴愮紪鐮�" />
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="CreateSubmitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+
</div>
</template>
@@ -374,11 +391,12 @@
import { listProductBom } from "@/api/main/bs/ProductBom/ProductBom";
import { listTechnologyRoute} from "@/api/main/bs/technologyRoute/technologyRoute";
import ItemSelect from "@/components/itemSelect/single.vue";
-import { upDownMove, listProductionOrde, getProductionOrde, delProductionOrde, addProductionOrde, updateProductionOrde } from "@/api/main/om/productionOrde/productionOrde";
+import { getProductionNotice, upDownMove, listProductionOrde, getProductionOrde, delProductionOrde, addProductionOrde, updateProductionOrde } from "@/api/main/om/productionOrde/productionOrde";
+import { listOrderScheduling, getOrderScheduling, delOrderScheduling, addOrderScheduling, updateOrderScheduling,generateNumbers } from "@/api/main/bs/orderScheduling/orderScheduling";
export default {
name: "ProductionOrde",
- dicts: ['order_state'],
+ dicts: ['order_state','year','month','day'],
components: {
ItemSelect ,
},
@@ -387,6 +405,7 @@
titleName: '',
options: [],
lineOptions: [],
+ outputArray: [],
showFlag:false,
advancedShowSearch: false,
workOrder: {
@@ -412,6 +431,7 @@
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ Createopen: false,
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -434,8 +454,10 @@
idNums: null,
typeZ: null,
flag: null,
-
+ adds:null,
+ productionNotice: null,
},
+
// 琛ㄥ崟鍙傛暟
form: {},
updateStatusParameter: {
@@ -447,7 +469,23 @@
id: [
{ required: true, message: "ID涓嶈兘涓虹┖", trigger: "blur" }
],
- }
+ },
+ CreateRules: {
+ day: [
+ { required: true, message: "涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ month: [
+ { required: true, message: "涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ year: [
+ { required: true, message: "涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ },
+ change: {
+ day: '',
+ month: '',
+ year: '',
+ },
};
},
created() {
@@ -455,6 +493,29 @@
this.initWorkshop();
},
methods: {
+ getProductionNotice(){
+ getProductionNotice(this.queryParams).then(response => {
+ this.$modal.msgSuccess("鎺ユ敹鎴愬姛");
+ this.queryParams = {}
+ this.getList();
+ });
+ },
+ //鏁扮粍鐢熸垚
+ changeDay(day){
+ this.change.day = day;
+ let adds =this.form.typeZ+this.change.year+this.change.month+this.change.day+this.form.actualQty;
+ this.form.adds = adds
+ },
+ changeMonth(day){
+ this.change.month = day;
+ let adds =this.form.typeZ+this.change.year+this.change.month+this.change.day+this.form.actualQty;
+ this.form.adds = adds
+ },
+ changeYear(day){
+ this.change.year = day;
+ let adds =this.form.typeZ+this.change.year+this.change.month+this.change.day+this.form.actualQty;
+ this.form.adds = adds
+ },
moveUp(row, val){
console.log(val)
const ids = row.id || this.ids
@@ -474,15 +535,8 @@
});
},
// 鍦ㄨ繖閲岀紪鍐欏鐞嗛�変腑浜嬩欢鐨勯�昏緫
- handleSelectChange(selectedOption) {
- this.form.lineCode = null;
- let params = {
- workshopCode: selectedOption
- };
- listLineInfo(params).then(response => {
- this.lineOptions = response.rows;
- });
- },
+
+
//鐗╂枡閫夋嫨寮瑰嚭妗�
onItemSelected(obj){
if(obj !== undefined && obj !== null){
@@ -490,6 +544,7 @@
this.form.productCode = productCode;
this.form.productName = obj.materialName;
this.form.typeZ = obj.typeZ;
+ this.typeL = obj.typeZ;
this.queryParams.productCode = productCode;
this.queryParams.typeZ = typeZ
listTechnologyRoute(this.queryParams).then(response => {
@@ -528,6 +583,7 @@
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
+ this.Createopen = false;
this.reset();
},
// 琛ㄥ崟閲嶇疆
@@ -571,7 +627,8 @@
spareField2: null,
spareField3: null,
typeZ: null,
- spareField4: null
+ spareField4: null,
+ adds:null
};
this.resetForm("form");
},
@@ -605,7 +662,23 @@
this.initWorkshop();
this.reset();
this.open = true;
- this.titleName = "娣诲姞鐢熶骇宸ュ崟";
+ this.titleName = "娣诲姞鐢熶骇璁㈠崟";
+ },
+ /** 鍚屾鎸夐挳鎿嶄綔 */
+ CreatehandleUpdate(Row) {
+ this.initWorkshop();
+ this.reset();
+ const id = Row.id || this.ids
+ getProductionOrde(id).then(response => {
+ console.log(response.data)
+ this.form = response.data;
+ this.Createopen = true;
+ this.titleName = "鐢熸垚璁㈠崟";
+ // return Array.from({ length: parseInt(this.actualQty) }, (_, index) => index + 1);
+ });
+ this.$modal.msgSuccess(Row.actualQty);
+
+
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -616,7 +689,7 @@
console.log(response.data)
this.form = response.data;
this.open = true;
- this.titleName = "淇敼鐢熶骇宸ュ崟";
+ this.titleName = "淇敼鐢熶骇璁㈠崟";
});
},
/** 鎻愪氦鎸夐挳 */
@@ -642,7 +715,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鐢熶骇宸ュ崟缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎鐢熶骇璁㈠崟缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
return delProductionOrde(ids);
}).then(() => {
this.getList();
@@ -654,7 +727,28 @@
this.download('om/productionOrde/export', {
...this.queryParams
}, `productionOrde_${new Date().getTime()}.xlsx`)
- }
+ },
+ /** 鎻愪氦鎸夐挳 */
+ CreateSubmitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ if (this.form.orderNumber != null) {
+ updateOrderScheduling(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addOrderScheduling(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ }
+ });
+ },
+
}
};
</script>
--
Gitblit v1.9.3