From fcadf16afa65a8a5ca53a33c4b8f4bf2efe2ea03 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 九月 2026 09:21:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_新聚' into dev_新疆_新聚
---
src/views/business/productOrder/components/addView.vue | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/views/business/productOrder/components/addView.vue b/src/views/business/productOrder/components/addView.vue
index 52cf05d..7c3bbd6 100644
--- a/src/views/business/productOrder/components/addView.vue
+++ b/src/views/business/productOrder/components/addView.vue
@@ -4,7 +4,7 @@
<div style="display: flex;justify-content: space-between;align-items:center;">
<div>濮旀墭鍗曚俊鎭�</div>
<div>
- <el-cascader
+ <el-cascader v-if="false"
v-model="addObj.quarterItemId"
:disabled="active>1"
:options="quarterItemOptions"
@@ -38,7 +38,32 @@
</div>
<div v-show="!cableConfigShow&&!auxiliaryShow" style="margin-top: 10px">
<div class="search">
- <el-form ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px" label-position="right">
+ <el-form :inline="true" :model="addObj" label-width="108px" label-position="right">
+ <el-row>
+ <el-col :span="6"><el-form-item label="浜у搧鍚嶇О"><el-input v-model="addObj.sample" disabled size="small" /></el-form-item></el-col>
+ <el-col :span="6"><el-form-item label="鐢熶骇鍗曚綅"><el-input v-model="addObj.production" disabled size="small" /></el-form-item></el-col>
+ <el-col :span="6"><el-form-item label="濮旀墭鍗曚綅"><el-input v-model="addObj.company" disabled size="small" /></el-form-item></el-col>
+ <el-col :span="6"><el-form-item label="妫�楠岀被鍒�"><el-select v-model="addObj.orderType" disabled size="small"><el-option v-for="item in dict.type.check_type1" :key="item.value" :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="鏍峰搧鏁伴噺"><el-input v-model="addObj.testQuantity" disabled size="small" /></el-form-item></el-col>
+ <el-col :span="6"><el-form-item label="鏍峰搧缂栧彿"><el-input v-model="sampleCode" disabled size="small" /></el-form-item></el-col>
+ <el-col :span="6"><el-form-item label="鏍峰搧澶栬"><el-input v-model="addObj.sampleStatus" disabled size="small" /></el-form-item></el-col>
+ <el-col :span="6"><el-form-item label="閫佹牱浜�"><el-input v-model="addObj.prepareUser" disabled size="small" /></el-form-item></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6"><el-form-item label="鐢熶骇鏃ユ湡"><el-date-picker v-model="addObj.productionDate" type="date" value-format="yyyy-MM-dd" disabled size="small" /></el-form-item></el-col>
+ <el-col :span="6"><el-form-item label="鐢熶骇鎵瑰彿"><el-input v-model="addObj.productionBatch" disabled size="small" /></el-form-item></el-col>
+ <el-col :span="6"><el-form-item label="閫佹牱鏃ユ湡"><el-date-picker v-model="addObj.sampleDate" type="date" value-format="yyyy-MM-dd" disabled size="small" /></el-form-item></el-col>
+ <el-col :span="6"><el-form-item label="鑱旂郴鏂瑰紡"><el-input v-model="addObj.phone" disabled size="small" /></el-form-item></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6"><el-form-item label="鐜鏉′欢"><el-input v-model="addObj.temperature" disabled placeholder="娓╁害" size="small" /></el-form-item></el-col>
+ <el-col :span="6"><el-form-item label="婀垮害"><el-input v-model="addObj.humidity" disabled size="small" /></el-form-item></el-col>
+ <el-col :span="12"><el-form-item label="澶囨敞"><el-input v-model="addObj.remark" disabled size="small" style="width: 520px" /></el-form-item></el-col>
+ </el-row>
+ </el-form>
+ <el-form v-show="false" ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px" label-position="right">
<el-row>
<el-col :span="6">
<el-form-item label="濮旀墭缂栧彿:" prop="entrustCode">
@@ -201,7 +226,7 @@
</el-row>
</el-form>
</div>
- <div>
+ <div v-show="false">
<div style="display: flex;justify-content: space-between;background-color: #F5F7FB;margin-bottom: 6px">
<div v-if="active==1">
<el-form :inline="true" :model="addObj1" label-width="90px">
@@ -415,7 +440,7 @@
<el-col :span="24">
<span><i
:class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
- {{ data.code }} {{ data.label }}</span>
+ {{ data.label }}</span>
</el-col>
</el-row>
</div>
@@ -618,6 +643,7 @@
active: '',
tabIndex: '',
currentId: '',
+ sampleCode: '',
sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
editTable:[],
template: null,
@@ -685,12 +711,6 @@
],
testQuantity: [
{ required: true, message: '璇峰～鍐欐娊妫�鏁伴噺', trigger: 'blur' }
- ],
- production: [
- { required: true, message: '璇峰～鍐欑敓浜у崟浣�', trigger: 'blur' }
- ],
- productionEn: [
- { required: true, message: '璇峰～鍐欑敓浜у崟浣岴N', trigger: 'blur' }
],
},
sample: {
@@ -868,6 +888,7 @@
};
this.addObj.type = String(this.addObj.type)
this.sampleList = this.HaveJson(res.data.sampleProduct);
+ this.sampleCode = this.sampleList.length ? this.sampleList[0].sampleCode : ''
this.specialStandardMethod = this.sampleList[0].specialStandardMethod
this.getProNum()
this.addObj.sampleNum = this.sampleList.length
--
Gitblit v1.9.3