物资管理-库存修改

src/api/materialManagement/WareHouseService.js

@@ -22,6 +22,13 @@ export default class WareHouseService {
       params: param
     })
   }
+  collectHistoryList (param) {
+    return request({
+      url: '/material/management/wareHouse/collectHistoryList',
+      method: 'get',
+      params: param
+    })
+  }
   wareHouseSummaryList (param) {
     return request({
       url: '/material/management/wareHouse/wareHouseSummaryList',

src/views/modules/materialManagement/wareHouse/WareHouseAddForm.vue

@@ -60,18 +60,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="合同编号" prop="contractNo"
+            <el-form-item label="采购编号" prop="purchaseNo"
                           :rules="[]">
-              <el-input size="medium" :readonly="true" @focus="openContractChooseForm()" v-model="inputForm.contractNo" placeholder="请选择采购编号">
-                <el-button slot="append" icon="el-icon-search" @click="openContractChooseForm()"></el-button>
+              <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
+                <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="采购编号" prop="purchaseNo"
+            <el-form-item label="合同编号" prop="contractNo"
                           :rules="[]">
-              <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
-                <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
+              <el-input size="medium" :readonly="true" @focus="openContractChooseForm()" v-model="inputForm.contractNo" placeholder="请选择采购编号">
+                <el-button slot="append" icon="el-icon-search" @click="openContractChooseForm()"></el-button>
               </el-input>
             </el-form-item>
           </el-col>

src/views/modules/materialManagement/wareHouse/WareHouseUpdateForm.vue

@@ -51,18 +51,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="合同编号" prop="contractNo"
+          <el-form-item label="采购编号" prop="purchaseNo"
                         :rules="[]">
-            <el-input size="medium" :readonly="true" @focus="openContractChooseForm()" v-model="inputForm.contractNo" placeholder="请选择采购编号">
-              <el-button slot="append" icon="el-icon-search" @click="openContractChooseForm()"></el-button>
+            <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
+              <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="采购编号" prop="purchaseNo"
+          <el-form-item label="合同编号" prop="contractNo"
                         :rules="[]">
-            <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
-              <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
+            <el-input size="medium" :readonly="true" @focus="openContractChooseForm()" v-model="inputForm.contractNo" placeholder="请选择采购编号">
+              <el-button slot="append" icon="el-icon-search" @click="openContractChooseForm()"></el-button>
             </el-input>
           </el-form-item>
         </el-col>

src/views/modules/materialManagement/wareHouseSummary/WareHouseHistory.vue

@@ -77,7 +77,7 @@
               :print-config="{}"
               @sort-change=""
               :sort-config="{remote:true}"
-              :data="dataList"
+              :data="collectList"
               :row-config="{isCurrent: true}"
               :radio-config="{trigger: 'row'}"
             >
@@ -187,6 +187,15 @@
           this.tableKey = Math.random()
           this.loading = false
         })
+        this.wareHouseService.collectHistoryList({
+          ...this.searchForm
+        }).then(({data}) => {
+          this.collectList = data.records
+          // this.collectList = data.collectList
+          this.tablePage.total = data.total
+          this.tableKey = Math.random()
+          this.loading = false
+        })
       },
       // 当前页
       currentChangeHandle ({currentPage, pageSize}) {