From 2281a3da368d9366e7d97e85719fe0f4a0492f9b Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 18 三月 2024 01:05:37 +0800
Subject: [PATCH] 功能调整
---
src/components/do/b1-ins-order/add.vue | 363 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 266 insertions(+), 97 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 9a50c89..cbcbb42 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -2,6 +2,11 @@
.ins_order_add {
width: 100%;
height: 100%;
+ overflow-y: auto;
+ }
+
+ .ins_order_add::-webkit-scrollbar {
+ width: 0;
}
.title {
@@ -12,7 +17,7 @@
.search {
width: calc(100% - 40px);
background-color: #fff;
- padding: 10px 40px 10px 0;
+ padding: 5px 40px 5px 0;
}
.search_thing {
@@ -35,6 +40,7 @@
color: orange;
font-size: 18px;
}
+
</style>
<style>
.ins_order_add .el-input-group__append,
@@ -64,6 +70,10 @@
.ins_order_add .el-table__row .cell {
font-size: 12px;
}
+
+ .ins_order_add .el-table .warning-row .cell{
+ color: #bababa;
+ }
</style>
<template>
@@ -78,7 +88,7 @@
<el-button size="medium" @click="">
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
- <el-button size="medium" type="primary" @click="save">鎻愪氦</el-button>
+ <el-button size="medium" type="primary" @click="save" :loading="saveLoad">鎻愪氦</el-button>
<el-button size="medium" @click="$parent.playOrder(0)">
<span style="color: #3A7BFA;">杩斿洖</span>
</el-button>
@@ -91,12 +101,6 @@
<div class="search_label">濮旀墭缂栧彿锛�</div>
<div class="search_input">
<el-input v-model="addObj.entrustCode" size="small" placeholder="绯荤粺鐢熸垚" disabled></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>鏍峰搧缂栧彿锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.sampleCode" size="small" placeholder="璇疯緭鍏�" clearable></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
@@ -115,37 +119,10 @@
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>鏍峰搧鍚嶇О锛�</div>
- <div class="search_input">
- <el-input readonly size="small" v-model="addObj.sample">
- <template slot="append"><el-button slot="append" icon="el-icon-search"
- @click="selectStandardTree = true"></el-button></template>
- </el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>瀹為獙瀹ゅ悕绉帮細</div>
- <div class="search_input">
- <el-input size="small" clearable disabled v-model="addObj.laboratory"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>鏍峰搧绫诲瀷锛�</div>
- <div class="search_input">
- <el-input size="small" clearable disabled v-model="addObj.sampleType"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>瑙勬牸鍨嬪彿锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.model"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label">绾﹀畾鏃堕棿锛�</div>
+ <div class="search_label">闇�姹傛椂闂达細</div>
<div class="search_input">
<el-date-picker type="date" placeholder="閫夋嫨鏃ユ湡" size="small" value-format="yyyy-MM-dd" style="width: 100%;"
- v-model="addObj.appointedTime"></el-date-picker>
+ v-model="addObj.appointed"></el-date-picker>
</div>
</el-col>
<el-col class="search_thing" :span="6">
@@ -157,32 +134,18 @@
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>鏍峰搧鏁伴噺锛�</div>
- <div class="search_input">
- <el-input-number size="small" v-model="addObj.sampleNum" :controls="false" :min="0" :max="1000"
- :precision="0" style="width: 50%;" @change="onSample"></el-input-number>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
<div class="search_label">OTC璁㈠崟鍙凤細</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.otcCode"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label">鏍峰搧鐣欐牱锛�</div>
- <div class="search_input">
- <el-radio-group v-model="addObj.isLeave" @change="addObj.leaveNum = null">
- <el-radio :label="1">鐣欐牱</el-radio>
- <el-radio :label="0">涓嶇暀鏍�</el-radio>
+ <div class="search_label" style="width: 175px;">鏄惁娑夊強閰嶅鏍峰搧锛�</div>
+ <div class="search_input" style="width: calc(100% - 175px);">
+ <el-radio-group v-model="addObj.mating" @change="$refs.sampleTable.doLayout()">
+ <el-radio :label="1">鏄�</el-radio>
+ <el-radio :label="0">鍚�</el-radio>
</el-radio-group>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label">鐣欐牱鏁伴噺锛�</div>
- <div class="search_input">
- <el-input-number size="small" v-model="addObj.leaveNum" :controls="false" :min="0"
- :disabled="addObj.isLeave == 0" style="width: 50%;"></el-input-number>
</div>
</el-col>
<el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
@@ -192,24 +155,39 @@
v-model="addObj.remark"></el-input>
</div>
</el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label" style="width: 160px;">鏄惁娑夊強閰嶅鏍峰搧锛�</div>
- <div class="search_input" style="width: calc(100% - 160px);">
- <el-radio-group v-model="addObj.mating" @change="$refs.sampleTable.doLayout()">
- <el-radio :label="1">鏄�</el-radio>
- <el-radio :label="0">鍚�</el-radio>
- </el-radio-group>
- </div>
- </el-col>
</el-row>
</div>
- <div style="display: flex;">
- <el-table class="el-table" ref="sampleTable" :data="sampleList" height="300px" tooltip-effect="dark" border
- @selection-change="selectSample">
+ <div>
+ <div style="text-align: right;line-height: 45px;">
+ <el-button type="primary" size="small" @click="addSampleDia = true">娣诲姞鏍峰搧</el-button>
+ <el-button size="small" @click="delSample">
+ <span style="color: #3A7BFA;">鍒犻櫎鏍峰搧</span>
+ </el-button>
+ </div>
+ <el-table class="el-table" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark" border
+ @selection-change="selectSample" highlight-current-row @row-click="rowClick">
<el-table-column type="selection" width="60"></el-table-column>
<el-table-column type="index" label="搴忓彿" width="65" align="center"></el-table-column>
<el-table-column prop="sample" label="鏍峰搧鍚嶇О" align="center" show-overflow-tooltip
min-width="100"></el-table-column>
+ <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" width="140" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.sampleCode" clearable></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="factory" label="宸ュ巶" align="center" show-overflow-tooltip min-width="100">
+ </el-table-column>
+ <el-table-column prop="laboratory" label="瀹為獙瀹�" align="center" show-overflow-tooltip min-width="100">
+ </el-table-column>
+ <el-table-column prop="sampleType" label="鏍峰搧绫诲瀷" align="center" show-overflow-tooltip min-width="100">
+ </el-table-column>
+ <el-table-column prop="model" label="鏍峰搧鍨嬪彿" align="center" show-overflow-tooltip min-width="100">
+ </el-table-column>
+ <el-table-column prop="isLeave" label="鏄惁鐣欐牱" align="center" show-overflow-tooltip min-width="100">
+ <template slot-scope="scope">
+ <span>{{scope.row.isLeave==1?'鏄�':'鍚�'}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="joinName" label="閰嶅鏍峰搧鍚嶇О" width="140" align="center" v-if="addObj.mating==1">
<template slot-scope="scope">
<el-input size="small" type="textarea" :autosize="{ minRows: 1, maxRows: 1}"
@@ -222,9 +200,38 @@
v-model="scope.row.joinModel"></el-input>
</template>
</el-table-column>
+ <el-table-column prop="joinNum" label="閰嶅鏍峰搧鏁伴噺" width="140" align="center" v-if="addObj.mating==1">
+ <template slot-scope="scope">
+ <el-input-number size="small" v-model="scope.row.joinNum" :min="1" :max="100" :precision="0"
+ :controls="false" style="width: 80%;"></el-input-number>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" width="65" align="center">
<template slot-scope="scope">
- <el-button type="text" size="small" @click="">鍒犻櫎</el-button>
+ {{scope.index}}
+ <el-button type="text" size="small" @click="sampleList.splice(scope.$index, 1)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border
+ @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
+ :row-class-name="tableRowClassName">
+ <el-table-column type="selection" width="65"></el-table-column>
+ <el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
+ show-overflow-tooltip></el-table-column>
+ <el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="method" label="妫�楠屾爣鍑�" min-width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="unit" label="璁￠噺鍗曚綅" width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="price" label="鍗曚环" width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="manDay" label="棰勮鏃堕棿(澶�)" width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="manHourGroup" 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 prop="section" label="鍖洪棿" width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="ask" label="瑕佹眰鍊�" min-width="220px">
+ <template slot-scope="scope">
+ <el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea"
+ :autosize="{ minRows: 1, maxRows: 3}"></el-input>
</template>
</el-table-column>
</el-table>
@@ -266,6 +273,71 @@
<el-button type="primary" @click="activeStandardTree">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <el-dialog title="娣诲姞鏍峰搧" :visible.sync="addSampleDia" width="400px">
+ <div class="body" style="max-height: 60vh;">
+ <el-row>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label"><span class="required-span">* </span>鏍峰搧鍚嶇О锛�</div>
+ <div class="search_input">
+ <el-input readonly size="small" v-model="sample.sample">
+ <template slot="append"><el-button slot="append" icon="el-icon-search"
+ @click="selectStandardTree = true"></el-button></template>
+ </el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label"><span class="required-span">* </span>宸ュ巶鍚嶇О锛�</div>
+ <div class="search_input">
+ <el-input size="small" clearable disabled v-model="sample.factory"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label"><span class="required-span">* </span>瀹為獙瀹ゅ悕绉帮細</div>
+ <div class="search_input">
+ <el-input size="small" clearable disabled v-model="sample.laboratory"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label"><span class="required-span">* </span>鏍峰搧绫诲瀷锛�</div>
+ <div class="search_input">
+ <el-input size="small" clearable disabled v-model="sample.sampleType"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label"><span class="required-span">* </span>瑙勬牸鍨嬪彿锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="sample.model"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label">鏍峰搧缂栧彿锛�</div>
+ <div class="search_input">
+ <el-input v-model="sample.sampleCode" size="small" placeholder="璇疯緭鍏�" clearable></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="24">
+ <div class="search_label">鏍峰搧鏁伴噺锛�</div>
+ <div class="search_input">
+ <el-input-number size="small" v-model="sample.sampleNum" :min="1" :max="100" :precision="0"
+ style="width: 50%;"></el-input-number>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label">鏍峰搧鐣欐牱锛�</div>
+ <div class="search_input">
+ <el-radio-group v-model="sample.isLeave">
+ <el-radio :label="1">鐣欐牱</el-radio>
+ <el-radio :label="0">涓嶇暀鏍�</el-radio>
+ </el-radio-group>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="addSampleDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="onSample()" :loading="getProductLoad">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -281,24 +353,25 @@
templates: [],
addObj: {
entrustCode: null,
- sampleCode: null,
custom: null,
company: null,
userId: null,
type: '0',
code: null,
- laboratory: null,
- appointedTime: null,
- factory: null,
- sample: null,
- sampleType: null,
- sampleNum: null,
- model: null,
- isLeave: 0,
- leaveNum: null,
+ appointed: null,
remark: null,
otcCode: null,
mating: 0
+ },
+ sample: {
+ sampleCode: null,
+ laboratory: null,
+ factory: null,
+ sampleType: null,
+ sample: null,
+ model: null,
+ sampleNum: 1,
+ isLeave: 0,
},
type: [],
selectUserDia: false,
@@ -335,7 +408,13 @@
expandedKeys: [],
sampleList: [],
sampleIds: [],
- methodList: []
+ methodList: [],
+ addSampleDia: false,
+ count: 1,
+ productList: [],
+ productIds: [],
+ getProductLoad: false,
+ saveLoad: false
}
},
mounted() {
@@ -367,7 +446,20 @@
this.selectUserDia = false
},
save() {
- console.log(this.addObj);
+ this.saveLoad = true
+ this.$axios.post(this.$api.insOrder.addInsOrder,{
+ insOrder: this.addObj,
+ list: this.sampleList
+ },{
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res=>{
+ this.saveLoad = false
+ if(res.code==201)return
+ this.$message.success('宸叉彁浜�')
+ this.$parent.playOrder(0)
+ })
},
getUserNow() {
this.$axios.get(this.$api.user.getUserNow).then(res => {
@@ -425,31 +517,108 @@
this.$message.error('鏈�夋嫨鏍峰搧')
return
}
- this.addObj.factory = trees[0]
- this.addObj.laboratory = trees[1]
- this.addObj.sampleType = trees[2]
- this.addObj.sample = trees[3]
- this.addObj.model = trees[4]
+ this.sample.factory = trees[0]
+ this.sample.laboratory = trees[1]
+ this.sample.sampleType = trees[2]
+ this.sample.sample = trees[3]
+ this.sample.model = trees[4]
this.selectStandardTree = false
- this.onSample()
},
selectSample(val) {
+ this.sampleIds = []
val.forEach(a => {
- this.sampleIds = a.id
+ this.sampleIds.push(a.id)
})
},
onSample() {
- this.sampleList = []
- if (this.addObj.sampleNum == 0 || this.addObj.sample == null || this.addObj.sample == '') return
- for (var i = 0; i < this.addObj.sampleNum; i++) {
- this.sampleList.push({
- sample: this.addObj.sample,
- joinName: null,
- joinModel: null
- })
+ if (this.sample.sample == null || this.sample.sample == '') {
+ this.$message.error('璇烽�夋嫨鏍峰搧')
+ return
}
+ if (this.sample.model == null || this.sample.model == '') {
+ this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
+ return
+ }
+ this.getProductLoad = true
+ this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ factory: this.sample.factory,
+ laboratory: this.sample.laboratory,
+ sampleType: this.sample.sampleType,
+ sample: this.sample.sample,
+ model: this.sample.model
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ res.data.forEach(a => {
+ a.state = 1
+ })
+ for (var i = 0; i < this.sample.sampleNum; i++) {
+ this.sample.joinName = null
+ this.sample.joinModel = null
+ this.sample.joinNum = 1
+ this.sample.insProduct = res.data
+ this.sample.id = this.count
+ this.sampleList.push(this.HaveJson(this.sample))
+ this.count++
+ }
+ this.$refs.sampleTable.doLayout()
+ this.getProductLoad = false
+ this.addSampleDia = false
+ this.sample = {
+ sampleCode: null,
+ laboratory: null,
+ factory: null,
+ sampleType: null,
+ sample: null,
+ model: null,
+ sampleNum: 1,
+ isLeave: 0,
+ }
+ })
+ },
+ delSample() {
+ this.sampleIds.forEach(a => {
+ for (var i = 0; i < this.sampleList.length; i++) {
+ if (this.sampleList[i].id == a) {
+ this.sampleList.splice(i, 1)
+ i -= 1
+ break
+ }
+ }
+ })
this.$refs.sampleTable.doLayout()
+ },
+ selectProduct(val) {
+ this.productIds = []
+ val.forEach(a => {
+ this.productIds.push(a.id)
+ })
+ },
+ rowClick(row, column, event) {
+ this.productList = row.insProduct
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 300)
+ },
+ toggleSelection(row) {
+ this.$refs.productTable.toggleRowSelection(row, true);
+ },
+ upProductSelect(selection, row) {
+ row.state = row.state == 1 ? 0 : 1
+ },
+ tableRowClassName({
+ row,
+ rowIndex
+ }) {
+ if (row.state === 0) {
+ return 'warning-row';
+ }
+ return '';
}
}
}
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.9.3