费用协议

src/views/agreement/agreementTask/index.vue

@@ -536,6 +536,7 @@ export default {
     getList() {
       this.loading = true
       listAgreement(this.queryParams).then(response => {
+        console.log(response)
         this.agreementList = response.rows
         this.total = response.total
         this.loading = false

src/views/warehouseBusiness/agreement/index.vue

@@ -556,6 +556,7 @@ export default {
     getList() {
       this.loading = true
       listAgreement(this.queryParams).then(response => {
+        console.log(response)
         this.agreementList = response.rows
         this.total = response.total
         this.loading = false

src/views/warehouseBusiness/inStock/index.vue

@@ -1175,7 +1175,7 @@
           >新行
         </el-button>
         </div>
-         <div>附件明细</div>
+         <div style="font-size:18px">附件明细</div>
       </div>
       <el-table
         :data="relevantAttachments"
@@ -1760,14 +1760,14 @@
       </div>
       <!-- 选择库存总账数据 -->
       <el-dialog
-        title="仓储费协议"
+        title="作业费协议"
         :modal="false"
         style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
         :visible.sync="warehousingagreement"
         width="70%"
       >
         <el-table
-          :data="whgenlegList"
+          :data="tasklegList"
           ref="table"
           tooltip-effect="dark"
           width="100%"
@@ -1776,11 +1776,13 @@
           @selection-change="whgenlegSelectionChange"
         >
           <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column label="行号" type="index" width="80">
+            </el-table-column>
           <el-table-column
             prop="fMblno"
             header-align="center"
             align="center"
-            label="提单号"
+            label="费用名称"
           >
           </el-table-column>
           <el-table-column
@@ -1788,52 +1790,52 @@
             header-align="center"
             align="center"
             width="180px"
-            label="入库日期"
+            label="计价单位"
           >
           </el-table-column>
           <el-table-column
             prop="fGoodsid"
             header-align="center"
             align="center"
-            label="品名"
+            label="单价"
           >
           </el-table-column>
           <el-table-column
             prop="fQtyblc"
             header-align="center"
             align="center"
-            label="结余数量"
+            label="录入人"
           >
           </el-table-column>
           <el-table-column
             prop="fWarehouseLocationid"
             header-align="center"
             align="center"
-            label="库区"
+            label="录入时间"
           >
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="fMarks"
             header-align="center"
             align="center"
             label="唛头"
           >
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
         <pagination
           v-show="whgenlegTotal > 0"
           :total="whgenlegTotal"
-          :page.sync="whgenlegParams.pageNum"
-          :limit.sync="whgenlegParams.pageSize"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
           @pagination="getWhgenlegList"
         />
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="whgenlegData">导入</el-button>
+          <el-button type="primary" @click="">导入</el-button>
           <el-button @click="warehousingagreement = false">取 消</el-button>
         </div>
       </el-dialog>
       <el-dialog
-        title="入库页面"
+        title=""
         :modal="false"
         style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
         :visible.sync="editDialogVisible_s"
@@ -1954,7 +1956,7 @@
         <button @click="printSomething">打印</button>
       </el-dialog>
       <el-dialog
-        title="收货单打印"
+        title=""
         style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
         :visible.sync="editDialogVisible_ss"
         width="70%"
@@ -2041,7 +2043,7 @@
         <button @click="printSomething">打印</button>
       </el-dialog>
        <el-dialog
-        title="收货单打印"
+        title=""
         style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
         :visible.sync="editDialogVisible_sss"
         width="70%"
@@ -2144,7 +2146,7 @@ import {
   updateWarehousebills,
   exportWarehousebills,
 } from "@/api/warehouseBusiness/warehouseInStock";
-
+import { listAgreement } from '@/api/agreement/agreement';
 import { listCorps } from "@/api/basicdata/corps";
 
 import { listFees } from "@/api/basicdata/fees";
@@ -2224,8 +2226,8 @@ export default {
       // 货权方(客户数据)
       // 客户名称
       KHblnoOptions: [],
-      // 仓储费协议
-      whgenlegList: [],
+      // 作业费协议
+      tasklegList: [],
       whgenlegTotal: 0,
        // 库存明细入账数组
       dataListSelection: [],
@@ -2307,13 +2309,26 @@ export default {
         fCntrtype: null,
         fCntqty: null,
       },
-         // 库存总账参数
-      whgenlegParams: {
+         // 作业费参数
+      queryParams: {
         pageNum: 1,
         pageSize: 10,
-        fMblno: null,
+        fBillno: null,
+        fDeptid: null,
+        fContractno: null,
         fCorpid: null,
-        fWarehouseid: null,
+        fStltypeid: null,
+        fGoodsid: null,
+        fFeetypeid: null,
+        tPackages: null,
+        fTrademodeid: null,
+        fFreedays: null,
+        fBegindate: null,
+        fEnddate: null,
+        fBillstatus: null
+        // fMblno: null,
+        // fCorpid: null,
+        // fWarehouseid: null,
       },
       // 表单参数
       form: {
@@ -2439,6 +2454,7 @@ export default {
       this.dialogWhgenlegList = [];
       this.whgenlegTotal = 0;
       this.warehousingagreement = true;
+      // this.whgenlegData()
       this.getWhgenlegList();
     },
     // 新增list
@@ -2570,14 +2586,25 @@ export default {
         this.loading = false;
       });
     },
-     // 查询仓储费信息
+     // 查询作业费信息
     getWhgenlegList() {
+      listAgreement(this.queryParams).then((response) => {
+        console.log(response)
+        this.whgenlegList = response.rows;
+        console.log(this.whgenlegList);
+        this.whgenlegTotal = response.total;
+      });
 
     },
     // 导入仓储费协议
-    whgenlegData() {
-
-    },
+    // whgenlegData() {
+    //   listAgreement(this.queryParams).then(response => {
+    //     console.log(response)
+    //     this.agreementList = response.rows
+    //     this.total = response.total
+    //     this.loading = false
+    //   })
+    // },
     // 贸易方式(数据字典),对���t_trademodels 字典翻译
     fTrademodeidFormat(row, column) {
       return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);