From e87aa5d7b6b44e36a7dfb3b0a705446d0fe55e2d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 01 十二月 2023 15:31:57 +0800
Subject: [PATCH] 工作台修复
---
src/views/admin/productType/index.vue | 9 ++--
src/views/product/workbench/feed-pane.vue | 38 +++++++++++++++---
src/views/basic/workstation/workstation-form.vue | 8 ++--
src/views/quality/processconfiguration/index.vue | 2
vue.config.js | 3 -
src/views/plan/customerorder/customerorder-form.vue | 41 ++++++++++++--------
src/views/product/workbench/productInDialog.vue | 8 +++-
7 files changed, 72 insertions(+), 37 deletions(-)
diff --git a/src/views/admin/productType/index.vue b/src/views/admin/productType/index.vue
index b23cc54..12120e7 100644
--- a/src/views/admin/productType/index.vue
+++ b/src/views/admin/productType/index.vue
@@ -54,7 +54,7 @@
<el-dialog :visible.sync="dialogAddVisible" :close-on-click-modal="false" title="鏂板閰嶇疆">
<el-form :model="prodForm" :rules="rules" ref="addDialog">
<el-form-item prop="staffName" label="鐢ㄦ埛鍚嶇О:" label-width="90px">
- <el-select style="width:100%" v-model="prodForm.staffName">
+ <el-select style="width:100%" v-model="prodForm.staffName" filterable placeholder="璇烽�夋嫨">
<el-option v-for="(item,index) in staffNamesOptions" :key="index" :value="item.id" :label="item.staffName"/>
</el-select>
</el-form-item>
@@ -70,12 +70,12 @@
</el-dialog>
</div>
</template>
-
+
<script>
import { tableOption } from '@/const/crud/admin/productType'
import { getList,addObj,delObj,chooseStaff } from '@/api/admin/productType'
import { mapGetters } from 'vuex'
-
+
export default {
name: 'TableProduct',
data() {
@@ -184,7 +184,7 @@
}
}
</script>
-
+
<style lang="scss" scoped>
.el-dialog__wrapper {
.el-dialog {
@@ -203,4 +203,3 @@
}
}
</style>
-
\ No newline at end of file
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 9947e12..2449eea 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -127,7 +127,7 @@
>
</el-transfer>
</el-tab-pane>
- <el-tab-pane label="浜у嚭寰呮搴撲綅" name="inspection">
+ <!-- <el-tab-pane label="浜у嚭寰呮搴撲綅" name="inspection">
<el-transfer
filterable
v-model="inspectionLocationIds"
@@ -137,7 +137,7 @@
@change="handleChangeInspectionLocation"
>
</el-transfer>
- </el-tab-pane>
+ </el-tab-pane> -->
<!-- <el-tab-pane label="浜у嚭涓嶅悎鏍煎簱浣�" name="disqualified">
<el-transfer
filterable
@@ -160,7 +160,7 @@
>
</el-transfer>
</el-tab-pane> -->
- <el-tab-pane label="妫�楠屽緟澶勭悊搴撲綅" name="pending">
+ <!-- <el-tab-pane label="妫�楠屽緟澶勭悊搴撲綅" name="pending">
<el-transfer
filterable
v-model="pendingLocationIds"
@@ -170,7 +170,7 @@
@change="handleChangePendingLocation"
>
</el-transfer>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="鎴愬搧寰呮搴撲綅" name="product">
<el-transfer
filterable
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index ec8dfc5..f131c55 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -209,13 +209,12 @@
<el-input
v-model="dataForm.partNo"
placeholder=""
- disabled
>
<el-button
slot="append"
icon="el-icon-search"
- @click="openSalesPartDialog()"
- v-show="dataForm.id==null"
+ @click="openPartDialog()"
+
></el-button>
</el-input>
</el-form-item>
@@ -1052,7 +1051,7 @@
// } else {
// console.log('2')
this.dataForm = response.data.data
-
+
// }
// this.fileList = response.data.data.customerOrderAttachmentList
const sourceId = response.data.data.sourceId
@@ -1194,25 +1193,35 @@
}
})
},
- // 闆朵欢閫夋嫨
+ // 闆朵欢閫夋嫨
openPartDialog() {
- if (
- this.dataForm.coState === '01partUnCheck' ||
- this.dataForm.coState === '02technologyUnCheck'
- ) {
- this.showPart = true
- } else {
- this.$message.warning(
- '璁㈠崟鍙湁鍦ㄣ�愰浂浠跺緟閫夈�戙�併�愬伐鑹烘枃浠跺緟閫夈�戠姸鎬佷笅锛屾墠鑳借繘琛岄浂浠朵慨鏀�'
- )
- }
+ this.showPart = true
},
selectPart(part) {
+ console.log(part);
if (part) {
this.dataForm.partNo = part.partNo
- this.$refs.dataForm.validateField('partNo', (valid) => {})
}
},
+ // 闆朵欢閫夋嫨
+ // openPartDialog() {
+ // if (
+ // this.dataForm.coState === '01partUnCheck' ||
+ // this.dataForm.coState === '02technologyUnCheck'
+ // ) {
+ // this.showPart = true
+ // } else {
+ // this.$message.warning(
+ // '璁㈠崟鍙湁鍦ㄣ�愰浂浠跺緟閫夈�戙�併�愬伐鑹烘枃浠跺緟閫夈�戠姸鎬佷笅锛屾墠鑳借繘琛岄浂浠朵慨鏀�'
+ // )
+ // }
+ // },
+ // selectPart(part) {
+ // if (part) {
+ // this.dataForm.partNo = part.partNo
+ // this.$refs.dataForm.validateField('partNo', (valid) => {})
+ // }
+ // },
// 鍏ㄥ睆
fullscreen() {
this.isFullScreen = !this.isFullScreen
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 743e9a2..24ba340 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -137,7 +137,7 @@
</el-table-column>
</el-table>
<el-tabs v-model="activeName">
- <el-tab-pane name="first" label="绾胯竟浠撳悎鏍肩墿鏂�">
+ <!-- <el-tab-pane name="first" label="绾胯竟浠撳悎鏍肩墿鏂�"> -->
<div class="line-side-warehouse-header">
<div>
<el-divider class="pane-divider" direction="vertical"></el-divider
@@ -408,13 +408,13 @@
<span>{{ scope.row.stockQuantity }}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="棰勭暀鏁伴噺"
prop="reserveQuantity"
align="center"
>
<template slot="header">
- <div style="line-height: 14px;">棰勭暀鏁伴噺</div>
+ <div style="line-height: 14px;">棰勭暀鏁伴噺</div> -->
<!-- <div class="th" @click.stop>
<el-input
type="text"
@@ -425,9 +425,33 @@
size="mini"
></el-input>
</div> -->
- </template>
+ <!-- </template>
<template slot-scope="scope">
<span>{{ scope.row.reserveQuantity }}</span>
+ </template>
+ </el-table-column> -->
+ <el-table-column label="鏄惁宸ュ簭搴撳瓨" prop="operationStockStatus" align="center">
+ <template slot-scope="scope">
+ <span v-if="scope.row.operationStockStatus">鏄�</span>
+ <span v-else>鍚�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎵�灞炲伐搴�" prop="name" align="center">
+ <template slot="header">
+ <div style="line-height: 14px;">鎵�灞炲伐搴�</div>
+ <div class="th" @click.stop>
+ <el-input
+ type="text"
+ v-model="queryParamTwo.name"
+ @keyup.enter.native="handleStockList"
+ clearable
+ @clear="handleStockList"
+ size="mini"
+ ></el-input>
+ </div>
+ </template>
+ <template slot-scope="scope">
+ <span>{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column label="搴撲綅鍙�" prop="locationNo" align="center">
@@ -461,7 +485,7 @@
>
</el-pagination>
</div> -->
- </el-tab-pane>
+ <!-- </el-tab-pane> -->
<!-- <el-tab-pane name="second" label="绾胯竟浠撳緟澶勭悊鐗╂枡">
<div class="line-side-warehouse-header">
<div>
@@ -480,7 +504,7 @@
>鎵爜鎶曟枡</el-button
>
<el-button
- class="feeding-btn"
+ class="feeding-btn"locationNo
type="primary"
icon="feed-btn-feeding"
@click="addFeed()"
@@ -1373,7 +1397,7 @@
</div>
</template>
<template slot-scope="scope">
- <span>{{ scope.row.ifsLocation }}</span>
+ <span>{{ scope.row.locNo }}</span>
</template>
</el-table-column>
<el-table-column label="鍗曚綅" prop="unit" align="center">
diff --git a/src/views/product/workbench/productInDialog.vue b/src/views/product/workbench/productInDialog.vue
index 6c6bf7c..ab22650 100644
--- a/src/views/product/workbench/productInDialog.vue
+++ b/src/views/product/workbench/productInDialog.vue
@@ -31,8 +31,8 @@
:show-overflow-tooltip="true"
>
</el-table-column>
- <el-table-column label="闆朵欢鎵瑰彿" prop="partBatchNo" align="center">
- </el-table-column>
+ <!-- <el-table-column label="闆朵欢鎵瑰彿" prop="partBatchNo" align="center">
+ </el-table-column> -->
<el-table-column label="瑙勬牸鍨嬪彿" prop="specs" align="center">
</el-table-column>
<el-table-column
@@ -45,6 +45,10 @@
</el-table-column>
<el-table-column label="鍗曚綅" prop="unit" align="center">
</el-table-column>
+ <el-table-column label="鏄惁宸ュ簭搴撳瓨" prop="operationStockStatus" align="center">
+ </el-table-column>
+ <el-table-column label="鎵�灞炲伐搴�" prop="name" align="center">
+ </el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index e608a41..41372ea 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -299,7 +299,7 @@
minWidth: 100
}
},
- materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'}],
+ materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'},{label:'鍖呰妫�楠�',value:'鍖呰妫�楠�'}],
StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插鐞�',value:'2'}],
insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}],
}
diff --git a/vue.config.js b/vue.config.js
index b450b4c..2ba50db 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,11 +3,10 @@
* https://cli.vuejs.org/zh/config/
*/
// const url = 'http://192.168.2.7:9999'
-const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
-// const url = 'http://localhost:9999'
+ const url = 'http://localhost:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3