Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/api/finance/charge.js

@@ -63,7 +63,7 @@ export function search(queryParameter) {
 // 查询客户详情列表
 export function listCorps(query) {
   return request({
-    url: '/basicdata/customerDetails/corps/list',
+    url: '/basicdata/corps/list',
     method: 'get',
     params: query
   })

src/api/finance/payment.js

@@ -63,7 +63,7 @@ export function search(queryParameter) {
 // 查询客户详情列表
 export function listCorps(query) {
   return request({
-    url: '/basicdata/customerDetails/corps/list',
+    url: '/basicdata/corps/list',
     method: 'get',
     params: query
   })

src/api/warehouseBusiness/agreement.js

@@ -66,7 +66,7 @@ export function updateAgreement_s(fId, fStatus) {
     method: 'put',
     data: {
       fId:fId,
-      fBillstatus:fStatus
+      fStatus:fStatus
     }
   })
 }

src/views/system/auditConfiguration/index.vue

@@ -36,16 +36,16 @@
         width="400"
         label="活动名">
         <template slot-scope="scope">
-          <span v-if="scope.row.actId === 110">入库</span>
-          <span v-if="scope.row.actId === 120">出库</span>
-          <span v-if="scope.row.actId === 130">货转</span>
-          <span v-if="scope.row.actId === 140">调拨</span>
-          <span v-if="scope.row.actId === 150">计算仓储费</span>
-          <span v-if="scope.row.actId === 210">对账</span>
-          <span v-if="scope.row.actId === 220">收费</span>
-          <span v-if="scope.row.actId === 230">付费</span>
-          <span v-if="scope.row.actId === 310">仓储费</span>
-          <span v-if="scope.row.actId === 320">计划费</span>
+          <span v-if="scope.row.actId === 110">入库审批流程</span>
+          <span v-if="scope.row.actId === 120">出库审批流程</span>
+          <span v-if="scope.row.actId === 130">货转审批流程</span>
+          <span v-if="scope.row.actId === 140">调拨审批流程</span>
+          <span v-if="scope.row.actId === 150">计算仓储费审批流程</span>
+          <span v-if="scope.row.actId === 210">对账审批流程</span>
+          <span v-if="scope.row.actId === 220">收费审批流程</span>
+          <span v-if="scope.row.actId === 230">付费审批流程</span>
+          <span v-if="scope.row.actId === 310">协议仓储费审批流程</span>
+          <span v-if="scope.row.actId === 320">协议计划费审批流程</span>
         </template>
       </el-table-column>
       <el-table-column

src/views/system/toConfigure/index.vue

@@ -15,7 +15,6 @@
             icon="el-icon-plus"
             size="mini"
             @click="addOrUpdateHandle()"
-            v-hasPermi="['finance:charge:add']"
           >新增
           </el-button>
         </el-col>