From e04fbe73f7785155bffe3db30a7ead37f9200f06 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 四月 2024 16:09:32 +0800
Subject: [PATCH] 对接测试项目统计接口
---
src/components/do/b1-ins-order/add.vue | 759 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 612 insertions(+), 147 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 23d27c7..5f39d99 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -3,6 +3,7 @@
width: 100%;
height: 100%;
overflow-y: auto;
+ overflow-x: hidden;
}
.ins_order_add::-webkit-scrollbar {
@@ -41,12 +42,11 @@
font-size: 18px;
}
- .el-select-dropdown__item {
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
+ .el-select-dropdown__item {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
</style>
<style>
.ins_order_add .el-input-group__append,
@@ -77,9 +77,16 @@
font-size: 12px;
}
- .ins_order_add .el-table .warning-row .cell{
+ .ins_order_add .el-table .warning-row .cell {
color: #bababa;
}
+
+ .el-select .is-disabled{
+ background: transparent !important;
+ }
+ .el-select .is-disabled .el-input__inner{
+ background: transparent !important;
+ }
</style>
<template>
@@ -88,18 +95,22 @@
<el-row class="title">
<el-col :span="6" style="padding-left: 20px;">濮旀墭鍗曚俊鎭�</el-col>
<el-col :span="18" style="text-align: right;">
- <el-select v-model="template" size="medium" placeholder="涓嬪崟妯℃澘" style="margin-right: 10px;" v-show="active==1">
- <el-option v-for="(a, ai) in templates" :key="ai" :value="a.value" :label="a.label">
- <span style="float: left">{{ a.label }}</span>
- <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px" @click.stop="handleDelete"></i>
- </el-option>
+ <el-select v-model="template" size="medium" placeholder="涓嬪崟妯℃澘" style="margin-right: 10px;" v-show="active==1"
+ @change="selectInsOrderTemplateById">
+ <el-option v-for="(a, ai) in templates" :key="ai" :value="a.id" :label="a.name">
+ <span style="float: left">{{ a.name }}</span>
+ <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px"
+ @click.stop="handleDelete(a)"></i>
+ </el-option>
</el-select>
<el-button size="medium" @click="templateDia=true" v-show="active==1">
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">鎻愪氦</el-button>
- <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3">瀹℃牳涓嶉�氳繃</el-button>
- <el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad" v-show="active==3">瀹℃牳閫氳繃</el-button>
+ <!-- 瀹℃牳 -->
+ <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3">涓嶉�氳繃</el-button>
+ <el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad"
+ v-show="active==3">閫氳繃</el-button>
<el-button size="medium" @click="$parent.playOrder(0)">
<span style="color: #3A7BFA;">杩斿洖</span>
</el-button>
@@ -119,7 +130,7 @@
<div class="search_input">
<el-input readonly size="small" v-model="addObj.custom">
<template slot="append"><el-button slot="append" icon="el-icon-search"
- @click="selectUserDia = true"></el-button></template>
+ @click="selectUserDia = true" :disabled="active>1"></el-button></template>
</el-input>
</div>
</el-col>
@@ -130,30 +141,59 @@
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label">闇�姹傛椂闂达細</div>
+ <div class="search_label"><span class="required-span">* </span>绱ф�ョ▼搴︼細</div>
<div class="search_input">
- <el-date-picker type="date" placeholder="閫夋嫨鏃ユ湡" size="small" value-format="yyyy-MM-dd" style="width: 100%;"
- v-model="addObj.appointed"></el-date-picker>
+ <el-select size="small" style="width: 100%;" clearable v-model="addObj.type" :disabled="active>1">
+ <el-option v-for="(a, ai) in type" :key="ai" :value="a.value" :label="a.label"></el-option>
+ </el-select>
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>绱ф�ョ▼搴︼細</div>
+ <div class="search_label"><span class="required-span">* </span>鏍峰搧鍚嶇О锛�</div>
<div class="search_input">
- <el-select size="small" style="width: 100%;" clearable v-model="addObj.type">
- <el-option v-for="(a, ai) in type" :key="ai" :value="a.value" :label="a.label"></el-option>
+ <el-input readonly size="small" v-model="addObj.sample">
+ <template slot="append"><el-button slot="append" icon="el-icon-search"
+ @click="selectStandardTree = true" :disabled="active>1"></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-number size="small" v-model="addObj.sampleNum" :min="1" :max="100" :precision="0"
+ style="width: 65%;" @change="addStandardTree" :readonly="active>1"></el-input-number>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label">鏍峰搧鍗曚綅锛�</div>
+ <div class="search_input">
+ <el-select v-model="addObj.unit" clearable size="small" style="width: 100%;" :disabled="active>1">
+ <el-option v-for="(a, i) in units" :key="i" :label="a.label" :value="a.value"></el-option>
</el-select>
</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>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
<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-group v-model="addObj.mating" @change="$refs.sampleTable.doLayout()" :disabled="active>1">
<el-radio :label="1">鏄�</el-radio>
<el-radio :label="0">鍚�</el-radio>
</el-radio-group>
@@ -163,40 +203,69 @@
<div class="search_label">澶囨敞锛�</div>
<div class="search_input">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 2}" size="small" clearable
- v-model="addObj.remark"></el-input>
+ v-model="addObj.remark" :readonly="active>1"></el-input>
</div>
</el-col>
</el-row>
</div>
<div>
- <div style="text-align: right;line-height: 45px;" v-if="active<2">
- <el-button type="primary" size="small" @click="addSampleDia = true" >娣诲姞鏍峰搧</el-button>
+ <!-- <div style="text-align: right;line-height: 45px;" v-if="active<2">
+ <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 sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark" border
- @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;">
- <el-table-column type="selection" width="60"></el-table-column>
+ </div> -->
+ <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark"
+ border @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;" >
+ <el-table-column type="selection" width="60" :selectable="selectable" v-if="active==1"></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">
+ <el-table-column prop="sample" label="鏍峰搧鍚嶇О" align="center" min-width="100">
<template slot-scope="scope">
- <el-input size="small" v-model="scope.row.sampleCode" clearable></el-input>
+ <el-input size="small" v-model="scope.row.sample" clearable :readonly="active>1"></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">
+ <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="140" align="center">
<template slot-scope="scope">
- <span>{{scope.row.isLeave==1?'鏄�':'鍚�'}}</span>
+ <el-input size="small" v-model="scope.row.sampleCode" clearable placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚" :readonly="active>1"></el-input>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column prop="factory" label="宸ュ巶" align="center" min-width="100">
+ </el-table-column>
+ <el-table-column prop="laboratory" label="瀹為獙瀹�" align="center" min-width="100">
+ </el-table-column>
+ <el-table-column prop="sampleType" label="鏍峰搧绫诲瀷" align="center" min-width="100">
+ </el-table-column> -->
+ <el-table-column prop="model" label="鏍峰搧鍨嬪彿" align="center" min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.model" filterable allow-create default-first-option placeholder="鏍峰搧鍨嬪彿"
+ size="small" @change="handleChangeModel" :disabled="active>1">
+ <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="standardMethodListId" label="妫�楠屾爣鍑�" align="center" min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null||active>1" placeholder="妫�楠屾爣鍑�" size="small"
+ :loading="methodLoad" @change="(value)=>methodChange(value, scope.row)" @focus="methodFocus" :readonly="active>1">
+ <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" align="center" min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.unit" clearable size="small" style="width: 100%;" :disabled="active>1">
+ <el-option v-for="(a, i) in units" :key="i" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="isLeave" label="鏄惁鐣欐牱" align="center" min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.isLeave" size="small" :disabled="active>1">
+ <el-option label="鐣欐牱" :value="1"></el-option>
+ <el-option label="涓嶇暀鏍�" :value="0"></el-option>
+ </el-select>
</template>
</el-table-column>
<el-table-column prop="joinName" label="閰嶅鏍峰搧鍚嶇О" width="140" align="center" v-if="addObj.mating==1">
@@ -217,22 +286,26 @@
:controls="false" style="width: 80%;"></el-input-number>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="65" align="center">
+ <!-- <el-table-column label="鎿嶄綔" width="65" align="center">
<template slot-scope="scope">
{{scope.index}}
- <el-button type="text" size="small" @click="sampleList.splice(scope.$index, 1)" :disabled="active!=1">鍒犻櫎</el-button>
+ <el-button type="text" size="small" @click="delSampleAndProduct" :disabled="active!=1">鍒犻櫎</el-button>
</template>
- </el-table-column>
+ </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>
+ :row-class-name="tableRowClassName" v-loading="getProductLoad" @select-all="handleAll">
+ <el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1"></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="method" label="璇曢獙鏂规硶" min-width="120" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <span>{{scope.row.method.replace('[','').replace(']','').replaceAll('"','')}}</span>
+ </template>
+ </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>
@@ -242,7 +315,7 @@
<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>
+ :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)"></el-input>
</template>
</el-table-column>
</el-table>
@@ -349,16 +422,63 @@
<el-button type="primary" @click="onSample()" :loading="getProductLoad">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="30%">
- <div class="body" style="height: 10vh;display: flex;align-items: center;" v-if="templateDia">
- <div class="search_label"><span class="required-span">* </span>妯℃澘鍚嶇О锛�</div>
- <div class="search_input">
- <el-input size="small" clearable v-model="templateName"></el-input>
- </div>
+ <el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="400px">
+ <div class="body" style="display: flex;align-items: center;" v-if="templateDia">
+ <div class="search_label" style="width: 90px;"><span class="required-span">* </span>妯℃澘鍚嶇О锛�</div>
+ <div class="search_input">
+ <el-input size="small" clearable v-model="templateName"></el-input>
+ </div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="templateDia = false">鍙� 娑�</el-button>
<el-button type="primary" @click="addTemplateDia" :loading="templateLoading">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" 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-date-picker size="small" v-model="distributeData.appointed" type="date" placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd" style="width: 100%;" format="yyyy-MM-dd">
+ </el-date-picker>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label"><span class="required-span" v-if="addObj.type == 2">* </span>鎸囨淳浜哄憳锛�</div>
+ <div class="search_input">
+ <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="issuedDialogVisible=false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm2" :loading="upLoad">纭� 瀹�</el-button>
+ </el-row>
+ </span>
+ </el-dialog>
+ <el-dialog title="涓嶉�氳繃鍘熷洜" :visible.sync="noDialogVisible" 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 v-model="tell" size="small" placeholder="璇疯緭鍏ヤ笉閫氳繃鍘熷洜"></el-input>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="noDialogVisible=false,tell=''">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitTell" :loading="noLoading">纭� 瀹�</el-button>
+ </el-row>
</span>
</el-dialog>
</div>
@@ -370,25 +490,20 @@
components: {
ValueTable
},
- props:{
- active: {
+ props: {
+ active: {
type: Number,
default: () => 0
},
- currentId:{
- type: Number,
+ currentId: {
+ type: Number,
default: () => 0
- }
- },
+ }
+ },
data() {
return {
template: null,
- templates: [
- {
- label:'0000',
- value:1
- }
- ],
+ templates: [],
addObj: {
entrustCode: null,
custom: null,
@@ -399,7 +514,15 @@
appointed: null,
remark: null,
otcCode: null,
- mating: 0
+ mating: 0,
+ sample: null,
+ factory: null,
+ laboratory: null,
+ sampleType: null,
+ sampleNum: 1,
+ unit: null,
+ model: null,
+ method: null
},
sample: {
sampleCode: null,
@@ -410,6 +533,7 @@
model: null,
sampleNum: 1,
isLeave: 0,
+ unit: null
},
type: [],
selectUserDia: false,
@@ -453,33 +577,70 @@
productIds: [],
getProductLoad: false,
saveLoad: false,
- templateDia:false,
- templateLoading:false,
- templateName:''
+ templateDia: false,
+ templateLoading: false,
+ templateName: '',
+ issuedDialogVisible: false,
+ distributeData: {
+ appointed: '',
+ userId: ''
+ },
+ personList: [],
+ upLoad: false,
+ units: [],
+ models: [],
+ methods: [],
+ methodLoad: false,
+ noDialogVisible:false,
+ tell:'',
+ noLoading:false
+ }
+ },
+ watch: {
+ sampleList() {
+ this.addObj.method = null
+ this.productList = []
}
},
mounted() {
this.selectEnumByCategoryForType()
this.getUserNow()
this.selectStandardTreeList()
- if(this.active==1){
- // 涓嬪崟娴佺▼
- }else {
- // 鏌ョ湅/瀹℃牳娴佺▼
- // 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
- this.$axios.post(this.$api.insOrder.getInsOrder, {
+ this.selectInsOrderTemplate()
+ this.getAuthorizedPerson();
+ this.selectEnumByCategoryForUnit()
+ this.selectStandardMethods()
+ if (this.active != 1) {
+ // 鏌ョ湅/瀹℃牳娴佺▼
+ // 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
+ this.$axios.post(this.$api.insOrder.getInsOrder, {
orderId: this.currentId
}).then(res => {
- this.addObj = {...res.data.insOrder};
- this.addObj.type = String(this.addObj.type)
- this.sampleList = this.HaveJson(res.data.sampleProduct);
- this.$nextTick(()=>{
- this.$refs.sampleTable.doLayout()
- })
+ this.addObj = {
+ ...res.data.insOrder
+ };
+ this.addObj.type = String(this.addObj.type)
+ this.sampleList = this.HaveJson(res.data.sampleProduct);
+ this.addObj.sampleNum = this.sampleList.length
+ this.$nextTick(() => {
+ this.$refs.sampleTable.doLayout()
+ })
})
- }
+ }
},
methods: {
+ getAuthorizedPerson() {
+ this.$axios.get(this.$api.user.getUserMenu).then(res => {
+ let data = []
+ res.data.forEach(a => {
+ data.push({
+ label: a.name,
+ value: a.id
+ })
+ })
+ this.personList = data
+ })
+ },
selectEnumByCategoryForType() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
category: "绱ф�ョ▼搴�"
@@ -503,37 +664,107 @@
this.selectUserDia = false
},
save() {
- this.saveLoad = true
- this.$axios.post(this.$api.insOrder.addInsOrder,{
- insOrder: this.addObj,
- list: this.sampleList
- },{
- headers: {
- 'Content-Type': 'application/json'
+ if (!this.addObj.custom) {
+ this.$message.error('鏈�夋嫨涓嬪崟瀹㈡埛')
+ return
+ }
+ if (!this.addObj.type) {
+ this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
+ } else if (this.sampleList.length < 1) {
+ this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
+ } else if (!this.sampleList.every(m => m.sample)) {
+ this.$message.error('璇疯緭鍏ユ牱鍝佸悕绉�')
+ } else if (!this.sampleList.every(m => m.model)) {
+ this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
+ } else if (!this.sampleList.every(m => m.standardMethodListId)) {
+ this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
+ } else if (!this.sampleList.every(m => m.unit)) {
+ this.$message.error('璇疯緭鍏ユ牱鍝佺殑鍗曚綅')
+ } else {
+ 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)
+ })
+ }
+ },
+ upInsOrderOfState(state) {
+ if(state == 1){
+ this.saveLoad = true
+ this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
+ state,
+ id: this.currentId
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.saveLoad = false
+ if (res.code == 201) return
+ this.$message.success('鎻愪氦鎴愬姛')
+ // 濡傛灉绱ф�ョ▼搴︿负绱ф�ワ紝闇�瑕佺洿鎺ヤ笅鍙戜汉鍛�
+ // if (this.addObj.type == 2) {
+ // this.issuedDialogVisible = true;
+ // this.$axios.post(this.$api.insOrder.selectOrderManDay, {
+ // id: this.currentId
+ // }).then(ress => {
+ // this.distributeData.orderId = this.currentId
+ // this.distributeData.appointed = ress.data
+ // })
+ // } else {
+ // this.$parent.playOrder(0)
+ // }
+ this.issuedDialogVisible = true;
+ this.$axios.post(this.$api.insOrder.selectOrderManDay, {
+ id: this.currentId
+ }).then(ress => {
+ this.distributeData.orderId = this.currentId
+ this.distributeData.appointed = ress.data
+ })
+ })
+ }else{
+ // 涓嶉�氳繃
+ this.noDialogVisible = true
+ }
+ },
+ // 涓嬪彂
+ submitForm2() {
+ if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
+ this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
+ return
+ }
+ if (this.addObj.type == 2&&(this.distributeData.userId == null || this.distributeData.userId == '')) {
+ this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
+ return
+ }
+ this.upLoad = true;
+ this.$axios.post(this.$api.insOrder.upInsOrder, {
+ orderId: this.distributeData.orderId,
+ appointed: this.distributeData.appointed,
+ userId: this.distributeData.userId
+ }).then(res => {
+ if (res.code === 201) {
+ this.upLoad = false
+ return
}
- }).then(res=>{
- this.saveLoad = false
- if(res.code==201)return
- this.$message.success('宸叉彁浜�')
+ this.$message.success('鎻愪氦鎴愬姛')
+ this.upLoad = false
+ this.issuedDialogVisible = false
this.$parent.playOrder(0)
+ }).catch(e => {
+ this.$message.error('鎻愪氦澶辫触')
+ this.upLoad = false
})
},
- upInsOrderOfState(state){
- this.saveLoad = true
- this.$axios.post(this.$api.insOrder.upInsOrderOfState,{
- state,
- id:this.currentId
- },{
- 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 => {
let selects = res.data
@@ -555,6 +786,7 @@
},
handleNodeClick(val, node, el) { //鏍戠殑鍊�
this.selectTree = ''
+ this.models = val.children
this.getNodeParent(node)
this.selectTree = this.selectTree.replace(' - ', '')
let data = this.selectTree.split(' - ')
@@ -590,12 +822,67 @@
this.$message.error('鏈�夋嫨鏍峰搧')
return
}
- 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.addObj.factory = trees[0]
+ this.addObj.laboratory = trees[1]
+ this.addObj.sampleType = trees[2]
+ this.addObj.sample = trees[3]
+ this.addObj.model = (trees[4] == undefined ? null : trees[4])
this.selectStandardTree = false
+ this.sampleList = []
+ for (var i = 0; i < this.addObj.sampleNum; i++) {
+ this.sample.joinName = null
+ this.sample.joinModel = null
+ this.sample.joinNum = 1
+ this.sample.sample = this.addObj.sample
+ this.sample.model = this.addObj.model
+ this.sample.unit = this.addObj.unit
+ this.sample.standardMethodListId = null
+ this.sample.insProduct = []
+ this.sample.id = this.count
+ this.sampleList.push(this.HaveJson(this.sample))
+ this.count++
+ }
+ this.$refs.sampleTable.doLayout()
+ // this.selectsStandardMethodByFLSSM()
+ },
+ selectsStandardMethodByFLSSM() {
+ this.methodLoad = true
+ this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
+ tree: this.selectTree
+ }).then(res => {
+ this.methodLoad = false
+ try {
+ if (res.data.standardMethodList.length == 0 && this.selectTree.split('-').length == 5) {
+ let arr = this.selectTree.split('-')
+ let arr0 = arr.slice(0, arr.length - 1)
+ let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1)
+ this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
+ tree: selectTree
+ }).then(ress => {
+ this.methods = ress.data.standardMethodList
+ })
+ } else {
+ this.methods = res.data.standardMethodList
+ }
+ } catch (e) {}
+ })
+ },
+ addStandardTree() {
+ if (this.selectTree == null) return
+ this.sampleList = []
+ for (var i = 0; i < this.addObj.sampleNum; i++) {
+ this.sample.joinName = null
+ this.sample.joinModel = null
+ this.sample.joinNum = 1
+ this.sample.sample = this.addObj.sample
+ this.sample.model = this.addObj.model
+ this.sample.unit = this.addObj.unit
+ this.sample.standardMethodListId = null
+ this.sample.insProduct = []
+ this.sample.id = this.count
+ this.sampleList.push(this.HaveJson(this.sample))
+ this.count++
+ }
},
selectSample(val) {
this.sampleIds = []
@@ -612,8 +899,8 @@
this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
return
}
- this.getProductLoad = true
- this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ // this.getProductLoad = true
+ /* this.$axios.post(this.$api.standardTree.selectStandardProductList, {
factory: this.sample.factory,
laboratory: this.sample.laboratory,
sampleType: this.sample.sampleType,
@@ -649,7 +936,7 @@
sampleNum: 1,
isLeave: 0,
}
- })
+ }) */
},
delSample() {
this.sampleIds.forEach(a => {
@@ -675,13 +962,24 @@
this.productList.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
})
- }, 300)
+ }, 200)
},
toggleSelection(row) {
this.$refs.productTable.toggleRowSelection(row, true);
},
upProductSelect(selection, row) {
row.state = row.state == 1 ? 0 : 1
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ if (m.id == row.id) {
+ m.state = row.state;
+ }
+ return m;
+ })
+ }
+ return item
+ })
},
tableRowClassName({
row,
@@ -692,33 +990,200 @@
}
return '';
},
- // 鍒犻櫎妯℃澘--璋冪敤鎺ュ彛
- handleDelete(){
- this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- // this.$axios.post(this.delUrl, {
- // id: row.id
- // }).then(res => {
- // if (res.code === 201) {
- // return
- // }
- // this.$message.success('鍒犻櫎鎴愬姛')
- // this.selectList()
- // }).catch(e => {
- // this.$message.error('鍒犻櫎澶辫触')
- // })
- }).catch(() => {})
- },
- // 淇濆瓨妯℃澘
- addTemplateDia(){
- if(this.templateName){
- this.templateLoading = true;
+ selectInsOrderTemplate() {
+ this.$axios.get(this.$api.insOrder.selectInsOrderTemplate).then(res => {
+ if (res.code == 201) return
+ this.templates = res.data
+ })
+ },
+ // 鍒犻櫎妯℃澘--璋冪敤鎺ュ彛
+ handleDelete(row) {
+ this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ this.$axios.post(this.$api.insOrder.delInsOrderTemplate, {
+ id: row.id
+ }).then(res => {
+ if (res.code === 201) {
+ return
+ }
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.selectInsOrderTemplate()
+ }).catch(e => {
+ this.$message.error('鍒犻櫎澶辫触')
+ })
+ }).catch(() => {})
+ },
+ // 淇濆瓨妯℃澘
+ addTemplateDia() {
+ if (this.templateName) {
+ this.templateLoading = true;
+ this.$axios.post(this.$api.insOrder.addInsOrderTemplate, {
+ name: this.templateName,
+ thing: JSON.stringify({
+ addObj: this.addObj,
+ sampleList: this.sampleList
+ })
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) return
+ this.templateLoading = false;
+ this.templateDia = false;
+ this.$message.success('淇濆瓨鎴愬姛')
+ this.selectInsOrderTemplate()
+ this.templateName = ''
+ })
+ } else {
+ this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
+ }
+ },
+ // 鏌ヨ妯℃澘
+ selectInsOrderTemplateById(e) {
+ this.$axios.post(this.$api.insOrder.selectInsOrderTemplateById + '?id=' + e).then(res => {
+ if (res.code == 201) return
+ let obj = JSON.parse(res.data)
+ this.addObj = obj.addObj;
+ this.sampleList = obj.sampleList;
+ })
+ },
+ delSampleAndProduct() {
+ this.sampleList.splice(scope.$index, 1)
+ this.productList = []
+ },
+ selectEnumByCategoryForUnit() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "鍗曚綅"
+ }).then(res => {
+ this.units = res.data
+ })
+ },
+ methodChange(val, row) {
+ this.getProductLoad = true
+ this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ model: this.addObj.model,
+ standardMethodListId: val
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ res.data.forEach(a => {
+ a.state = 1
+ })
+ row.insProduct = this.HaveJson(res.data)
+ this.getProductLoad = false
+ this.productList = row.insProduct
+ this.$refs.sampleTable.setCurrentRow(row)
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 200)
+ })
+ },
+ methodFocus() {
+ this.selectsStandardMethodByFLSSM()
+ },
+ handleChangeModel(e) {
+ let num = this.selectTree.split('-').length;
+ if (num == 4) {
+ this.selectTree = this.selectTree + ' - ' + e
+ } else {
+ let arr = this.selectTree.split('-')
+ let arr0 = arr.slice(0, arr.length - 1)
+ this.selectTree = arr0.join('-') + '- ' + e
+ }
+ },
+ // 瑕佹眰鍊煎彉鍖栨椂
+ requestChange(e, row) {
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ if (m.id == row.id) {
+ m.ask = e;
+ }
+ return m;
+ })
+ }
+ return item
+ })
+ },
+ selectStandardMethods() {
+ this.$axios.get(this.$api.standardTree.selectStandardMethodEnum).then(res => {
+ this.methods = res.data
+ })
+ },
+ selectable(){
+ if(this.active>1){
+ return false
}else{
- this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
+ return true
}
+ },
+ handleAll(e){
+ if(e.length>0){
+ this.productList.map(m=>{
+ m.state = 1
+ return m
+ })
+ }else{
+ this.productList.map(m=>{
+ m.state = 0
+ return m
+ })
+ }
+ if(e.length>0){
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ m.state = 1
+ return m;
+ })
+ }
+ return item
+ })
+ }else{
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ m.state = 0
+ return m;
+ })
+ }
+ return item
+ })
+ }
+ this.$nextTick(()=>{
+ this.$refs.productTable.doLayout()
+ })
+ },
+ submitTell(){
+ if (!this.tell) {
+ this.$message.error('璇疯緭鍏ヤ笉閫氳繃鍘熷洜')
+ return
+ }
+ this.noLoading = true;
+ this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
+ state:2,
+ id: this.currentId,
+ tell:this.tell
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.noLoading = false;
+ this.tell = '';
+ if (res.code == 201) return
+ this.$message.success('鎻愪氦鎴愬姛')
+ this.issuedDialogVisible = false;
+ this.$parent.playOrder(0)
+ })
}
}
}
--
Gitblit v1.9.3