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

src/api/basicdata/corps.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询客户详情列表
 export function listCorps(query) {
   return request({
-    url: '/basicdata/customerDetails/corps/list',
+    url: '/basicdata/corps/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listCorps(query) {
 // 查询客户详情详细
 export function getCorps(fId) {
   return request({
-    url: '/basicdata/customerDetails/corps/' + fId,
+    url: '/basicdata/corps/' + fId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getCorps(fId) {
 // 新增客户详情
 export function addCorps(data) {
   return request({
-    url: '/basicdata/customerDetails/corps',
+    url: '/basicdata/corps',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addCorps(data) {
 // 修改客户详情
 export function updateCorps(data) {
   return request({
-    url: '/basicdata/customerDetails/corps',
+    url: '/basicdata/corps',
     method: 'put',
     data: data
   })
@@ -41,7 +41,7 @@ export function changeCorpsStatus(fId, fStatus) {
     fStatus
   }
   return request({
-    url: '/basicdata/customerDetails/corps',
+    url: '/basicdata/corps',
     method: 'put',
     data: data
   })
@@ -50,7 +50,7 @@ export function changeCorpsStatus(fId, fStatus) {
 // 删除客户详情
 export function delCorps(fId) {
   return request({
-    url: '/basicdata/customerDetails/corps/' + fId,
+    url: '/basicdata/corps/' + fId,
     method: 'delete'
   })
 }
@@ -58,7 +58,7 @@ export function delCorps(fId) {
 // 导出客户详情
 export function exportCorps(query) {
   return request({
-    url: '/basicdata/customerDetails/corps/export',
+    url: '/basicdata/corps/export',
     method: 'get',
     params: query
   })

src/views/agreement/agreementTask/index.vue

@@ -97,7 +97,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd()"
-          v-hasPermi="['warehouseBusiness:agreement:add']"
+          v-hasPermi="['agreement:agreementTask:add']"
         >新增
         </el-button>
       </el-col>
@@ -108,7 +108,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['warehouseBusiness:agreement:edit']"
+          v-hasPermi="['agreement:agreementTask:edit']"
         >修改
         </el-button>
       </el-col>
@@ -119,7 +119,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['warehouseBusiness:agreement:remove']"
+          v-hasPermi="['agreement:agreementTask:remove']"
         >删除
         </el-button>
       </el-col>
@@ -129,7 +129,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['warehouseBusiness:agreement:export']"
+          v-hasPermi="['agreement:agreementTask:export']"
         >导出
         </el-button>
       </el-col>
@@ -180,7 +180,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-if="scope.row.fBillstatus <= 3"
-            v-hasPermi="['warehouseBusiness:agreement:edit']"
+            v-hasPermi="['agreement:agreementTask:edit']"
           >修改
           </el-button>
           <el-button
@@ -189,7 +189,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-if="scope.row.fBillstatus <= 3"
-            v-hasPermi="['warehouseBusiness:agreement:remove']"
+            v-hasPermi="['agreement:agreementTask:remove']"
           >删除
           </el-button>
           <el-button
@@ -198,7 +198,7 @@
             icon="el-icon-delete"
             @click="speed(scope.row,0)"
             v-if="scope.row.fBillstatus == 6"
-            v-hasPermi="['warehouseBusiness:agreement:remove']"
+            v-hasPermi="['agreement:agreementTask:remove']"
           >查看
           </el-button>
           <el-button
@@ -207,7 +207,7 @@
             icon="el-icon-delete"
             @click="speed(scope.row,1)"
             v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
-            v-hasPermi="['warehouseBusiness:agreement:remove']"
+            v-hasPermi="['agreement:agreementTask:remove']"
           >审批进度
           </el-button>
         </template>

src/views/basicdata/corps/index.vue

@@ -70,7 +70,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['basicdata/customerDetails:corps:add']"
+          v-hasPermi="['basicdata:corps:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -80,7 +80,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['basicdata/customerDetails:corps:edit']"
+          v-hasPermi="['basicdata:corps:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -90,7 +90,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['basicdata/customerDetails:corps:remove']"
+          v-hasPermi="['basicdata:corps:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -99,7 +99,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['basicdata/customerDetails:corps:export']"
+          v-hasPermi="['basicdata:corps:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -156,14 +156,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['basicdata/customerDetails:corps:edit']"
+            v-hasPermi="['basicdata:corps:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['basicdata/customerDetails:corps:remove']"
+            v-hasPermi="['basicdata:corps:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

src/views/finance/payment/index.vue

@@ -67,7 +67,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['finance:charge:add']"
+          v-hasPermi="['finance:payment:add']"
         >新增
         </el-button>
       </el-col>
@@ -78,7 +78,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['finance:charge:edit']"
+          v-hasPermi="['finance:payment:edit']"
         >修改
         </el-button>
       </el-col>
@@ -99,7 +99,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['finance:charge:export']"
+          v-hasPermi="['finance:payment:export']"
         >导出
         </el-button>
       </el-col>
@@ -140,7 +140,7 @@
             type="text"
             icon="el-icon-view"
             @click="check(scope.row,0)"
-            v-hasPermi="['finance:contrast:edit']"
+            v-hasPermi="['finance:payment:edit']"
           >查看</el-button
           >
           <el-button
@@ -148,7 +148,7 @@
             type="text"
             icon="el-icon-view"
             @click="check(scope.row,1)"
-            v-hasPermi="['finance:contrast:edit']"
+            v-hasPermi="['finance:payment:edit']"
             v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
           >审批进度</el-button
           >
@@ -157,7 +157,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['finance:charge:edit']"
+            v-hasPermi="['finance:payment:edit']"
             v-if="scope.row.fBillstatus <= 3"
           >修改
           </el-button>
@@ -166,7 +166,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['finance:charge:remove']"
+            v-hasPermi="['finance:payment:remove']"
             v-if="scope.row.fBillstatus <= 3"
           >删除
           </el-button>

src/views/warehouseBusiness/agreement/index.vue

@@ -97,7 +97,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd()"
-          v-hasPermi="['warehouseBusiness:agreement:add']"
+          v-hasPermi="['agreement:agreementStorage:add']"
         >新增
         </el-button>
       </el-col>
@@ -108,7 +108,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['warehouseBusiness:agreement:edit']"
+          v-hasPermi="['agreement:agreementStorage:edit']"
           v-if="form.fBillstatus === '2' || form.fBillstatus === '3'"
         >修改
         </el-button>
@@ -120,7 +120,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['warehouseBusiness:agreement:remove']"
+          v-hasPermi="['agreement:agreementStorage:remove']"
         >删除
         </el-button>
       </el-col>
@@ -130,7 +130,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['warehouseBusiness:agreement:export']"
+          v-hasPermi="['agreement:agreementStorage:export']"
         >导出
         </el-button>
       </el-col>
@@ -181,7 +181,7 @@
             icon="el-icon-view"
             @click="check(scope.row,0)"
             v-if="scope.row.fBillstatus == 6"
-            v-hasPermi="['warehouseBusiness:agreement:edit']"
+            v-hasPermi="['agreement:agreementStorage:edit']"
           >查看
           </el-button>
           <el-button
@@ -189,7 +189,7 @@
             type="text"
             icon="el-icon-view"
             @click="check(scope.row,1)"
-            v-hasPermi="['finance:contrast:edit']"
+            v-hasPermi="['agreement:agreementStorage:edit']"
             v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
           >审批进度
           </el-button>
@@ -199,7 +199,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['warehouseBusiness:agreement:edit']"
+            v-hasPermi="['agreement:agreementStorage:edit']"
           >修改
           </el-button>
           <el-button
@@ -207,7 +207,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['warehouseBusiness:agreement:remove']"
+            v-hasPermi="['agreement:agreementStorage:remove']"
           >删除
           </el-button>
         </template>

src/views/warehouseBusiness/inStock/index.vue

@@ -183,7 +183,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd(false)"
-          v-hasPermi="['warehouseBusiness:warehousebills:add']"
+          v-hasPermi="['warehouseBusiness:inStock:add']"
         >新增
         </el-button>
       </el-col>
@@ -194,7 +194,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+          v-hasPermi="['warehouseBusiness:inStock:edit']"
         >修改
         </el-button>
       </el-col>
@@ -205,7 +205,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['warehouseBusiness:warehousebills:remove']"
+          v-hasPermi="['warehouseBusiness:inStock:remove']"
           >删除
         </el-button>
       </el-col> -->
@@ -215,7 +215,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['warehouseBusiness:warehousebills:export']"
+          v-hasPermi="['warehouseBusiness:inStock:export']"
         >导出
         </el-button>
       </el-col>
@@ -226,7 +226,7 @@
           size="mini"
           @click="handleExport"
           :disabled="multiple"
-          v-hasPermi="['warehouseBusiness:warehousebills:export']"
+          v-hasPermi="['warehouseBusiness:inStock:export']"
         >导入
         </el-button>
       </el-col>
@@ -314,7 +314,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row, true)"
-            v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+            v-hasPermi="['warehouseBusiness:inStock:edit']"
           >查看
           </el-button>
           <el-button
@@ -327,7 +327,7 @@
               scope.row.fBillstatus === 3
             "
             @click="handleUpdate(scope.row, false)"
-            v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+            v-hasPermi="['warehouseBusiness:inStock:edit']"
           >修改
           </el-button>
           <el-button
@@ -336,7 +336,7 @@
             icon="el-icon-delete"
             v-if="scope.row.fBillstatus !== 6 && scope.row.fItemsStatus === 1"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['warehouseBusiness:warehousebills:remove']"
+            v-hasPermi="['warehouseBusiness:inStock:remove']"
           >删除
           </el-button>
           <el-button

src/views/warehouseBusiness/outStock/index.vue

@@ -182,8 +182,8 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd(false)"
-          v-hasPermi="['warehouseBusiness:warehousebills:add']"
-        >新增
+          v-hasPermi="['warehouseBusiness:outStock:add']"
+          >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -193,8 +193,8 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['warehouseBusiness:warehousebills:edit']"
-        >修改
+          v-hasPermi="['warehouseBusiness:outStock:edit']"
+          >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -203,8 +203,8 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['warehouseBusiness:warehousebills:export']"
-        >导出
+          v-hasPermi="['warehouseBusiness:outStock:export']"
+          >导出
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -214,8 +214,8 @@
           size="mini"
           @click="handleExport"
           :disabled="multiple"
-          v-hasPermi="['warehouseBusiness:warehousebills:export']"
-        >导入
+          v-hasPermi="['warehouseBusiness:outStock:export']"
+          >导入
         </el-button>
       </el-col>
       <right-toolbar
@@ -293,8 +293,8 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row, true)"
-            v-hasPermi="['warehouseBusiness:warehousebills:edit']"
-          >查看
+            v-hasPermi="['warehouseBusiness:outStock:edit']"
+            >查看
           </el-button>
           <el-button
             size="mini"
@@ -306,8 +306,8 @@
               scope.row.fBillstatus === 3
             "
             @click="handleUpdate(scope.row, false)"
-            v-hasPermi="['warehouseBusiness:warehousebills:edit']"
-          >修改
+            v-hasPermi="['warehouseBusiness:outStock:edit']"
+            >修改
           </el-button>
           <el-button
             size="mini"
@@ -315,16 +315,8 @@
             icon="el-icon-delete"
             v-if="scope.row.fBillstatus !== 6 && scope.row.fItemsStatus === 1"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['warehouseBusiness:warehousebills:remove']"
-          >删除
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-if="scope.row.fBillstatus == 4"
-            @click="handleUpdate(scope.row, true)"
-          >审核进度
+            v-hasPermi="['warehouseBusiness:outStock:remove']"
+            >删除
           </el-button>
         </template>
       </el-table-column>
@@ -3846,7 +3838,7 @@ export default {
   height: 50px;
   text-align: center;
   border-right: 1px solid #dfe6ec !important;
-  order-bottom: 1px solid #dfe6ec !important;
+  // order-bottom: 1px solid #dfe6ec !important;
   border-bottom: 1px solid #dfe6ec !important;
 }
 .el-table thead th {

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -182,7 +182,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd(false)"
-          v-hasPermi="['warehouseBusiness:warehousebills:add']"
+          v-hasPermi="['warehouseBusiness:stockTransfer:add']"
           >新增
         </el-button>
       </el-col>
@@ -193,7 +193,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+          v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
           >修改
         </el-button>
       </el-col>
@@ -203,7 +203,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['warehouseBusiness:warehousebills:export']"
+          v-hasPermi="['warehouseBusiness:stockTransfer:export']"
           >导出
         </el-button>
       </el-col>
@@ -214,7 +214,7 @@
           size="mini"
           @click="handleExport"
           :disabled="multiple"
-          v-hasPermi="['warehouseBusiness:warehousebills:export']"
+          v-hasPermi="['warehouseBusiness:stockTransfer:export']"
           >导入
         </el-button>
       </el-col>
@@ -292,7 +292,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row, true)"
-            v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+            v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
             >查看
           </el-button>
           <el-button
@@ -301,7 +301,7 @@
             icon="el-icon-edit"
             v-if="scope.row.fBillstatus <= 3"
             @click="handleUpdate(scope.row, false)"
-            v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+            v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
             >修改
           </el-button>
           <el-button
@@ -310,7 +310,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-if="scope.row.fBillstatus <= 3"
-            v-hasPermi="['warehouseBusiness:warehousebills:remove']"
+            v-hasPermi="['warehouseBusiness:stockTransfer:remove']"
             >删除
           </el-button>
         </template>

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -106,7 +106,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd(false)"
-          v-hasPermi="['warehouseBusiness:warehousebills:add']"
+          v-hasPermi="['warehouseBusiness:storageFeeCalculation:add']"
         >新增
         </el-button>
       </el-col>
@@ -117,7 +117,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+          v-hasPermi="['warehouseBusiness:storageFeeCalculation:edit']"
         >修改
         </el-button>
       </el-col>
@@ -128,7 +128,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['warehouseBusiness:warehousebills:remove']"
+          v-hasPermi="['warehouseBusiness:storageFeeCalculation:remove']"
         >删除
         </el-button>
       </el-col>
@@ -138,7 +138,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['warehouseBusiness:warehousebills:export']"
+          v-hasPermi="['warehouseBusiness:storageFeeCalculation:export']"
         >导出
         </el-button>
       </el-col>
@@ -149,7 +149,7 @@
           size="mini"
           @click="handleExport"
           :disabled="multiple"
-          v-hasPermi="['warehouseBusiness:warehousebills:export']"
+          v-hasPermi="['warehouseBusiness:storageFeeCalculation:export']"
         >导入
         </el-button>
       </el-col>
@@ -228,7 +228,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row, true)"
-            v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+            v-hasPermi="['warehouseBusiness:storageFeeCalculation:edit']"
           >查看
           </el-button>
           <el-button
@@ -236,7 +236,7 @@
             type="text"
             icon="el-icon-view"
             @click="check(scope.row,1)"
-            v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+            v-hasPermi="['warehouseBusiness:storageFeeCalculation:edit']"
             v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
           >审批进度</el-button
           >
@@ -246,7 +246,7 @@
             icon="el-icon-edit"
             v-if="scope.row.fBillstatus <= 3"
             @click="handleUpdate(scope.row, false)"
-            v-hasPermi="['warehouseBusiness:warehousebills:edit']"
+            v-hasPermi="['warehouseBusiness:storageFeeCalculation:edit']"
           >修改
           </el-button>
           <el-button
@@ -255,7 +255,7 @@
             icon="el-icon-delete"
             v-if="scope.row.fBillstatus <= 3"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['warehouseBusiness:warehousebills:remove']"
+            v-hasPermi="['warehouseBusiness:storageFeeCalculation:remove']"
           >删除
           </el-button>
         </template>