|
@@ -23,8 +23,8 @@
|
|
|
</el-dropdown-menu>
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
</el-dropdown>
|
|
|
</template>
|
|
</template>
|
|
|
- <template v-slot:toolkit>
|
|
|
|
|
- <div v-if="conditionType == 2">
|
|
|
|
|
|
|
+ <template v-slot:toolkit v-if="conditionType == 2">
|
|
|
|
|
+ <div>
|
|
|
<div style="display: flex;align-items: center;">
|
|
<div style="display: flex;align-items: center;">
|
|
|
<el-input v-model="formData.number" style="width: 120px;" placeholder="请输入" size="mini"
|
|
<el-input v-model="formData.number" style="width: 120px;" placeholder="请输入" size="mini"
|
|
|
@change="handleInputNumber"></el-input>
|
|
@change="handleInputNumber"></el-input>
|
|
@@ -889,27 +889,21 @@ export default {
|
|
|
},
|
|
},
|
|
|
getNewSampleList(measureQ, unit, nums) {
|
|
getNewSampleList(measureQ, unit, nums) {
|
|
|
this.sampleList = [];
|
|
this.sampleList = [];
|
|
|
- let data = [];
|
|
|
|
|
|
|
+ // let data = [];
|
|
|
if (!this.selectedList || this.selectedList.length == 0) {
|
|
if (!this.selectedList || this.selectedList.length == 0) {
|
|
|
this.$message.warning('请先选择样品!');
|
|
this.$message.warning('请先选择样品!');
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- this.selectedList.forEach(oldItem => {
|
|
|
|
|
|
|
+ this.selectedList.forEach((oldItem, index) => {
|
|
|
|
|
|
|
|
- delete oldItem.id;
|
|
|
|
|
-
|
|
|
|
|
- for (let i = 0; i < nums; i++) {
|
|
|
|
|
- data.push({
|
|
|
|
|
- ...oldItem,
|
|
|
|
|
- measureQuantity: measureQ,
|
|
|
|
|
- measureUnit: unit
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ this.$set(oldItem, 'id', null);
|
|
|
|
|
+ this.$set(oldItem, 'measureQuantity', measureQ);
|
|
|
|
|
+ this.$set(oldItem, 'measureUnit', unit);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- console.log(data, 'datadatadatadatadatadata', nums)
|
|
|
|
|
|
|
+ console.log(this.selectedList, 'datadatadatadatadatadata', nums)
|
|
|
|
|
|
|
|
- this.sampleList = data;
|
|
|
|
|
|
|
+ this.sampleList = this.selectedList;
|
|
|
},
|
|
},
|
|
|
handleCancel() {
|
|
handleCancel() {
|
|
|
this.takeAsampleVisible = false;
|
|
this.takeAsampleVisible = false;
|