修改耗材信息首页

oa-ui/src/views/oa/declare/index.vue

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-08-14 14:24:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-21 15:00:50
+ * @LastEditTime: 2024-10-21 17:31:27
 -->
 <template>
   <div class="app-container">
@@ -161,7 +161,7 @@
           <el-input v-model="form.coefficient" placeholder="请输入系数" @blur="predictMoney(this.form)" />
         </el-form-item>
         <el-form-item label="预估绩效">
-         <el-tag type="warning">{{ predictMoney(this.form) }}</el-tag>
+          <el-tag type="warning">{{ predictMoney(this.form) }}</el-tag>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -232,7 +232,9 @@ export default {
     /** 查询工作填报列表 */
     getList() {
       this.loading = true;
-      this.queryParams.deptId = this.$store.getters.deptId;
+      if (this.$store.getters.deptId > 103) {
+        this.queryParams.deptId = this.$store.getters.deptId;
+      }
       listDeclare(this.queryParams).then(response => {
         this.declareList = response.rows;
         this.total = response.total;

oa-ui/src/views/oa/material/components/buyInfo.vue

@@ -0,0 +1,210 @@
+<template>
+  <div>
+    <el-empty description="请选择左边表格的耗材，显示对应的采购数据" v-if="!clickMaterial"></el-empty>
+    <el-row :gutter="10" class="mb8" v-if="clickMaterial">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:material:add']">新增</el-button>
+      </el-col>
+    </el-row>
+    <el-table v-loading="buyloading" :data="buyList" v-if="clickMaterial" height="300px">
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="采购日期" align="center" prop="buyTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.buyTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="采购地点" align="center" prop="place" />
+      <el-table-column label="采购数量" align="center" prop="totalNum" />
+      <el-table-column label="单价" align="center" prop="price" />
+      <el-table-column label="总价" align="center" prop="amount" />
+      <el-table-column label="采购人" align="center" prop="buyUser.nickName" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:buy:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:buy:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改cmc耗材购买对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="耗材名称" prop="materialId">
+          <el-tag>{{ clickMaterial }}</el-tag>
+        </el-form-item>
+        <el-form-item label="采购日期" prop="buyTime">
+          <el-date-picker clearable v-model="form.buyTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择采购日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="采购地点" prop="place">
+          <el-input v-model="form.place" placeholder="请输入采购地点" />
+        </el-form-item>
+        <el-form-item label="采购数量" prop="totalNum">
+          <el-input-number :controls="false" v-model="form.totalNum" placeholder="请输入采购数量" @blur="computeAmount()" />
+        </el-form-item>
+        <el-form-item label="单价" prop="price">
+          <el-input-number :controls="false" v-model="form.price" placeholder="请输入单价" @blur="computeAmount()" />
+        </el-form-item>
+        <el-form-item label="总价" prop="amount">
+          <el-tag>{{ form.amount }}</el-tag>
+        </el-form-item>
+        <el-form-item label="采购人" prop="buyer">
+          <el-select v-model="form.buyer" filterable clearable>
+            <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMaterialBuy, getMaterialBuy, delMaterialBuy, addMaterialBuy, updateMaterialBuy } from "@/api/oa/material/materialBuy";
+import ChooseMateral from '../chooseMateral.vue';
+export default {
+  components: { ChooseMateral },
+  props: {
+    clickRow: {
+      type: Object,
+      require: true,
+      default: {}
+    },
+    clickMaterial: {
+      type: String,
+      require: true,
+    }
+  },
+  data() {
+    return {
+      ids:[],
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      open: false,
+      title: '',
+      buyloading: false,
+      buyList: [],
+      form: {},
+      rules: {},
+    }
+  },
+  watch: {
+    clickRow: {
+      handler(newVal) {
+        if (newVal) {
+          this.getList();
+        }
+      },
+      immediate: true,  // 在绑定时立即执行一次  
+      deep: true       // 深度监听对象的变化  
+    },
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      listMaterialBuy({ pageSize: 999,materialId: this.clickRow.materialId }).then(res => {
+        this.buyList = res.rows;
+        this.buyTotal = res.total
+        this.buyloading = false
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.buyId != null) {
+            updateMaterialBuy(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.materialId = this.clickRow.materialId
+            addMaterialBuy(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.open = true;
+      this.title = " 新增耗材购买信息";
+      this.reset();
+      this.computeAmount();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        buyId: null,
+        materialId: null,
+        buyTime: null,
+        place: null,
+        totalNum: null,
+        price: null,
+        amount: null,
+        buyer: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.confirmMaterial(row.material)
+      const buyId = row.buyId || this.ids
+      getMaterialBuy(buyId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改耗材购买信息";
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const buyIds = row.buyId || this.ids;
+      this.$modal.confirm('是否确认删除cmc耗材购买编号为"' + buyIds + '"的数据项？').then(function () {
+        return delMaterialBuy(buyIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    computeAmount() {
+      let amount = (this.form.totalNum * this.form.price).toFixed(2);
+      this.$set(this.form, 'amount', amount);
+      this.$set(this.form, 'buyer', 17);
+    },
+    confirmMaterial(row) {
+      if (row) {
+        this.form.materialId = row.materialId;
+        if (this.$refs.form)
+          this.$refs.form.validateField('materialId')
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/oa/material/components/giveInfo.vue

@@ -0,0 +1,198 @@
+<template>
+  <div>
+    <el-empty description="请选择左边表格的耗材，显示对应的发放数据" v-if="!clickMaterial"></el-empty>
+    <el-row :gutter="10" class="mb8" v-if="clickMaterial">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:material:add']">新增</el-button>
+      </el-col>
+    </el-row>
+    <el-table v-loading="giveloading" :data="giveList" v-if="clickMaterial" height="300px">
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="发放时间" align="center" prop="giveTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.giveTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="领用人" align="center" prop="acceptUser.nickName" />
+      <el-table-column label="领用部门" align="center" prop="dept.deptName" />
+      <el-table-column label="领用数量" align="center" prop="giveNum" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:give:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:give:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改cmc耗材发放对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="耗材名称" prop="materialId">
+          <el-tag>{{ clickMaterial }}</el-tag>
+        </el-form-item>
+        <el-form-item label="发放时间" prop="giveTime">
+          <el-date-picker clearable v-model="form.giveTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择发放时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="领用人" prop="accepter">
+          <el-select v-model="form.accepter" filterable clearable>
+            <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="领用部门" prop="useDept">
+          <el-select v-model="form.useDept" filterable clearable>
+            <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="领用数量" prop="giveNum">
+          <el-input-number :controls="false" v-model="form.giveNum" placeholder="请输入领用数量" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMaterialGive, getMaterialGive, delMaterialGive, addMaterialGive, updateMaterialGive } from "@/api/oa/material/materialGive";
+export default {
+  props: {
+    clickRow: {
+      type: Object,
+      require: true,
+      default: {}
+    },
+    clickMaterial: {
+      type: String,
+      require: true,
+    }
+  },
+  data() {
+    return {
+      ids: [],
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      open: false,
+      title: '',
+      giveloading: false,
+      giveList: [],
+      giveTotal: 0,
+      form: {},
+      rules: {},
+    }
+  },
+  watch: {
+    clickRow: {
+      handler(newVal) {
+        if (newVal) {
+          this.getList();
+        }
+      },
+      immediate: true,  // 在绑定时立即执行一次  
+      deep: true       // 深度监听对象的变化  
+    },
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      listMaterialGive({ pageSize: 999, materialId: this.clickRow.materialId }).then(res => {
+        this.giveList = res.rows;
+        this.giveTotal = res.total
+        this.giveloading = false
+      })
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增耗材发放记录";
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        giveId: null,
+        materialId: null,
+        giveTime: null,
+        accepter: null,
+        useDept: null,
+        giveNum: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.confirmMaterial(row.material)
+      const giveId = row.giveId || this.ids
+      getMaterialGive(giveId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改耗材发放记录";
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.giveId != null) {
+            updateMaterialGive(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.materialId = this.clickRow.materialId
+            addMaterialGive(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const giveIds = row.giveId || this.ids;
+      this.$modal.confirm('是否确认删除cmc耗材发放编号为"' + giveIds + '"的数据项？').then(function () {
+        return delMaterialGive(giveIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    confirmMaterial(row) {
+      if (row) {
+        this.form.materialId = row.materialId;
+        if (this.$refs.form)
+          this.$refs.form.validateField('materialId')
+      }
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/oa/material/index.vue

@@ -1,72 +1,88 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-08-01 08:58:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-10-22 15:39:11
+-->
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="耗材编号" prop="materialId">
-        <el-input v-model="queryParams.materialId" placeholder="请输入耗材编号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="耗材名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入耗材名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="规格型号" prop="series">
-        <el-input v-model="queryParams.series" placeholder="请输入规格型号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="耗材品牌" prop="brand">
-        <el-input v-model="queryParams.brand" placeholder="请输入耗材品牌" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="存放地点" prop="place">
-        <el-input v-model="queryParams.place" placeholder="请输入存放地点" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['oa:material:add']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['oa:material:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['oa:material:remove']">删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['oa:material:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="耗材编号" align="center" prop="materialId" />
-      <el-table-column label="耗材名称" align="center" prop="name" />
-      <!-- <el-table-column label="耗材类别" align="center" prop="type" /> -->
-      <el-table-column label="规格型号" align="center" prop="series" />
-      <el-table-column label="耗材品牌" align="center" prop="brand" />
-      <el-table-column label="存放地点" align="center" prop="place" />
-      <el-table-column label="剩余数量" align="center" prop="remain" />
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:material:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:material:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+  <div class="app-container" style="height:95vh;background-color:#f0f4f7">
+    <div class="warpper">
+      <div class="left mr10">
+        <div class="titles mb20">耗材信息</div>
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="68px">
+          <el-form-item label="耗材名称" prop="name">
+            <el-input v-model="queryParams.name" placeholder="请输入耗材名称" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="规格型号" prop="series">
+            <el-input v-model="queryParams.series" placeholder="请输入规格型号" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="耗材品牌" prop="brand">
+            <el-input v-model="queryParams.brand" placeholder="请输入耗材品牌" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+              v-hasPermi="['oa:material:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+              v-hasPermi="['oa:material:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+              v-hasPermi="['oa:material:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+              v-hasPermi="['oa:material:export']">导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange" height="550px"
+          highlight-current-row @row-click="handleRow">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="耗材编号" align="center" prop="materialId" />
+          <el-table-column label="耗材名称" align="center" prop="name" />
+          <!-- <el-table-column label="耗材类别" align="center" prop="type" /> -->
+          <el-table-column label="规格型号" align="center" prop="series" />
+          <el-table-column label="耗材品牌" align="center" prop="brand" />
+          <el-table-column label="存放地点" align="center" prop="place" />
+          <el-table-column label="剩余数量" align="center" prop="remain" />
+          <el-table-column label="单位" align="center" prop="unit" />
+          <el-table-column label="备注" align="center" prop="remark" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['oa:material:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['oa:material:remove']">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :autoScroll="false"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </div>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+      <div class="right">
+        <div class="right-top">
+          <div class="titles">采购信息</div>
+          <div class="sub-title mb20">当前点击耗材：{{ clickMaterial ? clickMaterial : '未选择' }}</div>
+          <buy-info :clickRow="clickRow" :clickMaterial="clickMaterial"></buy-info>
+        </div>
+        <div class="right-bottom mt10">
+          <div class="titles">发放信息</div>
+          <div class="sub-title mb20">当前点击耗材：{{ clickMaterial ? clickMaterial : '未选择' }}</div>
+          <give-info :clickRow="clickRow" :clickMaterial="clickMaterial"></give-info>
+        </div>
+      </div>
+    </div>
 
-    <!-- 添加或修改cmc耗材信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="耗材名称" prop="name">
@@ -82,13 +98,14 @@
           <el-input v-model="form.place" placeholder="请输入存放地点" />
         </el-form-item>
         <el-form-item label="剩余数量" prop="remain">
-          {{ form.remain }}
+          <el-input v-model="form.remain" v-if="form.materialId"></el-input>
+          <span v-else>{{ form.remain }}</span>
         </el-form-item>
         <el-form-item label="单位" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入单位" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -101,30 +118,25 @@
 
 <script>
 import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/oa/material/material";
+import { listMaterialBuy, getMaterialBuy, delMaterialBuy, addMaterialBuy, updateMaterialBuy } from "@/api/oa/material/materialBuy";
+import { listMaterialGive, getMaterialGive, delMaterialGive, addMaterialGive, updateMaterialGive } from "@/api/oa/material/materialGive";
+import buyInfo from './components/buyInfo.vue';
+import GiveInfo from './components/giveInfo.vue';
 
 export default {
+  components: { buyInfo, GiveInfo },
   name: "Material",
   data() {
     return {
-      // 遮罩层
       loading: true,
-      // 选中数组
       ids: [],
-      // 非单个禁用
       single: true,
-      // 非多个禁用
       multiple: true,
-      // 显示搜索条件
       showSearch: true,
-      // 总条数
       total: 0,
-      // cmc耗材信息表格数据
       materialList: [],
-      // 弹出层标题
       title: "",
-      // 是否显示弹出层
       open: false,
-      // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 50,
@@ -136,11 +148,17 @@ export default {
         remain: null,
         unit: null,
       },
-      // 表单参数
       form: {},
-      // 表单校验
       rules: {
-      }
+      },
+      buyList: [],
+      buyloading: false,
+      buyTotal: 0,
+      giveList: [],
+      giveloading: false,
+      giveTotal: 0,
+      clickMaterial: undefined,
+      clickRow: {}
     };
   },
   created() {
@@ -244,7 +262,75 @@ export default {
       this.download('oa/material/export', {
         ...this.queryParams
       }, `material_${new Date().getTime()}.xlsx`)
+    },
+    handleRow(row) {
+      this.buyloading = true
+      let brand = row.brand
+      let name = row.name
+      let series = row.series
+      if (brand && series) {
+        this.clickMaterial = name + '-' + brand + '（' + series + '）'
+      } else if (brand == null && series != null) {
+        this.clickMaterial = name + '（' + series + '）'
+      } else if (brand != null && series == null) {
+        this.clickMaterial = name + '-' + brand
+      } else {
+        this.clickMaterial = name
+      }
+      this.clickRow = row
+      listMaterialGive({ materialId: row.materialId }).then(res => {
+        this.giveList = res.rows;
+        this.giveTotal = res.total
+        this.giveloading = false
+      })
     }
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.warpper {
+  width: 100%;
+  display: flex;
+
+  .titles {
+    font-family: 'puhuiti';
+    font-size: 18px;
+    line-height: 20px;
+    padding-left: 10px;
+    border-left: 3px solid var(--current-color);
+    // color: var(--current-color);
+  }
+
+  .sub-title {
+    font-size: 12px;
+    color: #a09a9a;
+    padding-left: 13px;
+  }
+
+  .left {
+    flex: 1;
+    background: #fff;
+    padding: 10px;
+    height: 810px;
+  }
+
+  .right {
+    flex: 1;
+
+    .right-top {
+      width: 100%;
+      height: 400px;
+      background: #fff;
+      padding: 10px;
+    }
+
+    .right-bottom {
+      width: 100%;
+      height: 400px;
+      background: #fff;
+      padding: 10px;
+    }
+  }
+}
+</style>