FXnNp|{3xw1t4v6oCkX-*i$Q%Fw+i&8Z-6=bfOBluZ--S^C0GL0MA>>~K
b1kqktg@QyZ6#j#PpZHyvkLEz&FT#HScW3Xy
diff --git a/src/components/jeecg/JEditor.vue b/src/components/jeecg/JEditor.vue
index 24dc082..ca046f2 100644
--- a/src/components/jeecg/JEditor.vue
+++ b/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,
diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index 1b07f2d..1bb20cc 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/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',
diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index dae2119..2fa113b 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -113,6 +113,20 @@
+
+
+ 关闭
+
+
+
+
+
+
+
+
@@ -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("", "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 {