修改耗材管理；

新增承接合同评审日期修改功能

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -306,7 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="major != null">major = #{major},</if>
 			<if test="degree != null">degree = #{degree},</if>
 			<if test="contractSign != null">contract_sign = #{contractSign},</if>
-			<if test="contractExpire != null">contract_expire = #{contractExpire},</if>
+			contract_expire = #{contractExpire},
 			<if test="homePlace != null">home_place = #{homePlace},</if>
  			update_time = sysdate()
  		</set>

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -696,7 +696,7 @@ export default {
             if (res.rows)
               this.paymentList = res.rows;
           });
-          listContractComment({ contractId: this.taskForm.formId }).then(res => {
+          listContractComment({ pageNum: 1, pageSize: 100, contractId: this.taskForm.formId }).then(res => {
             if (res.rows && res.rows.length != 0) {
               this.commentList = res.rows;
               for (let comment of this.commentList) {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 09:05:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-24 15:01:08
+ * @LastEditTime: 2024-08-06 14:38:13
 -->
 <template>
   <div class="app-container">
@@ -15,26 +15,6 @@
         <el-input v-model="queryParams.contractCode" placeholder="请输入合同编码" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <!-- <el-form-item label="合同编号" prop="contractNumber">
-        <el-input v-model="queryParams.contractNumber" placeholder="请输入合同编号" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="拟稿人" prop="drafter">
-        <el-select v-model="queryParams.drafter" filterable clearable>
-          <el-option :key="item.userId" v-for="item of $store.state.user.userList" :label="item.nickName"
-            :value="item.userId"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="拟稿日期" prop="draftTime">
-        <el-date-picker clearable v-model="queryParams.draftTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择拟稿日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="签订日期" prop="signDate">
-        <el-date-picker clearable v-model="queryParams.signDate" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择签订日期">
-        </el-date-picker>
-      </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>
@@ -81,12 +61,12 @@
           </el-link>
         </template>
       </el-table-column>
-      <el-table-column label="拟稿日期" align="center" prop="draftTime" width="180">
+      <el-table-column label="拟稿日期" align="center" prop="draftTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="签订日期" align="center" prop="signDate" width="180">
+      <el-table-column label="签订日期" align="center" prop="signDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.signDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -116,9 +96,9 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
             v-hasPermi="['oa:contract:query']">查看</el-button>
-          <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:contract:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+          <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['oa:contract:remove']">删除</el-button> -->
         </template>
       </el-table-column>
@@ -128,43 +108,78 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc合同评审对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="合同编号" prop="contractNumber">
-          <el-input v-model="form.contractNumber" placeholder="请输入合同编号" />
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-form-item label="合同名称" prop="contractName">
+          {{ form.contractName }}
         </el-form-item>
-        <el-form-item label="合同金额" prop="amount">
-          <el-input v-model="form.amount" placeholder="请输入合同金额" />
-        </el-form-item>
-        <el-form-item label="履约保证金" prop="deposit">
-          <el-input v-model="form.deposit" placeholder="请输入履约保证金" />
-        </el-form-item>
-        <el-form-item label="合同文件" prop="contractDocument">
-          <el-input v-model="form.contractDocument" placeholder="请输入合同文件" />
-        </el-form-item>
-        <el-form-item label="拟稿人" prop="drafter">
-          <el-input v-model="form.drafter" placeholder="请输入拟稿人" />
+        <el-form-item label="合同编号" prop="contractNumber">
+          {{ form.contractNumber }}
         </el-form-item>
         <el-form-item label="拟稿日期" prop="draftTime">
           <el-date-picker clearable v-model="form.draftTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择拟稿日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="合同备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入合同备注" />
+        <el-form-item label="分管审批日期" prop="managerTime">
+          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择分管审批日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总经理审批日期" prop="gmTime">
+          <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择总经理审批日期">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="签订日期" prop="signDate">
           <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="签订备注" prop="signRemark">
-          <el-input v-model="form.signRemark" placeholder="请输入签订备注" />
+        <el-form-item label="评审方式">
+          <el-tag :type="form.commentType == '2' ? 'success' : 'warning'">
+            {{ getCommentType(form.commentType) }}</el-tag>
         </el-form-item>
-        <el-form-item label="签订扫描件" prop="signScan">
-          <el-input v-model="form.signScan" placeholder="请输入签订扫描件" />
+        <el-form-item label="" label-width="0" v-if="form.commentType == '2'">
+          <table border="1" style="width:100%;">
+            <tr>
+              <td style="width: 50px;">序号</td>
+              <td>会审部门</td>
+              <td>会审人</td>
+              <td>会审意见</td>
+              <td style="width: 200px;">会审附件</td>
+              <!-- <td style="width: 90px;">签名</td> -->
+              <td style="width: 100px;">日期</td>
+            </tr>
+            <tr v-for="(comment, index) in commentList" :key="index">
+              <td>
+                {{ index + 1 }}
+              </td>
+              <td>
+                {{ getDeptName(comment.deptId) }}
+              </td>
+              <td>
+                {{ getUserName(comment.userId) }}
+              </td>
+              <td>
+                {{ comment.comment }}
+              </td>
+              <td>
+                <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + comment.document}`)">
+                  {{ getFileName(comment.document) }}
+                </el-link>
+              </td>
+              <!-- <td>
+                <span class="auditor">{{ comment.commentUser ? comment.commentUser.nickName : '' }}</span>
+              </td> -->
+              <td>
+                <el-date-picker v-model="comment.commentTime" type="date" value-format="yyyy-MM-dd" style="width:140px;"
+                  placeholder="选择日期"></el-date-picker>
+              </td>
+            </tr>
+          </table>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer text-center">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -173,7 +188,6 @@
     <el-dialog :title="title" :visible.sync="openInfo" width="80%" append-to-body>
       <!-- <contract-info :form="form"></contract-info> -->
       <contract-form :taskForm="taskForm" :taskName="''" :flowDisabled="false"></contract-form>
-
     </el-dialog>
   </div>
 </template>
@@ -186,6 +200,7 @@ import { listDefinition } from "@/api/flowable/definition";
 import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
 import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
+import { listContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
 export default {
   components: { contractInfo, ContractForm },
   name: "Contract",
@@ -232,7 +247,9 @@ export default {
       rules: {
       },
       project: {},
-      taskForm: {}
+      taskForm: {},
+      commentList: [],
+      commentOpen: false,
     };
   },
   created() {
@@ -313,12 +330,16 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
       const contractId = row.contractId || this.ids
       getContract(contractId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc合同评审";
+        this.title = "修改承接合同评审_日期";
+        listContractComment({ pageNum: 1, pageSize: 100, contractId: contractId }).then(res => {
+          if (res.rows && res.rows.length != 0) {
+            this.commentList = res.rows;
+          }
+        })
       });
     },
     // 登记合同
@@ -398,6 +419,9 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.contractId != null) {
+            for (let comment of this.commentList) {
+              updateContractComment(comment);
+            }
             updateContract(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -432,3 +456,17 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+</style>

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

@@ -1,61 +1,31 @@
 <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="耗材id" prop="materialId">
-        <el-input
-          v-model="queryParams.materialId"
-          placeholder="请输入耗材id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="耗材名称" prop="materialId">
+        <el-select v-model="queryParams.materialId" filterable clearable remote reserve-keyword placeholder="请输入耗材名称"
+          :remote-method="remoteMethod" :loading="remoteLoading" style="width:300px;">
+          <el-option v-for="item in materialList" :key="item.materialId" :label="item.name"
+            :value="item.materialId">
+            <span style="float: left">{{ item.name }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.brand }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.series }}</span>
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="采购日期" prop="buyTime">
-        <el-date-picker clearable
-          v-model="queryParams.buyTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.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="queryParams.place"
-          placeholder="请输入采购地点"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采购数量" prop="totalNum">
-        <el-input
-          v-model="queryParams.totalNum"
-          placeholder="请输入采购数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总价" prop="amount">
-        <el-input
-          v-model="queryParams.amount"
-          placeholder="请输入总价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.place" placeholder="请输入采购地点" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="采购人" prop="buyer">
-        <el-input
-          v-model="queryParams.buyer"
-          placeholder="请输入采购人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.buyer" filterable clearable @keyup.enter.native="handleQuery">
+          <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>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -65,46 +35,20 @@
 
     <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:materialBuy:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:materialBuy: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:materialBuy:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:materialBuy: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:materialBuy:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:materialBuy: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:materialBuy:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:materialBuy:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -112,7 +56,7 @@
     <el-table v-loading="loading" :data="materialBuyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="耗材购买id" align="center" prop="buyId" /> -->
-      <!-- <el-table-column label="耗材id" align="center" prop="materialId" /> -->      
+      <!-- <el-table-column label="耗材id" align="center" prop="materialId" /> -->
       <el-table-column label="耗材品牌" align="center" prop="material.brand" />
       <el-table-column label="耗材名称" align="center" prop="material.name" />
       <el-table-column label="规格型号" align="center" prop="material.series" />
@@ -129,63 +73,50 @@
       <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:materialBuy:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:materialBuy:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:materialBuy:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:materialBuy:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改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="耗材id" prop="materialId">
-          <el-input v-model="form.materialId" placeholder="请输入耗材id" />
+        <el-form-item label="耗材名称" prop="materialId">
+          <el-tag v-if="chooseM.name">{{ chooseMname }}</el-tag>
+          <el-button type="primary" @click="materialOpen = true" size="mini">耗材选择</el-button>
         </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 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 v-model="form.totalNum" placeholder="请输入采购数量" />
+          <el-input-number :controls="false" v-model="form.totalNum" placeholder="请输入采购数量" @blur="computeAmount()" />
         </el-form-item>
         <el-form-item label="单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入单价" />
+          <el-input-number :controls="false" v-model="form.price" placeholder="请输入单价" @blur="computeAmount()" />
         </el-form-item>
         <el-form-item label="总价" prop="amount">
-          <el-input v-model="form.amount" placeholder="请输入总价" />
+          <!-- <el-input v-model="form.amount" placeholder="请输入总价" /> -->
+          <el-tag>{{ form.amount }}</el-tag>
         </el-form-item>
         <el-form-item label="采购人" prop="buyer">
-          <el-input v-model="form.buyer" placeholder="请输入采购人" />
+          <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" placeholder="请输入备注" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -193,18 +124,25 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="选择耗材" :visible.sync="materialOpen" width="60%" append-to-body>
+      <choose-materal @confirmChoose="confirmMaterial"></choose-materal>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listMaterialBuy, getMaterialBuy, delMaterialBuy, addMaterialBuy, updateMaterialBuy } from "@/api/oa/material/materialBuy";
+import { listMaterial, getMaterial } from "@/api/oa/material/material";
+import ChooseMateral from './chooseMateral.vue';
 
 export default {
   name: "MaterialBuy",
+  components: { ChooseMateral },
   data() {
     return {
       // 遮罩层
       loading: true,
+      remoteLoading: true,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -237,7 +175,26 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+        materialId: [
+          { required: true, message: '请选择耗材', trigger: 'blur' }
+        ],
+        buyTime: [
+          { required: true, message: '请选择采购日期', trigger: 'change' }
+        ],
+        totalNum: [
+          { required: true, message: '请输入采购数量', trigger: 'blur' }
+        ],
+        price: [
+          { required: true, message: '请输入采购单价', trigger: 'blur' }
+        ],
+        buyer: [
+          { required: true, message: '请选择采购人', trigger: 'change' }
+        ]
+      },
+      materialOpen: false,
+      chooseM: {},
+      chooseMname: '',
+      materialList: []
     };
   },
   created() {
@@ -286,23 +243,26 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.buyId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc耗材购买";
+      this.chooseM = {};
+      this.title = " 新增耗材购买信息";
+      this.computeAmount();
     },
     /** 修改按钮操作 */
     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 = "修改cmc耗材购买";
+        this.title = "修改耗材购买信息";
       });
     },
     /** 提交按钮 */
@@ -328,18 +288,55 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const buyIds = row.buyId || this.ids;
-      this.$modal.confirm('是否确认删除cmc耗材购买编号为"' + buyIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc耗材购买编号为"' + buyIds + '"的数据项？').then(function () {
         return delMaterialBuy(buyIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download('oa/materialBuy/export', {
         ...this.queryParams
       }, `materialBuy_${new Date().getTime()}.xlsx`)
+    },
+    computeAmount() {
+      let amount = (this.form.totalNum * this.form.price).toFixed(2);
+      console.log(amount);
+      this.$set(this.form, 'amount', amount);
+      this.$set(this.form, 'buyer', 17);
+    },
+    confirmMaterial(row) {
+      if (row) {
+        this.chooseM = row;
+        let brand = row.brand
+        let name = row.name
+        let series = row.series
+        if (brand && series) {
+          this.chooseMname = name + '-' + brand + '（' + series + '）'
+        } else if (brand == null && series != null) {
+          this.chooseMname = name + '（' + series + '）'
+        } else if (brand != null && series == null) {
+          this.chooseMname = name + '-' + brand
+        } else {
+          this.chooseMname = name
+        }
+        this.form.materialId = row.materialId;
+        this.materialOpen = false;
+        if (this.$refs.form)
+          this.$refs.form.validateField('materialId')
+      }
+    },
+    remoteMethod(val) {
+      listMaterial({
+        pageNum: 1,
+        pageSize: 20,
+        name: val
+      }).then(response => {
+        this.materialList = response.rows;
+        this.remoteLoading = false;
+      });
     }
   }
 };

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

@@ -0,0 +1,134 @@
+<template>
+  <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-table v-loading="loading" :data="materialList" highlight-current-row @row-dblclick="chooseClick">
+      <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>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    
+    <div class="text-center mt20">
+      <el-button type="primary">确认选择</el-button>
+      <el-button>清空选择</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/oa/material/material";
+export default {
+  name: "Material",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc耗材信息表格数据
+      materialList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        type: null,
+        series: null,
+        brand: null,
+        place: null,
+        remain: null,
+        unit: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc耗材信息列表 */
+    getList() {
+      this.loading = true;
+      listMaterial(this.queryParams).then(response => {
+        this.materialList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        materialId: null,
+        name: null,
+        type: null,
+        series: null,
+        brand: null,
+        place: null,
+        remain: null,
+        unit: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    chooseClick(val){
+      this.$emit('confirmChoose',val)
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -1,45 +1,34 @@
 <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="耗材id" prop="materialId">
-        <el-input
-          v-model="queryParams.materialId"
-          placeholder="请输入耗材id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="耗材名称" prop="materialId">
+        <el-select v-model="queryParams.materialId" filterable clearable remote reserve-keyword placeholder="请输入耗材名称"
+          :remote-method="remoteMethod" :loading="remoteLoading" style="width:300px;">
+          <el-option v-for="item in materialList" :key="item.materialId" :label="item.name" :value="item.materialId">
+            <span style="float: left">{{ item.name }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.brand }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.series }}</span>
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="发放时间" prop="giveTime">
-        <el-date-picker clearable
-          v-model="queryParams.giveTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.giveTime" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择发放时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="领用人" prop="accepter">
-        <el-input
-          v-model="queryParams.accepter"
-          placeholder="请输入领用人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.accepter" filterable clearable @keyup.enter.native="handleQuery">
+          <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-input
-          v-model="queryParams.useDept"
-          placeholder="请输入领用部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="领用数量" prop="giveNum">
-        <el-input
-          v-model="queryParams.giveNum"
-          placeholder="请输入领用数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.useDept" filterable clearable @keyup.enter.native="handleQuery">
+          <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>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -49,46 +38,20 @@
 
     <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:materialGive:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:materialGive: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:materialGive:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:materialGive: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:materialGive:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:materialGive: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:materialGive:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:materialGive:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -111,57 +74,47 @@
       <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:materialGive:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:materialGive:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:materialGive:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:materialGive:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改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="耗材id" prop="materialId">
-          <el-input v-model="form.materialId" placeholder="请输入耗材id" />
+        <el-form-item label="耗材名称" prop="materialId">
+          <el-tag v-if="chooseM.name">{{ chooseMname }}</el-tag>
+          <el-button type="primary" @click="materialOpen = true" size="mini">耗材选择</el-button>
         </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 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-input v-model="form.accepter" placeholder="请输入领用人" />
+          <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-input v-model="form.useDept" placeholder="请输入领用部门" />
+        <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 v-model="form.giveNum" placeholder="请输入领用数量" />
+          <el-input-number :controls="false" v-model="form.giveNum" 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">
@@ -169,14 +122,20 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="选择耗材" :visible.sync="materialOpen" width="60%" append-to-body>
+      <choose-materal @confirmChoose="confirmMaterial"></choose-materal>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listMaterialGive, getMaterialGive, delMaterialGive, addMaterialGive, updateMaterialGive } from "@/api/oa/material/materialGive";
+import { listMaterial, getMaterial } from "@/api/oa/material/material";
+import ChooseMateral from './chooseMateral.vue';
 
 export default {
   name: "MaterialGive",
+  components: { ChooseMateral },
   data() {
     return {
       // 遮罩层
@@ -211,7 +170,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      remoteLoading: true,
+      materialList: [],
+      materialOpen: false,
+      chooseM: {},
+      chooseMname: '',
     };
   },
   created() {
@@ -258,23 +222,25 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.giveId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc耗材发放";
+      this.chooseM = {};
+      this.title = "新增耗材发放记录";
     },
     /** 修改按钮操作 */
     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 = "修改cmc耗材发放";
+        this.title = "修改耗材发放记录";
       });
     },
     /** 提交按钮 */
@@ -300,19 +266,50 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const giveIds = row.giveId || this.ids;
-      this.$modal.confirm('是否确认删除cmc耗材发放编号为"' + giveIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc耗材发放编号为"' + giveIds + '"的数据项？').then(function () {
         return delMaterialGive(giveIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download('oa/materialGive/export', {
         ...this.queryParams
       }, `materialGive_${new Date().getTime()}.xlsx`)
-    }
+    },
+    remoteMethod(val) {
+      listMaterial({
+        pageNum: 1,
+        pageSize: 20,
+        name: val
+      }).then(response => {
+        this.materialList = response.rows;
+        this.remoteLoading = false;
+      });
+    },
+    confirmMaterial(row) {
+      if (row) {
+        this.chooseM = row;
+        let brand = row.brand
+        let name = row.name
+        let series = row.series
+        if (brand && series) {
+          this.chooseMname = name + '-' + brand + '（' + series + '）'
+        } else if (brand == null && series != null) {
+          this.chooseMname = name + '（' + series + '）'
+        } else if (brand != null && series == null) {
+          this.chooseMname = name + '-' + brand
+        } else {
+          this.chooseMname = name
+        }
+        this.form.materialId = row.materialId;
+        this.materialOpen = false;
+        if (this.$refs.form)
+          this.$refs.form.validateField('materialId')
+      }
+    },
   }
 };
 </script>

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

@@ -1,6 +1,14 @@
 <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"
@@ -33,22 +41,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="剩余数量" prop="remain">
-        <el-input
-          v-model="queryParams.remain"
-          placeholder="请输入剩余数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          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>
@@ -103,7 +95,7 @@
 
     <el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="耗材id" align="center" prop="materialId" />
+      <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" />

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

@@ -105,6 +105,8 @@
       selectDictLabel(dict.type.sys_user_salarylevel, scope.row.salaryLevel) }}
             </template>
           </el-table-column>
+          <el-table-column label="职务" align="center" key="postName" prop="postName" v-if="columns[17].visible"
+            :show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="职称" align="center" key="titles" prop="titles" v-if="columns[6].visible"
             :show-overflow-tooltip="true">
             <template slot-scope="scope">
@@ -120,7 +122,12 @@
           <el-table-column label="政治面貌" align="center" key="politicalAffiliation"
             :formatter="formatterPoliticalAffiliation" prop="politicalAffiliation" v-if="columns[14].visible" />
           <el-table-column label="民族" align="center" key="ethnic" prop="ethnic" v-if="columns[15].visible" />
-
+          <el-table-column label="入职时间" align="center" key="entryDate" prop="entryDate" v-if="columns[16].visible"
+            :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.entryDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="合同签订" align="center" key="contractSign" prop="contractSign" v-if="columns[7].visible"
             :show-overflow-tooltip="true">
             <template slot-scope="scope">
@@ -278,8 +285,8 @@
                   :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位" style="width:100%;">
+            <el-form-item label="职务">
+              <el-select v-model="form.postIds" multiple placeholder="请选择职务" style="width:100%;">
                 <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
                   :disabled="item.status == 1"></el-option>
               </el-select>
@@ -435,6 +442,8 @@ export default {
         { key: 13, label: `籍贯`, visible: false },
         { key: 14, label: `政治面貌`, visible: false },
         { key: 15, label: `民族`, visible: false },
+        { key: 16, label: `入职时间`, visible: true },
+        { key: 17, label: `职务`, visible: false },
       ],
       // 表单校验
       rules: {
@@ -465,7 +474,8 @@ export default {
         ]
       },
       certificates: '',
-      postSalary: ''
+      postSalary: '',
+      postData:''
     };
   },
   watch: {
@@ -487,6 +497,9 @@ export default {
       this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.userList = response.rows;
+        this.userList.forEach(user => {
+          this.getPostByUser(user)
+        })
         this.total = response.total;
         this.loading = false;
       }
@@ -801,6 +814,21 @@ export default {
     formatterPoliticalAffiliation(row) {
       let v = this.selectDictLabels(this.dict.type.sys_user_political, row.politicalAffiliation, ',')
       return v
+    },
+    async getPostByUser(row){
+      const userId = row.userId || this.ids;
+      let resData = await getUser(userId);
+      let postArr = [];
+      for (let post of resData.posts) {
+        for (let postid of resData.postIds) {
+          if (postid == post.postId) {
+            postArr.push(post.postName)
+          }
+        }
+      }
+      let postStr = postArr.join('/');
+      this.$set(row,'postName',postStr)
+      
     }
   }
 };