From 9562e6b8a5d1b703681074927efbd602b9f48108 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 16 一月 2024 13:50:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 218 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 134 insertions(+), 84 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 4f1359c..5bc4ecd 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -21,7 +21,6 @@
</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>
@@ -96,25 +95,34 @@
v-hasPermi="['om:productionOrde:export']"
>瀵煎嚭</el-button>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-upload2"
- :disabled="move"
- size="mini"
- @click="moveUp(val => val, 'up')"
- >涓婄Щ</el-button>
- </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="warning"-->
+<!-- plain-->
+<!-- icon="el-icon-upload2"-->
+<!-- :disabled="move"-->
+<!-- size="mini"-->
+<!-- @click="moveUp(val => val, 'up')"-->
+<!-- >涓婄Щ</el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="warning"-->
+<!-- plain-->
+<!-- icon="el-icon-download"-->
+<!-- size="mini"-->
+<!-- :disabled="move"-->
+<!-- @click="moveUp(val => val, 'down')"-->
+<!-- >涓嬬Щ</el-button>-->
+<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
- :disabled="move"
- @click="moveUp(val => val, 'down')"
- >涓嬬Щ</el-button>
+ @click="getProductionNotice"
+ >鎺ユ敹</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -146,25 +154,25 @@
</el-table-column>
<el-table-column label="闇�姹傛暟閲�" align="center" prop="planQty">
</el-table-column>
- <el-table-column label="鐗╂枡绫诲瀷" width="140" align="center" prop="productCode">
+ <el-table-column label="浜у搧缂栧彿" width="150" align="center" prop="productCode">
</el-table-column>
- <el-table-column label="瀹為檯鏁伴噺" width="160" align="center" prop="actualQty">
- </el-table-column>
+<!-- <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>
- <el-table-column label="浠撳簱" align="center">
- </el-table-column>
+<!-- <el-table-column label="宸ュ巶" align="center" prop="workshopCode">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="浠撳簱" align="center">-->
+<!-- </el-table-column>-->
<el-table-column label="浜х嚎" align="center" prop="lineCode">
</el-table-column>
- <el-table-column label="璁㈠崟绫诲瀷" align="center">
- </el-table-column>
- <el-table-column label="ZWS" align="center">
- </el-table-column>
+<!-- <el-table-column label="璁㈠崟绫诲瀷" align="center">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="ZWS" align="center">-->
+<!-- </el-table-column>-->
<!-- <el-table-column label="宸ヨ壓娴佺▼" width="140" align="center" prop="routeCode">-->
<!-- </el-table-column>-->
@@ -194,7 +202,7 @@
</el-table-column>
<el-table-column width="160" label="閫氱煡鐢熸垚鏃ユ湡" align="center" prop="createTime">
</el-table-column>
- <el-table-column label="鎴愬搧鎻忚堪" width="160" align="center" prop="productName">
+ <el-table-column label="鎴愬搧鎻忚堪" width="320" align="center" prop="productName">
</el-table-column>
<!-- <el-table-column label="淇敼浜�" width="80" align="center" prop="updateUser">-->
<!-- </el-table-column>-->
@@ -341,43 +349,30 @@
<i class="el-icon-s-order"></i>
{{titleName}}
</span>
- <el-form ref="form" inline :model="form" :rules="CreateRules"label-width="80px">
+ <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 label="鏃ユ湡" prop="dateTime">
+ <el-date-picker clearable
+ v-model="form.dateTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鏃ユ湡" @input="handleCodeChange">
+ </el-date-picker>
</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 class="hidden-form-item" label="鏃ユ湡瑙勫垯" prop="dateTimeRule">
+ <el-input v-model="form.dateTimeRule"/>
</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 label="璧峰缂栧彿" prop="startCode">
+ <el-input type="number" :maxlength="3" :pattern="'[0-9]{3}'" v-model="form.startCode" placeholder="璇疯緭鍏ヨ捣濮嬬紪鍙�" @input="handleCodeChange"/>
</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 label="璧锋缂栧彿" prop="startEndCode">
+ <el-input disabled v-model="form.startEndCode"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="CreateSubmitForm">纭� 瀹�</el-button>
+ <el-button type="primary" @click="submitFormForBoxCode">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -391,8 +386,16 @@
import { listProductBom } from "@/api/main/bs/ProductBom/ProductBom";
import { listTechnologyRoute} from "@/api/main/bs/technologyRoute/technologyRoute";
import ItemSelect from "@/components/itemSelect/single.vue";
-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";
+import { addOrderSchedulingForBoxCode,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";
+import {listMaterial} from "@/api/main/bs/material/material";
export default {
name: "ProductionOrde",
@@ -457,6 +460,11 @@
adds:null,
productionNotice: null,
},
+ materialQueryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ materialCode: null,
+ },
// 琛ㄥ崟鍙傛暟
form: {},
@@ -480,12 +488,19 @@
year: [
{ required: true, message: "涓嶈兘涓虹┖", trigger: "blur" }
],
+ dateTime: [
+ { required: true, message: "涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ startCode: [
+ { required: true, message: "涓嶈兘涓虹┖", trigger: "blur" }
+ ],
},
change: {
day: '',
month: '',
year: '',
},
+ markNo: '',
};
},
created() {
@@ -493,6 +508,44 @@
this.initWorkshop();
},
methods: {
+ //鏃ユ湡鎴栧紑濮嬬紪鍙疯緭鍏ユ椂
+ handleCodeChange(data){
+ let dateTime = this.form.dateTime;
+ let planQty = this.form.planQty;
+ let startCode = this.form.startCode
+ if(dateTime !== null && dateTime !== undefined
+ && startCode !== null && startCode !== undefined) {
+ let dateTimes = dateTime.split("-");
+ let year = dateTimes[0];
+ let month = dateTimes[1];
+ let day = dateTimes[2];
+ let dictYear = this.dict.type.year;
+ let dictMonth = this.dict.type.month;
+ let startCode = this.form.startCode
+ let dateTimeRule = "";
+
+ //骞�
+ for (let i = 0; i < dictYear.length; i++) {
+ if (year === dictYear[i].label) {
+ dateTimeRule = dictYear[i].value
+ // this.form.startEndCode = startEndCode;
+ }
+ }
+ //鏈�
+ for (let i = 0; i < dictMonth.length; i++) {
+ if (month === dictMonth[i].label) {
+ dateTimeRule = dateTimeRule + dictMonth[i].value;
+ }
+ }
+ //鏃�
+ dateTimeRule = dateTimeRule + day;
+ dateTimeRule = dateTimeRule + this.markNo;
+ this.form.dateTimeRule = dateTimeRule;
+ //璧嬪�艰捣濮嬬紪鐮�
+ this.form.startEndCode = dateTimeRule + startCode + "----" + dateTimeRule + String(parseInt(startCode) + parseInt(planQty)-1).padStart(3, '0') ;
+ }
+ },
+
getProductionNotice(){
getProductionNotice(this.queryParams).then(response => {
this.$modal.msgSuccess("鎺ユ敹鎴愬姛");
@@ -671,14 +724,16 @@
const id = Row.id || this.ids
getProductionOrde(id).then(response => {
console.log(response.data)
+ console.log(response.data.productCode)
+ this.materialQueryParams.materialCode = response.data.productCode;
+ listMaterial(this.materialQueryParams).then(response => {
+ this.markNo = response.rows[0].mark
+ });
this.form = response.data;
this.Createopen = true;
- this.titleName = "鐢熸垚璁㈠崟";
+ this.titleName = "鐢熸垚绠变綋鏉＄爜";
// return Array.from({ length: parseInt(this.actualQty) }, (_, index) => index + 1);
});
- this.$modal.msgSuccess(Row.actualQty);
-
-
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -712,6 +767,22 @@
}
});
},
+
+ /** 鐢熸垚绠变綋鏉＄爜鎻愪氦鎸夐挳 */
+ submitFormForBoxCode() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ if (this.form.id != null) {
+ addOrderSchedulingForBoxCode(this.form).then(response => {
+ this.$modal.msgSuccess("淇濆瓨鎴愬姛");
+ this.Createopen = false;
+ this.getList();
+ });
+ }
+ }
+ });
+ },
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
@@ -728,33 +799,12 @@
...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>
<style lang="scss" scoped>
-//::v-deep .el-dialog__header{
-// /*background-color: #f8f8f8;*/
-// background-color: #f8f8f9;
-//}
+.hidden-form-item {
+ display: none;
+}
</style>
--
Gitblit v1.9.3