Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/profitable/expensemanagementdetails.vue

@@ -52,12 +52,14 @@
               <el-option v-for="item in personList" :key="item.id" :label="item.agent" :value="item.agent">
               </el-option>
             </el-select>
-            
+            <!-- <el-select v-model="warehouseName"  filterable  clearable @change="getList1" class="options_css">
+              <el-option label="全部状态" value=""></el-option>
+              <el-option label="待审核" value=""></el-option>
+            </el-select> -->
             <!-- <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他驻库人员，可选多人"  allow-create default-first-option @change="selectstaffOther" multiple filterable clearable>
             <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName" :value="item.staffMobilePhone" />
           </el-select> -->
-            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px"
-                src="../../../public/img/sousuo.png" alt="" /></el-button>
+            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px" src="../../../public/img/sousuo.png" alt="" /></el-button>
           </div>
         </el-col>
       </el-row>
@@ -854,7 +856,8 @@ export default {
         unallocatedNumber:this.unallocatedAmount.length>0?this.unallocatedAmount.toString():'',
         agent:this.agent.length>0?this.agent.toString():'',
         flowTo:this.flowTo.length>0?this.flowTo.toString():'',
-        warehouseName:this.warehouseName
+        warehouseName:this.warehouseName,
+        warehouseName:this.warehouseName,
       })
         .toPromise()
         .then((response) => {

src/views/workNotification/utils/index.js

@@ -33,6 +33,8 @@ export function code2Url (type, code, state,status,message,businessId) {
       return warehouseReceiptRegulation(code, state)
     case 'ROLE':
       return stock(code, state)
+    case 'FEIYONGYUNFEI':
+      return profitable(code,state)  
     case 'TRANSPORTATIONTASK':
       return trantask(code,state,message)
     case 'WAREHOUSE':