Преглед на файлове

前端合同已驳回不可修改状态,只有待执行和已驳回可以删除合同

gjy преди 2 години
родител
ревизия
b21995e8f3

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

@@ -85,7 +85,7 @@
               style="color: #8890b1" />
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
-            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
+            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'||scope.row.status=='已驳回'"
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">
@@ -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.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />

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

@@ -85,7 +85,7 @@
               style="color: #8890b1" />
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
-          :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
+          :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'||scope.row.status=='已驳回'"
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">
@@ -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.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />

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

@@ -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.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />

+ 3 - 1
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -2724,7 +2724,9 @@ export default {
                 }
                 // console.log(delete this.deptBudgetList.status)
               if (this.statusTypetext == '初检') {
-                
+                if(this.zjJurisdiction){
+                  this.deptBudgetList.outType=this.outType
+                }
                 
                 if(this.deptBudgetList.id){
                   this.deptBudgetList.id=kid

+ 1 - 1
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -186,7 +186,7 @@
 						</el-select>
 					</el-form-item>
 					<!-- 货名 -->
-					<el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+					<el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2||dataList1.taskTypeKey == 3' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"

+ 1 - 1
src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -219,7 +219,7 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2||dataList1.taskTypeKey == 3' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"

+ 1 - 1
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -401,7 +401,7 @@
             />
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2||dataList1.taskTypeKey == 3' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"