物料变更单列表功能，新增功能

src/api/changeApply/basic.js

@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+// 获取物料变更单列表
+export function getChangeList(params) {
+  return request({
+    url: `/material/change/list`,
+    method: 'get',
+    params: params
+  })
+}
+// 物料变更单新增
+export function addChangeList(data) {
+  return request({
+    url: `/material/change/add`,
+    method: 'post',
+    data: data
+  })
+}
+// 获取物料列表信息
+export function getMaterialList(data) {
+  return request({
+    url: `/system/material/list`,
+    method: 'post',
+    data: data
+  })
+}
+// 获取物料基本信息详细信息
+export function getMaterialDetails(id) {
+  return request({
+    url: `/system/material/details/${id}`,
+    method: 'get',
+  })
+}

src/components/PopDialog/index.vue

@@ -0,0 +1,279 @@
+<template>
+  <div>
+    <el-dialog
+      title="物料选择"
+      width="1000px"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+      v-dialogDrag
+      class="userDialog"
+      :visible.sync="visible"
+    >
+      <el-container style="height: 500px">
+        <el-container>
+          <el-header style="text-align: left; font-size: 12px; height: 30px">
+            <el-form
+              size="small"
+              :inline="true"
+              ref="searchForm"
+              :model="searchForm"
+              @keyup.enter.native="refreshList()"
+              @submit.native.prevent
+            >
+              <el-form-item prop="code">
+                <el-input
+                  size="small"
+                  v-model="searchForm.code"
+                  placeholder="物料编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item prop="name">
+                <el-input
+                  size="small"
+                  v-model="searchForm.name"
+                  placeholder="物料名称"
+                  clearable
+                ></el-input>
+              </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>
+          </el-header>
+          <el-main>
+            <el-table
+              :data="dataList"
+              v-loading="loading"
+              size="small"
+              border
+              ref="contractTable"
+              @select="handleSelectionChange"
+              height="calc(100% - 40px)"
+              style="width: 100%"
+            >
+              <el-table-column
+                type="selection"
+                header-align="center"
+                align="center"
+                width="50"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="code"
+                header-align="center"
+                align="left"
+                sortable="custom"
+                min-width="90"
+                label="code"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                header-align="center"
+                align="left"
+                sortable="custom"
+                min-width="90"
+                label="物料名称"
+              >
+              </el-table-column>
+              <!-- <el-table-column
+                prop="contractAmount"
+                header-align="center"
+                align="left"
+                sortable="custom"
+                min-width="110"
+                label="合同金额"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="oppositeCompany"
+                header-align="center"
+                align="center"
+                sortable="custom"
+                min-width="110"
+                label="对方单位"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="signDate"
+                header-align="center"
+                align="left"
+                sortable="custom"
+                min-width="110"
+                label="签订时间"
+              >
+              </el-table-column> -->
+            </el-table>
+            <el-pagination
+              @size-change="sizeChangeHandle"
+              @current-change="currentChangeHandle"
+              :current-page="pageNo"
+              :page-sizes="[5, 10, 15, 20]"
+              :page-size="pageSize"
+              :total="total"
+              layout="total, sizes, prev, pager, next, jumper"
+            >
+            </el-pagination>
+          </el-main>
+        </el-container>
+      </el-container>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          size="small"
+          @click="visible = false"
+          icon="el-icon-circle-close"
+          >关闭</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          icon="el-icon-circle-check"
+          @click="doSubmit()"
+          >确定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import { getMaterialList } from '@/api/changeApply/basic'
+export default {
+  data() {
+    return {
+      searchForm: {
+        code: '',
+        name: ''
+      },
+      dataListAllSelections: [], // 所有选中的数据包含跨页数据
+      idKey: "id", // 标识列表数据中每一行的唯一键的名称(需要按自己的数据改一下)
+      dataList: [],
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      orders: [],
+      loading: false,
+      visible: false,
+    };
+  },
+  props: {
+    selectData: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    // 是否启用单选
+    single: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    init() {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.dataListAllSelections = JSON.parse(JSON.stringify(this.selectData));
+        this.resetSearch();
+      });
+    },
+    // 获取数据列表
+    refreshList() {
+      this.loading = true;
+      // axios({
+      //   url: "http://172.16.62.241:8000/drp-admin/system/material/list", // 自己的接口路径
+      //   method: "post",
+      //   data: {
+      //     // current: this.pageNo,
+      //     size: this.pageSize,
+      //     // orders: this.orders,
+      //     // ...this.searchForm,
+      //   },
+      getMaterialList({
+        pageNo: 1,
+        size: this.pageSize
+      }).then(({ data }) => {
+        console.log('data',data)
+        this.dataList = data.tableBody.rows;
+        this.total = data.tableBody.total;
+        this.pageNo = data.current;
+        this.loading = false;
+        this.$nextTick(() => {
+          this.setSelectRow();
+        });
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.refreshList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageNo = val;
+      this.refreshList();
+    },
+    // 排序
+    resetSearch() {
+      this.$refs.searchForm.resetFields();
+      this.refreshList();
+    },
+    // 选中数据
+    handleSelectionChange(selection, row) {
+      if (this.single && selection.length > 1) {
+        this.$refs.contractTable.clearSelection();
+        this.$refs.contractTable.toggleRowSelection(row);
+      }
+      this.dataListAllSelections = this.single ? [row] : selection
+    },
+    // 设置选中的方法
+    setSelectRow() {
+      this.$refs.contractTable.clearSelection();
+      if (!this.dataListAllSelections || this.dataListAllSelections.length <= 0) {
+        return;
+      }
+      for (let i = 0; i < this.dataList.length; i++) {
+        if (this.dataListAllSelections.some(item => item[this.idKey] == this.dataList[i][this.idKey])) {
+          // 设置选中，记住table组件需要使用ref="table"
+          this.$refs.contractTable.toggleRowSelection(this.dataList[i], true);
+        }
+      }
+    },
+    doSubmit() {
+      this.visible = false;
+      console.log('选择的数据？',this.dataListAllSelections)
+      this.$emit("doSubmit", this.dataListAllSelections);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.userDialog {
+  .el-dialog__body {
+    padding: 10px 0px 0px 10px;
+    color: #606266;
+    font-size: 14px;
+    word-break: break-all;
+  }
+  .el-main {
+    padding: 20px 20px 5px 20px;
+    .el-pagination {
+      margin-top: 5px;
+    }
+  }
+}
+</style>

src/views/material/changeApply/add.vue

@@ -6,97 +6,132 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="单据编码" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+                <el-input disabled v-model="basicForm.code"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="申请组织" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="申请组织" prop="orgId">
+                <el-input disabled v-model="basicForm.orgId"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="物料编码" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="物料编码" prop="materialCode">
+                <el-input v-model="basicForm.materialCode">
+                  <el-button slot="append" icon="el-icon-more" @click="test01"></el-button>
+                </el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="物料名称" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="物料名称" prop="materialName">
+                <el-input v-model="basicForm.materialName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="医药物料" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="医药物料" prop="medicineMaterial">
+                <el-select
+                    v-model="basicForm.medicineMaterial"
+                    placeholder="医药物料"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="一级分类" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="一级分类" prop="oneClass">
+                <el-input v-model="basicForm.oneClass"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="二级分类" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="二级分类" prop="twoClass">
+                <el-input v-model="basicForm.twoClass"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="三级分类" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="三级分类" prop="threeClass">
+                <el-input v-model="basicForm.threeClass"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="四级分类" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="四级分类" prop="fourClass">
+                <el-input v-model="basicForm.fourClass"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="规格" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="规格" prop="specification">
+                <el-input v-model="basicForm.specification"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="型号" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="型号" prop="model">
+                <el-input v-model="basicForm.model"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="生产厂家/代理人" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="生产厂家/代理人" prop="factory">
+                <el-input v-model="basicForm.factory"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="注册人/上市许可持有人" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="注册人/上市许可持有人" prop="registrant">
+                <el-input v-model="basicForm.registrant"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="存储条件" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="存储条件" prop="storageConditions">
+                <el-select
+                    v-model="basicForm.storageConditions"
+                    placeholder="存储条件"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in dict.type.sys_storage_condition"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="运输条件" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="运输条件" prop="transportCondition">
+                <el-select
+                    v-model="basicForm.transportCondition"
+                    placeholder="运输条件"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in dict.type.sys_conditions_carriage"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="交货周期" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="交货周期" prop="leadTime">
+                <el-input v-model="basicForm.leadTime"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="备注" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="备注" prop="remark">
+                <el-input v-model="basicForm.remark"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -104,36 +139,167 @@
       </el-tab-pane>
 
       <el-tab-pane label="医药属性" name="second">
-        <el-form :model="basicForm2" :rules="basicRules2" ref="basic2" label-width="160px">
+        <el-form :model="basicForm2" ref="basic2" label-width="160px">
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="药品" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="药品" prop="drug">
+                <el-select
+                    v-model="basicForm2.drug"
+                    placeholder="药品"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in dict.type.sys_medicine"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="注册证号/备案凭证编号" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="注册证号/备案凭证编号" prop="registrationNo">
+                <el-input v-model="basicForm2.registrationNo"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="医疗器械" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="医疗器械" prop="medicalDevices">
+                <el-select
+                    v-model="basicForm2.medicalDevices"
+                    placeholder="医疗器械"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in dict.type.medical_instruments"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="养护类型" prop="code">
-                <el-input v-model="basicForm.code"></el-input>
+              <el-form-item label="养护类型" prop="maintenanceType">
+                <el-select
+                    v-model="basicForm2.maintenanceType"
+                    placeholder="养护类型"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in dict.type.curing_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <!-- <el-row style="margin-bottom: 12px;">
+          <span>物料类别</span>
+        </el-row>
+        <el-row style="margin-bottom: 12px;">
+          <el-button type="primary" size="small" plain @click="addLine">新增</el-button>
+          <el-button type="primary" size="small" plain @click="handleDelete">删除</el-button>
+          <el-button type="primary" size="small" plain @click="testsave">暂存</el-button>
+        </el-row> -->
+        <!-- <el-row>
+          <el-col :span="12">
+            <el-table 
+            :data="basicForm2.medicineTypeChanges"
+            class="request-table"
+            @selection-change="handleSelectionChange"
+            >
+              <el-table-column type="selection" width="55" />
+              <el-table-column label="序号" align="center" prop="sort">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.sort"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="物料类别" align="center" prop="medicineCode">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.medicineCode"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="类别名称" align="center" prop="medicineName">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.medicineName"></el-input>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </el-row> -->
+      </el-tab-pane>
+
+      <el-tab-pane label="修改记录" name="third">
+        <el-table 
+          :data="basicForm.changeRecords"
+          class="request-table"
+          >
+          <el-table-column label="字段名称" align="center" prop="pageCondtion" />
+          <el-table-column label="变更前" align="center" prop="beforeChangeValue" />
+          <el-table-column label="变更后" align="center" prop="afterChangeValue" />
+        </el-table>
+      </el-tab-pane>
+
+      <el-tab-pane label="单据信息" name="fourth">
+        <el-form :model="basicForm" ref="info" label-width="160px">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="申请人" prop="createBy">
+                <el-input v-model="basicForm.createBy"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="申请时间" prop="applicationTime">
+                <el-input v-model="basicForm.applicationTime"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="创建人" prop="createBy">
+                <el-input v-model="basicForm.createBy"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="创建时间" prop="createTime">
+                <el-input v-model="basicForm.createTime"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="最后修改人" prop="updateBy">
+                <el-input v-model="basicForm.updateBy"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="最后修改时间" prop="updateTime">
+                <el-input v-model="basicForm.updateTime"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="最后审核人" prop="approver">
+                <el-input v-model="basicForm.approver"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="最后审核时间" prop="approvalTime">
+                <el-input v-model="basicForm.approvalTime"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="单据状态" prop="status">
+                <el-input v-model="basicForm.status"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <span>物料类别</span>
       </el-tab-pane>
-      <el-tab-pane label="修改记录" name="third">修改记录</el-tab-pane>
-      <el-tab-pane label="单据信息" name="fourth">单据信息</el-tab-pane>
     </el-tabs>
 
     <div class="btn_group">
@@ -147,12 +313,26 @@
         <el-button type="primary" size="small" plain @click="back">返回</el-button>
       </el-col>
     </div>
+
+    <popDialog
+      ref="contractSelect"
+      @doSubmit="selectionsToInput"
+      :selectData="selectData"
+      :single="true"
+    />
+
   </div>
 </template>
 
 <script>
+import popDialog from '@/components/PopDialog/index.vue'
+import { addChangeList, getMaterialDetails } from '@/api/changeApply/basic'
 export default {
   name: 'applyAdd',
+  dicts: ['sys_storage_condition', 'sys_conditions_carriage', 'sys_medicine', 'medical_instruments', 'curing_type'],
+  components: {
+    popDialog
+  },
   model: {
     prop: 'isList',
     event: 'jugislist'
@@ -161,20 +341,182 @@ export default {
     return{
       tabValue: 'first',
       basicForm: {
-        code: ''
+        code: '',
+        orgId: '',
+        // 物料id
+        materialId:'',
+        materialCode: '',
+        materialName: '',
+        medicineMaterial: '',
+        oneClass: '',
+        twoClass: '',
+        threeClass: '',
+        fourClass: '',
+        specification: '',
+        model: '',
+        factory: '',
+        registrant: '',
+        storageConditions: '',
+        transportCondition: '',
+        leadTime: '',
+        remark: '',
+        // 修改记录
+        changeRecords: [],
+        // 单据信息字段
+        createBy: '',
+        applicationTime: '',
+        createTime:'',
+        updateBy: '',
+        updateTime: '',
+        approver: '',
+        approvalTime: '',
+        status: ''
+      },
+      options: [{
+        value: '0',
+        label: '是'
+      },{
+        value: '2',
+        label: '否'
+      }],
+      basicRules: {},
+      basicForm2: {
+        drug: '',
+        registrationNo: '',
+        medicalDevices: '',
+        maintenanceType: '',
+        // 医药属性子表
+        // medicineTypeChanges:[
+        // ],
       },
-      basicRules: {}
+      // tableList: [],
+      tableList2: [],
+      // 子表选中
+      ids: [],
+      // 弹窗
+      name: '',
+      selectData: []
     }
   },
+  // 监听
+  // watch: {
+  //   value: {
+  //     handler (newVal) {
+  //       this.selectData = []
+  //       if (newVal) {
+  //         newVal.split(',').forEach((id) => { // 回显拿数据
+  //           this.contractService.queryById(id).then(({data}) => {
+  //             if (data && data.id !== '') {
+  //               this.selectData.push(data)
+  //             }
+  //           })
+  //         })
+  //       }
+  //     },
+  //     immediate: true,
+  //     deep: false
+  //   },
+  //   selectData: {
+  //     handler (newVal) {
+  //       this.name = newVal.map(contract => contract.contractName).join(',')
+  //     },
+  //     immediate: false,
+  //     deep: false
+  //   }
+  // },
   methods: {
     handleClick(tab, event) {
       console.log(tab, event);
     },
-    save() {},
-    submit() {},
+    save() {
+      alert('保存传status：0')
+      let sparams = {...this.basicForm, ...{status: 0}}
+      sparams.medicineChange = this.basicForm2
+      console.log('参数', sparams)
+      addChangeList(sparams).then(res => {
+
+      })
+    },
+    submit() {
+      alert('提交传status：1')
+    },
     back() {
       this.$emit('jugislist', true)
     },
+    // 子表增删行
+    // handleSelectionChange(val) {
+    //   this.ids = val
+    //   console.log('this.ids',this.ids)
+    // },
+    // addLine() {
+    //   //添加行数
+    //   let newValue = {
+    //     sort:'',
+    //     medicineCode: '',
+    //     medicineName: '',
+    //   };
+    //   this.basicForm2.medicineTypeChanges.push(newValue);
+    // },
+    // handleDelete(index) {
+    //   if(this.ids.length == 0) {
+    //     this.$message({
+    //       message: '请选择删除条目',
+    //       type: 'warning'
+    //     });
+    //   } else {
+    //     // console.log('index',index)
+    //     // this.basicForm2.medicineTypeChanges.splice(index, 1);
+    //     this.basicForm2.medicineTypeChanges = this.basicForm2.medicineTypeChanges.filter(item =>
+    //      !this.ids.some(ele =>
+    //      ele.sort == item.sort))
+    //   }
+    // },
+    // testsave() {
+    //   console.log('暂存表格：', this.basicForm2.medicineTypeChanges)
+    //   console.log('暂存表单1', this.basicForm)
+    //   let params = {...this.basicForm, ...this.basicForm2}
+    //   console.log('暂存总表单', params)
+    // },
+    // 设置选中
+    selectionsToInput (selections) {
+      console.log('父组件拿到的：', selections)
+      this.selectData = selections
+      this.$emit('getInfo', this.selectData)
+      getMaterialDetails(selections[0].id).then(res => {
+        console.log('res',res)
+        if (res.code === 200) {
+          let data = res.data.data
+          // 物料id
+          this.basicForm.materialId = data.id
+          // 物料分类Id
+          this.basicForm.materialClassifyId = data.classifyId
+          this.basicForm.materialCode = data.code
+          this.basicForm.materialName = data.name
+          this.basicForm.medicineMaterial = data.isMedicine
+          this.basicForm.oneClass = data.oneClass
+          this.basicForm.twoClass = data.twoClass
+          this.basicForm.threeClass = data.threeClass
+          this.basicForm.fourClass = data.fourClass
+          this.basicForm.specification = data.specification
+          this.basicForm.model = data.model
+          this.basicForm.registrant = data.registrant
+          this.basicForm.storageConditions = data.storageCondition
+          this.basicForm.transportCondition = data.transportationCondition
+          this.basicForm.remark = data.deliveryPeriod
+          if(data.medcines.length !== 0) {
+            this.basicForm2.drug = data.medcines[0].isDrug
+            this.basicForm2.registrationNo = data.medcines[0].registrationNo
+            this.basicForm2.medicalDevices = data.medcines[0].medicalInstruments
+            this.basicForm2.maintenanceType = data.medcines[0].curingType
+          }
+        }
+      })
+    },
+    // 显示列表
+    test01() {
+      console.log('测试点击')
+      this.$refs.contractSelect.init()
+    }
   }
 }
 </script>

src/views/material/changeApply/index.vue

@@ -66,27 +66,29 @@
       <el-table 
         :data="tableList" 
         class="request-table"
+        fit
+        max-height="680"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" />
         <el-table-column label="序号" align="center" prop="sort" />
-        <el-table-column label="申请组织" align="center" prop="attributeName" />
-        <el-table-column label="单据编码" align="center" prop="classCode" />
-        <el-table-column label="申请人" align="center" prop="fieldType" />
-        <el-table-column label="申请时间" align="center" prop="dictId" />
-        <el-table-column label="单据状态" align="center" prop="fieldDesc" />
-        <el-table-column label="物料编码" align="center" prop="fieldDesc" />
-        <el-table-column label="物料名称" align="center" prop="fieldDesc" />
-        <el-table-column label="最后审批人" align="center" prop="fieldDesc" />
-        <el-table-column label="最后审核时间" align="center" prop="fieldDesc" />
-        <el-table-column label="创建人" align="center" prop="fieldDesc" />
-        <el-table-column label="创建时间" align="center" prop="fieldDesc" />
-        <el-table-column label="最后修改人" align="center" prop="fieldDesc" />
-        <el-table-column label="最后修改时间" align="center" prop="fieldDesc" />
+        <el-table-column label="申请组织" align="center" prop="orgId" />
+        <el-table-column label="单据编码" align="center" width="200" prop="code" />
+        <el-table-column label="申请时间" align="center" width="150" prop="applicationTime" />
+        <el-table-column label="单据状态" align="center" prop="status" :formatter="statusJug" />
+        <el-table-column label="物料编码" align="center" width="150" prop="materialCode" />
+        <el-table-column label="物料名称" align="center" prop="materialName" />
+        <el-table-column label="最后审批人" align="center" width="120" prop="approver" />
+        <el-table-column label="最后审核时间" align="center" width="150" prop="approvalTime" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" width="150" prop="createTime" />
+        <el-table-column label="最后修改人" align="center" width="120" prop="updateBy" />
+        <el-table-column label="最后修改时间" align="center" width="150" prop="updateTime" />
         <el-table-column
           fixed="right"
           label="操作"
           align="center"
+          width="150"
           >
           <template slot-scope="scope">
             <el-button type="text" size="small">查看</el-button>
@@ -99,11 +101,10 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-sizes="[100, 200, 300, 400]"
-        :page-size="100"
+        :page-sizes="[5, 10, 15, 20]"
+        :page-size=queryParams.pageSize
         layout="total, sizes, prev, pager, next, jumper"
-        :total="100"
+        :total="total"
         style="text-align: center;">
       </el-pagination>
     </el-card>
@@ -115,6 +116,7 @@
 
 <script>
 import addApply from './add.vue';
+import { getChangeList } from '@/api/changeApply/basic'
 export default {
   name: 'changeApply',
   components: {
@@ -129,17 +131,44 @@ export default {
       input: '',
       // 
       tableList: [],
-      currentPage: 2,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      total:0,
       // isComponent
       isComponent:'addApply',
       isList: true
     }
   },
+  created() {
+    this.getList(this.queryParams)
+  },
   methods: {
     addApply() {
       this.isList = false
       this.isComponent = 'addApply'
     },
+    getList(val) {
+      getChangeList(val).then(res => {
+        if (res.code === 200) {
+          this.tableList = res.rows
+          this.total = res.total
+        }
+      })
+    },
+    // 表格内状态栏判断值
+    statusJug(row) {
+      if (row.status === 0) {
+        return '未提交'
+      } else if (row.status === 1) {
+        return '审批中'
+      } else if (row.status === 2) {
+        return '已完成'
+      } else if (row.status === 3) {
+        return '已驳回'
+      }
+    },
     // 
     handleSelectionChange () {
 
@@ -148,10 +177,14 @@ export default {
 
     },
     handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
+      console.log(`每页 ${val} 条`);
+      this.queryParams.pageSize = val
+      this.getList(this.queryParams)
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
+      this.queryParams.pageNum = val
+      this.getList(this.queryParams)
     }
   }
 }