From 1344317356b0407f4aff867865ba72248871ac1f Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:16:17 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/view/b2-standard.vue | 30 ---
src/components/do/b1-ins-order/add.vue | 4
src/components/tool/excel.vue | 8
src/view/notice.vue | 2
src/components/do/b1-inspect-order-plan/Inspection.vue | 2
src/components/view/b2-standard-template.vue | 8
src/components/view/custom_manage.vue | 30 +++
src/components/do/b1-ins-order/fiberoptic-config.vue | 345 ++++++++++++++++++++++++++++++++++++++
src/components/view/a6-personnel-detail.vue | 22 ++
src/components/view/person-manage.vue | 35 ++-
src/assets/api/controller.js | 2
src/components/view/index-index.vue | 15 +
12 files changed, 445 insertions(+), 58 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 50a04fb..39f4fb4 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -169,6 +169,7 @@
upPlanUser: "/insOrderPlan/upPlanUser", //浠诲姟浜ゆ帴
verifyPlan: "/insOrderPlan/verifyPlan", //澶嶆牳妫�楠屼换鍔�
submitPlan: "/insOrderPlan/submitPlan", //妫�楠屼换鍔℃彁浜�
+ inspectionOrderDetailsTaskSwitching: "/insOrderPlan/inspectionOrderDetailsTaskSwitching", // 妫�楠屽崟璇︽儏-浠诲姟鍒囨崲
}
const systemLog = {
@@ -271,6 +272,7 @@
page: "/informationNotification/page", //婊氬姩鍒嗛〉鏌ヨ
updateMessageStatus: "/informationNotification/updateMessageStatus", //鏇存柊娑堟伅鐘舵�侊紙鎷掔粷銆佹帴鏀讹級
triggerModificationStatusToRead: "/informationNotification/triggerModificationStatusToRead", //鐐瑰嚮璇︽儏瑙﹀彂淇敼鐘舵�佷负宸茶
+ getNumberFourTypesMessagesHomePage: "/informationNotification/getNumberFourTypesMessagesHomePage", // 娑堟伅閫氱煡-鑾峰彇棣栭〉鍥涚娑堟伅鏁伴噺
}
const performanceShift = {
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 279d71a..c06c537 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -107,6 +107,7 @@
<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="$parent.playOrder(4)">鍏夌氦閰嶇疆</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"
@@ -1145,7 +1146,8 @@
this.getProductLoad = true
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
model: row.model + '-' + row.modelNum,
- standardMethodListId: val
+ standardMethodListId: val,
+ factory: this.selectTree,
}, {
headers: {
'Content-Type': 'application/json'
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
new file mode 100644
index 0000000..8adeb33
--- /dev/null
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -0,0 +1,345 @@
+<template>
+<div class="ins_order_config">
+ <div>
+ <el-row class="title">
+ <el-col :span="6" style="padding-left: 20px;">鍏夌氦閰嶇疆</el-col>
+ <el-col :span="18" style="text-align: right;">
+ <el-button size="medium" type="primary" @click="save" :loading="saveLoad">淇� 瀛�</el-button>
+ <el-button size="medium" @click="$parent.playOrder(0)">
+ <span style="color: #3A7BFA;">鍙� 娑�</span>
+ </el-button>
+ </el-col>
+ </el-row>
+ </div>
+ <div class="center">
+ <el-row :gutter="10" style="margin-bottom: 10px;">
+ <el-col :span="9">
+ <div class="grid-content">
+ <h4>濂楅</h4>
+ <div style="display: flex;align-items: center;justify-content: space-between;padding: 0 12px;box-sizing: border-box;">
+ <div class="search-item">
+ <label style="width: 70px;">鏍峰搧鍨嬪彿</label>
+ <span style="font-size: 14px;">GYTA53</span>
+ </div>
+ <el-radio-group v-model="packageInfo.radio" size="small">
+ <el-radio :label="0">鍏ㄦ</el-radio>
+ <el-radio :label="1">鎶芥</el-radio>
+ </el-radio-group>
+ </div>
+ <div class="search-item" style="margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
+ <label style="width: 70px;">鏍峰搧缂栧彿</label>
+ <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
+ <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
+ <div class="search-item" style="margin-right: 10px;">
+ <label>濂楃鏁扮洰</label>
+ <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
+ <div class="search-item" style="margin-right: 10px;">
+ <label style="width: 70px;">鏍囧噯閲�</label>
+ <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
+ <div class="search-item">
+ <label style="width: 70px;">妫�娴嬮噺</label>
+ <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
+ </div>
+ <el-table
+ ref="table0"
+ :data="tableData"
+ tooltip-effect="dark"
+ style="width: 100%"
+ height="150px"
+ size="small"
+ @selection-change="handleSelectionChange">
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column
+ label="绠¤壊鏍�"
+ show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鏍囬噺"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="娴嬭瘯閲�"
+ show-overflow-tooltip>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-col>
+ <el-col :span="15">
+ <div class="grid-content">
+ <h4>妫�娴嬮」淇℃伅</h4>
+ <el-table
+ ref="table1"
+ :data="tableData"
+ tooltip-effect="dark"
+ style="width: 100%"
+ height="274px"
+ size="small"
+ @selection-change="handleSelectionChange">
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column
+ label="瀹為獙瀹�"
+ show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="妫�娴嬮」鐩�"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="璇曢獙鏂规硶"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍗曚环"
+ width="70"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍗曚綅"
+ width="70"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="棰勮鏃堕棿"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="妫�娴嬫爣鍑�"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="妫�娴嬭姹�"
+ show-overflow-tooltip>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col :span="12">
+ <div class="grid-content">
+ <h4>鍏夌氦甯�</h4>
+ <div class="btns">
+ <el-button size="small" type="primary">鐢熸垚鍏夌氦甯�</el-button>
+ <el-button size="small" type="primary">淇濆瓨鍏夌氦甯﹂」鐩�</el-button>
+ </div>
+ <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
+ <div class="search-item" style="width: 50%;margin-right: 16px;">
+ <label style="width: 80px;">绾ゅ甫绫诲瀷</label>
+ <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ <div class="search-item" style="width: 50%;">
+ <label style="width: 80px;">鍙傝�冩爣鍑�</label>
+ <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ <el-table
+ ref="table2"
+ :data="tableData"
+ tooltip-effect="dark"
+ style="width: 100%"
+ height="270px"
+ size="small"
+ @selection-change="handleSelectionChange">
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column
+ label="鍏夌氦甯︾紪鍙�"
+ show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍏夌氦甯﹁鏍�"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍙傝�冩爣鍑�"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍏夌氦妫�娴嬮噺"
+ show-overflow-tooltip>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="grid-content">
+ <h4>鍏夌氦</h4>
+ <div class="btns">
+ <el-button size="small" type="primary">鍏夌氦閰嶈壊</el-button>
+ <el-button size="small" type="primary">淇濆瓨鍏夌氦椤圭洰</el-button>
+ </div>
+ <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
+ <div class="search-item" style="width: 50%;margin-right: 16px;">
+ <label style="width: 80px;">鍏夌氦绫诲瀷</label>
+ <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ <div class="search-item" style="width: 50%;">
+ <label style="width: 80px;">鍙傝�冩爣鍑�</label>
+ <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ <el-table
+ ref="table3"
+ :data="tableData"
+ tooltip-effect="dark"
+ style="width: 100%"
+ height="270px"
+ size="small"
+ @selection-change="handleSelectionChange">
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column
+ label="绠″鑹叉爣"
+ show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍏夌氦鑹叉爣"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍏夌氦瑙勬牸"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍙傝�冩爣鍑�"
+ show-overflow-tooltip>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+</div>
+</template>
+
+<script>
+export default {
+ data(){
+ return{
+ saveLoad:false,
+ packageInfo:{
+ radio:1,
+ input:''
+ },
+ tableData:[],
+ tape:{
+ value:''
+ },
+ options:[]
+ }
+ },
+ methods:{
+ save(){},
+ handleSelectionChange(val) {}
+ }
+}
+</script>
+
+<style scoped>
+ .ins_order_config {
+ width: 100%;
+ height: 100%;
+ overflow-y: auto;
+ overflow-x: hidden;
+ }
+
+ .title {
+ height: 60px;
+ line-height: 60px;
+ }
+ .center{
+ width: 100%;
+ height: calc(100% - 60px);
+ }
+ .grid-content{
+ background: #fff;
+ border-radius: 4px;
+ }
+ .grid-content h4{
+ color: #3A7BFA;
+ font-weight: 400;
+ line-height: 32px;
+ padding-left: 16px;
+ box-sizing: border-box;
+ border-bottom: 1px solid #eee;
+ }
+ .search-item{
+ display: flex;
+ align-items: center;
+ line-height: 36px;
+ }
+ .search-item label{
+ width: 90px;
+ font-size: 12px;
+ color: #606266;
+ /* text-align: right; */
+ }
+ .btns{
+ margin: 8px 0 8px 10px;
+ }
+ >>>.el-table th.el-table__cell>.cell{
+ padding-top: 2px !important;
+ padding-bottom: 2px !important;
+ }
+</style>
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 49302c5..b776a4f 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -319,7 +319,7 @@
</el-table>
</el-drawer>
<el-drawer title="浠诲姟鍒囨崲" :visible.sync="taskVisible" :size="500">
- <ValueTable class="value-table" ref="insOrderPlan" :url="$api.insOrderPlan.selectInsOrderPlanList"
+ <ValueTable class="value-table" ref="insOrderPlan" :url="$api.insOrderPlan.inspectionOrderDetailsTaskSwitching"
:componentData="componentData" :key="upIndex" style="height: 100%;"/>
</el-drawer>
<el-dialog title="妫�楠屽鏍�" :visible.sync="reviewDia" width="500px">
diff --git a/src/components/tool/excel.vue b/src/components/tool/excel.vue
index 2c4027e..25f85b3 100644
--- a/src/components/tool/excel.vue
+++ b/src/components/tool/excel.vue
@@ -20,6 +20,12 @@
cursor: pointer;
}
+ #luckysheet .save_i{
+ margin-right: 20px;
+ font-size: 20px;
+ cursor: help;
+ }
+
#luckysheet .save:hover {
opacity: .8;
}
@@ -114,7 +120,7 @@
cellFormat: false // 璁剧疆鍗曞厓鏍兼牸寮�
},
option.myFolderUrl = this.LOCATIONVUE + '/',
- option.functionButton = '<button onClick="excelClosed()" class="save">淇濆瓨</button>'
+ option.functionButton = '<i class="save_i el-icon-info" title="绯荤粺鏀寔鐨勫彉閲忥細
搴忓彿
妫�楠岄」
妫�楠屽瓙椤�
璁惧鍚嶇О
璁惧缂栫爜
鍗曚綅
瑕佹眰鍊�
璇曢獙鏂规硶 | 妫�娴嬫柟娉�
鏈�缁堝��
缁撹
璁＄畻鍊�
妫�楠屽��"></i><button onClick="excelClosed()" class="save">淇濆瓨</button>'
luckysheet.create(option)
}
}
diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index 03c27c1..21598f0 100644
--- a/src/components/view/a6-personnel-detail.vue
+++ b/src/components/view/a6-personnel-detail.vue
@@ -67,7 +67,7 @@
background-color: #fff;
height: 100%;
display: flex;
- align-items: center;
+ align-items: right;
justify-content: end;
}
@@ -160,7 +160,7 @@
<span class="required-span">* </span>鏋舵瀯鍚嶇О锛�
</el-col>
<el-col :span="16" :offset="1">
- <el-input v-model="addOb.name" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small"></el-input>
+ <el-input v-model="addOb.name" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small" @keyup.enter.native="addStandardTree"></el-input>
</el-col>
</el-row>
</div>
@@ -170,6 +170,13 @@
</span>
</el-dialog>
<el-dialog title="閫夋嫨鐢ㄦ埛" :visible.sync="selectUserDia" width="70%">
+ <div class="search" style="margin-bottom: 9px;">
+ <div class="search_thing">
+ <div class="search_label">鐢ㄦ埛鍚嶏細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData2.entity.name" @keyup.enter.native="$refs.ValueTable2.selectList()"></el-input></div>
+ </div>
+ </div>
<div class="body" style="height: 60vh;" v-if="selectUserDia">
<ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2"/>
</div>
@@ -245,6 +252,7 @@
expandedKeys: [],
selectUserDia: false,
componentData2: {
+ name: null,
entity: {
orderBy: {
field: 'id',
@@ -271,6 +279,7 @@
selectField: {},
upUserDepardLimsIdPower: true
},
+ currentCompaniesList: []
}
},
mounted() {
@@ -304,11 +313,12 @@
}
this.selectTree = data2.replace(' - ', '')
this.addOb.fatherId = val.id;
- this.componentData.entity.departLimsId = val.id;
+ this.componentData.entity.departLimsId = val.id+',';
this.refreshTable()
},
getNodeParent(val) {
if (val.parent != null) {
+ this.currentCompaniesList[val.level-1] = val.data.id
this.selectTree += ' - ' + val.label
this.getNodeParent(val.parent)
}
@@ -423,10 +433,14 @@
selects.forEach(a=>{
ids.push(a.id)
})
+ let str = ''
+ this.currentCompaniesList.forEach(a=>{
+ str+=(a+',')
+ })
this.selectUserDia = false
this.$axios.post(this.$api.user.upUserDepardLimsId,{
ids: JSON.stringify(ids),
- id: this.componentData.entity.departLimsId
+ id: str
}).then(res=>{
if (res.code === 201) {
return
diff --git a/src/components/view/b2-standard-template.vue b/src/components/view/b2-standard-template.vue
index d42a770..dcc22f9 100644
--- a/src/components/view/b2-standard-template.vue
+++ b/src/components/view/b2-standard-template.vue
@@ -62,8 +62,8 @@
:upUrl="$api.StandardTemplate.upStandardTemplate" :delUrl="$api.StandardTemplate.delStandardTemplate"
:componentData="componentData" :key="upIndex" />
</div>
- <el-dialog title="妯℃澘缂栧埗" :visible.sync="isShow" width="80%" :before-close="isClose">
- <div style="width: 100%;height: 80vh;overflow: auto;" v-if="isShow">
+ <el-dialog title="妯℃澘缂栧埗" :visible.sync="isShow" width="85%" :before-close="isClose">
+ <div style="width: 100%;height: 82vh;overflow: auto;" v-if="isShow">
<Excel :data="row.thing" :execlTitle="row.name" v-loading="loading"></Excel>
</div>
</el-dialog>
@@ -162,12 +162,16 @@
this.componentData.do.splice(1, 1)
}
if (!up) {
+ this.componentData.do.splice(2, 1)
this.componentData.do.splice(0, 1)
}
this.addPower = add
},
templateWrite(row) {
this.$axios.get(this.$api.StandardTemplate.getEditTemplatePreparation + '?id=' + row.id).then(res => {
+ if(res.code != 200){
+ return
+ }
this.row = row
this.row.thing = res.data
this.isShow = true
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index dcbdf55..1dbd59a 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -577,32 +577,8 @@
},
methodList: [],
productTableLoading0: false,
- filters0: [{
- text: '娴嬭瘯',
- value: 0,
- },
- {
- text: '娴嬭瘯1',
- value: 1,
- },
- {
- text: '娴嬭瘯2',
- value: 2,
- }
- ],
- filters1: [{
- text: '娴嬭瘯',
- value: 0,
- },
- {
- text: '娴嬭瘯1',
- value: 1,
- },
- {
- text: '娴嬭瘯2',
- value: 2,
- }
- ],
+ filters0: [],
+ filters1: [],
pages: 1,
inspectionItem: null,
inspectionItemSubclass: null,
@@ -1347,7 +1323,7 @@
}
}
this.$axios.post(this.$api.standardTree.upStandardProducts, {
- ids: this.moreSelects.map(a => a.id),
+ ids: JSON.stringify(this.moreSelects.map(a => a.id)),
standardProductList: this.moreInfo
}, {
headers: {
diff --git a/src/components/view/custom_manage.vue b/src/components/view/custom_manage.vue
index 595ac5d..8dc0396 100644
--- a/src/components/view/custom_manage.vue
+++ b/src/components/view/custom_manage.vue
@@ -112,6 +112,13 @@
</el-row>
<el-row style="line-height: 50px;">
<el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
+ </span>鍗曚綅EN锛�</el-col>
+ <el-col :span="15">
+ <el-input v-model="user.companyEn" size="small" clearable></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
</span>宸ュ巶鍩燂細</el-col>
<el-col :span="15">
<el-input v-model="user.code" size="small" clearable></el-input>
@@ -125,6 +132,14 @@
:autosize="{minRows: 2, maxRows: 4}"></el-input>
</el-col>
</el-row>
+ <el-row style="margin-top: 15px;">
+ <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
+ </span>鍦板潃EN锛�</el-col>
+ <el-col :span="15">
+ <el-input type="textarea" v-model="user.addressEn" size="small" clearable
+ :autosize="{minRows: 2, maxRows: 4}"></el-input>
+ </el-col>
+ </el-row>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="addDia = false">鍙� 娑�</el-button>
@@ -132,6 +147,13 @@
</span>
</el-dialog>
<el-dialog title="閫夋嫨鐢ㄦ埛" :visible.sync="selectUserDia" width="70%">
+ <div class="search" style="height: 35px; margin-bottom: 9px;">
+ <div class="search_thing">
+ <div class="search_label">鐢ㄦ埛鍚嶏細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData2.entity.name" @keyup.enter.native="$refs.ValueTable2.selectList()"></el-input></div>
+ </div>
+ </div>
<div class="body" style="height: 60vh;" v-if="selectUserDia">
<ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2" />
</div>
@@ -282,6 +304,14 @@
this.$message.error('璇峰～鍐欏崟浣嶅湴鍧�')
return
}
+ if (this.user.companyEn == '' || this.user.companyEn == null) {
+ this.$message.error('璇峰～鍐欒嫳鏂囧鎴峰崟浣�')
+ return
+ }
+ if (this.user.addressEn == '' || this.user.addressEn == null) {
+ this.$message.error('璇峰～鍐欒嫳鏂囧崟浣嶅湴鍧�')
+ return
+ }
this.loading = true
this.$axios.post(this.$api.user.addCustom, this.user, {
headers: {
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index 8a8f1cb..16a3025 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -304,7 +304,7 @@
<img src="../../../static/img/index-0.svg" alt="">
</div>
<div class="mun">
- <p style="font-size: 20px;">0</p>
+ <p style="font-size: 20px;">{{getNumberFourTypes.totalNumberOfMessages}}</p>
<p style="font-size: 14px;margin-bottom: 10px;">鎴戠殑寰呭姙</p>
</div>
</div>
@@ -313,7 +313,7 @@
<img src="../../../static/img/index-1.svg" alt="">
</div>
<div class="mun">
- <p style="font-size: 20px;">0</p>
+ <p style="font-size: 20px;">{{ getNumberFourTypes.remainingToDo }}</p>
<p style="font-size: 14px;margin-bottom: 10px;">宸插姙浜嬪疁</p>
</div>
</div>
@@ -322,7 +322,7 @@
<img src="../../../static/img/index-2.svg" alt="">
</div>
<div class="mun">
- <p style="font-size: 20px;">0</p>
+ <p style="font-size: 20px;">{{ getNumberFourTypes.totalNumberOfReadMessages }}</p>
<p style="font-size: 14px;margin-bottom: 10px;">鍓╀綑寰呭姙</p>
</div>
</div>
@@ -331,7 +331,7 @@
<img src="../../../static/img/index-3.svg" alt="">
</div>
<div class="mun">
- <p style="font-size: 20px;">0</p>
+ <p style="font-size: 20px;">{{ getNumberFourTypes.totalNumberOfMessagesInThePastSevenDays }}</p>
<p style="font-size: 14px;margin-bottom: 10px;">杩戞湡浜嬪疁</p>
</div>
</div>
@@ -467,6 +467,7 @@
finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
timer:null,
keyMap:{},
+ getNumberFourTypes: {},
}
},
watch:{
@@ -502,8 +503,14 @@
this.getList();
this.getScheduleByMe()
},1000*60*10)
+ this.getNumberFourTypesFun()
},
methods: {
+ getNumberFourTypesFun() {
+ this.$axios.get(this.$api.informationNotification.getNumberFourTypesMessagesHomePage).then(res => {
+ this.getNumberFourTypes = res.data
+ })
+ },
getList(){
const key = `_${this.currentPage}`
const value = this.keyMap[key]
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 69e4eaa..5938846 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -289,7 +289,7 @@
font: '缂栬緫',
type: 'text',
method: 'doDiy',
- field: ['createUserName', 'updateUserName', 'roleName', '瑙掕壊=roleId', '瀵嗙爜=password',
+ field: ['roleName', '瑙掕壊=roleId', '瀵嗙爜=password',
'濮撳悕EN=nameEn','骞撮緞=age','閭=email','鍗曚綅=company','绛惧悕=pictureUrl','鏈汉鐓�=signatureUrl']
}],
tagField: {
@@ -490,8 +490,10 @@
this.addUserPower = addUserPower
},
handleAdd() {
+ console.log(`output->this.addOb.fatherId`,this.addOb.fatherId)
+ console.log(`output->this.addOb.name`,this.addOb.name)
if (this.addOb.fatherId||this.addOb.name=='鍏ㄩ儴') {
- this.addDia0 = true;
+ this.addDia = true;
} else {
this.$message.error('璇烽�夋嫨涓�涓灦鏋勫眰绾�')
}
@@ -522,7 +524,7 @@
}
this.selectTree = data2.replace(' - ', '')
this.addOb.fatherId = val.id;
- this.componentData.entity.departId = val.id;
+ this.componentData.entity.departId = val.id + ',';
this.refreshTable()
},
nodeOpen(data, node, el) {
@@ -587,18 +589,18 @@
return
}
this.$message.success('娣诲姞鎴愬姛')
- this.addDia0 = false
+ this.addDia = false
this.selectTreeList()
this.addLoad = false
this.addOb.name = ''
this.addOb.fatherId = ''
}).catch(e => {
- this.addDia0 = false
+ this.addDia = false
this.addLoad = false
})
},
nodeClick2(ob, node, el) {
- this.currentCompaniesList[node.level-1] = ob.id
+ this.getNodeParent(node)
if (ob.id !== 'SC21') {
this.personLoad = true
this.$axios.post(this.$api.companies.selectSimpleList, {
@@ -611,6 +613,12 @@
})
}
},
+ getNodeParent(val){
+ this.currentCompaniesList[val.level-1] = val.data.id
+ if(val.parent!=null){
+ this.getNodeParent(val.parent)
+ }
+ },
handleSelectionChange(val) {
this.multipleSelection = val;
},
@@ -621,24 +629,17 @@
if(this.currentCompaniesList.length === 0){
return this.$message.error('璇烽�夋嫨缁勭粐')
}
- for (let index = this.currentCompaniesList.length-1; index >1; index--) {
+ /* for (let index = this.currentCompaniesList.length-1; index >1; index--) {
let obj = this.multipleSelection.find(a=>a.companyId==this.currentCompaniesList[index])
if(!obj){
this.currentCompaniesList.splice(index,1)
- }else{
- return
}
- }
+ } */
let arr = []
this.currentCompaniesList.forEach(b=>{
- /* this.companiesList.forEach(a=>{
- if(a.companyId===b){
- console.log(a)
- }
- }) */
let obj = this.companiesList.find(a=>a.companyId==b)
arr.push(obj)
- })
+ })
this.addLoad = true
this.$axios.post(this.$api.companies.addPersonUser, {
company: arr,
@@ -659,7 +660,7 @@
this.addLoad = false
this.personList = []
this.userSearch2 = ''
- this.refresh()
+ this.selectTreeList()
}).catch(e => {
this.addthirdParty = false
this.addLoad = false
diff --git a/src/view/notice.vue b/src/view/notice.vue
index 99f4985..bc84174 100644
--- a/src/view/notice.vue
+++ b/src/view/notice.vue
@@ -4,7 +4,7 @@
title="娑堟伅閫氱煡"
:visible.sync="drawer"
:direction="direction"
- :before-close="handleClose" style="height: 100vh;z-index: 9999999;">
+ :before-close="handleClose" style="height: 100vh;z-index: 9999999;" size="450px">
<div class="head">
<div class="head-search">
<label>娑堟伅绫诲瀷锛�</label>
--
Gitblit v1.9.3