Переглянути джерело

Merge branch 'sxw-skeleton' of http://101.36.160.140:21044/emergency-report/report-vue into sxw-skeleton

sunxuewei 1 рік тому
батько
коміт
c8f1164e09

+ 2 - 2
src/views/InformationFilling/enterWarehouseInfo/index.vue

@@ -46,10 +46,10 @@
46 46
       <el-table-column fixed="right" label="操作" width="150" align="center">
47 47
         <template #default="{ row }">
48 48
           <el-button link type="success" size="small" @click="openDetail(row, 'look')">查看</el-button>
49
-          <el-button link v-if="row.status == 1" type="primary" size="small" @click="openDetail(row, 'edit')"
49
+          <el-button link v-if="row.status == 1 || row.status == 4 || row.status == 6" type="primary" size="small" @click="openDetail(row, 'edit')"
50 50
             >编辑</el-button
51 51
           >
52
-          <el-button link v-if="row.status == 1" type="danger" size="small" @click="deleteClick(row)">删除</el-button>
52
+          <el-button link v-if="row.status == 1 || row.status == 4 || row.status == 6" type="danger" size="small" @click="deleteClick(row)">删除</el-button>
53 53
         </template>
54 54
       </el-table-column>
55 55
     </el-table>

+ 2 - 3
src/views/InformationFilling/outWarehouseInfo/index.vue

@@ -51,10 +51,10 @@
51 51
       <el-table-column fixed="right" label="操作" width="150" align="center">
52 52
         <template #default="{ row }">
53 53
           <el-button link type="success" size="small" @click="openDetail(row, 'look')">查看</el-button>
54
-          <el-button link v-if="row.status == 1" type="primary" size="small" @click="openDetail(row, 'edit')"
54
+          <el-button link v-if="row.status == 1 || row.status == 4 || row.status == 6" type="primary" size="small" @click="openDetail(row, 'edit')"
55 55
             >编辑</el-button
56 56
           >
57
-          <el-button link v-if="row.status == 1" type="danger" size="small" @click="deleteClick(row)">删除</el-button>
57
+          <el-button link v-if="row.status == 1 || row.status == 4 || row.status == 6" type="danger" size="small" @click="deleteClick(row)">删除</el-button>
58 58
         </template>
59 59
       </el-table-column>
60 60
     </el-table>
@@ -83,7 +83,6 @@ const { outdound_type, is_available, province_ch, auditing_status } = useDict(
83 83
   "province_ch",
84 84
   "auditing_status"
85 85
 );
86
-
87 86
 const searchList = ref({
88 87
   outboundType: "",
89 88
   materialNameVo: ""