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

public/index.html

@@ -5,6 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <meta name="referrer" content="no-referrer" />
   <title>综合信息管理平台</title>
   <link rel="icon" href="<%= BASE_URL%>logo2.jpeg">
 <!--  <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>-->

src/components/jeecg/JEditor.vue

@@ -62,7 +62,7 @@
           language_url: '/tinymce/langs/zh_CN.js',
           language: 'zh_CN',
           skin_url: '/tinymce/skins/lightgray',
-          height: 300,
+          height: 400,
           plugins: this.plugins,
           toolbar: this.toolbar,
           branding: false,

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -255,6 +255,15 @@
             //   placeholder: '请输入${title}',
             //   defaultValue: ''
             // },
+            {
+              title: '实发数',
+              key: 'actualSendNumber',
+              type: FormTypes.inputNumber,
+              width: '130px',
+              placeholder: '请输入${title}',
+              defaultValue: '',
+              disabled: this.actualNumber
+            },
             {
               title: '接收调拨目标',
               key: 'allotTarget',

src/views/dashboard/HomePage.vue

@@ -113,6 +113,20 @@
       </a-card>
 
     </div>
+    <a-modal v-model="visible" title="" width="1200px"
+      @cancel="handlerOk"
+      cancelText="关闭">
+      <template slot="footer">
+        <a-button @click="handlerOk">关闭</a-button>
+      </template>
+      <p v-html="regimeConter"  :style="{'max-height': this.timeLineHeight + 'px' }"
+         style="overflow-y:scroll;margin-top: 2%"></p>
+
+    </a-modal>
+
+
+
+
     <!--全部应用-->
     <div  style="width: 100%; height:70%; margin-top: 11px; overflow-y: hidden"  :headStyle="{}" :bodyStyle="{height:'100%' , overflow:'hidden'}">
       <a-row :gutter="24">
@@ -173,7 +187,7 @@
 <!--        </template>-->
 
       </a-modal>
-      <process-regime-modal ref="modalForm" @ok="modalFormOk"></process-regime-modal>
+<!--      <process-regime-modal ref="modalForm" @ok="modalFormOk"></process-regime-modal>-->
 
     </div>
 <!--    <a-card class="bottom-card" title="全部应用" style="width: 100%; height:60%; margin-top: 11px; overflow-y: hidden" :headStyle="{}" :bodyStyle="{height:'100%' , overflow:'hidden'}" >-->
@@ -194,9 +208,8 @@ import { JVXETypes } from '@/components/jeecg/JVxeTable/index'
 import { colorList } from '@/components/tools/setting'
 import ShowAnnouncement from '@comp/tools/ShowAnnouncement'
 import KeyApplications from '@views/dashboard/KeyApplications'
-import ProcessRegimeModal from '@views/regime/modules/ProcessRegimeModal'
-// import { mixinDevice } from '@/utils/mixin'
-// import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+// import ProcessRegimeModal from '@views/regime/modules/ProcessRegimeModal'
+// import Institution from '@views/regime/institution'
 
 export default {
   name: 'HomePage',
@@ -205,16 +218,19 @@ export default {
     KeyApplications,
     JVXETypes,
     ShowAnnouncement,
-    ProcessRegimeModal,
+    // ProcessRegimeModal,
+    // Institution
   },
 
   data() {
     return {
       regime: false,
+      regimeConter: undefined,
       isorter:{
         column: 'createTime',
         order: 'desc',
       },
+      visible: false,
       //待办 登录日志 站内消息查询地址
       url: {
         listCementByUser:"/sys/annountCement/listByUser",
@@ -262,16 +278,18 @@ export default {
         //   ellipsis: true,
         //   sorter: true
         // },
-        {
-          align:"left",
-          dataIndex: 'contentDetails',
-          ellipsis: true,
-          sorter: true,
-          customRender:function (t,r,index) {
-            t = t.replace("<p>", "user")
-            return t;
-          }
-        },
+        // {
+        //   align:"left",
+        //   dataIndex: 'contentDetails',
+        //   ellipsis: true,
+        //   sorter: true,
+        //   customRender:function (t,r,index) {
+        //     let str = '';
+        //
+        //     t =str;
+        //     return t;
+        //   }
+        // },
         {
           align:"center",
           dataIndex: 'createTime',
@@ -304,9 +322,16 @@ export default {
       KeyApplicationsChildren:[],
       selectRowKeys:[],
       routerGo:"",
+      timeLineHeight:"",
       colors:[],
     }
   },
+  mounted() {
+    this.timeLineHeight = document.documentElement.clientHeight - 300;
+    window.onresize = () => {
+      this.timeLineHeight = document.documentElement.clientHeight - 300;
+    };
+  },
   created() {
      getAction(this.url.keyApplications).then((res) => {
       if (res.success) {
@@ -332,6 +357,10 @@ export default {
   },
 
   methods: {
+    handlerOk(e) {
+      console.log(e);
+      this.visible = false;
+    },
 
     expandedRowKeys(row){
       console.log("=====",row);
@@ -560,9 +589,12 @@ export default {
     handleDetail(record){
 
       this.$nextTick(() => {
-        this.$refs.modalForm.edit(record);
-        this.$refs.modalForm.title="详情";
-        this.$refs.modalForm.disableSubmit = true;
+        this.visible = true;
+        this.regimeConter = record.contentDetails;
+        // console.log("=edrsfg-q=wse0gf=",record.contentDetails);
+        // this.$refs.modalForm.edit(record);
+        // this.$refs.modalForm.title="详情";
+        // this.$refs.modalForm.disableSubmit = true;
       })
 
     },
@@ -647,6 +679,18 @@ export default {
 
 </script>
 <style scoped>
+
+/deep/ .ant-modal-content {
+  position: relative;
+  background-color: #fff;
+  background-clip: padding-box;
+  border: 0;
+  border-radius: 2px;
+  pointer-events: auto;
+  max-width: 1500px;
+  display: inline-block;
+}
+
 .ant-carousel >>> .slick-slide img {
   border: 5px solid #fff;
   display: block;

src/views/regime/modules/ProcessRegimeForm.vue

@@ -1,6 +1,6 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
+    <j-form-container >
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">