From 6eb3ff526a354e8b5d1ec5f1870cef1b4a325fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 29 Jul 2021 22:21:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E6=8B=A8=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/report/AllocationDetail.vue     | 218 ++++++++++++++++++
 jshERP-web/src/views/report/InDetail.vue      |  18 +-
 jshERP-web/src/views/report/OutDetail.vue     |  18 +-
 3 files changed, 238 insertions(+), 16 deletions(-)
 create mode 100644 jshERP-web/src/views/report/AllocationDetail.vue

diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue
new file mode 100644
index 00000000..fa494f14
--- /dev/null
+++ b/jshERP-web/src/views/report/AllocationDetail.vue
@@ -0,0 +1,218 @@
+<!-- 用的InDetail修改 -->
+<template>
+  <a-row :gutter="24">
+    <a-col :md="24">
+      <a-card :bordered="false">
+        <!-- 查询区域
+        projectId 调出仓库
+        projectIdto 调入仓库
+        -->
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+              <a-col :md="4" :sm="24">
+                <a-form-item label="调出仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-select
+                    showSearch optionFilterProp="children"
+                    style="width: 100%"
+                    placeholder="请选择仓库"
+                    v-model="queryParam.depotIdF">
+                    <a-select-option v-for="(depot,index) in depotList" :value="depot.id">
+                      {{ depot.depotName }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="调入仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-select
+                    showSearch optionFilterProp="children"
+                    style="width: 100%"
+                    placeholder="请选择仓库"
+                    v-model="queryParam.depotId">
+                    <a-select-option v-for="(depot,index) in depotList" :value="depot.id">
+                      {{ depot.depotName }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="5" :sm="24">
+                <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-range-picker
+                    style="width: 210px"
+                    v-model="queryParam.createTimeRange"
+                    :default-value="defaultTimeStr"
+                    format="YYYY-MM-DD"
+                    :placeholder="['开始时间', '结束时间']"
+                    @change="onDateChange"
+                  />
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24" >
+                <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                  <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
+                </span>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+        <!-- table区域-begin -->
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+            <span slot="numberCustomRender" slot-scope="text, record">
+              <a @click="myHandleDetail(record)">{{record.number}}</a>
+            </span>
+          </a-table>
+        </section>
+        <!-- table区域-end -->
+        <!-- 表单区域 -->
+        <bill-detail ref="modalDetail"></bill-detail>
+      </a-card>
+    </a-col>
+  </a-row>
+</template>
+<script>
+  import BillDetail from '../bill/dialog/BillDetail'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getNowFormatMonth } from '@/utils/util';
+  import {getAction} from '@/api/manage'
+  import {findBySelectSup, findBillDetailByNumber} from '@/api/api'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+  import moment from 'moment'
+  export default {
+    name: "BuyInReport",
+    mixins:[JeecgListMixin],
+    components: {
+      BillDetail,
+      JEllipsis
+    },
+    data () {
+      return {
+        labelCol: {
+          span: 5
+        },
+        wrapperCol: {
+          span: 18,
+          offset: 1
+        },
+        // 查询条件
+        queryParam: {
+          organId: '',
+          materialParam:'',
+          depotId: '',
+          depotIdF: '',
+          beginTime: getNowFormatMonth() + '-01',
+          endTime: moment().format('YYYY-MM-DD'),
+          subType: "调拨"
+        },
+        dateFormat: 'YYYY-MM-DD',
+        currentDay: moment().format('YYYY-MM-DD'),
+        defaultTimeStr: '',
+        supList: [],
+        depotList: [],
+        tabKey: "1",
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:40,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title: '单据编号', dataIndex: 'number', width: 100,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
+          {title: '条码', dataIndex: 'barCode', width: 100},
+          {title: '名称', dataIndex: 'mname', width: 120},
+          {title: '规格', dataIndex: 'standard', width: 50},
+          {title: '型号', dataIndex: 'model', width: 50},
+          {title: '单位', dataIndex: 'mUnit', width: 50},
+          {title: '数量', dataIndex: 'operNumber', width: 60},
+          {title: '单价', dataIndex: 'unitPrice', width: 60},
+          {title: '金额', dataIndex: 'allPrice', width: 60},
+          {title: '调出仓库', dataIndex: 'dname', width: 80},
+          {title: '调入仓库', dataIndex: 'sname', width: 80},
+          {title: '调拨日期', dataIndex: 'operTime', width: 80},
+          {title: '备注', dataIndex: 'newRemark', width: 100}
+        ],
+        url: {
+          list: "/depotHead/findAllocationDetail",
+        }
+      }
+    },
+    created () {
+      this.getDepotData()
+      this.initSupplier()
+      this.defaultTimeStr = [moment(getNowFormatMonth() + '-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
+    },
+    methods: {
+      moment,
+      getQueryParams() {
+        let param = Object.assign({}, this.queryParam, this.isorter);
+        param.field = this.getQueryField();
+        param.currentPage = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        return param;
+      },
+      onDateChange: function (value, dateString) {
+        console.log(dateString[0],dateString[1]);
+        this.queryParam.beginTime=dateString[0];
+        this.queryParam.endTime=dateString[1];
+      },
+      initSupplier() {
+        let that = this;
+        findBySelectSup({}).then((res)=>{
+          if(res) {
+            that.supList = res;
+          }
+        });
+      },
+      getDepotData() {
+        getAction('/depot/findDepotByCurrentUser').then((res)=>{
+          if(res.code === 200){
+            this.depotList = res.data;
+          }else{
+            this.$message.info(res.data);
+          }
+        })
+      },
+      myHandleDetail(record) {
+        findBillDetailByNumber({ number: record.number }).then((res) => {
+          if (res && res.code === 200) {
+            this.handleDetail(res.data, record.newType);
+          }
+        })
+      },
+      searchQuery() {
+        if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){
+          this.$message.warning('请选择单据日期！')
+        } else {
+          this.loadData(1);
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue
index 637043d2..f9318359 100644
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@@ -131,19 +131,21 @@
             }
           },
           {
-            title: '单据编号', dataIndex: 'number', width: 140,
+            title: '单据编号', dataIndex: 'number', width: 100,
             scopedSlots: { customRender: 'numberCustomRender' },
           },
-          {title: '条码', dataIndex: 'barCode', width: 120},
+          {title: '条码', dataIndex: 'barCode', width: 100},
           {title: '名称', dataIndex: 'mname', width: 120},
-          {title: '规格', dataIndex: 'standard', width: 100},
-          {title: '型号', dataIndex: 'model', width: 100},
+          {title: '规格', dataIndex: 'standard', width: 50},
+          {title: '型号', dataIndex: 'model', width: 50},
+          {title: '单位', dataIndex: 'mUnit', width: 50},
+          {title: '数量', dataIndex: 'operNumber', width: 60},
           {title: '单价', dataIndex: 'unitPrice', width: 60},
-          {title: '入库数量', dataIndex: 'operNumber', width: 80},
           {title: '金额', dataIndex: 'allPrice', width: 60},
-          {title: '供应商', dataIndex: 'sname', width: 120},
-          {title: '仓库', dataIndex: 'dname', width: 120},
-          {title: '入库日期', dataIndex: 'operTime', width: 100}
+          {title: '供应商', dataIndex: 'sname', width: 80},
+          {title: '仓库', dataIndex: 'dname', width: 80},
+          {title: '入库日期', dataIndex: 'operTime', width: 80},
+          {title: '备注', dataIndex: 'newRemark', width: 100}
         ],
         url: {
           list: "/depotHead/findInDetail",
diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue
index 84f3e807..251e4d1a 100644
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@@ -131,19 +131,21 @@
             }
           },
           {
-            title: '单据编号', dataIndex: 'number', width: 140,
+            title: '单据编号', dataIndex: 'number', width: 100,
             scopedSlots: { customRender: 'numberCustomRender' },
           },
-          {title: '条码', dataIndex: 'barCode', width: 120},
+          {title: '条码', dataIndex: 'barCode', width: 100},
           {title: '名称', dataIndex: 'mname', width: 120},
-          {title: '规格', dataIndex: 'standard', width: 100},
-          {title: '型号', dataIndex: 'model', width: 100},
+          {title: '规格', dataIndex: 'standard', width: 50},
+          {title: '型号', dataIndex: 'model', width: 50},
+          {title: '单位', dataIndex: 'mUnit', width: 50},
+          {title: '数量', dataIndex: 'operNumber', width: 60},
           {title: '单价', dataIndex: 'unitPrice', width: 60},
-          {title: '出库数量', dataIndex: 'operNumber', width: 80},
           {title: '金额', dataIndex: 'allPrice', width: 60},
-          {title: '客户', dataIndex: 'sname', width: 120},
-          {title: '仓库', dataIndex: 'dname', width: 120},
-          {title: '出库日期', dataIndex: 'operTime', width: 100}
+          {title: '客户', dataIndex: 'sname', width: 80},
+          {title: '仓库', dataIndex: 'dname', width: 80},
+          {title: '出库日期', dataIndex: 'operTime', width: 80},
+          {title: '备注', dataIndex: 'newRemark', width: 100}
         ],
         url: {
           list: "/depotHead/findInDetail",