sunlupeng 1 year ago
parent
commit
5815671e10
2 changed files with 7 additions and 283 deletions
  1. 1 1
      config/index.js
  2. 6 282
      src/views/commendManage/commendList.vue

+ 1 - 1
config/index.js

@@ -14,7 +14,7 @@ module.exports = {
 
     // Various Dev Server settings
     // host: 'localhost', // can be overwritten by process.env.HOST
-    host: '192.168.100.137', // can be overwritten by process.env.HOST
+    host: '192.168.100.185', // can be overwritten by process.env.HOST
     port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

+ 6 - 282
src/views/commendManage/commendList.vue

@@ -56,8 +56,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="表彰人" prop="recipientsArry">
-          <el-select v-model="dataForm.recipientsArry" multiple filterable placeholder="请选择" style="width: 350px">
+        <el-form-item label="表彰人" prop="recipientsList">
+          <el-select v-model="dataForm.recipientsList" multiple filterable placeholder="请选择" style="width: 350px">
             <el-option :key="item.loginId" v-for="item in recipientsList" :label="item.userName" :value="item.loginId">
             </el-option>
           </el-select>
@@ -123,9 +123,9 @@ export default {
   directives: { waves },
   data() {
     return {
+      recipientsList:[],
       typeVisible: false,
       fileImgUrl: this.upLoadUrl,
-      recipientsList: [],
       typeList: [],
       subTypeList: [
         {
@@ -138,277 +138,6 @@ export default {
         },
       ],
       list: [
-        {
-          "commendId": 1,
-          "type": 31,
-          "typeName": "部门表彰",
-          "subType": 0,
-          "subTypeName": "奖状",
-          "title": "2023第一季度部门表彰",
-          "content": "大家好",
-          "sender": null,
-          "recipients": "13525451463,13525451463",
-          "userInfos": [
-            {
-              "id": 5177,
-              "loginId": "13949266004",
-              "loginPwd": "436CE2EAE38374E08B7025090FB69D2A",
-              "userName": "王东坡",
-              "userEmail": null,
-              "userPhone": "13949266004",
-              "company": "K13101",
-              "department": "bf681d36dc44407fbf1269a7937707e4",
-              "deptName": "洛阳交付中心_本部_开发",
-              "costCenter": "K13101",
-              "post": "TA1",
-              "postName": null,
-              "workplace": "洛阳",
-              "employeNo": "1021",
-              "createDate": "2021-09-08 15:36:50",
-              "updateDate": "2022-08-02 14:28:30",
-              "dhrmCompany": null,
-              "dhrmCompanyName": null,
-              "companyId": "69964c94aef84d3ea9d496a01188cbd8",
-              "superAdmin": false,
-              "sex": "null",
-              "headImage": null,
-              "youtuImage": null,
-              "remainLeave": null,
-              "openId": null,
-              "isDelete": 0,
-              "vacation": null,
-              "userNamePY": null,
-              "updateUser": null,
-              "updateUserIp": null,
-              "isManager": null,
-              "isRecruit": "0",
-              "balance": 0,
-              "workAddr": null,
-              "workSchedul": null,
-              "idCard": null,
-              "dgtJoinTime": null,
-              "emailPassword": null,
-              "isPopup": null,
-              "roleId": null,
-              "oldRoleId": null,
-              "roleName": null,
-              "redPacketCount": null,
-              "receivingAddress": null,
-              "isLeader": 0,
-              "checked": false,
-              "isSetPwd": null,
-              "oldPwd": null,
-              "isRefundItem": null,
-              "delFlag": null,
-              "isHr": null,
-              "admin": true
-            },
-            {
-              "id": 2106,
-              "loginId": "13683797487",
-              "loginPwd": "B815292F8B6AE8BFDB624D95750E5B19",
-              "userName": "刘伟",
-              "userEmail": "liuwei@dftis.com",
-              "userPhone": "13683797487",
-              "company": "K19102",
-              "department": "80e99ccb24a1425d8b4d3e776550cdc7",
-              "deptName": "软件工程院_本部_管理",
-              "costCenter": "K19102",
-              "post": "TA5",
-              "postName": null,
-              "workplace": "洛阳",
-              "employeNo": "DL091904001",
-              "createDate": "2019-04-09 10:04:18",
-              "updateDate": "2023-04-28 09:34:49",
-              "dhrmCompany": "09",
-              "dhrmCompanyName": null,
-              "companyId": "69964c94aef84d3ea9d496a01188cbd8",
-              "superAdmin": false,
-              "sex": "0",
-              "headImage": "/fileServer/head_image/202108121440531628750453066.png",
-              "youtuImage": null,
-              "remainLeave": null,
-              "openId": null,
-              "isDelete": 0,
-              "vacation": null,
-              "userNamePY": null,
-              "updateUser": null,
-              "updateUserIp": null,
-              "isManager": null,
-              "isRecruit": "0",
-              "balance": 0,
-              "workAddr": null,
-              "workSchedul": null,
-              "idCard": null,
-              "dgtJoinTime": null,
-              "emailPassword": null,
-              "isPopup": null,
-              "roleId": null,
-              "oldRoleId": null,
-              "roleName": null,
-              "redPacketCount": null,
-              "receivingAddress": null,
-              "isLeader": 0,
-              "checked": false,
-              "isSetPwd": null,
-              "oldPwd": null,
-              "isRefundItem": null,
-              "delFlag": null,
-              "isHr": null,
-              "admin": true
-            }
-          ],
-          "createTime": "2023-05-10",
-          "modifyTime": "2023-05-10",
-          "status": 0,
-          "statusName": "关闭",
-          "fileIds": "",
-          "files": null
-        },
-        {
-          "commendId": 2,
-          "type": 33,
-          "typeName": "客户表彰",
-          "subType": 0,
-          "subTypeName": "奖状",
-          "title": "**公司赠与",
-          "content": "大家好",
-          "sender": null,
-          "recipients": "13525451463,13525451463",
-          "userInfos": [
-            {
-              "id": 5177,
-              "loginId": "13949266004",
-              "loginPwd": "436CE2EAE38374E08B7025090FB69D2A",
-              "userName": "王东坡",
-              "userEmail": null,
-              "userPhone": "13949266004",
-              "company": "K13101",
-              "department": "bf681d36dc44407fbf1269a7937707e4",
-              "deptName": "洛阳交付中心_本部_开发",
-              "costCenter": "K13101",
-              "post": "TA1",
-              "postName": null,
-              "workplace": "洛阳",
-              "employeNo": "1021",
-              "createDate": "2021-09-08 15:36:50",
-              "updateDate": "2022-08-02 14:28:30",
-              "dhrmCompany": null,
-              "dhrmCompanyName": null,
-              "companyId": "69964c94aef84d3ea9d496a01188cbd8",
-              "superAdmin": false,
-              "sex": "null",
-              "headImage": null,
-              "youtuImage": null,
-              "remainLeave": null,
-              "openId": null,
-              "isDelete": 0,
-              "vacation": null,
-              "userNamePY": null,
-              "updateUser": null,
-              "updateUserIp": null,
-              "isManager": null,
-              "isRecruit": "0",
-              "balance": 0,
-              "workAddr": null,
-              "workSchedul": null,
-              "idCard": null,
-              "dgtJoinTime": null,
-              "emailPassword": null,
-              "isPopup": null,
-              "roleId": null,
-              "oldRoleId": null,
-              "roleName": null,
-              "redPacketCount": null,
-              "receivingAddress": null,
-              "isLeader": 0,
-              "checked": false,
-              "isSetPwd": null,
-              "oldPwd": null,
-              "isRefundItem": null,
-              "delFlag": null,
-              "isHr": null,
-              "admin": true
-            },
-            {
-              "id": 2106,
-              "loginId": "13683797487",
-              "loginPwd": "B815292F8B6AE8BFDB624D95750E5B19",
-              "userName": "刘伟",
-              "userEmail": "liuwei@dftis.com",
-              "userPhone": "13683797487",
-              "company": "K19102",
-              "department": "80e99ccb24a1425d8b4d3e776550cdc7",
-              "deptName": "软件工程院_本部_管理",
-              "costCenter": "K19102",
-              "post": "TA5",
-              "postName": null,
-              "workplace": "洛阳",
-              "employeNo": "DL091904001",
-              "createDate": "2019-04-09 10:04:18",
-              "updateDate": "2023-04-28 09:34:49",
-              "dhrmCompany": "09",
-              "dhrmCompanyName": null,
-              "companyId": "69964c94aef84d3ea9d496a01188cbd8",
-              "superAdmin": false,
-              "sex": "0",
-              "headImage": "/fileServer/head_image/202108121440531628750453066.png",
-              "youtuImage": null,
-              "remainLeave": null,
-              "openId": null,
-              "isDelete": 0,
-              "vacation": null,
-              "userNamePY": null,
-              "updateUser": null,
-              "updateUserIp": null,
-              "isManager": null,
-              "isRecruit": "0",
-              "balance": 0,
-              "workAddr": null,
-              "workSchedul": null,
-              "idCard": null,
-              "dgtJoinTime": null,
-              "emailPassword": null,
-              "isPopup": null,
-              "roleId": null,
-              "oldRoleId": null,
-              "roleName": null,
-              "redPacketCount": null,
-              "receivingAddress": null,
-              "isLeader": 0,
-              "checked": false,
-              "isSetPwd": null,
-              "oldPwd": null,
-              "isRefundItem": null,
-              "delFlag": null,
-              "isHr": null,
-              "admin": true
-            }
-          ],
-          "createTime": "2023-05-10",
-          "modifyTime": "2023-05-10",
-          "status": 0,
-          "statusName": "关闭",
-          "fileIds": "",
-          "files": [
-            {
-              "id": 2205,
-              "key": "bgwarfgbmgx2pt537msb",
-              "oldName": "DGT电子报刊第六期(2019年第二季度).pdf",
-              "newName": "bgwarfgbmgx2pt537msb.pdf",
-              "type": "application/pdf",
-              "size": 3000091,
-              "filePath": "/application/2022/01/20/bgwarfgbmgx2pt537msb.pdf",
-              "url": "http://xiaoyou.dgtis.com/images/application/2022/01/20/bgwarfgbmgx2pt537msb.pdf",
-              "modifyTime": "2022-01-19T19:47:37",
-              "createUserId": null,
-              "createTime": "2022-01-19T19:47:37",
-              "modifyUserId": null,
-              "deleted": false,
-              "imgBelongs": null
-            }
-          ]
-        }
       ],
       delarr: [],
       multipleSelection: [],
@@ -427,8 +156,7 @@ export default {
         fileIds: undefined,
         fileName: undefined,
         files: [],
-        recipientsArry:[],
-        recipients: undefined,
+        recipientsList:[],
       },
       dialogFormVisible: false,
       dialogStatus: "",
@@ -438,7 +166,7 @@ export default {
       },
       rules: {
         title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
-        recipientsArry: [
+        recipientsList: [
           { required: true, message: "表彰人不能为空", trigger: "blur" },
         ],
         type: [{ required: true, message: "请选择类型", trigger: "blur" }],
@@ -532,8 +260,7 @@ export default {
         fileIds: undefined,
         fileName: undefined,
         files: [],
-        recipientsArry:[],
-        recipients: undefined,
+        recipientsList:[],
       };
     },
     getAllUserList() {
@@ -554,7 +281,6 @@ export default {
     createData() {
       this.$refs["dataForm"].validate((valid) => {
         if (valid) {
-          this.dataForm.recipients = this.dataForm.recipientsArry.join(",");
           createItem(this.dataForm)
             .then(() => {
               this.getList();
@@ -604,7 +330,6 @@ export default {
 
     handleUpdate(row) {
       this.dataForm = Object.assign({}, row);
-      this.dataForm.recipientsArry = this.dataForm.recipients.split(",");
       this.dialogStatus = "update";
       this.dialogFormVisible = true;
       this.$nextTick(() => {
@@ -615,7 +340,6 @@ export default {
     updateData() {
       this.$refs["dataForm"].validate((valid) => {
         if (valid) {
-          this.dataForm.recipients = this.dataForm.recipientsArry.join(",");
           updateItem(this.dataForm).then(() => {
             this.dialogFormVisible = false;
             this.$notify({