diff --git a/src/api/firstOrder/inbound.js b/src/api/firstOrder/inbound.js
index ccb04c9..59b3720 100644
--- a/src/api/firstOrder/inbound.js
+++ b/src/api/firstOrder/inbound.js
@@ -79,4 +79,12 @@ export const  editList = (onePutStorageId) => {
     cryptoToken: false,
     cryptoData: false
   })
-}
\ No newline at end of file
+}
+
+export const getStatistics = data => {
+  return request({
+    url: '/smartpark/oneForm/getOnePutOneForm',
+    method: 'post',
+    data: data,
+  })
+}
diff --git a/src/views/dataAnalysis/index.vue b/src/views/dataAnalysis/index.vue
new file mode 100644
index 0000000..2d2dad5
--- /dev/null
+++ b/src/views/dataAnalysis/index.vue
@@ -0,0 +1,890 @@
+<template>
+  <basic-container>
+    <el-row :gutter=24>
+      <el-row :gutter=24 v-if="this.permission.departmentSearch" >
+        <el-form ref="form" :model="form" label-width="80px">
+          <!-- <el-col :span="6">
+            <el-form-item label="日期">
+              <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
+                end-placeholder="结束日期" style="width:100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="6">
+            <el-form-item label="部门">
+              <el-select v-model="value" placeholder="请选择部门" style="width:100%">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-button type="primary" @click="onSubmit">搜索</el-button>
+            <el-button @click="onSubmit">重置</el-button>
+          </el-col>
+        </el-form>
+      </el-row>
+      <el-col :span="12">
+        <div class="title">物资申请类别
+        </div>
+        <div id="echarts1" style="width: 100%;  height:400px"></div>
+      </el-col>
+      <el-col :span="12">
+        <div class="title">物资申请价值
+        </div>
+        <div id="echarts2" style="width: 100%;  height:400px"></div>
+      </el-col>
+      <el-col :span="12">
+        <div class="title">物资库存
+        </div>
+        <div id="echarts3" style="width: 100%;  height:400px"></div>
+      </el-col>
+      <el-col :span="12">
+        <div class="title">消耗品价值分析
+          <el-select v-model="value2" placeholder="请选择" style="float:right" @change="changeSelect()">
+            <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div id="echarts4" style="width: 100%;  height:400px"></div>
+      </el-col>
+    </el-row>
+  </basic-container>
+</template>
+<script>
+import * as echarts from "echarts";
+import {mapGetters} from "vuex";
+export default {
+  computed: {
+    ...mapGetters(["userInfo", "permission"]),
+  },
+  data() {
+    return {
+      options: [{
+        value: '部门一',
+        label: '部门一'
+      }, {
+        value: '部门二',
+        label: '部门二'
+      }, {
+        value: '部门三',
+        label: '部门三'
+      }, {
+        value: '部门四',
+        label: '部门四'
+      }, {
+        value: '部门五',
+        label: '部门五'
+      }],
+      value: '',
+      options2: [{
+        value: '年度',
+        label: '年度'
+      }, {
+        value: '季度',
+        label: '季度'
+      }, {
+        value: '月份',
+        label: '月份'
+      }],
+      value2: '年度'
+    }
+  },
+  mounted() {
+    this.initEcharts1()
+    this.initEcharts2()
+    this.initEcharts3()
+    this.initEcharts4(["2022年", "2023年", "2024年", "2025年"], [23, 78, 87, 90])
+  },
+  methods: {
+    initEcharts1() {
+      var myChart = echarts.init(document.getElementById("echarts1"));
+      // 指定图表的配置项和数据
+      var option = {
+
+        title: {
+          text: '',
+          x: 'center'
+        },
+        backgroundColor: '#fff',
+        tooltip: {
+          trigger: 'item',
+        },
+        xAxis: {
+          data: ["全部", "易耗品", "耐用品"],
+          axisTick: {
+            show: false
+          },
+          axisLine: {
+            show: false
+          },
+          axisLabel: {
+            textStyle: {
+              color: '#888'
+            },
+            margin: 20, //刻度标签与轴线之间的距离。
+          },
+
+        },
+        yAxis: {
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: '#eee',
+              type: 'solid'
+            }
+          },
+          axisTick: {
+            show: false
+          },
+          axisLine: {
+            show: false
+          },
+          axisLabel: {
+            textStyle: {
+              color: '#888'
+            },
+          }
+        },
+        series: [
+          {//三个最低下的圆片
+            "name": "",
+            "type": "pictorialBar",
+            "symbolSize": [100, 30],
+            "symbolOffset": [0, 18],
+            "z": 12,
+            "data": [{
+              "name": "",
+              "value": "100",
+              "itemStyle": {
+                "normal": {
+                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                    offset: 0,
+                    color: "rgba(89,211,255,1)"
+                  },
+                  {
+                    offset: 1,
+                    color: "rgba(23,237,194,1)"
+                  }
+                  ])
+                }
+              }
+            }, {
+              "name": "",
+              "value": "101",
+              "itemStyle": {
+                "normal": {
+                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                    offset: 0,
+                    color: "rgba(89,211,255,1)"
+                  },
+                  {
+                    offset: 1,
+                    color: "rgba(23,237,194,1)"
+                  }
+                  ])
+                }
+              }
+            }, {
+              "name": "",
+              "value": "81",
+              "itemStyle": {
+                "normal": {
+                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                    offset: 0,
+                    color: "rgba(89,211,255,1)"
+                  },
+                  {
+                    offset: 1,
+                    color: "rgba(23,237,194,1)"
+                  }
+                  ])
+                }
+              }
+            }]
+          },
+
+
+          //下半截柱状图
+          {
+            name: '2020',
+            type: 'bar',
+            barWidth: 100,
+            barGap: '-100%',
+            itemStyle: {//lenged文本
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                offset: 0,
+                color: "rgba(55,255,249,1)"
+              },
+              {
+                offset: 1,
+                color: "rgba(0,222,215,0.2)"
+              }
+              ])
+            },
+
+            data: [{
+              "name": "",
+              "value": "100",
+              "itemStyle": {
+                "normal": {
+                  "color": {
+                    "x": 0,
+                    "y": 0,
+                    "x2": 0,
+                    "y2": 1,
+                    "type": "linear",
+                    "global": false,
+                    "colorStops": [{//第一节下面
+                      "offset": 0,
+                      "color": "rgba(0,255,245,0.5)"
+                    }, {
+                      "offset": 1,
+                      "color": "#43bafe"
+                    }]
+                  }
+                }
+              }
+            }, {
+              "name": "",
+              "value": "101",
+              "itemStyle": {
+                "normal": {
+                  "color": {
+                    "x": 0,
+                    "y": 0,
+                    "x2": 0,
+                    "y2": 1,
+                    "type": "linear",
+                    "global": false,
+                    "colorStops": [{//第二个柱状图下面
+                      "offset": 0,
+                      "color": "rgba(0,255,245,0.5)"
+                    }, {
+                      "offset": 1,
+                      "color": "#43bafe"
+                    }]
+                  }
+                }
+              }
+            }, {
+              "name": "",
+              "value": "81",
+              "itemStyle": {
+                "normal": {
+                  "color": {
+                    "x": 0,
+                    "y": 0,
+                    "x2": 0,
+                    "y2": 1,
+                    "type": "linear",
+                    "global": false,
+                    "colorStops": [{//第三个柱状图下半截
+                      "offset": 0,
+                      "color": "rgba(0,255,245,0.5)"
+                    }, {
+                      "offset": 1,
+                      "color": "#43bafe"
+                    }]
+                  }
+                }
+              }
+            }]
+          },
+
+          { // 替代柱状图 默认不显示颜色，是最下方柱图（邮件营销）的value值 - 20
+            type: 'bar',
+            barWidth: 100,
+            barGap: '-100%',
+            stack: '广告',
+            itemStyle: {
+              color: 'transparent'
+            },
+            data: [100, 102, 81]
+          },
+
+          {
+            "name": "", //头部
+            "type": "pictorialBar",
+            "symbolSize": [100, 45],
+            "symbolOffset": [0, -20],
+            "z": 12,
+            "data": [{
+              "name": "",
+              "value": "320",
+              "symbolPosition": "end",
+              "itemStyle": {
+                "normal": {
+                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1,
+                    [{
+                      offset: 0,
+                      color: "rgba(54,127,223,1)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(94,162,254,1)"
+                    }
+                    ],
+                    false
+                  ),
+                }
+              }
+            }, {
+              "name": "",
+              "value": "283",
+              "symbolPosition": "end",
+              "itemStyle": {
+                "normal": {
+                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1,
+                    [{
+                      offset: 0,
+                      color: "rgba(54,127,223,1)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(94,162,254,1)"
+                    }
+                    ],
+                    false
+                  ),
+                }
+              }
+            }, {
+              "name": "",
+              "value": "272",
+              "symbolPosition": "end",
+              "itemStyle": {
+                "normal": {
+                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1,
+                    [{
+                      offset: 0,
+                      color: "rgba(54,127,223,1)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(94,162,254,1)"
+                    }
+                    ],
+                    false
+                  ),
+                }
+              }
+            }]
+          },
+
+          {
+            "name": "",
+            "type": "pictorialBar",
+            "symbolSize": [100, 45],
+            "symbolOffset": [0, -20],
+            "z": 12,
+            "data": [{
+              "name": "",
+              "value": "103",
+              "symbolPosition": "end",
+              "itemStyle": {
+                "normal": {
+                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1,
+                    [{
+                      offset: 0,
+                      color: "rgba(89,211,255,1)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(23,237,194,1)"
+                    }
+                    ],
+                    false
+                  ),
+                }
+              }
+            }, {
+              "name": "",
+              "value": "105",
+              "symbolPosition": "end",
+              "itemStyle": {
+                "normal": {
+                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1,
+                    [{
+                      offset: 0,
+                      color: "rgba(89,211,255,1)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(23,237,194,1)"
+                    }
+                    ],
+                    false
+                  ),
+                }
+              }
+            }, {
+              "name": "",
+              "value": "84",
+              "symbolPosition": "end",
+              "itemStyle": {
+                "normal": {
+                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1,
+                    [{
+                      offset: 0,
+                      color: "rgba(89,211,255,1)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(23,237,194,1)"
+                    }
+                    ],
+                    false
+                  ),
+                }
+              }
+            }]
+          },
+
+          {
+            name: '2019',
+            type: 'bar',
+            barWidth: 100,
+            barGap: '-100%',
+            stack: '广告',
+            itemStyle: {
+              // barBorderRadius: 20,
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                offset: 1,
+                color: "rgba(0,255,100,0.5)"
+              },
+              {
+                offset: 1,
+                color: "rgba(0,255,100,0.5)"
+              }
+              ])
+            },
+            //上班截开始
+            data: [{
+              "name": "关井数",
+              "value": "220",
+              "trueVal": "22",
+              "itemStyle": {
+                "normal": {
+                  "color": {
+                    "x": 0,
+                    "y": 0,
+                    "x2": 0,
+                    "y2": 1,
+                    "type": "linear",
+                    "global": false,
+                    "colorStops": [{
+                      offset: 0,
+                      color: "rgba(54,127,223,1)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(94,162,254,1)"
+                    }],
+                  }
+                }
+              }
+            }, {
+              "name": "开井数",
+              "value": "182",
+              "trueVal": "18",
+              "itemStyle": {
+                "normal": {
+                  "color": {
+                    "x": 0,
+                    "y": 0,
+                    "x2": 0,
+                    "y2": 1,
+                    "type": "linear",
+                    "global": false,
+                    "colorStops": [{
+                      offset: 0,
+                      color: "rgba(54,127,223,1)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(94,162,254,1)"
+                    }],
+                  }
+                }
+              }
+            }, {
+              "name": "不在线",
+              "value": "191",
+              "trueVal": "19",
+              "itemStyle": {
+                "normal": {
+                  "color": {
+                    "x": 0,
+                    "y": 0,
+                    "x2": 0,
+                    "y2": 1,
+                    "type": "linear",
+                    "global": false,
+                    "colorStops": [{
+                      offset: 0,
+                      color: "rgba(54,127,223,1)"
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(94,162,254,1)"
+                    }],
+                  }
+                }
+              }
+            }
+
+            ]
+          }
+
+
+        ]
+      }
+        ;
+      myChart.setOption(option);
+    },
+    initEcharts2() {
+      var myChart = echarts.init(document.getElementById("echarts2"));
+      let index = 0;
+      var colorList = ['#73DDFF', '#73ACFF', '#FDD56A', '#FDB36A', '#FD866A', '#9E87FF', '#58D5FF']
+      function fun() {
+        var timer = setInterval(function () {
+          myChart.dispatchAction({
+            type: 'hideTip',
+            seriesIndex: 0,
+            dataIndex: index
+          });
+          // 显示提示框
+          myChart.dispatchAction({
+            type: 'showTip',
+            seriesIndex: 0,
+            dataIndex: index
+          });
+          // 取消高亮指定的数据图形
+          myChart.dispatchAction({
+            type: 'downplay',
+            seriesIndex: 0,
+            dataIndex: index == 0 ? 5 : index - 1
+          });
+          myChart.dispatchAction({
+            type: 'highlight',
+            seriesIndex: 0,
+            dataIndex: index
+          });
+          index++;
+          if (index > 5) {
+            index = 0;
+          }
+        }, 3000)
+      }
+
+      fun()
+      setTimeout(function () { fun() }, 5000);
+      let option = {
+        title: {
+          text: '申请价值',
+          x: 'center',
+          y: 'center',
+          textStyle: {
+            fontSize: 20
+          }
+        },
+        tooltip: {
+          trigger: 'item'
+        },
+        series: [{
+          type: 'pie',
+          center: ['50%', '50%'],
+          radius: ['24%', '45%'],
+          clockwise: true,
+          avoidLabelOverlap: true,
+          hoverOffset: 15,
+          itemStyle: {
+            normal: {
+              color: function (params) {
+                return colorList[params.dataIndex]
+              }
+            }
+          },
+          label: {
+            show: true,
+            position: 'outside',
+            formatter: '{a|{b}：{d}%}\n{hr|}',
+            rich: {
+              hr: {
+                backgroundColor: 't',
+                borderRadius: 3,
+                width: 3,
+                height: 3,
+                padding: [3, 3, 0, -12]
+              },
+              a: {
+                padding: [-30, 15, -20, 15]
+              }
+            }
+          },
+          labelLine: {
+            normal: {
+              length: 20,
+              length2: 30,
+              lineStyle: {
+                width: 1
+              }
+            }
+          },
+          data: [{
+            'name': '全部',
+            'value': 1.45
+          }, {
+            'name': '易耗品',
+            'value': 2.93
+          }, {
+            'name': '耐用品',
+            'value': 3.15
+          },
+          ],
+        }]
+      };
+      myChart.setOption(option);
+    },
+    initEcharts3() {
+      var myChart = echarts.init(document.getElementById("echarts3"));
+      var data = ["物品1", "物品2", "物品3", "物品4"]
+
+      let option = {
+        backgroundColor: '#fff',
+        color: [new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+          offset: 0,
+          color: "#13ace8"
+        }, {
+          offset: 1,
+          color: "#0167e8"
+        }], false)],
+        grid: {
+          left: '8%',
+          right: '10%',
+          top: '12%',
+          bottom: '18%',
+          containLabel: true
+        },
+        tooltip: {
+          show: "true",
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        yAxis: {
+          type: 'value',
+
+          axisTick: {
+            show: false
+          },
+          axisLine: {
+            show: false,
+            lineStyle: {
+              color: '#ccc',
+            }
+          },
+          axisLabel: {
+            show: true,
+            color: "#ccc",
+            fontSize: 18
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              type: 'dashed'
+            }
+          },
+
+
+        },
+        xAxis: [{
+          axisTick: {
+            show: false
+          },
+
+          type: 'category',
+          axisLine: {
+            show: false
+          },
+          axisLabel: {
+            show: true,
+            color: '#ccc',
+            interval: 0,
+            formatter: function (value) {
+              return value.split("").join("\n");
+            }
+          },
+
+
+          splitLine: {
+            show: false,
+            lineStyle: {
+              type: 'dashed'
+            }
+          },
+          data: data,
+        }],
+        series: [{
+          name: '违规',
+          type: 'bar',
+          barWidth: 15,
+          label: {
+            normal: {
+              show: false,
+              position: 'right',
+              textStyle: {
+                color: "#ccc",
+                fontSize: 14
+              }
+            }
+          },
+          itemStyle: {
+            normal: {
+              // barBorderRadius: [0, 0, 5, 0],
+            }
+          },
+          data: [50, 60, 70, 80]
+        }]
+      };
+      myChart.setOption(option);
+    },
+    initEcharts4(xdata, ydata) {
+      var myChart = echarts.init(document.getElementById("echarts4"));
+      // var data = ["2022年", "2023年", "2024年", "2025年"]
+      var data = xdata
+
+      let option = {
+        backgroundColor: '#fff',
+        color: [new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+          offset: 0,
+          color: "#13ace8"
+        }, {
+          offset: 1,
+          color: "#0167e8"
+        }], false)],
+        grid: {
+          left: '8%',
+          right: '10%',
+          top: '12%',
+          bottom: '18%',
+          containLabel: true
+        },
+        tooltip: {
+          show: "true",
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        yAxis: {
+          type: 'value',
+
+          axisTick: {
+            show: false
+          },
+          axisLine: {
+            show: false,
+            lineStyle: {
+              color: '#ccc',
+            }
+          },
+          axisLabel: {
+            show: true,
+            color: "#ccc",
+            fontSize: 18
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              type: 'dashed'
+            }
+          },
+
+
+        },
+        xAxis: [{
+          axisTick: {
+            show: false
+          },
+
+          type: 'category',
+          axisLine: {
+            show: false
+          },
+          axisLabel: {
+            show: true,
+            color: '#ccc',
+            interval: 0,
+            formatter: function (value) {
+              return value.split("").join("\n");
+            }
+          },
+
+
+          splitLine: {
+            show: false,
+            lineStyle: {
+              type: 'dashed'
+            }
+          },
+          data: data,
+        }],
+        series: [{
+          name: '价值',
+          type: 'bar',
+          barWidth: 15,
+          label: {
+            normal: {
+              show: false,
+              position: 'right',
+              textStyle: {
+                color: "#ccc",
+                fontSize: 14
+              }
+            }
+          },
+          itemStyle: {
+            normal: {
+              // barBorderRadius: [0, 0, 5, 0],
+            }
+          },
+          data: ydata
+        }]
+      };
+      myChart.setOption(option);
+    },
+
+    onSubmit() {
+      this.$message({
+        message: '操作成功',
+        type: 'success'
+      });
+    },
+    changeSelect(value) {
+      if (this.value2 == '年度') {
+        this.initEcharts4(["2022年", "2023年", "2024年", "2025年"], [23, 78, 87, 90])
+      }
+      if (this.value2 == '季度') {
+        this.initEcharts4(["一季度", "二季度", "三季度", "四季度"], [23, 28, 97, 40])
+      }
+      if (this.value2 == '月份') {
+        this.initEcharts4(["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], [23, 28, 97, 40, 32, 56, 78, 69, 45, 32, 98, 84])
+      }
+    }
+  },
+
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .el-card__body {
+  // background: #000;
+}
+
+.title {
+  height: 50px;
+  line-height: 50px;
+}
+</style>
diff --git a/src/views/firstOrder/components/batchSelectionDialog.vue b/src/views/firstOrder/components/batchSelectionDialog.vue
index 50b233b..f04bb33 100644
--- a/src/views/firstOrder/components/batchSelectionDialog.vue
+++ b/src/views/firstOrder/components/batchSelectionDialog.vue
@@ -26,8 +26,8 @@
             <el-table-column label="物料名称" prop="materialName" />
             <el-table-column label="规格型号" prop="model" />
             <el-table-column label="申请数量" prop="applicationQuantity" />
-            <el-table-column label="本此出库数量" prop="applicationQuantity" />
-            <!-- <el-table-column label="已出库数量" prop="outboundQuantity"  /> -->
+            <!-- <el-table-column label="本此出库数量" prop="applicationQuantity" /> -->
+            <el-table-column label="已出库数量" prop="outboundQuantity"  />
             <el-table-column label="部门" prop="departmentName" />
             <el-table-column label="单位" prop="unit" />
         </el-table>
@@ -103,7 +103,7 @@ export default {
                 parentDepartmentName: parentRow.departmentName, // 关联父行的部门信息
                 applicationQuantity: parentRow.applicationQuantity,
                 ldDemandEndId: parentRow.ldDemandEndId,
-                // outboundQuantity:parentRow.outboundQuantity,
+                outboundQuantity:parentRow.outboundQuantity,
             }));
 
             // 先移除当前父行下已勾选的旧数据
@@ -146,4 +146,4 @@ export default {
 
 }
 
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/firstOrder/components/inDialog.vue b/src/views/firstOrder/components/inDialog.vue
index e7a1d53..f5404d0 100644
--- a/src/views/firstOrder/components/inDialog.vue
+++ b/src/views/firstOrder/components/inDialog.vue
@@ -1,33 +1,64 @@
 <template>
   <div>
-    <el-dialog :close-on-click-modal="false" :title="inDialogTiltle" :visible.sync="inDialogVisible"
-      :append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen class="dialog-container">
+    <el-dialog
+      :close-on-click-modal="false"
+      :title="inDialogTiltle"
+      :visible.sync="inDialogVisible"
+      :append-to-body="true"
+      width="70%"
+      @close="handleCloseDetail"
+      fullscreen
+      class="dialog-container"
+    >
       <!-- 基本信息 -->
       <div class="dialog-content">
-        <el-form :model="sizeForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic" :rules="rules">
-          <div class="form-title"> 基本信息</div>
+        <el-form
+          :model="sizeForm"
+          ref="dynamicValidateForm"
+          label-width="100px"
+          class="demo-dynamic"
+          :rules="rules"
+        >
+          <div class="form-title">基本信息</div>
           <el-row>
-            <el-col :span="12" v-show="sizeForm.options == 1 && inDialogType != 'add'">
+            <el-col
+              :span="12"
+              v-show="sizeForm.options == 1 && inDialogType != 'add'"
+            >
               <el-form-item label="入库单号">
                 <el-input v-model="sizeForm.orderNo" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="入库时间">
-                <el-date-picker v-model="sizeForm.inDate" format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date"
-                  placeholder="选择日期" style="width: 100%;" disabled>
+                <el-date-picker
+                  v-model="sizeForm.inDate"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  type="date"
+                  placeholder="选择日期"
+                  style="width: 100%"
+                  disabled
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="事由">
-                <el-input v-model="sizeForm.reason" :disabled="inDialogType == 'details'"></el-input>
+                <el-input
+                  v-model="sizeForm.reason"
+                  :disabled="inDialogType == 'details'"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="物资类型">
-                <el-select v-model="sizeForm.materialType" placeholder="请选择" style="width: 100%;"
-                  :disabled="inDialogType == 'details'">
+                <el-select
+                  v-model="sizeForm.materialType"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  :disabled="inDialogType == 'details'"
+                >
                   <el-option label="办公物资" value="1"></el-option>
                   <el-option label="其他物资" value="2"></el-option>
                 </el-select>
@@ -35,8 +66,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item prop="source" label="来源">
-                <el-select v-model="sizeForm.source" placeholder="请选择" style="width: 100%;"
-                  :disabled="inDialogType == 'details'">
+                <el-select
+                  v-model="sizeForm.source"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  :disabled="inDialogType == 'details'"
+                >
                   <el-option label="采购申请" value="cg"></el-option>
                   <el-option label="其他来源" value="qt"></el-option>
                 </el-select>
@@ -44,7 +79,11 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="选项">
-                <el-radio-group v-model="sizeForm.option" @change="radioChange()" :disabled="inDialogType == 'details'">
+                <el-radio-group
+                  v-model="sizeForm.option"
+                  @change="radioChange()"
+                  :disabled="inDialogType == 'details'"
+                >
                   <el-radio :label="1">批量选择</el-radio>
                   <el-radio :label="2">单项选择</el-radio>
                 </el-radio-group>
@@ -57,76 +96,144 @@
             </el-col>
           </el-row>
           <div class="form-title">{{ inDate }}</div>
-          <el-button type="primary" size="mini" style="margin-bottom: 18px;" @click="inTableAdd()"
-            v-if="!allDisabled && sizeForm.option == 2">新增</el-button>
+          <el-button
+            type="primary"
+            size="mini"
+            style="margin-bottom: 18px"
+            @click="inTableAdd()"
+            v-if="!allDisabled && sizeForm.option == 2"
+            >新增</el-button
+          >
           <!-- 批量选择 -->
-          <el-table :data="sizeForm.inTableData" border style="width: 100%" v-show="sizeForm.option == 1">
-            <el-table-column prop="inboundDetailCode" label="入库明细单号" v-if="inDialogType == 'details'">
+          <el-table
+            :data="sizeForm.inTableData"
+            border
+            style="width: 100%"
+            v-show="sizeForm.option == 1"
+          >
+            <el-table-column
+              prop="inboundDetailCode"
+              label="入库明细单号"
+              v-if="inDialogType == 'details'"
+            >
             </el-table-column>
             <el-table-column prop="materialCode" label="物资编码">
             </el-table-column>
             <el-table-column prop="materialName" label="物资名称">
             </el-table-column>
-            <el-table-column prop="model" label="规格">
-            </el-table-column>
-            <el-table-column prop="unit" label="单位">
-            </el-table-column>
+            <el-table-column prop="model" label="规格"> </el-table-column>
+            <el-table-column prop="unit" label="单位"> </el-table-column>
             <el-table-column prop="type" label="类别">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.type" placeholder="请选择" style="width: 100%;"
-                  :disabled="inDialogType == 'details'" @change="handleTypeChange(scope.row)"
-                  v-if='inDialogType != "details"'>
+                <el-select
+                  v-model="scope.row.type"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  :disabled="inDialogType == 'details'"
+                  @change="handleTypeChange(scope.row)"
+                  v-if="inDialogType != 'details'"
+                >
                   <el-option label="耐用品" value="NY"></el-option>
                   <el-option label="易耗品" value="YH"></el-option>
                 </el-select>
-                <span v-else>{{ scope.row.type == 'NY' ? '耐用品' : '易耗品' }}</span>
+                <span v-else>{{
+                  scope.row.type == "NY" ? "耐用品" : "易耗品"
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="requiredQuantity" label="计划采购数量" v-if="sizeForm.option == 1">
+            <el-table-column
+              prop="requiredQuantity"
+              label="计划采购数量"
+              v-if="sizeForm.option == 1"
+            >
               <template slot-scope="scope">
                 {{ scope.row.requiredQuantity || 0 }}
               </template>
             </el-table-column>
-            <el-table-column prop="inboundQuantity" label="已入库数量" v-if="sizeForm.option == 1">
+            <el-table-column
+              prop="inboundQuantity"
+              label="已入库数量"
+              v-if="sizeForm.option == 1"
+            >
               <template slot-scope="scope">
                 {{ scope.row.inboundQuantity || 0 }}
               </template>
             </el-table-column>
             <el-table-column prop="theInboundQuantity" label="本次入库数量">
               <template slot-scope="scope">
-                <el-input-number size="mini" v-model="scope.row.theInboundQuantity" :min="0" style="width: 100%;"
-                  @change="syncInboundQuantity(scope.row)" v-if='inDialogType != "details"'></el-input-number>
-                <span v-else>{{ scope.row.theInboundQuantity === undefined ? 0 : scope.row.theInboundQuantity }}</span>
+                <el-input-number
+                  size="mini"
+                  v-model="scope.row.theInboundQuantity"
+                  :min="0"
+                  style="width: 100%"
+                  @change="syncInboundQuantity(scope.row)"
+                  v-if="inDialogType != 'details'"
+                ></el-input-number>
+                <span v-else>{{
+                  scope.row.theInboundQuantity === undefined
+                    ? 0
+                    : scope.row.theInboundQuantity
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="unitPrice" label="单价">
               <template slot-scope="scope">
-                <el-input-number size="mini" v-model="scope.row.unitPrice" :min="0" style="width: 100%;"
+                <el-input-number
+                  size="mini"
+                  v-model="scope.row.unitPrice"
+                  :min="0"
+                  style="width: 100%"
                   @change="syncUnitPrice(scope.row)"
-                  v-if='inDialogType != "details" && scope.row.type !== "YH"'></el-input-number>
-                <span v-else-if='scope.row.type === "YH"'>-</span>
+                  v-if="inDialogType != 'details' && scope.row.type !== 'YH'"
+                ></el-input-number>
+                <span v-else-if="scope.row.type === 'YH'">-</span>
                 <span v-else>{{ scope.row.unitPrice || 0 }}</span>
-
               </template>
             </el-table-column>
-             <el-table-column prop="remark" label="备注">
+            <el-table-column prop="remark" label="备注">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.remark" placeholder="请输入备注" v-if='inDialogType != "details"'></el-input>
+                <el-input
+                  v-model="scope.row.remark"
+                  placeholder="请输入备注"
+                  v-if="inDialogType != 'details'"
+                ></el-input>
                 <span v-else>{{ scope.row.remark }}</span>
               </template>
             </el-table-column>
           </el-table>
           <!-- 单项选择 -->
-          <el-table :data="sizeForm.singleData" border style="width: 100%" v-show="sizeForm.option == 2" align="center">
-            <el-table-column prop="inboundDetailCode" label="入库明细单号" v-if="inDialogType == 'details'">
+          <el-table
+            :data="sizeForm.singleData"
+            border
+            style="width: 100%"
+            v-show="sizeForm.option == 2"
+            align="center"
+          >
+            <el-table-column
+              prop="inboundDetailCode"
+              label="入库明细单号"
+              v-if="inDialogType == 'details'"
+            >
             </el-table-column>
-            <el-table-column prop="materialCode" label="物资编码"></el-table-column>
+            <el-table-column
+              prop="materialCode"
+              label="物资编码"
+            ></el-table-column>
             <el-table-column prop="materialName" label="物资名称">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.materialId" placeholder="请选择物资名称" style="width: 100%;"
-                  @change="handleMaterialChange(scope.row)" v-if='inDialogType != "details"'>
-                  <el-option v-for="item in materials" :key="item.materialId" :label="item.materialName"
-                    :value="item.materialId">
+                <el-select
+                  v-model="scope.row.materialId"
+                  placeholder="请选择物资名称"
+                  style="width: 100%"
+                  @change="handleMaterialChange(scope.row)"
+                  v-if="inDialogType != 'details'"
+                >
+                  <el-option
+                    v-for="item in materials"
+                    :key="item.materialId"
+                    :label="item.materialName"
+                    :value="item.materialId"
+                  >
                   </el-option>
                 </el-select>
                 <span v-else> {{ scope.row.materialName }}</span>
@@ -135,43 +242,71 @@
             <el-table-column prop="model" label="物资规格"></el-table-column>
             <el-table-column prop="type" label="类别 ">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.type" placeholder="请选择" style="width: 100%;"
-                  @change="handleTypeChange(scope.row)" v-if='inDialogType !== "details"'>
+                <el-select
+                  v-model="scope.row.type"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  @change="handleTypeChange(scope.row)"
+                  v-if="inDialogType !== 'details'"
+                >
                   <el-option label="耐用品" value="NY"></el-option>
                   <el-option label="易耗品" value="YH"></el-option>
                 </el-select>
-                <span v-else>{{ scope.row.type == 'NY' ? '耐用品' : '易耗品' }}</span>
+                <span v-else>{{
+                  scope.row.type == "NY" ? "耐用品" : "易耗品"
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="unit" label="单位"></el-table-column>
-            <el-table-column prop="requiredQuantity" label="计划采购数量" v-if="sizeForm.option == 1">
+            <el-table-column
+              prop="requiredQuantity"
+              label="计划采购数量"
+              v-if="sizeForm.option == 1"
+            >
               <template slot-scope="scope">
                 {{ scope.row.requiredQuantity || 0 }}
               </template>
             </el-table-column>
-            <el-table-column prop="inboundQuantity" label="已入库数量" v-if="sizeForm.option == 1">
+            <el-table-column
+              prop="inboundQuantity"
+              label="已入库数量"
+              v-if="sizeForm.option == 1"
+            >
             </el-table-column>
             <el-table-column prop="theInboundQuantity" label="本次入库数量">
               <template slot-scope="scope">
-                <el-input-number size="mini" v-model="scope.row.theInboundQuantity" :min="0" style="width: 100%;"
-                  @change="syncInboundQuantity(scope.row)" v-if='inDialogType != "details"'></el-input-number>
+                <el-input-number
+                  size="mini"
+                  v-model="scope.row.theInboundQuantity"
+                  :min="0"
+                  style="width: 100%"
+                  @change="syncInboundQuantity(scope.row)"
+                  v-if="inDialogType != 'details'"
+                ></el-input-number>
                 <span v-else>{{ scope.row.theInboundQuantity || 0 }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="unitPrice" label="单价">
               <template slot-scope="scope">
-                <el-input-number size="mini" v-model="scope.row.unitPrice" :min="0" style="width: 100%;"
+                <el-input-number
+                  size="mini"
+                  v-model="scope.row.unitPrice"
+                  :min="0"
+                  style="width: 100%"
                   @change="syncUnitPrice(scope.row)"
-                  v-if='inDialogType != "details" && scope.row.type !== "YH"'></el-input-number>
-                <span v-else-if='scope.row.type === "YH"'>-</span>
+                  v-if="inDialogType != 'details' && scope.row.type !== 'YH'"
+                ></el-input-number>
+                <span v-else-if="scope.row.type === 'YH'">-</span>
                 <span v-else>{{ scope.row.unitPrice || 0 }}</span>
               </template>
             </el-table-column>
           </el-table>
           <!-- 入库账目表格 -->
-          <div class="form-title" v-if="inDialogType !== 'details'">入库账目表格：</div>
+          <div class="form-title" v-if="inDialogType !== 'details'">
+            入库账目表格：
+          </div>
           <!-- 批量选择 -->
-          <el-table :data="sizeForm.inTableData" border style="width: 100%"
+          <!-- <el-table :data="sizeForm.inTableData" border style="width: 100%"
             v-show="sizeForm.option == 1 && inDialogType !== 'details'">
             <el-table-column prop="date" label="当前库存">
               <el-table-column prop="inboundDetailCode" label="入库明细单号" v-if="inDialogType == 'details'">
@@ -182,8 +317,6 @@
               </el-table-column>
               <el-table-column prop="model" label="规格">
               </el-table-column>
-              <!-- <el-table-column prop="type" label="类别">
-              </el-table-column> -->
               <el-table-column prop="unit" label="单位">
               </el-table-column>
               <el-table-column prop="type" label="类别">
@@ -239,9 +372,9 @@
               </el-table-column>
             </el-table-column>
 
-          </el-table>
+          </el-table> -->
           <!-- 单项选择 -->
-          <el-table :data="sizeForm.singleData" border style="width: 100%"
+          <!-- <el-table :data="sizeForm.singleData" border style="width: 100%"
             v-show="sizeForm.option == 2 && inDialogType !== 'details'">
             <el-table-column prop="date" label="当前库存">
               <el-table-column prop="inboundDetailCode" label="入库明细单号" v-if="inDialogType == 'details'">
@@ -299,6 +432,90 @@
                 </template>
               </el-table-column>
             </el-table-column>
+          </el-table> -->
+          <el-table
+            :data="statisticsList"
+            border
+            style="width: 100%"
+            v-if="inDialogType !== 'details'"
+          >
+            <el-table-column prop="date" label="当前库存">
+              <el-table-column
+                prop="inboundDetailCode"
+                label="入库明细单号"
+                v-if="inDialogType == 'details'"
+              >
+              </el-table-column>
+              <el-table-column prop="materialCode" label="物资编码">
+              </el-table-column>
+              <el-table-column prop="materialName" label="物资名称">
+              </el-table-column>
+              <el-table-column prop="model" label="规格"> </el-table-column>
+              <el-table-column prop="unit" label="单位"> </el-table-column>
+              <el-table-column prop="type" label="类别">
+                <template slot-scope="scope">
+                  {{
+                    scope.row.type === "NY"
+                      ? "耐用品"
+                      : scope.row.type === "YH"
+                      ? "易耗品"
+                      : ""
+                  }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="num" label="数量">
+                <template slot-scope="scope">
+                  {{ scope.row.num || 0 }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="unitPrice" label="单价">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.type === 'YH'">-</span>
+                  <span v-else>{{ scope.row.unitPrice || 0 }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column prop="date" label="入库信息">
+              <el-table-column prop="theInboundQuantity" label="数量">
+              </el-table-column>
+              <el-table-column prop="unitPrice" label="单价">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.type === 'YH'">-</span>
+                  <span v-else>{{ scope.row.unitPrice || 0 }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column prop="date" label="入库后库存">
+              <el-table-column label="数量">
+                <template slot-scope="scope">
+                  {{
+                    scope.row.totalQuantity
+                  }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="unitPrice" label="单价">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.type === 'YH'">-</span>
+                  <span v-else>{{ scope.row.unitPrice || 0 }}</span> </template
+                >s
+              </el-table-column>
+            </el-table-column>
+            <el-table-column prop="date" label="入库信息">
+              <el-table-column label="入库人">
+                <template slot-scope="scope">
+                  {{
+                    scope.row.userInfoVO
+                      ? scope.row.userInfoVO.name
+                      : sizeForm.userInfoVO.name
+                  }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="inDate" label="入库时间" width="150">
+                <template slot-scope="scope">
+                  {{ inDate }}
+                </template>
+              </el-table-column>
+            </el-table-column>
           </el-table>
         </el-form>
       </div>
@@ -310,10 +527,27 @@
     </el-dialog>
 
     <!-- 批量出库  选择 -->
-    <el-dialog :close-on-click-modal="false" title="选择数据来源" :visible.sync="inBatchDialogVisible" :append-to-body="true"
-      width="40%" @close="handleBatchClose" @open="getBatchOptions">
-      <el-select v-model="batchType" placeholder="请选择数据来源" style="width: 100%;" :clearable="true">
-        <el-option v-for="item in batchOptions" :key="item.ids" :label="item.quarterName" :value="item.ids">
+    <el-dialog
+      :close-on-click-modal="false"
+      title="选择数据来源"
+      :visible.sync="inBatchDialogVisible"
+      :append-to-body="true"
+      width="40%"
+      @close="handleBatchClose"
+      @open="getBatchOptions"
+    >
+      <el-select
+        v-model="batchType"
+        placeholder="请选择数据来源"
+        style="width: 100%"
+        :clearable="true"
+      >
+        <el-option
+          v-for="item in batchOptions"
+          :key="item.ids"
+          :label="item.quarterName"
+          :value="item.ids"
+        >
         </el-option>
       </el-select>
       <span slot="footer" class="dialog-footer">
@@ -324,100 +558,154 @@
   </div>
 </template>
 <script>
-import { getAllQuarter, getPurchasesByIds, getMaterialList, getDetailList, submitData, editList } from "@/api/firstOrder/inbound";
+import {
+  getAllQuarter,
+  getPurchasesByIds,
+  getMaterialList,
+  getDetailList,
+  submitData,
+  editList,
+  getStatistics,
+} from "@/api/firstOrder/inbound";
 export default {
   props: {
     repairVisible: {
       type: Boolean,
-      default: false
+      default: false,
     },
     inDialogTiltle: {
       type: String,
-      default: ''
+      default: "",
     },
     inDialogType: {
       type: String,
-      default: ''
+      default: "",
     },
     type: {
       type: String,
-      default: ''
+      default: "",
     },
     id: {
       type: Number,
-      default: 0
-    }
+      default: 0,
+    },
   },
   data() {
     return {
       inDialogVisible: false,
       sizeForm: {
-        orderNo: '',//入库单号
-        reason: '',//事由
-        inDate: '',//入库日期
-        inAccountsTableData: [],//总计
+        orderNo: "", //入库单号
+        reason: "", //事由
+        inDate: "", //入库日期
+        inAccountsTableData: [], //总计
         inTableData: [], //批量选择的数据
         singleData: [], //单条选择
-        option: 2,//入库类型
-        options: '',
-        materialType: '1',//物资类型
-        source: 'cg', //来源
-        status: '',//状态
-        quarterName: '',
-        purchaseEndInfo: '',//采购单信息
+        option: 2, //入库类型
+        options: "",
+        materialType: "1", //物资类型
+        source: "cg", //来源
+        status: "", //状态
+        quarterName: "",
+        purchaseEndInfo: "", //采购单信息
         userInfoVO: {
           userId: "用户ID",
           name: "用户名称",
           mainErDepartment: "1",
           mainErDepartmentName: "主管部门名称",
         },
-        ldOnePutStorageDetailVOList: [],//入库明细
+        ldOnePutStorageDetailVOList: [], //入库明细
       },
       inTableData: [],
-      inBatchDialogVisible: false,//选择采购单的数据
-      batchType: '',//批量选择类型
-      materialsType: '',
-      allDisabled: false,
 
-    }
+      inBatchDialogVisible: false, //选择采购单的数据
+      batchType: "", //批量选择类型
+      materialsType: "",
+      allDisabled: false,
+      statisticsList: [], //统计明细数据
+    };
   },
   computed: {
     inDate() {
-      const now = new Date()
+      const now = new Date();
       const year = now.getFullYear();
-      const month = String(now.getMonth() + 1).padStart(2, '0');
-      const day = String(now.getDate()).padStart(2, '0');
+      const month = String(now.getMonth() + 1).padStart(2, "0");
+      const day = String(now.getDate()).padStart(2, "0");
       return `${year}年${month}月${day}日`;
-    }
+    },
   },
   mounted() {
-    this.inDialogVisible = this.repairVisible
-    if (this.inDialogType == 'add') {
-      this.addInit()
+    this.inDialogVisible = this.repairVisible;
+    if (this.inDialogType == "add") {
+      this.addInit();
     } else {
-      this.inInit()
+      this.inInit();
     }
-    if (this.inDialogType == 'details') {
-      this.allDisabled = true
+    if (this.inDialogType == "details") {
+      this.allDisabled = true;
     }
-    this.getBatchOptions()
-    this.getMaterialList()
+    this.getBatchOptions();
+    this.getMaterialList();
   },
   methods: {
+    // 批量 更改明细表数据
+    getStatistics() {
+      getStatistics(this.sizeForm.inTableData).then((res) => {
+        this.statisticsList = res.data.result;
+        this.statisticsList = this.statisticsList.map((stat) => {
+          const detail = this.sizeForm.inTableData.find(
+            (item) => item.materialCode === stat.materialCode
+          );
+          console.log("detail", detail,stat);
+          return {
+            ...stat,
+            theInboundQuantity: detail.theInboundQuantity, //本次入库数量
+            unitPrice: detail.unitPrice,
+            totalQuantity: stat.num + detail.theInboundQuantity,
+          };
+        });
+      });
+    },
+    // 单项 更改明细表数据
+    getStatisticsSingle() {
+      getStatistics(this.sizeForm.singleData).then((res) => {
+        this.statisticsList = res.data.result;
+        this.statisticsList = this.statisticsList.map((stat) => {
+          const detail = this.sizeForm.singleData.find(
+            (item) => item.materialId === stat.materialId
+          );
+          return {
+            ...stat,
+            theInboundQuantity: detail.theInboundQuantity, //本次入库数量
+            unitPrice: detail.unitPrice,
+            totalQuantity: stat.num + detail.theInboundQuantity,
+          };
+        });
+      });
+    },
     //本次入库数量
     syncInboundQuantity(row) {
       row.theInboundQuantity = Number(row.theInboundQuantity);
+       if(this.sizeForm.option == 1){
+        this.getStatistics();
+      }else{
+        this.getStatisticsSingle();
+      }
     },
     //单价
     syncUnitPrice(row) {
       row.unitPrice = Number(row.unitPrice);
+       if(this.sizeForm.option == 1){
+        this.getStatistics();
+      }else{
+        this.getStatisticsSingle();
+      }
     },
     //批量选择采购单数据来源
     async getBatchOptions() {
-      this.loading = true
+      this.loading = true;
       try {
         const res = await getAllQuarter();
-        this.batchOptions = res.data.result
+        this.batchOptions = res.data.result;
       } catch (error) {
         this.$message.error("获取数据来源失败，请重试");
       } finally {
@@ -426,36 +714,40 @@ export default {
     },
     //获取单条选择的物资名称列表
     async getMaterialList() {
-      this.loading = true
+      this.loading = true;
       try {
         const res = await getMaterialList();
-        this.materials = res.data.result
+        this.materials = res.data.result;
       } catch (error) {
         this.$message.error("获取数据来源失败，请重试");
       } finally {
         this.loading = false;
       }
     },
+    // 查看详情
     async inInit() {
-      if (this.inDialogType == 'details' || this.inDialogType == 'edit') {
+      if (this.inDialogType == "details" || this.inDialogType == "edit") {
         try {
           const res = await editList(this.id);
-          const { ldOnePutStorage, ldOnePutStorageDetailList = [] } = res.data.result || {};
+          const { ldOnePutStorage, ldOnePutStorageDetailList = [] } =
+            res.data.result || {};
           if (!ldOnePutStorage) {
             this.$message.error("回显数据异常");
             return;
           }
-          const handledDetailList = ldOnePutStorageDetailList.map(item => ({
+          const handledDetailList = ldOnePutStorageDetailList.map((item) => ({
             ...item,
-            theInboundQuantity: item.inboundQuantity || 0
-          }))
+            theInboundQuantity: item.inboundQuantity || 0,
+          }));
           this.sizeForm = {
             ...this.sizeForm,
             ...ldOnePutStorage,
-            inDate: ldOnePutStorage.inDate ? new Date(ldOnePutStorage.inDate) : '',
+            inDate: ldOnePutStorage.inDate
+              ? new Date(ldOnePutStorage.inDate)
+              : "",
             option: Number(ldOnePutStorage.options) || 1,
             quarterName: ldOnePutStorage.purchaseEndInfo,
-          }
+          };
           if (this.sizeForm.option === 1) {
             this.sizeForm.inTableData = handledDetailList;
           } else {
@@ -467,37 +759,37 @@ export default {
       }
     },
     addInit() {
-      this.sizeForm.inDate = new Date()//入库时间
-      this.sizeForm.inTableData.theInboundQuantity = 0
+      this.sizeForm.inDate = new Date(); //入库时间
+      this.sizeForm.inTableData.theInboundQuantity = 0;
     },
     //取消操作
     handleCloseDetail() {
-      this.inDialogVisible = false
-      this.$emit('handleCloseDetail')
+      this.inDialogVisible = false;
+      this.$emit("handleCloseDetail");
     },
     async inTableAdd() {
       if (this.sizeForm.option == 1) {
         this.sizeForm.inTableData.push({
-          unit: '',
-          model: '',
-          name: '',
-          status: '',//
-          materialId: '',
-          materialName: '',
+          unit: "",
+          model: "",
+          name: "",
+          status: "", //
+          materialId: "",
+          materialName: "",
           theInboundQuantity: 0,
           unitPrice: 0,
-        })
+        });
       } else {
         if (!Array.isArray(this.sizeForm.singleData)) {
           this.sizeForm.singleData = [];
         }
         const newRow = {
-          unit: '',
-          model: '',
-          name: '',
-          status: '',
-          materialId: '',
-          materialName: '',
+          unit: "",
+          model: "",
+          name: "",
+          status: "",
+          materialId: "",
+          materialName: "",
           theInboundQuantity: 0,
           unitPrice: 0,
         };
@@ -508,24 +800,27 @@ export default {
     // 采购单选择确定
     async batchSubmit() {
       if (!this.batchType) {
-        this.$message.warning("请选择数据来源")
-        return
+        this.$message.warning("请选择数据来源");
+        return;
       }
-      const selectedOption = this.batchOptions.find(option => option.ids === this.batchType);
+      const selectedOption = this.batchOptions.find(
+        (option) => option.ids === this.batchType
+      );
       if (!selectedOption) {
         this.$message.error("未找到对应的采购单信息");
-        return
+        return;
       }
-      this.sizeForm.quarterName = selectedOption.quarterName
+      this.sizeForm.quarterName = selectedOption.quarterName;
 
-      this.sizeForm.purchaseEndInfo = selectedOption
-      this.loading = true
+      this.sizeForm.purchaseEndInfo = selectedOption;
+      this.loading = true;
       const res = await getPurchasesByIds(this.batchType);
       if (res.data.success) {
         this.sizeForm.inTableData = res.data.result;
-        this.sizeForm.inTableData.forEach(item => {
-          item.theInboundQuantity = 0
-        })
+        this.sizeForm.inTableData.forEach((item) => {
+          item.theInboundQuantity = 0;
+        });
+        this.getStatistics();
         this.$message.success("数据获取成功");
         this.inBatchDialogVisible = false;
       } else {
@@ -535,23 +830,28 @@ export default {
     },
     // 采购单选择弹框关闭
     handleBatchClose() {
-      this.inBatchDialogVisible = false
+      this.inBatchDialogVisible = false;
     },
     // 处理物资选择变化
     async handleMaterialChange(row) {
       if (!row.materialId) {
         this.$message.warning("请选择物资名称");
-        return
+        return;
       }
-      const res = await getDetailList({ id: row.materialId })
+      const res = await getDetailList({ id: row.materialId });
       if (res.data.success) {
         if (!Array.isArray(this.sizeForm.singleData)) {
           this.sizeForm.singleData = [];
         }
         const materialData = res.data.result;
-        const index = this.sizeForm.singleData.findIndex(item => item === row);
+        const index = this.sizeForm.singleData.findIndex(
+          (item) => item === row
+        );
         if (index !== -1) {
-          this.$set(this.sizeForm.singleData, index, { ...row, ...materialData });
+          this.$set(this.sizeForm.singleData, index, {
+            ...row,
+            ...materialData,
+          });
         } else {
           this.sizeForm.singleData.push({ ...row, ...materialData });
         }
@@ -580,12 +880,16 @@ export default {
         this.$message.error("请选择来源");
         return;
       }
-      if (this.sizeForm.option === 1) {//批量选择
+      if (this.sizeForm.option === 1) {
+        //批量选择
         if (!this.sizeForm.quarterName) {
           this.$message.error("请选择采购单名称");
           return;
         }
-        if (!this.sizeForm.inTableData || this.sizeForm.inTableData.length === 0) {
+        if (
+          !this.sizeForm.inTableData ||
+          this.sizeForm.inTableData.length === 0
+        ) {
           this.$message.error("请添加批量选择数据");
           return;
         }
@@ -605,7 +909,7 @@ export default {
               return;
             }
           }
-          if ( row.theInboundQuantity < 0) {
+          if (row.theInboundQuantity < 0) {
             this.$message.error("本次入库数量不能为空");
             return;
           }
@@ -613,16 +917,25 @@ export default {
             this.$message.error("请选择类别");
             return;
           }
-         if ((row.theInboundQuantity+ row.inboundQuantity > row.requiredQuantity)&& !row.remark ) {
-
-            this.$message.error(row.materialName + "本次入库数量不能大于采购单计划数量,请填写备注原因");
+          if (
+            row.theInboundQuantity + row.inboundQuantity >
+              row.requiredQuantity &&
+            !row.remark
+          ) {
+            this.$message.error(
+              row.materialName +
+                "本次入库数量不能大于采购单计划数量,请填写备注原因"
+            );
             return;
           }
         }
       }
       // 单项选择验证
       else if (this.sizeForm.option === 2) {
-        if (!this.sizeForm.singleData || this.sizeForm.singleData.length === 0) {
+        if (
+          !this.sizeForm.singleData ||
+          this.sizeForm.singleData.length === 0
+        ) {
           this.$message.error("请添加单项选择数据");
           return;
         }
@@ -651,28 +964,28 @@ export default {
       }
 
       // status == 1 暂存 ，2提交
-      this.sizeForm.status = index
+      this.sizeForm.status = index;
       if (this.sizeForm.option == 1) {
-        this.sizeForm.singleData = []
-        this.sizeForm.ldOnePutStorageDetailVOList = this.sizeForm.inTableData
-        this.sizeForm.options = this.sizeForm.option
-        this.sizeForm.purchaseEndInfo = this.sizeForm.quarterName
-        this.sizeForm.option = ''
+        this.sizeForm.singleData = [];
+        this.sizeForm.ldOnePutStorageDetailVOList = this.sizeForm.inTableData;
+        this.sizeForm.options = this.sizeForm.option;
+        this.sizeForm.purchaseEndInfo = this.sizeForm.quarterName;
+        this.sizeForm.option = "";
       } else if (this.sizeForm.option == 2) {
-        this.sizeForm.inTableData = []
-        this.sizeForm.ldOnePutStorageDetailVOList = this.sizeForm.singleData
-        this.sizeForm.options = this.sizeForm.option
-        this.sizeForm.option = ''
+        this.sizeForm.inTableData = [];
+        this.sizeForm.ldOnePutStorageDetailVOList = this.sizeForm.singleData;
+        this.sizeForm.options = this.sizeForm.option;
+        this.sizeForm.option = "";
       }
       try {
-        const res = await submitData(this.sizeForm)
+        const res = await submitData(this.sizeForm);
         if (res.data.success) {
           this.$message({
             type: "success",
-            message: "提交成功"
+            message: "提交成功",
           });
           // 提交成功后通知父组件更新页面
-          this.$emit('submitSuccess');
+          this.$emit("submitSuccess");
           this.handleCloseDetail();
         } else {
           this.$message.error(res.data.message || "提交失败");
@@ -680,42 +993,48 @@ export default {
       } catch (error) {
         this.$message.error(error.message || "服务器错误");
       }
-
     },
 
     // 选项选择，批量选择1 单条选择2
     radioChange() {
-      this.batchType = '';
-      this.sizeForm.inTableData = []
-      this.sizeForm.singleData = []
+      this.batchType = "";
+      this.sizeForm.inTableData = [];
+      this.sizeForm.singleData = [];
       if (this.sizeForm.option == 1) {
-        this.inBatchDialogVisible = true
+        this.inBatchDialogVisible = true;
       }
     },
     // type类别选择变更
     handleTypeChange(row) {
-      if (row.type === 'YH') {
+      if (row.type === "YH") {
         // row.unitPrice = null;
         if (Number(row.unitPrice) > 600) {
-          this.$confirm('单价大于600元,确定要选择为易耗品吗？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            return;
-          }).catch(() => {
-            row.type = 'NY'
-            this.$message({
-              type: 'info',
-              message: '请重新选择类型'
+          this.$confirm("单价大于600元,确定要选择为易耗品吗？", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              return;
+            })
+            .catch(() => {
+              row.type = "NY";
+              this.$message({
+                type: "info",
+                message: "请重新选择类型",
+              });
             });
-          });
         }
       }
-    },
-  }
 
-}
+      if(this.sizeForm.option == 1){
+        this.getStatistics();
+      }else{
+        this.getStatisticsSingle();
+      }
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-table td,
diff --git a/src/views/firstOrder/components/outDialog.vue b/src/views/firstOrder/components/outDialog.vue
index 1abbc56..43b3abc 100644
--- a/src/views/firstOrder/components/outDialog.vue
+++ b/src/views/firstOrder/components/outDialog.vue
@@ -1,32 +1,60 @@
 <template>
   <div>
-    <el-dialog :close-on-click-modal="false" :title="outDialogTiltle" :visible.sync="outDialogVisible"
-      :append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen>
+    <el-dialog
+      :close-on-click-modal="false"
+      :title="outDialogTiltle"
+      :visible.sync="outDialogVisible"
+      :append-to-body="true"
+      width="70%"
+      @close="handleCloseDetail"
+      fullscreen
+    >
       <!-- 基本信息 -->
       <div class="dialog-content">
-        <el-form :model="sizeForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic">
-          <div class="form-title"> 基本信息</div>
+        <el-form
+          :model="sizeForm"
+          ref="dynamicValidateForm"
+          label-width="100px"
+          class="demo-dynamic"
+        >
+          <div class="form-title">基本信息</div>
           <el-row>
-            <el-col :span="12" v-show="sizeForm.options == 1 && outDialogType != 'add'">
+            <el-col
+              :span="12"
+              v-show="sizeForm.options == 1 && outDialogType != 'add'"
+            >
               <el-form-item label="出库单号">
                 <el-input v-model="sizeForm.orderNo" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="出库申请日期">
-                <el-date-picker v-model="sizeForm.outDate" type="date" placeholder="选择日期" style="width: 100%;" disabled>
+                <el-date-picker
+                  v-model="sizeForm.outDate"
+                  type="date"
+                  placeholder="选择日期"
+                  style="width: 100%"
+                  disabled
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="事由">
-                <el-input v-model="sizeForm.reason" :disabled="outDialogType == 'details'"></el-input>
+                <el-input
+                  v-model="sizeForm.reason"
+                  :disabled="outDialogType == 'details'"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="物资类型">
-                <el-select v-model="sizeForm.materialType" placeholder="请选择" style="width: 100%;"
-                  :disabled="outDialogType == 'details'">
+                <el-select
+                  v-model="sizeForm.materialType"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  :disabled="outDialogType == 'details'"
+                >
                   <el-option label="办公室物资" value="1"></el-option>
                   <el-option label="其他物资" value="2"></el-option>
                 </el-select>
@@ -34,17 +62,25 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="选项">
-                <el-radio-group v-model="sizeForm.options" @change="radioChange()"
-                  :disabled="outDialogType == 'details'">
-                  <el-radio :label="1" :disabled="sizeForm.type == 2"><span>批量选择</span></el-radio>
+                <el-radio-group
+                  v-model="sizeForm.options"
+                  @change="radioChange()"
+                  :disabled="outDialogType == 'details'"
+                >
+                  <el-radio :label="1" :disabled="sizeForm.type == 2"
+                    ><span>批量选择</span></el-radio
+                  >
                   <el-radio :label="2">单项选择</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="sizeForm.options === 2">
               <el-form-item label="选项">
-                <el-radio-group v-model="sizeForm.optionType" :disabled="outDialogType == 'details'"
-                  @change="getMaterialList">
+                <el-radio-group
+                  v-model="sizeForm.optionType"
+                  :disabled="outDialogType == 'details'"
+                  @change="getMaterialList"
+                >
                   <el-radio label="YH">易耗品</el-radio>
                   <el-radio label="NY">耐用品</el-radio>
                 </el-radio-group>
@@ -57,147 +93,292 @@
             </el-col>
           </el-row>
           <div class="form-title">{{ outDate }} 出库信息：</div>
-          <el-button type="primary" size="mini" style="margin-bottom: 18px;" @click="inTableAdd()"
-            v-if="sizeForm.options == 2 && outDialogType != 'details'">新增</el-button>
-          <el-table :data="sizeForm.inTableData" border style="width: 100%">
+          <el-button
+            type="primary"
+            size="mini"
+            style="margin-bottom: 18px"
+            @click="inTableAdd()"
+            v-if="sizeForm.options == 2 && outDialogType != 'details'"
+            >新增</el-button
+          >
+          <el-table
+            :data="sizeForm.inTableData"
+            border
+            style="width: 100%"
+            :span-method="objectSpanMethod"
+          >
             <el-table-column prop="materialCode" label="物资编码">
             </el-table-column>
             <el-table-column prop="materialName" label="物资名称">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.materialitem" placeholder="请选择物资名称" style="width: 100%;"
-                  @change="handleMaterialChange(scope.row.materialitem, scope.$index)"
-                  v-if='outDialogType != "details" && sizeForm.options == 2 && sizeForm.optionType == "YH"'
-                  value-key="id">
-                  <el-option v-for="item in materials" :key="item.materialId" :label="item.materialName" :value="item">
+                <el-select
+                  v-model="scope.row.materialitem"
+                  placeholder="请选择物资名称"
+                  style="width: 100%"
+                  @change="
+                    handleMaterialChange(scope.row.materialitem, scope.$index)
+                  "
+                  v-if="
+                    outDialogType != 'details' &&
+                    sizeForm.options == 2 &&
+                    sizeForm.optionType == 'YH'
+                  "
+                  value-key="id"
+                >
+                  <el-option
+                    v-for="item in materials"
+                    :key="item.materialId"
+                    :label="item.materialName"
+                    :value="item"
+                  >
                   </el-option>
                 </el-select>
                 <span v-else> {{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="model" label="规格">
-            </el-table-column>
+            <el-table-column prop="model" label="规格"> </el-table-column>
             <el-table-column prop="type" label="类别">
               <template slot-scope="scope">
-                {{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }}
+                {{
+                  scope.row.type === "NY"
+                    ? "耐用品"
+                    : scope.row.type === "YH"
+                    ? "易耗品"
+                    : ""
+                }}
               </template>
             </el-table-column>
             <el-table-column prop="type" label="出库类型">
               <template slot-scope="scope">
-                {{ scope.row.type === "NY" ? "出库单" : (scope.row.type === "YH" ? "发放单" : "") }}
+                {{
+                  scope.row.type === "NY"
+                    ? "出库单"
+                    : scope.row.type === "YH"
+                    ? "发放单"
+                    : ""
+                }}
               </template>
             </el-table-column>
-            <el-table-column prop="unit" label="单位">
-            </el-table-column>
-            <el-table-column label="部门" prop="departmentName" v-if="sizeForm.options === 2 || sizeForm.optionType"
-              :key="'account-dept-' + sizeForm.options">
+            <el-table-column prop="unit" label="单位"> </el-table-column>
+            <el-table-column
+              label="部门"
+              prop="departmentName"
+              v-if="sizeForm.options === 2 || sizeForm.optionType"
+              :key="'account-dept-' + sizeForm.options"
+            >
               <template slot-scope="scope">
-                <el-select v-model="scope.row.department" placeholder="请选择部门名称" style="width: 100%;"
-                  v-if='outDialogType != "details"'>
-                  <el-option v-for="item in list" :key="item.departmentId" :label="item.department"
-                    :value="item.departmentId">
+                <el-select
+                  v-model="scope.row.department"
+                  placeholder="请选择部门名称"
+                  style="width: 100%"
+                  v-if="outDialogType != 'details'"
+                  @change="changeDepartment"
+                >
+                  <el-option
+                    v-for="item in list"
+                    :key="item.departmentId"
+                    :label="item.department"
+                    :value="item.departmentId"
+                  >
                   </el-option>
                 </el-select>
-                <span v-else> {{ scope.row.departmentName || '无' }}</span>
+                <span v-else> {{ scope.row.departmentName || "无" }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column prop="departmentName" label="部门" :key="'account-dept-' + sizeForm.options">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.department" placeholder="请选择部门名称" style="width: 100%;"
-                  v-if='outDialogType != "details" && sizeForm.options === 2 && sizeForm.optionType'>
-                  <el-option v-for="item in list" :key="item.departmentId" :label="item.department"
-                    :value="item.departmentId">
-                  </el-option>
-                </el-select>
-                <span v-else>{{ scope.row.departmentName }}</span>
-              </template>
-            </el-table-column> -->
-            <el-table-column prop="applicationQuantity" label="申请数量" v-if="sizeForm.options == 1">
+            <el-table-column
+              prop="applicationQuantity"
+              label="申请数量"
+              v-if="sizeForm.options == 1"
+            >
               <template slot-scope="scope">
                 {{ scope.row.applicationQuantity || 0 }}
               </template>
             </el-table-column>
 
-            <el-table-column prop="outboundQuantity" label="已出库数量" v-if="sizeForm.options == 1">
+            <el-table-column
+              prop="outboundQuantity"
+              label="已出库数量"
+              v-if="sizeForm.options == 1"
+            >
               <template slot-scope="scope">
                 {{ scope.row.outboundQuantity || 0 }}
               </template>
             </el-table-column>
             <el-table-column prop="theOutboundQuantity" label="本次出库数量">
               <template slot-scope="scope">
-                <el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="0" style="width: 100%;"
-                  @change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"
-                  v-if="sizeForm.optionType === 'YH' || inBatchForm.optionType === 'YH'"></el-input-number>
-                <span v-else>{{ scope.row.theOutboundQuantity = 1 }}</span>
+                <el-input-number
+                  size="mini"
+                  v-model="scope.row.theOutboundQuantity"
+                  :min="0"
+                  style="width: 100%"
+                  @change="syncInboundQuantity(scope.row)"
+                  :disabled="outDialogType == 'details'"
+                  v-if="
+                    sizeForm.optionType === 'YH' ||
+                    inBatchForm.optionType === 'YH'
+                  "
+                ></el-input-number>
+                <span v-else>{{ (scope.row.theOutboundQuantity = 1) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" style="text-align: center;" v-if="outDialogType != 'details'">
+            <el-table-column
+              label="操作"
+              style="text-align: center"
+              v-if="outDialogType != 'details'"
+            >
               <template slot-scope="scope">
-                <div style="text-align: center;" :disabled="outDialogType == 'details'">
-                  <el-button type="text" size="mini" @click="handleDelete(scope.$index, scope.row)">
+                <div
+                  style="text-align: center"
+                  :disabled="outDialogType == 'details'"
+                >
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="handleDelete(scope.$index, scope.row)"
+                  >
                     删除
                   </el-button>
                 </div>
               </template>
             </el-table-column>
           </el-table>
-          <div class="form-title" v-if="outDialogType !== 'details'">出库账目表格：</div>
-          <el-table :data="sizeForm.inTableData" border style="width: 100%" v-if="outDialogType !== 'details'">
+          <div class="form-title" v-if="outDialogType !== 'details'">
+            出库账目表格：
+          </div>
+          <el-table
+            :data="statisticsList"
+            border
+            style="width: 100%"
+            v-if="outDialogType !== 'details'"
+          >
             <el-table-column prop="date" label="当前库存" width="100">
               <el-table-column prop="materialCode" label="物资编码">
               </el-table-column>
               <el-table-column prop="materialName" label="物资名称">
               </el-table-column>
-              <el-table-column prop="model" label="规格">
-              </el-table-column>
+              <el-table-column prop="model" label="规格"> </el-table-column>
               <el-table-column prop="type" label="类别">
                 <template slot-scope="scope">
-                  {{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }}
+                  {{
+                    scope.row.type === "NY"
+                      ? "耐用品"
+                      : scope.row.type === "YH"
+                      ? "易耗品"
+                      : ""
+                  }}
                 </template>
               </el-table-column>
               <el-table-column prop="type" label="出库类型">
                 <template slot-scope="scope">
-                  {{ scope.row.type === "NY" ? "出库单" : (scope.row.type === "YH" ? "发放单" : "") }}
+                  {{
+                    scope.row.type === "NY"
+                      ? "出库单"
+                      : scope.row.type === "YH"
+                      ? "发放单"
+                      : ""
+                  }}
                 </template>
               </el-table-column>
-              <el-table-column prop="departmentName" label="部门" v-if="sizeForm.options == 2"
-                :key="'account-dept-' + sizeForm.options">
+              <el-table-column
+                prop="departmentName"
+                label="部门"
+                v-if="sizeForm.options == 2"
+                :key="'account-dept-' + sizeForm.options"
+              >
                 <template slot-scope="scope">
                   <span>
                     {{ getDepartmentName(scope.row.department) }}
                   </span>
                 </template>
               </el-table-column>
-              <el-table-column prop="theOutboundQuantity" label="本次出库数量">
+              <el-table-column prop="num" label="数量">
               </el-table-column>
             </el-table-column>
-            <el-table-column prop="date" label="出库信息" v-if="sizeForm.options == 1">
-              <el-table-column prop="outboundQuantity" label="数量">
+
+            <el-table-column
+              prop="date"
+              label="出库信息"
+
+            >
+              <el-table-column prop="theOutboundQuantity" label="数量">
                 <template slot-scope="scope">
-                  {{ scope.row.outboundQuantity || 0 }}
+                  {{ scope.row.theOutboundQuantity || 0 }}
+                </template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column
+              prop="date"
+              label="出库后库存"
+
+            >
+              <el-table-column prop="totalQuantity" label="数量">
+                <template slot-scope="scope">
+                  {{ scope.row.totalQuantity || 0 }}
+                </template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column prop="date" label="出库信息">
+              <el-table-column label="出库人">
+                <template slot-scope="scope">
+                  {{
+                    scope.row.userInfoVO
+                      ? scope.row.userInfoVO.name
+                      : sizeForm.userInfoVO.name
+                  }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="outDate" label="出库时间" width="150">
+                <template slot-scope="scope">
+                  {{ outDate }}
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table>
         </el-form>
       </div>
-      <span slot="footer" class="dialog-footer" v-if="outDialogType != 'details'">
+      <span
+        slot="footer"
+        class="dialog-footer"
+        v-if="outDialogType != 'details'"
+      >
         <el-button @click="handleCloseDetail()">取 消</el-button>
         <el-button type="primary" @click="submit(1)">暂存</el-button>
         <el-button type="primary" @click="submit(2)">提交</el-button>
       </span>
     </el-dialog>
     <!-- 批量出库  选择数据源弹窗 -->
-    <el-dialog :close-on-click-modal="false" title="选择数据来源" :visible.sync="inBatchDialogVisible" :append-to-body="true"
-      width="40%" @close="handleBatchClose" @open="getQuarterList">
-      <el-form :model="inBatchForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic">
+    <el-dialog
+      :close-on-click-modal="false"
+      title="选择数据来源"
+      :visible.sync="inBatchDialogVisible"
+      :append-to-body="true"
+      width="40%"
+      @close="handleBatchClose"
+      @open="getQuarterList"
+    >
+      <el-form
+        :model="inBatchForm"
+        ref="dynamicValidateForm"
+        label-width="100px"
+        class="demo-dynamic"
+      >
         <el-row>
           <el-col :span="24">
             <el-form-item label="需求单">
               <template slot-scope="scope">
-                <el-select v-model="inBatchForm.batchType" placeholder="请选择需求单" style="width: 100%;"
-                  @change="resetHandle">
-                  <el-option v-for="item in quarterList" :key="item.ids" :label="item.quarterName" :value="item.ids"
-                    :clearable="true">
+                <el-select
+                  v-model="inBatchForm.batchType"
+                  placeholder="请选择需求单"
+                  style="width: 100%"
+                  @change="resetHandle"
+                >
+                  <el-option
+                    v-for="item in quarterList"
+                    :key="item.ids"
+                    :label="item.quarterName"
+                    :value="item.ids"
+                    :clearable="true"
+                  >
                   </el-option>
                 </el-select>
               </template>
@@ -205,17 +386,29 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="部门">
-              <el-select v-model="inBatchForm.department" placeholder="请选择" style="width: 100%;" :clearable="true"
-                @change="depchange">
-                <el-option v-for="item in departmentList" :key="item.departmentId" :label="item.department"
-                  :value="item.departmentId">
+              <el-select
+                v-model="inBatchForm.department"
+                placeholder="请选择"
+                style="width: 100%"
+                :clearable="true"
+                @change="depchange"
+              >
+                <el-option
+                  v-for="item in departmentList"
+                  :key="item.departmentId"
+                  :label="item.department"
+                  :value="item.departmentId"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="选项">
-              <el-radio-group v-model="inBatchForm.optionType" :disabled="outDialogType == 'details'">
+              <el-radio-group
+                v-model="inBatchForm.optionType"
+                :disabled="outDialogType == 'details'"
+              >
                 <el-radio label="YH">易耗品</el-radio>
                 <el-radio label="NY">耐用品</el-radio>
               </el-radio-group>
@@ -231,53 +424,75 @@
     </el-dialog>
 
     <!-- 单条新增耐用品弹窗 -->
-    <consumableDialog v-if="consumableVisible" :consumableVisible='consumableVisible'
-      :demandDialogTitle="demandDialogTitle" @handleCloseDetail="handleCloseDetail" @confirm="confirm">
+    <consumableDialog
+      v-if="consumableVisible"
+      :consumableVisible="consumableVisible"
+      :demandDialogTitle="demandDialogTitle"
+      @handleCloseDetail="handleCloseDetail"
+      @confirm="confirm"
+    >
     </consumableDialog>
     <!-- 批量耐用品弹窗 -->
-    <batchSelectionDialog v-if="batchSelectionVisible" :batchSelectionVisible='batchSelectionVisible'
-      :batchSelectionTitle="batchSelectionTitle" :tableData="batchTableData" @batchclose="batchclose"
-      :inBatchForm="inBatchForm" @confirm-selection="handleConfirmSelection" @selectionChange="selectionChange">
+    <batchSelectionDialog
+      v-if="batchSelectionVisible"
+      :batchSelectionVisible="batchSelectionVisible"
+      :batchSelectionTitle="batchSelectionTitle"
+      :tableData="batchTableData"
+      @batchclose="batchclose"
+      :inBatchForm="inBatchForm"
+      @confirm-selection="handleConfirmSelection"
+      @selectionChange="selectionChange"
+    >
     </batchSelectionDialog>
   </div>
-
 </template>
 <script>
-import { getQuarterList, getDepartmentList, getDetailedList, getDetailedItems, submitData, getMaterialList, editList, batchList } from "@/api/firstOrder/outbound";
-import consumableDialog from './consumableDialog.vue'
-import batchSelectionDialog from './batchSelectionDialog.vue'
+import {
+  getQuarterList,
+  getDepartmentList,
+  getDetailedList,
+  getDetailedItems,
+  submitData,
+  getMaterialList,
+  editList,
+  batchList,
+} from "@/api/firstOrder/outbound";
+import consumableDialog from "./consumableDialog.vue";
+import batchSelectionDialog from "./batchSelectionDialog.vue";
+import { getStatistics } from "@/api/firstOrder/inbound";
 export default {
   components: {
     consumableDialog,
-    batchSelectionDialog
+    batchSelectionDialog,
   },
   props: {
     repairVisible: {
       type: Boolean,
-      default: false
+      default: false,
     },
     outDialogTiltle: {
       type: String,
-      default: ''
+      default: "",
     },
     outDialogType: {
       type: String,
-      default: ''
+      default: "",
     },
     type: {
       type: String,
-      default: ''
+      default: "",
     },
     id: {
       type: Number,
-      default: 0
-    }
+      default: 0,
+    },
   },
   data() {
     return {
+      statisticsList: [], //统计明细数据
       dialogVisible: false,
-      demandDialogTitle: '耐用品出库',
-      batchSelectionTitle: '耐用品出库',
+      demandDialogTitle: "耐用品出库",
+      batchSelectionTitle: "耐用品出库",
       batchSelectionVisible: false,
       batchSelection: true, // 保持组件渲染
       batchTableData: [],
@@ -287,17 +502,17 @@ export default {
       departmentList: [],
       outDialogVisible: false,
       sizeForm: {
-        orderNo: '',//出库单号
-        reason: '',//事由
+        orderNo: "", //出库单号
+        reason: "", //事由
         // inAccountsTableData: [],//总计
         inTableData: [],
         ldOneOutStorageDetailVOList: [],
-        demandEndInfo: '',//需求单名称
-        outDate: '',//出库时间
-        options: 2,//出库类型
-        optionType: '', // 1易耗品 2耐用品
-        materialType: '1',//物资类型
-        status: '',//1暂存 2提交
+        demandEndInfo: "", //需求单名称
+        outDate: "", //出库时间
+        options: 2, //出库类型
+        optionType: "", // 1易耗品 2耐用品
+        materialType: "1", //物资类型
+        status: "", //1暂存 2提交
         // materialld: '',//物资Id
         userInfoVO: {
           userId: "用户ID",
@@ -307,54 +522,110 @@ export default {
         },
       },
       // inTableData: [],
-      inBatchDialogVisible: false,//选择采购单的数据
-      batchType: '',//需求单选择类型
-      inBatchForm: { //批量选择
-        batchType: '', //需求单类型
-        department: '', //部门
-        optionType: '', //YH/NY
+      inBatchDialogVisible: false, //选择采购单的数据
+      batchType: "", //需求单选择类型
+      inBatchForm: {
+        //批量选择
+        batchType: "", //需求单类型
+        department: "", //部门
+        optionType: "", //YH/NY
       },
       quarterYearMap: {},
       quarterQuarterMap: {},
-    }
+    };
   },
   computed: {
     outDate() {
-      const now = new Date()
+      const now = new Date();
       const year = now.getFullYear();
-      const month = String(now.getMonth() + 1).padStart(2, '0');
-      const day = String(now.getDate()).padStart(2, '0')
+      const month = String(now.getMonth() + 1).padStart(2, "0");
+      const day = String(now.getDate()).padStart(2, "0");
       // const hour = String(now.getHours()).padStart(2, '0')
       // const minute = String(now.getMinutes()).padStart(2, '0')
       // const second = String(now.getSeconds()).padStart(2, '0')
       // return `${year}-${month}-${day} ${hour}:${minute}:${second}`
-      return `${year}-${month}-${day}`
-    }
+      return `${year}-${month}-${day}`;
+    },
   },
   mounted() {
-
-    this.outDialogVisible = this.repairVisible
-    if (this.outDialogType == 'add') {
-      this.addInit()
+    this.outDialogVisible = this.repairVisible;
+    if (this.outDialogType == "add") {
+      this.addInit();
     } else {
-      this.inInit()
+      this.inInit();
     }
-    this.getDetailedItems()
+    this.getDetailedItems();
     // this.getMaterialList()
   },
   methods: {
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (this.sizeForm.options == 1 && this.inBatchForm.optionType == "NY") {
+        if (
+          columnIndex === 0 ||
+          columnIndex === 1 ||
+          columnIndex === 6 ||
+          columnIndex === 7
+        ) {
+          const key = `${row.materialCode}-${row.materialName}`;
+          const rows = this.sizeForm.inTableData.filter(
+            (item) => `${item.materialCode}-${item.materialName}` === key
+          );
+          if (
+            rows.length > 1 &&
+            rowIndex === this.sizeForm.inTableData.indexOf(rows[0])
+          ) {
+            return {
+              rowspan: rows.length,
+              colspan: 1,
+            };
+          }
+
+          if (
+            rows.length > 1 &&
+            rowIndex !== this.sizeForm.inTableData.indexOf(rows[0])
+          ) {
+            return {
+              rowspan: 0,
+              colspan: 0,
+            };
+          }
+        }
+      }
+    },
+    getStatistics() {
+      getStatistics(this.sizeForm.inTableData).then((res) => {
+        this.statisticsList = res.data.result;
+        this.statisticsList = this.statisticsList.map((stat) => {
+          const detail = this.sizeForm.inTableData.find(
+            (item) => item.materialCode === stat.materialCode
+          );
+          console.log("detail", detail, stat);
+          return {
+            ...stat,
+            theOutboundQuantity: detail.theOutboundQuantity, //本次出库数量
+            unitPrice: detail.unitPrice,
+            totalQuantity: stat.num - detail.theOutboundQuantity,
+          };
+        });
+      });
+    },
+    changeDepartment(){
+      this.getStatistics()
+    },
     batchclose() {
-      this.batchSelectionVisible = false
+      this.batchSelectionVisible = false;
     },
     selectionChange(row) {
-      this.batchSelectionVisible = false
-      this.sizeForm.inTableData = row
+      this.batchSelectionVisible = false;
+      this.sizeForm.inTableData = row;
+       this.getStatistics();
     },
     confirm(allSelectedList) {
-      this.consumableVisible = false
-      this.sizeForm.inTableData = allSelectedList
-      console.log(this.sizeForm.inTableData, '111220')
-    },    // 处理搜索
+      this.consumableVisible = false;
+      this.sizeForm.inTableData = allSelectedList;
+      this.getStatistics();
+      console.log(this.sizeForm.inTableData, "111220");
+    }, // 处理搜索
     async handleSearch() {
       // 重置当前页
       this.currentPage = 1;
@@ -374,18 +645,21 @@ export default {
       this.loadGoodsList();
     },
     depchange(value) {
-      this.departmentList = this.departmentList
+      this.departmentList = this.departmentList;
     },
     //关闭
     handleBatchClose() {
-      this.inBatchDialogVisible = false
+      this.inBatchDialogVisible = false;
     },
     // 添加出库数据
     inTableAdd() {
       const requiredFields = [
-        { value: this.sizeForm.reason, message: '请填写事由' },
-        { value: this.sizeForm.materialType, message: '请选择物资类型' },
-        { value: this.sizeForm.optionType, message: '请选择类别（易耗品/耐用品）' }
+        { value: this.sizeForm.reason, message: "请填写事由" },
+        { value: this.sizeForm.materialType, message: "请选择物资类型" },
+        {
+          value: this.sizeForm.optionType,
+          message: "请选择类别（易耗品/耐用品）",
+        },
       ];
       // 检查所有必填项
       for (const field of requiredFields) {
@@ -394,87 +668,89 @@ export default {
           return;
         }
       }
-      this.sizeForm.inTableData.push({})
+      this.sizeForm.inTableData.push({});
     },
     addInit() {
-      this.sizeForm.outDate = new Date()//出库时间
-
+      this.sizeForm.outDate = new Date(); //出库时间
     },
     //本次出库数量
     syncInboundQuantity(row) {
-      row.theOutboundQuantity = Number(row.theOutboundQuantity)
+      row.theOutboundQuantity = Number(row.theOutboundQuantity);
       if (this.sizeForm.options === 1) {
-        const maxAllowQuantity = (row.applicationQuantity || 0) - (row.outboundQuantity || 0);
+        const maxAllowQuantity =
+          (row.applicationQuantity || 0) - (row.outboundQuantity || 0);
         if (row.theOutboundQuantity > maxAllowQuantity) {
           this.$message.error(`本次出库数量不能大于${maxAllowQuantity}`);
           row.theOutboundQuantity = maxAllowQuantity;
+          return false
         }
       }
-      if (this.sizeForm.optionType === 'NY') {
-        row.theOutboundQuantity = 1
+      if (this.sizeForm.optionType === "NY") {
+        row.theOutboundQuantity = 1;
       }
+      this.getStatistics()
     },
     //关闭新增弹窗
     handleCloseDetail() {
-      this.outDialogVisible = false
-      this.consumableVisible = false
-      this.$emit('handleCloseDetail')
+      this.outDialogVisible = false;
+      this.consumableVisible = false;
+      this.$emit("handleCloseDetail");
     },
     // 获取批量需求单列表
     async getQuarterList() {
       try {
-        const res = await getQuarterList()
+        const res = await getQuarterList();
         if (res.data && res.data.result) {
-          this.quarterList = res.data.result
-          this.quarterList.forEach(item => {
+          this.quarterList = res.data.result;
+          this.quarterList.forEach((item) => {
             if (item.year && item.quarter && item.ids) {
-              this.quarterYearMap[item.ids] = item.year
-              this.quarterQuarterMap[item.ids] = item.quarter
-              this.sizeForm.inTableData.ldDemandEndId = item.ids
+              this.quarterYearMap[item.ids] = item.year;
+              this.quarterQuarterMap[item.ids] = item.quarter;
+              this.sizeForm.inTableData.ldDemandEndId = item.ids;
             }
-          })
+          });
         }
       } catch (error) {
-        this.$message.error('获取需求单列表失败')
+        this.$message.error("获取需求单列表失败");
       }
     },
     // 批量需求单选择变化，获取部门列表
     async onQuarterSelectChange(ids) {
-      if (!ids) return
-      const year = this.quarterYearMap[ids]
-      const quarter = this.quarterQuarterMap[ids]
+      if (!ids) return;
+      const year = this.quarterYearMap[ids];
+      const quarter = this.quarterQuarterMap[ids];
       if (year && quarter) {
         try {
           const res = await getDepartmentList({
             year: year,
-            quarter: quarter
-          })
+            quarter: quarter,
+          });
           if (res.data && res.data.result) {
-            this.departmentList = res.data.result
-            console.log(this.departmentList, 'departmentList')
+            this.departmentList = res.data.result;
+            console.log(this.departmentList, "departmentList");
           } else {
-            this.departmentList = []
+            this.departmentList = [];
           }
         } catch (error) {
-          this.$message.error('获取部门列表失败')
-          this.departmentList = []
+          this.$message.error("获取部门列表失败");
+          this.departmentList = [];
         }
       } else {
-        this.departmentList = []
+        this.departmentList = [];
       }
     },
 
     async batchSubmit() {
       if (!this.inBatchForm.batchType) {
-        this.$message.error('请选择需求单');
+        this.$message.error("请选择需求单");
         return;
       }
       if (!this.inBatchForm.department) {
-        this.$message.error('请选择部门');
+        this.$message.error("请选择部门");
         return;
       }
       if (!this.inBatchForm.optionType) {
-        this.$message.error('请选择类别');
+        this.$message.error("请选择类别");
         return;
       }
 
@@ -486,23 +762,24 @@ export default {
 
       try {
         let res;
-        if (this.inBatchForm.optionType === 'YH') {
+        if (this.inBatchForm.optionType === "YH") {
           res = await getDetailedList(requestParams);
-        } else if (this.inBatchForm.optionType === 'NY') {
+
+        } else if (this.inBatchForm.optionType === "NY") {
           res = await batchList(requestParams);
         }
 
         if (res.data && res.data.result) {
           this.sizeForm.inTableData = res.data.result;
           const selectedDept = this.departmentList.find(
-            dept => dept.departmentId === this.inBatchForm.department
+            (dept) => dept.departmentId === this.inBatchForm.department
           );
-          const deptName = selectedDept ? selectedDept.department : '';
+          const deptName = selectedDept ? selectedDept.department : "";
 
-          this.sizeForm.inTableData = res.data.result.map(item => ({
+          this.sizeForm.inTableData = res.data.result.map((item) => ({
             ...item,
             IdDemandEndld: this.inBatchForm.batchType,
-            department: deptName
+            department: deptName,
           }));
 
           // 关闭批量选择弹窗
@@ -510,19 +787,20 @@ export default {
 
           // 设置需求单名称
           const selectedQuarter = this.quarterList.find(
-            item => item.ids === this.inBatchForm.batchType
+            (item) => item.ids === this.inBatchForm.batchType
           );
           if (selectedQuarter) {
             this.sizeForm.demandEndInfo = selectedQuarter.quarterName;
           }
 
           // 耐用品特殊处理（打开批量选择弹窗）
-          if (this.inBatchForm.optionType === 'NY') {
-            console.log(this.inBatchForm.optionType, 'this.inBatchForm.optionType')
+          if (this.inBatchForm.optionType === "NY") {
             this.batchSelectionVisible = true;
             this.dialogVisible = true;
-            console.log(1)
+            console.log(1);
             this.batchTableData = res.data.result;
+          }else {
+            this.getStatistics()
           }
 
           // 强制更新视图
@@ -530,19 +808,23 @@ export default {
             this.$forceUpdate();
           });
         } else {
-          this.$message.warning('未获取到详细数据');
+          this.$message.warning("未获取到详细数据");
         }
       } catch (error) {
-        this.$message.error(`获取${this.inBatchForm.optionType === 'YH' ? '易耗品' : '耐用品'}数据失败：${error.message}`);
-        console.error('批量提交接口调用失败：', error);
+        this.$message.error(
+          `获取${
+            this.inBatchForm.optionType === "YH" ? "易耗品" : "耐用品"
+          }数据失败：${error.message}`
+        );
+        console.error("批量提交接口调用失败：", error);
       }
     },
     //获取单条选择的部门名称列表
     async getDetailedItems() {
-      this.loading = true
+      this.loading = true;
       try {
         const res = await getDetailedItems();
-        this.list = res.data.result
+        this.list = res.data.result;
       } catch (error) {
         this.$message.error("获取数据来源失败，请重试");
       } finally {
@@ -550,38 +832,42 @@ export default {
       }
     },
     getDepartmentName(departmentId) {
-      const department = this.list.find(item => item.departmentId === departmentId);
-      return department ? department.department : '';
+      const department = this.list.find(
+        (item) => item.departmentId === departmentId
+      );
+      return department ? department.department : "";
     },
     //获取单条选择的物资名称列表
-  async getMaterialList() {
-  this.loading = true
-  this.consumableVisible = false; // 默认先隐藏
-  try {
-    // 只在单项选择且是耐用品时才显示弹窗
-    if (this.sizeForm.optionType === "NY" && 
-        this.outDialogType !== 'details' && 
-        this.sizeForm.options === 2) {
-      this.consumableVisible = true
-    } else if (this.sizeForm.optionType === "YH" && this.outDialogType !== 'details') {
-      // 易耗品时获取物资列表
-      const res = await getMaterialList({ optionType: this.sizeForm.optionType })
-      this.materials = res.data.result
-    }
-  } catch (error) {
-    this.$message.error("获取数据来源失败，请重试");
-  } finally {
-    this.loading = false;
-  }
-},
+    async getMaterialList() {
+      this.loading = true;
+      this.consumableVisible = false;
+      try {
+        if (
+          this.sizeForm.optionType === "NY" &&
+          this.outDialogType !== "details"
+        ) {
+          this.consumableVisible = true;
+        } else {
+          const res = await getMaterialList({
+            optionType: this.sizeForm.optionType,
+          });
+          this.materials = res.data.result;
+        }
+      } catch (error) {
+        this.$message.error("获取数据来源失败，请重试");
+      } finally {
+        this.loading = false;
+      }
+    },
     // 处理物资选择变化
     handleMaterialChange(row, index) {
-      this.sizeForm.inTableData[index].materialId = row.materialId
-      this.sizeForm.inTableData[index].model = row.model
-      this.sizeForm.inTableData[index].materialCode = row.materialCode
-      this.sizeForm.inTableData[index].materialName = row.materialName
-      this.sizeForm.inTableData[index].type = row.type
-      this.sizeForm.inTableData[index].unit = row.unit
+      this.sizeForm.inTableData[index].materialId = row.materialId;
+      this.sizeForm.inTableData[index].model = row.model;
+      this.sizeForm.inTableData[index].materialCode = row.materialCode;
+      this.sizeForm.inTableData[index].materialName = row.materialName;
+      this.sizeForm.inTableData[index].type = row.type;
+      this.sizeForm.inTableData[index].unit = row.unit;
+      this.getStatistics()
     },
     // 提交
     async submit(index) {
@@ -598,7 +884,10 @@ export default {
           this.$message.error("请选择需求单名称");
           return;
         }
-        if (!this.sizeForm.inTableData || this.sizeForm.inTableData.length === 0) {
+        if (
+          !this.sizeForm.inTableData ||
+          this.sizeForm.inTableData.length === 0
+        ) {
           this.$message.error("请添加批量选择数据");
           return;
         }
@@ -612,32 +901,38 @@ export default {
         }
       }
       // status == 1 暂存 ，2提交
-      this.sizeForm.status = index
-      this.sizeForm.ldOneOutStorageDetailVOList = this.sizeForm.inTableData
-      let arr = this.departmentList.find(item => item.departmentId === this.inBatchForm.department || {})
-      this.sizeForm.ldOneOutStorageDetailVOList = this.sizeForm.inTableData.map(row => {
-        console.log(row, 'row')
-        const deptId = row.department
-        const dept = this.list.find(item => item.departmentId === deptId);
-        const oneFormId = row.id
-        return {
-          ...row,
-          department: this.sizeForm.options == '1' ? arr.departmentId : deptId,
-          departmentName: this.sizeForm.options == '1' ? arr.department : dept.department,
-          oneFormId: oneFormId
+      this.sizeForm.status = index;
+      this.sizeForm.ldOneOutStorageDetailVOList = this.sizeForm.inTableData;
+      let arr = this.departmentList.find(
+        (item) => item.departmentId === this.inBatchForm.department || {}
+      );
+      this.sizeForm.ldOneOutStorageDetailVOList = this.sizeForm.inTableData.map(
+        (row) => {
+          console.log(row, "row");
+          const deptId = row.department;
+          const dept = this.list.find((item) => item.departmentId === deptId);
+          const oneFormId = row.id;
+          return {
+            ...row,
+            department:
+              this.sizeForm.options == "1" ? arr.departmentId : deptId,
+            departmentName:
+              this.sizeForm.options == "1" ? arr.department : dept.department,
+            oneFormId: oneFormId,
+          };
         }
-      })
-      console.log(this.sizeForm, '111')
-      this.sizeForm.inTableData = []
+      );
+      console.log(this.sizeForm, "111");
+      this.sizeForm.inTableData = [];
       try {
-        const res = await submitData(this.sizeForm)
-        console.log(this.sizeForm, '222')
+        const res = await submitData(this.sizeForm);
+        console.log(this.sizeForm, "222");
         if (res.data.success) {
           this.$message({
             type: "success",
-            message: "提交成功"
+            message: "提交成功",
           });
-          this.$emit('submitSuccess');
+          this.$emit("submitSuccess");
           this.handleCloseDetail();
         } else {
           this.$message.error(res.data.message || "提交失败");
@@ -645,27 +940,30 @@ export default {
       } catch (error) {
         this.$message.error(error.message || "服务器错误");
       }
-
-
     },
 
     //编辑和详情
     async inInit() {
-      if (this.outDialogType == 'details' || this.outDialogType == 'edit') {
-        editList(this.id).then(res => {
-          console.log(res.data.result, '详情数据')
-          const { ldOneOutStorage, ldOneOutStorageDetails } = res.data.result || {};
+      if (this.outDialogType == "details" || this.outDialogType == "edit") {
+        editList(this.id).then((res) => {
+          console.log(res.data.result, "详情数据");
+          const { ldOneOutStorage, ldOneOutStorageDetails } =
+            res.data.result || {};
           // this.sizeForm = res.data.result.ldOneOutStorage
-          this.sizeForm.inTableData = res.data.result.ldOneOutStorageDetails
-          this.sizeForm.orderNo = ldOneOutStorage.orderNo
-          this.sizeForm.reason = ldOneOutStorage.reason
-          this.sizeForm.demandEndInfo = ldOneOutStorage.demandEndInfo
-          this.sizeForm.outDate = ldOneOutStorage.outDate
-          this.sizeForm.options = Number(ldOneOutStorage.options)
-          this.sizeForm.optionType = ldOneOutStorage.optionType
-          this.$set(this.sizeForm, 'inTableData', res.data.result.ldOneOutStorageDetails)
-          console.log(this.sizeForm, '111')
-        })
+          this.sizeForm.inTableData = res.data.result.ldOneOutStorageDetails;
+          this.sizeForm.orderNo = ldOneOutStorage.orderNo;
+          this.sizeForm.reason = ldOneOutStorage.reason;
+          this.sizeForm.demandEndInfo = ldOneOutStorage.demandEndInfo;
+          this.sizeForm.outDate = ldOneOutStorage.outDate;
+          this.sizeForm.options = Number(ldOneOutStorage.options);
+          this.sizeForm.optionType = ldOneOutStorage.optionType;
+          this.$set(
+            this.sizeForm,
+            "inTableData",
+            res.data.result.ldOneOutStorageDetails
+          );
+          console.log(this.sizeForm, "111");
+        });
       }
     },
     //  async inInit() {
@@ -696,18 +994,20 @@ export default {
     //   },
     // 选项选择
     radioChange() {
-      this.sizeForm.inTableData = []
+      this.sizeForm.inTableData = [];
+      this.statisticsList = []
+      this.sizeForm.optionType = "";
+      this.inBatchDialogVisible = false;
       this.consumableVisible = false;
       this.inBatchDialogVisible = false;
       this.batchSelectionVisible = false;
       this.sizeForm.optionType = '';
       this.batchTableData = [];
       if (this.sizeForm.options === 1) {
-        this.getQuarterList()
-        this.inBatchDialogVisible = true
-        this.inBatchForm.batchType = '',
-        this.inBatchForm.department = ''
-        this.inBatchForm.optionType = ''
+        this.getQuarterList();
+        this.inBatchDialogVisible = true;
+        (this.inBatchForm.batchType = ""), (this.inBatchForm.department = "");
+        this.inBatchForm.optionType = "";
       }
     },
     // closeHandle() {
@@ -718,33 +1018,32 @@ export default {
     //   this.getQuarterList()
     //   this.inBatchDialogVisible = true
 
-    //   // this.sizeForm.inTableData = []   
+    //   // this.sizeForm.inTableData = []
     // },
     // 删除表格行数据
     handleDelete(index, row) {
-      this.sizeForm.inTableData.splice(index, 1)
-      this.$message.success('已成功删除该条记录')
+      this.sizeForm.inTableData.splice(index, 1);
+      this.$message.success("已成功删除该条记录");
     },
   },
   watch: {
     // 监听需求单选择变化
-    'inBatchForm.batchType': function (newVal) {
-      this.inBatchForm.department = '',
-        this.inBatchForm.optionType = 1
+    "inBatchForm.batchType": function (newVal) {
+      (this.inBatchForm.department = ""), (this.inBatchForm.optionType = 1);
       if (newVal) {
-        this.onQuarterSelectChange(newVal)
+        this.onQuarterSelectChange(newVal);
       }
     },
-    'sizeForm.optionType': function (newVal) {
-      if (newVal && this.outDialogType === 'add') {
-        this.sizeForm.inTableData = []
-        this.getMaterialList()
-      } else if (newVal && this.outDialogType !== 'add') {
-        this.getMaterialList()
+    "sizeForm.optionType": function (newVal) {
+      if (newVal && this.outDialogType === "add") {
+        this.sizeForm.inTableData = [];
+        this.getMaterialList();
+      } else if (newVal && this.outDialogType !== "add") {
+        this.getMaterialList();
       }
     },
-  }
-}
+  },
+};
 </script>
 <style lang="scss" scoped>
 .form-title {
diff --git a/src/views/materials/index.vue b/src/views/materials/index.vue
index d5b4351..ee8c6a8 100644
--- a/src/views/materials/index.vue
+++ b/src/views/materials/index.vue
@@ -1,9 +1,28 @@
 <template>
   <div>
     <basic-container>
-      <avue-crud :option="option" v-model="form" :data="data" @row-del="rowDel" @on-load="onLoad"
-        :table-loading="loading" @row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange"
-        @search-reset="searchReset" :page.sync="page">
+      <avue-crud
+        :option="option"
+        v-model="form"
+        :data="data"
+        @row-del="rowDel"
+        @on-load="onLoad"
+        :table-loading="loading"
+        @row-update="rowUpdate"
+        @row-save="rowSave"
+        @search-change="searchChange"
+        @search-reset="searchReset"
+        :page.sync="page"
+        :upload-after="uploadAfter"
+      >
+        <template slot="pictureImg" slot-scope="scope">
+          <!-- {{scope.row.picture}} -->
+          <el-image
+            style="width: 60px; height: 60px"
+            :src="scope.row.picture"
+            fit="fill"
+          ></el-image>
+        </template>
       </avue-crud>
     </basic-container>
   </div>
@@ -69,8 +88,7 @@ export default {
             type: "select",
             headerAlign: "center",
             align: "center",
-            dicData: [
-            ],
+            dicData: [],
             props: {
               label: "label",
               value: "value",
@@ -94,33 +112,25 @@ export default {
                 return "无";
               }
               return value;
-            }
+            },
           },
           {
-            label: '图片',
-            prop: 'picture',
-            type: 'upload',
+            label: "图片",
+            prop: "picture",
+            type: "upload",
             headerAlign: "center",
             align: "center",
             loadText: "图片上传中，请稍等",
             span: 12,
             tip: "只能上传jpg/png文件",
-            // rules: [{
-            //   required: true,
-            //   message: "请上传图片",
-            //   trigger: "change",
-            // }],
-            formatter: (row, column) => {
-              const value = row.picture;
-              if (value === null || value === undefined || value === "") {
-                return "无"
-              }
-              return value;
-            },
-            onSuccess: (res, file, fileList) => {
-              this.form.picture = res.data
-            },
-            httpRequest: this.handleUpload
+            hide: true,
+            httpRequest: this.handleUpload,
+          },
+          {
+            label: "图片",
+            prop: "pictureImg",
+            span: 12,
+            display: false,
           },
         ],
       },
@@ -135,16 +145,20 @@ export default {
     this.fetchMaterialCode();
   },
   methods: {
+    uploadAfter(res, done, loading, column) {
+      console.log("上传成功", res, done, loading, column);
+    },
     handleUpload(params) {
-      const formData = new FormData()
-      formData.append('file', params.file)
+      const formData = new FormData();
+      formData.append("file", params.file);
       upload(formData)
-        .then(res => {
-          params.onSuccess(res)
-        })
-        .catch(err => {
-          params.onError(err)
+        .then((res) => {
+          this.form.picture = res.data.message;
+          params.onSuccess(res);
         })
+        .catch((err) => {
+          params.onError(err);
+        });
     },
     fetchMaterialCode() {
       getCode()
@@ -152,17 +166,17 @@ export default {
           const dicData = res.data.result.map((item) => ({
             label: item.name,
             value: item.code,
-          }))
+          }));
           const targetColumn = this.option.column.find(
             (col) => col.prop === "materialCode"
-          )
+          );
           if (targetColumn) {
-            targetColumn.dicData = dicData
+            targetColumn.dicData = dicData;
           }
         })
         .catch((error) => {
           this.$message.error("加载类别数据失败，请刷新重试");
-        })
+        });
     },
     handleLog() {
       this.dialogLogVisible = true;
@@ -219,7 +233,7 @@ export default {
           window.console.log(error);
           loading();
         }
-      )
+      );
     },
     //修改
     rowUpdate(row, index, done, loading) {