From aa6bb1f2363c33e1d3a6c03e984b928160dcca5c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 27 十二月 2023 16:32:09 +0800
Subject: [PATCH] 修改工艺文件
---
src/views/technology/document/document-form.vue | 199 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 140 insertions(+), 59 deletions(-)
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index b408ea2..93cf63a 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -7,11 +7,11 @@
<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">
- <div class="document-basic">
+ <div class="document-basic" style="height: 28%;">
<el-form
:model="dataForm"
:rules="dataRule"
@@ -22,7 +22,7 @@
label-width="110px"
>
<el-row>
- <el-col :span="5">
+ <el-col :span="6">
<el-form-item prop="name" label="鏂囦欢鍚嶇О">
<el-input
v-model="dataForm.name"
@@ -30,13 +30,13 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="6">
<el-form-item prop="number" label="鏂囦欢缂栧彿">
<el-input v-model="dataForm.number" placeholder="鏂囦欢缂栧彿">
</el-input>
</el-form-item>
</el-col>
- <el-col :span="4">
+ <!-- <el-col :span="4">
<el-form-item prop="docType" label="绫诲瀷">
<el-select
v-model="dataForm.docType"
@@ -52,16 +52,8 @@
</el-option>
</el-select>
</el-form-item>
- </el-col>
- <el-col :span="3">
- <el-form-item prop="version" label="鐗堟湰鍙�">
- <el-input
- v-model="dataForm.version"
- placeholder="鐗堟湰鍙�"
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="3">
+ </el-col> -->
+ <!-- <el-col :span="3">
<el-form-item prop="sheathColor" label="鎶ゅ棰滆壊">
<el-input
v-model="dataForm.sheathColor"
@@ -76,7 +68,7 @@
placeholder="缁濈紭棰滆壊"
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="4">
<el-form-item label="椤圭洰鍙�" prop="projectNo">
<el-input
@@ -108,11 +100,9 @@
<countrySelector v-model="dataForm.country"></countrySelector>
</el-form-item>
</el-col> -->
- </el-row>
- <el-row>
- <el-col :span="5">
+ <el-col :span="6">
<el-form-item label="浜у搧闆朵欢鍙�" prop="partNo">
- <el-input v-model="dataForm.partNo" placeholder="璇烽�夋嫨闆朵欢">
+ <el-input disabled v-model="dataForm.partNo" placeholder="璇烽�夋嫨闆朵欢">
<el-button
slot="append"
icon="el-icon-search"
@@ -121,21 +111,76 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="6">
<el-form-item label="浜у搧闆朵欢鎻忚堪" prop="partName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
<el-input v-model="dataForm.partName" disabled> </el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
- <el-col :span="5">
- <el-form-item label="澶囨敞" prop="remark">
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item prop="version" label="鐗堟湰鍙�">
+ <el-input
+ v-model="dataForm.version"
+ placeholder="鐗堟湰鍙�"
+ ></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=""
+ style="width: 100%;"
+ filterable>
+ <el-option
+ v-for="item in bomList"
+ :key="item.id"
+ :label="item.number"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="宸ヨ壓璺嚎缂栧彿" prop="routingList">
+ <el-select
+ :disabled="dataForm.id != null"
+ v-model="dataForm.routingId"
+ placeholder=""
+ style="width: 100%;"
+ filterable>
+ <el-option
+ v-for="item in routingList"
+ :key="item.id"
+ :label="item.routing_no"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="椤圭洰鍙�" prop="projectNo">
<el-input
- type="textarea"
- v-model="dataForm.remark"
- placeholder="澶囨敞"
- style="width:360px"
+ v-model="dataForm.projectNo"
+ placeholder="椤圭洰鍙�"
+ style="width:100%"
></el-input>
</el-form-item>
- </el-col>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input
+ type="textarea"
+ v-model="dataForm.remark"
+ placeholder="澶囨敞"
+ style="width:100%"
+ ></el-input>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</div>
@@ -143,7 +188,7 @@
<div class="document-detail">
<el-tabs type="card" style="width: 100%;height: 100%">
<el-tab-pane
- label="鍘熸潗鐢ㄩ噺"
+ label="鍘熸潗鏂欑敤閲�"
style="height: 100%"
class="orimaterial-quantity"
>
@@ -198,6 +243,8 @@
align="center"
>
</el-table-column>
+ <el-table-column label="鐗╂枡缂栧彿" prop="partNo" align="center">
+ </el-table-column>
<el-table-column label="鐗╂枡" prop="partName" align="center">
</el-table-column>
<el-table-column label="鏁伴噺" prop="quantity" align="center">
@@ -214,7 +261,8 @@
>
<TeststandardDialog
:editable="editable"
- :documentId="Number(dataForm.id)"
+ :key="dataForm.id"
+ :documentId="dataForm.id"
>
</TeststandardDialog>
</el-tab-pane>
@@ -307,8 +355,8 @@
</el-table-column>
</el-table>
</div>
- <el-card class="document-bom" header="BOM-宸ュ簭鍙傛暟">
- <div slot="header">
+ <el-card class="document-bom" header="">
+ <!-- <div slot="header">
<span>BOM-宸ュ簭鍙傛暟</span>
<el-tooltip
class="item"
@@ -339,7 +387,7 @@
>娣诲姞
</el-button>
</el-tooltip>
- </div>
+ </div> -->
<el-collapse
v-model="currTechnologyBomPartName"
accordion
@@ -367,7 +415,7 @@
</el-checkbox>
</template>
<div style="display:flex;">
- <div
+ <!-- <div
style="font-size:13px;font-weight:bold;cursor: pointer;border-radius:2px 2px 0px 0px;width:80px;text-align:center;"
:class="[
item.showBom
@@ -377,21 +425,16 @@
@click="item.showBom = true"
>
BOM缁撴瀯
- </div>
+ </div> -->
<div
style="font-size:13px;font-weight:bold;cursor: pointer;margin-left: 10px;border-radius:2px 2px 0px 0px;width:80px;text-align:center;"
- :class="[
- !item.showBom
- ? 'highlight-tab-class'
- : 'unhighlight-tab-class'
- ]"
- @click="item.showBom = false"
+ :class="['highlight-tab-class']"
>
宸ュ簭鍙傛暟
</div>
</div>
-
- <div class="document-bom-div" v-show="item.showBom">
+
+ <!-- <div class="document-bom-div" v-show="item.showBom">
<el-tooltip
class="item"
effect="dark"
@@ -428,8 +471,9 @@
<el-table-column prop="unit" label="鍗曚綅">
</el-table-column>
</el-table>
- </div>
- <div class="document-technology-div" v-show="!item.showBom">
+ </div> -->
+
+ <div class="document-technology-div" v-show="item.showBom">
<div
style="border: 1px solid #ebeef5;height: 440px;overflow: auto;"
>
@@ -483,15 +527,15 @@
></el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="澶囨敞" style="height: 100%">
+ <!-- <el-tab-pane label="澶囨敞" style="height: 100%">
<rich-text
:editorId="
'fwb' + item.id + '-' + ele.id + '-' + j
"
:richContent="ele.remark"
></rich-text>
- </el-tab-pane>
- <el-tab-pane label="妫�娴嬫爣鍑�">
+ </el-tab-pane> -->
+ <!-- <el-tab-pane label="妫�娴嬫爣鍑�">
<checkStandardTable
ref="documentTestStandardTable"
:dataFormId="dataForm.id"
@@ -510,8 +554,8 @@
refreshTestStandardInfo
"
></checkStandardTable>
- </el-tab-pane>
- <el-tab-pane label="鎶芥瑙勫垯">
+ </el-tab-pane> -->
+ <!-- <el-tab-pane label="鎶芥瑙勫垯">
<div>
<div style="padding: 0px 20px;">
<el-button
@@ -594,7 +638,7 @@
</el-table>
</div>
</div>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</el-collapse-item>
</el-collapse>
@@ -666,7 +710,7 @@
</el-select>
<div id="demo" style="margin:5px auto;"></div>
</div>
- <!--<el-upload
+ <el-upload
class="upload-demo"
action="/mes/document/uploadLct"
:headers="headers"
@@ -686,7 +730,7 @@
<div slot="tip" class="el-upload__tip">
鍙兘涓婁紶jpg鍥剧墖锛屼笖涓嶈秴杩�2MB
</div>
- </el-upload>-->
+ </el-upload>
<el-dialog :visible.sync="dialogFlowVisible">
<img width="100%" :src="dialogFlowImageUrl" alt="" />
</el-dialog>
@@ -746,6 +790,8 @@
import { delDocumentSamplingRule } from '@/api/quality/documentsamplingrule'
import { getObj as getTechnologyDetail } from '@/api/technology/routing'
import { getObj as getStructureDetail } from '@/api/technology/completeproductstructure'
+import { fetchList as getBomList } from '@/api/technology/completeproductstructure'
+import { getRouting } from '@/api/technology/document'
import { getTestStandardParams } from '@/api/quality/teststandard'
import { remote } from '@/api/admin/dict'
import { fetchList as getStandard } from '@/api/quality/standardbind'
@@ -764,6 +810,8 @@
export default {
data() {
return {
+ bomList: [],
+ routingList: [],
operationPart: {},
showCompleteproductstructure: false,
showTechnology: false,
@@ -790,6 +838,8 @@
],
dataForm: {
id: null,
+ bomId: null,
+ routingId: null,
number: null,
name: null,
version: null,
@@ -816,7 +866,7 @@
{ required: true, message: '鐗堟湰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
],
projectNo: [
- { required: true, message: '椤圭洰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
+ // { required: true, message: '椤圭洰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
],
projectType: [
{ required: true, message: '椤圭洰绫诲埆涓嶈兘涓虹┖', trigger: 'change' }
@@ -906,6 +956,42 @@
window.winDbClick = this.getDbClick
// 鍒濆鍖栨祦绋嬪浘瀹炰緥
this.initFlowDesign()
+ },
+ watch: {
+ 'dataForm.partId'(newValue, oldValue) {
+ if (oldValue) {
+ this.dataForm.bomId = null
+ }
+ if (newValue) {
+ getBomList(
+ Object.assign({
+ current: 1,
+ size: 999,
+ partId: this.dataForm.partId,
+ })
+ ).then((response) => {
+ this.bomList = response.data.data.records
+ })
+ } else {
+ this.bomList = []
+ }
+ },
+ 'dataForm.bomId'(newValue, oldValue) {
+ if (oldValue) {
+ this.dataForm.routingId = null
+ }
+ if (newValue) {
+ getRouting(
+ Object.assign({
+ bomId: this.dataForm.bomId,
+ })
+ ).then((response) => {
+ this.routingList = response.data.data
+ })
+ } else {
+ this.routingList = []
+ }
+ },
},
methods: {
// 鏌ヨ绫诲瀷瀛楀吀
@@ -1131,7 +1217,6 @@
if (this.currTechnologyName != null && this.currTechnologyName !== '') {
// 褰撶敤鎴峰垹闄ゅ伐鑹烘枃浠朵腑鍏宠仈鐨勫伐鑹鸿矾绾挎椂锛岃嫢璇ユ枃浠跺搴擝OM涓墍闇�鍗婃垚鍝佺殑宸ヨ壓璺嚎涔熷凡涓庡綋鍓嶅伐鑹烘枃浠跺叧鑱�
routingChildCheck(this.currTechnologyBomPartName).then((res) => {
- console.log('res', res.data)
const resData = res.data
let num = 0
if (resData.code === 0) {
@@ -1828,7 +1913,6 @@
if (this.dataForm.id) {
this.getDocumentInfo(this.dataForm.id)
}
- console.log('涓婁紶鎴愬姛')
},
handleStructureExceed(files, fileList) {
// this.$message.warning(
@@ -1870,7 +1954,6 @@
this.dialogFlowVisible = true
},
handleFlowSuccess(response, file, fileList) {
- console.log('涓婁紶鎴愬姛')
},
handleFlowExceed(files, fileList) {
this.$message.warning(
@@ -1914,8 +1997,6 @@
},
getSummaries(param) {
const { columns, data } = param
- console.log(columns, 'A')
- console.log(data, 'B')
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
--
Gitblit v1.9.3