Merge remote-tracking branch 'origin/dev-sensitive-20191111' into dev-sensitive-20191111

src/views/sensitive-control/data-view-message.vue

@@ -75,6 +75,26 @@
       </span>
     </el-dialog>
 
+    <!-- 备注 弹窗 -->
+    <el-dialog
+      title="备注"
+      @close="handleRemarkClose"
+      :close-on-click-modal="false"
+      class="remark-modal"
+      :visible.sync="remarkDialogVisible"
+      width="300px"
+      center
+    >
+      <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="newRemark"></el-input>
+      <el-button type="primary" class="remark-confirm-btn" @click="confirmSendRemark">确 定</el-button>
+      <ul class="history-list">
+        <li v-for="item in remarkHistory">
+          <p class="date">{{ item.createdTime }}</p>
+          <p class="text">{{ item.remark }}</p>
+        </li>
+      </ul>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -95,7 +115,7 @@
     methods: {
       handleClick(row) {
         console.log(row);
-      }
+      },
     },
     created() {
       vm = this;
@@ -119,6 +139,10 @@
     },
     data() {
       return {
+        remarkDialogVisible: false, //备注弹窗
+        newRemark: "",
+        remarkHistory: [],  // 历史备注列表
+
         SMSTips: '获取短信验证码',
         countDownNum: 6,  // 倒计时
         timer: null,       // 倒计时定时器
@@ -139,6 +163,26 @@
       }
     },
     methods: {
+      handleRemarkClose() {
+        vm.newRemark = '';
+        vm.remarkHistory = [];
+      },
+      confirmSendRemark() {  // 添加备注信息
+        let data = {
+          dataUserContentId: vm.currentRow.dataUserContentId,
+          remark: vm.newRemark,
+        };
+
+        let callback = (res) => {
+          if(res.code == '000000'){
+            vm.remarkDialogVisible = false;
+          }else{
+            vm.$message.error(res.message);
+          }
+        }
+        vm.sendRequest( 'post', `/sensitive/dataRemark`, data, callback );
+      },
+
       // handleMaskTouch() {
       //   console.log('>>>> mask .....')
       //   let grayMask = document.getElementsByClassName('v-modal')[0];
@@ -272,7 +316,7 @@
             };
           }
         }
-        
+
         let callback = (res) => {
           if(res.code == '000000'){
             vm.centerDialogVisible = false;
@@ -294,7 +338,19 @@
         vm.getTableList(true);
       },
       showRemarkModal(row) {
-        alert('未完待续。。。')
+        // alert('未完待续。。。');
+        this.remarkDialogVisible = true;
+        vm.currentRow = row;
+
+        // 获取备注信息
+        let callback = (res) => {
+          if(res.code == "000000") {
+              vm.remarkHistory = res.data.remarks;
+          }else {
+              vm.$message.error(res.message);
+          }
+        };
+        vm.sendRequest( 'get', `/sensitive/dataRemark?dataUserContentId=${row.dataUserContentId}`, {}, callback );
       },
       sendRequest( type, url, params, callback ){
         openLoading(this);
@@ -398,6 +454,31 @@
     //     white-space: nowrap;
     //   }
     // }
+    ul, li {
+      list-style: none;
+    }
+    .remark-modal{
+      .el-dialog__body {
+        overflow: hidden;
+        padding: 0 10px 30px !important;
+        .remark-confirm-btn {
+          float: right;
+          margin-top: 10px;
+        }
+        .history-list {
+          margin-top: 60px;
+          li {
+            width: 100%;
+            margin-bottom: 5px;
+            .text {
+              word-break: break-all;
+              text-indent: 12px;
+              line-height: 22px;
+            }
+          }
+        }
+      }
+    }
   }
 
 </style>
\ No newline at end of file

src/views/sensitive-control/data-view.vue

@@ -44,7 +44,7 @@
         </el-select>
       </el-form-item>
       <el-form-item style="margin-left: 100px;">
-        <el-button type="primary" @click="showAddConditionModal" v-if="testDataList && testDataList.columnList && testDataList.columnList.length > 0">添加筛选条件</el-button>
+        <el-button type="primary" @click="showAddConditionModal">添加筛选条件</el-button>
         <el-button type="primary" @click="handleSend" v-if="showSendBtn">分发</el-button>
         <el-button type="primary" @click="submitForm('ruleForm')">查询</el-button>
       </el-form-item>
@@ -79,6 +79,7 @@
       title="添加筛选条件"
       class="condition-dialog-wrap"
       :visible.sync="addConditioDialogVisible"
+      :show-close="false"
       width="500px"
       center
     >
@@ -93,7 +94,7 @@
         </template>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="addConditioDialogVisible = false">取 消</el-button>
+        <el-button @click="handleClearCondition">清 空</el-button>
         <el-button type="primary" @click="addConditioDialogVisible = false">确 定</el-button>
       </span>
     </el-dialog>
@@ -211,6 +212,10 @@ export default {
       })
     },
 
+    handleClearCondition() {
+      vm.conditionForm = {};
+      vm.addConditioDialogVisible = false;
+    },
     handleDingNumChange(val) {
       if (val && val.length == 21) {
         this.getApplyDateList();
@@ -470,6 +475,7 @@ export default {
           .text {
             margin: 5px 10px;
             line-height: 22px;
+            word-break: break-all;
           }
         }
       }