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/product/workbench/operation-task-pane.vue | 1
src/views/technology/routing/routing-form.vue | 95 ++-----
src/views/technology/completeproductstructure/completeproductstructure-form.vue | 2
src/views/product/workbench/workReportCard.vue | 3
src/const/crud/customerOrder/customerOrderForm.js | 1
src/views/warehouse/changestock/index.vue | 306 ++++++++++-----------------
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 2
src/views/technology/operation/operation-form.vue | 135 ++----------
src/views/plan/operationtask/operationtask-form.vue | 1
src/views/quality/processInspect/processInspect-form.vue | 84 +++----
src/views/product/workbench/taskinfo-pane.vue | 1
src/views/quality/rawMaterial/rawMaterial-form.vue | 2
src/views/quality/teststandard/standard-form.vue | 6
src/views/quality/newReport/ReportForm.vue | 2
src/views/technology/document/document-form.vue | 2
15 files changed, 222 insertions(+), 421 deletions(-)
diff --git a/src/const/crud/customerOrder/customerOrderForm.js b/src/const/crud/customerOrder/customerOrderForm.js
index 979cc63..99d8a29 100644
--- a/src/const/crud/customerOrder/customerOrderForm.js
+++ b/src/const/crud/customerOrder/customerOrderForm.js
@@ -26,6 +26,7 @@
delBtn: false,
align: 'center',
addBtn: false,
+ addBtnText: '娣诲姞琛�',
addRowBtn: true,
refreshBtn: false, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
columnBtn: false, // 鏄惁鏄剧ず鏄惧奖鎸夐挳H
diff --git a/src/views/plan/operationtask/operationtask-form.vue b/src/views/plan/operationtask/operationtask-form.vue
index 2c1d48e..02fb8dc 100644
--- a/src/views/plan/operationtask/operationtask-form.vue
+++ b/src/views/plan/operationtask/operationtask-form.vue
@@ -778,7 +778,6 @@
// this.dataForm.partName = this.routingList.partName
// this.dataForm.partId = this.routingList.partId
// 鍒堕�犺鍗昮orm鍒涘缓鐨勶紝鑷姩甯﹀嚭宸ュ簭
- console.log(this.routingOptions);
if (param.selectedRoutingOperationId && this.routingOptions) {
const option = this.routingOptions.find(
(e) => e.id === param.selectedRoutingOperationId
diff --git a/src/views/product/workbench/operation-task-pane.vue b/src/views/product/workbench/operation-task-pane.vue
index 4c9c558..5e07e8d 100644
--- a/src/views/product/workbench/operation-task-pane.vue
+++ b/src/views/product/workbench/operation-task-pane.vue
@@ -719,7 +719,6 @@
break
}
}
- // console.log(this.operationTasks)
// 鑻ュ綋鍓嶅伐鍗曞湪宸ュ崟鍒楄〃鏈鎵惧埌涓斿綋鍓嶅伐鍗曠姸鎬佷负宸插畬鎴愭垨宸插彇娑堟椂锛屽垯灏嗗綋鍓嶅伐鍗曢噸缃负绌哄苟鎶涘嚭浜嬩欢锛屽惁鍒欎笉绠�
if (isResetCurrOpertionTaskFlag) {
getOperationTaskById(taskId).then((res) => {
diff --git a/src/views/product/workbench/taskinfo-pane.vue b/src/views/product/workbench/taskinfo-pane.vue
index 488cfe1..443fda6 100644
--- a/src/views/product/workbench/taskinfo-pane.vue
+++ b/src/views/product/workbench/taskinfo-pane.vue
@@ -1675,7 +1675,6 @@
// 缁欏脊鍑烘浜ч噺鍒楄〃productList璧嬪��
this.productList = []
const product = {}
- console.log('userInfo', this.userInfo)
const currStaff = this.personBoardList.find((item) => {
return item.staffId == this.userInfo.staffId
})
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index 6b121ae..e070a2c 100644
--- a/src/views/product/workbench/workReportCard.vue
+++ b/src/views/product/workbench/workReportCard.vue
@@ -2749,7 +2749,6 @@
},
createLodopPrintIze(data) {
const currYearAndMonth = getYearAndMonth()
- console.log(data)
const qr = {
part_no: data.partNo,
lot_batch_no: data.ifsBatchNo,
@@ -2890,7 +2889,6 @@
this.LODOP.PRINT()
},
createLodopPrint(data) {
- console.log(data)
const qr = {
part_no: data.partNo,
lot_batch_no: data.ifsBatchNo,
@@ -3075,7 +3073,6 @@
},
saveList() {
const list = JSON.parse(JSON.stringify(this.productOutputList))
- console.log(`output->list`, list)
const data = []
list.forEach((el) => {
if (el.isEdit) {
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 5457054..c43c355 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -8,7 +8,7 @@
<h2 v-else>缂栬緫-浜у搧妫�楠屽崟</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="addTestProject" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
+ <el-button type="primary" @click="addTestProject" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
</div>
</div>
<div class="page-main">
diff --git a/src/views/quality/newReport/ReportForm.vue b/src/views/quality/newReport/ReportForm.vue
index f2d6203..d6d6a7a 100644
--- a/src/views/quality/newReport/ReportForm.vue
+++ b/src/views/quality/newReport/ReportForm.vue
@@ -1504,14 +1504,12 @@
},
data: requireData,
success: function(response) {
- console.log('response', response)
const resJson = JSON.parse(
response
.replace(/\r/g, '')
.replace(/\n/g, '')
.replace(/\s*/g, '')
)
- console.log('resJson', resJson)
// TODO
if (resJson.message) {
const resData = resJson.data
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 9a3454a..2d674d4 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -8,13 +8,13 @@
<h2 v-else>缂栬緫-杩囩▼妫�楠屽崟</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="addTestProject" v-if="processInspectVo.id == null">鐢熸垚妫�楠岄」鐩�</el-button>
+ <el-button type="primary" @click="addTestProject" v-if="processInspectVo.id == null">鐢熸垚妫�楠岄」鐩�</el-button>
</div>
</div>
<div class="page-main">
<div class="finishedProduct-basic">
<el-form :model="processInspectVo" ref="addInspectionform" class="l-mes" label-position="right"
- label-width="120px" style="width: 100%" size="small">
+ label-width="120px" style="width: 100%" size="small" :rules="rules">
<div class="formwrapper">
<el-row>
<el-col :span="6">
@@ -24,7 +24,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁㈠崟鍙凤細">
+ <el-form-item label="璁㈠崟鍙凤細" prop="orderNumber">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
v-model="processInspectVo.orderNumber" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
</el-form-item>
@@ -113,7 +113,7 @@
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.empiricalValueAddss[index]"
- @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.empiricalValueAddss[index]"></span>
</el-tooltip>
@@ -121,10 +121,7 @@
<el-col v-else>
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <!-- <el-input :disabled="scope.row.eId == null"
- v-model="scope.row.empiricalValueAddss[index]"
- @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input> -->
- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
+ <el-select style="width: 100%;" @change="changeState(scope.row)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
<el-option v-for="item in dataVal" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
@@ -151,31 +148,16 @@
<el-table-column
label="妫�楠屾弿杩�" width="240" style="text-align: center;">
<template slot-scope="scope">
- <el-col v-if="scope.row.itype === '1'">
+ <el-col>
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.inote"
- @blur="changeState(scope.row, inote)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+ @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.inote"></span>
</el-tooltip>
</el-col>
- <el-col v-else>
- <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
- class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <el-input :disabled="scope.row.eId == null"
- v-model="scope.row.inote"
- @blur="changeState(scope.row, inote)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
- <!-- <el-select style="width: 100%;" @change="changeState(scope.row, inote)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="璇烽�夋嫨">
- <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
- :value="item.value">
- </el-option>
- </el-select> -->
- <span v-if="resultVal != null && processInspectVo.id != null"
- v-text="scope.row.inote"></span>
- </el-tooltip>
- </el-col>
</template>
</el-table-column>
<el-table-column label="缁撹" fixed="right" min-width="100">
@@ -236,6 +218,9 @@
export default {
data() {
return {
+ rules: {
+ orderNumber: [{required:true,message:'璁㈠崟鍙蜂笉鑳戒负绌�',trigger:'blur'}]
+ },
dataVal: [{
label: '鏄�',
value: '鏄�'
@@ -257,7 +242,7 @@
proInsNo: null,
material: null,
materialCode: null,
- orderNumber: "ZTTIC20230001",
+ orderNumber: null,
quantity: null,
specs: null,
unit: null,
@@ -378,9 +363,9 @@
arr = obj.inspectionValue.split(",")
}
obj.empiricalValueAddss = arr
- if(obj.note){
- snote=obj.inote
- }
+ if(!obj.inote){
+ obj.inote = null
+ }
if (arr.length > this.empiricalValueAdd) {
this.empiricalValueAdd = arr.length
}
@@ -432,7 +417,7 @@
this.processInspectVo.material = sample.material
this.technologyList = sample.children
},
- changeState(row, index) {
+ changeState(row) {
if (row.iid != null && row.iid != '') {
let str = ""
row.empiricalValueAddss.forEach(e => {
@@ -462,20 +447,23 @@
},
addTestProject() {
let val = this.processInspectVo
+ const _than = this
addProcess(val).then(res => {
let id = res.data.data
if (id != null) {
+ _than.processInspectVo.id = id
queryById(id).then(response => {
let proList = response.data.data.children
proList.forEach(item => {
item.iid = Math.random();
if (item.children != undefined) {
item.children.forEach(obj => {
+ obj.inote = null
obj.empiricalValueAddss = []
})
}
})
- this.inspectionItems = proList
+ _than.inspectionItems = proList
}).catch(error => {
console.log(error);
})
@@ -485,21 +473,25 @@
})
},
selectInfoByOrderId() {
- chooseMater({
- orderNumber: this.processInspectVo.orderNumber
- }).then(res => {
- if (res.data.data != null) {
- this.optionsSamplename = res.data.data.children
- } else {
- this.$message({
- message: '娌℃湁璇ヨ鍗曞彿锛�',
- type: 'warning'
- });
- this.optionsSamplename = []
- this.processInspectVo.materialCode = null
- this.processInspectVo.material = null
- this.processInspectVo.specs = null
- this.processInspectVo.unit = null
+ this.$refs.addInspectionform.validate(valid=>{
+ if(valid){
+ chooseMater({
+ orderNumber: this.processInspectVo.orderNumber
+ }).then(res => {
+ if (res.data.data != null) {
+ this.optionsSamplename = res.data.data.children
+ } else {
+ this.$message({
+ message: '娌℃湁璇ヨ鍗曞彿锛�',
+ type: 'warning'
+ });
+ this.optionsSamplename = []
+ this.processInspectVo.materialCode = null
+ this.processInspectVo.material = null
+ this.processInspectVo.specs = null
+ this.processInspectVo.unit = null
+ }
+ })
}
})
},
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 1d38bdc..578e65c 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -7,7 +7,7 @@
<h2 v-else>缂栬緫-鍘熸潗鏂欐楠�</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="save()" v-if="this.dataForm.id==null">淇濆瓨</el-button>
+ <el-button @click="save()" type="primary" v-if="this.dataForm.id==null">淇濆瓨</el-button>
</div>
</div>
<div class="page-main">
diff --git a/src/views/quality/teststandard/standard-form.vue b/src/views/quality/teststandard/standard-form.vue
index 3b0cbde..4cc5f4c 100644
--- a/src/views/quality/teststandard/standard-form.vue
+++ b/src/views/quality/teststandard/standard-form.vue
@@ -262,6 +262,9 @@
this.visible = false
this.isSubmit = false
this.$emit('refreshDataList')
+ }).catch(error=>{
+ console.error(error);
+ this.isSubmit = false
})
} else {
addTestStandard(this.dataForm).then((data) => {
@@ -269,6 +272,9 @@
this.visible = false
this.isSubmit = false
this.$emit('refreshDataList')
+ }).catch(error=>{
+ console.error(error);
+ this.isSubmit = false
})
}
} else {
diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
index 93e1376..03ee99f 100644
--- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue
+++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
@@ -7,7 +7,7 @@
<h2 v-if="!editable">鏌ョ湅-瀹屾暣浜у搧缁撴瀯</h2>
</div>
<div class="btn-group header-right" v-if="editable">
- <el-button :disabled="isSubmit" v-thinclick="`dataFormSubmit`"
+ <el-button type="primary" :disabled="isSubmit" v-thinclick="`dataFormSubmit`"
>淇濆瓨</el-button
>
</div>
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index 19348cf..b3448e3 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -7,7 +7,7 @@
<h2 v-if="!editable">鏌ョ湅-宸ヨ壓鏂囦欢</h2>
</div>
<div class="btn-group header-right" v-if="editable">
- <el-button @click="save()">淇濆瓨</el-button>
+ <el-button type="primary" @click="save()">淇濆瓨</el-button>
</div>
</div>
<div class="page-main">
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index d6bd9e4..85832ba 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -6,7 +6,7 @@
<h2>缂栬緫-宸ュ簭</h2>
</div>
<div class="btn-group header-right">
- <el-button :disabled="isSubmit" v-thinclick="`dataFormSubmit`"
+ <el-button type="primary" :disabled="isSubmit" v-thinclick="`dataFormSubmit`"
>淇濆瓨</el-button
>
</div>
@@ -14,50 +14,38 @@
<div class="page-main">
<div class="operation-basic">
<el-form
- :inline="true"
+ style="width:100%"
:model="dataForm"
:rules="dataRule"
ref="dataForm"
label-width="100px"
- class="l-mes form-content"
- >
+ class="l-mes">
<el-row class="first-row">
- <el-col :span="24">
+ <el-col :span="6">
<el-form-item label="宸ュ簭鍚嶇О" prop="name">
<el-input
+ style="width:100%"
v-model="dataForm.name"
placeholder="宸ュ簭鍚嶇О"
></el-input>
</el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="宸ュ簭缂栧彿" prop="operationNo">
<el-input
+ style="width:100%"
v-model="dataForm.operationNo"
placeholder="宸ュ簭缂栧彿"
></el-input>
</el-form-item>
- <!-- <el-form-item label="闆朵欢鏃�" prop="partFamilyId">
- <el-select
- v-model="dataForm.partFamilyId"
- filterable
- placeholder="璇烽�夋嫨"
- style="width: 100%;"
- >
- <el-option
- v-for="(item, index) in this.partFamilyOptions"
- :key="index"
- :label="item.partFamilyName"
- :value="item.id"
- >
- </el-option>
- </el-select>
- </el-form-item> -->
+ </el-col>
+ <el-col :span="6">
<el-form-item label="宸ヤ綔涓績" prop="workCenter">
<el-select
v-model="dataForm.workCenter"
placeholder="宸ヤ綔涓績"
style="width: 100%"
- filterable
- >
+ filterable >
<el-option
v-for="item in workCenterOptions"
:key="item.id"
@@ -66,18 +54,8 @@
/>
</el-select>
</el-form-item>
- <!-- <el-form-item label="鏈哄櫒杩愯浆鍥犵礌" prop="machRunFactor">
- <el-input
- v-model="dataForm.machRunFactor"
- placeholder="鏈哄櫒杩愯浆鍥犵礌"
- ></el-input>
- </el-form-item>
- <el-form-item label="鏈哄櫒璁剧疆鏃堕棿" prop="machSetupTime">
- <el-input
- v-model="dataForm.machSetupTime"
- placeholder="鏈哄櫒璁剧疆鏃堕棿"
- ></el-input>
- </el-form-item> -->
+ </el-col>
+ <el-col :span="6">
<el-form-item label="浜哄伐绫诲埆" prop="laborClassNo">
<el-select
v-model="dataForm.laborClassNo"
@@ -94,95 +72,30 @@
</el-option>
</el-select>
</el-form-item>
- <!-- <el-form-item label="鍔冲姏杩愯浆鍥犵礌" prop="laborRunFactor">
- <el-input
- v-model="dataForm.laborRunFactor"
- placeholder="鍔冲姏杩愯浆鍥犵礌"
- ></el-input>
- </el-form-item> -->
- <!-- <el-form-item label="鍔冲姏璁剧疆鏃堕棿" prop="laborSetupTime">
- <el-input
- v-model="dataForm.laborSetupTime"
- placeholder="鍔冲姏璁剧疆鏃堕棿"
- ></el-input>
- </el-form-item> -->
- <!-- <el-form-item label="鍥犵礌鍗曚綅" prop="runTimeCodeDb">
- <el-select
- v-model="dataForm.runTimeCodeDb"
- placeholder="鍥犵礌鍗曚綅"
- style="width: 100%"
- >
- <el-option
- v-for="item in runTimeCodeDbOptions"
- :key="item.id"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item> -->
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
<el-form-item label="鐝粍浜哄憳" prop="crewSize">
<el-input
+ style="width:100%"
v-model="dataForm.crewSize"
placeholder="鐝粍浜哄憳"
></el-input>
</el-form-item>
- <!-- <el-form-item label="澶栭儴宸ュ簭椤圭洰" prop="outsideOpItem">
- <el-select
- v-model="dataForm.outsideOpItem"
- placeholder="澶栭儴宸ュ簭椤圭洰"
- style="width: 170px"
- clearable
- >
- <el-option
- v-for="item in outsideOpItemOptions"
- :key="item.id"
- :label='item.value + "-" + item.label '
- :value="item.value"
- />
- </el-select>
- </el-form-item> -->
+ </el-col>
+ <el-col :span="12">
<el-form-item label="澶囨敞" prop="remark">
<el-input
v-model="dataForm.remark"
placeholder="澶囨敞"
- style="width: 280px"
+ style="width: 100%"
></el-input>
</el-form-item>
</el-col>
- </el-row>
- <!-- <el-row style="padding-top: 10px">
- <el-col :span="24">
- <el-form-item label="閰嶇疆椤�">
- <el-checkbox-group
- v-model="checkboxGroup"
- @change="checkboxGroupChange()"
- >
- <el-checkbox-button
- label="productionCounting"
- key="productionCounting"
- >鎶ュ伐</el-checkbox-button
- >
- <el-checkbox-button label="daq" key="daq"
- >閲囬泦</el-checkbox-button
- >
- <el-checkbox-button label="inspection" key="inspection"
- >妫�楠�</el-checkbox-button
- >
- <el-checkbox-button
- label="autoInspection"
- key="autoInspection"
- >鑷姩鎶ユ</el-checkbox-button
- >
- <el-checkbox-button label="semiFinished" key="semiFinished"
- >鍗婃垚鍝�</el-checkbox-button
- >
- <el-checkbox-button label="materialCost" key="materialCost"
- >鎶曟枡</el-checkbox-button
- >
- </el-checkbox-group>
- </el-form-item>
+ <el-col :span="6">
</el-col>
- </el-row> -->
+ </el-row>
</el-form>
</div>
@@ -1163,7 +1076,7 @@
<style>
.operation-basic {
background-color: #fff;
- height: 200px;
+ height: 130px;
display: flex;
padding: 20px 30px;
border: 1px solid #ddd;
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index 38698da..9a1e3d4 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -7,31 +7,35 @@
<h2 v-if="!editable">鏌ョ湅-宸ヨ壓璺嚎</h2>
</div>
<div class="btn-group header-right" v-if="editable">
- <el-button :disabled="isSubmit" v-thinclick="`allSave`">淇濆瓨</el-button>
+ <el-button :disabled="isSubmit" type="primary" v-thinclick="`allSave`">淇濆瓨</el-button>
</div>
</div>
<div class="page-main">
<div class="routing-basic">
<el-form
- :inline="true"
:model="dataForm"
:rules="dataRule"
ref="dataForm"
+ label-width="100px"
style="width: 100%"
class="l-mes"
:disabled="!editable"
>
<el-row>
- <el-col :span="24">
- <el-form-item prop="routingNo" label="宸ヨ壓缂栧彿">
+ <el-col :span="6">
+ <el-form-item style="width:100%" prop="routingNo" label="宸ヨ壓缂栧彿">
<el-input
+ style="width:100%"
v-model="dataForm.routingNo"
placeholder="宸ヨ壓缂栧彿"
disabled
></el-input>
</el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item prop="partNo" label="闆朵欢鍙�">
<el-input
+ style="width:100%"
v-model="dataForm.partNo"
placeholder="闆朵欢鍙�"
disabled
@@ -43,60 +47,31 @@
></el-button>
</el-input>
</el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item prop="partName" label="闆朵欢鍚嶇О">
<el-input
v-model="dataForm.partName"
placeholder="闆朵欢鍚嶇О"
readonly
- style="width: 300px"
+ style="width: 100%"
></el-input>
</el-form-item>
- <el-form-item prop="description" label="鎻忚堪">
- <el-input
- v-model="dataForm.description"
- placeholder="鎻忚堪"
- style="width: 280px"
- ></el-input>
- </el-form-item>
- <!-- <el-form-item prop="wireCore" label="绾胯姱">
- <el-input
- v-model="dataForm.wireCore"
- placeholder="绾胯姱"
- style="width: 60px"
- ></el-input>
- </el-form-item> -->
+ </el-col>
+ <el-col :span="6">
<el-form-item label="BOM" prop="bomId">
- <el-select :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
+ <el-select style="width:100%" :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
<el-option
v-for="item in bomList"
:key="item.id"
:label="item.number"
- :value="item.id"
- />
+ :value="item.id" />
</el-select>
</el-form-item>
- <!-- <el-form-item prop="version" label="宸ヨ壓鐗堟湰">
- <el-input
- v-model="dataForm.version"
- placeholder="宸ヨ壓鐗堟湰"
- ></el-input>
- </el-form-item> -->
- <!-- <el-form-item label="宸ヨ壓绫诲瀷" prop="bomTypeDb">
- <el-select
- v-model="dataForm.bomTypeDb"
- placeholder="璇烽�夋嫨宸ヨ壓绫诲瀷"
- style="width:100%"
- @change="bomTypeDbChange"
- >
- <el-option
- v-for="(item, index) in bomTypeDbOptions"
- :label="item.label"
- :value="item.value"
- :key="index"
- >
- </el-option>
- </el-select>
- </el-form-item> -->
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
<el-form-item label="閫愭閲囩敤鏃ユ湡" prop="phaseInDate">
<el-date-picker
v-model="dataForm.phaseInDate"
@@ -106,6 +81,8 @@
>
</el-date-picker>
</el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="閫愭娣樻卑鏃ユ湡" prop="phaseOutDate">
<el-date-picker
v-model="dataForm.phaseOutDate"
@@ -115,27 +92,17 @@
>
</el-date-picker>
</el-form-item>
- <!-- <el-form-item prop="alternativeNo" label="鏇夸唬">
+ </el-col>
+ <el-col :span="6">
+ <el-form-item prop="description" label="鎻忚堪">
<el-input
- v-model="dataForm.alternativeNo"
- placeholder="鏇夸唬"
+ v-model="dataForm.description"
+ placeholder="鎻忚堪"
+ style="width: 100%"
></el-input>
- </el-form-item> -->
- <!-- <el-form-item prop="alternativeDesc" label="鏇夸唬鎻忚堪">
- <el-input
- v-model="dataForm.alternativeDesc"
- placeholder="鏇夸唬鎻忚堪"
- ></el-input>
- </el-form-item> -->
- <!-- <el-form-item label="宸插悓姝ヨ嚦IFS" prop="ifsSync">
- <span
- style="width: 146px;display: inline-block;font-size:12px;font-weight:bold;"
- >{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span
- >
- </el-form-item> -->
- <!-- <el-form-item label="涓诲伐鑹�" prop="master">
- <el-switch v-model="dataForm.master"> </el-switch>
- </el-form-item> -->
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
</el-col>
</el-row>
</el-form>
@@ -731,7 +698,7 @@
wireCore: null
},
dataRule: {
- partName: [
+ partNo: [
{ required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'change' }
],
bomTypeDb: [
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