From fe2c38273024c74f28e59c24c867eb67c841be16 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 四月 2025 11:35:10 +0800
Subject: [PATCH] 原辅材修改
---
src/views/business/materialOrder/customsInspection.vue | 178 ++++-------------------------------------------------------
1 files changed, 12 insertions(+), 166 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index e141b74..b1ce84e 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -153,20 +153,6 @@
<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">
- <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px;margin-top: 6px">
- <el-select v-model="model" :placeholder="active > 1 ? '' : '璇疯緭鍏�'" allow-create clearable
- default-first-option filterable size="small" @change="changeModel">
- <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </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" multiple>
- <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
<el-form-item label="闄勪欢鏌ョ湅:" style="margin-bottom: 6px;margin-top: 6px">
<el-button type="text" @click="handleFileDialog">
<i class="el-icon-document"></i>
@@ -303,7 +289,7 @@
</template>
</el-table-column>
<el-table-column label="璇曢獙鏉′欢" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
- <el-table-column label="璇曢獙鏂规硶" min-width="120" prop="method" show-overflow-tooltip>
+ <el-table-column label="璇曢獙鏂规硶" min-width="120" prop="methodS" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>璇曢獙鏂规硶</span>
@@ -338,7 +324,7 @@
<div class="search_input">
<el-radio-group v-model="item.bsm1Val" v-removeAriaHidden @input="upBsmAll(item)">
<el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai" :label="a">{{
- JSON.parse(item.bsmRow.askCopy)[ai] }}</el-radio>
+ JSON.parse(item.bsmRow.askCopy)[ai] }}</el-radio>
</el-radio-group>
</div>
</el-col>
@@ -767,7 +753,6 @@
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')
}
@@ -1061,10 +1046,7 @@
},
sampleList: sampleList.map(a => {
a.standardMethodListId = JSON.stringify(a.standardMethodListId)
- a.insProduct = this.fullProductList.map(item => ({
- ...item,
- state: 1
- }))
+ a.insProduct = this.productList
if (a.modelNum) {
// 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
// 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
@@ -1605,9 +1587,15 @@
}).then(res => {
this.getProductLoad = false
// 鐩存帴灏嗘煡璇㈢粨鏋滆祴鍊肩粰 productList
- this.fullProductList = res.data
- this.productList = res.data
- this.productList0 = res.data
+ // this.fullProductList = res.data
+ this.productList = res.data.map(m => {
+ m.state = 1
+ return m
+ })
+ this.productList0 = res.data.map(m => {
+ m.state = 1
+ return m
+ })
this.$refs.sampleTable.setCurrentRow(row)
setTimeout(() => {
this.productList.forEach(a => {
@@ -1616,25 +1604,6 @@
}, 200)
}).catch(err => {
console.log('err-', err)
- })
- },
- // 閫夋嫨鏍峰搧鍨嬪彿鐨勫洖璋�
- changeModel() {
- this.sampleList.forEach(a => {
- let obj = this.sampleIds.find(b => b == a.id)
- if (obj) {
- a.model = this.model
- }
- })
- },
- // 閫夋嫨妫�楠屾爣鍑嗙殑鍥炶皟
- changeStandardMethodListId() {
- this.sampleList.forEach(a => {
- let obj = this.sampleIds.find(b => b == a.id)
- if (obj) {
- a.standardMethodListId = this.standardMethodListId
- this.methodChange(this.standardMethodListId, a)
- }
})
},
// 鎷兼帴鏍峰搧鏍戠殑瀛楃涓�
@@ -1702,129 +1671,6 @@
}
this.changeProductList0()
this.currentMethod.insProduct = this.productList0
- },
- // 鍗曢�夐�夋嫨妫�楠岄」鐨勫洖璋�
- selectOne(selection, row) {
- this.bsm1DiaList = []
- row.state = row.state == 1 ? 0 : 1
- if (row.section === null) {
- row.section = ""
- }
- if (row.sectionCopy === undefined && row.section) {
- if (row.section.indexOf('[') > -1) {
- this.$set(row, 'sectionCopy', row.section)
- }
- }
- if (row.ask.includes('[')) {
- this.$set(row, 'askCopy', row.ask)
- }
- if (row.tell.includes('[')) {
- this.$set(row, 'tellCopy', row.tell)
- }
- let arr = this.productList.filter(m => m.state == 1 && row.sectionCopy && row.sectionCopy.includes(m.sectionCopy) && m.ask && m.sectionCopy.indexOf('[') == -1)
- if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.sectionCopy !== undefined && row.state === 1 && arr.length == 0) {
- if (row.sectionCopy.indexOf('[') > -1) {
- row.bsmRow = this.HaveJson(row)
- }
- row.bsm1 = true
- this.bsm1DiaList.push(row)
- this.bsm1DiaAll = true
- } else if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.state === 0 && arr.length == 0) {
- row.bsm1 = false
- } else if (arr.length > 0) {
- try {
- row.bsmRow = this.HaveJson(row)
- let section = arr[0].section
- let arr0 = JSON.parse(row.section)
- let arr1 = JSON.parse(row.ask)
- let arr4 = JSON.parse(row.tell)
- let index = arr0.indexOf(section)
- row.section = section
- row.ask = arr1[index]
- row.tell = arr4[index]
- } catch (e) { }
- }
- this.sampleList.map(item => {
- if (this.sampleIds.indexOf(item.id) > -1) {
- item.insProduct.map(m => {
- if (m.id == row.id) {
- m.state = row.state;
- }
- return m;
- })
- }
- return item
- })
- this.changeProductList0()
- this.currentMethod.insProduct = this.productList0
- this.getProNum()
- },
- handleAll(e) {
- if (e.length > 0) {
- this.productList.map(m => {
- if (e.find(a => a.id == m.id)) {
- m.state = 1
- }
- return m
- })
- } else {
- this.productList.map(m => {
- m.state = 0
- return m
- })
- }
- this.bsmRow3 = [];
- this.bsm1DiaList = []
- this.productList.forEach(p => {
- if (p.sectionCopy === undefined && p.section) {
- if (p.section.indexOf('[') > -1) {
- this.$set(p, 'sectionCopy', p.section)
- }
- }
- if (p.ask.includes('[')) {
- this.$set(p, 'askCopy', p.ask)
- }
- if (p.tell.includes('[')) {
- this.$set(p, 'tellCopy', p.tell)
- }
- if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.sectionCopy !== undefined && p.state === 1) {
- if (p.sectionCopy.indexOf('[') > -1) {
- p.bsmRow = this.HaveJson(p)
- }
- p.bsm1 = true
- this.bsm1DiaList.push(p)
- this.bsm1DiaAll = true
- } else if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.state === 0) {
- p.bsm1 = false
- }
- })
- if (e.length > 0) {
- this.sampleList.map(item => {
- if (this.sampleIds.indexOf(item.id) > -1) {
- item.insProduct.map(m => {
- m.state = 1
- return m;
- })
- }
- return item
- })
- } else {
- this.sampleList.map(item => {
- if (this.sampleIds.indexOf(item.id) > -1) {
- item.insProduct.map(m => {
- m.state = 0
- return m;
- })
- }
- return item
- })
- }
- this.changeProductList0()
- this.currentMethod.insProduct = this.productList0
- this.getProNum()
- this.$nextTick(() => {
- this.$refs.productTable.doLayout()
- })
},
changeProductList0() {
this.productList0.forEach(a => {
--
Gitblit v1.9.3