Merge remote-tracking branch 'origin/master'

src/api/cw/reportManagement/ProjectReportService.js

@@ -143,4 +143,13 @@ export default class ProjectReportService {
       params: {reportId: reportId}
     })
   }
+  /* 三级校审文档下载 */
+  downloadCwReportAuditTpl (id) {
+    return request({
+      url: '/cwProjectReport/downloadCwReportAuditTpl',
+      method: 'get',
+      params: {id: id},
+      responseType: 'blob'
+    })
+  }
 }

src/api/materialManagement/WareHouseService.js

@@ -0,0 +1,18 @@
+import request from '@/utils/httpRequest'
+
+export default class WareHouseService {
+  list (params) {
+    return request({
+      url: '/material/management/wareHouse/list',
+      method: 'get',
+      params: params
+    })
+  }
+  wareHouseList (param) {
+    return request({
+      url: '/material/management/wareHouse/wareHouseList',
+      method: 'get',
+      params: param
+    })
+  }
+}

src/views/modules/cw/reportManagement/ReportManagementForm.vue

@@ -12,6 +12,11 @@
       :visible.sync="visible">
       <el-row>
         <el-row>
+          <div v-if="tabName === '报告审核单下载'">
+            <el-row type="flex" justify="end">
+              <el-button @click="downloadCwReportAuditTpl">报告审核单下载</el-button>
+            </el-row>
+          </div>
           <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
                    label-width="135px" @submit.native.prevent>
             <el-divider content-position="left"><i class="el-icon-document"></i> 项目信息</el-divider>
@@ -730,6 +735,10 @@
               <!--        附件-->
               <UpLoadComponent2 ref="enclosure"></UpLoadComponent2>
             </el-tab-pane>
+            <el-tab-pane label="签章附件" name="archiveFile">
+              <!--        附件-->
+              <UpLoadComponent ref="archiveFile" @clickSign="clickSign"></UpLoadComponent>
+            </el-tab-pane>
             <el-tab-pane label="已签章附件" name="signatureFile">
               <!--        附件-->
               <UpLoadComponent2 ref="signatureFile"></UpLoadComponent2>
@@ -928,7 +937,8 @@
         tableKeyContact: '2',
         tableKeyClient2: '1',
         tableKeyClient3: '1',
-        visible: false
+        visible: false,
+        tabName: ''
       }
     },
     ReportReviewService: null,
@@ -996,7 +1006,8 @@
       getKeyWatch (keyWatch) {
         this.keyWatch = keyWatch
       },
-      init (method, id) {
+      init (method, id, tabName) {
+        this.tabName = tabName
         this.visible = true
         if (method === 'edit') {
           this.title = '报告信息修改'
@@ -1127,7 +1138,9 @@
               this.detailDivide(data.details)
             }
             this.$refs.enclosure.newUpload(method, data.cwFileInfoList2, 'cwWorkContract', null, null, null, null, false)
-            // this.$refs.archiveFile.newUpload(method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
+            this.inputForm.cwWorkClientContactDTOList = data.cwWorkClientContactDTOList
+            // this.$refs.enclosure.newUpload(method, data.cwFileInfoList2, 'cwWorkContract', null, null, null, null, false)
+            this.$refs.archiveFile.newUpload(method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             this.$refs.signatureFile.newUpload('view', data.signatureFileList, 'cwWorkContract', null, null, null, null, false)
             this.loading = false
           })
@@ -1142,6 +1155,11 @@
           // })
         })
       },
+      clickSign () {
+        this.projectReportService.saveFlowableParam(this.inputForm).then(({data}) => {
+          window.open(data, '_blank')
+        })
+      },
       detailDivide (details) {
         this.inputForm.detailFor1010 = []
         this.inputForm.detailFor1020 = []
@@ -1503,6 +1521,21 @@
       changeBusinessType () {
         // 切换业务类型的时候，审计业务类型清空
         this.inputForm.auditBusinessType = ''
+      },
+      // 下载报告审核单下载
+      downloadCwReportAuditTpl () {
+        // this.$utils.downloadExcel('/sys/project/import/template')
+        this.loading = true
+        this.projectReportService.downloadCwReportAuditTpl(this.inputForm.id).then((res) => {
+          // 将二进制流文件写入excel表，以下为重要步骤
+          this.$utils.downloadExcel(res.data, '报告审核单.xls')
+          this.loading = false
+        }).catch(function (err) {
+          this.loading = false
+          if (err.response) {
+            console.log(err.response)
+          }
+        })
       }
     }
   }

src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -301,7 +301,7 @@
       add () {
         // this.$refs.workClientForm.init('add', '')
         // this.$refs.reportManagementTaskForm.init('add', '')
-        this.$refs.reportManagementForm.init('add', '')
+        this.$refs.reportManagementForm.init('add', '', '')
       },
       // 修改
       edit (id) {
@@ -310,13 +310,13 @@
         })[0]
         // this.$refs.workClientForm.init('edit', id)
         // this.$refs.reportManagementTaskForm.init('edit', id)
-        this.$refs.reportManagementForm.init('edit', id)
+        this.$refs.reportManagementForm.init('edit', id, '')
       },
       // 查看
       view (id) {
         // this.$refs.workClientForm.init('view', id)
         // this.$refs.reportManagementTaskForm.init('view', id)
-        this.$refs.reportManagementForm.init('view', id)
+        this.$refs.reportManagementForm.init('view', id, '报告审核单下载')
       },
       // 查询当前用户是否是管理员用户
       checkIsAdmin () {

src/views/modules/finance/invoice/UserPullForm.vue

@@ -8,6 +8,7 @@
       height="500px"
       @close="close"
       @keyup.enter.native=""
+      append-to-body
       :visible.sync="visible">
       <div style="height: calc(100% - 80px);">
         <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>

src/views/modules/materialManagement/info/MaterialTypePullForm.vue

@@ -1,19 +1,20 @@
 <template>
   <div>
     <el-dialog
-      title="报销类型选择"
+      title="类型选择"
       :close-on-click-modal="false"
       v-dialogDrag
       width="1100px"
       height="500px"
       @close="close"
+      append-to-body
       @keyup.enter.native=""
       :visible.sync="visible">
       <div style="height: calc(100% - 80px);">
         <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
           <!-- 搜索框-->
-          <el-form-item label="报销类型名称" prop="name">
-            <el-input size="small" v-model="searchForm.name" placeholder="请输入报销类型名称" clearable></el-input>
+          <el-form-item label="类型名称" prop="name">
+            <el-input size="small" v-model="searchForm.name" placeholder="请输入类型名称" clearable></el-input>
           </el-form-item>
 
           <el-form-item>
@@ -40,7 +41,7 @@
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
 <!--          <vxe-column type="checkbox" width="40" ></vxe-column>-->
           <vxe-column type="radio" width="40" ></vxe-column>
-          <vxe-column title="报销内容名称" field="name" align="left" tree-node></vxe-column>
+          <vxe-column title="内容名称" field="name" align="left" tree-node></vxe-column>
           <vxe-column width="100" title="序号" field="sort"></vxe-column>
         </vxe-table>
       </div>

src/views/modules/materialManagement/info/UpdateInfoForm.vue

@@ -106,6 +106,7 @@
             @edit-closed=""
             highlight-current-row
             :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
+            :edit-rules="validRules"
           >
             <vxe-table-column field="purchaser" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]">
               <template v-slot:edit="scope">
@@ -223,6 +224,7 @@
       <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
       <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
       <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
+      <UserPullForm ref="userPullForm" @getProgramForUser="getProgramForUser"></UserPullForm>
       <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
       <el-button size="small" type="primary" v-if="method != 'view'" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
@@ -240,10 +242,34 @@
   // import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/ReimbursementApprovalService'
   import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import UserPullForm from '@/views/modules/finance/invoice/UserPullForm'
   import XEUtils from 'xe-utils'
   export default {
     data () {
       return {
+        validRules: {
+          purchaser: [
+            {required: true, message: '采购人不能为空'}
+          ],
+          procurementOffice: [
+            {required: true, message: '采购部门不能为空'}
+          ],
+          procurementType: [
+            {required: true, message: '采购类型不能为空'}
+          ],
+          tradeName: [
+            {required: true, message: '商品名称不能为空'}
+          ],
+          tradePrice: [
+            {required: true, message: '商品单价不能为空'}
+          ],
+          tradeNumber: [
+            {required: true, message: '商品数量不能为空'}
+          ],
+          priceSum: [
+            {required: true, message: '商品总价不能为空'}
+          ]
+        },
         title: '',
         method: '',
         visible: false,
@@ -278,7 +304,16 @@
       MaterialTypePullForm,
       CwProgramPageForm,
       MaterialManagementDialog,
-      UpLoadComponent
+      UpLoadComponent,
+      UserPullForm
+    },
+    computed: {
+      name () {
+        return JSON.parse(localStorage.getItem('user')).name
+      },
+      officeName () {
+        return JSON.parse(localStorage.getItem('user')).officeDTO.name
+      }
     },
     methods: {
       init (method, id) {
@@ -336,9 +371,29 @@
           }
         })
       },
+      // 值改变事件
+      changeValue () {
+        let i = this.inputForm.detailInfos.length
+        for (let j = 0; j < i; j++) {
+          if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+            if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+              // parseFloat(item.account).toFixed(2)
+              this.inputForm.detailInfos[j].priceSum = parseFloat(parseFloat(this.inputForm.detailInfos[j].tradePrice) * parseFloat(this.inputForm.detailInfos[j].tradeNumber)).toFixed(2)
+            }
+          }
+        }
+      },
+      getProgramForUser (rows) {
+        this.inputForm.detailInfos[this.indexRow].userId = rows[0].id
+        this.inputForm.detailInfos[this.indexRow].purchaser = rows[0].name
+        this.inputForm.detailInfos[this.indexRow].deptId = rows[0].parentId
+        this.inputForm.detailInfos[this.indexRow].procurementOffice = rows[0].officeName
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
       getProgramForType (rows) {
-        this.inputForm.detailInfos[this.indexRow].typeId = rows[0].id
-        this.inputForm.detailInfos[this.indexRow].procurementType = rows[0].name
+        this.inputForm.detailInfos[this.indexRow].typeId = rows.id
+        this.inputForm.detailInfos[this.indexRow].procurementType = rows.name
         this.indexRow = ''
         this.$forceUpdate()
       },
@@ -527,6 +582,8 @@
       async insertEvent (type) {
         if (type === 'detail') {
           await this.$refs.detailTable.insert().then((data) => {
+            data.purchaser = this.name
+            data.procurementOffice = this.officeName
             this.inputForm.detailInfos.push(data)
           })
         }

src/views/modules/materialManagement/purchase/PurchaseForm.vue

@@ -73,7 +73,7 @@
                       type="textarea"
                       :rows="5"
                       maxlength="500"
-                      placeholder="请输入简介"
+                      placeholder="请填写备注信息"
                       show-word-limit>
             </el-input>
           </el-form-item>
@@ -100,6 +100,7 @@
           @edit-closed=""
           highlight-current-row
           :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
+          :edit-rules="validRules"
         >
           <vxe-table-column field="purchaser" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]">
             <template v-slot:edit="scope">
@@ -124,7 +125,7 @@
           <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
             <template v-slot:edit="scope">
 <!--              <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @keyup.native="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
-              <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>
+              <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces2(scope.row.tradePrice)"></el-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
@@ -243,6 +244,29 @@
   export default {
     data () {
       return {
+        validRules: {
+          purchaser: [
+            {required: true, message: '采购人不能为空'}
+          ],
+          procurementOffice: [
+            {required: true, message: '采购部门不能为空'}
+          ],
+          procurementType: [
+            {required: true, message: '采购类型不能为空'}
+          ],
+          tradeName: [
+            {required: true, message: '商品名称不能为空'}
+          ],
+          tradePrice: [
+            {required: true, message: '商品单价不能为空'}
+          ],
+          tradeNumber: [
+            {required: true, message: '商品数量不能为空'}
+          ],
+          priceSum: [
+            {required: true, message: '商品总价不能为空'}
+          ]
+        },
         title: '',
         method: '',
         visible: false,

src/views/modules/materialManagement/purchase/PurchaseList.vue

@@ -70,7 +70,7 @@
 <!--          </el-option>-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item label="合同金额" prop="contractAmounts">
+      <el-form-item label="采购金额（元）" prop="contractAmounts">
         <InputNumber :disabled="false" :precision="num" v-model="searchForm.contractAmounts"></InputNumber>
       </el-form-item>
       <el-form-item label="申请时间" prop="contractDates">

src/views/modules/materialManagement/wareHouse/PurchaseChooseForm.vue

@@ -0,0 +1,183 @@
+<template>
+  <div>
+    <el-dialog
+      title="选择项目"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="1100px"
+      height="500px"
+      @close="close"
+      append-to-body
+      @keyup.enter.native=""
+      :visible.sync="visible">
+      <div style="height: calc(100% - 80px);">
+        <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
+          <!-- 搜索框-->
+          <el-form-item label="采购名称" prop="purchaseSketch">
+            <el-input size="small" v-model="searchForm.purchaseSketch" placeholder="请输入采购名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="申请时间" prop="contractDates">
+            <el-date-picker
+              placement="bottom-start"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              v-model="searchForm.contractDates"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="400px"
+          :loading="loading"
+          size="small"
+          ref="projectTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          :print-config="{}"
+          @sort-change=""
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :row-config="{isCurrent: true}"
+          :radio-config="{trigger: 'row'}"
+        >
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column type="radio" width="40px"></vxe-column>
+          <vxe-column min-width="160" align="center" title="采购编号" field="purchaseNo"></vxe-column>
+          <vxe-column min-width="160" align="center" title="采购名称" field="purchaseSketch"></vxe-column>
+          <vxe-column min-width="160" align="center" title="经办人" field="handledBy"></vxe-column>
+          <vxe-column min-width="160" align="center" title="经办人部门" field="handledByOfficeName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="申请时间" field="createDate"></vxe-column>
+          <vxe-column min-width="160" align="center" title="采购方式" field="purchaseMode"></vxe-column>
+
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+      </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="small" type="primary" v-if="method != 'view'" @click="getProject()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import InputNumber from '@/views/modules/sys/workContract/InputNumber.vue'
+  // import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
+  import WareHouseService from '@/api/materialManagement/WareHouseService'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        dataList: [],
+        searchForm: {
+          purchaseSketch: '',
+          contractDates: []
+        }
+      }
+    },
+    // projectRecordsService: null,
+    wareHouseService: null,
+    created () {
+      // this.projectRecordsService = new ProjectRecordsService()
+      this.wareHouseService = new WareHouseService()
+    },
+    components: {
+      SelectUserTree,
+      InputNumber
+    },
+    methods: {
+      init () {
+        this.visible = true
+        this.list()
+      },
+      // 表单提交
+      getProject () {
+        let row = this.$refs.projectTable.getRadioRecord()
+        if (this.commonJS.isEmpty(row)) {
+          this.$message.error('请选择一条数据')
+          return
+        }
+        this.close()
+        this.$emit('getProject', row)
+      },
+      list () {
+        this.loading = true
+        // this.searchForm.createId = this.$store.state.user.id
+        this.searchForm.status = '5'
+        this.wareHouseService.list({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+        // this.projectRecordsService.list({
+        //   'current': this.tablePage.currentPage,
+        //   'size': this.tablePage.pageSize,
+        //   'orders': this.tablePage.orders,
+        //   ...this.searchForm
+        // }).then(({data}) => {
+        //   this.dataList = data.records
+        //   this.tablePage.total = data.total
+        //   this.loading = false
+        // })
+      },
+      // 当前页
+      currentChangeHandle ({currentPage, pageSize}) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.list()
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.list()
+      },
+      close () {
+        this.$refs.searchForm.resetFields()
+        this.visible = false
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-dialog__body {
+    padding-top: 0px;
+    padding-bottom: 15px;
+  }
+</style>

src/views/modules/materialManagement/wareHouse/WareHouseAddForm.vue

@@ -0,0 +1,648 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="1200px"
+      @close="close"
+      @keyup.enter.native="doSubmit"
+      :visible.sync="visible">
+      <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
+               label-width="100px" @submit.native.prevent>
+
+        <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
+        <el-row :gutter="26">
+          <el-col :span="12">
+            <el-form-item label="入库编号" prop="wareHouseNumber">
+              <el-input placeholder="自动生成" v-model="inputForm.wareHouseNumber" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入库名称" prop="wareHouseName"
+                          :rules="[{required: true, message: '入库名称不能为空', trigger: 'blur'}
+                 ]">
+              <el-input v-model="inputForm.wareHouseName" placeholder="请填写入库名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="经办人" prop="handledBy">
+              <el-input v-model="inputForm.handledBy" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="经办人部门" prop="handledByOffice">
+              <SelectTree
+                :disabled="true"
+                ref="officeTree"
+                :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+
+                :url="`/sys/office/treeData?type=2`"
+                :value="inputForm.handledByOffice"
+                :accordion="true"
+                size="medium"
+                @getValue="(value) => {inputForm.handledByOffice=value}"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入库时间" prop="wareHouseDare" :rules="[{required: true, message:'请选择入库时间', trigger:'blur'}]">
+              <el-date-picker
+                v-model="inputForm.wareHouseDare"
+                type="date"
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="采购编号" prop="purchaseNo"
+                          :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
+                              {required: true, message:'采购编号不能为空', trigger:'change'}]">
+              <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
+                <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model="inputForm.remarks"
+                        type="textarea"
+                        :rows="5"
+                        maxlength="500"
+                        placeholder="请输入简介"
+                        show-word-limit>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider content-position="left"><i class="el-icon-document"></i>
+          采购详情
+<!--          <el-button style="margin-left: 20px" type="primary" @click="insertEvent('detail')" plain>-->
+<!--            新增-->
+<!--          </el-button>-->
+        </el-divider>
+        <el-row  :gutter="15" >
+          <vxe-table
+            border
+            show-footer
+            show-overflow
+            :footer-method="footerMethod"
+            ref="detailTable"
+            class="vxe-table-element"
+            :data="inputForm.detailInfos"
+            style="margin-left: 5em"
+            @cell-click=""
+            @edit-closed=""
+            highlight-current-row
+            :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
+          >
+            <vxe-table-column field="purchaser" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.purchaser"></el-input>
+<!--                <el-input v-model="scope.row.purchaser" @focus="userPullListForm(scope.$rowIndex)"></el-input>-->
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="procurementOffice" title="采购部门" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input :disabled='true' v-model="scope.row.procurementOffice" ></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="procurementType" title="采购类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.procurementType"></el-input>
+<!--                <el-input v-model="scope.row.procurementType" @focus="typePullForm(scope.$rowIndex)"></el-input>-->
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.tradeName"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <!--              <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @keyup.native="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
+                <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice"></el-input>
+<!--                <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <!--              <el-input @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>-->
+                <el-input @change="changeValue" v-model="scope.row.tradeNumber" maxlength="10"></el-input>
+<!--                <el-input @change="changeValue" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>-->
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="priceSum" title="商品总价" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.priceSum" maxlength="15"></el-input>
+<!--                <el-input v-model="scope.row.priceSum" @blur="scope.row.priceSum = twoDecimalPlaces(scope.row.priceSum)" maxlength="15"></el-input>-->
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.company"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="remarks" title="备注" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.remarks" ></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column title="操作">
+              <template v-slot="scope">
+                <el-button size="mini" type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
+                <!--              <el-button size="mini" v-if="formReadOnly" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>-->
+              </template>
+            </vxe-table-column>
+          </vxe-table>
+        </el-row>
+        <el-divider content-position="left"><i class="el-icon-document"></i>
+          入库详情
+          <el-button style="margin-left: 20px" type="primary" @click="insertEvent('detail')" plain>
+            新增
+          </el-button>
+        </el-divider>
+        <el-row  :gutter="15" >
+          <vxe-table
+            border
+            show-footer
+            show-overflow
+            :footer-method="footerMethod2"
+            ref="detailTable"
+            class="vxe-table-element"
+            :data="inputForm.wareHouse"
+            style="margin-left: 5em"
+            @cell-click=""
+            @edit-closed=""
+            highlight-current-row
+            :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
+          >
+            <vxe-table-column field="wareHouseMan" title="入库人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.wareHouseMan" @focus="userPullListForm(scope.$rowIndex)"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="wareHouseManOffice" title="入库部门" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input :disabled='true' v-model="scope.row.wareHouseManOffice" ></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="wareHouseType" title="入库类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.wareHouseType" @focus="typePullForm(scope.$rowIndex)"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.tradeName"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input @change="changeValue2" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces2(scope.row.tradePrice)"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input @change="changeValue2" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="priceSum" title="商品总价" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.priceSum" @blur="scope.row.priceSum = twoDecimalPlaces(scope.row.priceSum)" maxlength="15"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.company"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="remarks" title="备注" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.remarks" ></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column title="操作" width="300">
+              <template v-slot="scope">
+                <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
+                <el-button size="mini" type="primary" @click="sss(scope.$rowIndex)">上传附件</el-button>
+                <el-button size="mini" type="primary" v-if="method==='view'" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
+                <!--              <el-button size="mini" v-if="formReadOnly" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>-->
+              </template>
+            </vxe-table-column>
+          </vxe-table>
+        </el-row>
+
+      </el-form>
+      <!-- 附件 -->
+      <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+      <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
+      <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
+      <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
+      <UserPullForm ref="userPullForm" @getProgramForUser="getProgramForUser"></UserPullForm>
+      <PurchaseChooseForm  ref="purchaseChooseForm" @getProject="getContract"></PurchaseChooseForm>
+      <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="small" type="primary" v-if="method != 'view'" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import SelectTree from '@/components/treeSelect/treeSelect.vue'
+  import MaterialManagementDialog from '../file/MaterialManagementDialog'
+  import CwProgramPageForm from '@/views/modules/cw/reimbursementApproval/info/CwProgramPageForm'
+  import MaterialTypePullForm from '../info/MaterialTypePullForm'
+  import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
+  import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import UserPullForm from '@/views/modules/finance/invoice/UserPullForm'
+  import PurchaseChooseForm from './PurchaseChooseForm'
+  import XEUtils from 'xe-utils'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        inputForm: {
+          wareHouseTotalPrice: '', // 入库商品总价
+          tradeTotalPrice: '',  // 商品总价
+          fileInfoLost: [],
+          purchaseNo: '',
+          handledBy: '',
+          handledByOffice: '',
+          wareHouseName: '',
+          wareHouseNumber: '', // 入库编号
+          userId: '',
+          wareHouseDare: '',
+          remarks: '',
+          detailInfos: [],
+          wareHouse: [],
+          // amountInfos: [],
+          files: [] // 附件信息
+        }
+      }
+    },
+    MaterialManagementService: null,
+    created () {
+      this.materialManagementService = new MaterialManagementService()
+    },
+    components: {
+      SelectTree,
+      MaterialTypePullForm,
+      CwProgramPageForm,
+      MaterialManagementDialog,
+      UpLoadComponent,
+      UserPullForm,
+      PurchaseChooseForm
+    },
+    computed: {
+      name () {
+        return JSON.parse(localStorage.getItem('user')).name
+      },
+      officeName () {
+        return JSON.parse(localStorage.getItem('user')).officeDTO.name
+      }
+    },
+    methods: {
+      init (method, id) {
+        this.method = method
+        this.inputForm = {
+          wareHouseTotalPrice: '', // 入库商品总价
+          tradeTotalPrice: '',  // 商品总价
+          fileInfoLost: [],
+          purchaseNo: '',
+          handledBy: JSON.parse(localStorage.getItem('user')).name,
+          handledByOffice: '',
+          wareHouseName: '',
+          wareHouseNumber: '', // 入库编号
+          userId: JSON.parse(localStorage.getItem('user')).id,
+          wareHouseDare: new Date(),
+          remarks: '',
+          detailInfos: [],
+          wareHouse: [],
+          // amountInfos: [],
+          files: [] // 附件信息
+        }
+        if (method === 'add') {
+          this.title = `新建采购类型`
+        } else if (method === 'edit') {
+          this.inputForm.id = id
+          this.title = '修改采购类型'
+        } else if (method === 'view') {
+          this.inputForm.id = id
+          this.title = '查看采购类型'
+        } else if (method === 'addChild') {
+          this.title = '添加下级结构'
+          this.inputForm.parentId = id
+        }
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          if (method === 'edit' || method === 'view') { // 修改或者查看
+            this.loading = true
+            this.$refs.inputForm.resetFields()
+            this.materialManagementService.findById(this.inputForm.id).then(({data}) => {
+              this.inputForm = this.recover(this.inputForm, data)
+              if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
+                this.inputForm.handledByOffice = JSON.parse(localStorage.getItem('user')).officeDTO.id
+              }
+              let i = this.inputForm.detailInfos.length
+              for (let j = 0; j < i; j++) {
+                if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+                  if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+                    this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+                  }
+                }
+              }
+              this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
+              this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+              this.loading = false
+            })
+          }
+        })
+      },
+      getContract (row) {
+        this.materialManagementService.findById(row.id).then(({data}) => {
+          this.inputForm.detailInfos = data.detailInfos
+          this.inputForm.purchaseNo = data.purchaseNo
+          let i = this.inputForm.detailInfos.length
+          for (let j = 0; j < i; j++) {
+            if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+              if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+                this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+              }
+            }
+          }
+        })
+        this.$forceUpdate()
+      },
+      openContractForm () {
+        this.$refs.purchaseChooseForm.init()
+      },
+      // 值改变事件
+      changeValue () {
+        let i = this.inputForm.detailInfos.length
+        for (let j = 0; j < i; j++) {
+          if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+            if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+              // parseFloat(item.account).toFixed(2)
+              this.inputForm.detailInfos[j].priceSum = parseFloat(parseFloat(this.inputForm.detailInfos[j].tradePrice) * parseFloat(this.inputForm.detailInfos[j].tradeNumber)).toFixed(2)
+            }
+          }
+        }
+      },
+      // 值改变事件
+      changeValue2 () {
+        let i = this.inputForm.wareHouse.length
+        for (let j = 0; j < i; j++) {
+          if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradePrice)) {
+            if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradeNumber)) {
+              // parseFloat(item.account).toFixed(2)
+              this.inputForm.wareHouse[j].priceSum = parseFloat(parseFloat(this.inputForm.wareHouse[j].tradePrice) * parseFloat(this.inputForm.wareHouse[j].tradeNumber)).toFixed(2)
+            }
+          }
+        }
+      },
+      getProgramForUser (rows) {
+        // this.inputForm.detailInfos[this.indexRow].userId = rows[0].id
+        // this.inputForm.detailInfos[this.indexRow].purchaser = rows[0].name
+        // this.inputForm.detailInfos[this.indexRow].deptId = rows[0].parentId
+        // this.inputForm.detailInfos[this.indexRow].procurementOffice = rows[0].officeName
+        this.inputForm.wareHouse[this.indexRow].userId = rows[0].id
+        this.inputForm.wareHouse[this.indexRow].wareHouseMan = rows[0].name
+        this.inputForm.wareHouse[this.indexRow].deptId = rows[0].parentId
+        this.inputForm.wareHouse[this.indexRow].wareHouseManOffice = rows[0].officeName
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
+      getProgramForType (rows) {
+        this.inputForm.wareHouse[this.indexRow].typeId = rows.id
+        this.inputForm.wareHouse[this.indexRow].wareHouseType = rows.name
+        // this.inputForm.detailInfos[this.indexRow].procurementType = rows.name
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
+      getProgram (rows) {
+        this.inputForm.detailInfos[this.indexRow].projectId = rows[0].id
+        this.inputForm.detailInfos[this.indexRow].projectName = rows[0].name
+        this.inputForm.detailInfos[this.indexRow].reportNumber = rows[0].reportNo
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
+      getUpload (p, index) {
+        p.then((list) => {
+          // list为返回数据
+          this.inputForm.wareHouse[index].fileInfoLost = list
+          this.inputForm.wareHouse[index].fileNumber = list.length
+          this.tableKeyClient = Math.random()
+        })
+      },
+      twoDecimalPlaces (num) {
+        let str = num.toString()
+        var len1 = str.substr(0, 1)
+        var len2 = str.substr(1, 1)
+        // eslint-disable-next-line eqeqeq
+        if (str.length > 1 && len1 == 0 && len2 != '.') {
+          str = str.substr(1, 1)
+        }
+        // eslint-disable-next-line eqeqeq
+        if (len1 == '.') {
+          str = ''
+        }
+        // eslint-disable-next-line eqeqeq
+        if (str.indexOf('.') != -1) {
+          var str_ = str.substr(str.indexOf('.') + 1)
+          // eslint-disable-next-line eqeqeq
+          if (str_.indexOf('.') != -1) {
+            str = str.substr(0, str.indexOf('.') + str_.indexOf('.') + 1)
+          }
+          if (str_.length > 2) {
+            this.$message.warning(`金额小数点后只能输入两位，请正确输入！`)
+            return (str = '')
+          }
+        }
+        // eslint-disable-next-line no-useless-escape
+        str = str.replace(/[^\d^\.]+/g, '') // 保留数字和小数点
+        return str
+      },
+      twoDecimalPlaces2 (num) {
+        let str = num.toString()
+        var len1 = str.substr(0, 1)
+        var len2 = str.substr(1, 1)
+        // eslint-disable-next-line eqeqeq
+        if (str.length > 1 && len1 == 0 && len2 != '.') {
+          str = str.substr(1, 1)
+        }
+        // eslint-disable-next-line eqeqeq
+        if (len1 == '.') {
+          str = ''
+        }
+        // eslint-disable-next-line eqeqeq
+        if (str.indexOf('.') != -1) {
+          var str_ = str.substr(str.indexOf('.') + 1)
+          // eslint-disable-next-line eqeqeq
+          if (str_.indexOf('.') != -1) {
+            str = str.substr(0, str.indexOf('.') + str_.indexOf('.') + 1)
+          }
+          if (str_.length > 2) {
+            this.$message.warning(`商品数量小数点后只能输入两位，请正确输入！`)
+            return (str = '')
+          }
+        }
+        // eslint-disable-next-line no-useless-escape
+        str = str.replace(/[^\d^\.]+/g, '') // 保留数字和小数点
+        return str
+      },
+      // 采购人下拉弹窗
+      userPullListForm (rowIndex) {
+        this.indexRow = rowIndex
+        this.$refs.userPullForm.init()
+      },
+      footerMethod ({ columns, data }) {
+        const footerData = [
+          columns.map((column, columnIndex) => {
+            if (columnIndex === 0) {
+              return '商品总价'
+            }
+            if (['priceSum'].includes(column.property)) {
+              // eslint-disable-next-line no-undef
+              this.inputForm.tradeTotalPrice = XEUtils.sum(data, column.property)
+              return XEUtils.sum(data, column.property)
+            }
+            return null
+          })
+        ]
+        return footerData
+      },
+      footerMethod2 ({ columns, data }) {
+        const footerData = [
+          columns.map((column, columnIndex) => {
+            if (columnIndex === 0) {
+              return '商品总价'
+            }
+            if (['priceSum'].includes(column.property)) {
+              // eslint-disable-next-line no-undef
+              this.inputForm.wareHouseTotalPrice = XEUtils.sum(data, column.property)
+              return XEUtils.sum(data, column.property)
+            }
+            return null
+          })
+        ]
+        return footerData
+      },
+      seeFileInfo (index) {
+        if (this.commonJS.isEmpty(this.inputForm.wareHouse[index].fileInfoLost)) {
+          this.inputForm.wareHouse[index].fileInfoLost = []
+        }
+        this.$refs.materialManagementDialog.newUpload('view', this.inputForm.wareHouse[index].fileInfoLost, null, null, null, null, null, false, index)
+      },
+      sss (index) {
+        if (this.commonJS.isEmpty(this.inputForm.wareHouse[index].fileInfoLost)) {
+          this.inputForm.wareHouse[index].fileInfoLost = []
+        }
+        this.$refs.materialManagementDialog.newUpload(null, this.inputForm.wareHouse[index].fileInfoLost, null, null, null, null, null, false, index)
+      },
+      // 采购类型下拉弹窗
+      typePullForm (rowIndex) {
+        this.indexRow = rowIndex
+        this.$refs.materialTypePullForm.init()
+      },
+      // 表单提交
+      doSubmit () {
+        this.$refs['inputForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            if (this.$refs.uploadComponent.checkProgress()) {
+              this.loading = false
+              return
+            }
+            if (this.commonJS.isEmpty(this.inputForm.files)) {
+              this.loading = false
+              this.inputForm.files = []
+            }
+            if (this.commonJS.isEmpty(this.inputForm.detailInfos)) {
+              this.$message.error('至少填写一条采购详情信息')
+              this.loading = false
+              return
+            } else {
+              let i = this.inputForm.detailInfos.length
+              for (let j = 0; j < i; j++) {
+                let k = j + 1
+                if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].purchaser)) {
+                  this.$message.error('采购详情第' + k + '行请选择采购人')
+                  this.loading = false
+                  return
+                }
+                if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].procurementType)) {
+                  this.$message.error('采购详情第' + k + '行请选择采购类型')
+                  this.loading = false
+                  return
+                }
+                if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+                  this.$message.error('采购详情第' + k + '行请输入商品单价')
+                  this.loading = false
+                  return
+                }
+              }
+            }
+            this.inputForm.files = this.$refs.uploadComponent.getDataList()
+            this.materialManagementService.save(this.inputForm).then(({data}) => {
+              // eslint-disable-next-line no-undef
+              callback(data.businessTable, data.businessId, this.inputForm)
+              this.$refs.inputForm.resetFields()
+              this.loading = false
+            }).catch(() => {
+              this.$refs.inputForm.resetFields()
+              this.loading = false
+            })
+          }
+        })
+      },
+      close () {
+        this.$refs.inputForm.resetFields()
+        this.inputForm.detailInfos = []
+        this.inputForm.wareHouse = []
+        this.inputForm.amountInfos = []
+        this.$refs.uploadComponent.clearUpload()
+        this.visible = false
+      },
+      // 删除
+      removeEvent (row, rowIndex, type) {
+        if (type === 'detail') {
+          this.$refs.detailTable.remove(row)
+          // this.inputForm.detailInfos.splice(rowIndex, 1)
+          this.inputForm.wareHouse.splice(rowIndex, 1)
+        }
+        if (type === 'amount') {
+          this.$refs.amountTable.remove(row)
+          this.inputForm.amountInfos.splice(rowIndex, 1)
+        }
+      },
+      // 新增
+      async insertEvent (type) {
+        if (type === 'detail') {
+          await this.$refs.detailTable.insert().then((data) => {
+            data.wareHouseMan = this.name
+            data.wareHouseManOffice = this.officeName
+            // this.inputForm.detailInfos.push(data)
+            this.inputForm.wareHouse.push(data)
+          })
+        }
+        if (type === 'amount') {
+          await this.$refs.amountTable.insert().then((data) => {
+            this.inputForm.amountInfos.push(data)
+          })
+        }
+      }
+    }
+  }
+</script>

src/views/modules/materialManagement/wareHouse/WareHouseList.vue

@@ -0,0 +1,292 @@
+<template>
+  <div class="page">
+    <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+      <!-- 搜索框-->
+      <el-form-item label="入库编号" prop="wareHouseNumber">
+        <el-input size="small" v-model="searchForm.wareHouseNumber" placeholder="请输入入库编号" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="入库名称" prop="wareHouseName">
+        <el-input size="small" v-model="searchForm.wareHouseName" placeholder="请输入入库名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="经办人" prop="handledBy">
+        <SelectUserTree
+          ref="companyTree"
+          :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+          :url="`/sys/user/treeUserDataAllOffice?type=2`"
+          :value="searchForm.handledBy"
+          :clearable="true"
+          :accordion="true"
+          @getValue="(value) => {searchForm.handledBy=value}"/>
+      </el-form-item>
+      <el-form-item  prop="handledByOffice" label="经办人部门">
+        <SelectTree
+          ref="officeTree"
+          :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+
+          :url="`/sys/office/treeData?type=1`"
+          :value="searchForm.handledByOffice"
+          :accordion="true"
+          @getValue="(value) => {searchForm.handledByOffice=value}"/>
+      </el-form-item>
+      <el-form-item label="入库时间" prop="wareHouseDates">
+        <el-date-picker
+          placement="bottom-start"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          v-model="searchForm.wareHouseDates"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
+        <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="bg-white top" style="">
+      <vxe-toolbar :refresh="{query: refreshList}" custom>
+        <template #buttons>
+          <el-button v-if="hasPermission('cw_work_client:info:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>
+        </template>
+      </vxe-toolbar>
+      <div style="height: calc(100% - 90px)">
+        <vxe-table
+          :key="tableKey"
+          border="inner"
+          auto-resize
+          resizable
+          height="auto"
+          :loading="loading"
+          size="small"
+          ref="clientTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          @sort-change="sortChangeHandle"
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :checkbox-config="{}">
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column min-width="160" align="center" title="入库编号" field="wareHouseNumber"></vxe-column>
+          <vxe-column min-width="160" align="center" title="入库名称" field="wareHouseName">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.id)">{{scope.row.wareHouseName}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('material:list')"  @click="view(scope.row.id,)">{{scope.row.wareHouseName}}</el-link>
+              <span v-else>{{scope.row.wareHouseName}}</span>
+            </template>
+          </vxe-column>
+          <vxe-column min-width="160" align="center" title="入库时间" field="wareHouseDate"></vxe-column>
+          <vxe-column min-width="160" align="center" title="经办人" field="handledBy"></vxe-column>
+          <vxe-column min-width="160" align="center" title="经办人部门" field="handledByOfficeName"></vxe-column>
+
+          <vxe-column title="操作" width="150px" fixed="right" align="center">
+            <template  slot-scope="scope">
+              <el-button v-if="hasPermission('material:edit')&&scope.row.createBy === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"  size="small" @click="push(scope.row)">修改</el-button>
+              <el-button v-else-if="hasPermission('material:edit')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('material:del')&&scope.row.createBy === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-else-if="hasPermission('material:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+            </template>
+          </vxe-column>
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+<!--        <UpdateInfoForm ref="updateInfoForm" @refreshDataList="refreshList"></UpdateInfoForm>-->
+        <WareHouseAddForm ref="wareHouseAddForm" @refreshDataList="refreshList"></WareHouseAddForm>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  // import UpdateInfoForm from '../info/UpdateInfoForm'
+  import WareHouseAddForm from './WareHouseAddForm'
+  import InputNumber from '@/views/modules/cw/workContract/InputNumber.vue'
+  import SelectTree from '@/components/treeSelect/treeSelect.vue'
+  import WorkClientService from '@/api/cw/workClientInfo/WorkClientService'
+  import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
+  import WareHouseService from '@/api/materialManagement/WareHouseService'
+  import TaskService from '@/api/flowable/TaskService'
+  import ProcessService from '@/api/flowable/ProcessService'
+  import UserService from '@/api/sys/UserService'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  export default {
+    data () {
+      return {
+        num: 0,
+        searchForm: {
+          wareHouseName: '',
+          wareHouseNumber: '',
+          handledBy: '',
+          handledByOffice: '',
+          wareHouseDates: [],
+          procurementType: '',
+          createBy: ''
+        },
+        dataList: [],
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        tableKey: '',
+        loading: false,
+        processDefinitionAuditId: '',
+        procDefAuditKey: '',
+        isAdmin: false,
+        create: ''
+      }
+    },
+    workClientService: null,
+    materialManagementService: null,
+    wareHouseService: null,
+    taskService: null,
+    processService: null,
+    userService: null,
+    created () {
+      this.workClientService = new WorkClientService()
+      this.materialManagementService = new MaterialManagementService()
+      this.wareHouseService = new WareHouseService()
+      this.taskService = new TaskService()
+      this.processService = new ProcessService()
+      this.userService = new UserService()
+    },
+    components: {
+      InputNumber,
+      SelectUserTree,
+      SelectTree,
+      // UpdateInfoForm
+      WareHouseAddForm
+    },
+    computed: {
+      userName () {
+        return JSON.parse(localStorage.getItem('user')).name
+      },
+      user () {
+        this.createName = JSON.parse(localStorage.getItem('user')).name
+        return JSON.parse(localStorage.getItem('user'))
+      }
+    },
+    mounted () {
+      this.refreshList()
+    },
+    activated () {
+      this.refreshList()
+    },
+    methods: {
+      // 新增
+      add () {
+        // this.$refs.reportManagementForm.init('add', '')
+        this.$refs.wareHouseAddForm.init('add', '')
+      },
+      // 修改
+      edit (id) {
+        id = id || this.$refs.clientTable.getCheckboxRecords().map(item => {
+          return item.id
+        })[0]
+        // this.$refs.updateInfoForm.init('edit', id)
+        this.$refs.wareHouseAddForm.init('edit', id)
+      },
+      // 查看
+      view (id) {
+        // this.$refs.updateInfoForm.init('view', id)
+        this.$refs.wareHouseAddForm.init('view', id)
+      },
+      // 查询当前用户是否是管理员用户
+      checkIsAdmin () {
+        this.userService.is().then(({data}) => {
+          this.isAdmin = data
+        })
+      },
+      // 获取数据列表
+      refreshList () {
+        this.loading = true
+        this.wareHouseService.wareHouseList({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.tableKey = Math.random()
+          this.loading = false
+        })
+        // this.materialManagementService.list({
+        //   'current': this.tablePage.currentPage,
+        //   'size': this.tablePage.pageSize,
+        //   'orders': this.tablePage.orders,
+        //   ...this.searchForm
+        // }).then(({data}) => {
+        //   this.dataList = data.records
+        //   this.tablePage.total = data.total
+        //   this.tableKey = Math.random()
+        //   this.loading = false
+        // })
+        this.checkIsAdmin()
+        this.processService.getByName('物资管理-采购申请').then(({data}) => {
+          if (!this.commonJS.isEmpty(data.id)) {
+            this.processDefinitionAuditId = data.id
+            this.procDefAuditKey = data.key
+          }
+        })
+      },
+      // 当前页
+      currentChangeHandle ({ currentPage, pageSize }) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.refreshList()
+      },
+      // 排序
+      sortChangeHandle (column) {
+        this.tablePage.orders = []
+        if (column.order != null) {
+          this.tablePage.orders.push({column: this.$utils.toLine(column.property), asc: column.order === 'asc'})
+        }
+        this.refreshList()
+      },
+      // 删除
+      del (id) {
+        let ids = id || this.$refs.clientTable.getCheckboxRecords().map(item => {
+          return item.id
+        }).join(',')
+        this.$confirm(`确定删除所选项吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.loading = true
+          this.materialManagementService.remove(ids).then(({data}) => {
+            this.$message.success(data)
+            this.refreshList()
+            this.loading = false
+          })
+        })
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.refreshList()
+      }
+    }
+  }
+</script>