gjy 2 年 前
コミット
56d874be74

+ 1 - 1
src/views/contractManagement/acquisitionContract.vue

@@ -187,7 +187,7 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " v-if="scope.row.status == '待执行'||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
+            " v-if="scope.row.status == '待执行'&&!scope.row.approveStatus||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />

+ 1 - 1
src/views/contractManagement/purchaseContract.vue

@@ -187,7 +187,7 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " v-if="scope.row.status == '待执行'||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
+            " v-if="scope.row.status == '待执行'&&!scope.row.approveStatus||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />

+ 2 - 2
src/views/contractManagement/salesContract.vue

@@ -88,7 +88,7 @@
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
             @change='selectstatuschange($event,scope.row)'
-            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
+            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'||scope.row.status=='已驳回'"
             :value="scope.row.status">
               <el-option label="执行中" value="执行中"
               style="color: #8890b1" />
@@ -190,7 +190,7 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " v-if="scope.row.status == '待执行'||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
+            " v-if="scope.row.status == '待执行'&&!scope.row.approveStatus||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />