From af5b753500ee70fb1e730e327eba8736d503bddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 22 Apr 2021 03:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmMenu/XmMenuMng.vue | 2 +- src/views/xm/core/xmMenu/XmMenuSelect.vue | 2 +- src/views/xm/core/xmProject/XmProjectMng.vue | 34 ++- .../xm/core/xmQuestion/XmQuestionEdit.vue | 217 ++++++++++-------- .../xm/core/xmQuestion/XmQuestionMng.vue | 47 ++-- 5 files changed, 179 insertions(+), 123 deletions(-) diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index 5258c62f..50b3b883 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -95,7 +95,7 @@ trigger="click" >
-
{{scope.row.remark?scope.row.remark.substr(0,20)+"...":""}}
+
{{scope.row.remark?scope.row.remark.substr(0,18)+"...":""}}
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue index 1a60cee8..e2f8437f 100644 --- a/src/views/xm/core/xmMenu/XmMenuSelect.vue +++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue @@ -33,7 +33,7 @@ width="400" trigger="click" :content="scope.row.remark"> -
{{scope.row.remark?scope.row.remark.substr(0,20)+"...":""}}
+
{{scope.row.remark?scope.row.remark.substr(0,18)+"...":""}}
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index e1e06c9f..4aeff320 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -23,17 +23,28 @@ 选项2 选项3 --> - + + + + 未结束 + + + {{filters.productName}}按产品过滤 + + + + + + + + - - - 未结束 - {{filters.productName}}选产品 - - - - - + + @@ -206,6 +217,9 @@ console.log("shotType_change"); this.xmProjects = []; this.getXmProjects(); + }, + "finishFlag":function(val){ + this.searchXmProjects(); } }, data() { diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index 8ec0c781..bae18b0d 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -2,101 +2,113 @@
- - - - - {{editForm.name}} - - - {{selProject.name}} - - - {{editForm.taskName}}选任务 - - - - {{i.optionName}} - - - - - {{i.optionName}} - - - - - {{i.optionName}} - - - - - - - 提出: {{editForm.askUsername}} 创建人: {{userInfo.username}} 时间:{{formateDate(new Date()).substr(0,10)}} - - - {{editForm.handlerUsername}} 指派给提出人指派给创建人选其它人 - - - -
-
-
- - - - - 测试步骤 - - - - 预期结果 - - - - - -
- - - - - - - - - - - - + + + + + + {{editForm.name}} + + + {{selProject.name}} + + + {{editForm.taskName}}选任务 + + + + {{i.optionName}} + + + + + {{i.optionName}} + + + + + {{i.optionName}} + + + + + + + 提出: {{editForm.askUsername}} 创建人: {{userInfo.username}} 时间:{{formateDate(new Date()).substr(0,10)}} + + + {{editForm.handlerUsername}} 指派给提出人指派给创建人选其它人 + + + + + 测试步骤 + +
+
+
+ + 预期结果 + +
+
+
+ + 流转信息 + 查询流转信息 + 隐藏流转信息 + + + + + + + + + + + + + + - -
- - - - - - - 取消 - 确认 - 不是问题 - 直接解决 - 直接关闭 - 解决 - 关闭 - 关闭 - 重新激活 - 重新激活 - - - -
+ + +
+ + + +
+
+
+ + + + + + + + + + + + + 取消 + 确认 + 不是问题 + 直接解决 + 直接关闭 + 解决 + 关闭 + 关闭 + 重新激活 + 重新激活 + + @@ -133,9 +145,11 @@ }, 'visible':function(visible) { if(visible==true){ - this.getXmQuestionHandle(); + //this.getXmQuestionHandle(); //从新打开页面时某些数据需要重新加载,可以在这里添加 - } + }else{ + this.flowInfoVisible=false; + } } }, data() { @@ -170,6 +184,7 @@ userFieldName:'', xmQuestionHandles:[], selectTaskVisible:false, + flowInfoVisible:false, /**end 在上面加自定义属性**/ }//end return },//end data @@ -325,6 +340,10 @@ this.editForm.handlerUsername=this.editForm.askUsername this.editForm.handlerUserid=this.editForm.askUserid + }, + showFlowInfo:function(){ + this.flowInfoVisible=true; + this.getXmQuestionHandle(); } /**end 在上面加自定义方法**/ @@ -345,7 +364,7 @@ this.options['urgencyLevel']=res.data.data.urgencyLevel } }); - this.getXmQuestionHandle(); + //this.getXmQuestionHandle(); /**在下面写其它函数***/ }//end mounted @@ -369,4 +388,8 @@ .add-btns >>> .el-form-item__content{ margin-left: 0 !important; } +.label-font{ + font-weight: 700; + font-size: 14px; +} \ No newline at end of file diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index 961674f2..c56976ee 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -1,7 +1,8 @@