|
|
@@ -71,7 +71,7 @@
|
|
|
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="委托方地址">
|
|
|
- <el-input v-model="mainForm.Address" placeholder="委托方地址" disabled></el-input>
|
|
|
+ <el-input v-model="mainForm.AddressName" placeholder="委托方地址" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<!--<el-col :span="8" v-if="!tjz">-->
|
|
|
@@ -384,8 +384,8 @@
|
|
|
SampleNum: [{
|
|
|
type: 'number',
|
|
|
message: '样品数量必须为数值',
|
|
|
- trigger: 'blur',
|
|
|
- }],
|
|
|
+ trigger: 'blur'
|
|
|
+ }]
|
|
|
},
|
|
|
tableData2: [{
|
|
|
seqNo: '1',
|
|
|
@@ -412,7 +412,7 @@
|
|
|
address: '2号位',
|
|
|
address2: '大连制表厂',
|
|
|
address3: 'D004'
|
|
|
- },{
|
|
|
+ }, {
|
|
|
seqNo: '5',
|
|
|
name: '无游梁式抽油机检测',
|
|
|
address: '1号位',
|
|
|
@@ -476,20 +476,20 @@
|
|
|
ISprepare: 0,
|
|
|
PrepareNum: 0,
|
|
|
ISreveive: 0,
|
|
|
- ReveiveNum: 10.,
|
|
|
+ ReveiveNum: 10.0,
|
|
|
Remark: ''
|
|
|
},
|
|
|
rulesdeliverForm: {
|
|
|
SampleNum: [{
|
|
|
type: 'number',
|
|
|
message: '样品数量必须为数值',
|
|
|
- trigger: 'blur',
|
|
|
+ trigger: 'blur'
|
|
|
}],
|
|
|
SampleCode: [{
|
|
|
required: true,
|
|
|
message: '请输入样品编号',
|
|
|
trigger: 'blur'
|
|
|
- }],
|
|
|
+ }]
|
|
|
},
|
|
|
entityList: [],
|
|
|
detail_flag: true,
|
|
|
@@ -511,26 +511,26 @@
|
|
|
Courier: '',
|
|
|
Sender: '',
|
|
|
Notes: '',
|
|
|
- ISsend: 0,
|
|
|
+ ISsend: 0
|
|
|
},
|
|
|
rulesTransport: {
|
|
|
Sender: [{
|
|
|
required: true,
|
|
|
- message: "请填写发件人",
|
|
|
- trigger: "blur",
|
|
|
- }],
|
|
|
+ message: '请填写发件人',
|
|
|
+ trigger: 'blur'
|
|
|
+ }]
|
|
|
},
|
|
|
- //分配信息弹窗
|
|
|
+ // 分配信息弹窗
|
|
|
balanceShow: false,
|
|
|
partuserlist: [],
|
|
|
balanceForm: {
|
|
|
ConUserId: '',
|
|
|
ConUserBy: '',
|
|
|
- Remark: '',
|
|
|
+ Remark: ''
|
|
|
},
|
|
|
OfficerList: [],
|
|
|
docTemplateDictList: [],
|
|
|
- //审核信息弹窗
|
|
|
+ // 审核信息弹窗
|
|
|
auditorShow: false,
|
|
|
shenheForm: {
|
|
|
SuccessStatus: 0,
|
|
|
@@ -544,7 +544,7 @@
|
|
|
permissions: {
|
|
|
'lims.taskplan.save': false,
|
|
|
'lims.taskplan.receive': false
|
|
|
- },
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
created () {
|
|
|
@@ -625,7 +625,6 @@
|
|
|
// }
|
|
|
|
|
|
_this.saveEntity()
|
|
|
-
|
|
|
} else {
|
|
|
_this.$message({
|
|
|
type: 'warning',
|
|
|
@@ -650,10 +649,10 @@
|
|
|
|
|
|
delEntrustEquipment (val) {
|
|
|
let _this = this
|
|
|
- _this.$confirm("是否要删除关联设备?", "提示", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
+ _this.$confirm('是否要删除关联设备?', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
}).then(() => {
|
|
|
entrustEquipmentApi.deleteEntity(val, _this.$axios).then(function () {
|
|
|
_this.initDeviceList()
|
|
|
@@ -745,8 +744,8 @@
|
|
|
})
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
- console.error(err)
|
|
|
- })
|
|
|
+ console.error(err)
|
|
|
+ })
|
|
|
} else {
|
|
|
return false
|
|
|
}
|
|
|
@@ -784,25 +783,25 @@
|
|
|
_this.TestSampleNum = res.data
|
|
|
}).catch(err => {
|
|
|
// handle error
|
|
|
- console.error(err)
|
|
|
- })
|
|
|
+ console.error(err)
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
saveDetail () {
|
|
|
let _this = this
|
|
|
- //负责人姓名
|
|
|
- let tempOfficers = [];
|
|
|
+ // 负责人姓名
|
|
|
+ let tempOfficers = []
|
|
|
for (let idx in _this.OfficerList) {
|
|
|
- let selectId = _this.OfficerList[idx];
|
|
|
+ let selectId = _this.OfficerList[idx]
|
|
|
for (let idx2 in _this.partuserlist) {
|
|
|
- let item = _this.partuserlist[idx2];
|
|
|
+ let item = _this.partuserlist[idx2]
|
|
|
if (item.Id == selectId) {
|
|
|
- tempOfficers.push(item.Realname);
|
|
|
- break;
|
|
|
+ tempOfficers.push(item.Realname)
|
|
|
+ break
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- _this.balanceForm.ConUserBy = tempOfficers.join(',');
|
|
|
+ _this.balanceForm.ConUserBy = tempOfficers.join(',')
|
|
|
_this.$axios.post('/limsentrust/taskbalance/' + _this.mainForm.Id + '?samplecode=' + _this.sampleForm.SampleCode,
|
|
|
_this.balanceForm)
|
|
|
.then(res => {
|
|
|
@@ -813,7 +812,7 @@
|
|
|
message: res.data.message
|
|
|
})
|
|
|
_this.balanceShow = false
|
|
|
- _this.getEntrustInfo() //更新界面
|
|
|
+ _this.getEntrustInfo() // 更新界面
|
|
|
} else {
|
|
|
_this.$message({
|
|
|
type: 'warning',
|
|
|
@@ -827,8 +826,8 @@
|
|
|
})
|
|
|
},
|
|
|
|
|
|
- //保存委托样本明细信息
|
|
|
- addSample() {
|
|
|
+ // 保存委托样本明细信息
|
|
|
+ addSample () {
|
|
|
let _this = this
|
|
|
this.$refs['sampleForm'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
@@ -870,10 +869,10 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- showSample(val) {
|
|
|
+ showSample (val) {
|
|
|
let _this = this
|
|
|
_this.deliver_flag = 'showSample'
|
|
|
- _this.deliverTitle = "样品交接详情"
|
|
|
+ _this.deliverTitle = '样品交接详情'
|
|
|
_this.sampleForm.Id = val.Id
|
|
|
_this.sampleForm.SampleCode = val.SampleCode
|
|
|
_this.sampleForm.DetectSampleId = val.DetectSampleId
|
|
|
@@ -892,7 +891,7 @@
|
|
|
_this.sampleForm.Remark = val.Remark
|
|
|
_this.deliverShow = true
|
|
|
},
|
|
|
- editSample() {
|
|
|
+ editSample () {
|
|
|
let _this = this
|
|
|
this.$refs['sampleForm'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
@@ -920,48 +919,48 @@
|
|
|
})
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
- console.error(err)
|
|
|
- })
|
|
|
+ console.error(err)
|
|
|
+ })
|
|
|
} else {
|
|
|
return false
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- deleteSample(val) {
|
|
|
- let _this = this;
|
|
|
- _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
+ deleteSample (val) {
|
|
|
+ let _this = this
|
|
|
+ _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
})
|
|
|
.then(() => {
|
|
|
_this.$axios
|
|
|
- .delete("limsentrustsample/entrustsampledelete/" + val.Id, {})
|
|
|
+ .delete('limsentrustsample/entrustsampledelete/' + val.Id, {})
|
|
|
.then(function (response) {
|
|
|
// response
|
|
|
if (response.data.code === 0) {
|
|
|
_this.$message({
|
|
|
- type: "success",
|
|
|
+ type: 'success',
|
|
|
message: response.data.message
|
|
|
- });
|
|
|
+ })
|
|
|
// 更新界面
|
|
|
_this.getEntrustInfo()
|
|
|
- //刷新样品明显列表
|
|
|
+ // 刷新样品明显列表
|
|
|
_this.getSampleList()
|
|
|
} else {
|
|
|
_this.$message({
|
|
|
- type: "warning",
|
|
|
+ type: 'warning',
|
|
|
message: response.data.message
|
|
|
- });
|
|
|
+ })
|
|
|
}
|
|
|
})
|
|
|
.catch(function (error) {
|
|
|
- console.log(error);
|
|
|
- });
|
|
|
+ console.log(error)
|
|
|
+ })
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => {})
|
|
|
},
|
|
|
- sampleDialog() {
|
|
|
+ sampleDialog () {
|
|
|
this.deliverShow = true
|
|
|
this.deliverTitle = '新增样品信息'
|
|
|
this.deliver_flag = 'adddeliver'
|
|
|
@@ -981,10 +980,10 @@
|
|
|
this.sampleForm.Notes = ''
|
|
|
this.testcodec()
|
|
|
},
|
|
|
- getSampleList() {
|
|
|
+ getSampleList () {
|
|
|
let _this = this
|
|
|
// request
|
|
|
- this.$axios.get("/limsentrustsample/getentrustsamplelist/" + _this.ServiceId, {})
|
|
|
+ this.$axios.get('/limsentrustsample/getentrustsamplelist/' + _this.ServiceId, {})
|
|
|
.then(res => {
|
|
|
_this.deliverList = res.data.items
|
|
|
})
|
|
|
@@ -1017,7 +1016,6 @@
|
|
|
}).catch(err => {
|
|
|
console.error(err)
|
|
|
})
|
|
|
-
|
|
|
} else {
|
|
|
// 分页及列表条件
|
|
|
let params = {
|
|
|
@@ -1038,7 +1036,7 @@
|
|
|
},
|
|
|
|
|
|
// 列表排序功能
|
|
|
- orderby(column) {
|
|
|
+ orderby (column) {
|
|
|
if (column.order == 'ascending') {
|
|
|
this.Column.Order = 'asc'
|
|
|
} else if (column.order == 'descending') {
|
|
|
@@ -1058,13 +1056,13 @@
|
|
|
this.initDeviceList()
|
|
|
},
|
|
|
|
|
|
- //ln
|
|
|
- deletetesttype(val) {
|
|
|
- let _this = this;
|
|
|
- this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
+ // ln
|
|
|
+ deletetesttype (val) {
|
|
|
+ let _this = this
|
|
|
+ this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
})
|
|
|
.then(() => {
|
|
|
_this.$axios
|
|
|
@@ -1089,7 +1087,7 @@
|
|
|
})
|
|
|
.catch(() => {})
|
|
|
},
|
|
|
- addTestType() {
|
|
|
+ addTestType () {
|
|
|
this.$axios.post('/limsentrustsample/addtesttype/' + this.EntrustSampleId, this.typevalue)
|
|
|
.then(response => {
|
|
|
if (response.data.code === 0) {
|
|
|
@@ -1105,32 +1103,32 @@
|
|
|
})
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
- console.error(err)
|
|
|
- })
|
|
|
+ console.error(err)
|
|
|
+ })
|
|
|
this.typevalue = []
|
|
|
},
|
|
|
- //详情
|
|
|
- details(val) {
|
|
|
+ // 详情
|
|
|
+ details (val) {
|
|
|
this.EntrustSampleId = val.Id
|
|
|
- this.$axios.get("/limsentrustsample/getdetails/" + val.Id)
|
|
|
+ this.$axios.get('/limsentrustsample/getdetails/' + val.Id)
|
|
|
.then(response => {
|
|
|
this.testdetails = response.data.item
|
|
|
this.testtypes = response.data.types
|
|
|
})
|
|
|
this.detailsDialog = true
|
|
|
},
|
|
|
- details1(id) {
|
|
|
- this.$axios.get("/limsentrustsample/getdetails/" + id)
|
|
|
+ details1 (id) {
|
|
|
+ this.$axios.get('/limsentrustsample/getdetails/' + id)
|
|
|
.then(response => {
|
|
|
this.testdetails = response.data.item
|
|
|
this.testtypes = response.data.types
|
|
|
})
|
|
|
this.detailsDialog = true
|
|
|
},
|
|
|
- //ln
|
|
|
+ // ln
|
|
|
|
|
|
- //发送
|
|
|
- transportShow() {
|
|
|
+ // 发送
|
|
|
+ transportShow () {
|
|
|
if (this.mainForm.DeliverStatus === 0) {
|
|
|
this.getDeliverNo()
|
|
|
} else {
|
|
|
@@ -1138,7 +1136,7 @@
|
|
|
}
|
|
|
this.transportDialog = true
|
|
|
},
|
|
|
- getDeliverInfo() {
|
|
|
+ getDeliverInfo () {
|
|
|
let _this = this
|
|
|
let params = {
|
|
|
ServiceId: _this.mainForm.Id
|
|
|
@@ -1150,17 +1148,17 @@
|
|
|
_this.deliverForm = res.data.items
|
|
|
}).catch(err => {
|
|
|
// handle error
|
|
|
- console.error(err)
|
|
|
- })
|
|
|
+ console.error(err)
|
|
|
+ })
|
|
|
},
|
|
|
- saveDeliver() {
|
|
|
+ saveDeliver () {
|
|
|
if (this.mainForm.DeliverStatus == 0) {
|
|
|
this.addDeliver('deliverForm')
|
|
|
} else if (this.mainForm.DeliverStatus == 1) {
|
|
|
this.editDeliver('deliverForm')
|
|
|
}
|
|
|
},
|
|
|
- addDeliver(formName) {
|
|
|
+ addDeliver (formName) {
|
|
|
let _this = this
|
|
|
this.$refs['deliverForm'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
@@ -1195,7 +1193,7 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- editDeliver(formName) {
|
|
|
+ editDeliver (formName) {
|
|
|
let _this = this
|
|
|
this.$refs['deliverForm'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
@@ -1222,7 +1220,7 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- sendTransport() {
|
|
|
+ sendTransport () {
|
|
|
if (this.deliverForm.Sender || this.deliverForm.Sender != '') {
|
|
|
this.deliverForm.ISsend = 1
|
|
|
this.editDeliver()
|
|
|
@@ -1234,12 +1232,12 @@
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- auditor() {
|
|
|
+ auditor () {
|
|
|
let _this = this
|
|
|
- _this.$confirm("确定审核该检测计划?审核后所有信息将不可修改!", "提示", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
+ _this.$confirm('确定审核该检测计划?审核后所有信息将不可修改!', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
})
|
|
|
.then(() => {
|
|
|
if (_this.shenheForm.SuccessStatus === 0) {
|
|
|
@@ -1254,7 +1252,7 @@
|
|
|
})
|
|
|
.catch(() => {})
|
|
|
},
|
|
|
- makesure() {
|
|
|
+ makesure () {
|
|
|
if (this.ServiceId <= 0) {
|
|
|
this.$message({
|
|
|
type: 'warning',
|
|
|
@@ -1278,17 +1276,16 @@
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
console.error(err)
|
|
|
- });
|
|
|
-
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
- testcodec() {
|
|
|
+ testcodec () {
|
|
|
this.$axios.get('/codesequence/GetProjectCenterDailySequence')
|
|
|
.then(res => {
|
|
|
this.sampleForm.SampleCode = res.data.items
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
- getCode() {
|
|
|
+ getCode () {
|
|
|
if (this.ServiceId === 'add') {
|
|
|
if (this.tjz) {
|
|
|
for (var i = 0; i < this.projectTypeList.length; i++) {
|
|
|
@@ -1302,14 +1299,14 @@
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- getEntrustNo() {
|
|
|
+ getEntrustNo () {
|
|
|
let _this = this
|
|
|
_this.$axios.get('orderadd/getOrderNumgene')
|
|
|
.then(function (response) {
|
|
|
_this.mainForm.EntrustNo = response.data.items + ''
|
|
|
})
|
|
|
},
|
|
|
- getReportNo() {
|
|
|
+ getReportNo () {
|
|
|
let _this = this
|
|
|
let params = {
|
|
|
TemplateCode: _this.templatecode
|
|
|
@@ -1321,15 +1318,15 @@
|
|
|
_this.mainForm.EntrustNo = response.data.items + ''
|
|
|
})
|
|
|
},
|
|
|
- getDeliverNo() {
|
|
|
+ getDeliverNo () {
|
|
|
let _this = this
|
|
|
_this.$axios.get('orderadd/getOrderNumgene')
|
|
|
.then(function (response) {
|
|
|
_this.deliverForm.DeliverNo = response.data.items + ''
|
|
|
})
|
|
|
},
|
|
|
- //判断组织结构确定流程
|
|
|
- getOrganizeListById() {
|
|
|
+ // 判断组织结构确定流程
|
|
|
+ getOrganizeListById () {
|
|
|
let _this = this
|
|
|
_this.$axios.get('/limsentrust/getstyle')
|
|
|
.then(
|
|
|
@@ -1343,29 +1340,29 @@
|
|
|
}
|
|
|
}
|
|
|
}).catch(function (error) {
|
|
|
- console.log(error)
|
|
|
- })
|
|
|
+ console.log(error)
|
|
|
+ })
|
|
|
},
|
|
|
- balanceaction(){
|
|
|
- this.balanceShow=true
|
|
|
+ balanceaction () {
|
|
|
+ this.balanceShow = true
|
|
|
this.getpartuserlist(this.mainForm.DataTemplateId)
|
|
|
},
|
|
|
- getDictList() {
|
|
|
+ getDictList () {
|
|
|
docTemplateApi.getDictList(this.$axios).then(res => {
|
|
|
- this.docTemplateDictList = res.data;
|
|
|
- });
|
|
|
+ this.docTemplateDictList = res.data
|
|
|
+ })
|
|
|
},
|
|
|
- getpartuserlist(val) {
|
|
|
- this.partuserlist = ""
|
|
|
- let docTempType = '';
|
|
|
+ getpartuserlist (val) {
|
|
|
+ this.partuserlist = ''
|
|
|
+ let docTempType = ''
|
|
|
for (let idx in this.docTemplateDictList) {
|
|
|
if (val == this.docTemplateDictList[idx].Id) {
|
|
|
- docTempType = this.docTemplateDictList[idx].TemplateCode;
|
|
|
+ docTempType = this.docTemplateDictList[idx].TemplateCode
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (val != "") {
|
|
|
- if (docTempType === "DAYT.LightProtect.Report" || docTempType === "DAYT.Equipotent.Report") {
|
|
|
+ if (val != '') {
|
|
|
+ if (docTempType === 'DAYT.LightProtect.Report' || docTempType === 'DAYT.Equipotent.Report') {
|
|
|
this.lightpermission = true
|
|
|
} else {
|
|
|
this.lightpermission = false
|
|
|
@@ -1382,16 +1379,16 @@
|
|
|
console.error(err)
|
|
|
})
|
|
|
},
|
|
|
- //获取委托类型
|
|
|
- getEntypeList() {
|
|
|
+ // 获取委托类型
|
|
|
+ getEntypeList () {
|
|
|
let _this = this
|
|
|
_this.$axios.get('/items/worditem?code=DelegateType', {})
|
|
|
.then(res => {
|
|
|
_this.entypeList = res.data
|
|
|
})
|
|
|
},
|
|
|
- //委托方名称下拉
|
|
|
- getCustomer() {
|
|
|
+ // 委托方名称下拉
|
|
|
+ getCustomer () {
|
|
|
let _this = this
|
|
|
_this.$axios.get('/customer/customerlist', {})
|
|
|
.then(res => {
|
|
|
@@ -1406,8 +1403,8 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- //下拉选择委托方
|
|
|
- chooseCustomer() {
|
|
|
+ // 下拉选择委托方
|
|
|
+ chooseCustomer () {
|
|
|
let _this = this
|
|
|
for (var i = 0; i < _this.customerList.length; i++) {
|
|
|
if (_this.customerList[i].Id == _this.mainForm.CustomerId) {
|
|
|
@@ -1419,8 +1416,8 @@
|
|
|
}
|
|
|
this.getAddress(_this.mainForm.CustomerId)
|
|
|
},
|
|
|
- //检测地点下拉
|
|
|
- getAddress(CId) {
|
|
|
+ // 检测地点下拉
|
|
|
+ getAddress (CId) {
|
|
|
let _this = this
|
|
|
this.$axios.get('/limsreporthuxf/getEntrustCorp/' + CId)
|
|
|
.then(res => {
|
|
|
@@ -1435,8 +1432,8 @@
|
|
|
console.error(err)
|
|
|
})
|
|
|
},
|
|
|
- //检测报告
|
|
|
- getProjectType() {
|
|
|
+ // 检测报告
|
|
|
+ getProjectType () {
|
|
|
let _this = this
|
|
|
_this.$axios.get('/testtype/testypetreeall', {})
|
|
|
.then(res => {
|
|
|
@@ -1463,14 +1460,14 @@
|
|
|
console.log(res.data)
|
|
|
_this.mainForm.CustomerId = res.data.items['Id']
|
|
|
_this.mainForm.CustomerName = res.data.items['Fullname']
|
|
|
- // _this.mainForm.CustomerPerson = res.data.items['Person']
|
|
|
- // _this.mainForm.CustomerTelephone = res.data.items['Telephone']
|
|
|
- // _this.mainForm.Address = res.data.items['Address']
|
|
|
+ _this.mainForm.CustomerPerson = res.data.items['Contacts']
|
|
|
+ _this.mainForm.CustomerTelephone = res.data.items['Phone']
|
|
|
+ _this.mainForm.AddressName = res.data.items['Address']
|
|
|
// _this.getAddress(_this.mainForm.CustomerId)
|
|
|
}).catch(err => {
|
|
|
// handle error
|
|
|
console.error(err)
|
|
|
- })
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
SampleTypeChangeHandler () {
|
|
|
@@ -1484,21 +1481,20 @@
|
|
|
},
|
|
|
|
|
|
AddressChangeHandler () {
|
|
|
-
|
|
|
this.currentPage = 1
|
|
|
this.initDeviceList()
|
|
|
},
|
|
|
|
|
|
// 获取样品数量单位
|
|
|
- getsamplesnumlist() {
|
|
|
+ getsamplesnumlist () {
|
|
|
let _this = this
|
|
|
_this.$axios.get('/items/worditem?code=SamplesNum', {})
|
|
|
.then(res => {
|
|
|
_this.sampeunitlist = res.data
|
|
|
})
|
|
|
},
|
|
|
- //样品名称
|
|
|
- getSampleTypeOrigList() {
|
|
|
+ // 样品名称
|
|
|
+ getSampleTypeOrigList () {
|
|
|
let _this = this
|
|
|
_this.$axios.get('/limsampletype/sampletypetree', {})
|
|
|
.then(function (res) {
|
|
|
@@ -1512,7 +1508,7 @@
|
|
|
console.error(err)
|
|
|
})
|
|
|
},
|
|
|
- getSampleType() {
|
|
|
+ getSampleType () {
|
|
|
let _this = this
|
|
|
_this.sampleTypeList = []
|
|
|
for (var i = 0; _this.sampleTypeOrigList && i < _this.sampleTypeOrigList.length; i++) {
|
|
|
@@ -1533,16 +1529,16 @@
|
|
|
_this.sampleTypeTreeList = window.toolfun_gettreejson(_this.sampleTypeList, 'Id', 'ParentId',
|
|
|
'Id,FullName')
|
|
|
},
|
|
|
- getDetectSampleName(sampleId) {
|
|
|
+ getDetectSampleName (sampleId) {
|
|
|
let ret = ''
|
|
|
for (let idx in this.sampleTypeList) {
|
|
|
if (sampleId === this.sampleTypeList[idx].Id) {
|
|
|
ret = this.sampleTypeList[idx].FullName
|
|
|
}
|
|
|
}
|
|
|
- return ret;
|
|
|
+ return ret
|
|
|
},
|
|
|
- SamplePropertyHandler() {
|
|
|
+ SamplePropertyHandler () {
|
|
|
let _this = this
|
|
|
var sampleid = _this.selectedorg[_this.selectedorg.length - 1]
|
|
|
this.$axios.get('limsampletype/getsampleproperty/' + sampleid, {})
|
|
|
@@ -1554,10 +1550,10 @@
|
|
|
_this.sampleForm.ReveiveNum = res.data.items.ReveiveNum
|
|
|
}).catch(err => {
|
|
|
// handle error
|
|
|
- console.error(err)
|
|
|
- })
|
|
|
+ console.error(err)
|
|
|
+ })
|
|
|
},
|
|
|
- //获取权限
|
|
|
+ // 获取权限
|
|
|
getPermissions () {
|
|
|
let _this = this
|
|
|
// request
|
|
|
@@ -1579,7 +1575,7 @@
|
|
|
console.error(err)
|
|
|
})
|
|
|
},
|
|
|
- jstimehandle(val) {
|
|
|
+ jstimehandle (val) {
|
|
|
if (val === '') {
|
|
|
return '----'
|
|
|
} else if (val === '0001-01-01T08:00:00+08:00') {
|
|
|
@@ -1590,11 +1586,10 @@
|
|
|
val = val.replace('T', ' ')
|
|
|
return val.substring(0, 10)
|
|
|
}
|
|
|
- },
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss">
|