1

src/lang/zh.js

@@ -1027,7 +1027,7 @@ export default {
     dynamicReportsDetail: '动态报详情',
 
     // 库内自采
-    houseSelfCollect: '收购业务管理',
+    houseSelfCollect: '入库管理',
     deliverywarehouse:'出库管理',
     customerManagement: '客户管理',
     acquisitionManagement: '仓库设置',
@@ -1035,7 +1035,7 @@ export default {
     inspectionManagementrecord:'质检管理记录',
     paymentManagement: '付款管理',
     weighingManagement: '检斤管理',
-    newWeighingManagement: '新检斤管理',
+    newWeighingManagement: '检斤管理',
     weightCheckRecord: '检斤记录',
     houseSelfCollectPrint: '查看',
     acquisitionManagementAdd: '收购管理',
@@ -7458,8 +7458,8 @@ export default {
     paymentManagement: '付款管理',
     weighingManagement: '检斤管理',
     weighingManagement: '检斤管理',
-    newWeighingManagement: '新检斤管理',
-    houseSelfCollect: '收购业务管理',
+    newWeighingManagement: '检斤管理',
+    houseSelfCollect: '入库管理',
     deliverywarehouse:'出库管理',
     houseSelfCollectPrint: '查看',
     customerManagementEdit: '客户管理编辑',

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

@@ -112,14 +112,28 @@ const houseSelfCollectRouter = {
         // keepAlive:true
       }
     },
-    // 检斤管理
-    {
-      path: 'weighingManagement',
+    // // 检斤管理
+    // {
+    //   path: 'weighingManagement',
+    //   component: () =>
+    //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weighingManagement'),
+    //   name: 'weighingManagement',
+    //   meta: {
+    //     title: 'weighingManagement',
+    //     shortcutEntrance: 'houseSelfCollect',
+    //     module: 'acquisitionManagement.acquisitionWeight.view',
+    //     permissicon: [],
+    //     keepAlive: true
+    //   }
+    // },
+     // 新检斤管理
+     {
+      path: 'newWeighingManagement',
       component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weighingManagement'),
-      name: 'weighingManagement',
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/newWeighingManagement'),
+      name: 'newWeighingManagement',
       meta: {
-        title: 'weighingManagement',
+        title: 'newWeighingManagement',
         shortcutEntrance: 'houseSelfCollect',
         module: 'acquisitionManagement.acquisitionWeight.view',
         permissicon: [],
@@ -196,20 +210,7 @@ const houseSelfCollectRouter = {
       },
       hidden: true
     },
-    // 新检斤管理
-    {
-      path: 'newWeighingManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/newWeighingManagement'),
-      name: 'newWeighingManagement',
-      meta: {
-        title: 'newWeighingManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionWeight.view',
-        permissicon: [],
-        keepAlive: true
-      }
-    },
+   
     // 记录
     {
       path: 'weightCheckRecord',

src/views/houseSelfCollect/settlement.vue

@@ -188,7 +188,7 @@
                 placeholder="请输入粮款" maxlength="100" size="small" disabled />
             </ws-form-item>
             <!-- 采购合同 自运 按合同的出库净重计算 -->
-            <ws-form-item v-if='paymentList.contractManagement' label="粮款 = 出库净重 x  (干粮单价 - 扣单价)  =" span="1" prop="waterContent"
+            <ws-form-item v-if='paymentList.contractManagement' label="粮款 = 出库净重 x  (单价 - 扣单价)  =" span="1" prop="waterContent"
               class="formItem">
               <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' v-model="paymentList.grainMoney"
                 placeholder="请输入粮款" maxlength="100" size="small" disabled />