From 15fc2eb2a1e0a92efb877d96f7c72ba7fbed3ecd Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 20 三月 2024 15:49:02 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b2-standard.vue | 163 ++++++--
src/components/do/b1-ins-order/add.vue | 606 +++++++++++++++++++++------------
src/components/tool/value-table.vue | 136 ++++--
src/components/view/a5-capacity-scope.vue | 22 +
package-lock.json | 10
static/js/menu.js | 2
src/components/view/b1-inspection-order.vue | 44 +-
src/components/view/a7-standard-method.vue | 48 ++
src/assets/api/controller.js | 4
9 files changed, 684 insertions(+), 351 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 6b731f8..afa2cbe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -177,6 +177,11 @@
}
}
},
+ "@tinymce/tinymce-vue": {
+ "version": "3.2.8",
+ "resolved": "https://registry.npmmirror.com/@tinymce/tinymce-vue/-/tinymce-vue-3.2.8.tgz",
+ "integrity": "sha512-jEz+NZ0g+FZFz273OEUWz9QkwPMyjc5AJYyxOgu51O1Y5UaJ/6IUddXTX6A20mwCleEv5ebwNYdalviafx4fnA=="
+ },
"@transloadit/prettier-bytes": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz",
@@ -12039,6 +12044,11 @@
"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz",
"integrity": "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="
},
+ "tinymce": {
+ "version": "5.10.9",
+ "resolved": "https://registry.npmmirror.com/tinymce/-/tinymce-5.10.9.tgz",
+ "integrity": "sha512-5bkrors87X9LhYX2xq8GgPHrIgJYHl87YNs+kBcjQ5I3CiUgzo/vFcGvT3MZQ9QHsEeYMhYO6a5CLGGffR8hMg=="
+ },
"tmp": {
"version": "0.2.3",
"resolved": "https://registry.npmmirror.com/tmp/-/tmp-0.2.3.tgz",
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 4871473..552fbaa 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -150,11 +150,15 @@
addStandardProduct: "/standardTree/addStandardProduct", //鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�
delStandardTree: "/standardTree/delStandardTree", //鍒犻櫎鏍囧噯鏍戠殑灞傜骇
selectStandardProductList: "/standardTree/selectStandardProductList", //閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�
+ selectStandardProductListByMethodId: "/standardTree/selectStandardProductListByMethodId", //閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�
}
const standardMethod = {
selectStandardMethodList: "/standardMethod/selectStandardMethodList", //鑾峰彇鏍囧噯鏂规硶鍒楄〃
selectStandardMethods: "/standardMethod/selectStandardMethods", //鑾峰彇鏍囧噯鏂规硶鏋氫妇
+ addStandardMethod: "/standardMethod/addStandardMethod", //娣诲姞鏍囧噯鏂规硶
+ upStandardMethod: "/standardMethod/upStandardMethod", //淇敼鏍囧噯鏂规硶
+ delStandardMethod: "/standardMethod/delStandardMethod", //鍒犻櫎鏍囧噯鏂规硶
}
const StandardTemplate = {
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 1758b5a..e7e2a54 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,7 +77,7 @@
font-size: 12px;
}
- .ins_order_add .el-table .warning-row .cell{
+ .ins_order_add .el-table .warning-row .cell {
color: #bababa;
}
</style>
@@ -88,18 +88,21 @@
<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" @change="selectInsOrderTemplateById">
+ <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>
+ <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>
@@ -130,17 +133,46 @@
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <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.appointed"></el-date-picker>
- </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-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-select>
+ </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-number size="small" v-model="addObj.sampleNum" :min="1" :max="100" :precision="0"
+ style="width: 65%;" @change="addStandardTree"></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%;">
+ <el-option v-for="(a, i) in units" :key="i" :label="a.label" :value="a.value"></el-option>
</el-select>
</div>
</el-col>
@@ -169,34 +201,63 @@
</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;">
+ </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>
<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" show-overflow-tooltip 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></el-input>
</template>
</el-table-column>
- <el-table-column prop="factory" label="宸ュ巶" align="center" show-overflow-tooltip min-width="100">
+ <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="140" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.sampleCode" clearable placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"></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> -->
<el-table-column prop="model" label="鏍峰搧鍨嬪彿" align="center" show-overflow-tooltip min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.model" filterable allow-create default-first-option placeholder="鏍峰搧鍨嬪彿"
+ size="small">
+ <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" show-overflow-tooltip min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.method" :disabled="scope.row.model==null" filterable placeholder="妫�楠屾爣鍑�" size="small"
+ :loading="methodLoad" @change="(value)=>methodChange(value, scope.row)" @focus="methodFocus">
+ <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" show-overflow-tooltip min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.unit" clearable size="small" style="width: 100%;">
+ <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" show-overflow-tooltip min-width="100">
<template slot-scope="scope">
- <span>{{scope.row.isLeave==1?'鏄�':'鍚�'}}</span>
+ <el-select v-model="scope.row.isLeave" size="small">
+ <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 +278,22 @@
: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="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">
+ :row-class-name="tableRowClassName" v-loading="getProductLoad">
<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="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>
@@ -349,47 +410,47 @@
<el-button type="primary" @click="onSample()" :loading="getProductLoad">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="30%">
+ <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>
+ <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>
</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">* </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="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">* </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>
</div>
</template>
@@ -399,16 +460,16 @@
components: {
ValueTable
},
- props:{
- active: {
+ props: {
+ active: {
type: Number,
default: () => 0
},
- currentId:{
- type: Number,
+ currentId: {
+ type: Number,
default: () => 0
- }
- },
+ }
+ },
data() {
return {
template: null,
@@ -423,7 +484,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,
@@ -434,6 +503,7 @@
model: null,
sampleNum: 1,
isLeave: 0,
+ unit: null
},
type: [],
selectUserDia: false,
@@ -477,43 +547,56 @@
productIds: [],
getProductLoad: false,
saveLoad: false,
- templateDia:false,
- templateLoading:false,
- templateName:'',
- issuedDialogVisible:false,
- distributeData:{
- appointed:'',
- userId:''
- },
- personList:[],
- upLoad:false,
+ templateDia: false,
+ templateLoading: false,
+ templateName: '',
+ issuedDialogVisible: false,
+ distributeData: {
+ appointed: '',
+ userId: ''
+ },
+ personList: [],
+ upLoad: false,
+ units: [],
+ models: [],
+ methods: [],
+ methodLoad: false
+ }
+ },
+ watch: {
+ sampleList() {
+ this.addObj.method = null
+ this.productList = []
}
},
mounted() {
this.selectEnumByCategoryForType()
this.getUserNow()
this.selectStandardTreeList()
- this.selectInsOrderTemplate()
- this.getAuthorizedPerson();
- if(this.active==1){
- // 涓嬪崟娴佺▼
- }else {
- // 鏌ョ湅/瀹℃牳娴佺▼
- // 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
- this.$axios.post(this.$api.insOrder.getInsOrder, {
+ this.selectInsOrderTemplate()
+ this.getAuthorizedPerson();
+ this.selectEnumByCategoryForUnit()
+ if (this.active == 1) {
+ // 涓嬪崟娴佺▼
+ } else {
+ // 鏌ョ湅/瀹℃牳娴佺▼
+ // 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
+ 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.$nextTick(() => {
+ this.$refs.sampleTable.doLayout()
+ })
})
- }
+ }
},
methods: {
- getAuthorizedPerson() {
+ getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
let data = []
res.data.forEach(a => {
@@ -524,7 +607,7 @@
})
this.personList = data
})
- },
+ },
selectEnumByCategoryForType() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
category: "绱ф�ョ▼搴�"
@@ -548,67 +631,67 @@
this.selectUserDia = false
},
save() {
- if(!this.addObj.custom){
- this.$message.error('鏈�夋嫨涓嬪崟瀹㈡埛')
- }else if(!this.addObj.type){
- this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
- }else if(this.sampleList.length<1){
- this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
- }else if(!this.sampleList.every(m=>m.sampleCode)){
- 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('宸叉彁浜�')
- // 濡傛灉绱ф�ョ▼搴︿负绱ф�ワ紝闇�瑕佺洿鎺ヤ笅鍙戜汉鍛�
- if(this.addObj.type==2){
- this.issuedDialogVisible = true;
- this.$axios.post(this.$api.insOrder.selectOrderManDay,{
- id: res.data
- }).then(ress=>{
- // TODO 闇�瑕佸啀纭涓�涓嬭繑鍥炲��
- this.distributeData.orderId = res.data
- // this.distributeData.sampleId = res.data.sampleId
- this.distributeData.appointed = ress.data
- })
- }else{
- this.$parent.playOrder(0)
- }
- })
- }
+ if (!this.addObj.custom) {
+ this.$message.error('鏈�夋嫨涓嬪崟瀹㈡埛')
+ } else if (!this.addObj.type) {
+ this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
+ } else if (this.sampleList.length < 1) {
+ this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
+ } else if (!this.sampleList.every(m => m.sampleCode)) {
+ 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('宸叉彁浜�')
+ // 濡傛灉绱ф�ョ▼搴︿负绱ф�ワ紝闇�瑕佺洿鎺ヤ笅鍙戜汉鍛�
+ if (this.addObj.type == 2) {
+ this.issuedDialogVisible = true;
+ this.$axios.post(this.$api.insOrder.selectOrderManDay, {
+ id: res.data
+ }).then(ress => {
+ // TODO 闇�瑕佸啀纭涓�涓嬭繑鍥炲��
+ this.distributeData.orderId = res.data
+ // this.distributeData.sampleId = res.data.sampleId
+ this.distributeData.appointed = ress.data
+ })
+ } else {
+ this.$parent.playOrder(0)
+ }
+ })
+ }
},
- upInsOrderOfState(state){
- this.saveLoad = true
- this.$axios.post(this.$api.insOrder.upInsOrderOfState,{
+ upInsOrderOfState(state) {
+ this.saveLoad = true
+ this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
state,
- id:this.currentId
- },{
+ id: this.currentId
+ }, {
headers: {
'Content-Type': 'application/json'
}
- }).then(res=>{
+ }).then(res => {
this.saveLoad = false
- if(res.code==201)return
+ if (res.code == 201) return
this.$message.success('鎻愪氦鎴愬姛')
this.$parent.playOrder(0)
})
- },
- // 涓嬪彂
- submitForm2(){
- if(this.distributeData.appointed==null||this.distributeData.appointed==''){
+ },
+ // 涓嬪彂
+ submitForm2() {
+ if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
return
}
- if(this.distributeData.userId==null||this.distributeData.userId==''){
+ if (this.distributeData.userId == null || this.distributeData.userId == '') {
this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
return
}
@@ -631,7 +714,7 @@
this.$message.error('淇敼澶辫触')
this.upLoad = false
})
- },
+ },
getUserNow() {
this.$axios.get(this.$api.user.getUserNow).then(res => {
let selects = res.data
@@ -653,6 +736,7 @@
},
handleNodeClick(val, node, el) { //鏍戠殑鍊�
this.selectTree = ''
+ this.models = val.children
this.getNodeParent(node)
this.selectTree = this.selectTree.replace(' - ', '')
let data = this.selectTree.split(' - ')
@@ -688,12 +772,54 @@
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
+ this.methods = res.data.standardMethodList
+ })
+ },
+ 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 = []
@@ -710,8 +836,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,
@@ -747,7 +873,7 @@
sampleNum: 1,
isLeave: 0,
}
- })
+ }) */
},
delSample() {
this.sampleIds.forEach(a => {
@@ -773,7 +899,7 @@
this.productList.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
})
- }, 300)
+ }, 200)
},
toggleSelection(row) {
this.$refs.productTable.toggleRowSelection(row, true);
@@ -790,68 +916,108 @@
}
return '';
},
- selectInsOrderTemplate(){
- this.$axios.get(this.$api.insOrder.selectInsOrderTemplate).then(res=>{
- if(res.code==201)return
+ 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})
- },{
+ },
+ // 鍒犻櫎妯℃澘--璋冪敤鎺ュ彛
+ 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) {
+ this.$refs.sampleTable.doLayout()
+ this.getProductLoad = true
+ this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ model: this.addObj.model,
+ standardMethodListId: val
+ }, {
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 = ''
+ }).then(res => {
+ res.data.forEach(a => {
+ a.state = 1
+ })
+ this.sampleIds.forEach(a => {
+ for (var b in this.sampleList) {
+ if (this.sampleList[b].id == a) {
+ this.sampleList[b].standardMethodListId = val
+ this.sampleList[b].insProduct = this.HaveJson(res.data)
+ }
+ }
+ })
+ this.getProductLoad = false
+ this.productList = []
+ this.$refs.sampleTable.setCurrentRow()
})
- }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 = []
- }
+ },
+ methodFocus(){
+ this.selectsStandardMethodByFLSSM()
+ }
}
}
-</script>
+</script>
\ No newline at end of file
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 78fa5f5..c8bce0f 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -36,26 +36,32 @@
}
</style>
<style>
- .value-table .highlight-warning-row-border td{
- border-top: 2px solid #ffcd29;
- border-bottom: 2px solid #ffcd29;
- }
- .value-table .highlight-warning-row-border td:first-child{
- border-left: 2px solid #ffcd29;
- }
- .value-table .highlight-warning-row-border td:last-child{
- border-right: 2px solid #ffcd29;
- }
- .value-table .highlight-danger-row-border td{
- border-top: 2px solid red;
- border-bottom: 2px solid red;
- }
- .value-table .highlight-danger-row-border td:first-child{
- border-left: 2px solid red;
- }
- .value-table .highlight-danger-row-border td:last-child{
- border-right: 2px solid red;
- }
+ .value-table .highlight-warning-row-border td {
+ border-top: 2px solid #ffcd29;
+ border-bottom: 2px solid #ffcd29;
+ }
+
+ .value-table .highlight-warning-row-border td:first-child {
+ border-left: 2px solid #ffcd29;
+ }
+
+ .value-table .highlight-warning-row-border td:last-child {
+ border-right: 2px solid #ffcd29;
+ }
+
+ .value-table .highlight-danger-row-border td {
+ border-top: 2px solid red;
+ border-bottom: 2px solid red;
+ }
+
+ .value-table .highlight-danger-row-border td:first-child {
+ border-left: 2px solid red;
+ }
+
+ .value-table .highlight-danger-row-border td:last-child {
+ border-right: 2px solid red;
+ }
+
.value-table .el-upload {
width: 100%;
}
@@ -76,23 +82,31 @@
</el-table-column>
<el-table-column type="index" align="center" label="搴忓彿" width="70" v-if="data.isIndex" :key="Math.random()">
</el-table-column>
- <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" v-for="(a, ai) in tableHead" :key="ai"
- show-overflow-tooltip min-width="160">
+ <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'"
+ v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="160">
<template slot-scope="scope">
<div v-if="showType(a.label, data.tagField) != null">
- <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == scope.row[a.label]"
- :type="b.type" size="medium">{{b.label}}</el-tag>
+ <template v-if="typeof(scope.row[a.label]) == 'object'">
+ <template v-for="(param, i) in scope.row[a.label]">
+ <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == param"
+ :type="b.type" size="medium" style="margin-right: 5px;">{{b.label}}</el-tag>
+ </template>
+ </template>
+ <template v-else>
+ <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == scope.row[a.label]"
+ :type="b.type" size="medium">{{b.label}}</el-tag>
+ </template>
</div>
- <!-- 鍙搷浣滆杩涜鐐瑰嚮浜嬩欢 -->
- <span v-else-if="data.linkEvent&&showLink(a.label, data.linkEvent)" style="color:#409EFF;cursor: pointer;" @click="handleLinkEvent(scope.row,data.linkEvent[a.label])">{{scope.row[a.label]}}</span>
+ <!-- 鍙搷浣滆杩涜鐐瑰嚮浜嬩欢 -->
+ <span v-else-if="data.linkEvent&&showLink(a.label, data.linkEvent)" style="color:#409EFF;cursor: pointer;"
+ @click="handleLinkEvent(scope.row,data.linkEvent[a.label])">{{scope.row[a.label]}}</span>
<span v-else>{{scope.row[a.label]}}</span>
</template>
</el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" :width="getWidth()"
- v-if="data.do.length > 0">
+ <el-table-column fixed="right" align="center" label="鎿嶄綔" :width="getWidth()" v-if="data.do.length > 0">
<template slot-scope="scope">
<el-button v-for="(a, ai) in data.do" :key="ai" :type="a.type"
- :disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false"
+ :disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false"
@click="main(scope.row, a)">{{a.font}}</el-button>
</template>
</el-table-column>
@@ -105,19 +119,21 @@
</el-pagination>
</div>
<el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'">
- <div class="body" v-if="upDia" style="max-height: 550px;overflow-y: auto;padding: 5px 0;">
+ <div class="body" v-if="upDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
<div v-if="data.row > 1">
<div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
- <el-col :span="6/data.row" style="text-align: right;">
+ <el-col :span="6/data.row" style="text-align: right;" :offset="1">
<span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}锛�
</el-col>
- <el-col :span="16/data.row" :offset="1">
+ <el-col :span="16/data.row">
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
- <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
- style="width: 100%;" :disabled="isDisabled(a.label)" clearable>
+ <el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
+ v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
+ clearable>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
- :label="b.label"></el-option>
+ :label="b.label">
+ </el-option>
</el-select>
</el-col>
</div>
@@ -130,8 +146,9 @@
<el-col :span="16" :offset="1">
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
- <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
- style="width: 100%;" :disabled="isDisabled(a.label)" clearable>
+ <el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
+ v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
+ clearable>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
:label="b.label"></el-option>
</el-select>
@@ -216,9 +233,9 @@
} from 'iview';
export default {
props: {
- tableRowClassName:{
- type: Function
- },
+ tableRowClassName: {
+ type: Function
+ },
url: {
type: String,
default: () => null
@@ -390,6 +407,15 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ for (var a in this.data.selectField) {
+ if (this.data.selectField[a].choose == true) {
+ this.tableData.map(b => {
+ try {
+ b[a] = JSON.parse(b[a])
+ } catch (e) {}
+ })
+ }
+ }
this.loading = false
}).catch(e => {
this.loading = false
@@ -414,10 +440,10 @@
var str = ob[val]
return str == undefined ? null : ob[val].select
},
- showLink(val, ob){
- var str = ob[val]
+ showLink(val, ob) {
+ var str = ob[val]
return str == undefined ? null : ob[val].method
- },
+ },
showAddReq(label) {
if (this.data.requiredAdd == undefined) {
return
@@ -454,7 +480,7 @@
delete this.upData.createUser
delete this.upData.updateUser
val.field.forEach(a => {
- if (this.upData[a] == undefined) {
+ if (this.upData[a] === undefined) {
this.upHead.push({
value: a.split('=')[0],
label: a.split('=')[1]
@@ -496,7 +522,6 @@
} else {
delete row.orderBy
this.$parent[val.method](row)
- // this.$emit(val.method, row)
}
},
saveUpData() {
@@ -515,6 +540,11 @@
}
}
this.upLoad = true
+ for (var a in this.data.selectField) {
+ if (this.data.selectField[a].choose == true) {
+ this.upData[a] = JSON.stringify(this.upData[a])
+ }
+ }
this.$axios.post(this.upUrl, this.upData, {
headers: {
'Content-Type': 'application/json'
@@ -729,16 +759,16 @@
});
return sums;
},
- handleLinkEvent(row,val){
- if(val.method=='doDiy'){
- this.main(row,val)
- }else{
+ handleLinkEvent(row, val) {
+ if (val.method == 'doDiy') {
+ this.main(row, val)
+ } else {
this.$parent[val.method](row)
- }
- },
- getWidth(){
+ }
+ },
+ getWidth() {
let count = 0
- this.data.do.forEach(a=>{
+ this.data.do.forEach(a => {
count += a.font.length
})
return count * 15 + 60 + 'px'
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index fe60bf6..bf6e2dd 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -162,7 +162,9 @@
templateId:{
select:[]
},
- sonLaboratory: {select:[]}
+ sonLaboratory: {select:[]},
+ unit: {select:[]},
+ sample: {select:[]},
},
selectField: {
inspectionItemType: {
@@ -180,10 +182,11 @@
templateId:{
select:[]
},
- method:{select:[]},
+ method:{select:[],choose: true},
deviceGroup:{select:[]},
sample: {select:[]},
- sonLaboratory: {select:[]}
+ sonLaboratory: {select:[]},
+ unit: {select:[]}
},
requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','sample'],
requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','sample']
@@ -237,6 +240,7 @@
this.selectTestObjectByName()
this.getStandardTemplate()
this.selectEnumByCategoryForSLaboratory()
+ this.selectEnumByCategoryForUnit()
this.getPower('0')
},
methods: {
@@ -321,6 +325,14 @@
this.itemParameterData.tagField.sonLaboratory.select = res.data
})
},
+ selectEnumByCategoryForUnit() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "鍗曚綅"
+ }).then(res => {
+ this.itemParameterData.selectField.unit.select = res.data
+ this.itemParameterData.tagField.unit.select = res.data
+ })
+ },
obtainItemParameterList() {
this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
let data = []
@@ -353,10 +365,12 @@
res.data.forEach(a => {
data.push({
label: a.specimenName,
- value: a.specimenName
+ value: a.id,
+ type: 'success'
})
})
this.itemParameterData.selectField.sample.select = data
+ this.itemParameterData.tagField.sample.select = data
})
},
getStandardTemplate() {
diff --git a/src/components/view/standard_method.vue b/src/components/view/a7-standard-method.vue
similarity index 68%
rename from src/components/view/standard_method.vue
rename to src/components/view/a7-standard-method.vue
index 4cb5c7b..2e33e47 100644
--- a/src/components/view/standard_method.vue
+++ b/src/components/view/a7-standard-method.vue
@@ -42,7 +42,7 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">鏍囧噯鏂规硶</el-col>
<el-col :span="12" style="text-align: right;">
- <!-- <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button> -->
+ <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
</el-col>
</el-row>
</div>
@@ -63,7 +63,8 @@
</div>
</div>
<div class="table">
- <ValueTable ref="ValueTable" :url="$api.standardMethod.selectStandardMethodList" :componentData="componentData" :key="upIndex"/>
+ <ValueTable ref="ValueTable" :url="$api.standardMethod.selectStandardMethodList"
+ :delUrl="$api.standardMethod.delStandardMethod" :upUrl="$api.standardMethod.upStandardMethod" :componentData="componentData" :key="upIndex"/>
</div>
</div>
</template>
@@ -93,17 +94,21 @@
font: '缂栬緫',
type: 'text',
method: 'doDiy',
- field:['createUserName','updateUserName']
+ field:['sampleType','createUserName','updateUserName','妫�楠屽璞�=structureTestObjectId']
},{
id: 'delete',
font: '鍒犻櫎',
type: 'text',
method: 'doDiy'
}],
- tagField: {},
- selectField: {},
- requiredAdd:['code','name'],
- requiredUp:['code','name']
+ tagField: {
+ structureTestObjectId:{select: []}
+ },
+ selectField: {
+ structureTestObjectId:{select: []}
+ },
+ requiredAdd:['code','name','structureTestObjectId'],
+ requiredUp:['code','name','structureTestObjectId']
},
entityCopy: {},
upIndex: 0,
@@ -114,6 +119,7 @@
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
this.getPower()
+ this.selectTestObjectByName()
},
methods: {
refreshTable() {
@@ -130,9 +136,15 @@
let del = false
let add = false
for (var i = 0; i < power.length; i++) {
- /* if(power[i].menuMethod=='addEnum'){
+ if(power[i].menuMethod=='addStandardMethod'){
add = true
- } */
+ }
+ if(power[i].menuMethod=='delStandardMethod'){
+ del = true
+ }
+ if(power[i].menuMethod=='upStandardMethod'){
+ up = true
+ }
}
if(!del){
this.componentData.do.splice(1, 1)
@@ -141,7 +153,23 @@
this.componentData.do.splice(0, 1)
}
this.addPower = add
- }
+ },
+ openAdd(){
+ this.$refs.ValueTable.openAddDia(this.$api.standardMethod.addStandardMethod);
+ },
+ selectTestObjectByName() {
+ this.$axios.get(this.$api.capacityScope.selectTestObjectByName).then(res => {
+ let data = []
+ res.data.forEach(a => {
+ data.push({
+ label: a.specimenName,
+ value: a.id
+ })
+ })
+ this.componentData.selectField.structureTestObjectId.select = data
+ this.componentData.tagField.structureTestObjectId.select = data
+ })
+ },
}
}
</script>
\ No newline at end of file
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index d9a4091..0200bd6 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -54,7 +54,7 @@
border-radius: 8px 0 0 8px;
}
- .tab li:nth-child(4) {
+ .tab li:nth-child(5) {
border-radius: 0 8px 8px 0;
}
@@ -218,7 +218,7 @@
entity: {
entrustCode: null,
sample: null,
- state: 1,
+ state: 0,
orderBy: {
field: 'id',
order: 'asc'
@@ -260,17 +260,17 @@
return row.state == 2 || row.state == 3
}
}, {
- font: '涓嬪彂',
+ font: '鍒嗛厤',
type: 'text',
method: 'handleIssued',
disabFun: (row, index) => {
return row.state != 1 || row.sendTime != null
}
}],
- linkEvent:{
- entrustCode:{
- method:'selectAllByOne'
- }
+ linkEvent: {
+ entrustCode: {
+ method: 'selectAllByOne'
+ }
},
tagField: {
type: {
@@ -333,12 +333,15 @@
addPower: true,
upLoad: false,
tabList: [{
- label: '妫�楠屽鐞�',
+ label: '寰呭鏍�',
+ value: 0
+ }, {
+ label: '寰呮楠�',
value: 1
},
{
- label: '寰呭鏍�',
- value: 0
+ label: '宸叉楠�',
+ value: 4
},
{
label: '閫�鍥�',
@@ -350,8 +353,8 @@
},
],
tabIndex: 0,
- active: 0,//1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍�
- currentId:null
+ active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍�
+ currentId: null
}
},
mounted() {
@@ -415,27 +418,26 @@
},
// 璇︽儏
selectAllByOne(row) {
- this.active = 2;
+ this.active = 2;
// console.log(row);
// //鎵撳紑寮规
// this.dialogVisible = true;
// //row = 鐐瑰嚮瀵瑰簲琛屽��
// //澶嶅埗缁檉ormData
// this.formData = this.HaveJson(row);
- this.currentId = row.id
+ this.currentId = row.id
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
this.dataDialogVisible = true;
},
// 涓嬭浇鎶ュ憡
- download(row) {
- },
+ download(row) {},
// 瀹℃牳
handleVerify(row) {
// this.verifyDialogVisible = true;
- this.active = 3;
- this.currentId = row.id
+ this.active = 3;
+ this.currentId = row.id
},
// 鎾ら攢
handlEquash(row) {
@@ -444,9 +446,9 @@
// 涓嬪彂
handleIssued(row) {
this.issuedDialogVisible = true;
- this.$axios.post(this.$api.insOrder.selectOrderManDay,{
+ this.$axios.post(this.$api.insOrder.selectOrderManDay, {
id: row.sampleId
- }).then(res=>{
+ }).then(res => {
this.distributeData.orderId = row.id
this.distributeData.sampleId = row.sampleId
this.distributeData.appointed = res.data
@@ -454,7 +456,7 @@
})
},
submitForm2() {
- if(this.distributeData.appointed==null||this.distributeData.appointed==''){
+ if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
return
}
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 333deea..f78bd60 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -54,6 +54,7 @@
height: calc(100% - 275px);
margin-top: 5px;
background-color: white;
+ user-select: none;
}
.product_table .el-table {
@@ -83,6 +84,10 @@
.standard .standard_table .el-table__row .cell {
font-size: 14px;
}
+
+ .standard .el-table .warning-row .cell {
+ color: #bababa;
+ }
</style>
<template>
@@ -97,9 +102,10 @@
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addDia = true"></el-button>
</el-col>
</el-row>
- <el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }"
- node-key="label" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current
- @node-expand="nodeOpen" @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="true" :default-expanded-keys="expandedKeys">
+ <el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }" node-key="label"
+ :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
+ @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false"
+ :default-expanded-keys="expandedKeys">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row>
<el-col :span="21">
@@ -120,17 +126,18 @@
<el-row class="title">
<el-col :span="10" style="font-size: 14px;color: #999;">{{selectTree}}</el-col>
<el-col :span="selectTree==''?24:14" style="text-align: right;" v-if="selectTree!=''">
- <el-button size="small" type="primary" @click="addStandardDia = true"
+ <!-- <el-button size="small" type="primary" @click="addStandardDia = true"
v-if="addStandardMethod">鏂板鏍囧噯</el-button>
<el-button size="small" type="primary" @click="addProductDia = true" v-if="addStandardProduct">鏂板椤圭洰</el-button>
<el-button size="small" @click="delStandardProductByIds" v-if="delStandardProduct">
<i class="el-icon-delete" style="color: #3A7BFA;"></i>
<span style="color: #3A7BFA;">鍒犻櫎</span>
- </el-button>
+ </el-button> -->
</el-col>
</el-row>
<el-row class="standard_table" v-loading="tableLoad">
- <el-table class="el-table" :data="standardList" style="width: 100%;" height="220px" tooltip-effect="dark">
+ <el-table class="el-table" :data="standardList" style="width: 100%;" height="220px" tooltip-effect="dark"
+ highlight-current-row @row-click="rowClick">
<el-table-column prop="code" label="鏍囧噯缂栧彿" show-overflow-tooltip>
<template slot-scope="scope">
<span style="color: red;font-size: 14px;">{{scope.row['code']}}</span>
@@ -140,34 +147,45 @@
<el-table-column prop="remark" label="澶囨敞" show-overflow-tooltip></el-table-column>
<el-table-column prop="createUserName" label="鍒涘缓浜�"></el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="250px"></el-table-column>
- <el-table-column label="鎿嶄綔" width="100" align="center" v-if="delStandardMethod">
+ <!-- <el-table-column label="鎿嶄綔" width="100" align="center" v-if="delStandardMethod">
<template slot-scope="scope">
<el-button type="text" size="small" @click="delStandardMethodByFLSSM(scope.row.id)">鍒犻櫎</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</el-row>
- <el-row class="product_table" v-loading="tableLoad">
- <el-table :data="productList" style="width: 100%;" height="100%" tooltip-effect="dark" stripe :fit="true" border
- @selection-change="handleSelectionChange">
+ <el-row class="product_table" v-loading="tableLoad2">
+ <el-table :data="productList" ref="productTable" style="width: 100%;" height="100%" tooltip-effect="dark" stripe :fit="true" border
+ @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" @select="upProductSelect">
<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="inspectionItemClassify" label="妫�楠岄」绫诲瀷" width="120" 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="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="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="manHour" label="宸ユ椂" width="80" 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">
+ <el-table-column prop="ask" label="瑕佹眰鍊�" min-width="200px">
<template slot-scope="scope">
<el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable
- @change="(value)=>upStandardProductList(value,scope.row.id)" v-if="upStandardProduct" type="textarea" :autosize="{ minRows: 1, maxRows: 3}"></el-input>
+ @change="(value)=>upStandardProductList(value,scope.row.id)" v-if="upStandardProduct" type="textarea"
+ :autosize="{ minRows: 1, maxRows: 3}"></el-input>
<span v-else>{{scope.row.ask}}</span>
</template>
</el-table-column>
+ <el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px">
+ <template slot-scope="scope">
+ <el-input size="small" placeholder="瑕佹眰鎻忚堪" v-model="scope.row.tell" clearable
+ @change="(value)=>upStandardProductListOfTell(value,scope.row.id)" v-if="upStandardProduct" type="textarea"
+ :autosize="{ minRows: 1, maxRows: 3}"></el-input>
+ <span v-else>{{scope.row.ask}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="method" label="璇曢獙鏂规硶" width="100" 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="90" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="manHour" label="宸ユ椂(H)" width="90" 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>
</el-row>
</div>
@@ -245,7 +263,7 @@
</el-dialog>
<el-dialog title="鏂板椤圭洰" :visible.sync="addProductDia" width="70%">
<div class="body" style="height: 60vh;" v-if="addProductDia">
- <ValueTable ref="ValueTable" :url="$api.capacityScope.selectItemParameterList" :componentData="componentData"/>
+ <ValueTable ref="ValueTable" :url="$api.capacityScope.selectItemParameterList" :componentData="componentData" />
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="addProductDia = false">鍙� 娑�</el-button>
@@ -289,6 +307,7 @@
addLoad2: false,
productList: [],
tableLoad: false,
+ tableLoad2: false,
upStandardProduct: false,
delStandardMethod: false,
selects: [],
@@ -316,17 +335,19 @@
valueType: {
select: []
},
- bsm:{
+ bsm: {
select: []
},
- inspectionValueType:{
- select:[]
+ inspectionValueType: {
+ select: []
},
- deviceGroup:{select:[]}
+ deviceGroup: {
+ select: []
+ }
},
selectField: {},
},
- expandedKeys:[]
+ expandedKeys: []
}
},
mounted() {
@@ -380,7 +401,7 @@
remove(node, data) {
this.$confirm("鏄惁鍒犻櫎璇ュ眰绾�", "鎻愮ず", {
type: "error"
- }).then(()=> {
+ }).then(() => {
this.treeLoad = true
this.selectTree = ''
this.getNodeParent(node)
@@ -394,7 +415,7 @@
this.$axios.post(this.$api.standardTree.delStandardTree, {
tree: this.selectTree
}).then(res => {
- if(res.code==201)return
+ if (res.code == 201) return
this.$message.success('宸插垹闄�')
this.selectStandardTreeList()
this.selectTree = ''
@@ -463,12 +484,12 @@
this.treeLoad = true
this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
this.list = res.data
- this.list.forEach(a=>{
- a.children.forEach(b=>{
- /* b.children.forEach(c=>{
+ this.list.forEach(a => {
+ a.children.forEach(b => {
+ b.children.forEach(c => {
this.expandedKeys.push(c.label)
- }) */
- this.expandedKeys.push(b.label)
+ })
+ // this.expandedKeys.push(b.label)
})
})
this.treeLoad = false
@@ -569,7 +590,6 @@
}).then(res => {
this.tableLoad = false
this.standardList = res.data.standardMethodList
- this.productList = res.data.standardProductList
})
},
getPower() {
@@ -628,6 +648,22 @@
this.$message.success('宸蹭繚瀛�')
})
},
+ upStandardProductListOfTell(value, index) {
+ this.$axios.post(this.$api.standardTree.upStandardProductList, {
+ id: index,
+ tell: value
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('鏈繚瀛�')
+ return
+ }
+ this.$message.success('宸蹭繚瀛�')
+ })
+ },
delStandardMethodByFLSSM(id) {
this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
confirmButtonText: "纭畾",
@@ -653,11 +689,11 @@
})
},
delStandardProductByIds() {
- if(this.selects.length == 0){
+ if (this.selects.length == 0) {
this.$message.error('鏈�変腑鏁版嵁')
return
}
- this.$confirm('鏄惁鍒犻櫎褰撳墠閫変腑 '+this.selects.length+' 鏉℃暟鎹�?', "璀﹀憡", {
+ this.$confirm('鏄惁鍒犻櫎褰撳墠閫変腑 ' + this.selects.length + ' 鏉℃暟鎹�?', "璀﹀憡", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
@@ -674,21 +710,21 @@
})
}).catch(() => {})
},
- addStandardProductDo(){
+ addStandardProductDo() {
let selects = this.$refs.ValueTable.multipleSelection
- if(selects.length == 0){
+ if (selects.length == 0) {
this.$message.error('鏈�夋嫨鏁版嵁')
return
}
let select = []
- selects.forEach(a=>{
+ selects.forEach(a => {
select.push(a.id)
})
this.tableLoad = true
- this.$axios.post(this.$api.standardTree.addStandardProduct,{
+ this.$axios.post(this.$api.standardTree.addStandardProduct, {
ids: JSON.stringify(select),
tree: this.selectTree
- }).then(res=>{
+ }).then(res => {
if (res.code == 201) {
return
}
@@ -696,7 +732,50 @@
this.selectsStandardMethodByFLSSM()
})
this.addProductDia = false
- }
+ },
+ rowClick(row, column, event) {
+ this.tableLoad2 = true
+ this.$axios.post(this.$api.standardTree.selectStandardProductListByMethodId, {
+ id: row.id
+ }).then(res => {
+ this.productList = res.data
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 300)
+ this.tableLoad2 = false
+ })
+ },
+ toggleSelection(row) {
+ this.$refs.productTable.toggleRowSelection(row, true);
+ },
+ tableRowClassName({
+ row,
+ rowIndex
+ }) {
+ if (row.state === 0) {
+ return 'warning-row';
+ }
+ return '';
+ },
+ upProductSelect(selection, row) {
+ row.state = row.state == 1 ? 0 : 1
+ this.$axios.post(this.$api.standardTree.upStandardProductList, {
+ id: row.id,
+ state: row.state
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('鏈繚瀛�')
+ return
+ }
+ this.$message.success('宸蹭繚瀛�')
+ })
+ },
}
}
</script>
diff --git a/static/js/menu.js b/static/js/menu.js
index 9ba4edd..ceca16d 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -543,7 +543,7 @@
}, {
v: "瀹為獙瀹ょ殑妫�娴嬭兘鍔涙。妗�",
i: "font icon-erjidaohang",
- u: "standard_method",
+ u: "a7-standard-method",
g: "7.2 鏂规硶鐨勯�夋嫨銆侀獙璇佸拰纭",
p: "selectStandardMethodList"
}, {
--
Gitblit v1.9.3