From ab87478ba941f90cd60252cf4d34aa585dc1a63f Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 22 七月 2024 18:29:10 +0800
Subject: [PATCH] 设备数采配置 调整
---
src/components/do/b1-ins-order/add.vue | 134 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 130 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index cc855de..fb9622e 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -840,6 +840,22 @@
<el-button type="primary" @click="spliceData">淇濆瓨</el-button>
</span>
</el-dialog>
+ <el-dialog :title="temperatureTitle" :visible.sync="temperatureShow" width="260px" :before-close="temperatureShowClose" :show-close="false">
+ <div>
+ <div v-if="isShowInput" style="margin-bottom: 6px">
+ <span>寰幆娆℃暟:</span>
+ <!-- <el-input size="small" type="number" v-model="temperatureTestNum" style="width: 120px"></el-input> -->
+ <el-input-number v-model="temperatureTestNum" :min="2" :max="1000000" size="small" label=""></el-input-number>
+ </div>
+ <el-checkbox-group v-model="temperatureTest" @change="handleTemperatureTestChange" style="display: flex;flex-direction: column;">
+ <el-checkbox v-for="item in temperatureList" :label="item" :key="item" style="margin-bottom: 6px">{{item}}</el-checkbox>
+ </el-checkbox-group>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="cleanTemperatureTest">鍙栨秷</el-button>
+ <el-button type="primary" @click="spliceTemperatureTest">淇濆瓨</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -1027,7 +1043,15 @@
{label: '=', value: '='},
{label: '鈮�', value: '鈮�'},
{label: '>', value: '>'},
- ]
+ ],
+ temperatureShow: false, // 娓╁崌璇曢獙妫�楠岄」寮规
+ temperatureTest: [],
+ temperatureList: [],
+ temperatureEngList: [],
+ temperatureTitle: '',
+ temperatureTestNum: '',
+ isShowInput: false,
+ temId: ''
}
},
watch: {
@@ -1169,9 +1193,61 @@
item.tell = tell
}
})
- console.log('ask---', ask)
- console.log('tell---', tell)
this.circulateShow = false
+ },
+ spliceTemperatureTest () {
+ if (this.temperatureTest.length === 0) {
+ this.$message.error('璇烽�夋嫨')
+ return
+ }
+ let askStr = ''
+ let askArr1 = []
+ let askArr2 = ''
+ let ask = ''
+ let index = ''
+ this.temperatureTest.map(val => {
+ index = this.temperatureEngList.findIndex(item => item.label === val)
+ if (index > -1) {
+ askStr = val + ',' + this.temperatureEngList[index].value
+ }
+ askArr1.push(askStr)
+ })
+
+ if (this.temperatureTitle === '娓╁崌璇曢獙瑕佹眰濉啓') {
+ askArr2 = askArr1.join(';')
+ ask = askArr2 + ';1'
+ } else {
+ if (!this.temperatureTestNum) {
+ this.$message.error('璇峰～鍐欏惊鐜鏁�')
+ return
+ }
+ askArr2 = askArr1.join(';')
+ ask = askArr2 + ';' + this.temperatureTestNum
+ }
+ this.productList.forEach(item => {
+ if (item.id === this.temId) {
+ item.ask = ask
+ item.tell = ask
+ }
+ })
+ console.log('ask---', ask)
+ this.temperatureShow = false
+ },
+ temperatureShowClose () {
+ if (this.temperatureTitle === '鐑惊鐜姹傚～鍐�' && !this.temperatureTestNum) {
+ this.$message.error('璇峰～鍐欏惊鐜鏁�')
+ return
+ }
+ if (this.temperatureTest.length === 0) {
+ this.$message.error('璇烽�夋嫨')
+ return
+ }
+ this.spliceTemperatureTest()
+ },
+ cleanTemperatureTest () {
+ this.temperatureTest = []
+ this.temperatureTestNum = ''
+ this.temperatureShow = false
},
cleanSpliceData () {
this.circulateForm.entrustNum = null
@@ -1200,6 +1276,10 @@
}
})
this.spliceData()
+ },
+
+ handleTemperatureTestChange (value) {
+ console.log('value---', value)
},
handleSelectionChange(val) {
this.opticalProjectList = val;
@@ -1989,6 +2069,16 @@
} else if (row.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && row.state === 0) {
this.circulateShow = false;
}
+ if ((row.inspectionItem === '娓╁崌璇曢獙' || row.inspectionItem === '鐑惊鐜�') && row.state === 1) {
+ console.log('row---', row)
+ this.temperatureTitle = `${row.inspectionItem}瑕佹眰濉啓`
+ this.isShowInput = row.inspectionItem === '鐑惊鐜�'
+ this.temId = row.id
+ this.temperatureShow = true;
+ return
+ } else if ((row.inspectionItem === '娓╁崌璇曢獙' || row.inspectionItem === '鐑惊鐜�') && row.state === 0) {
+ this.temperatureShow = false;
+ }
this.getProNum()
},
searchProject () {
@@ -2160,6 +2250,20 @@
}, 200)
})
this.searchProject()
+ this.searchTemList()
+ },
+ searchTemList () {
+ this.temperatureList = []
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "鐢靛姏娓╁害寰幆妫�楠�"
+ }).then(res => {
+ if (res.data.length > 0) {
+ this.temperatureEngList = res.data
+ res.data.forEach(item => {
+ this.temperatureList.push(item.label)
+ })
+ }
+ })
},
changeModel() {
this.sampleList.forEach(a => {
@@ -2219,9 +2323,12 @@
}
},
handleAll(e) {
+ console.log('e---', e)
if (e.length > 0) {
this.productList.map(m => {
- m.state = 1
+ if(e.find(a=>a.id == m.id)){
+ m.state = 1
+ }
return m
})
} else {
@@ -2257,6 +2364,23 @@
this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
this.$refs.productTable.clearSelection()
return
+ }
+ const select = this.selectTree.split(' - ')
+ if (p.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && p.state === 1) {
+ this.circulateShow = true;
+ return
+ } else if (p.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && p.state === 0) {
+ this.circulateShow = false;
+ }
+ if ((p.inspectionItem === '娓╁崌璇曢獙' || p.inspectionItem === '鐑惊鐜�') && p.state === 1) {
+ console.log('p---', p)
+ this.temperatureTitle = `${p.inspectionItem}瑕佹眰濉啓`
+ this.isShowInput = p.inspectionItem === '鐑惊鐜�'
+ this.temId = p.id
+ this.temperatureShow = true;
+ return
+ } else if ((p.inspectionItem === '娓╁崌璇曢獙' || p.inspectionItem === '鐑惊鐜�') && p.state === 0) {
+ this.temperatureShow = false;
}
/* if (p.ask.includes('RTS')&&p.state === 1) {
p.rts = ''
@@ -2532,6 +2656,7 @@
getTotal() {
this.totalArr = []
this.total = 0;
+ console.log(this.sampleList)
this.sampleList.forEach(item => {
if (item.insProduct && item.insProduct.length > 0) {
item.insProduct.forEach(a => {
@@ -2577,6 +2702,7 @@
if (item.manHourGroup === '' || !item.manHourGroup) {
return true
} else {
+ console.log(item)
mySet.add(item.manHourGroup)
let num2 = mySet.size
if (num2 > num1) {
--
Gitblit v1.9.3