From 4fa27a6fb37b7d5685cbeb1ae4ec9c1b85936fbf Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 31 May 2024 18:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/material/poReceive.js                |  11 +
 src/views/modules/material/poReceiving.vue   | 725 +++++++++++++++----
 src/views/modules/sys/user-add-or-update.vue |  20 +-
 3 files changed, 585 insertions(+), 171 deletions(-)
 create mode 100644 src/api/material/poReceive.js

diff --git a/src/api/material/poReceive.js b/src/api/material/poReceive.js
new file mode 100644
index 0000000..08e416e
--- /dev/null
+++ b/src/api/material/poReceive.js
@@ -0,0 +1,11 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+export const searchTransHeader = data => createAPI(`/poReceive/searchTransHeader`,'post',data)
+
+export const searchTransDetail = data => createAPI(`/poReceive/searchTransDetail`,'post',data)
+
+export const searchTransDetailSub = data => createAPI(`/poReceive/searchTransDetailSub`,'post',data)
+
+
+export const getWareHouseList = data => createAPI(`/poReceive/getWareHouseList`,'post',data)
+export const saveTransHeaderData= data => createAPI(`/poReceive/saveTransHeaderData`,'post',data)
diff --git a/src/views/modules/material/poReceiving.vue b/src/views/modules/material/poReceiving.vue
index f1bebdc..fe692e9 100644
--- a/src/views/modules/material/poReceiving.vue
+++ b/src/views/modules/material/poReceiving.vue
@@ -2,6 +2,32 @@
   <div class="mod-config">
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
       <el-form :inline="true" label-position="top" style="margin-top: 0px">
+        <el-form-item :label="'采购单号'">
+          <el-input v-model="searchData.orderRef1" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'入库单日期'">
+          <el-date-picker
+            style="width: 120px"
+            v-model="searchData.startDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item style="margin-top: 23px;">
+          <label style="margin-left: 0px;font-size: 19px">&#10142</label>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-date-picker
+            style="width: 120px"
+            v-model="searchData.endDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item :label="' '">
+        <el-button type="primary" @click="searchTable()">查询</el-button>
         <el-button type="primary" @click="addModal()">新增</el-button>
         <download-excel
           :fields="fields()"
@@ -17,11 +43,13 @@
           class="el-button el-button--primary el-button--medium">
           {{ '导出' }}
         </download-excel>
+        </el-form-item>
       </el-form>
     </el-form>
     <el-table
       :data="dataList"
-      height="240"
+      @row-click="changeData"
+      :height="height"
       border
       v-loading="dataListLoading"
       style="width: 100%; ">
@@ -45,11 +73,12 @@
         header-align="center"
         align="center"
         width="150"
-        fixed="right"
+        fixed="left"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" @click="updateModel(scope.row)">修改</a>
+          <a type="text" size="small" @click="updateModel(scope.row)">编辑</a>
           <a type="text" size="small" @click="deleteData(scope.row)">删除</a>
+          <a type="text" size="small" @click="deleteData(scope.row)">扫描</a>
         </template>
       </el-table-column>
     </el-table>
@@ -62,16 +91,116 @@
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
+    <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
+      <el-tab-pane label="明细" name="detail">
+        <el-table
+          :data="dataList2"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+          <el-table-column
+            v-for="(item,index) in columnList2" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-tab-pane>
+      <el-tab-pane label="卷明细" name="sub">
+        <el-table
+          :data="dataList3"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+          <el-table-column
+            v-for="(item,index) in columnList3" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+
+
+    <el-dialog title="采购入库-新增" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="480px" >
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="仓库">
+          <el-select v-model="modelData.wareHouseId"  clearable style="width: 100%;">
+            <el-option :value="i.wareHouseId" :label="i.wareHouseName" v-for="i in wareHouseList" :key="i.menuId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="入库日期">
+          <el-date-picker
+            style="width: 100%"
+            readonly
+            v-model="modelData.transDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label=" " >
+          <el-checkbox v-model="jumpFlag">保存后直接扫描</el-checkbox>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="经手人">
+          <el-input v-model="modelData.receiver"   style="width: 204px"></el-input>
+        </el-form-item>
+        <el-form-item label="采购单号">
+          <el-input v-model="modelData.orderRef1" style="width: 200px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item >
+          <span slot="label" style="" @click="getBaseList(23,1)" ><a herf="#">供应商编码</a></span>
+          <el-input v-model="modelData.supplierId"   style="width: 204px"></el-input>
+        </el-form-item>
+        <el-form-item label="供应商名称">
+          <el-input v-model="modelData.supplierName" disabled style="width: 200px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer  style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveHeaderData()">保存</el-button>
+        <el-button type="primary" @click="modelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
 
 <script>
   import {
-    getProjectInfoPartList,
-    saveProjectPart,
-    deleteProjectPartWithId,
-  } from "@/api/project/project.js"
+    searchTransHeader
+    ,searchTransDetail
+    ,searchTransDetailSub
+    ,getWareHouseList
+    ,saveTransHeaderData
+  } from "@/api/material/poReceive.js"
   import Chooselist from '@/views/modules/common/Chooselist'
   export default {
     components: {
@@ -79,83 +208,121 @@
     },
     data() {
       return {
+        height:200,
+        modelFlag:false,
+        activeName: 'detail',
         dataList: [],
+        dataList2: [],
+        dataList3: [],
         searchData: {
           page: 1,
           limit: 100,
           site:this.$store.state.user.site,
           username: this.$store.state.user.name,
-          projectId: '',
+          orderRef1: '',
+          startDate: '',
+          endDate: '',
+          transTypeDb:'CRT',
+        },
+        wareHouseList:[],
+        jumpFlag:true,
+        modelData:{
+          addFlag:0,
+          site:this.$store.state.user.site,
+          transDate:new Date(),
+          wareHouseId:'',
+          receiver:'',
+          orderRef1:'',
+          supplierId:'',
+          supplierName:'',
+          enterBy:'',
         },
         exportList:[],
         pageIndex: 1,
         pageSize: 100,
         totalPage: 0,
-        visible:false,
         dataListLoading: false,
         currentRow:'',
+        headerData:'',
         columnList1:[
           {
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4TestPartNo',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "testPartNo",
+            functionId: 200001,
+            serialNumber: '200001Table1TransNo',
+            tableId: "200001Table1",
+            tableName: "采购入库主表",
+            columnProp: "transNo",
             headerAlign: "center",
             align: "left",
-            columnLabel: "物料编码",
+            columnLabel: "入库单号",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 100
           },{
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4PartType',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "partType",
+            functionId: 200001,
+            serialNumber: '200001Table1TransType',
+            tableId: "200001Table1",
+            tableName: "采购入库主表",
+            columnProp: "transType",
             headerAlign: "center",
             align: "left",
-            columnLabel: "物料分类",
+            columnLabel: "入库类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table1TransDate',
+            tableId: "200001Table1",
+            tableName: "采购入库主表",
+            columnProp: "transDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "入库日期",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 60
+            columnWidth: 120
           },{
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4PartTypeDesc',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "partTypeDesc",
+            functionId: 200001,
+            serialNumber: '200001Table1WareHouseId',
+            tableId: "200001Table1",
+            tableName: "采购入库主表",
+            columnProp: "wareHouseId",
             headerAlign: "center",
             align: "left",
-            columnLabel: "物料分类名称",
+            columnLabel: "仓库编码",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 100
           },{
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4PartName',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "partName",
+            functionId: 200001,
+            serialNumber: '200001Table1OrderRef1',
+            tableId: "200001Table1",
+            tableName: "采购入库主表",
+            columnProp: "orderRef1",
             headerAlign: "center",
             align: "left",
-            columnLabel: "物料名称",
+            columnLabel: "采购单号",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -165,31 +332,31 @@
             columnWidth: 120
           },{
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4PartDesc',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "partDesc",
+            functionId: 200001,
+            serialNumber: '200001Table1Receiver',
+            tableId: "200001Table1",
+            tableName: "采购入库主表",
+            columnProp: "receiver",
             headerAlign: "center",
             align: "left",
-            columnLabel: "物料描述",
+            columnLabel: "经手人",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120
+            columnWidth: 100
           },{
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4PartSpec',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "partSpec",
+            functionId: 200001,
+            serialNumber: '200001Table1EnterDate',
+            tableId: "200001Table1",
+            tableName: "采购入库主表",
+            columnProp: "enterDate",
             headerAlign: "center",
             align: "left",
-            columnLabel: "规格型号",
+            columnLabel: "录入时间",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -199,65 +366,102 @@
             columnWidth: 120
           },{
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4MaterialNumber',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "materialNumber",
+            functionId: 200001,
+            serialNumber: '200001Table1EnterName',
+            tableId: "200001Table1",
+            tableName: "采购入库主表",
+            columnProp: "enterName",
             headerAlign: "center",
             align: "left",
-            columnLabel: "物料图号",
+            columnLabel: "录入人",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120
+            columnWidth: 100
+          },
+        ],
+        columnList2:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table2PartNo',
+            tableId: "200001Table2",
+            tableName: "采购入库明细",
+            columnProp: "partNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "料号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
           },{
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4Remark',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "remark",
+            functionId: 200001,
+            serialNumber: '200001Table2PartDesc',
+            tableId: "200001Table2",
+            tableName: "采购入库明细",
+            columnProp: "partDesc",
             headerAlign: "center",
             align: "left",
-            columnLabel: "备注",
+            columnLabel: "料号描述",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120
+            columnWidth: 150
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table2TransQty',
+            tableId: "200001Table2",
+            tableName: "采购入库明细",
+            columnProp: "transQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "入库数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
           },{
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4CreateDate',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "createDate",
+            functionId: 200001,
+            serialNumber: '200001Table2BatchNo',
+            tableId: "200001Table2",
+            tableName: "采购入库明细",
+            columnProp: "batchNo",
             headerAlign: "center",
             align: "left",
-            columnLabel: "创建时间",
+            columnLabel: "批号",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 160
+            columnWidth: 120
           },{
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4CreateBy',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "createBy",
+            functionId: 200001,
+            serialNumber: '200001Table2LocationId',
+            tableId: "200001Table2",
+            tableName: "采购入库明细",
+            columnProp: "locationId",
             headerAlign: "center",
             align: "left",
-            columnLabel: "创建人",
+            columnLabel: "库位",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -267,31 +471,119 @@
             columnWidth: 80
           },{
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4UpdateDate',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "updateDate",
+            functionId: 200001,
+            serialNumber: '200001Table2WdrNo',
+            tableId: "200001Table2",
+            tableName: "采购入库明细",
+            columnProp: "wdrNo",
             headerAlign: "center",
             align: "left",
-            columnLabel: "上次修改日期",
+            columnLabel: "W/D/R",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table2ManufactureDate',
+            tableId: "200001Table2",
+            tableName: "采购入库明细",
+            columnProp: "manufactureDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "生产日期",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 160
+            columnWidth: 100
           },{
             userId: this.$store.state.user.name,
-            functionId: 101002003,
-            serialNumber: '101002003Table4UpdateBy',
-            tableId: "101002003Table4",
-            tableName: "项目物料",
-            columnProp: "updateBy",
+            functionId: 200001,
+            serialNumber: '200001Table2ExpiredDate',
+            tableId: "200001Table2",
+            tableName: "采购入库明细",
+            columnProp: "expiredDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "失效日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table2EnterDate',
+            tableId: "200001Table2",
+            tableName: "采购入库明细",
+            columnProp: "enterDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "录入日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table2EnterName',
+            tableId: "200001Table2",
+            tableName: "采购入库明细",
+            columnProp: "enterName",
             headerAlign: "center",
             align: "left",
-            columnLabel: "修改人",
+            columnLabel: "录入人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70
+          },
+        ],
+        columnList3:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table3RollNo',
+            tableId: "200001Table3",
+            tableName: "采购入库卷明细",
+            columnProp: "rollNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "卷号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table3RollQty',
+            tableId: "200001Table3",
+            tableName: "采购入库卷明细",
+            columnProp: "rollQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "数量",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -299,22 +591,59 @@
             status: true,
             fixed: '',
             columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table3ManufactureDate',
+            tableId: "200001Table3",
+            tableName: "采购入库卷明细",
+            columnProp: "manufactureDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "生产日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table3EnterName',
+            tableId: "200001Table3",
+            tableName: "采购入库卷明细",
+            columnProp: "enterName",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "录入人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table3EnterDate',
+            tableId: "200001Table3",
+            tableName: "采购入库卷明细",
+            columnProp: "enterDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "录入时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
           },
         ],
-        dataForm:{
-          id:'',
-          site: '',
-          projectId: '',
-          testPartNo:'',
-          partType:'',
-          partTypeDesc:'',
-          partName:'',
-          partDesc:'',
-          partSpec:'',
-          remark:'',
-          materialNumber:'',
-          username:'',
-        },
         dataRole: {
           partTypeDesc: [
             {
@@ -333,12 +662,18 @@
         },
         // 导出 start
         exportData: [],
-        exportName: '项目物料'+this.dayjs().format('YYYYMMDDHHmmss'),
-        exportHeader: ["项目物料"],
+        exportName: '采购入库主表'+this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["采购入库主表"],
         exportFooter: [],
         // 导出 end
       }
     },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = (window.innerHeight- 260) / 2
+
+      })
+    },
     methods: {
       // 获取基础数据列表S
       getBaseList (val, type) {
@@ -347,8 +682,8 @@
         this.$nextTick(() => {
           let strVal = ''
           if (val === 1013) {
-            if(type==1) {
-              strVal = this.dataForm.partType
+            if(type==23) {
+              strVal = this.modelData.supplierId
             }
           }
           this.$refs.baseList.init(val, strVal)
@@ -356,84 +691,101 @@
       },
       /* 列表方法的回调 */
       getBaseData (val) {
-        if (this.tagNo === 1013) {
+        if (this.tagNo === 23) {
           if(this.tagNo1==1) {
-            this.dataForm.partType = val.Base_id
-            this.dataForm.partTypeDesc = val.Base_desc
+            this.modelData.supplierId = val.SupplierID
+            this.modelData.supplierName = val.SupplierName
           }
         }
       },
-      //初始化组件的参数
-      init(inData) {
-        //初始化参数
-        this.searchData = JSON.parse(JSON.stringify(inData));
-        //刷新表格
-        this.searchTable();
-
-      },
       // 每页数
       sizeChangeHandle (val) {
         this.pageSize = val
         this.pageIndex = 1
-        this.search()
+        this.searchTable()
       },
       // 当前页
       currentChangeHandle (val) {
         this.pageIndex = val
-        this.search()
+        this.searchTable()
       },
-      search(){
-        this.searchData.limit = this.pageSize
-        this.searchData.page = this.pageIndex
-        // projectInfoSearch(this.searchData).then(({data}) => {
-        //   if (data.code == 0) {
-        //     this.dataList1 = data.page.list
-        //     this.pageIndex = data.page.currPage
-        //     this.pageSize = data.page.pageSize
-        //     this.totalPage = data.page.totalCount
-        //     if(this.dataList1.length>0){
-        //       this.$refs.mainTable.setCurrentRow(this.dataList1[0]);
-        //       this.changeData(this.dataList1[0])
-        //     }
-        //   }
-        //   this.dataListLoading = false
-        // })
+      tabClick (tab, event) {
+        // 刷新列表数据
+        this.refreshCurrentTabTable()
+      },
+      changeData(row){
+        this.currentRow = JSON.parse(JSON.stringify(row));
+        this.headerData=row;
+        this.refreshCurrentTabTable ();
+      },
+      refreshCurrentTabTable(){
+        if(this.currentRow===''||this.currentRow===null){
+          this.currentRow={site:'',transNo:''}
+        }
+        if(this.activeName==='detail'){
+          searchTransDetail(this.currentRow).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList2 = data.rows
+
+            } else {
+              this.dataList = [];
+            }
+          });
+        }else {
+          searchTransDetailSub(this.currentRow).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList2 = data.rows
+
+            } else {
+              this.dataList = [];
+            }
+          });
+        }
       },
       searchTable(){
-        getProjectInfoPartList(this.searchData).then(({data}) => {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        searchTransHeader(this.searchData).then(({data}) => {
           //区分请求成功和失败的状况
           if (data && data.code == 0) {
-            this.dataList = data.rows;
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+            if(this.dataList.length>0){
+              this.$refs.mainTable.setCurrentRow(this.dataList[0]);
+              this.changeData(this.dataList[0])
+            }else {
+              this.changeData(null)
+            }
           } else {
             this.dataList = [];
           }
         });
       },
       addModal(){
-        if(this.searchData.projectId==""||this.searchData.projectId==null){
-          this.$alert('请选择项目！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false;
-        }
-        this.dataForm={
-          id:0,
-          site: this.searchData.site,
-          projectId: this.searchData.projectId,
-          testPartNo:'',
-          partType:'',
-          partTypeDesc:'',
-          partName:'',
-          partDesc:'',
-          partSpec:'',
-          remark:'',
-          materialNumber:'',
-          username:this.$store.state.user.name,
+        this.getWareHouseList();
+
+        this.modelData={
+          addFlag:0,
+            site:this.$store.state.user.site,
+            transDate:new Date(),
+            wareHouseId:this.wareHouseList.length>0?this.wareHouseList[0].wareHouseId:'',
+            receiver:this.$store.state.user.name,
+            orderRef1:'',
+            supplierId:'',
+            supplierName:'',
+            enterBy:this.$store.state.user.name,
+        };
+        if(this.wareHouseList.length>0){
+          this.modelData.wareHouseId=this.wareHouseList[0].wareHouseId
         }
-        this.visible=true;
+        this.modelFlag=true;
       },
       updateModel(row){
-        this.dataForm={
+        this.modelData={
           id:row.id,
           site: row.site,
           projectId: row.projectId,
@@ -447,7 +799,7 @@
           materialNumber:row.materialNumber,
           username:this.$store.state.user.name,
         }
-        this.visible=true;
+        this.modelFlag=true;
       },
       deleteData(){
         this.$confirm('确定要删除这条数据?', '提示', {
@@ -455,7 +807,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          deleteProjectPartWithId(this.dataForm).then(({data}) => {
+          deleteProjectPartWithId(this.modelData).then(({data}) => {
             if (data && data.code === 0) {
               this.$message.success( '操作成功')
               this.searchTable();
@@ -466,6 +818,57 @@
         }).catch(() => {
         })
       },
+      saveHeaderData(){
+        if(this.dataForm.wareHouseId===''){
+          this.$alert('请选择仓库！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if(this.dataForm.receiver===''){
+          this.$alert('请选择经手人！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if(this.dataForm.transDate===''){
+          this.$alert('请选择入库日期！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        saveTransHeaderData(this.dataForm).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message.success( '操作成功')
+            this.modelFlag = false
+            this.searchTable()
+            if(this.jumpFlag){
+              this.$nextTick(function () {
+                setTimeout(() => {
+                  // let inData = {
+                  //   site: this.$store.state.user.site,
+                  //   codeNo: data.row.codeNo,
+                  //   buNo: data.row.buNo,
+                  //   username: this.$store.state.user.name
+                  // };
+                  // localStorage.setItem('tsfData', JSON.stringify(inData))
+                  // window.open('#/BMPage');
+                },500)
+              })
+            }
+
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      },
+      getWareHouseList(){
+        getWareHouseList({site:this.$store.state.user.site}).then(({data}) => {
+          if (data && data.code === 0) {
+            this.wareHouseList=data.rows
+          }
+        })
+      },
       //导出excel
       //导出excel
       async createExportData() {
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index e8c7c31..5c6e931 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -71,6 +71,12 @@
 <!--              </el-option>-->
 <!--            </el-select>-->
 <!--          </el-form-item>-->
+          <el-form-item label="状态" size="mini" prop="status">
+            <el-radio-group v-model="dataForm.status">
+              <el-radio :label="0">{{buttons.disable||'禁用'}}</el-radio>
+              <el-radio :label="1">{{buttons.normal||'正常'}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
         </el-form>
 <!--        <el-form>-->
 <!--          <el-form-item :label="buttons.post||'岗位'" prop="post">-->
@@ -88,16 +94,10 @@
 <!--          </el-form-item>-->
 <!--        </el-form>-->
         <el-form>
-<!--          <el-form-item label="角色" size="mini" prop="roleIdList">-->
-<!--            <el-checkbox-group v-model="dataForm.roleIdList">-->
-<!--              <el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{role.roleName}}</el-checkbox>-->
-<!--            </el-checkbox-group>-->
-<!--          </el-form-item>-->
-          <el-form-item label="状态" size="mini" prop="status">
-            <el-radio-group v-model="dataForm.status">
-              <el-radio :label="0">{{buttons.disable||'禁用'}}</el-radio>
-              <el-radio :label="1">{{buttons.normal||'正常'}}</el-radio>
-            </el-radio-group>
+          <el-form-item label="角色" size="mini" prop="roleIdList">
+            <el-checkbox-group v-model="dataForm.roleIdList">
+              <el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{role.roleName}}</el-checkbox>
+            </el-checkbox-group>
           </el-form-item>
         </el-form>
       </el-form>