From 425ddd1efa206d6bf1fbc03e9fa5196103a25789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 19 Jul 2022 22:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmTestCase/XmTestCaseSelect.vue   | 111 +++---------------
 1 file changed, 19 insertions(+), 92 deletions(-)

diff --git a/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue b/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
index f176a2b0..64e94b2d 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
@@ -14,112 +14,38 @@
 			<!--列表 XmTestCase 测试用例-->
 			<el-table ref="xmTestCaseTable" :data="xmTestCases" :height="maxTableHeight" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="55" show-overflow-tooltip fixed="left"></el-table-column>
-				<el-table-column sortable type="index" width="55" show-overflow-tooltip  fixed="left"></el-table-column>
-				<!--
+ 				<!--
 				<el-table-column sortable prop="username" width="55" show-overflow-tooltip  fixed="left">
 				    <span class="cell-text">  {{scope.row.username}}}  </span>
 				    <span class="cell-bar"><el-input style="display:inline;" v-model="scope.row.username" placeholder="" @change="editSomeFields(scope.row,'username',$event)" :maxlength="22"></el-input></span>
 				</el-table-column>
 				-->
-				<el-table-column prop="id" label="主键" min-width="120" show-overflow-tooltip  fixed="left"></el-table-column>
-				<el-table-column prop="caseName" label="标题" min-width="120" show-overflow-tooltip>
+				<el-table-column prop="id" label="编号" width="120" show-overflow-tooltip  fixed="left"></el-table-column>
+				<el-table-column prop="caseName" label="标题" min-width="250" show-overflow-tooltip>
 				    <template slot-scope="scope">
-				        <span> {{scope.row.caseName}} </span>
+				        <span><el-link @click="showEdit(scope.row)"> {{scope.row.caseName}} </el-link></span>
                     </template>
 				</el-table-column>
-				<el-table-column prop="caseRemark" label="备注" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.caseRemark}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="testStep" label="测试步骤" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.testStep}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="expectResult" label="期望结果" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.expectResult}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="menuId" label="关联的故事" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.menuId}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="menuName" label="关联故事名" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.menuName}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="ctime" label="创建时间" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.ctime}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="ltime" label="更新时间" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.ltime}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="luserid" label="更新人编号" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.luserid}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="lusername" label="更新人姓名" min-width="120" show-overflow-tooltip>
+                
+				<el-table-column prop="caseStatus" label="状态" min-width="120" show-overflow-tooltip>
 				    <template slot-scope="scope">
-				        <span> {{scope.row.lusername}} </span>
+				        <el-tag  v-for="(item,index) in formatDictsWithClass(dicts,'testCaseStatus',scope.row.caseStatus)" :key="index" :type="item.className">{{item.name}}</el-tag>
+                                 
                     </template>
-				</el-table-column>
-				<el-table-column prop="cbranchId" label="创建机构" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.cbranchId}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="moduleId" label="模块编号" min-width="120" show-overflow-tooltip>
+				</el-table-column> 
+				<el-table-column prop="caseRemark" label="备注" min-width="120" show-overflow-tooltip>
 				    <template slot-scope="scope">
-				        <span> {{scope.row.moduleId}} </span>
+				        <span> {{scope.row.caseRemark}} </span>
                     </template>
-				</el-table-column>
+				</el-table-column>   
 				<el-table-column prop="moduleName" label="模块名称" min-width="120" show-overflow-tooltip>
 				    <template slot-scope="scope">
 				        <span> {{scope.row.moduleName}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="caseStatus" label="用例状态1正常0废弃" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.caseStatus}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="cuserid" label="创建人编号" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.cuserid}} </span>
                     </template>
 				</el-table-column>
 				<el-table-column prop="cusername" label="创建人姓名" min-width="120" show-overflow-tooltip>
 				    <template slot-scope="scope">
 				        <span> {{scope.row.cusername}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="productId" label="产品编号" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.productId}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="verNum" label="版本号" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.verNum}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="casedbId" label="用例库编号" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.casedbId}} </span>
-                    </template>
-				</el-table-column>
-				<el-table-column prop="casedbName" label="用例库名称" min-width="120" show-overflow-tooltip>
-				    <template slot-scope="scope">
-				        <span> {{scope.row.casedbName}} </span>
                     </template>
 				</el-table-column> 
 			</el-table>
@@ -127,14 +53,14 @@
 		</el-row>
 		<el-row>
 			<!--编辑 XmTestCase 测试用例界面-->
-			<el-drawer title="编辑测试用例" :visible.sync="editFormVisible"  size="60%"  append-to-body   :close-on-click-modal="false">
-			    <xm-test-case-edit op-type="edit" :xm-test-case="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-test-case-edit>
-			</el-drawer>
+			<el-dialog title="编辑测试用例" :visible.sync="editFormVisible"  width="60%" top="20px"  append-to-body   :close-on-click-modal="false">
+			    <xm-test-case-edit op-type="edit" :xm-test-case="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @edit-fields="onEditFields"></xm-test-case-edit>
+			</el-dialog>
 
 			<!--新增 XmTestCase 测试用例界面-->
-			<el-drawer title="新增测试用例" :visible.sync="addFormVisible"  size="60%"  append-to-body  :close-on-click-modal="false">
-			    <xm-test-case-edit op-type="add" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-test-case-edit>
-			</el-drawer>
+			<el-dialog title="新增测试用例" :visible.sync="addFormVisible"  width="60%" top="20px"  append-to-body  :close-on-click-modal="false">
+			    <xm-test-case-edit op-type="add" :xm-test-casedb="xmTestCasedb" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-test-case-edit>
+			</el-dialog>
 	    </el-row>
 	</section>
 </template>
@@ -183,6 +109,7 @@ export default {
             load:{ list: false, edit: false, del: false, add: false },//查询中...
             sels: [],//列表选中数据
             dicts:{
+                testCaseStatus:[],
                 //sex: [{id:'1',name:'男'},{id:'2',name:'女'}]
             },//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
             addFormVisible: false,//新增xmTestCase界面是否显示