仓储增加权限，导出功能

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -2643,7 +2643,7 @@
         @click="submitForm()"
         >请核</el-button
       >
-      <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke"
+      <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke" v-hasPermi="['warehouseBusiness:revoke']"
         >撤销请核</el-button
       >
       <el-button

src/views/Warehousing/cargoClearance/index.vue

@@ -242,17 +242,6 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
-            type="warning"
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            :disabled="multiple"
-            v-hasPermi="['warehouseBusiness:stockTransfer:export']"
-            >导入
-          </el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
             type="info"
             icon="el-icon-download"
             size="mini"
@@ -1007,6 +996,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.$message.warning('功能开发中')
       // require.ensure([], () => {
       //   const { export_json_to_excel } = require("../../../excel/Export2Excel");
       //   const tHeader = ["客户名称", "制单日期"];

src/views/Warehousing/costModify/AddOrUpdate.vue

@@ -564,10 +564,8 @@
                 <span v-if="scope.row.fSrcTypeId == 10">费用变更</span>
               </template>
             </el-table-column>
-            <el-table-column prop="remarks" label="录入人" align="center"></el-table-column>
-            <el-table-column prop="remarks" label="录入日期" align="center"></el-table-column>
-            <el-table-column prop="remarks" label="审核人" align="center"></el-table-column>
-            <el-table-column prop="remarks" label="审核日期" align="center"></el-table-column>
+            <el-table-column prop="createBy" label="录入人" align="center"></el-table-column>
+            <el-table-column prop="createTime" label="录入日期" align="center"></el-table-column>
             <el-table-column prop="remarks" label="备注" align="center" width="180">
               <template slot-scope="scope">
                 <el-input

src/views/Warehousing/costModify/index.vue

@@ -753,6 +753,7 @@ export default {
       this.reset();
       detailWarehouseModify(id).then(res => {
         this.form = res.data
+        this.warehouseId = res.data.fPid
         this.feeList = res.data.tWarehousebillsfees
         this.formfeesList = res.data.warehousebillsfeesModifyList?res.data.warehousebillsfeesModifyList: []
         this.$nextTick(() => {

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -1746,7 +1746,7 @@
         @click="submitForm()"
         >请核</el-button
       >
-      <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke"
+      <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke" v-hasPermi="['warehouseBusiness:revoke']"
         >撤销请核</el-button
       >
       <el-button

src/views/Warehousing/goodsTransfer/index.vue

@@ -241,17 +241,6 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
-            type="warning"
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            :disabled="multiple"
-            v-hasPermi="['warehouseBusiness:stockTransfer:export']"
-            >导入
-          </el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
             type="info"
             icon="el-icon-download"
             size="mini"
@@ -1028,6 +1017,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.$message.warning('功能开发中')
       // require.ensure([], () => {
       //   const { export_json_to_excel } = require("../../../excel/Export2Excel");
       //   const tHeader = ["客户名称", "制单日期"];

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -4432,7 +4432,7 @@
       >请核
       </el-button
       >
-      <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke"
+      <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke" v-hasPermi="['warehouseBusiness:revoke']"
       >撤销请核
       </el-button
       >

src/views/Warehousing/inAndOutStock/index.vue

@@ -967,6 +967,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.$message.warning('功能开发中')
       // require.ensure([], () => {
       //   const { export_json_to_excel } = require("../../../excel/Export2Excel");
       //   const tHeader = ["客户名称", "制单日期"];

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -3678,7 +3678,7 @@
               <td>入库日期</td>
               <td colspan="2">{{ form.fBsdate | fBsdateFormat }}</td>
               <td>仓管员</td>
-              <td colspan="2">{{ form.createBy }}</td>
+              <td colspan="2">{{ form.fStorekeeper }}</td>
             </tr>
             <tr>
               <td>出库日期</td>
@@ -6252,7 +6252,7 @@
           @click="submitForm()"
       >请核
       </el-button>
-      <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke"
+      <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke" v-hasPermi="['warehouseBusiness:revoke']"
       >撤销请核
       </el-button
       >

src/views/Warehousing/inStock/index.vue

@@ -307,17 +307,6 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
-            type="warning"
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            :disabled="multiple"
-            v-hasPermi="['warehouseBusiness:inStock:export']"
-          >导入
-          </el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
             type="info"
             icon="el-icon-download"
             size="mini"
@@ -606,6 +595,7 @@ import {
   delinStock_s,
   delWarehousebills,
   getWarehousebills,
+  exportWarehousebills,
 } from "@/api/warehouseBusiness/warehouseInStock";
 import { listCorps } from "@/api/basicdata/corps";
 import { listWarehousesss } from "@/api/basicdata/warehouse";
@@ -615,6 +605,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Cookies from "js-cookie";
 import { addSet, select, resetModule } from "@/api/system/set";
 import draggable from "vuedraggable";
+
 export default {
   name: "plans",
   data() {
@@ -1250,6 +1241,15 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.$confirm('是否确认导出', '警告', {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        exportWarehousebills(this.queryParams).then(res => {
+          this.download(res.msg);
+        })
+      })
       // require.ensure([], () => {
       //   const { export_json_to_excel } = require("../../../excel/Export2Excel");
       //   const tHeader = ["客户名称", "制单日期"];

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -4164,7 +4164,7 @@
       >请核
       </el-button
       >
-      <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke"
+      <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke" v-hasPermi="['warehouseBusiness:revoke']"
       >撤销请核
       </el-button
       >

src/views/Warehousing/outStock/index.vue

@@ -272,17 +272,6 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
-            type="warning"
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            :disabled="multiple"
-            v-hasPermi="['warehouseBusiness:outStock:export']"
-            >导入
-          </el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
             type="info"
             icon="el-icon-download"
             size="mini"
@@ -545,6 +534,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Cookies from "js-cookie";
 import { addSet, select, resetModule } from "@/api/system/set";
 import draggable from "vuedraggable";
+
 export default {
   name: "plans",
   data() {
@@ -1106,6 +1096,15 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.$confirm('是否确认导出', '警告', {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        exportWarehousebills(this.queryParams).then(res => {
+          this.download(res.msg);
+        })
+      })
       // require.ensure([], () => {
       //   const { export_json_to_excel } = require("../../../excel/Export2Excel");
       //   const tHeader = ["客户名称", "制单日期"];

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -3301,7 +3301,7 @@
         @click="submitForm()"
         >请核</el-button
       >
-      <el-button type="danger" v-if="form.fBillstatus == 6" @click="revoke"
+      <el-button type="danger" v-if="form.fBillstatus == 6" @click="revoke" v-hasPermi="['warehouseBusiness:revoke']"
         >撤销请核</el-button
       >
       <el-button

src/views/Warehousing/stockTransfer/index.vue

@@ -242,17 +242,6 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
-            type="warning"
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            :disabled="multiple"
-            v-hasPermi="['warehouseBusiness:stockTransfer:export']"
-            >导入
-          </el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
             type="info"
             icon="el-icon-download"
             size="mini"
@@ -1042,6 +1031,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.$message.warning('功能开发中')
       // require.ensure([], () => {
       //   const { export_json_to_excel } = require("../../../excel/Export2Excel");
       //   const tHeader = ["客户名称", "制单日期"];