From 19f8e45ad02f51dd058455e3013b53d6885db5e7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 25 Nov 2021 19:56:15 +0800
Subject: [PATCH] 部分文件修改
---
pages/report/initiate.vue | 51 ++++++++++++++++++++-----
pages/securityStaff/information.vue | 10 ++--
pages/dispatch/imgissue.vue | 54 +++++++++++++++++++++++----
store/index.js | 4 +-
4 files changed, 94 insertions(+), 25 deletions(-)
diff --git a/pages/dispatch/imgissue.vue b/pages/dispatch/imgissue.vue
index e6c296f..8c4db3a 100644
--- a/pages/dispatch/imgissue.vue
+++ b/pages/dispatch/imgissue.vue
@@ -11,7 +11,10 @@
<u-form-item label-width='158' prop="recipientText" label="指令接收人" :required="true">
- <u-button slot="right" type="success" size="mini" @click="recipientClick">选择接收人</u-button>
+ <u-input type='textarea' v-model="form.recipientPeople" placeholder="请选择指令接收人"
+ @click="recipientClick" autoHeight />
+
+ <!-- <u-button slot="right" type="success" size="mini" @click="recipientClick">选择接收人</u-button> -->
<u-popup :closeable="true" v-model="recipientShow" mode="bottom" height="50%" border-radius="14">
@@ -77,11 +80,11 @@
return {
recipientShow: false,
recipientList: [],
-
form: {
content: '',
recipient: '',
- recipientData: []
+ recipientData: [],
+ recipientPeople: ''
},
rules: {
@@ -106,6 +109,11 @@
},
methods: {
recipientClick() {
+ if (this.recipientList.length > 0) {
+ this.recipientShow = true;
+ return;
+ }
+
uni.request({
url: this.$store.state.piAPI + "/blade-user/seleL",
method: "get",
@@ -118,12 +126,21 @@
this.recipientList = []
res.data.data.forEach(item => {
+ var flag = true
- if (item.id != this.$store.state
- .UserData.user_id
- ) {
- item.checked = false;
- this.recipientList.push(item)
+ if (this.recipientList.length > 0) {
+ this.recipientList.forEach(it => {
+ if (item.id == it.id) flag = false
+ })
+ }
+
+ if (flag == true) {
+ if (item.id != this.$store.state
+ .UserData.user_id
+ ) {
+ item.checked = false;
+ this.recipientList.push(item)
+ }
}
})
@@ -246,9 +263,30 @@
});
},
checkboxGroupChange(e) {
+ var that = this
this.form.recipientData = e
+ var str = ""
+ var num = 0
+
+ that.form.recipientData.forEach((item, index) => {
+ that.recipientList.forEach((it, index) => {
+ if (item == it.id) {
+ if (num > 0) {
+ str += '、';
+ str += it.real_name;
+ } else {
+ str += it.real_name
+ }
+ num += 1
+ return
+ }
+ })
+ })
+
+ this.form.recipientPeople = str
+
},
}
diff --git a/pages/report/initiate.vue b/pages/report/initiate.vue
index e83ba19..0677f20 100644
--- a/pages/report/initiate.vue
+++ b/pages/report/initiate.vue
@@ -25,7 +25,8 @@
<u-form-item label-width='132' label="接收人">
- <u-button slot="right" type="success" size="mini" @click="recipientClick">选择接收人</u-button>
+ <u-input type='textarea' v-model="form.recipientPeople" placeholder="请选择接收人"
+ @click="recipientClick" autoHeight />
<u-popup :closeable="true" v-model="recipientShow" mode="bottom" height="50%" border-radius="14">
@@ -105,7 +106,8 @@
categoryText: '',
type: '',
typeText: '',
- recipientData: []
+ recipientData: [],
+ recipientPeople: ''
},
rules: {
categoryText: [{
@@ -230,14 +232,22 @@
this.recipientList = []
res.data.data.forEach(item => {
-
- if (item.id != this.$store.state
- .UserData.user_id
- ) {
-
- item.checked = false;
- this.recipientList.push(item)
-
+
+ var flag = true
+
+ if (this.recipientList.length > 0) {
+ this.recipientList.forEach(it => {
+ if (item.id == it.id) flag = false
+ })
+ }
+
+ if (flag == true) {
+ if (item.id != this.$store.state
+ .UserData.user_id
+ ) {
+ item.checked = false;
+ this.recipientList.push(item)
+ }
}
})
@@ -317,8 +327,29 @@
});
},
checkboxGroupChange(e) {
+ var that = this
this.form.recipientData = e
+
+ var str = ""
+ var num = 0
+
+ that.form.recipientData.forEach((item, index) => {
+ that.recipientList.forEach((it, index) => {
+ if (item == it.id) {
+ if (num > 0) {
+ str += '、';
+ str += it.real_name;
+ } else {
+ str += it.real_name
+ }
+ num += 1
+ return
+ }
+ })
+ })
+
+ this.form.recipientPeople = str
},
diff --git a/pages/securityStaff/information.vue b/pages/securityStaff/information.vue
index 1d41cd2..5b053c0 100644
--- a/pages/securityStaff/information.vue
+++ b/pages/securityStaff/information.vue
@@ -27,13 +27,13 @@
<i>学历</i> <span> {{ datalist.education }} </span>
</view>
<view class="once">
- <i>出生日期</i> <span> {{ datalist.birthtime }} </span>
+ <i>出生日期</i> <span> {{ datalist.birthday }} </span>
</view>
<view class="once">
<i>政治面貌</i> <span> {{ datalist.politicaloutlook }} </span>
</view>
<view class="once">
- <i>联系电话</i> <span> {{ datalist.cell }} </span>
+ <i>联系电话</i> <span> {{ datalist.phone }} </span>
</view>
<view class="once">
<i>所属公司</i> <span> {{ datalist.deptName }} </span>
@@ -61,13 +61,13 @@
性别：<view class="o-once"> {{datalist.sex == 1 ? '男' : '女'}}</view>
</view>
<view class="once">
- 编号：<view class="o-once"> {{datalist.baoanzheng}}</view>
+ 编号：<view class="o-once"> {{datalist.securitynumber}}</view>
</view>
<view class="once">
- 发证机关：<view class="o-once"> {{datalist.fzobj}}</view>
+ 发证机关：<view class="o-once"> 南昌市公安局 </view>
</view>
<view class="once">
- 发证日期：<view class="o-once"> {{datalist.fztime}}</view>
+ 发证日期：<view class="o-once"> {{datalist.updateTime}}</view>
</view>
<u-image class="img" width="150rpx" height="150rpx" :src="datalist.avatar">
diff --git a/store/index.js b/store/index.js
index f9bb215..a07ac56 100644
--- a/store/index.js
+++ b/store/index.js
@@ -33,8 +33,8 @@
useName: '过客 ',
},
logPath: '',
- // piAPI: 'http://223.82.109.183:2080/api',
- piAPI: 'http://192.168.0.114:81',
+ piAPI: 'http://223.82.109.183:2080/api',
+ // piAPI: 'http://192.168.0.114:81',
api: 'http://223.82.109.183:2080/api',
// piAPI: 'http://localhost:83/',
// piAPI: 'http://192.168.0.115:83',
--
Gitblit v1.9.3