Ver código fonte

1.入库详情页添加备案序号,并使数据回显,方便库总账导出分类监管时携带为账册序号报送
2.仓储费添加界面更改仅查询仓储费协议客户数据接口
3.账单明细界面->显示费用起始日期、费用截止日期、原始入库日期

nzf 3 anos atrás
pai
commit
60f1f43b46

+ 9 - 0
src/api/basicdata/corps.js

@@ -10,6 +10,15 @@ export function listCorps(query) {
   })
 }
 
+// 查询仓储协议对应的客户详情列表
+export function agreementListCorps(query) {
+  return request({
+    url: '/basicdata/corps/agreementCorpList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询客户详情详细
 export function getCorps(fId) {
   return request({

+ 14 - 0
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -505,6 +505,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8" v-if="showfCustomno">
+            <el-form-item
+              label="备案序号"
+              prop="fEmsSeqNo"
+            >
+              <el-input
+                v-model="form.fEmsSeqNo"
+                style="width: 80%"
+                placeholder="备案序号"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
 
       <el-row>

+ 41 - 18
src/views/finance/query/index.vue

@@ -475,7 +475,8 @@ export default {
           name: "审核日期",
           checked: 0,
           width: 100,
-        },{
+        },
+        {
           surface: "6",
           label: "feeName",
           name: "费用名称",
@@ -488,120 +489,142 @@ export default {
           name: "费用状态",
           checked: 0,
           width: 100,
-        },{
+        },
+        {
           surface: "8",
+          label: "fChargedate",
+          name: "费用起始日期",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "9",
+          label: "fBillingDeadline",
+          name: "费用截止日期",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "10",
+          label: "fOriginalbilldate",
+          name: "原始入库日期",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "10",
           label: "fDc",
           name: "收/付",
           checked: 0,
           width: 100,
         },
         {
-          surface: "9",
+          surface: "11",
           label: "fAmount",
           name: "金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "10",
+          surface: "12",
           label: "fStlamount",
           name: "结算金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "11",
+          surface: "13",
           label: "fStlamountDate",
           name: "结算日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "12",
+          surface: "14",
           label: "fInvamount",
           name: "开票金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "13",
+          surface: "15",
           label: "fInvnos",
           name: "发票号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "14",
+          surface: "16",
           label: "fAccamount",
           name: "对账金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "15",
+          surface: "17",
           label: "fAccamountDate",
           name: "对账日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "16",
+          surface: "18",
           label: "fStatementNo",
           name: "对账单号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "17",
+          surface: "19",
           label: "fFeeunitid",
           name: "计价单位",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "20",
           label: "fQty",
           name: "数量",
           checked: 0,
           width: 100,
         },
         {
-          surface: "19",
+          surface: "21",
           label: "fUnitprice",
           name: "单价",
           checked: 0,
           width: 100,
         },
         {
-          surface: "20",
+          surface: "22",
           label: "fBilltype",
           name: "业务类型",
           checked: 0,
           width: 100,
         },
         {
-          surface: "21",
+          surface: "23",
           label: "fStltypeid",
           name: "结算方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "22",
+          surface: "24",
           label: "fProductName",
           name: "货物名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "23",
+          surface: "25",
           label: "fShipper",
           name: "发货方(货主)",
           checked: 0,
           width: 130,
         },
         {
-          surface: "24",
+          surface: "26",
           label: "remark",
           name: "备注",
           checked: 0,

+ 4 - 4
src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -1129,7 +1129,7 @@ import {
 import {listUser, queryUserVal} from "@/api/system/user";
 import {listGoods} from "@/api/basicdata/goods";
 import {listFees} from "@/api/basicdata/fees";
-import {listCorps} from "@/api/basicdata/corps";
+import { agreementListCorps, listCorps } from '@/api/basicdata/corps'
 import moment from 'moment'
 import AddOrUpdate from '@/views/viewApproval'
 import ApprovalComments from '@/views/startApproval'
@@ -1446,7 +1446,7 @@ export default {
       rules: {
         fCorpid: [{required: true, message: " ", trigger: "blur",}],
         fBillingDeadline: [{required: true, message: " ", trigger: "blur",}],
-        fGoodsid: [{required: true, message: " ", trigger: "blur",}]
+        fGoodsid: [{required: false, message: " ", trigger: "blur",}]
       },
       pickerOptions: {
         shortcuts: [{
@@ -1818,7 +1818,7 @@ export default {
     calculateCost() {
       this.countstate = true
       if (!this.form.fCorpid || !this.form.fBillingDeadline) {
-        this.$message({message: '请维护货权方以及,仓储费计算截止日期', type: 'warning'})
+        this.$message({message: '请维护客户名称以及,仓储费计算截止日期', type: 'warning'})
         this.countstate = false
         return false
       }
@@ -2282,7 +2282,7 @@ export default {
         return false;
       }
       let queryParams = {pageNum: 1, pageSize: 10, fName: name};
-      listCorps(queryParams).then((response) => {
+      agreementListCorps(queryParams).then((response) => {
         this.fMblnoOptions = response.rows;
       });
     },