代储合同记录

src/api/V2/contract/index.js

@@ -94,3 +94,9 @@ export const API_POST_STORAGEFEERECORDCHARGE = '/storageFeeRecordCharge/api/addC
 
 // 代储收费记录
 export const API_GET_FEERECORD = '/storageFeeRecordCharge/feeRecord'
+
+// 代储记录终止
+export const API_POST_STOP = '/storageFeeRecord/editInfo'
+
+// 代储费导出
+export const API_POST_STORAGEFEERECORDEXPORT = '/storageFeeRecord/export'

src/lang/zh.js

@@ -504,7 +504,7 @@ export default {
     storageContractAdd: '代储合同  /  添加',
     storageContractEdit: '代储合同  /  编辑',
     storageContractExamine: '代储合同  /  查看',
-    storageContractRecord:'代储合同  /  记录',
+    storageContractRecord:'代储合同  /  代储费',
     purchaseContractExamine: '现货采购合同  /  查看',
     salesContract: '现货销售合同',
     salesContractEdit: '现货销售合同  /  编辑',

src/model/contarct/index.js

@@ -40,7 +40,9 @@ import {
     API_POST_ADDSTORAGEFEERECORD,
     API_POST_EDITSTORAGEFEERECORD,
     API_POST_STORAGEFEERECORDCHARGE,
-    API_GET_FEERECORD
+    API_GET_FEERECORD,
+    API_POST_STOP,
+    API_POST_STORAGEFEERECORDEXPORT
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -134,5 +136,11 @@ export const editStorageRecordInfo = appRx.post(API_POST_EDITSTORAGEFEERECORD, e
 // 代储收费
 export const storageFeeRecordCharge = appRx.post(API_POST_STORAGEFEERECORDCHARGE, errorCatcher, errorHandle, filter)
 
-// 代储收费
+// 代储收费记录
 export const feeRecord = appRx.get(API_GET_FEERECORD, errorCatcher, errorHandle, filter)
+
+// 代储收费记录
+export const stopStorageFeeRecord = appRx.post(API_POST_STOP, errorCatcher, errorHandle, filter)
+
+// 代储费导出
+export const exportStorageFee = appRx.post(API_POST_STORAGEFEERECORDEXPORT)

src/views/contractManagement/collectionContractRecord.vue

@@ -178,8 +178,6 @@
                   </div>
                 </div>
                 <i class="el-icon-plus avatar-uploader-icon"></i>
-                
-                
               </el-upload>
             </div>
           </ws-info-table>

src/views/contractManagement/storageContract.vue

@@ -449,7 +449,7 @@
           }
         }
       },
-      fujian(row) {debugger
+      fujian(row) {
         this.id = row.id
         this.accessoryTFs = true
         this.appendixIdss = row.addressUrl
@@ -560,7 +560,7 @@
           })
       },
       //记录
-      handleRecord(row) {debugger
+      handleRecord(row) {
         this.$router.push({
           name: 'storageContractRecord',
           query: {
@@ -574,7 +574,8 @@
             storageFeeStartdate:row.storageFeeStartdate,
             storageFeeEnddate:row.storageFeeEnddate,
             storageFeeWeight:row.storageFeeWeight,
-            contractId:row.id
+            contractId:row.id,
+            status:row.status
           },
         })
       },

src/views/platformAudit/component/routers/route.js

@@ -1,63 +1,105 @@
 import Layout from '@/layout/index';
 
-const contractManagementRouter = {
-  path: '/contractManagement',
+const platformauditRouter = {
+  path: '/platformaudit',
   component: Layout,
-  redirect: '/contractManagement',
-  name: 'platformAudit',
+  redirect: '/platformaudit',
+  name: 'platformaudit',
   alwaysShow: true, // will always show the root menu
   meta: {
-    title: 'platformAudit',
-    module: 'contractManagement',
-    icon: '-hetongguanli'
+    title: 'platformaudit',
+    module: 'audit',
+    icon: '-shenhe'
   },
   children: [
+
+    //粮商审核
     {
-      path: 'salesContract',
+      path: 'grainmerchantreview',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/salesContract'),
-      name: 'salesContract',
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainmerchantreview'),
+      name: 'grainmerchantreview',
       meta: {
-        title: 'salesContract',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract',
+        title: 'grainmerchantreview',
+        shortcutEntrance: 'grainmerchantreview',
+        module: 'audit.grainMerchant.grainMerchantInfo',
         permissicon: [],
         keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      }
+      },
     },
-    // 司机审核
+
+    //司机审核
     {
-      path: 'driverAudit',
+      path: 'driverreview',
       component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/contractManagement/purchaseContract'),
-      name: 'driveraudit',
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/driverreview'),
+      name: 'driverreview',
       meta: {
-        title: 'driveraudit',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract',
+        title: 'driverreview',
+        shortcutEntrance: 'driverreview',
+        module: 'audit.driverMerchant.driverMerchantInfo',
         permissicon: [],
         keepAlive: true
-      }
+      },
     },
+
+    //采购交易信息审核
     {
-      path: 'purchaseContractExamine',
+      path: 'transactioninformationreview',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/purchaseContractExamine'),
-      name: 'purchaseContractExamine',
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/transactioninformationreview'),
+      name: 'transactioninformationreview',
       meta: {
-        title: 'purchaseContractExamine',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract.buyContractInfo.view',
+        title: 'transactioninformationreview',
+        shortcutEntrance: 'transactioninformationreview',
+        module: 'audit.tranMerchant.tranMerchantInfo',
         permissicon: [],
         keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
       },
-      hidden: true
     },
-    
-  ],
 
+    //销售交易信息审核
+    {
+      path: 'saletransactioninformationreview',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/saletransactioninformationreview'),
+      name: 'saletransactioninformationreview',
+      meta: {
+        title: 'saletransactioninformationreview',
+        shortcutEntrance: 'saletransactioninformationreview',
+        module: 'audit.tranMerchant.tranMerchantInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+    },
+    //粮脉企业审核
+    {
+      path: 'grainpulseenterprisereview',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainpulseenterprisereview'),
+      name: 'grainpulseenterprisereview',
+      meta: {
+        title: 'grainpulseenterprisereview',
+        shortcutEntrance: 'grainpulseenterprisereview',
+        module: 'audit.tranMerchant.tranMerchantInfo',
+        permissicon: [],
+        keepAlive: true
+      },
+    },
+    //粮脉动态审核
+    {
+      path: 'grainPulseDynamic',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainPulseDynamic'),
+      name: 'grainPulseDynamic',
+      meta: {
+        title: 'grainPulseDynamic',
+        shortcutEntrance: 'grainPulseDynamic',
+        module: 'audit.grainMerchant.grainMerchantInfo.review',
+        permissicon: [],
+        keepAlive: true
+      },
+    },
+  ],
 };
-
-export default contractManagementRouter;
+export default platformauditRouter;

src/views/warehousenew/warehouseManagementIoss.vue

@@ -277,7 +277,6 @@ export default {
   },
   methods: {
     binNumberChange(e){
-      debugger
        this.deptBudgetList.positionId = this.binnumberList[e].id
        this.deptBudgetList.binNumber = this.binnumberList[e].binNumber
        this.deptBudgetList1.binNumber = this.binnumberList[e].binNumber