From 2a9ffe2101873f8eb6acdf730181549a398f002d Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 08 四月 2025 16:58:50 +0800
Subject: [PATCH] 原辅材+成品下单修改
---
src/views/business/materialOrder/customsInspection.vue | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 4c9dd8c..a60f62d 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -136,6 +136,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
+ <el-form-item class="addObj-form-item" label="杞﹂棿鍚嶇О:">
+ <el-input v-model="addObj.workShopName" class="addObj-info" clearable disabled size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item class="addObj-form-item" label="澶囨敞:">
<el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2 }" :disabled="active > 1"
:placeholder="active > 1 ? '' : '璇疯緭鍏�'" clearable size="small" type="textarea"></el-input>
@@ -157,7 +162,7 @@
</el-form-item>
<el-form-item label="妫�楠屾爣鍑�:" style="margin-bottom: 6px;margin-top: 6px">
<el-select v-model="standardMethodListId" :loading="methodLoad" :placeholder="active > 1 ? '' : '璇疯緭鍏�'"
- clearable size="small" @change="changeStandardMethodListId" @focus="methodFocus">
+ clearable size="small" @change="changeStandardMethodListId" @focus="methodFocus" multiple>
<el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
@@ -165,10 +170,10 @@
<el-form-item label="闄勪欢鏌ョ湅:" style="margin-bottom: 6px;margin-top: 6px">
<el-button type="text" @click="handleFileDialog">
<i class="el-icon-document"></i>
- 闄勪欢鏌ョ湅
+ 杞﹂棿闄勪欢鏌ョ湅
</el-button>
<el-dialog :visible.sync="fileDialogVisible" title="闄勪欢鏌ョ湅" width="80%">
- <fileList :currentNo="partNo" v-if="fileDialogVisible" />
+ <fileList :currentNo="addObj.workShopId" v-if="fileDialogVisible" />
</el-dialog>
</el-form-item>
</el-form>
@@ -218,7 +223,7 @@
<el-select v-model="scope.row.standardMethodListId"
:disabled="scope.row.model == null || active > 1 || scope.$index !== 0" :loading="methodLoad" clearable
placeholder="妫�楠屾爣鍑�" size="small" style="width: 100%;" @change="(value) => methodChange(value, scope.row)"
- @clear="productList = []" @focus="methodFocus">
+ @clear="productList = []" @focus="methodFocus" multiple>
<el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
@@ -419,7 +424,7 @@
selectStandardProductList,
selectStandardTreeListByPartNo
} from "@/api/business/rawMaterialOrder";
-import fileList from "./commom/fileList.vue"
+import fileList from "../../structural/capabilityAndLaboratory/workshop/components/fileList.vue"
import limsTable from "@/components/Table/lims-table.vue";
export default {
@@ -477,6 +482,8 @@
typeSource: 1,
ifsInventoryId: '',
sampleStatus: 'In good condition',
+ workShopName: '',//杞﹂棿鍚嶇О
+ workShopId: '',//杞﹂棿ID
},
addObjRules: { // 琛ㄥ崟鏍￠獙瑙勫垯
testQuantity: [
@@ -528,7 +535,7 @@
totalArr: [],
addObj1: {},
model: null,
- standardMethodListId: null,
+ standardMethodListId: [],
inspectionItem: null,
inspectionItemSubclass: null,
methodS: null,
@@ -560,7 +567,7 @@
value: 0
},
{
- label: '瀛ｅ害妫�楠�',
+ label: '鍙潬鎬ф楠�',
value: 1
},
],
@@ -603,11 +610,11 @@
},
'addObj.sample'(val) {
this.model = null
- this.standardMethodListId = null
+ this.standardMethodListId = []
},
'addObj.qtyArrived'(val) {
this.model = null
- this.standardMethodListId = null
+ this.standardMethodListId = []
}
},
created() {
@@ -632,7 +639,6 @@
methods: {
handleFileDialog() {
this.fileDialogVisible = true
- this.currentNo = addObj.partNo || customsInspection.partNo;
},
save1() {
if (this.bsm1DiaList.length > 0) {
@@ -710,6 +716,11 @@
this.addObj.updateBatchNo = res.data.insOrderTemplate.updateBatchNo
this.addObj.type = String(this.addObj.type)
this.sampleList = this.HaveJson(res.data.sampleProduct)
+ this.sampleList.forEach(m => {
+ if (m.standardMethodListId) {
+ m.standardMethodListId = JSON.parse(m.standardMethodListId)
+ }
+ })
this.getProNum()
this.$nextTick(() => {
this.$refs.sampleTable.doLayout()
@@ -749,6 +760,10 @@
this.$set(this.addObj, 'buyUnitMeas', this.customsInspection.buyUnitMeas)
this.$set(this.addObj, 'updateBatchNo', this.customsInspection.updateBatchNo)
this.$set(this.addObj, 'partDetail', this.customsInspection.partDesc)
+ this.$set(this.addObj, 'workShopName', res.data.workShopName)
+ this.$set(this.addObj, 'workShopId', res.data.workShopId)
+ this.$set(this.addObj, 'inspectionType', this.customsInspection.inspectionType)
+ console.log(111111, this.addObj)
if (this.orderType == 1) {
this.$set(this.addObj, 'orderType', 'Quarterly inspection')
}
@@ -887,7 +902,7 @@
save() {
this.$refs['addObj'].validate((valid) => {
if (valid) {
- if (!this.sampleList.every(m => m.standardMethodListId)) {
+ if (!this.sampleList.every(m => m.standardMethodListId && m.standardMethodListId.length > 0)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
return
}
@@ -941,7 +956,7 @@
noNeedCheck() {
this.$refs['addObj'].validate((valid) => {
if (valid) {
- if (!this.sampleList.every(m => m.standardMethodListId)) {
+ if (!this.sampleList.every(m => m.standardMethodListId && m.standardMethodListId.length > 0)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
return
}
@@ -1038,6 +1053,7 @@
addInsOrder({
insOrder: this.addObj,
sampleList: sampleList.map(a => {
+ a.standardMethodListId = JSON.stringify(a.standardMethodListId)
if (a.insProduct.length > 0) {
a.insProduct.forEach(c => {
delete c.id
@@ -1455,14 +1471,13 @@
this.sample.joinNum = 1
this.sample.sample = this.addObj.sample
this.sample.unit = this.addObj.unit
- this.sample.standardMethodListId = null
+ this.sample.standardMethodListId = []
this.sample.insProduct = []
this.sample.id = this.count
this.sample.childSampleList = []
this.sample.insulating = null
this.sample.sheath = null
this.sample.quantity = 1
- console.log(2222, codeLevel, data)
if (codeLevel === '[5]') {
this.sample.model = this.addObj.sample
} else if (codeLevel === '[4]') {
@@ -1491,12 +1506,12 @@
// 閫変腑琛ㄦ牸琛岀殑鍥炶皟
rowClick(row, column, event) {
this.currentMethod = row
- let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
- if (obj && obj.code == '鎶�鏈姹�') {
- this.isAskOnlyRead = true
- } else {
- this.isAskOnlyRead = false
- }
+ // let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ // if (obj && obj.code == '鎶�鏈姹�') {
+ // this.isAskOnlyRead = true
+ // } else {
+ // this.isAskOnlyRead = false
+ // }
this.sampleId = row.id
if (this.active !== 1) {
this.sampleIds = []
@@ -1566,19 +1581,19 @@
})
}
this.currentMethod = row
- let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
- if (obj && obj.code == '鎶�鏈姹�') {
- this.isAskOnlyRead = true
- } else {
- this.isAskOnlyRead = false
- }
+ // let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ // if (obj && obj.code == '鎶�鏈姹�') {
+ // this.isAskOnlyRead = true
+ // } else {
+ // this.isAskOnlyRead = false
+ // }
this.getProductLoad = true
let selectTreeList = this.selectTree.split(" - ")
this.addObj.model && (selectTreeList[selectTreeList.length - 1] = this.addObj.model)
selectStandardProductList({
model: this.addObj.model ? this.addObj.model : row.model,
modelNum: row.modelNum,
- standardMethodListId: val,
+ standardMethodListIds: val,
factory: selectTreeList.join(" - "),
partNo: this.addObj.partNo,
ifsInventoryId: this.customsInspection.id
--
Gitblit v1.9.3