From b03a5a783a3246be20d6b9a8f2cc16157ed9c336 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 01 Jun 2022 08:48:24 +0800
Subject: [PATCH] 农资统计

---
 src/views/remote/remote.vue           |  492 +++++++++++++++++++++-----------
 src/views/stock/stockmanage.vue       |    4 
 src/views/stockrecord/stockrecord.vue |    5 
 src/views/statistics/stock.vue        |  338 ++++++++++++----------
 src/views/stock/stockout.vue          |   10 
 src/api/stock/stock.js                |    9 
 6 files changed, 521 insertions(+), 337 deletions(-)

diff --git a/src/api/stock/stock.js b/src/api/stock/stock.js
index 3601db7..bee63c7 100644
--- a/src/api/stock/stock.js
+++ b/src/api/stock/stock.js
@@ -46,4 +46,11 @@
         method: 'post',
         data: row
     })
-}
\ No newline at end of file
+}
+export const pagenum = (row) => {
+  return request({
+    url: '/api/stock/stock/pagenum',
+    method: 'post',
+    data: row
+  })
+}
diff --git a/src/views/remote/remote.vue b/src/views/remote/remote.vue
index ec03518..8130912 100644
--- a/src/views/remote/remote.vue
+++ b/src/views/remote/remote.vue
@@ -32,186 +32,328 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/remote/remote";
-  import {mapGetters} from "vuex";
+import {getList, getDetail, add, update, remove} from "@/api/remote/remote";
+import {mapGetters} from "vuex";
 
-  export default {
-    data() {
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      selectionList: [],
+      option: {
+        height: 'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        border: true,
+        index: true,
+        viewBtn: true,
+        selection: true,
+        align: "center",
+        dialogClickModal: false,
+        searchMenuSpan:3,
+        column: [
+          {
+            label: "预览图",
+            prop: "reTp",
+            type: "upload",
+            labelWidth: 145,
+            dataType: "string",
+            span: 24,
+            limit: 5,
+            listType: "picture-card",
+            tip: "建议上传手机横屏拍摄的照片,宽高比16:9,最多上传5张",
+            canvasOption: {
+              text: "",
+              ratio: 1.0,
+            },
+            propsHttp: {
+              res: "data",
+              url: "url"
+            },
+            action: "/api/blade-resource/oss/endpoint/put-files"
+          },
+          {
+            label: "专题名称",
+            prop: "reName",
+            search:true,
+            rules: [{
+              required: true,
+              message: "请输入reName",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "通知时间",
+            prop: "releaseTimeRange",
+            type: "datetime",
+            format: "yyyy-MM-dd hh:mm:ss",
+            valueFormat: "yyyy-MM-dd hh:mm:ss",
+            searchRange:true,
+            hide: true,
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            search: true,
+            rules: [{
+              required: true,
+              message: "请输入通知时间",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "遥感时间",
+            prop: "reTime",
+            search:true,
+            searchSpan:4,
+            type: "datetime",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            rules: [{
+              required: true,
+              message: "请输入遥感时间",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "拍摄时间",
+            prop: "rePtime",
+            type: "datetime",
+            format: "yyyy-MM-dd HH:mm:ss",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            rules: [{
+              required: true,
+              message: "请输入拍摄时间",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "是否展示",
+            prop: "reType1",
+            type: "select",
+            searchSpan:4,
+            addDisplay:false,
+            editDisplay:false,
+            hide:true,
+            search:true,
+            dicData:[
+              {
+                label:"全部",
+                value:""
+              },
+              {
+                label:"展示",
+                value:"0"
+              },
+              {
+                label:"不展示",
+                value:"1"
+              },
+            ],
+            rules: [{
+              required: true,
+              message: "请输入是否展示",
+              trigger: "reType"
+            }]
+          },
+          {
+            label: "是否展示",
+            prop: "reType",
+            type: "select",
+            dicData:[
+              {
+                label:"展示",
+                value:"0"
+              },
+              {
+                label:"不展示",
+                value:"1"
+              },
+            ],
+            rules: [{
+              required: true,
+              message: "请输入是否展示",
+              trigger: "reType"
+            }]
+          },
+          {
+            label: "服务地址",
+            prop: "reUrl",
+            span: 24,
+            rules: [{
+              required: true,
+              message: "请输入服务地址",
+              trigger: "reType"
+            }]
+          },
+          {
+            label: "介绍",
+            type: "textarea",
+            prop: "reContext",
+            span: 24,
+            rules: [
+              {
+                required: true,
+                message: "请输入介绍",
+                trigger: "blur",
+              },
+            ],
+          },
+        ]
+      },
+      data: []
+    };
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
       return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "遥感名称",
-              prop: "reName",
-              rules: [{
-                required: true,
-                message: "请输入遥感名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "遥感地址",
-              prop: "reUrl",
-              rules: [{
-                required: true,
-                message: "请输入遥感地址",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
+        addBtn: this.vaildData(this.permission.remote_add, false),
+        viewBtn: this.vaildData(this.permission.remote_view, false),
+        delBtn: this.vaildData(this.permission.remote_delete, false),
+        editBtn: this.vaildData(this.permission.remote_edit, false)
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.remote_add, false),
-          viewBtn: this.vaildData(this.permission.remote_view, false),
-          delBtn: this.vaildData(this.permission.remote_delete, false),
-          editBtn: this.vaildData(this.permission.remote_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
     }
-  };
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      add(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      const {releaseTimeRange} = this.query;
+      let values = {
+        ...params,
+        ...this.query
+      };
+      if (releaseTimeRange) {
+        values = {
+          ...values,
+          releaseTime_datege: releaseTimeRange[0],
+          releaseTime_datelt: releaseTimeRange[1],
+        };
+        values.releaseTimeRange = null;
+      }
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, values).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    }
+  }
+};
 </script>
 
 <style>
diff --git a/src/views/statistics/stock.vue b/src/views/statistics/stock.vue
index 6b795fb..7b1d0d7 100644
--- a/src/views/statistics/stock.vue
+++ b/src/views/statistics/stock.vue
@@ -7,6 +7,7 @@
       :page.sync="page"
       :permission="permissionList"
       :before-open="beforeOpen"
+      :summary-method="getSummaries"
       v-model="form"
       ref="crud"
       @row-update="rowUpdate"
@@ -32,8 +33,9 @@
   remove,
   save,
 } from "@/api/farmplant/farmproductstock";
-import { getStrainList } from "@/api/farmplant/strain";
-import { mapGetters } from "vuex";
+import {pagenum} from "@/api/stock/stock";
+import {mapGetters} from "vuex";
+
 export default {
   data() {
     return {
@@ -66,7 +68,7 @@
         selectionFixed: false,
         expandFixed: false,
         menuFixed: false,
-        menu:false,
+        menu: false,
         sumColumnList: [
           {
             label: "合计",
@@ -79,72 +81,62 @@
         ],
         column: [
           {
-            label: "农产品名称",
-            prop: "strainId",
+            label: "农资名称",
+            prop: "agrname",
+            //labelWidth: 145,
+          },
+          {
+            label: "厂家",
+            prop: "facname",
+            // labelWidth: 145,
+          }, {
+            label: "入库量合计",
+            prop: "rknum",
+            //labelWidth: 145,
+          },
+          {
+            label: "采购入库",
+            prop: "cgnum",
+            //labelWidth: 145,
+          },
+          {
+            label: "调拨入库",
+            prop: "dbrknum",
+            //labelWidth: 145,
+          },
+          {
+            label: "出库量合计",
+            prop: "cknum",
+            //labelWidth: 145,
+          },
+          {
+            label: "领用出库",
+            prop: "lycknum",
+            //labelWidth: 145,
+          },
+          {
+            label: "调拨出库",
+            prop: "dbcknum",
+            //labelWidth: 145,
+          },
+          {
+            label: "报废出库",
+            prop: "bfcknum",
+            //labelWidth: 145,
+          },
+          {
+            label: "筛选时间段",
+            prop: "releaseTimeRange",
             span: 12,
+            hide: true,
             search: true,
-            searchSpan: 4,
-            searchLabelWidth: 100,
-            type: "tree",
-            dicData: [],
-            props: {
-              label: "strainName",
-              value: "id",
-            },
-            labelWidth: 145,
-            rules: [
-              {
-                required: true,
-                message: "请输入农产品名称",
-                trigger: "blur",
-              },
-            ],
-            disabled: true,
-          },
-          {
-            label: "农产品图片",
-            prop: "url",
-            span: 12,
-            addDisplay: false,
-            editDisplay: false,
-            type: "upload",
-            dataType: "string",
-            listType: "picture-card",
-            labelWidth: 145,
-            rules: [
-              {
-                required: true,
-                message: "请上传农产品图片",
-                trigger: "click",
-              },
-            ],
-          },
-          {
-            label: "库存重量/公斤",
-            prop: "weight",
-            tip: "公斤",
-            span: 12,
-            labelWidth: 145,
-            controls: false,
-            type: "number",
-            rules: [
-              {
-                required: true,
-                message: "请输入库存重量 公斤",
-                trigger: "click",
-              },
-            ],
-          },
-          {
-            label: "采收时间",
-            prop: "time",
-            addDisplay: false,
-            editDisplay: false,
-            span: 12,
-            labelWidth: 145,
-            type: "datetime",
-            format: "yyyy-MM-dd HH:mm",
-            valueFormat: "yyyy-MM-dd HH:mm",
+            searchSpan: 6,
+            searchLabelWidth: 110,
+            searchRange: true,
+            searchValue: [this.getStartTime(), this.getEndTime()],
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
             rules: [
               {
                 required: true,
@@ -153,73 +145,15 @@
               },
             ],
           },
-          // {
-          //   label: "操作人",
-          //   prop: "operator",
-          //   type: "tree",
-          //   dicData: [],
-          //   props: {
-          //     label: "realName",
-          //     value: "id",
-          //   },
-          //   span: 12,
-          //   labelWidth: 145,
-          //   rules: [
-          //     {
-          //       required: true,
-          //       message: "请输入操作人",
-          //       trigger: "click",
-          //     },
-          //   ],
-          // },
-          {
-            label: "产品等级",
-            prop: "leaves",
-            span: 12,
-            labelWidth: 145,
-            search: true,
-            searchSpan: 4,
-            type: "select",
-            dicData: [
-              {
-                label: "一等品",
-                value: "0",
-              },
-              {
-                label: "二等品",
-                value: "1",
-              },
-              {
-                label: "三等品",
-                value: "2",
-              },
-              {
-                label: "四等品",
-                value: "3",
-              },
-              {
-                label: "五等品",
-                value: "4",
-              },
-            ],
-            rules: [
-              {
-                required: true,
-                message: "请输入产品等级",
-                trigger: "click",
-              },
-            ],
-          },
-        ],
+        ]
       },
       data: [],
     };
-  },
-  created() {
-    this.initData();
-  },
+  }
+  ,
   computed: {
-    ...mapGetters(["permission", "userInfo"]),
+    ...
+      mapGetters(["permission", "userInfo"]),
     // permissionList() {
     //   return {
     //     addBtn: this.vaildData(this.permission.social_add, true),
@@ -234,10 +168,82 @@
         ids.push(ele.id);
       });
       return ids.join(",");
-    },
-  },
-  mounted() {},
+    }
+    ,
+  }
+  ,
+  mounted() {
+    var params = {
+      startTime: this.getStartTime(),
+      endTime: this.getEndTime()
+    }
+    this.onLoad(this.page, params);
+  }
+  ,
   methods: {
+    //合计计算
+    getSummaries(param) {
+      const {columns, data} = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        if (index == 1) {
+          return;
+        }
+        const values = data.map((item) => Number(item[column.property]));
+        if (!values.every((value) => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] += " 公斤";
+        } else {
+          sums[index] = "N/A";
+        }
+      });
+      return sums;
+    },
+    getStartTime() {
+      var myDate = new Date();
+      var year = myDate.getFullYear();
+      //获取当前月份(0-11,0代表1月,所以要加1);
+      var month = myDate.getMonth() + 1;
+      //获取当前日(1-31)
+      var day = myDate.getDate();
+      if (month < 10) {
+        month = "0" + month;
+      }
+      if (day >= 0 && day <= 9) {
+        day = "0" + day;
+      }
+      var firstDay = year + "-" + month + "-01";
+      // this.query['startTime'] = firstDay;
+      return firstDay;
+    },
+    getEndTime() {
+      var myDate = new Date();
+      var year = myDate.getFullYear();
+      //获取当前月份(0-11,0代表1月,所以要加1);
+      var month = myDate.getMonth() + 1;
+      //获取当前日(1-31)
+      var day = myDate.getDate();
+      if (month < 10) {
+        month = "0" + month;
+      }
+      if (day >= 0 && day <= 9) {
+        day = "0" + day;
+      }
+      var thisDay = year + "-" + month + "-" + day;
+      // this.query['endTime'] = thisDay;
+      return thisDay;
+    },
     initData() {
       var that = this;
       //获取农产品数据
@@ -247,7 +253,8 @@
           strainId.dicData = res.data.data;
         }
       });
-    },
+    }
+    ,
     //新增
     rowSave(row, done, loading) {
       row["strainType"] = 0;
@@ -265,7 +272,8 @@
           window.console.log(error);
         }
       );
-    },
+    }
+    ,
     //修改
     rowUpdate(row, index, done, loading) {
       update(row).then(
@@ -282,7 +290,8 @@
           console.log(error);
         }
       );
-    },
+    }
+    ,
     //删除
     rowDel(row) {
       this.$confirm("确定将选择数据删除?", {
@@ -300,7 +309,8 @@
             message: "操作成功!",
           });
         });
-    },
+    }
+    ,
     handleDelete() {
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
@@ -322,7 +332,8 @@
           });
           this.$refs.crud.toggleSelection();
         });
-    },
+    }
+    ,
     beforeOpen(done, type) {
       if (["edit", "view"].includes(type)) {
         getDetail(this.form.id).then((res) => {
@@ -330,39 +341,57 @@
         });
       }
       done();
-    },
+    }
+    ,
     searchReset() {
       this.query = {};
       this.onLoad(this.page);
-    },
+    }
+    ,
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
       done();
-    },
+    }
+    ,
     selectionChange(list) {
       this.selectionList = list;
-    },
+    }
+    ,
     selectionClear() {
       this.selectionList = [];
       this.$refs.crud.toggleSelection();
-    },
+    }
+    ,
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
-    },
+    }
+    ,
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
-    },
+    }
+    ,
     refreshChange() {
       this.onLoad(this.page, this.query);
-    },
+    }
+    ,
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(
-        page.currentPage,
-        page.pageSize,
-        Object.assign(params, this.query)
+      const {releaseTimeRange} = this.query;
+      let values = {
+        ...params,
+      };
+      if (releaseTimeRange) {
+        values = {
+          ...params,
+          startTime: releaseTimeRange[0],
+          endTime: releaseTimeRange[1],
+          ...this.query,
+        };
+        values.releaseTimeRange = null;
+      }
+      pagenum(page.currentPage, page.pageSize, values
       ).then((res) => {
         const data = res.data.data;
         this.page.total = data.total;
@@ -370,9 +399,12 @@
         this.loading = false;
         this.selectionClear();
       });
-    },
-  },
-};
+    }
+    ,
+  }
+  ,
+}
+;
 </script>
 
 <style>
diff --git a/src/views/stock/stockmanage.vue b/src/views/stock/stockmanage.vue
index 9faf025..2ec4356 100644
--- a/src/views/stock/stockmanage.vue
+++ b/src/views/stock/stockmanage.vue
@@ -711,7 +711,7 @@
     //库存明细
     kc(item) {
       const data = {
-        stockId: item.stockId,
+        sid: item.id,
       };
       this.$router.push({
         path: `/stockrecord`,
@@ -815,6 +815,7 @@
         specsVal1: row.specsValue1,
         specsVal2: row.specsValue1,
         stockType1: 1,
+        sid: row.id,
       };
       this.gradeBoxVisible = true;
     }
@@ -835,6 +836,7 @@
         specsVal1: row.specsValue1,
         specsVal2: row.specsValue1,
         stockType1: 0,
+        sid: row.id,
       };
       this.gradeBoxVisible1 = true;
     }
diff --git a/src/views/stock/stockout.vue b/src/views/stock/stockout.vue
index fa2724e..0cfa20c 100644
--- a/src/views/stock/stockout.vue
+++ b/src/views/stock/stockout.vue
@@ -128,10 +128,10 @@
         dialogClickModal: false,
         column: [
           {
-            label: "农资",
+            label: "农资id",
             span: 20,
             display: true,
-            prop: "stockid",
+            prop: "sid",
           },
           {
             label: "库存数量",
@@ -196,7 +196,7 @@
       }
       //退回数量等于入库数量
       if (row.spn == row.num) {
-        Updateout(row.spn,row.stockid,0).then(
+        Updateout(row.spn,row.sid,0).then(
           () => {
             this.onLoad(this.page);
             this.$message({
@@ -214,7 +214,7 @@
       }
         //退回数量小于入库数量
       if (row.spn < row.num) {
-        Updateout(row.spn,row.stockid,1).then(
+        Updateout(row.spn,row.sid,1).then(
           () => {
             this.onLoad(this.page);
             this.$message({
@@ -291,7 +291,7 @@
     out(row) {
       this.formO = {
         num: row.amount1,
-        stockid: row.stockId1,
+        sid: row.sid,
       };
       this.outScoke = true
     }
diff --git a/src/views/stockrecord/stockrecord.vue b/src/views/stockrecord/stockrecord.vue
index 675d32a..f18f775 100644
--- a/src/views/stockrecord/stockrecord.vue
+++ b/src/views/stockrecord/stockrecord.vue
@@ -241,8 +241,9 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        var datas = this.$route.query.stockId;
-        params.stockId1=datas;
+        var datas = this.$route.query.sid;
+        console.log(datas)
+        params.sid=datas;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

--
Gitblit v1.9.3