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

src/api/agreement/agreement.js

@@ -28,7 +28,7 @@ export function listGoods(query) {
 // 查询仓储费列表
 export function listAgreement(query) {
   return request({
-    url: '/warehouseBusiness/agreementTask/list',
+    url: '/warehouseBusiness/agreementitems/list',
     method: 'get',
     params: query
   })

src/views/warehouseBusiness/inStock/index.vue

@@ -738,7 +738,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-form-item disabled label="仓储计费日期" prop="fChargedate">
                 <el-date-picker
                   v-model="form.fChargedate"
@@ -749,9 +749,9 @@
                 >
                 </el-date-picker>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
-          <el-row>
+          <!-- <el-row>
             <el-col :span="8">
               <el-form-item label="计费方式" prop="fBillingway">
                 <el-select
@@ -769,7 +769,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            </el-row>
+            </el-row> -->
         </div>
       </el-form>
 
@@ -1507,7 +1507,7 @@
         </el-button> -->
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
         <!-- <el-button type="warning">仓储费协议</el-button> -->
-        <el-button type="danger">作业费协议</el-button></div>
+        <el-button type="danger" @click.prevent="addAgreements()" >作业费协议</el-button></div>
         <div style="font-size:18px">付款信息</div>
 
       </div>
@@ -1777,10 +1777,86 @@
           <el-table-column label="行号" type="index" width="80">
             </el-table-column>
           <el-table-column
-            prop="fMblno"
+            prop="fCorpid"
+            header-align="center"
+            align="center"
+            label="客户名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="计价单位"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fGoodsid"
+            header-align="center"
+            align="center"
+            label="单价"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fQtyblc"
+            header-align="center"
+            align="center"
+            label="录入人"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fBegindate"
+            header-align="center"
+            align="center"
+            label="录入时间"
+          >
+          </el-table-column>
+          <!-- <el-table-column
+            prop="fMarks"
+            header-align="center"
+            align="center"
+            label="唛头"
+          >
+          </el-table-column> -->
+        </el-table>
+        <pagination
+          v-show="whgenlegTotal > 0"
+          :total="whgenlegTotal"
+          :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 @click="warehousingagreements = false">取 消</el-button>
+        </div>
+      </el-dialog>
+       <!-- 选择作业费协议数据 -->
+      <el-dialog
+        title="作业费协议"
+        :modal="false"
+        style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
+        :visible.sync="warehousingagreements"
+        width="70%"
+      >
+        <el-table
+          :data="tasklegList"
+          ref="table"
+          tooltip-effect="dark"
+          width="100%"
+          border
+          stripe
+          @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="fCorpid"
             header-align="center"
             align="center"
-            label="费用名称"
+            label="客户名称"
           >
           </el-table-column>
           <el-table-column
@@ -1806,7 +1882,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="fWarehouseLocationid"
+            prop="fBegindate"
             header-align="center"
             align="center"
             label="录入时间"
@@ -1828,7 +1904,7 @@
           @pagination="getWhgenlegList"
         />
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="">导入</el-button>
+          <el-button type="primary" @click="zhgenlegData">导入</el-button>
           <el-button @click="warehousingagreement = false">取 消</el-button>
         </div>
       </el-dialog>
@@ -1906,7 +1982,7 @@
             <td width="100">入库重量</td>
             <td width="100">入库件数</td>
           </tr>
-          <tr v-for="(item,index) in dataListSelection" :key="index">
+          <tr v-for="(item,index) in Printinglist" :key="index">
             <td width="100">{{index+1}}</td>
             <td width="100">{{item.fBsdate}}</td>
             <td width="100">{{item.fCntqty}}</td>
@@ -1997,7 +2073,7 @@
 
             </td> -->
           </tr>
-          <tr v-for="(item,index) in dataListSelection" :key="index">
+          <tr v-for="(item,index) in Printinglist" :key="index">
             <td width="250">货物品名:</td>
             <!-- <td width="200" colspan="">1</td> -->
             <td width="250">{{item.fGoodsids}}</td>
@@ -2009,7 +2085,7 @@
           <!-- <tr>
             <td width="1400" colspan="6">&nbsp;</td>
           </tr> -->
-          <tr v-for="(item,index) in dataListSelection" :key="index">
+          <tr v-for="(item,index) in Printinglist" :key="index">
             <td>备注:</td>
             <td colspan="5">{{item.remark}}</td>
           </tr>
@@ -2081,7 +2157,7 @@
               出库日期：{{fBsdate}}
             </td>
           </tr>
-          <tr v-for="(item,index) in dataListSelection" :key="index">
+          <tr v-for="(item,index) in Printinglist" :key="index">
             <td width="200">车号</td>
             <td width="200">{{item.fTruckno}}</td>
             <td width="200">货物品名</td>
@@ -2169,6 +2245,7 @@ export default {
       browseStatus: false,
       detailsHidden: false,
       warehousingagreement: false,
+      warehousingagreements: false,
       formBrowseStatus: false,
       fTruckno: '',
       fBsdate: '',
@@ -2228,6 +2305,7 @@ export default {
       // 作业费协议
       tasklegList: [],
       whgenlegTotal: 0,
+      Printinglist: [],
        // 库存明细入账数组
       dataListSelection: [],
        // 库存明细撤回入账数组
@@ -2314,22 +2392,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        fBillno: null,
-        fDeptid: null,
-        fContractno: null,
         fCorpid: 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,
+        fLineno: null,
       },
       // 表单参数
       form: {
@@ -2351,6 +2415,9 @@ export default {
             trigger: "blur",
           },
         ],
+        fFeetunit: [
+          { required: true, message: " ", trigger: "blur" },
+        ],
         fChargedate: [
           { required: true, message: " ", trigger: "blur" },
         ],
@@ -2449,15 +2516,44 @@ export default {
         createTime: Date.parse(new Date()),
       });
     },
-    // 新增仓储协议
+    // 新增作业费协议
     addAgreement () {
-    this.whgenlegList = [];
+      console.log("222")
+      console.log(this.form.fCorpid)
+      if(!this.form.fCorpid) {
+        this.$message({
+          message: "请维护货权方",
+          type: "warning",
+        });
+      } else {
+      this.whgenlegList = [];
       this.dialogWhgenlegList = [];
       this.whgenlegTotal = 0;
       this.warehousingagreement = true;
       // this.whgenlegData()
-      this.getWhgenlegList();
+      this.getWhgenlegList(); 
+      }
+    
     },
+    // 新增付款作业费协议
+    addAgreements () {
+      console.log("333")
+    if(!this.form.fCorpid) {
+        this.$message({
+          message: "请维护货权方",
+          type: "warning",
+        });
+      } else {
+      this.whgenlegList = [];
+      this.dialogWhgenlegList = [];
+      this.whgenlegTotal = 0;
+      this.warehousingagreement = true;
+      // this.whgenlegData()
+      this.getWhgenlegList(); 
+      }
+    },
+   
+
     // 新增list
     addRelevant() {
       let time = null;
@@ -2487,13 +2583,14 @@ export default {
 
     // 收货单打印界面
     showEditDialog_s() {
-      if(this.dataListSelection.length>0) {
-      for(let aorp in this.dataListSelection){
-          var date = new Date(this.dataListSelection[aorp].fBsdate)
+      console.log(this.dataListSelection)
+      if(this.Printinglist.length>0) {
+      for(let aorp in this.Printinglist){
+          var date = new Date(this.Printinglist[aorp].fBsdate)
           var Y = date.getFullYear() + '-'
           var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
           var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
-          this.$set(this.dataListSelection[aorp], 'fBsdate', Y + M + D)
+          this.$set(this.Printinglist[aorp], 'fBsdate', Y + M + D)
      }
 
       this.editDialogVisible_s = true;
@@ -2515,14 +2612,15 @@ export default {
 
     },
     showEditDialog_ss() {
-      if(this.dataListSelection.length>0) {
+      console.log(this.dataListSelection)
+      if(this.Printinglist.length>0) {
       this.editDialogVisible_ss = true;
       }else {
         this.$message.error("请选择需要打印的明细!");
       }
     },
     showEditDialog_sss() {
-       if(this.dataListSelection.length>0) {
+       if(this.Printinglist.length>0) {
       this.editDialogVisible_sss = true;
       }else {
         this.$message.error("请选择需要打印的明细!");
@@ -2589,6 +2687,8 @@ export default {
     },
      // 查询作业费信息
     getWhgenlegList() {
+      // this.queryParams.fCorpid = this.form.fCorpid;
+      this.queryParams.fLineno = this.form.fCorpid;
       listAgreement(this.queryParams).then((response) => {
         console.log(response)
         this.tasklegList = response.rows;
@@ -2597,15 +2697,28 @@ export default {
       });
 
     },
-    // 导入仓储费协议
-    // whgenlegData() {
-    //   listAgreement(this.queryParams).then(response => {
-    //     console.log(response)
-    //     this.agreementList = response.rows
-    //     this.total = response.total
-    //     this.loading = false
-    //   })
-    // },
+    // 导入付款信息
+    whgenlegData() {
+      console.log(this.dialogWhgenlegList)
+      for (let whgen in this.dialogWhgenlegList) {
+        this.warehouseDrList.push({
+          fCorpid: this.dialogWhgenlegList[whgen].fCorpid,
+
+        });
+      }
+      this.warehousingagreement = false;
+      
+    },
+    zhgenlegData () {
+       console.log(this.dialogWhgenlegList)
+      for (let zhgen in this.dialogWhgenlegList) {
+        this.warehouseCrList.push({
+          fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
+
+        });
+      }
+      this.warehousingagreements = false;
+    },
     // 贸易方式(数据字典),对���t_trademodels 字典翻译
     fTrademodeidFormat(row, column) {
       return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);
@@ -2724,6 +2837,8 @@ export default {
     },
     // 库存明细多选
     Selectinventory(selection) {
+      console.log(selection)
+      this.Printinglist = selection;
       this.dataListSelection = []
       if (!selection || selection.length === 0) {
         return false
@@ -3067,6 +3182,7 @@ export default {
     },
     // 撤回入账
     withdrawClick() {
+      console.log("@@@")
       // 撤回入库
       let formData = new window.FormData();
       formData.append("warehouseBills", JSON.stringify(this.form))

src/views/warehouseBusiness/outStock/index.vue

@@ -742,7 +742,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-form-item disabled label="仓储计费日期" prop="fChargedate">
                 <el-date-picker
                   v-model="form.fChargedate"
@@ -753,9 +753,9 @@
                 >
                 </el-date-picker>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
-          <el-row>
+          <!-- <el-row>
             <el-col :span="8">
               <el-form-item label="计费方式" prop="fBillingway">
                 <el-select
@@ -773,7 +773,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            </el-row>
+            </el-row> -->
         </div>
       </el-form>
 
@@ -1224,8 +1224,8 @@
           >删除
         </el-button> -->
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
-        <el-button type="warning">仓储费协议</el-button>
-        <el-button type="danger">作业费协议</el-button>
+        <el-button type="warning" @click.prevent="addStorage()">仓储费协议</el-button>
+        <el-button type="danger" @click.prevent="addAgreement()">作业费协议</el-button>
         </div>
         <div style="font-size:18px;">收款信息</div>
       </div>
@@ -1459,8 +1459,8 @@
           >删除
         </el-button> -->
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
-        <el-button type="warning">仓储费协议</el-button>
-        <el-button type="danger">作业费协议</el-button>
+        <el-button type="warning" @click.prevent="addStorages()">仓储费协议</el-button>
+        <el-button type="danger" @click.prevent="addAgreements()">作业费协议</el-button>
          </div> 
          <div style="font-size:18px">付款信息</div>
        
@@ -1773,7 +1773,306 @@
           <el-button @click="whgenlegVisible = false">取 消</el-button>
         </div>
       </el-dialog>
-
+<!-- 选择作业费协议 -->
+      <el-dialog
+        title="作业费协议"
+        :modal="false"
+        style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
+        :visible.sync="warehousingagreement"
+        width="70%"
+      >
+        <el-table
+          :data="tasklegList"
+          ref="table"
+          tooltip-effect="dark"
+          width="100%"
+          border
+          stripe
+          @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="fCorpid"
+            header-align="center"
+            align="center"
+            label="客户名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="计价单位"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fGoodsid"
+            header-align="center"
+            align="center"
+            label="单价"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fQtyblc"
+            header-align="center"
+            align="center"
+            label="录入人"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fBegindate"
+            header-align="center"
+            align="center"
+            label="录入时间"
+          >
+          </el-table-column>
+          <!-- <el-table-column
+            prop="fMarks"
+            header-align="center"
+            align="center"
+            label="唛头"
+          >
+          </el-table-column> -->
+        </el-table>
+        <pagination
+          v-show="whgenlegTotal > 0"
+          :total="whgenlegTotal"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getWhgenlegList"
+        />
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="whgenlegDatas">导入</el-button>
+          <el-button @click="warehousingagreements = false">取 消</el-button>
+        </div>
+      </el-dialog>
+       <!-- 选择作业费协议数据 -->
+      <el-dialog
+        title="作业费协议"
+        :modal="false"
+        style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
+        :visible.sync="warehousingagreements"
+        width="70%"
+      >
+        <el-table
+          :data="tasklegList"
+          ref="table"
+          tooltip-effect="dark"
+          width="100%"
+          border
+          stripe
+          @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="fCorpid"
+            header-align="center"
+            align="center"
+            label="客户名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="计价单位"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fGoodsid"
+            header-align="center"
+            align="center"
+            label="单价"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fQtyblc"
+            header-align="center"
+            align="center"
+            label="录入人"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fBegindate"
+            header-align="center"
+            align="center"
+            label="录入时间"
+          >
+          </el-table-column>
+          <!-- <el-table-column
+            prop="fMarks"
+            header-align="center"
+            align="center"
+            label="唛头"
+          >
+          </el-table-column> -->
+        </el-table>
+        <pagination
+          v-show="whgenlegTotal > 0"
+          :total="whgenlegTotal"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getWhgenlegList"
+        />
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="zhgenlegData">导入</el-button>
+          <el-button @click="warehousingagreement = false">取 消</el-button>
+        </div>
+      </el-dialog>
+       <!-- 选择仓储费协议数据 -->
+      <el-dialog
+        title="仓储费协议"
+        :modal="false"
+        style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
+        :visible.sync="storageAgreement"
+        width="70%"
+      >
+        <el-table
+          :data="whgenlegList"
+          ref="table"
+          tooltip-effect="dark"
+          width="100%"
+          border
+          stripe
+          @selection-change="whgenlegSelectionChange"
+        >
+          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column
+            prop="fMblno"
+            header-align="center"
+            align="center"
+            label="提单号"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="入库日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fGoodsids"
+            header-align="center"
+            align="center"
+            label="品名"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fQtyblc"
+            header-align="center"
+            align="center"
+            label="结余数量"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fWarehouseLocationids"
+            header-align="center"
+            align="center"
+            label="库区"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fMarks"
+            header-align="center"
+            align="center"
+            label="唛头"
+          >
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="whgenlegTotal > 0"
+          :total="whgenlegTotal"
+          :page.sync="whgenlegParams.pageNum"
+          :limit.sync="whgenlegParams.pageSize"
+          @pagination="getWhgenlegList"
+        />
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="whgenlegData">导入</el-button>
+          <el-button @click="whgenlegVisible = false">取 消</el-button>
+        </div>
+      </el-dialog>
+       <!-- 选择仓储费协议数据 -->
+      <el-dialog
+        title="仓储费协议"
+        :modal="false"
+        style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
+        :visible.sync="storageAgreements"
+        width="70%"
+      >
+        <el-table
+          :data="whgenlegList"
+          ref="table"
+          tooltip-effect="dark"
+          width="100%"
+          border
+          stripe
+          @selection-change="whgenlegSelectionChange"
+        >
+          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column
+            prop="fMblno"
+            header-align="center"
+            align="center"
+            label="提单号"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="入库日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fGoodsids"
+            header-align="center"
+            align="center"
+            label="品名"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fQtyblc"
+            header-align="center"
+            align="center"
+            label="结余数量"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fWarehouseLocationids"
+            header-align="center"
+            align="center"
+            label="库区"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fMarks"
+            header-align="center"
+            align="center"
+            label="唛头"
+          >
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="whgenlegTotal > 0"
+          :total="whgenlegTotal"
+          :page.sync="whgenlegParams.pageNum"
+          :limit.sync="whgenlegParams.pageSize"
+          @pagination="getWhgenlegList"
+        />
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="whgenlegData">导入</el-button>
+          <el-button @click="whgenlegVisible = false">取 消</el-button>
+        </div>
+      </el-dialog>
       <el-dialog
         title="入库页面"
         :modal="false"
@@ -2085,6 +2384,9 @@ import {
   updateWarehousebills,
   exportWarehousebills,
 } from "@/api/warehouseBusiness/warehouseOutStock";
+import { listAgreement } from '@/api/agreement/agreement';
+
+import { listAgreements } from '@/api/warehouseBusiness/agreement';
 
 import { listCorps } from "@/api/basicdata/corps";
 
@@ -2113,6 +2415,8 @@ export default {
       fFeeUnitids: "",
       formBrowseStatus: false,
       detailsHidden: false,
+      warehousingagreement: false,
+      warehousingagreements: false,
        fTruckno: '',
       fBsdate: '',
       fCntrtype: '',
@@ -2153,6 +2457,8 @@ export default {
       editDialogVisible_ss: false,
       editDialogVisible_sss: false,
       editDialogClosed_ss: false,
+      storageAgreements: false,
+      storageAgreement: false,
       dataList: [],
       warehouseCrList: [],
       warehouseDrList: [],
@@ -2178,6 +2484,8 @@ export default {
       // 货权方(客户数据)
       // 客户名称
       KHblnoOptions: [],
+      // 作业费协议
+      tasklegList: [],
       Pledgebank: [],
       fSbuOptions: [],
       // 操作员
@@ -2211,6 +2519,12 @@ export default {
       fWbuOptions: [],
       // 计价单位
       jFeetunitOptions: [],
+         // 作业费参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fCorpid: null
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -2288,6 +2602,10 @@ export default {
         fMarks: [
           { required: true, message: " ", trigger: "blur" },
         ],
+        
+        fFeeUnitid: [
+          { required: true, message: " ", trigger: "blur" },
+        ],
         fChargedate: [
           { required: true, message: " ", trigger: "blur" },
         ],
@@ -2325,6 +2643,7 @@ export default {
   },
   created() {
     this.getList();
+
     this.getDicts("data_trademodes").then((response) => {
       this.fTrademodeidOptions = response.data;
     });
@@ -2377,6 +2696,119 @@ export default {
         createTime: Date.parse(new Date()),
       });
     },
+    // 新增作业费协议
+    addAgreement () {
+      console.log("222")
+      if(!this.form.fCorpid) {
+        this.$message({
+          message: "请维护货权方",
+          type: "warning",
+        });
+      } else {
+    this.whgenlegList = [];
+      this.dialogWhgenlegList = [];
+      this.whgenlegTotal = 0;
+      this.warehousingagreement = true;
+      // this.whgenlegData()
+      this.getWhgenlegListt();
+      }
+    },
+    // 新增付款作业费协议
+    addAgreements () {
+      console.log("333")
+      if(!this.form.fCorpid) {
+        this.$message({
+          message: "请维护货权方",
+          type: "warning",
+        });
+      } else {
+    this.whgenlegList = [];
+      this.dialogWhgenlegList = [];
+      this.whgenlegTotal = 0;
+      this.warehousingagreements = true;
+      // this.whgenlegData()
+      this.getWhgenlegListt();
+      }
+    },
+     // 新增仓储费协议
+    addStorage () {
+    if(!this.form.fCorpid) {
+        this.$message({
+          message: "请维护货权方",
+          type: "warning",
+        });
+      } else {
+      this.whgenlegList = [];
+      this.dialogWhgenlegList = [];
+      this.whgenlegTotal = 0;
+      this.storageAgreement = true;
+      // this.whgenlegData()
+      this.getAgreement(); 
+      }
+    },
+      // 新增仓储费协议
+    addStorages () {
+    if(!this.form.fCorpid) {
+        this.$message({
+          message: "请维护货权方",
+          type: "warning",
+        });
+      } else {
+      this.whgenlegList = [];
+      this.dialogWhgenlegList = [];
+      this.whgenlegTotal = 0;
+      this.storageAgreements = true;
+      // this.whgenlegData()
+      this.getAgreementt(); 
+      }
+    },
+    // 查询仓储费协议
+    getAgreement() {
+       this.queryParams.fCorpid = this.form.fCorpid;
+      listAgreements(this.queryParams).then((response) => {
+        console.log(response)
+        this.tasklegList = response.rows;
+        console.log(this.whgenlegList);
+        this.whgenlegTotal = response.total;
+      });
+    },
+    // 查询仓储费协议
+    getAgreementt() {
+
+    },
+      // 查询作业费信息
+    getWhgenlegListt() {
+      this.queryParams.fCorpid = this.form.fCorpid;
+      listAgreement(this.queryParams).then((response) => {
+        console.log(response)
+        this.tasklegList = response.rows;
+        console.log(this.whgenlegList);
+        this.whgenlegTotal = response.total;
+      });
+
+    },
+     // 导入付款信息
+    whgenlegDatas() {
+      console.log(this.dialogWhgenlegList)
+      for (let whgen in this.dialogWhgenlegList) {
+        this.warehouseDrList.push({
+          fCorpid: this.dialogWhgenlegList[whgen].fCorpid,
+
+        });
+      }
+      this.warehousingagreement = false;
+      
+    },
+    zhgenlegData () {
+       console.log(this.dialogWhgenlegList)
+      for (let zhgen in this.dialogWhgenlegList) {
+        this.warehouseCrList.push({
+          fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
+
+        });
+      }
+      this.warehousingagreements = false;
+    },
     // 新增list
     addRelevant() {
       let corpidStatus =
@@ -2441,6 +2873,7 @@ export default {
     },
     // 收货单打印界面
     showEditDialog_s() {
+      console.log(this.Printinglist)
       if(this.Printinglist.length>0) {
       for(let aorp in this.Printinglist){
           var date = new Date(this.Printinglist[aorp].fBsdate)
@@ -2478,6 +2911,7 @@ export default {
       }
     },
     showEditDialog_sss() {
+      console.log(this.Printinglist)
       if(this.Printinglist.length>0) {
       this.editDialogVisible_sss = true;
       }else {