From 162d0b2a887718585658404fdedc523d28cf659f Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 18 一月 2024 14:09:08 +0800
Subject: [PATCH] 搜索条件调整
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 77 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 00823a4..249fae6 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -30,23 +30,20 @@
<el-form-item style="margin-left: 14px" label="浜у搧缂栧彿" prop="productCode">
<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-form-item label="鏈哄瀷" prop="typeZ">
+ <el-input v-model="queryParams.typeZ" 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-form-item>
- <el-form-item label="浜х嚎缂栧彿" prop="lineCode">
- <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-form-item>
- <el-form-item label="宸ヨ壓娴佺▼" prop="routeCode">
- <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-form-item label-width="130" label="閫氱煡鍗曠敓鎴愭棩鏈�" prop="dateConditions">
+ <el-date-picker
+ v-model="queryParams.dateConditions"
+ type="datetimerange"
+ :picker-options="pickerOptions"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ align="right">
+ </el-date-picker>
</el-form-item>
</el-form>
</el-card>
@@ -117,9 +114,9 @@
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
- type="warning"
+ type="success"
plain
- icon="el-icon-download"
+ icon="el-icon-wind-power"
size="mini"
@click="getProductionNotice"
v-hasPermi="['om:productionOrde:receive']"
@@ -461,6 +458,7 @@
flag: null,
adds:null,
productionNotice: null,
+ dateConditions: [],
},
materialQueryParams: {
pageNum: 1,
@@ -503,6 +501,33 @@
year: '',
},
markNo: '',
+ pickerOptions: {
+ shortcuts: [{
+ text: '鏈�杩戜竴鍛�',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戜竴涓湀',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戜笁涓湀',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit('pick', [start, end]);
+ }
+ }]
+ },
};
},
created() {
@@ -552,7 +577,8 @@
getProductionNotice(){
getProductionNotice(this.queryParams).then(response => {
- this.$modal.msgSuccess(response.data.msg);
+
+ this.$modal.msgSuccess(response.msg);
this.queryParams = {}
this.getList();
});
@@ -732,6 +758,7 @@
this.materialQueryParams.materialCode = response.data.productCode;
listMaterial(this.materialQueryParams).then(response => {
this.markNo = response.rows[0].mark
+ this.form.typeL = response.rows[0].typeL;
});
this.form = response.data;
this.Createopen = true;
@@ -779,14 +806,20 @@
model: this.form.typeZ,
modelDate: this.form.dateTimeRule,
}
+ if(startCode>999){
+ this.$message.error('璧峰缂栧彿瓒呭嚭鏈�澶ц寖鍥达紝璇疯緭鍏�1-999鐨勬暟瀛楋紒');
+ return;
+ }else if(startCode<1){
+ this.$message.error('璧峰缂栧彿瓒呭嚭鏈�灏忚寖鍥达紝璇疯緭鍏�1-999鐨勬暟瀛楋紒');
+ return;
+ }
listModelNumber(queryParams).then(response => {
if(response.rows.length === 0){
this.saveBoxCode()
}else {
let maxNumValue = response.rows[0].maxnumValue;
- if(startCode<maxNumValue){
- this.$message.error('鏂板缓鐨勪笉鑳芥瘮鏌ヨ鍑虹殑灏�');
- return;
+ if(startCode<=maxNumValue){
+ this.$message.error('绠变綋鏉＄爜閲嶅锛岃閲嶆柊杈撳叆璧峰缂栧彿锛�');
}else {
this.saveBoxCode()
}
--
Gitblit v1.9.3