整理等

src/views/message/msg-history.vue

-<template>
-  <div class="msg-history-wrap">
-    <bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
-    <div class="component-content screenSet" id="screenSet">
-      <el-form ref="searchReq" :rules="rules" :model="searchReq" label-width="100px" style="margin-bottom: 20px;">
-        <el-row>
-          <el-col style="width:270px;">
-            <el-form-item label="手机号" prop="mobile">
-              <el-input v-model.number="searchReq.mobile" placeholder="请输入手机号" maxlength="11"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col style="width:290px;">
-            <el-form-item label="内容关键字" prop="content">
-              <el-input v-model="searchReq.content" placeholder="请输入内容关键字" ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 200px; margin-left: 60px;">
-            <el-button type="primary" @click="handleSearchClick('searchReq')">搜索</el-button>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <div style="padding: 0 40px;">
-        <el-table
-          :data="tableData"
-          border
-          style="width: 100%;">
-          <el-table-column
-            align="center"
-            prop="mobile"
-            label="手机号"
-            >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="content"
-            label="内容"
-            >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="发送时间"
-            >
-            <template slot-scope="scope">
-              {{ returnSendTime(scope.row.creatTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="统计"
-           >
-           <template slot-scope="scope">
-              <p :class="returnStatusStyle(scope.row.code)">{{ returnStatusText(scope.row.code) }}</p>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="pagination">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="searchReq.pageNo"
-            :page-sizes="[10, 30, 50, 100]"
-            :page-size="searchReq.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="totalRows">
-          </el-pagination>
-        </div>
-      </div>
-
-    </div>
-  </div>
-</template>
-<script>
-  import { openLoading, closeLoading } from "../../utils/utils";
-  import BreadCrumb from "../../components/breadcrumb.vue";
-  export default {
-    components: {
-      BreadCrumb,
-    },
-    data() {
-      var checkMobiles = (rule, value, callback) => {
-        // debugger;
-        if (value) {
-          if (!Number.isInteger(value)) {  
-            this.searchReq.mobile = '';
-            callback(new Error('手机号必须是以1开头的11位纯数字'));
-          } else{
-            value += '';
-            let arr = value.split('');
-            if(value.length >= 1){ 
-              if( arr[0] != '1' ){
-                callback(new Error('手机号必须是以1开头的11位纯数字'));
-              }else{
-                if( value.length != 11 ){
-                  callback(new Error('手机号必须是以1开头的11位纯数字'));
-                }else{
-                  callback();
-                }
-              } 
-            }else{
-              callback();
-            }
-          }
-        }else{
-          if(typeof value != 'undefined' && value === 0){
-            callback(new Error('手机号必须是以1开头的11位纯数字'));
-          };
-          callback();
-        }
-      };
-      return {
-        curmbFirst: "短信历史",
-        searchReq: {
-          mobile: '',
-          content: '',
-          pageNo: 1,
-          pageSize: 10,
-        },
-        totalRows: 0,
-        tableData: [],
-        rules: {
-          mobile: [
-            { validator: checkMobiles }
-          ],
-        },
-      }
-    },
-    created() {
-      this.getSMSList();
-    },
-    methods: {
-      getSMSList() {
-        let req = this.searchReq;
-        openLoading(this);
-        this.GET("raytheon/sms/list", req).then(res => {
-          closeLoading(this);
-          if(res && res.code && res.code == '000000'){
-            // console.log('get SMS列表>>>>> ', res);  
-            if( res && res.data ){
-              this.totalRows = res.data.total || 0;
-              this.tableData = res.data.list || [];
-            }
-          }else{
-            this.$message({
-              message: '接口请求失败',
-              type: 'warning'
-            });
-          }
-        });
-      },
-      handleSearchClick(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            this.searchReq.pageNo = 1;
-            this.getSMSList();
-          } else {
-            console.log('error submit!!');
-            return false;
-          }
-        });
-
-        
-      },
-      handleSizeChange(val){
-        this.searchReq.pageSize = val;
-        this.getSMSList();
-      },
-      handleCurrentChange(val) {
-        this.searchReq.pageNo = val;
-        this.getSMSList();
-      },
-      returnSendTime(creatTime){
-        if( creatTime ){
-          return creatTime.year + '-' + creatTime.monthValue + '-' + creatTime.dayOfMonth + ' ' + creatTime.hour + ':' + creatTime.minute ;
-        }else{
-          return '-';
-        }
-      },
-      returnStatusText(code){
-        if(typeof code != 'undefined'){
-          if(code == 0 || code == 3){
-            return '成功'; 
-          }else if(code == 1){
-            return '处理中'; 
-          }else if(code == 2 || code == 4){
-            return '失败';
-          }else{
-            return '失败';
-          }
-        }else{
-          return '-';
-        }
-      },
-      returnStatusStyle(code){
-        let basic = 'status-tj ';
-        if(typeof code != 'undefined'){
-          if(code == 0 || code == 3){
-            basic += 'success'; 
-          }else if(code == 1){
-            basic += 'pending'; 
-          }else if(code == 2 || code == 4){
-            basic += 'fail';
-          }else{
-            basic += 'fail';
-          }
-        }else{
-          basic += '';
-        }
-        return basic;
-      }
-    },
-  }
-</script>  
-<style lang="scss">
-  .msg-history-wrap{
-    .el-form-item .el-form-item__label{
-      font-size: 14px;
-    }
-    .component-content{
-      margin-top: 60px;
-      padding: 10px;
-      background: #fff;
-    }
-    .pagination{
-      margin: 20px 0;
-      text-align: right;
-    }
-    .status-tj{
-      &.success{
-        color: #409EFF;
-      }
-    }
-  }
-</style>

src/views/protocol/protocol-detail copy 2.vue

-<template>
-  <div class="create-protocol">
-    <bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
-    <div class="component-content screenSet" id="screenSet">
-      <!-- <div class="header-title"></div> -->
-      <el-form
-        :model="ruleForm"
-        ref="ruleForm"
-        label-width="100px"
-        class="ruleForm"
-      >
-        <el-form-item>
-          <el-button size="small" class="user-choose-submit right" style="margin-left:20px;" type="default" @click="goBack()">返回</el-button>
-        </el-form-item>          
-        <el-form-item label="协议标题" >
-          {{ruleForm.protocolName}}
-        </el-form-item>        
-        <el-form-item label="协议内容">
-          <div v-html="ruleForm.content"></div>
-          <!-- <textarea v-model="ruleForm.content" id="detailEditor">
-              
-          </textarea> -->
-        </el-form-item>
-        <el-form-item label="签署居民数量">
-          {{ruleForm.signNum}}
-        </el-form-item>        
-        <el-form-item label="创建人">
-          {{ruleForm.createdName}}
-        </el-form-item>        
-        <el-form-item label="创建时间">
-          {{ruleForm.createTime}}
-        </el-form-item>        
-      </el-form>
-    </div>
-  </div>
-</template>
-<script>
-import BreadCrumb from "../../components/breadcrumb.vue";
-import { openLoading, closeLoading } from "../../utils/utils";
-let detailEditor = null;
-let vm = null;
-export default {
-  components: {
-    BreadCrumb
-  },
-  data() {
-    return {
-      curmbFirst: '查看协议',
-      ruleForm: {
-        protocolName: '',
-        content: '',
-        signNum: '',
-        createdName: '',
-        createTime: '',
-      },
-      isUpdate: false,
-      protocolId: 0
-    };
-  },
-  computed: {
-    // ...mapGetters(['_token'])
-  },
-  created() {
-    vm = this;
-    this.isUpdate = this.$route.query && this.$route.query.isUpdate || this.isUpdate;
-    this.protocolId = this.$route.query && this.$route.query.protocolId || 0;
-    // vm.idType = localStorage.getItem("storageIdType");
-    // console.log("idType:", vm.idType);
-  },
-  // 挂载到Dom完成时
-  mounted: function() {
-    vm.getProtocolDetailById(vm.protocolId);
-    // commonUtil.resizeHeight();
-    // CKEDITOR.replace( 'detailEditor' );
-    // if(this.isUpdate) { // 只在修改时监听富文本的Ready事件
-    //   CKEDITOR.on('instanceReady', function (event) {
-    //       detailEditor = event.editor;
-    //       detailEditor.execCommand("toolbarCollapse");
-    //       detailEditor.setReadOnly(true); //只读
-    //       // 获取数据
-    //       vm.getProtocolDetailById(vm.protocolId);
-    //   });
-    // }
-  },
-  methods: {
-    // 根据协议ID获取协议详情
-    getProtocolDetailById(protocolId) {
-      vm.GET("/smartcontract/protocolManage/protocol", {protocolId: protocolId}).then(res => {
-        if(res && res.code && res.code == '000000'){
-          if( res && res.data ){
-            vm.ruleForm.protocolName = res.data.protocolName;
-            vm.ruleForm.content = res.data.contents;
-            vm.ruleForm.signNum = res.data.signNum;
-            vm.ruleForm.createdName = res.data.createdName;
-            vm.ruleForm.createTime = res.data.createTime;
-            detailEditor.setData(res.data.contents);
-          }
-        }else{
-          vm.$message({
-            message: '接口请求失败',
-            type: 'warning'
-          });
-        }
-      });      
-    },
-    goBack() {
-      this.$router.push({
-        path: '/protocol-list'
-      })
-    }
-  },
-};
-</script>
-<style lang="scss">
-.topIndex{
-    z-index: 10000 !important;
-  }
-.create-protocol {
-  .component-content {
-    margin-top: 80px;
-    padding: 10px;
-    background: #fff;
-    .header-title {
-      padding: 10px 12px;
-      font-size: 12px;
-      color: #449284;
-      border-bottom: 1px solid #efefef;
-    }
-    .ruleForm {
-        width: 70%;
-        margin-left: 50px;
-    }
-    .rule-form {
-      margin-top: 20px;
-      margin-left: 30px;
-      .el-form-item__content {
-        font-size: 12px;
-      }
-    }
-    .update-input {
-      width: 200px;
-    }
-    .update-item {
-      /* float: left; */
-      margin-right: 5px;
-    }
-    .el-upload__tip {
-      // margin-top: -10px;
-      // margin-left: 205px;
-      margin-top: -40px;
-      margin-left: 290px;
-      cursor: pointer;
-      width: 60px;
-      color: #449284;
-    }
-    .tip-text {
-      margin-top: -40px;
-      margin-left: 380px;
-      width: 260px;
-      color: red;
-    }
-    .el-upload-list {
-      display: none;
-    }
-    .table-empty {
-      img {
-        width: 100px;
-      }
-      p {
-        margin-top: -50px;
-      }
-    }
-    .user-select{
-      display: inline-block;
-      height: auto;
-      padding: 5px 10px;
-      border: 1px solid #ccc;
-      border-radius: 4px;
-      .select-btn{
-        display: inline-block;
-        font-size: 14px;
-        padding: 5px;
-        border-radius: 4px;
-        background: #449284 !important;
-        border: 1px solid #449284 !important;
-        color: #FFF;
-        cursor: pointer;
-      }
-      .numbers{
-        font-size: 14px;
-        margin-left: 10px;
-        display: inline-block;
-        .choosed{
-          color: #449284;
-        }
-      }
-    }
-    .user-choose-modal{
-      .el-form-item__label{
-        width: 120px;
-        font-size: 14px;
-      }
-      .select-choose{
-        width: 150px;
-      }
-      .block-item{
-        display: block;
-      }
-      .user-number{
-        margin: 40px auto 0;
-        text-align: center;
-        width: 70%;
-        height:34px;
-        line-height: 34px;
-        border-radius: 4px;
-        border: 1px solid #DCDFE6;
-        .title{
-          display: inline-block;
-        }
-        .number{
-          display: inline-block;
-          margin-left: 50px;
-          .target-num{
-            padding: 7px;
-          }
-          .choosed{
-            color: #449284;
-          }
-        }
-      }
-      .click-refresh-tips{
-        text-align: center;
-        margin: 5px auto 20px;
-        height: 20px;
-        color: #e6a23c;
-      }
-      .user-choose-submit{
-        margin: 0 auto;
-        display: block;
-      }
-    }
-
-  }
-}
-.valid-content {
-  color:#F56C6C;
-  font-size: 12px;
-  line-height: 26px;
-}
-</style>
\ No newline at end of file

src/views/protocol/protocol-detail.vue

@@ -17,9 +17,12 @@
           <!-- <el-input v-model="ruleForm.protocolName" maxlength="30" show-word-limit></el-input> -->
         </el-form-item>        
         <el-form-item label="协议内容">
-          <textarea v-model="ruleForm.content" id="detailEditor">
+          <!-- <textarea v-model="ruleForm.content" id="detailEditor">
               
-          </textarea>
+          </textarea> -->
+          <div style="width:375px;" v-html="ruleForm.content">
+
+          </div>
         </el-form-item>
         <el-form-item label="签署居民数量">
           <el-input size="small" v-model="ruleForm.signNum" maxlength="50" disabled style="widht:200px;" show-word-limit></el-input>
@@ -69,17 +72,18 @@ export default {
   },
   // 挂载到Dom完成时
   mounted: function() {
-    // commonUtil.resizeHeight();
-    CKEDITOR.replace( 'detailEditor' );
-    if(this.isUpdate) { // 只在修改时监听富文本的Ready事件
-      CKEDITOR.on('instanceReady', function (event) {
-          detailEditor = event.editor;
-          detailEditor.execCommand("toolbarCollapse");
-          detailEditor.setReadOnly(true); //只读
-          // 获取数据
     vm.getProtocolDetailById(vm.protocolId);
-      });
-    }
+    // commonUtil.resizeHeight();
+    // CKEDITOR.replace( 'detailEditor' );
+    // if(this.isUpdate) { // 只在修改时监听富文本的Ready事件
+    //   CKEDITOR.on('instanceReady', function (event) {
+    //       detailEditor = event.editor;
+    //       detailEditor.execCommand("toolbarCollapse");
+    //       detailEditor.setReadOnly(true); //只读
+    //       // 获取数据
+    //       vm.getProtocolDetailById(vm.protocolId);
+    //   });
+    // }
   },
   methods: {
     // 根据协议ID获取协议详情
@@ -92,7 +96,7 @@ export default {
             vm.ruleForm.signNum = res.data.signNum;
             vm.ruleForm.createdName = res.data.createdName;
             vm.ruleForm.createTime = res.data.createTime;
-            detailEditor.setData(res.data.contents);
+            // detailEditor.setData(res.data.contents);
           }
         }else{
           vm.$message({
@@ -108,6 +112,12 @@ export default {
       })
     }
   },
+  beforeDestroy() {
+    if (detailEditor) detailEditor.destroy();
+  },
+  destroy() {
+     if (detailEditor) detailEditor.destroy();   
+  }
 };
 </script>
 <style lang="scss">

src/views/protocol/protocol-history copy.vue

-<template>
-  <div class="msg-history-wrap">
-    <bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
-    <div class="component-content screenSet" id="screenSet">
-      <el-form ref="formData" :model="formData" label-width="100px" style="margin-bottom: 20px;margin-left: 7px;">
-        <input type="hidden" v-model="formData.all" value=5>
-        <el-row>
-          <el-col style="width:290px;">
-            <el-form-item label="协议名称" prop="protocolName">
-              <el-input size="small" v-model="formData.protocolName" placeholder="请输入协议名称" ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col style="position:relative; top: 4px; width: 200px; margin-left: 20px;">
-            <el-button type="primary" size="small" @click="handleSearchClick()">查询</el-button>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <div style="padding: 0 40px;">
-        <el-table
-          :data="tableData"
-          border
-          style="width: 100%;">
-          <!-- <el-table-column
-            align="center"
-            prop="mobile"
-            label="编号"
-            width="60"
-            >
-          </el-table-column> -->
-          <el-table-column
-            align="center"
-            type="index"
-            label="编号"
-            width="50">
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="protocolName"
-            label="协议名称"
-            width="400"
-            >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="signNum"
-            label="签署数量"
-            width="120"
-            >
-          </el-table-column>
-          <!-- <el-table-column
-            align="center"
-            prop="protocolType"
-            label="协议类型"
-            >
-          </el-table-column> -->
-          <!-- <el-table-column
-            align="center"
-            prop="versionNo"
-            label="协议版本"
-            >
-          </el-table-column> -->
-          <el-table-column
-            align="center"
-            prop="createdName"
-            label="创建人姓名"
-            width="120"
-            >
-          </el-table-column>          
-          <!-- <el-table-column
-            align="center"
-            prop="creatTime"
-            label="创建时间"
-            >
-            <template slot-scope="scope">
-              {{ returnSendTime(scope.row.creatTime) }}
-            </template>
-          </el-table-column> -->
-          <el-table-column
-            align="center"
-            label="最近更新时间"
-            prop="updateTime"
-            width="160"
-            >
-            <!-- <template slot-scope="scope">
-              {{ returnSendTime(scope.row.updateTime) }}
-            </template> -->
-          </el-table-column>
-
-          <el-table-column fixed="right" label="操作" min-width="200" align="center">
-            <template slot-scope="scope">
-              <el-button
-                @click="gotoDetail(scope.row, 0)"
-                type="primary"
-                size="small"
-              >查看详情</el-button>
-              <el-button
-                @click="gotoUpdate(scope.row, 0)"
-                type="primary"
-                size="small"
-              >更新版本</el-button>
-              <el-button
-                @click="gotoHistoryList(scope.row, 0)"
-                type="primary"
-                size="small"
-              >历史版本</el-button>
-            </template>
-          </el-table-column>
-
-        </el-table>
-        <div class="pagination">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="formData.pageNo"
-            :page-sizes="[10, 30, 50, 100]"
-            :page-size="formData.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="totalRows">
-          </el-pagination>
-        </div>
-      </div>
-
-    </div>
-  </div>
-</template>
-<script>
-  import { openLoading, closeLoading } from "../../utils/utils";
-  import BreadCrumb from "../../components/breadcrumb.vue";
-  export default {
-    components: {
-      BreadCrumb,
-    },
-    data() {
-      return {
-        curmbFirst: "协议管理",
-        formData: {
-          all: 1,
-          protocolName: '',
-          protocolType: 5,
-          pageNo: 1,
-          pageSize: 10,
-        },
-        totalRows: 0,
-        tableData: [{}],
-      }
-    },
-    created() {
-      this.getProtocolList({
-        all: 1,
-        protocolType: 5
-      });
-    },
-    methods: {
-      // 跳转到详情页面（预览页面）
-      gotoDetail(row) {
-        this.$router.push({
-          path: '/protocol-detail',
-          query: {
-            protocolId: row.protocolId
-          }
-        })
-      },
-
-      // 跳转到添加或修改页面
-      gotoUpdate(row) {
-        this.$router.push({
-          path: '/create-protocol',
-          query: {
-            protocolId: row.protocolId
-          }
-        })
-      },
-
-      // 跳转到历史版本页面
-      gotoHistoryList(row) {
-        this.$router.push({
-          path: '/protocol-history',
-          query: {
-            protocolId: row.protocolId
-          }
-        })
-      },
-
-      // 获取协议列表
-      getProtocolList(params) {
-        openLoading(this);
-        this.GET("/smartcontract/protocolManage/protocols", params).then(res => {
-          closeLoading(this);
-          if(res && res.code && res.code == '000000'){
-            if( res && res.data ){
-              this.tableData = res.data;
-              // this.totalRows = res.data.total || 0;
-              // this.tableData = res.data.list || [];
-            }
-          }else{
-            this.$message({
-              message: '接口请求失败',
-              type: 'warning'
-            });
-          }
-        });
-      },
-      handleSearchClick() {
-        console.log(this.formData);
-        this.getProtocolList(this.formData);
-      },
-      handleSizeChange(val){
-        this.formData.pageSize = val;
-        this.getSMSList();
-      },
-      handleCurrentChange(val) {
-        this.formData.pageNo = val;
-        this.getSMSList();
-      },
-      returnSendTime(creatTime){
-        if( creatTime ){
-          return creatTime.year + '-' + creatTime.monthValue + '-' + creatTime.dayOfMonth + ' ' + creatTime.hour + ':' + creatTime.minute ;
-        }else{
-          return '-';
-        }
-      }
-    },
-  }
-</script>  
-<style lang="scss">
-  .msg-history-wrap{
-    .el-form-item .el-form-item__label{
-      font-size: 14px;
-    }
-    .component-content{
-      margin-top: 60px;
-      padding: 10px;
-      background: #fff;
-    }
-    .pagination{
-      margin: 20px 0;
-      text-align: right;
-    }
-    .status-tj{
-      &.success{
-        color: #409EFF;
-      }
-    }
-  }
-</style>

src/views/protocol/protocol-history.vue

@@ -192,12 +192,23 @@
         })
       },
 
+      // // 跳转到历史版本页面
+      // gotoHistoryList(row) {
+      //   this.$router.push({
+      //     path: '/protocol-history',
+      //     query: {
+      //       protocolId: row.protocolId
+      //     }
+      //   })
+      // },
+
       // 跳转到历史版本页面
       gotoHistoryList(row) {
         this.$router.push({
           path: '/protocol-history',
           query: {
-            protocolId: row.protocolId
+            protocolId: row.protocolId,
+            protocolType: row.protocolType
           }
         })
       },
@@ -209,9 +220,8 @@
           closeLoading(this);
           if(res && res.code && res.code == '000000'){
             if( res && res.data ){
-              this.tableData = res.data;
-              // this.totalRows = res.data.total || 0;
-              // this.tableData = res.data.list || [];
+              this.tableData = res.data.list || []
+              this.totalRows = res.data.totalRows || 0;
             }
           }else{
             this.$message({

src/views/protocol/protocol-list.vue

@@ -218,9 +218,8 @@
           closeLoading(this);
           if(res && res.code && res.code == '000000'){
             if( res && res.data ){
-              this.tableData = res.data;
-              // this.totalRows = res.data.total || 0;
-              // this.tableData = res.data.list || [];
+              this.tableData = res.data.list || []
+              this.totalRows = res.data.totalRows || 0;
             }
           }else{
             this.$message({