Przeglądaj źródła

fix(设备标签):不知为何,在档案卡中没排列出启用日期信息,而标签却具备此信息,故标签取值改用设备的开始使用时间

ZZJ 1 rok temu
rodzic
commit
17779b9681

+ 7 - 9
src/views/platform/message/inner/detail/dialog.vue

@@ -129,8 +129,6 @@ export default {
         },
         // 消息确认,受控文件用
         confirmMsg () {
-            console.log('1111111111')
-            // TODO
             this.$confirm('点击确认将在系统信息管理模块查看到所通知文件的具体信息', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
@@ -138,26 +136,26 @@ export default {
                 showClose: false,
                 closeOnClickModal: false
             }).then(() => {
-                // TODO 受控文件逻辑处理
-                const perInfosId = this.$store.getters.userInfo.user.id
+                const personId = this.$store.getters.userInfo.user.id
                 const perInfosOrg = this.$store.getters.userInfo.org
                 if (!perInfosOrg) {
                     alert('系统所登录的账户并没有所属部门,请先在系统设置完再进行确认!')
                     return
                 }
                 // 判断签字图文是否存在
-                const sql1 = "select qian_zi_tu_wen_ FROM t_ryjbqk WHERE parent_id_ = '" + perInfosId + "'"
+                const sql1 = `select qian_zi_tu_wen_ FROM t_ryjbqk WHERE parent_id_ = '${personId}'`
                 // 判断是否已经点击过确认
-                const sql2 = `select id_ FROM ibps_msg_read WHERE msg_id_ = '${this.id}' and receiver_id_='${perInfosId}'`
-                console.log('perInfosId', perInfosId)
+                const sql2 = `select id_ FROM ibps_msg_read WHERE msg_id_ = '${this.id}' and receiver_id_='${personId}'`
+                console.log('employeeId:', personId)
+                console.log(this.tableName)
                 Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then((res) => {
                     const ryjbqkDatas = res[0].variables.data
-                    const cont2 = res[1].variables.data
+                    const confirmRecord = res[1].variables.data
                     if (!ryjbqkDatas.length) {
                         alert('系统所登录的账户并没有签字图文在系统,请先上传系统再进行确认!')
                         return
                     }
-                    if (!cont2.length) {
+                    if (!confirmRecord.length) {
                         const tempObj = {
                             id_: generateUUID(),
                             parent_id_: this.tableId,

+ 2 - 1
src/views/system/jbdScan/goods/deviceTag.vue

@@ -174,7 +174,8 @@ export default {
               local:item.cun_fang_di_dian_,
               condition: item.shi_yong_ke_shi_,
               money:item.zi_chan_yuan_zhi_,
-              time:item.qi_yong_ri_qi_!=null?this.getTime(item.qi_yong_ri_qi_):'',
+              // time:item.qi_yong_ri_qi_!=null?this.getTime(item.qi_yong_ri_qi_):'',
+              time:item.kai_shi_shi_yong_!=null?this.getTime(item.kai_shi_shi_yong_):'', // 档案卡没放启用日期,改为开始时间
               status:item.she_bei_zhuang_ta,
               specifications:item.gui_ge_xing_hao_,
               custodian: this.findPersonName(item.guan_li_ren_,personData)