From bc16d211c5a2b31f0e3127a102748806151eaecb Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 十二月 2023 16:23:19 +0800
Subject: [PATCH] modified: src/const/crud/customerOrder/customerOrderForm.js modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/product/workbench/operation-task-pane.vue modified: src/views/product/workbench/taskinfo-pane.vue modified: src/views/product/workbench/workReportCard.vue modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/newReport/ReportForm.vue modified: src/views/quality/processInspect/processInspect-form.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/quality/teststandard/standard-form.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/operation/operation-form.vue modified: src/views/technology/routing/routing-form.vue modified: src/views/warehouse/changestock/index.vue
---
src/views/warehouse/changestock/index.vue | 306 +++++++++++++++++++-------------------------------
1 files changed, 118 insertions(+), 188 deletions(-)
diff --git a/src/views/warehouse/changestock/index.vue b/src/views/warehouse/changestock/index.vue
index 29b448d..22c7325 100644
--- a/src/views/warehouse/changestock/index.vue
+++ b/src/views/warehouse/changestock/index.vue
@@ -2,145 +2,90 @@
<div class="mod-config">
<basic-container>
<div style="margin-left: 15px;">
- <el-row>
- <el-col :span="1">
- <div>
- <el-divider direction="vertical"></el-divider>
- <div
- style="float: left;height: 18px;font-size: 14px;line-height: 18px;font-weight: bold"
- >
- <span>闆朵欢</span>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-input
- class="change-stock-input"
- v-model="partNoStock"
- placeholder="闆朵欢"
- style="width: 100%"
- disabled
- >
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openPartDialog()"
- ></el-button>
- </el-input>
- </div>
- </el-col>
- <el-col :span="1" :offset="1">
- <div>
- <el-divider direction="vertical"></el-divider>
- <div
- style="float: left;height: 18px;font-size: 14px;line-height: 18px;font-weight: bold"
- >
- <span>搴撲綅</span>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-input
- class="change-stock-input"
- v-model="locationNoStock"
- placeholder="搴撲綅鍙�"
- @focus="openPicker(locationNoStock)"
- style="width: 100%"
- disabled
- >
- <i
- slot="suffix"
- v-show="locationNoStock"
- @click="clearForm(locationNoStock)"
- class="el-input__icon el-icon-error err-style"
- ></i>
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openLocationDialog()"
- ></el-button>
- </el-input>
- </div>
- </el-col>
- <el-col :span="2">
- <div style="display:flex;justify-content:flex-end;">
- <div
- style="height: 18px;font-size: 14px;line-height: 18px;font-weight: bold;width:60px;"
- >
- <span>鎵规鍙�</span>
- </div>
- <div>
- <el-divider direction="vertical"></el-divider>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-input
- class="change-stock-input"
- v-model="partBatchNoStock"
- placeholder="鎵规鍙�"
- @focus="openPicker(partBatchNoStock)"
- style="width: 100%"
- disabled
- >
- <i
- slot="suffix"
- v-show="partBatchNoStock"
- @click="clearStock(partBatchNoStock)"
- class="el-input__icon el-icon-error err-style"
- ></i>
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openStockDialog()"
- ></el-button>
- </el-input>
- </div>
- </el-col>
- <el-col :span="2">
- <div style="display:flex;justify-content:flex-end;">
- <div
- style="height: 18px;font-size: 14px;line-height: 18px;font-weight: bold;width:60px;"
- >
- <span>鍙敤鏁伴噺</span>
- </div>
- <div>
- <el-divider direction="vertical"></el-divider>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-select
- v-model="stockList.condition"
- placeholder="璇烽�夋嫨"
- @change="conditionChange"
- >
- <el-option
- v-for="item in conditionOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ <el-form class="l-mes" style="width:100%" :model="searchForm" label-width="80px" label-position="right">
+ <el-row>
+ <el-col :span="5">
+ <el-form-item label="闆朵欢">
+ <el-input
+ class="change-stock-input"
+ v-model="searchForm.partNoStock"
+ placeholder="闆朵欢"
+ style="width: 100%"
+ disabled
>
- </el-option>
- </el-select>
- </div>
- </el-col>
- <el-col :span="3">
- <div style="text-align:center;">
- <el-button @click="clearConditions">娓呯┖</el-button
- ><el-button
- @click="queryByConditions"
- :disabled="isSubmit"
- type="primary"
- >鏌ヨ</el-button
- >
- </div>
- </el-col>
- </el-row>
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @click="openPartDialog()"
+ ></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="搴撲綅">
+ <el-input
+ class="change-stock-input"
+ v-model="searchForm.locationNoStock"
+ placeholder="搴撲綅鍙�"
+ style="width: 100%"
+ disabled
+ >
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @click="openLocationDialog()"
+ ></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎵规鍙�">
+ <el-input
+ class="change-stock-input"
+ v-model="searchForm.partBatchNoStock"
+ placeholder="鎵规鍙�"
+ style="width: 100%"
+ disabled
+ >
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @click="openStockDialog()"
+ ></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鍙敤鏁伴噺">
+ <el-select
+ style="width:100%"
+ v-model="searchForm.condition"
+ placeholder="璇烽�夋嫨"
+ @change="conditionChange"
+ >
+ <el-option
+ v-for="item in conditionOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3" :offset="1">
+ <div style="text-align:center;">
+ <el-button @click="clearConditions">娓呯┖</el-button
+ ><el-button
+ @click="queryByConditions"
+ :disabled="isSubmit"
+ type="primary"
+ >鏌ヨ</el-button
+ >
+ </div>
+ </el-col>
+ </el-row>
+ </el-form>
<div style="margin-top: 15px;">
<el-divider direction="vertical"></el-divider>
<div
@@ -148,11 +93,11 @@
>
<span>瀹炴椂搴撳瓨</span>
</div>
- <el-button type="primary" @click="addOrUpdateHandle()"
+ <el-button size="mini" type="primary" @click="addOrUpdateHandle()"
>鏂板</el-button
>
- <el-button type="primary" @click="addStockSubmit()">鎺ユ敹</el-button>
- <el-button type="primary" @click="deleteStockSubmit()"
+ <el-button size="mini" type="primary" @click="addStockSubmit()">鎺ユ敹</el-button>
+ <el-button size="mini" type="primary" @click="deleteStockSubmit()"
>鍙戞斁</el-button
>
@@ -307,6 +252,12 @@
export default {
data() {
return {
+ searchForm: {
+ partNoStock: null,
+ locationNoStock: null,
+ partBatchNoStock: null,
+ condition: '>0',
+ },
stockList: {
condition: '>0',
locationNo: null,
@@ -322,9 +273,6 @@
paramObj: {},
dataRule: {},
addOrUpdateVisible: false,
- partNoStock: null,
- locationNoStock: null,
- partBatchNoStock: null,
showPart: false,
showLocation: false,
showStock: false,
@@ -355,7 +303,7 @@
}
},
watch: {
- partNoStock: {
+ 'searchForm.partNoStock': {
handler(newValue, oldValue) {
if (newValue != null && newValue != undefined) {
// this.getData()
@@ -364,7 +312,7 @@
deep: true,
immediate: true
},
- locationNoStock: {
+ 'searchForm.locationNoStock': {
handler(newValue, oldValue) {
if (newValue != null && newValue != undefined) {
// this.getData()
@@ -373,7 +321,7 @@
deep: true,
immediate: true
},
- partBatchNoStock: {
+ 'searchForm.partBatchNoStock': {
handler(newValue, oldValue) {
if (newValue != null && newValue != undefined) {
// this.getData()
@@ -386,16 +334,16 @@
methods: {
// 娓呯┖鎵�鏈夋煡璇㈡潯浠�
clearConditions() {
- this.partNoStock = null
+ this.searchForm.partNoStock = null
this.stockList.partNo = null
this.paramObj.partId = null
this.stockList.partName = null
this.stockList.partId = null
- this.locationNoStock = null
+ this.searchForm.locationNoStock = null
this.stockList.locationNo = null
this.stockList.locationId = null
this.paramObj.locationId = null
- this.partBatchNoStock = null
+ this.searchForm.partBatchNoStock = null
this.stockList.partBatchNo = null
},
// 鏍规嵁鏌ヨ鏉′欢锛屾悳绱�
@@ -403,15 +351,15 @@
this.getData()
},
// 鍙敤鏁伴噺鏉′欢鍙樻洿鍚庯紝瑙﹀彂鏌ヨ
- conditionChange() {
- // this.getData()
+ conditionChange(val) {
+ this.stockList.condition = val
},
// 闆朵欢
openPartDialog() {
this.showPart = true
},
getData() {
- if (this.partNoStock != null) {
+ if (this.searchForm.partNoStock != null) {
getStockCount(this.stockList).then((resp) => {
const respData = resp.data.data
if (respData && respData > 100) {
@@ -433,29 +381,10 @@
this.$message.error('璇峰厛閫夋嫨涓�涓浂浠�')
}
},
- openPicker() {
- document.activeElement.blur() // 涓诲姩瑙﹀彂onblur浜嬩欢锛屾槸鍘熺敓鐨刯s鍝�
- },
- clearForm() {
- this.locationNoStock = null
- this.stockList.locationNo = this.locationNoStock
- this.stockList.locationId = null
- this.paramObj.locationId = null
- // this.getData()
- },
- clearStock() {
- this.partBatchNoStock = null
- this.stockList.partBatchNo = this.partBatchNoStock
- this.locationNoStock = null
- this.stockList.locationNo = this.locationNoStock
- this.stockList.locationId = null
- this.paramObj.locationId = null
- // this.getData()
- },
selectPart(param) {
if (param) {
- this.partNoStock = param.partNo
- this.stockList.partNo = this.partNoStock
+ this.searchForm.partNoStock = param.partNo
+ this.stockList.partNo = this.searchForm.partNoStock
this.paramObj.partId = param.id
this.stockList.partName = param.partName
this.stockList.partId = param.id
@@ -469,14 +398,15 @@
// }
},
selectLocation(param) {
+ console.log(param);
if (param) {
- this.locationNoStock = param.locNo
- this.stockList.locationNo = this.locationNoStock
+ this.searchForm.locationNoStock = param.locNo
+ this.stockList.locationNo = this.searchForm.locationNoStock
this.stockList.locationId = param.id
this.paramObj.locationId = param.id
} else {
- this.locationNoStock = null
- this.stockList.locationNo = this.locationNoStock
+ this.searchForm.locationNoStock = null
+ this.stockList.locationNo = this.searchForm.locationNoStock
this.stockList.locationId = null
this.paramObj.locationId = null
// this.getData()
@@ -492,25 +422,25 @@
dataFormSubmit() {},
selectStock(param) {
if (param) {
- this.partBatchNoStock = param.partBatchNo
- this.stockList.partBatchNo = this.partBatchNoStock
+ this.searchForm.partBatchNoStock = param.partBatchNo
+ this.stockList.partBatchNo = this.searchForm.partBatchNoStock
this.stockList.locationNo = param.locationNo
- this.locationNoStock = param.locationNo
+ this.searchForm.locationNoStock = param.locationNo
this.stockList.locationId = param.locationId
this.paramObj.locationId = param.locationId
- this.partNoStock = param.partNo
- this.stockList.partNo = this.partNoStock
+ this.searchForm.partNoStock = param.partNo
+ this.stockList.partNo = this.searchForm.partNoStock
this.paramObj.partId = param.partId
this.stockList.partName = param.partName
this.stockList.partId = param.partId
} else {
- this.partBatchNoStock = null
- this.stockList.partBatchNo = this.partBatchNoStock
- this.locationNoStock = null
- this.stockList.locationNo = this.locationNoStock
+ this.searchForm.partBatchNoStock = null
+ this.stockList.partBatchNo = this.searchForm.partBatchNoStock
+ this.searchForm.locationNoStock = null
+ this.stockList.locationNo = this.searchForm.locationNoStock
this.stockList.locationId = null
this.paramObj.locationId = null
- this.partNoStock = null
+ this.searchForm.partNoStock = null
this.stockList.partNo = null
this.paramObj.partId = null
this.stockList.partName = null
--
Gitblit v1.9.3