业务修改

src/components/board/board.vue

@@ -501,7 +501,7 @@ export default {
     // this.SRConnection()
     /* 10秒轮询一次 */
     this.lxTimer = setInterval(() => {
-      this.getList()
+      //this.getList()
     }, 5000)
     this.getTime()
   },

src/components/my-modal-pay/index.vue

@@ -39,7 +39,7 @@
             class="col"
             style="padding: 0 5px;flex: 1;display: flex;align-items: flex-start;"
             v-if="
-              formData.applyPurType === 0 || formData.applyPurType === '物料'
+              formData.type === 0 || formData.type === '物料'
             "
           >
             <div class="label" style="width: 70px;">采购部门：</div>
@@ -84,7 +84,7 @@
           >
             <div class="label" style="width: 70px;">申购类型：</div>
             <div class="value" v-if="type === 'add'">
-              <Select v-model="formData.applyPurType">
+              <Select v-model="formData.type">
                 <Option
                   v-for="item in purTypeList"
                   :value="item.value"
@@ -94,7 +94,7 @@
               </Select>
             </div>
             <div class="value" v-if="type === 'form'" style="flex: 1;">
-              {{ formData.applyPurType }}
+              {{ formData.type }}
             </div>
           </div>
         </div>
@@ -107,16 +107,16 @@
             style="padding: 0 5px;flex: 1;display: flex;align-items: flex-start;"
           >
             <div class="label" style="width: 70px;">
-            <!-- {{ formData.applyPurType === 0 ? '申购说明：' : '申购内容' }} -->
+            <!-- {{ formData.type === 0 ? '申购说明：' : '申购内容' }} -->
               申购说明：
             </div>
             <div class="value" v-if="type === 'add'">
-              <Input v-model="formData.applyAccount" type="textarea" />
+              <Input v-model="formData.remark" type="textarea" />
             </div>
             <div class="value" v-if="type === 'form'" style="flex: 1;">
               {{
-                formData.applyPurType === '物料'
-                  ? formData.applyAccount
+                formData.type === '物料'
+                  ? formData.remark
                   : formData.purchaseContent
               }}
             </div>
@@ -126,7 +126,7 @@
       <!-- 副标题 -->
       <div
         class="sub"
-        v-if="formData.applyPurType === 0 || formData.applyPurType === '物料'"
+        v-if="formData.type === 0 || formData.type === '物料'"
         style="margin-bottom: 5px;display: flex;justify-content: space-between;align-items: center;"
       >
         <span
@@ -142,7 +142,7 @@
       <!-- 申购明细表格 -->
       <div
         class="table"
-        v-if="formData.applyPurType === 0 || formData.applyPurType === '物料'"
+        v-if="formData.type === 0 || formData.type === '物料'"
       >
         <table style="border-collapse:collapse;border:none;width: 100%;">
           <tr>
@@ -182,7 +182,7 @@
               操作
             </th>
           </tr>
-          <tr v-for="(item, index) in materialList" :key="index">
+          <tr v-for="(item, index) in applyDetailsList" :key="index">
             <td
               style="padding: 5px;text-align: center;border:solid #dcdee2 1px;position: relative;font-size: 12px;"
             >
@@ -206,10 +206,10 @@
             <td
               style="padding: 5px;text-align: center;border:solid #dcdee2 1px;position: relative;font-size: 12px;"
             >
-              <span v-if="type === 'form'">{{ item.purchaseQty }}</span>
+              <span v-if="type === 'form'">{{ item.quantity }}</span>
               <Input
                 v-if="type === 'add'"
-                v-model="item.purchaseQty"
+                v-model="item.quantity"
                 type="number"
               />
             </td>
@@ -314,7 +314,7 @@ export default {
     return {
       selectedList: [], // 用于表格勾选回填
       materialShow: false,
-      materialList: [],
+      applyDetailsList: [],
       purchaseFlowsList: [],
       modal: false,
       formData: {},
@@ -353,11 +353,11 @@ export default {
     value: {
       handler (n) {
         this.modal = n
-        this.$set(this.formData, 'applyPurType', 0)
+        this.$set(this.formData, 'type', 0)
         if (n) {
           if (this.type === 'form') {
             this.formData = { ...this.data }
-            this.materialList = this.formData.purDetails
+            this.applyDetailsList = this.formData.purDetails
             this.getApplyPurchaseFlows()
             console.log(this.formData)
           }
@@ -372,26 +372,26 @@ export default {
   methods: {
     // 删除已添加物料
     delRow (index) {
-      this.materialList.splice(index, 1)
+      this.applyDetailsList.splice(index, 1)
       this.selectedList.splice(index, 1)
     },
     // 添加物料
     getselectedList (data) {
       console.log('end--------------data')
       console.log(data)
-      this.materialList = []
+      this.applyDetailsList = []
       this.selectedList = data
       // 数据去重添加
       for (const select of data) {
         let flag = false
-        for (const item of this.materialList) {
+        for (const item of this.applyDetailsList) {
           if (select.code === item.materialCode) {
             flag = true
             break
           }
         }
         if (!flag) {
-          this.materialList.push({
+          this.applyDetailsList.push({
             materialCode: select.code,
             materialName: select.name,
             spec: select.spec
@@ -401,22 +401,24 @@ export default {
     },
     // 申购提交
     cfm () {
-      this.formData.materialList = this.materialList
+      this.formData.applyDetailsList = this.applyDetailsList
       // 选择申购类型不同时提交不同的字段
-      if (this.formData.applyPurType === 1) {
-        this.formData.purchaseContent = this.formData.applyAccount
+      if (this.formData.type === 1) {
+        this.formData.purchaseContent = this.formData.remark
       }
-      AddApplyPurchase(this.formData).then(res => {
-        if (res.code === 0) {
-          this.$Message.info('新增成功！')
-          this.$emit('cfm')
-          this.cancel()
-        }
-      })
+      this
+        .$post('/api/storage-restructure/applyPurchase/addFlowCreate', this.formData).then(res => {
+          if (res.code === 200) {
+            this.$Message.info('新增成功！')
+            this.$emit('cfm')
+            this.cancel()
+          }
+        })
+      
     },
     cancel () {
       this.formData = {}
-      this.materialList = []
+      this.applyDetailsList = []
       this.selectedList = []
       this.modal = false
     },
@@ -440,7 +442,7 @@ export default {
     if (this.modal && this.type === 'form') {
       console.log('???', this.modal, this.type)
       this.formData = { ...this.data }
-      this.materialList = this.formData.purDetails
+      this.applyDetailsList = this.formData.purDetails
     }
   }
 }

src/libs/http.js

@@ -71,11 +71,9 @@ axios.interceptors.response.use(
                 return
             }
             switch (err.response.data.code) {
-                
                 case 401:
                     Toast.fail('登录已失效，请重新登录')
                     router.push("/")
-
                     break;
                 case 403:
                     err.message = '拒绝访问(403)';
@@ -137,7 +135,7 @@ export function get(url, params = {}) {
         if(process.env.NODE_ENV == "development"){
             var getUrl = "http://" + window.location.host + "" + url
         }else{
-            var getUrl = "https://" + window.location.host + url
+            var getUrl = "http://" + window.location.host + url
         }
         axios.get(getUrl, {params:params})
             .then(response => {
@@ -163,7 +161,7 @@ export function post(url, data = {},params,headers) {
         if(process.env.NODE_ENV == "development"){
             var postUrl = "http://" + window.location.host + url
         }else{
-            var postUrl = "https://" + window.location.host + url
+            var postUrl = "http://" + window.location.host + url
         }
         axios.post(postUrl, data ,{
             params:params,

src/view/base-manage/warehouse-maintenance/warehouse-maintenance.vue

@@ -127,13 +127,13 @@ export default {
                   },
                   on: {
                     click: () => {
+                      const v = this
                       this.$MyModal.show({ text: '是否删除？' }).$on('confirm', () => {
-                        StockHouseDelete({
-                          id: params.row.id
-                        }).then(res => {
-                          if (res.code === 0) {
-                            this.$Message.info(res.msg)
-                            this.getList()
+                        this.$post('/api/storage-restructure/stockHouse/delete',
+                        {id: params.row.id}).then(res=>{
+                          if(res.code == 200){
+                            this.$Message.info('删除成功')
+                            v.getList()
                           }
                         })
                       })
@@ -176,21 +176,22 @@ export default {
   methods: {
     cfm (type, formData) {
       if (type === 'add') {
-        StockHouseAdd(formData).then(res => {
-          if (res.code === 0) {
+        this.$post('/api/storage-restructure/stockHouse/add',formData).then(res=>{
+          if(res.code == 200){
             this.show = false
-            this.$Message.info(res.msg)
+            this.$Message.info('新增成功')
             this.getList()
           }
         })
       } else if (type === 'edit') {
-        StockHouseUpdate(formData).then(res => {
-          if (res.code === 0) {
+        this.$post('/api/storage-restructure/stockHouse/edit',formData).then(res=>{
+          if(res.code == 200){
             this.show = false
-            this.$Message.info(res.msg)
+            this.$Message.info('编辑成功')
             this.getList()
           }
         })
+        
       }
     },
     // 检索条件事件处理
@@ -213,12 +214,16 @@ export default {
       this.getList()
     },
     getList () {
-      GetStockHousePageList(this.params).then(res => {
-        if (res.code === 0) {
-          this.data = res.result.list
-          this.params.total = res.result.totalCount
-        }
+      this.$post('/api/storage-restructure/stockHouse/page',this.params).then(res=>{
+        this.data = res.data.records
+        this.params.total = res.data.total
       })
+      // GetStockHousePageList(this.params).then(res => {
+      //   if (res.code === 0) {
+      //     this.data = res.result.list
+      //     this.params.total = res.result.totalCount
+      //   }
+      // })
     }
   },
   mounted () {

src/view/material-manege/contract/contract.vue

@@ -9,7 +9,7 @@
         <Button type="primary" style="width: 90px;" @click="search">查询</Button>
       </div>
       <div class="filter-item" style="">
-        <RadioGroup v-model="params.purContractState" @on-change="stateChange">
+        <RadioGroup v-model="params.status" @on-change="stateChange">
           <Radio :label="0">
             审批中
 <!--            <span style="color: #3F92F9">（{{ data.equelCount || 0 }}）</span>-->
@@ -38,7 +38,7 @@
         class="tab-item"
         v-for="(item, index) in titleData.amountItems"
         :key="index">
-        {{ item.dispalyName + item.amount }}
+        {{ item.name + item.amountMoney }}
       </div>
     </div>
     <div class="content">
@@ -372,7 +372,7 @@ export default {
                 click (e) {
                   e.stopPropagation()
                   _this.formData = { ...params.row }
-                  if (params.row.purContractState === 2 || params.row.purContractState === 3) {
+                  if (params.row.status === 2 || params.row.status === 3) {
                     _this.tabShow = true
                   } else {
                     _this.show = true
@@ -556,7 +556,7 @@ export default {
         },
         {
           name: 'RadioGroup',
-          value: 'purContractState',
+          value: 'status',
           list: [
             { label: '审批中', value: 0 },
             { label: '进行中', value: 1 },
@@ -575,7 +575,7 @@ export default {
         pageIndex: 1,
         pageSize: 20,
         total: 0,
-        purContractState: 0
+        status: 0
       }
     }
   },
@@ -677,7 +677,7 @@ export default {
         case 'search':
           this.params.pageIndex = 1
           this.params.keyWord = option.key
-          this.params.purContractState = option.purContractState
+          this.params.status = option.status
           this.getList()
           break
         case 'export':
@@ -701,7 +701,7 @@ export default {
     /* 到货通知 */
     purContractArrivalNotice () {
       if (!this.currentData.id) return this.$Message.error('请选择数据！')
-      if (this.currentData.purContractState !== 2) return this.$Message.error('订单未审批！')
+      if (this.currentData.status !== 2) return this.$Message.error('订单未审批！')
       PurContractArrivalNotice({ id: this.currentData.id }).then(res => {
         if (res.code === 0) {
           this.$Message.info('已向仓库发送到货通知！')
@@ -715,21 +715,18 @@ export default {
       this.getList()
     },
     getList () {
-      GetPurContractPageList(this.params).then(res => {
-        if (res.code === 0) {
-          this.data = res.result.list
-          this.params.total = res.result.totalCount
-        }
-      })
+      this
+        .$post('/api/storage-restructure/contract/page', this.params).then(res => {
+          if (res.code === 200) {
+            this.data = res.data.records
+            this.params.total = res.data.total
+          }
+        })
     },
     getPurContractTotal () {
-      GetPurContractTotal({
-        id: '',
-        purContractState: this.params.purContractState,
-        purchaseBillNo: this.params.purchaseBillNo
-      }).then(res => {
-        if (res.code === 0) {
-          this.titleData = res.result
+      this.$post('/api/storage-restructure/contract/amountStatistics',this.params).then(res => {
+        if (res.code === 200) {
+          this.titleData.amountItems = res.data
         }
       })
     }

src/view/material-manege/material-apply-detail/material-apply-detail.vue

@@ -284,15 +284,15 @@ export default {
     },
     getTypeList() {
       this.technologyType = ''
-      axios
-        .post('/cloudApi/applyPurchase/technologyTypeStatistics', {
+      this
+        .$post('/api/storage-restructure/applyPurchase/typeStatistics', {
           type: this.params.type,
           beginTime: this.params.beginTime,
           endTime: this.params.endTime,
           keyword: this.keyword
         })
         .then(res => {
-          this.typeList = res.data.data
+          this.typeList = res.data
         })
     },
     fabricAndInkClick(index) {
@@ -303,7 +303,9 @@ export default {
       })
     },
     getData(num, name) {
+      console.log(this.typeList)
       if (this.typeList[num] && this.typeList[num][name]) {
+        
         return this.typeList[num][name]
       } else {
         return '0'
@@ -512,8 +514,8 @@ export default {
       this.getList()
     },
     getHandleData() {
-      axios
-        .post('/cloudApi/applyPurchase/numStatistics', {
+      this
+        .$post('/api/storage-restructure/applyPurchase/flowStatistics', {
           type: this.params.type,
           beginTime: this.params.beginTime,
           endTime: this.params.endTime,
@@ -521,7 +523,7 @@ export default {
           technologyType: String(this.technologyType)
         })
         .then(res => {
-          this.tableFilter[0].list = res.data.data.map(item => {
+          this.tableFilter[0].list = res.data.map(item => {
             return {
               ...item,
               value: item.value || '',
@@ -532,8 +534,8 @@ export default {
     },
     getList() {
       this.$Spin.show()
-      axios
-        .post('/cloudApi/applyPurchase/page', {
+      this
+        .$post('/api/storage-restructure/applyPurchase/page', {
           ...this.params,
           type: this.params.type,
           beginTime: this.params.beginTime,
@@ -542,8 +544,8 @@ export default {
           technologyType: String(this.technologyType)
         })
         .then(res => {
-          this.data = res.data.data.records
-          this.params.total = res.data.data.total
+          this.data = res.data.records
+          this.params.total = res.data.total
           this.$Spin.hide()
         })
     },

src/view/material-manege/material-apply/material-apply.vue

@@ -45,7 +45,7 @@ export default {
         },
         {
           title: '申购单号',
-          key: 'applyBillNo',
+          key: 'code',
           minWidth: 150,
           render: (h, params) => {
             let _this = this
@@ -66,17 +66,17 @@ export default {
         },
         {
           title: '申购类型',
-          key: 'applyPurType',
+          key: 'type',
           minWidth: 150
         },
         {
           title: '申购日期',
-          key: 'applyTime',
+          key: 'createTime',
           minWidth: 150
         },
         {
           title: '申购部门',
-          key: 'departName',
+          key: 'deptName',
           minWidth: 150
         },
         {
@@ -86,12 +86,12 @@ export default {
         },
         {
           title: '审批状态',
-          key: 'applyState',
+          key: 'flowStatus',
           minWidth: 150
         },
         {
           title: '申购说明',
-          key: 'applyAccount',
+          key: 'remark',
           minWidth: 200
         }
       ],
@@ -187,12 +187,14 @@ export default {
       this.getList()
     },
     getList () {
-      GetApplyPurchasePageList(this.params).then(res => {
-        if (res.code === 0) {
-          this.data = res.result.list
-          this.params.total = res.result.totalCount
-        }
-      })
+      this
+        .$post('/api/storage-restructure/applyPurchase/applyPurchasePage', this.params).then(res => {
+          if (res.code === 200) {
+            this.data = res.data.records
+            this.params.total = res.data.total
+          }
+        })
+      
     }
   },
   mounted () {

src/view/store-in-manage/quality-record/quality-record.vue

@@ -30,30 +30,30 @@
           </div>
           <div class="date-tab">
             质检批数量
-            <span class="num">{{ data.checkBatchNum }}</span>
+            <span class="num">{{ statisticsData.count }}</span>
           </div>
           <div class="date-tab">
             质检平方
-            <span class="num">{{ data.checkSquareSum }}</span>
+            <span class="num">{{ statisticsData.sumArea }}</span>
           </div>
           <div class="date-tab">
             质检即时率
-            <span class="num">{{ data.checkInTimeRateStr }}</span>
+            <span class="num">{{ statisticsData.unqualifiedCount }}</span>
           </div>
           <div class="date-tab">
             合格批数
-            <span class="num">{{ data.standardBatchNum }}</span>
+            <span class="num">{{ statisticsData.qualifiedCount }}</span>
           </div>
           <div class="date-tab" :style="{ border: qtyCheckStatus === 0 ? '1px solid blue' : '' }">
             不合格批数
-            <span class="num red" @click="qtyCheckStatusClick">{{ data.unStandardBatchNum }}</span>
+            <span class="num red" @click="qtyCheckStatusClick">{{ statisticsData.unqualifiedCount }}</span>
           </div>
         </div>
       </div>
     </div>
     <div class="border"></div>
     <div class="main">
-      <my-table :data="data.dataItems && data.dataItems.list" :columns="columns" :table-filter="tableFilter" :table-page="params" @event-handle="eventHandle" @on-change="changePage"></my-table>
+      <my-table :data="data" :columns="columns" :table-filter="tableFilter" :table-page="params" @event-handle="eventHandle" @on-change="changePage"></my-table>
       <quality-form v-model="show" :data="formData"></quality-form>
     </div>
   </div>
@@ -212,7 +212,7 @@ export default {
         },
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字',
           align: 'right'
         },
@@ -228,7 +228,8 @@ export default {
         pageIndex: 1,
         pageSize: 20,
         total: 0
-      }
+      },
+      statisticsData:{},
     }
   },
   methods: {
@@ -338,17 +339,28 @@ export default {
       this.getList()
     },
     getList () {
-      GetQuantityCheckRecord({
-        ...this.params,
-        beginTime: this.beginTime,
-        endTime: this.endTime,
-        qtyCheckStatus: this.qtyCheckStatus
-      }).then(res => {
-        if (res.code === 0) {
-          this.data = res.result
-          this.params.total = res.result.dataItems.totalCount
-        }
-      })
+      this
+        .$post('/api/storage-restructure/qualityTesting/recordPage', {
+          ...this.params,
+          beginTime: this.beginTime,
+          endTime: this.endTime,
+          completeStatus: this.qtyCheckStatus
+        }).then(res => {
+          if (res.code === 200) {
+            this.data = res.data.records
+            this.params.total = res.data.total
+          }
+        })
+      this
+        .$post('/api/storage-restructure/qualityTesting/recordStatistics', {
+          beginTime: this.beginTime,
+          endTime: this.endTime,
+        }).then(res => {
+          if (res.code === 200) {
+            this.statisticsData = res.data
+          }
+        })
+      
     },
     getUserPageList () {
       GetUserPageList({

src/view/store-in-manage/store-in-record/store-in-record.vue

@@ -37,7 +37,7 @@ export default {
         },
         {
           title: '申购单号',
-          key: 'applyBillNo',
+          key: 'applyPurchaseCode',
           minWidth: 150,
           render: (h, params) => {
             let _this = this
@@ -45,7 +45,7 @@ export default {
               on: {
                 click () {
                   GetApplyBill({
-                    applyBillNo: params.row.applyBillNo
+                    applyBillNo: params.row.applyPurchaseCode
                   }).then(res => {
                     if (res.code === 0) {
                       _this.formData = { ...params.row, ...res.result }
@@ -54,12 +54,12 @@ export default {
                   })
                 }
               }
-            }, params.row.applyBillNo)
+            }, params.row.applyPurchaseCode)
           }
         },
         {
           title: '入库单号',
-          key: 'inOutStorageNo',
+          key: 'contractDetailsCode',
           minWidth: 150,
           render: (h, params) => {
             let _this = this
@@ -77,7 +77,7 @@ export default {
                   })
                 }
               }
-            }, params.row.inOutStorageNo)
+            }, params.row.contractDetailsCode)
           }
         },
         {
@@ -92,22 +92,22 @@ export default {
         },
         {
           title: '申购数量',
-          key: 'purchaseQty',
+          key: 'quantity',
           minWidth: 150
         },
         {
           title: '已入库数量',
-          key: 'readyInQty',
+          key: 'arrivalQuantity',
           minWidth: 150
         },
         {
           title: '未入库数量',
-          key: 'notInQty',
+          key: 'afloatQuantity',
           minWidth: 150
         },
         {
           title: '状态',
-          key: 'state',
+          key: 'completeStatus',
           minWidth: 150
         }
       ],
@@ -181,17 +181,19 @@ export default {
           this.getList()
           break
         case 'export':
-          GetInStockPageList({
+        this
+          .$post('/api/storage-restructure/contractDetails/inPage', {
             ...this.params,
             pageIndex: 1,
             pageSize: 99999
           }).then(res => {
-            if (res.code === 0) {
-              let data = res.result.list
+            if (res.code === 200) {
+              let data = res.data.records
               if (data.length < 1) return this.$Message.error('数据为空！')
               exportExcel(this.columns, data, '入库记录')
             }
           })
+          
           break
       }
     },
@@ -200,15 +202,16 @@ export default {
       this.getList()
     },
     getList () {
-      GetInStockPageList({
-        ...this.params,
-        key: this.params.key || this.key
-      }).then(res => {
-        if (res.code === 0) {
-          this.data = res.result.list
-          this.params.total = res.result.totalCount
-        }
-      })
+      this
+        .$post('/api/storage-restructure/contractDetails/inPage', {
+          ...this.params,
+          status: this.params.isComplete
+        }).then(res => {
+          if (res.code === 200) {
+            this.data = res.data.records
+            this.params.total = res.data.total
+          }
+        })
     }
   },
   mounted () {

src/view/store-in-manage/tag/tag.vue

@@ -65,7 +65,7 @@
             >
               <!--              <div class="row" style="font-size: 18px;font-weight: bold;">合同编号：{{ data.purchaseBillNo }}</div>-->
               <div class="row" style="font-size: 18px;font-weight: bold;">标签编码：{{ item.rfidCode }}</div>
-              <div class="row" style="font-size: 18px;font-weight: bold;">创建日期：{{ item.createdTime }}</div>
+              <div class="row" style="font-size: 18px;font-weight: bold;">创建日期：{{ item.createTime }}</div>
             </div>
             <div style="border-bottom: 1px solid #000;padding: 0 10px;width: calc(100% - 20px);height: 30%;display: flex;align-items: center;justify-content: center;font-size: 24px;font-weight: bold;text-align: center;">
               {{ item.materialName }}
@@ -176,14 +176,13 @@ export default {
                       this.printList = []
                       this.printList = [ { ...params.row } ]
                       if (!params.row.hadPrinter) {
-                        PrinterSupplierQRCode({
-                          stockTagIds: [params.row.id]
-                        }).then(res => {
-                          if (res.code === 0) {
-                            this.$Message.info('打印成功！')
-                            this.getList()
-                          }
-                        })
+                        this
+                          .$post('/api/storage-restructure/waterTag/printer', [params.row.id]).then(res => {
+                            if (res.code === 200) {
+                              this.$Message.info('打印成功！')
+                              this.getList()
+                            }
+                          })
                       }
                       if (params.row.qrCode) {
                         setTimeout(() => {
@@ -204,7 +203,7 @@ export default {
       tableFilter: [
         {
           name: 'Input',
-          value: 'key',
+          value: 'keyword',
           placeholder: '请输入关键字'
         },
         {
@@ -247,14 +246,13 @@ export default {
       if (this.printList.length < 1) {
         return
       }
-      PrinterSupplierQRCode({
-        stockTagIds: this.printList.map(item => item.id)
-      }).then(res => {
-        if (res.code === 0) {
-          this.$Message.info('打印成功！')
+      this
+        .$post('/api/storage-restructure/waterTag/printer', this.printList.map(item => item.id)).then(res => {
+          if (res.code === 200) {
+            this.$Message.info('打印成功！')
           this.getList()
-        }
-      })
+          }
+        })
       setTimeout(() => {
         this.$print(this.$refs.print)
         this.$refs.table.clearTempList()
@@ -319,14 +317,15 @@ export default {
       this.getList()
     },
     getList () {
-      GetSupplierQRCodeTest({
-        ...this.params
-      }).then(res => {
-        if (res.code === 0) {
-          this.data = res.result.list
-          this.params.total = res.result.totalCount
-        }
-      })
+      this
+        .$post('/api/storage-restructure/waterTag/page', {
+          ...this.params,
+        }).then(res => {
+          if (res.code === 200) {
+            this.data = res.data.records
+            this.params.total = res.data.total
+          }
+        })
     }
   },
   mounted () {

src/view/store-manage/store-material/store-material.vue

@@ -59,12 +59,12 @@ export default {
         },
         {
           title: '物料编码',
-          key: 'materialCode',
+          key: 'code',
           minWidth: 150
         },
         {
           title: '物料名称',
-          key: 'materialName',
+          key: 'name',
           minWidth: 150,
           sortable: true
         },
@@ -75,7 +75,7 @@ export default {
         },
         {
           title: '单位',
-          key: 'unitName',
+          key: 'unit',
           minWidth: 100
         },
         {
@@ -312,15 +312,18 @@ export default {
       this.getList()
     },
     getList () {
-      GetStockDataPageList(this.params).then(res => {
-        if (res.code === 0) {
-          this.data = res.result.list
-          this.data.forEach(item => {
-            item.id = item.materialCode
-          })
-          this.params.total = res.result.totalCount
-        }
-      })
+      this
+        .$post('/api/storage-restructure/material/stockPage', {
+          ...this.params,
+        }).then(res => {
+          if (res.code === 200) {
+            this.data = res.data.records
+            this.data.forEach(item => {
+              item.id = item.materialCode
+            })
+            this.params.total = res.data.total
+          }
+        })
     }
   },
   mounted () {