From 746fc975621dc0538d0dcc6d4c8b3f17fc13fe3c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 30 十月 2023 13:24:43 +0800
Subject: [PATCH] modified: src/api/equipment/equipment.js new file: src/api/quality/rawMaterial.js modified: src/api/technology/document.js new file: src/const/crud/quality/rawMaterial.js modified: src/router/views/index.js modified: src/views/common/teststandardradio.vue modified: src/views/equipment/equipment/index.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/index.vue new file: src/views/quality/rawMaterial/index.vue new file: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/operation/index.vue modified: src/views/technology/operation/operation-form.vue modified: src/views/technology/routing/index.vue modified: src/views/technology/routing/routing-form.vue modified: src/views/technology/structure/index.vue modified: src/views/technology/structure/single-structure-form.vue modified: vue.config.js
---
src/views/plan/customerorder/customerorder-form.vue | 92 +++++++++++++++++++++++++++++++---------------
1 files changed, 62 insertions(+), 30 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 5eed5a3..9427657 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -196,7 +196,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浜у搧绫诲瀷" prop="productType">
+ <el-form-item label="闅跺睘鍝佺墝" prop="productType">
<el-input
v-model="dataForm.productType"
placeholder=""
@@ -248,35 +248,42 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
+ <el-form-item label="宸ヨ壓鏂囦欢鍚嶇О" prop="docName">
<el-input
- v-model="dataForm.shippingAddress"
+ v-model="dataForm.docName"
placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍗曚綅" prop="otcUnit">
+ <el-select
+ v-model="dataForm.otcUnit"
+ placeholder=""
+ filterable
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in units"
+ :key="item.id"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浜у搧鍨嬪彿" prop="customerPartSpec">
+ <el-input
+ v-model="dataForm.customerPartSpec"
+ placeholder=""
+ disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
- </el-row>
- <el-row>
- <!-- <el-col :span="6">
- <el-form-item label="璐ㄩ噺瑕佹眰" prop="qualityRequire">
- <el-input
- v-model="dataForm.qualityRequire"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
- <!-- <el-col :span="6">
- <el-form-item label="鐢熶骇闇�姹傝鏄�" prop="otherProductRequire">
- <el-input
- v-model="dataForm.otherProductRequire"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
<!-- <el-col :span="6">
<el-form-item label="绯荤粺" prop="divisionSystem">
<el-input
@@ -317,6 +324,14 @@
</el-col> -->
</el-row>
<el-row>
+ <el-col :span="6">
+ <el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
+ <el-input
+ v-model="dataForm.shippingAddress"
+ placeholder=""
+ ></el-input>
+ </el-form-item>
+ </el-col>
<!-- <el-col :span="6">
<el-form-item label="OTC鎺ㄩ�佺姸鎬�" prop="remark">
<span>{{
@@ -331,7 +346,22 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="璁㈠崟璇存槑" prop="remark">
+ <el-form-item label="璁㈠崟澶囨敞" prop="comment">
+ <el-input
+ type="textarea"
+ :rows="3"
+ placeholder=""
+ v-model="dataForm.comment"
+ maxlength="500"
+ show-word-limit
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="浜у搧澶囨敞" prop="remark">
<el-input
type="textarea"
:rows="3"
@@ -614,15 +644,16 @@
show-overflow-tooltip
>
</el-table-column>
- <el-table-column prop="lineNumber" align="center" label="琛屽彿">
- </el-table-column>
+ <!-- <el-table-column prop="lineNumber" align="center" label="琛屽彿"> -->
+ <!-- </el-table-column> -->
<el-table-column
prop="originalFileName"
align="center"
label="鍘熸枃浠跺悕"
+ width="200"
>
</el-table-column>
- <el-table-column prop="fileName" align="center" label="鏂囦欢鍚�">
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑">
</el-table-column>
<el-table-column prop="createUser" align="center" label="涓婁紶浜�">
</el-table-column>
@@ -655,13 +686,13 @@
<!-- </el-table-column>-->
<el-table-column fixed="right" align="center" label="鎿嶄綔">
<template slot-scope="scope">
- <el-button
+ <!-- <el-button
@click="synchronizeFile(scope.row)"
type="text"
size="small"
:disabled="scope.row.lineNumber !== dataForm.customerNo"
>鍚屾</el-button
- >
+ > -->
<el-button
@click="delProcessConfigFile(scope.row)"
type="text"
@@ -782,7 +813,6 @@
showSynchronize: false,
selectOrderParam: null,
selectOrderObj: {},
- aaaaa:{},
dataForm: {
id: 0,
sourceId: '',
@@ -799,6 +829,7 @@
productType: '',
partNo: '',
docNumber: '',
+ docName: '',
shippingAddress: '',
remark: '',
otcUnit: '',
@@ -1020,6 +1051,7 @@
// } else {
// console.log('2')
this.dataForm = response.data.data
+
// }
// this.fileList = response.data.data.customerOrderAttachmentList
const sourceId = response.data.data.sourceId
--
Gitblit v1.9.3