添加置灰条件,以及

src/views/finance/contrast/index.vue

@@ -941,13 +941,12 @@ export default {
         let formDate = new window.FormData()
         formDate.append('tFee',JSON.stringify(this.queryParams))
         formDate.append("tFeeDo", JSON.stringify(this.DzfeeList))
-
         backFee(formDate).then(response=>{
           this.msgSuccess("撤回成功")
-
+          this.open = false
+          this.reset()
+          this.getList()
         })
-        // this.open = false
-      this.getList()
     },
 
     // 打印功能

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -344,7 +344,7 @@
                 v-model="form.fCorpid"
                 filterable
                 remote
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 style="width: 80%"
                 :remote-method="corpsRemoteMethod"
                 placeholder="请选择货权方"
@@ -364,7 +364,7 @@
                 v-model="form.fTocorpid"
                 filterable
                 remote
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 style="width: 80%"
                 @change="changefCorpid(form)"
                 :remote-method="corpsRemoteMethod"
@@ -397,7 +397,7 @@
                 v-model="form.fBsdate"
                 style="width: 80%"
                 type="date"
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 value-format="timestamp"
                 placeholder="货转日期"
               >
@@ -410,7 +410,7 @@
                 v-model="form.fChargedate"
                 style="width: 80%"
                 type="date"
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 value-format="timestamp"
                 placeholder="仓储计费日期">
               </el-date-picker>
@@ -421,7 +421,7 @@
               <el-select
                 v-model="form.fWarehouseid"
                 filterable
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 remote
                 style="width: 80%"
                 :remote-method="warehouseRemoteMethod"
@@ -443,7 +443,7 @@
                 v-model="form.fStltypeid"
                 placeholder="请选择结算方式"
                 clearable
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 style="width: 80%"
               >
                 <el-option
@@ -461,7 +461,7 @@
                 v-model="form.fFeetunit"
                 placeholder="请选择计费单位"
                 clearable
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 style="width: 80%"
               >
                 <el-option
@@ -479,7 +479,7 @@
                 v-model="form.fTrademodeid"
                 placeholder="请选择贸易方式"
                 clearable
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 style="width: 80%"
               >
                 <el-option
@@ -497,7 +497,7 @@
             <el-form-item label="提单号" prop="fMblno">
               <el-input
                 v-model="form.fMblno"
-                :disabled="browseStatus"
+                :disabled="notChange"
                 style="width: 80%"
                 placeholder="手工输入"
               />
@@ -508,7 +508,7 @@
               <el-input
                 v-model="form.fOriginalbillno"
                 style="width: 80%"
-                :disabled="browseStatus"
+                :disabled="notChange"
                 placeholder="原始入库单号"
               />
             </el-form-item>
@@ -521,7 +521,7 @@
                 value-format="yyyy-MM-dd"
                 range-separator="至"
                 style="width: 80%"
-                :disabled="browseStatus"
+                :disabled="notChange"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
               >

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -292,7 +292,7 @@
             type="text"
             icon="el-icon-edit"
             @click="check(scope.row, true)"
-            v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+            v-hasPermi="['warehouseBusiness:stockTransfer:query']"
             >查看
           </el-button>
           <el-button
@@ -301,7 +301,7 @@
             icon="el-icon-edit"
             v-if="scope.row.fBillstatus === 4 || scope.row.fBillstatus === 5"
             @click="check(scope.row, true)"
-            v-hasPermi="['warehouseBusiness:goodsTransfer:edit']"
+            v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
           >审批进度
           </el-button>
           <el-button