From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/business/productOrder/components/addView.vue | 60 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/addView.vue
similarity index 97%
rename from src/views/business/productOrder/components/add.vue
rename to src/views/business/productOrder/components/addView.vue
index a8d1468..b5ba69f 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/addView.vue
@@ -41,7 +41,7 @@
<el-form ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px" label-position="right">
<el-row>
<el-col :span="6">
- <el-form-item label="濮旀墭缂栧彿:">
+ <el-form-item label="濮旀墭缂栧彿:" prop="entrustCode">
<el-input v-model="addObj.entrustCode" clearable disabled placeholder="绯荤粺鐢熸垚" size="small"></el-input>
</el-form-item>
</el-col>
@@ -53,7 +53,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍒跺崟浜�:">
+ <el-form-item label="鍒跺崟浜�:" prop="custom">
<el-input v-model="addObj.custom" disabled size="small" clearable></el-input>
</el-form-item>
</el-col>
@@ -117,7 +117,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:">
+ <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:" prop="send">
<el-radio-group v-model="addObj.send" :disabled="active>1&&tabIndex!=4" size="mini">
<el-radio :label="1" border style="margin-right: 0">鑷彇</el-radio>
<el-radio :label="0" border>鍏朵粬</el-radio>
@@ -127,7 +127,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:">
+ <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:" prop="processing">
<el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini" style="display: flex; flex-direction: column;">
<el-radio :label="0" border style="margin-right: 0">濮旀墭鍗曚綅鍙栧洖</el-radio>
<el-radio :label="1" border>瀹為獙瀹ゅ鐞�</el-radio>
@@ -147,7 +147,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏄惁鐣欐牱:">
+ <el-form-item label="鏄惁鐣欐牱:" prop="isLeave">
<el-radio-group v-model="addObj.isLeave" border :disabled="active>1&&tabIndex!=4" size="mini">
<el-radio :label="0" border style="margin-right: 0">涓嶇暀鏍�</el-radio>
<el-radio :label="1" border>鐣欐牱</el-radio>
@@ -157,23 +157,23 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="濮旀墭浜�:">
+ <el-form-item label="濮旀墭浜�:" prop="prepareUser">
<el-input v-model="addObj.prepareUser" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="濮旀墭浜鸿嫳鏂�:">
+ <el-form-item label="濮旀墭浜鸿嫳鏂�:" prop="prepareUserEn">
<el-input v-model="addObj.prepareUserEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="澶囨敞:">
+ <el-form-item label="澶囨敞:" prop="remark">
<el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small" style="width: 100%" type="textarea"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="澶囨敞鑻辨枃:">
+ <el-form-item label="澶囨敞鑻辨枃:" prop="remarkEn">
<el-input v-model="addObj.remarkEn" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small" type="textarea"></el-input>
</el-form-item>
@@ -181,19 +181,19 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鏍峰搧鍚嶇О:">
+ <el-form-item label="鏍峰搧鍚嶇О:" prop="sampleView">
<el-input v-model="addObj.sampleView" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏍峰搧鍚嶇О鑻辨枃:">
+ <el-form-item label="鏍峰搧鍚嶇О鑻辨枃:" prop="sampleViewEn">
<el-input v-model="addObj.sampleViewEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="濮旀墭浜哄伐鍙�:">
+ <el-form-item label="濮旀墭浜哄伐鍙�:" prop="prepareCode">
<el-input v-model="addObj.prepareCode" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
@@ -356,11 +356,6 @@
size="small" type="textarea"
@change="e=>requestChange(e,scope.row,'radius')">
</el-input>
-<!-- <el-select v-else-if="scope.row.inspectionItem.includes('楂樻俯鍘嬪姏璇曢獙') && (active==1||tabIndex==4)" v-model="scope.row.radius" clearable-->
-<!-- placeholder="鏉′欢"-->
-<!-- size="small" @change="e=>requestChange(e,scope.row,'radius')">-->
-<!-- <el-option v-for="(a,i) in JSON.parse(scope.row.radiusList)" :key="i" :label="a" :value="a"></el-option>-->
-<!-- </el-select>-->
<span v-else>{{scope.row.radius}}</span>
</template>
</el-table-column>
@@ -379,16 +374,10 @@
</el-table-column>
<el-table-column label="璁￠噺鍗曚綅" prop="unit" show-overflow-tooltip width="100"></el-table-column>
<el-table-column label="鍗曚环" prop="price" show-overflow-tooltip width="100"></el-table-column>
- <!-- <el-table-column prop="manDay" label="棰勮鏃堕棿(澶�)" width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="manHour" label="宸ユ椂绯绘暟" width="100" show-overflow-tooltip></el-table-column> -->
- <!-- <el-table-column prop="deviceGroup" label="璁惧缁�" width="120" show-overflow-tooltip></el-table-column> -->
<el-table-column label="鍖洪棿" min-width="120" prop="section" show-overflow-tooltip></el-table-column>
<el-table-column :filter-method="filterHandler" :filters="filters" label="瀛愬疄楠屽" min-width="130" prop="sonLaboratory"
show-overflow-tooltip></el-table-column>
- <el-table-column v-if="isSpecial&&active==1"
- fixed="right"
- label="鎿嶄綔"
- width="100">
+ <el-table-column v-if="isSpecial&&active==1" label="鎿嶄綔" width="100">
<template slot-scope="scope">
<el-button v-if="!scope.row.repetitionTag" size="small" type="text" @click="addProductList(productList,scope.row,scope.$index)">鎻掑叆琛�</el-button>
<el-button v-if="!!scope.row.repetitionTag&&scope.row.delete" size="small" type="text" @click="deleteProductList(scope.$index,productList)">鍒犻櫎</el-button>
@@ -611,7 +600,7 @@
import {mapGetters} from "vuex";
export default {
- name: 'Add',
+ name: 'AddView',
components: {
limsTable,
cableConfig,
@@ -861,7 +850,6 @@
},
methods: {
getInfo() {
- this.getUserNowData()
this.selectStandardTreeList()
this.getAuthorizedPerson();
this.selectStandardMethods()
@@ -1130,7 +1118,9 @@
sampleList.forEach(a => {
if (a.insProduct.length > 0) {
a.insProduct.forEach(c => {
- delete c.id
+ if (this.tabIndex != 4) {
+ delete c.id
+ }
})
}
if (a.endModels) {
@@ -1168,7 +1158,9 @@
sampleList.forEach(a => {
if (a.insProduct.length > 0) {
a.insProduct.forEach(c => {
- delete c.id
+ if (this.tabIndex != 4) {
+ delete c.id
+ }
})
}
if (a.endModels) {
@@ -1267,14 +1259,16 @@
}
},
saveMethod(sampleList){
- console.log('sampleList----', sampleList)
this.saveLoad = true
if (this.addObj.quarterItemId) {
this.addObj.quarterItemId = this.addObj.quarterItemId[1]
}
if(this.tabIndex==4&&this.active==2){
+ if (this.addObj.createTime) {
+ delete this.addObj.createTime
+ }
// 閫�鍥炲悗鎻愪氦
- updateInsOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
+ updateInsOrder({insOrder: this.addObj, sampleProduct: sampleList}).then(res => {
this.saveLoad = false
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
@@ -1408,7 +1402,6 @@
if (node.data.code === '[3]') {
this.sampleViewEn = val.sampleTypeEn
} else if (node.data.code === '[4]') {
- console.log('node.data---', node.data)
if (node.data.children!==null && node.data.children.length>0) {
this.sampleViewEn = val.sampleEn
}
@@ -1654,7 +1647,6 @@
},
tableRowClassName({row, rowIndex}) {
if (row.state == 1) {
- console.log('row.state---', row.state)
return 'warning-row';
} else {
return '';
@@ -2221,4 +2213,8 @@
>>>.warning-row {
color: #1890FF;
}
+.node_i {
+ color: orange;
+ font-size: 18px;
+}
</style>
--
Gitblit v1.9.3