Browse Source

费用名称可以查询搜索

lichao 3 years ago
parent
commit
50eaef7767

+ 2 - 0
src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -1200,6 +1200,7 @@
               <el-select
                 v-model="scope.row.fFeeid"
                 clearable
+                filterable
                 placeholder="费用名称"
                 :disabled="browseStatus"
               >
@@ -1569,6 +1570,7 @@
               <el-select
                 v-model="scope.row.fFeeid"
                 clearable
+                filterable
                 placeholder="费用名称"
                 :disabled="browseStatus"
               >

+ 1 - 0
src/views/Warehousing/components/incomeMoney.vue

@@ -88,6 +88,7 @@
           <el-select
               v-model="scope.row.fFeeid"
               clearable
+              filterable
               placeholder="费用名称"
               :disabled="browseStatus"
           >

+ 1 - 0
src/views/Warehousing/components/payMoney.vue

@@ -87,6 +87,7 @@
           <el-select
             v-model="scope.row.fFeeid"
             clearable
+            filterable
             placeholder="费用名称"
             :disabled="browseStatus"
           >

+ 2 - 0
src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -716,6 +716,7 @@
               <el-select
                 v-model="scope.row.fFeeid"
                 clearable
+                filterable
                 placeholder="费用名称"
                 :disabled="browseStatus"
               >
@@ -1091,6 +1092,7 @@
               <el-select
                 v-model="scope.row.fFeeid"
                 clearable
+                filterable
                 placeholder="费用名称"
                 :disabled="browseStatus"
               >

+ 1 - 1
src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -4367,7 +4367,7 @@
       >
       <el-button
           type="primary"
-          v-if="approVal == true && form.fBillstatus == 4"
+          v-if="approVal == true && form.fBillstatus >= 4 && form.fBillstatus < 6"
           @click="addOrUpdateHand(form, 'f_billstatus')"
       >审批
       </el-button

+ 2 - 0
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -1304,6 +1304,7 @@
               <el-select
                   v-model="scope.row.fFeeid"
                   clearable
+                  filterable
                   placeholder="费用名称"
                   :disabled="browseStatus"
               >
@@ -1846,6 +1847,7 @@
               <el-select
                   v-model="scope.row.fFeeid"
                   clearable
+                  filterable
                   placeholder="费用名称"
                   :disabled="browseStatus || scope.row.fBillstatus === 6"
               >

+ 3 - 1
src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -1532,6 +1532,7 @@
               <el-select
                 v-model="scope.row.fFeeid"
                 clearable
+                filterable
                 placeholder="费用名称"
                 :disabled="browseStatus"
               >
@@ -1907,6 +1908,7 @@
               <el-select
                 v-model="scope.row.fFeeid"
                 clearable
+                filterable
                 placeholder="费用名称"
                 :disabled="browseStatus"
               >
@@ -3025,7 +3027,7 @@
       >
       <el-button
         type="primary"
-        v-if="approVal === true && form.fBillstatus == 6"
+        v-if="approVal === true && form.fBillstatus >= 4 && form.fBillstatus < 6"
         @click="addOrUpdateHand(form, 'f_billstatus')"
         >审批</el-button
       >