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

src/api/reportManagement/payable.js

@@ -46,7 +46,7 @@ export function delWhgenleg(fAccyear) {
 // 导出库存总账
 export function exportWhgenleg(query) {
   return request({
-    url: '/warehouseBusiness/whgenleg/export',
+    url: '/warehouseBusiness/payable/export',
     method: 'get',
     params: query
   })

src/api/reportManagement/profit.js

@@ -8,3 +8,12 @@ export function listpayable(query) {
     params: query
   })
 }
+
+// 导出库存总账
+export function exportWhgenleg(query) {
+  return request({
+    url: '/warehouseBusiness/profit/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/reportManagement/receivable.js

@@ -44,9 +44,9 @@ export function delWhgenleg(fAccyear) {
 }
 
 // 导出库存总账
-export function exportWhgenleg(query) {
+export function exporReceivable(query) {
   return request({
-    url: '/warehouseBusiness/whgenleg/export',
+    url: '/warehouseBusiness/receivable/export',
     method: 'get',
     params: query
   })

src/api/warehouseBusiness/goodsTransfer.js

@@ -111,3 +111,12 @@ export function delgoodsTransfer_s(fId) {
     method: 'delete'
   })
 }
+
+// 导出仓库主调拨
+export function exportgoodsTransfer(query) {
+  return request({
+    url: '/warehouseBusiness/goodsTransfer/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/warehouseBusiness/storageFeeCalculation.js

@@ -100,3 +100,11 @@ export function delstorageFeeCalculation_s(fId) {
     method: 'delete'
   })
 }
+// 导出仓库主调拨
+export function exportWarehousebills(query) {
+  return request({
+    url: '/warehouseBusiness/storageFeeCalculation/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/finance/contrast/index.vue

@@ -266,7 +266,7 @@
             icon="el-icon-view"
             @click="check(scope.row, 1)"
             v-hasPermi="['finance:contrast:edit']"
-            v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
+            v-if="scope.row.fBillstatus == '提交审核'  || scope.row.fBillstatus == '审核中' "
             >审批进度</el-button
           >
           <el-button
@@ -275,7 +275,11 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['finance:contrast:edit']"
-            v-if="scope.row.fBillstatus <= 3"
+            v-if="
+              scope.row.fBillstatus == '保存' ||
+              scope.row.fBillstatus == '暂存'  ||
+              scope.row.fBillstatus == '审批驳回'
+            "
           >
             修改</el-button
           >
@@ -286,7 +290,11 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['finance:contrast:remove']"
-            v-if="scope.row.fBillstatus <= 3"
+            v-if="
+              scope.row.fBillstatus == '保存' ||
+              scope.row.fBillstatus == '暂存'  ||
+              scope.row.fBillstatus == '审批驳回'
+            "
             >删除</el-button
           >
         </template>
@@ -1924,7 +1932,7 @@ export default {
       //   this.total = response.total;
       //   this.loading = false;
       // });
-      listFleet(this.tablefilter).then((response) => {
+      listFee(this.tablefilter).then((response) => {
         this.contrastList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/reportManagement/Statistics/index.vue

@@ -578,7 +578,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有库存总账数据项?', "警告", {
+      this.$confirm('是否确认导出所出入库统计数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

src/views/reportManagement/generalLedgerCr/index.vue

@@ -126,7 +126,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['warehouseBusiness:whgenleg:export']"
+          v-hasPermi="['warehouseBusiness:payable:export']"
         >导出</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -471,7 +471,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有库存总账数据项?', "警告", {
+      this.$confirm('是否确认导出所有应付总账数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

src/views/reportManagement/generalLedgerDr/index.vue

@@ -125,7 +125,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['warehouseBusiness:whgenleg:export']"
+          v-hasPermi="['warehouseBusiness:receivable:export']"
         >导出</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -235,7 +235,7 @@
 </template>
 
 <script>
-import { listWhgenleg, getWhgenleg, delWhgenleg, addWhgenleg, updateWhgenleg, exportWhgenleg } from "@/api/reportManagement/receivable";
+import { listWhgenleg, getWhgenleg, delWhgenleg, addWhgenleg, updateWhgenleg, exporReceivable } from "@/api/reportManagement/receivable";
 import {listWarehouse} from "@/api/basicdata/warehouse";
 import {listArea} from "@/api/basicdata/area";
 import {listGoods} from "@/api/basicdata/goods";
@@ -470,12 +470,12 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有库存总账数据项?', "警告", {
+      this.$confirm('是否确认导出所有应收总账数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          return exportWhgenleg(queryParams);
+          return exporReceivable(queryParams);
         }).then(response => {
           this.download(response.msg);
         })

src/views/reportManagement/profitGeneralLedger/index.vue

@@ -167,7 +167,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['warehouseBusiness:whgenleg:export']"
+          v-hasPermi="['warehouseBusiness:profit:export']"
         >导出
         </el-button>
       </el-col>
@@ -485,7 +485,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams
-      this.$confirm('是否确认导出所有库存总账数据项?', '警告', {
+      this.$confirm('是否确认导出所有利润总账数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/reportManagement/whgenleg/index.vue

@@ -139,13 +139,14 @@
       <el-table-column label="属性详情" align="center" prop="fMarks" width="120"/>
       <el-table-column label="品名" align="center" prop="fGoodsids" width="120"/>
       <el-table-column label="仓库" sortable align="center" prop="fWarehouseids" width="120"/>
-      <el-table-column
+      <el-table-column label="贸易方式" sortable align="center" prop="fTrademodeid" width="120"/>
+<!--      <el-table-column
         label="贸易方式"
         align="center"
         prop="fTrademodeid"
         :formatter="fTrademodeidFormat"
         width="120"
-      />
+      />-->
       <el-table-column label="入库件数" align="center" prop="fQtyD" width="120"/>
 <!--      <el-table-column label="入库尺码" align="center" prop="fVolumnD" />-->
       <el-table-column label="入库毛重(kg)" align="center" prop="fGrossweightD" width="120"/>

src/views/warehouseBusiness/cargoClearance/index.vue

@@ -2947,7 +2947,7 @@ export default {
         },
         {
           surface: "8",
-          label: "createTime",
+          label: "fBsdate",
           name: "调拨日期",
           checked: 0,
           width: 100,
@@ -3061,7 +3061,7 @@ export default {
         },
         {
           surface: "8",
-          label: "createTime",
+          label: "fBsdate",
           name: "调拨日期",
           checked: 0,
           width: 100,
@@ -5225,6 +5225,7 @@ export default {
           }
           if (dataList.length !== 0) {
             let formData = new window.FormData();
+            formData.append("type", "2");
             formData.append("warehouseBills", JSON.stringify(this.form));
             formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
             formData.append("warehousebillsitems", JSON.stringify(dataList));
@@ -5281,6 +5282,7 @@ export default {
       }
       let formData = new window.FormData();
       let withdrawList = JSON.parse(JSON.stringify(this.dataWithdrawList))
+      formData.append("type","2");
       formData.append("warehouseBills", JSON.stringify(this.form));
       formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
       formData.append("warehousebillsitems", JSON.stringify(this.dataWithdrawList));

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -376,7 +376,11 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.fBillstatus <= 3"
+            v-if="
+              scope.row.fBillstatus == '录入' ||
+              scope.row.fBillstatus == '暂存'  ||
+              scope.row.fBillstatus == '驳回'
+            "
             @click="handleUpdate(scope.row, false)"
             v-hasPermi="['warehouseBusiness:goodsTransfer:edit']"
           >修改
@@ -385,7 +389,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.fBillstatus === 4 || scope.row.fBillstatus === 5"
+            v-if="scope.row.fBillstatus == '请核'  || scope.row.fBillstatus == '审核中' "
             @click="check(scope.row)"
             v-hasPermi="['warehouseBusiness:goodsTransfer:edit']"
           >审批进度
@@ -394,7 +398,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.fItemsStatus === 1"
+            v-if="scope.row.fItemsStatus == '计划'"
             @click="handleDelete(scope.row)"
             v-hasPermi="['warehouseBusiness:goodsTransfer:remove']"
           >删除
@@ -1808,7 +1812,7 @@
     warehouseSubmission,
     delGoodsTransfer,
     delgoodsTransfer_s,
-    exportGoodsTransfer
+    exportgoodsTransfer
   } from '@/api/warehouseBusiness/goodsTransfer'
   import { updateCredit } from '@/api/warehouseBusiness/goodsTransfer'
   import { listCorps } from '@/api/basicdata/corps'

src/views/warehouseBusiness/inStock/index.vue

@@ -417,9 +417,9 @@
             type="text"
             icon="el-icon-edit"
             v-if="
-              scope.row.fBillstatus === 1 ||
-              scope.row.fBillstatus === 2 ||
-              scope.row.fBillstatus === 3
+              scope.row.fBillstatus == '录入' ||
+              scope.row.fBillstatus == '暂存'  ||
+              scope.row.fBillstatus == '驳回'
             "
             @click="handleUpdate(scope.row, false)"
             v-hasPermi="['warehouseBusiness:inStock:edit']"
@@ -429,7 +429,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.fItemsStatus === 1"
+            v-if="scope.row.fItemsStatus == '计划'"
             @click="handleDelete(scope.row)"
             v-hasPermi="['warehouseBusiness:inStock:remove']"
           >删除
@@ -438,7 +438,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.fBillstatus === 4 || scope.row.fBillstatus === 5"
+            v-if="scope.row.fBillstatus == '请核'  || scope.row.fBillstatus == '审核中' "
             @click="handleUpdate(scope.row, true)"
           >审核进度
           </el-button>

src/views/warehouseBusiness/outStock/index.vue

@@ -394,9 +394,9 @@
             type="text"
             icon="el-icon-edit"
             v-if="
-              scope.row.fBillstatus === 1 ||
-              scope.row.fBillstatus === 2 ||
-              scope.row.fBillstatus === 3
+              scope.row.fBillstatus == '录入' ||
+              scope.row.fBillstatus == '暂存'  ||
+              scope.row.fBillstatus == '驳回'
             "
             @click="handleUpdate(scope.row, false)"
             v-hasPermi="['warehouseBusiness:outStock:edit']"
@@ -406,7 +406,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.fItemsStatus === 1"
+            v-if="scope.row.fItemsStatus == '计划'"
             @click="handleDelete(scope.row)"
             v-hasPermi="['warehouseBusiness:outStock:remove']"
           >删除
@@ -415,7 +415,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.fBillstatus === 4 || scope.row.fBillstatus === 5"
+            v-if="scope.row.fBillstatus == '请核'  || scope.row.fBillstatus == '审核中' "
             @click="handleUpdate(scope.row, true)"
           >审核进度
           </el-button>

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -385,7 +385,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.fBillstatus === 4 || scope.row.fBillstatus === 5"
+            v-if="scope.row.fBillstatus == '请核'  || scope.row.fBillstatus == '审核中' "
             @click="check(scope.row, true)"
             v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
           >审批进度
@@ -394,7 +394,11 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.fBillstatus <= 3"
+            v-if="
+              scope.row.fBillstatus == '录入' ||
+              scope.row.fBillstatus == '暂存'  ||
+              scope.row.fBillstatus == '驳回'
+            "
             @click="handleUpdate(scope.row, false)"
             v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
             >修改
@@ -404,7 +408,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.fItemsStatus === 1"
+            v-if="scope.row.fItemsStatus == '计划'"
             v-hasPermi="['warehouseBusiness:stockTransfer:remove']"
             >删除
           </el-button>
@@ -2929,7 +2933,7 @@ export default {
         },
         {
           surface: "8",
-          label: "createTime",
+          label: "fBsdate",
           name: "调拨日期",
           checked: 0,
           width: 100,
@@ -3043,7 +3047,7 @@ export default {
         },
         {
           surface: "8",
-          label: "createTime",
+          label: "fBsdate",
           name: "调拨日期",
           checked: 0,
           width: 100,
@@ -5199,6 +5203,7 @@ export default {
           }
           if (dataList.length !== 0) {
             let formData = new window.FormData();
+            formData.append("type", "1");
             formData.append("warehouseBills", JSON.stringify(this.form));
             formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
             formData.append("warehousebillsitems", JSON.stringify(dataList));

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -282,14 +282,14 @@
         sortable
         prop="fBillstatus"
       >
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span v-if="scope.row.fBillstatus === 1">新建</span>
           <span v-if="scope.row.fBillstatus === 2">暂存</span>
           <span v-if="scope.row.fBillstatus === 3">审核驳回</span>
           <span v-if="scope.row.fBillstatus === 4">提交审核</span>
           <span v-if="scope.row.fBillstatus === 5">审核中</span>
           <span v-if="scope.row.fBillstatus === 6">审核通过</span>
-        </template>
+        </template>-->
       </el-table-column>
       <el-table-column
         label="制单人"
@@ -327,14 +327,18 @@
             icon="el-icon-view"
             @click="handleUpdate(scope.row, true)"
             v-hasPermi="['warehouseBusiness:storageFeeCalculation:edit']"
-            v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
+            v-if="scope.row.fBillstatus == '请核'  || scope.row.fBillstatus == '审核中' "
           >审批进度</el-button
           >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.fBillstatus <= 3"
+            v-if="
+              scope.row.fBillstatus == '录入' ||
+              scope.row.fBillstatus == '暂存'  ||
+              scope.row.fBillstatus == '驳回'
+            "
             @click="handleUpdate(scope.row, false)"
             v-hasPermi="['warehouseBusiness:storageFeeCalculation:edit']"
           >修改
@@ -343,7 +347,11 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.fBillstatus <= 3"
+            v-if="
+              scope.row.fBillstatus == '录入' ||
+              scope.row.fBillstatus == '暂存'  ||
+              scope.row.fBillstatus == '驳回'
+            "
             @click="handleDelete(scope.row)"
             v-hasPermi="['warehouseBusiness:storageFeeCalculation:remove']"
           >删除
@@ -1009,7 +1017,8 @@
     updateStorageFeeCalculation,
     exportStorageFeeCalculation,
     exportWarehousebillsitems,
-    delstorageFeeCalculation_s
+    delstorageFeeCalculation_s,
+    exportWarehousebills
   } from "@/api/warehouseBusiness/storageFeeCalculation";
   import { listUser, queryUserVal } from "@/api/system/user";
   import { listGoods } from "@/api/basicdata/goods";