|
@@ -24,18 +24,15 @@
|
|
|
<el-form-item label="单位名称:" prop="inspected_name" class="labelItem">
|
|
|
<el-input v-model="inspected_Unit.inspected_name" style="width:42%"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="单位地址:" prop="inspected_address" class="labelItem">
|
|
|
- <el-row>
|
|
|
- <el-col :span="10" style="margin-right:10px;">
|
|
|
- <!-- <el-cascader placeholder="请选择地区" :options="region" v- model="selectedOptions" @change="handleChange" :props="{ expandTrigger: 'hover' }" style="width:100%">
|
|
|
- </el-cascader> -->
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-input v-model="inspected_Unit.inspected_address" placeholder="请输入详细地址" style="width:100%"></el-input>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
+ <el-form-item label="单位地址:" prop="inspected_address" class="labelItem">
|
|
|
+ <el-cascader placeholder="请选择地区" :options="options" v-model="selectedOptions" @change="handleChange" style="width:15%">
|
|
|
+ </el-cascader>
|
|
|
+ <el-input v-model="inspected_Unit.inspected_address2" placeholder="请输入详细地址" style="width:26.5%;margin-left:5px;"></el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
+ <!-- <el-form-item label="" prop="inspected_address2" class="labelItem">
|
|
|
+ <el-input v-model="inspected_Unit.inspected_address" placeholder="请输入详细地址" style="width:42%"></el-input>
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item label="联系人:" prop="contact_name" class="labelItem">
|
|
|
<el-input v-model="inspected_Unit.contact_name" style="width:42%"></el-input>
|
|
|
</el-form-item>
|
|
@@ -61,7 +58,7 @@
|
|
|
<!-- </el-row> -->
|
|
|
<!-- 表格数据区域-->
|
|
|
<el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row style="width: 100%; margin:auto;"
|
|
|
- :row-style="rowStyle" :cell-style="cellStyle" @selection-change="handleSelectionChange">
|
|
|
+ :row-style="rowStyle" :cell-style="cellStyle">
|
|
|
<el-table-column type="selection" width="50"></el-table-column>
|
|
|
<el-table-column label="序号" width="50px">
|
|
|
<template slot-scope="scope">
|
|
@@ -87,6 +84,13 @@
|
|
|
<el-form-item label="抽样单编号:" prop="cyd_code" class="labelItem">
|
|
|
<el-input v-model="sample_unit.cyd_code" style="width:40%"></el-input>
|
|
|
</el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="抽样地点:" prop="sample_address" class="labelItem">
|
|
|
+ <el-cascader placeholder="请选择地区" :options="options" v-model="selectedOptions1" @change="handleChange1" style="width:15%">
|
|
|
+ </el-cascader>
|
|
|
+ <el-input v-model="sample_unit.sample_address2" placeholder="请输入详细地址" style="width:26.5%;margin-left:5px;"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="抽样人员1:" prop="sample_person_one" class="labelItem">
|
|
|
<el-input v-model="sample_unit.sample_person_one" style="width:40%"></el-input>
|
|
|
</el-form-item>
|
|
@@ -111,7 +115,7 @@
|
|
|
:on-remove="handleRemove"
|
|
|
:before-remove="beforeRemove"
|
|
|
multiple
|
|
|
- :limit="3"
|
|
|
+ :limit="10"
|
|
|
:on-exceed="handleExceed"
|
|
|
:file-list="fileList">
|
|
|
<el-button size="small" type="primary">点击上传</el-button>
|
|
@@ -137,6 +141,9 @@
|
|
|
<!-- <el-form-item label="样品编号:" prop="releaser" class="labelItem" required>
|
|
|
<el-input v-model="" style="width:42%"></el-input>
|
|
|
</el-form-item> -->
|
|
|
+ <el-form-item label="抽样地点:" prop="sample_name" class="labelItem">
|
|
|
+ <el-input v-model="product_Unit.sample_name" style="width:42%"></el-input>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="样品商标:" prop="sample_brand" class="labelItem">
|
|
|
<el-input v-model="product_Unit.sample_brand" style="width:42%"></el-input>
|
|
|
</el-form-item>
|
|
@@ -218,7 +225,7 @@
|
|
|
|
|
|
rules: {
|
|
|
inspected_name: [{required: true, message: '请输入单位名称', trigger: 'blur'},],
|
|
|
- inspected_address: [{required: true, message: '请输入单位地址', trigger: 'blur'},],
|
|
|
+ // inspected_address: [{required: true, message: '请输入单位地址', trigger: 'blur'},],
|
|
|
contact_name: [{required: true, message: '请输入联系人', trigger: 'blur'},],
|
|
|
contact_phone: [{required: true, message: '请输入联系电话', trigger: 'blur'},]
|
|
|
},
|
|
@@ -274,6 +281,11 @@
|
|
|
}
|
|
|
|
|
|
],
|
|
|
+ // 产地
|
|
|
+ options: regionData,
|
|
|
+ selectedOptions: [],
|
|
|
+ //抽样地点
|
|
|
+ selectedOptions1: [],
|
|
|
// 数据表格数据
|
|
|
tableData: [],
|
|
|
// 批量删除选中数据
|
|
@@ -326,7 +338,7 @@
|
|
|
task_id: '',
|
|
|
undertake_id: '',
|
|
|
// 产地
|
|
|
- options: regionData,
|
|
|
+ options: regionData[11].children,
|
|
|
selectedOptions: [],
|
|
|
// 日期选择器快捷选项
|
|
|
pickerOptions: {
|
|
@@ -362,9 +374,9 @@
|
|
|
console.log(this.task_id)
|
|
|
console.log(this.task_profile_id)
|
|
|
this.getCydObj()
|
|
|
-
|
|
|
-
|
|
|
console.log(regionData)
|
|
|
+ console.log(regionData[11])
|
|
|
+
|
|
|
},
|
|
|
methods: {
|
|
|
// // 步骤条下一步
|
|
@@ -457,6 +469,9 @@
|
|
|
async postInspectedUnit() {
|
|
|
var that = this
|
|
|
that.inspected_Unit['cyd_id'] = that.cyd_id
|
|
|
+ console.log()
|
|
|
+ that.inspected_Unit.inspected_address = that.inspected_Unit.inspected_address1 + that.inspected_Unit.inspected_address2
|
|
|
+ console.log(that.inspected_Unit.inspected_address)
|
|
|
const res = await this.$http.post('postInspectedUnit',that.inspected_Unit)
|
|
|
console.log(res)
|
|
|
// 判断业务逻辑
|
|
@@ -490,6 +505,7 @@
|
|
|
async postCydProfile(){
|
|
|
var that = this
|
|
|
that.sample_unit['cyd_id'] = that.cyd_id
|
|
|
+ that.sample_unit.sample_address = that.sample_unit.sample_address1 + that.sample_unit.sample_address2
|
|
|
const res = await this.$http.post('postCydProfile',that.sample_unit)
|
|
|
const result = await this.$http.post('postCyd',{
|
|
|
cyd_id: that.cyd_id,
|
|
@@ -503,6 +519,19 @@
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ //上传文件
|
|
|
+ handleRemove(file, fileList) {
|
|
|
+ console.log(file, fileList);
|
|
|
+ },
|
|
|
+ handlePreview(file) {
|
|
|
+ console.log(file);
|
|
|
+ },
|
|
|
+ handleExceed(files, fileList) {
|
|
|
+ this.$message.warning(`当前限制选择 10 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
|
|
|
+ },
|
|
|
+ beforeRemove(file, fileList) {
|
|
|
+ return this.$confirm(`确定移除 ${ file.name }?`);
|
|
|
+ },
|
|
|
//填报抽样单样品信息分页
|
|
|
handleSizeChange(val) {
|
|
|
this.queryInfo.pageSize = val;
|
|
@@ -525,18 +554,30 @@
|
|
|
},
|
|
|
// 获取样本列表
|
|
|
// 生成样品编码
|
|
|
- // 获取选择产地
|
|
|
- // handleChange() {
|
|
|
- // var that = this
|
|
|
- // var loc = "";
|
|
|
- // // console.log(this.form.place)
|
|
|
- // for (let i = 0; i < this.selectedOptions.length; i++) {
|
|
|
- // loc += CodeToText[this.selectedOptions[i]];
|
|
|
- // }
|
|
|
- // // console.log(loc)
|
|
|
- // that.cyd_data.place = loc
|
|
|
- // console.log(that.cyd_data.place)
|
|
|
- // },
|
|
|
+ // 获取受检单位地址
|
|
|
+ handleChange() {
|
|
|
+ var that = this
|
|
|
+ var loc = "";
|
|
|
+ console.log(this.selectedOptions)
|
|
|
+ for (let i = 0; i < this.selectedOptions.length; i++) {
|
|
|
+ loc += CodeToText[this.selectedOptions[i]];
|
|
|
+ }
|
|
|
+ console.log(loc)
|
|
|
+ that.inspected_Unit.inspected_address1 = loc
|
|
|
+ console.log(that.inspected_Unit.inspected_address1)
|
|
|
+ },
|
|
|
+ // 获取抽样地址
|
|
|
+ handleChange1() {
|
|
|
+ var that = this
|
|
|
+ var loc = "";
|
|
|
+ console.log(this.selectedOptions1)
|
|
|
+ for (let i = 0; i < this.selectedOptions1.length; i++) {
|
|
|
+ loc += CodeToText[this.selectedOptions1[i]];
|
|
|
+ }
|
|
|
+ console.log(loc)
|
|
|
+ that.sample_unit.sample_address1 = loc
|
|
|
+ console.log(that.sample_unit.sample_address1)
|
|
|
+ },
|
|
|
// 上传成功(要确认数据)
|
|
|
// uploadSuccess(res) {
|
|
|
// console.log(res.data)
|