From 7740e8d2fbfc70608575b22d6eded9a439ab4750 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 18 十二月 2023 09:17:57 +0800
Subject: [PATCH] 修改

---
 web/src/views/modules/testCheckOrder/TestCheckOrder.vue |   80 ++++++++++++++++++++++++---------------
 1 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
index 3f35ac5..73d6be1 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
@@ -1,13 +1,14 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <div class="fa-card-a">
     <div class="mod-testCheckOrder-testCheckOrder}">
-      <zt-table-wraper query-url="/testCheckOrder/TestCheckOrder/page" delete-url="/testCheckOrder/TestCheckOrder" v-slot="{ table }">
+      <zt-table-wraper query-url="/testCheckOrder/TestCheckOrder/page" delete-url="/testCheckOrder/TestCheckOrder/deleteCheckOrder"
+                       v-slot="{ table }">
         <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
           <el-form-item>
             <el-input v-model="dataForm.code" placeholder="璇疯緭鍏ョ紪鍙�" clearable></el-input>
           </el-form-item>
           <el-form-item>
-            <el-input v-model="dataForm.softwarename" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable></el-input>
+            <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable></el-input>
           </el-form-item>
           <el-form-item>
             <zt-button type="query" @click="table.query()"/>
@@ -15,63 +16,80 @@
             <zt-button type="delete" perm="testCheckOrder:delete" @click="table.deleteHandle()"/>
           </el-form-item>
         </el-form>
-        <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
-          <el-table-column type="selection" width="40"/>
-            <el-table-column prop="code" label="缂栧彿"/>
-                <el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
-                <el-table-column prop="softwareName" label="椤圭洰鍚嶇О"/>
-              <zt-table-column-handle :table="table" edit-perm="testCheckOrder:update" delete-perm="testCheckOrder::delete"/>
+        <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
+                  border @selection-change="table.selectionChangeHandle">
+          <el-table-column :selectable="isCheckbox" align="center" type="selection" width="40"/>
+          <el-table-column prop="code" label="缂栧彿"/>
+          <el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
+          <el-table-column prop="softwareName" label="椤圭洰鍚嶇О"/>
+          <zt-table-column-handle :table="table"  :hasEdit='false' edit-perm="testCheckOrder:update"
+                                  delete-perm="testCheckOrder::delete">
+            <template v-slot="{row}">
+              <zt-table-button type="primary" v-if="!(row.flowInfo && row.flowInfo.bizId)" @click="openEditWin(row)">淇敼</zt-table-button>
+            </template>
+
+          </zt-table-column-handle>
         </el-table>
         <!-- 寮圭獥, 鏂板 / 淇敼 -->
-        <add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
-        <ProjectSelect ref="projectSelect"
+        <add-or-update ref="addOrUpdate" @recall="table.query"/>
+        <ProjectSelect :pageCode="pageCode" ref="projectSelect"
                        @refreshDataList="table.query"
                        @setProjectInfo="openAddWin">
         </ProjectSelect>
-        <Preview ref="view" :pageMarkerfun="SoftwareTestOrder"></Preview>
+        <Preview ref="view"></Preview>
       </zt-table-wraper>
     </div>
-  </el-card>
+  </div>
 </template>
 
 <script>
   import AddOrUpdate from './TestCheckOrder-AddOrUpdate'
   import ProjectSelect from "../project/Project-select.vue"
   import Preview from '@/views/pages/view'
+
   export default {
-    props: {
-      pageCode: {
-        type: String,
-        default: ''
-      },
-      pageRead: {
-        type: String,
-        default: 'yes'
-      }
-    },
+    props: {},
     data() {
       return {
+        pageCode: '',
+        QueryUrl:'',
         dataForm: {
           code: '',
-          softwareidentity: '',
-          softwarename: '',
+          softwareIdentity: '',
+          softwareName: '',
+          pageCode:this.$route.query.pageCode
         }
       }
+    },
+    mounted() {
+      this.pageCode = this.$route.query.pageCode
+      this.dataForm.pageCode = this.$route.query.pageCode
+      console.log(this.pageCode,'this.pageCode this.pageCode')
     },
     components: {
       AddOrUpdate,
       ProjectSelect,
       Preview
     },
-    methods:{
+    computed:{
+    },
+    methods: {
       add() {
-        this.$refs.projectSelect.$refs.dialog.init("test_check_order")
+        console.log(this.pageCode, 'this.pageCode')
+        this.$refs.projectSelect.$refs.dialog.init("test_check_order", {pageCode: this.pageCode})
       },
-      openAddWin(row) {
-        console.log(row.id, 'row.id')
-        this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
+      isCheckbox(row,index){
+        return !(row.flowInfo && row.flowInfo.bizId);
       },
-      preview(row){
+      openAddWin(projectRow) {
+        console.log(projectRow, 'openAddWin(projectRow) projectRow')
+        this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: projectRow.id, pageCode: this.pageCode})
+      },
+      openEditWin(checkOrderRow){
+        console.log(checkOrderRow,'openEditWin(checkOrderRow)')
+        this.$refs.addOrUpdate.$refs.dialog.init(checkOrderRow.id, {id: checkOrderRow.id, projectId: checkOrderRow.projectId, pageCode: this.pageCode})
+      },
+      preview(row) {
         this.$refs.view.openAccessoryFormatSingle(row)
       }
     }

--
Gitblit v1.9.1