From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改

---
 web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue
index 72874d4..457f925 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue
@@ -1,11 +1,15 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-itemCirculatOrder-itemCirculatOrder}">
-      <zt-table-wraper query-url="/itemCirculatOrder/ItemCirculatOrder/page" delete-url="/itemCirculatOrder/ItemCirculatOrder" v-slot="{ table }">
+    <div class="fa-card-a">
+      <zt-table-wraper query-url="/itemCirculatOrder/ItemCirculatOrder/page" delete-url="/itemCirculatOrder/ItemCirculatOrder/deleteCirculat" 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-form-item>
+          <el-form-item>
+            <el-input v-model="dataForm.softwareIdentity" placeholder="璇疯緭鍏ョ墿鍝佺紪鍙�" clearable></el-input>
           </el-form-item>
           <el-form-item>
             <zt-button type="query" @click="table.query()"/>
@@ -14,8 +18,10 @@
           </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 :selectable="isCheckbox" align="center" type="selection" width="40"/>
             <el-table-column prop="code" label="鐗╁搧娴佽浆鍗曠紪鍙�"/>
+            <el-table-column prop="softwareName" label="鐗╁搧鍚嶇О"/>
+            <el-table-column prop="softwareIdentity" label="鐗╁搧缂栧彿"/>
               <zt-table-column-handle :table="table" edit-perm="itemCirculatOrder:update" delete-perm="itemCirculatOrder::delete"/>
         </el-table>
         <!-- 寮圭獥, 鏂板 / 淇敼 -->
@@ -26,7 +32,6 @@
         </ProjectSelect>
       </zt-table-wraper>
     </div>
-  </el-card>
 </template>
 
 <script>
@@ -37,6 +42,8 @@
       return {
         dataForm: {
           code: '',
+          softwareName:'',
+          softwareIdentity:'',
         }
       }
     },
@@ -48,6 +55,9 @@
       dataLoaded(data){
         console.log(data,'data daraList')
       },
+      isCheckbox(row,index){
+        return !(row.flowInfo && row.flowInfo.bizId);
+      },
       add() {
         this.$refs.projectSelect.$refs.dialog.init("item_circulat_order")
       },

--
Gitblit v1.9.1