Merge branch 'master' of http://172.16.100.139/new-business/drp-web

src/api/business/spd/bo/iuapquery/basic.js

@@ -7,4 +7,13 @@ export function listCustomer(query) {
     method: 'get',
     params: query
   })
+}
+
+// 查询销售区域列表
+export function listSaleArea(query) {
+  return request({
+    url: '/mk/bo/iuapquery/saleAreaList',
+    method: 'get',
+    params: query
+  })
 }

src/api/requisition/basic.js

@@ -95,4 +95,12 @@ export function getOrgs(data) {
     method: 'get',
     params: data
   })
+}
+// 参照-药品类别(子表)
+export function getDrug(data) {
+  return request({
+    url: `/system/archival/queryMedcineItemDrug`,
+    method: 'post',
+    data: data
+  })
 }

src/components/PopDialog/drug.vue

@@ -0,0 +1,128 @@
+<template>
+  <div>
+    <el-dialog
+      title="药品类别"
+      width="500px"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+      v-dialogDrag
+      class="userDialog"
+      :visible.sync="visible"
+    >
+      <el-container style="height: 500px">
+        <el-container>
+          <el-main>
+            <el-row :gutter="10" class="content">
+              <el-col :span="12">
+                <el-input
+                  placeholder="输入关键字进行过滤"
+                  size="small"
+                  v-model="filterText">
+                </el-input>
+
+                <el-tree
+                  class="filter-tree"
+                  :data="threedata"
+                  :props="defaultProps"
+                  node-key="id"
+                  highlight-current
+                  @node-click="clickTree"
+                  :filter-node-method="filterNode"
+                  ref="tree">
+                </el-tree>
+              </el-col>
+            </el-row>
+          </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 { getDrug } from '@/api/requisition/basic'
+export default {
+  data() {
+    return {
+      loading: false,
+      visible: false,
+      filterText: '',
+      threedata: [],
+      defaultProps: {
+        children: 'childrens',
+        label: 'name'
+      },
+      // 判断是否为最末级节点
+      // isLast: false,
+      // 选中的节点
+      choosePoint: {}
+    };
+  },
+  props: {},
+  methods: {
+    init() {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.refreshList()
+      });
+    },
+    // 获取数据列表
+    refreshList(data) {
+      this.loading = true;
+      getDrug({}).then(res => {
+        console.log('res',res)
+        if(res.code === 200) {
+          this.threedata = res.data.tableBody
+        }
+        this.loading = false;
+      });
+    },
+    clickTree(data) {
+      console.log('树形节点信息：',data)
+      this.choosePoint = data
+    },
+    filterNode(value, data) {
+      console.log('value', value)
+      console.log('data', data)
+        if (!value) return true;
+        return data.label.indexOf(value) !== -1;
+    },
+    doSubmit() {
+      console.log('子组件选择的数据',this.choosePoint)
+      this.$emit("doSubmit", this.choosePoint);
+      this.visible = false;
+    },
+  },
+};
+</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/router/index.js

@@ -130,7 +130,9 @@ export const constantRoutes = [
     children: [
       {
         path: `detail/:id`,
-        component: () => import('@/views/material/basicFile/details')
+        name: 'materialDetail',
+        component: () => import('@/views/material/basicFile/details'),
+        meta: { title: '基本信息详情' }
       }
 
     ]

src/store/getters.js

@@ -12,8 +12,9 @@ const getters = {
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
   permission_routes: state => state.permission.routes,
-  topbarRouters:state => state.permission.topbarRouters,
-  defaultRoutes:state => state.permission.defaultRoutes,
-  sidebarRouters:state => state.permission.sidebarRouters,
+  topbarRouters: state => state.permission.topbarRouters,
+  defaultRoutes: state => state.permission.defaultRoutes,
+  sidebarRouters: state => state.permission.sidebarRouters,
+  query: state => state.query,
 }
 export default getters

src/store/index.js

@@ -7,6 +7,7 @@ import tagsView from './modules/tagsView'
 import permission from './modules/permission'
 import settings from './modules/settings'
 import getters from './getters'
+import query from './material/query'
 
 Vue.use(Vuex)
 
@@ -17,7 +18,8 @@ const store = new Vuex.Store({
     user,
     tagsView,
     permission,
-    settings
+    settings,
+    query
   },
   getters
 })

src/store/material/query.js

@@ -1,17 +1,28 @@
 const query = {
 
   state: {
+    queryVlue: {}
+  },
+  getters: {
+    getQuery(state) {
 
+      return state.queryVlue;
+    }
   },
 
   mutations: {
-    setData: (state) => {
 
+    SET_QUERY: (state, value) => {
+      console.log(state, 'value', value,);
+      state.queryVlue = value;
     }
+
   },
 
   actions: {
-
+    reflashQuery(store, value) {
+      store.commit('SET_QUERY', value);
+    }
   }
 }
 

src/views/business/spd/bo/basic/index.vue

@@ -11,7 +11,7 @@
         />
       </el-form-item>
       <el-form-item label="商机类型" prop="boType">
-        <el-select v-model="form.boType" placeholder="请输入商机类型">
+        <el-select v-model="form.boType" placeholder="请输入商机类型" clearable>
           <el-option
             v-for="dict in dict.type.mk_bo_type"
             :key="dict.value"
@@ -20,8 +20,8 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="商机状态" prop="boState">
-        <el-select v-model="queryParams.boState" placeholder="请输入商机状态">
+      <el-form-item label="商机状态" prop="boState" clearable>
+        <el-select v-model="queryParams.boState" placeholder="请输入商机状态" clearable>
           <el-option
             v-for="dict in dict.type.mk_bo_state"
             :key="dict.value"
@@ -31,7 +31,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="商机来源" prop="boSource">
-        <el-select v-model="queryParams.boSource" placeholder="请输入商机来源">
+        <el-select v-model="queryParams.boSource" placeholder="请输入商机来源" clearable>
           <el-option
             v-for="dict in dict.type.mk_bo_source"
             :key="dict.value"
@@ -41,7 +41,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="商机阶段" prop="boStage">
-        <el-select v-model="queryParams.boStage" placeholder="请输入商机阶段">
+        <el-select v-model="queryParams.boStage" placeholder="请输入商机阶段" clearable>
           <el-option
             v-for="dict in dict.type.mk_bo_stage"
             :key="dict.value"
@@ -134,7 +134,7 @@
       <el-table-column label="客户名称" align="center" prop="customerName" />
       <el-table-column label="医院耗材预估值(万元)" align="center" prop="hosDiscreetValue" />
       <el-table-column label="赢单率" align="center" prop="winningRate" />
-      <el-table-column label="销售区域" align="center" prop="marketingArea" />
+      <el-table-column label="销售区域" align="center" prop="marketingAreaName" />
       <el-table-column label="销售组织" align="center" prop="marketingOrganizingName" />
       <el-table-column label="部门" align="center" prop="deptName" />
       <el-table-column label="商机负责人" align="center" prop="principalName" />
@@ -207,7 +207,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="商机类型" prop="boType">
-              <el-select v-model="form.boType" placeholder="商机类型">
+              <el-select v-model="form.boType" placeholder="商机类型" :disabled = "this.operatingState == 'Update'">
                 <el-option
                   v-for="dict in dict.type.mk_bo_type"
                   :key="dict.value"
@@ -219,8 +219,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="客户名称" prop="customerName">
-              <el-input v-model="form.customerName" placeholder="请输入客户" >
-                <el-button slot="append" icon="el-icon-more" @click="refereCustomer"></el-button>
+              <el-input v-model="form.customerName" placeholder="请输入客户" :disabled = "this.operatingState == 'Update'">
+                <el-button slot="append" icon="el-icon-more" @click="refereCustomer" :disabled = "this.operatingState == 'Update'"></el-button>
               </el-input>
             </el-form-item>
           </el-col>
@@ -259,8 +259,10 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="销售区域" prop="marketingArea">
-              <el-input v-model="form.marketingArea" placeholder="请输入销售区域" />
+            <el-form-item label="销售区域" prop="marketingAreaName">
+              <el-input v-model="form.marketingAreaName" placeholder="请输入销售区域">
+                <el-button slot="append" icon="el-icon-more" @click="refereSaleaea"></el-button>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -297,6 +299,12 @@
       @doSubmit="customerSelectionsToInput"
       :single="true"
     />
+    <!-- 销售区域参照 -->
+    <SaleaeaRef
+      ref="saleaeaSelect"
+      @doSubmit="saleaeaSelectionsToInput"
+      :single="true"
+    />
     <!-- 组织参照 -->
     <OrgRef
       ref="orgSelect"
@@ -321,6 +329,7 @@
 <script>
 import { listBasic, getBasic, addBasic, updateBasic, delBasic } from "@/api/business/spd/bo/basic";
 import CustomerRef from '@/views/business/spd/bo/refer/customer/index.vue';
+import SaleaeaRef from '@/views/business/spd/bo/refer/saleaea/index.vue';
 import OrgRef from '@/views/business/spd/bo/refer/org/index.vue';
 import DeptRef from '@/views/business/spd/bo/refer/dept/index.vue';
 import StaffRef from '@/views/business/spd/bo/refer/staff/index.vue';
@@ -328,7 +337,7 @@ import StaffRef from '@/views/business/spd/bo/refer/staff/index.vue';
 export default {
   name: "Basic",
   dicts: ['mk_bo_type','mk_bo_state','mk_bo_stage','mk_bo_source','mk_bo_total_revenue'],
-  components: {CustomerRef,OrgRef,DeptRef,StaffRef},
+  components: {CustomerRef,SaleaeaRef,OrgRef,DeptRef,StaffRef},
   data() {
     return {
       // 遮罩层
@@ -349,30 +358,40 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      //当前操作状态
+      operatingState: '',
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         id: null,
-        boName: null,
-        boType: null,
-        boState: null,
         boSource: null,
+        boState: null,
         boStage: null,
+        boName: null,
+        referrer: null,
+        referrerName: null,
+        boType: null,
+        customerName: null,
         totalHosRevenue: null,
-        projectApproval: null,
-        startWinningRate: null,
-        endWinningRate: null,
-        biddingDocumentsPass: null,
-        startConSignTime: null,
-        endConSignTime: null,
+        hosDiscreetValue: null,
         boContent: null,
+        marketingArea: null,
+        marketingAreaName: null,
+        marketingOrganizing: null,
         marketingOrganizingName: null,
         marketingArea: null,
+        dept: null,
         deptName: null,
+        principal: null,
+        principalName: null,
+        delFlag: null,
+        tenantId: null,
+        revision: null,
         createBy: null,
-        startCreateTime: null,
-        endCreateTime: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
       },
       // 表单参数
       form: {},
@@ -400,7 +419,7 @@ export default {
         boContent: [
           { required: true, message: "商机内容不能为空", trigger: "blur" }
         ],
-      }
+      },
     };
   },
   //监听属性
@@ -471,6 +490,8 @@ export default {
         totalHosRevenue: null,
         hosDiscreetValue: null,
         boContent: null,
+        marketingArea: null,
+        marketingAreaName: null,
         marketingOrganizing: null,
         marketingOrganizingName: null,
         marketingArea: null,
@@ -508,6 +529,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.operatingState = "Insert";
       this.form.principal = this.$store.state.user.id;
       this.form.principalName = this.$store.state.user.nickName;
       this.form.dept = this.$store.state.user.deptId;
@@ -528,6 +550,7 @@ export default {
       getBasic(id).then(response => {
         this.form = response.data;
         this.open = true;
+        this.operatingState = "Update";
         this.title = "修改商机基础信息";
       });
     },
@@ -576,6 +599,15 @@ export default {
       this.form.customer = selections[0].id;
       this.form.customerName = selections[0].name;
     },
+    // 触发销售区域参照列表
+    refereSaleaea() {
+      this.$refs.saleaeaSelect.init()
+    },
+    //销售区域参照列表选择后
+    saleaeaSelectionsToInput (selections) {
+      this.form.marketingArea = selections[0].id;
+      this.form.marketingAreaName = selections[0].name;
+    },
     // 触发组织参照列表
     refereOrg() {
       this.$refs.orgSelect.init()

src/views/business/spd/bo/behavior/behaviorList.vue

@@ -39,6 +39,7 @@
     <el-table v-loading="loading" :data="behaviorList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="负责人" align="center" prop="staffName" />
+      <el-table-column label="行动日期" align="center" prop="time" />
       <el-form-item label="行动日期" prop="time">
         <el-date-picker clearable
           v-model="form.time"
@@ -109,8 +110,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="任务id" prop="taskId">
-              <el-input v-model="form.taskId" placeholder="请输入任务id" />
+            <el-form-item label="任务" prop="taskId" v-if="!(this.source == 'BoDetails')">
+              <el-input v-model="form.taskCode" placeholder="请输入任务" :disabled="this.source == 'TaskList'"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -138,8 +139,8 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="客户" prop="customerName" disabled="this.source == 'BoDetails'">
-              <el-input v-model="form.customerName" placeholder="请输入客户" :disabled="this.source == 'BoDetails'"/>
+            <el-form-item label="客户" prop="customerName">
+              <el-input v-model="form.customerName" placeholder="请输入客户" disabled="this.source == 'BoDetails' || this.source == 'TaskList'"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -194,6 +195,15 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="6">
+            <el-form-item label="销售区域" prop="marketingAreaName">
+              <el-input v-model="form.marketingAreaName" placeholder="请输入销售区域">
+                <el-button slot="append" icon="el-icon-more" @click="refereSaleaea"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col  :span="8">
             <el-form-item label="销售组织" prop="salesOrgName">
               <el-input v-model="form.salesOrgName" placeholder="请输入销售组织" :disabled="true"/>
@@ -219,6 +229,23 @@
             v-model="form.content">
           </el-input>
         </el-form-item>
+        <div class="md-auditInfo">
+          <el-divider content-position="left">其它信息</el-divider>
+          <el-form :inline="true" label-position="right" :model="form">
+            <el-form-item label="创建人">
+              <el-input v-model="form.createBy" size="small" readonly placeholder="创建人"></el-input>
+            </el-form-item>
+            <el-form-item label="创建时间">
+              <el-input v-model="form.createTime" size="small" readonly placeholder="创建时间"></el-input>
+            </el-form-item>
+            <el-form-item label="修改人">
+              <el-input v-model="form.updateBy" size="small" readonly placeholder="修改人"></el-input>
+            </el-form-item>
+            <el-form-item label="修改时间">
+              <el-input v-model="form.updateTime" size="small" readonly placeholder="修改时间"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -232,18 +259,25 @@
       :single="true"
       :outerQueryParams="this.bo"
     />
+    <!-- 销售区域参照 -->
+    <SaleaeaRef
+      ref="saleaeaSelect"
+      @doSubmit="saleaeaSelectionsToInput"
+      :single="true"
+    />
   </div>
 </template>
 
 <script>
 import { listBehavior, getBehavior, delBehavior, addBehavior, updateBehavior } from "@/api/business/spd/bo/behavior";
 import ContactRef from '@/views/business/spd/bo/refer/contact/index.vue';
+import SaleaeaRef from '@/views/business/spd/bo/refer/saleaea/index.vue';
 
 export default {
   name: "BehaviorList",
   props:["source","bo"],
   dicts: ['mk_bo_behavior_res','mk_bo_behavior_type','sys_yes_no','mk_bo_behavior_goal'],
-  components: {ContactRef},
+  components: {ContactRef,SaleaeaRef},
   data() {
     return {
       // 遮罩层
@@ -269,6 +303,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         bo: null,
+        boStage: null,
         boName: null,
         task: null,
         taskCode: null,
@@ -311,8 +346,16 @@ export default {
     };
   },
   created() {
+    if(this.source == 'Behavior'){
+      this.queryParams = this.bo;
+    }
     if(this.source == 'BoDetails'){
       this.queryParams.bo = this.bo.id;
+      this.queryParams.boStage = this.bo.boStage;
+    }
+    if(this.source == 'TaskList'){
+      console.log('this.bo-----',this.bo);
+      this.queryParams.taskCode = this.bo.code;
     }
     this.getList();
   },
@@ -349,6 +392,8 @@ export default {
         result: null,
         assist: null,
         assistContent: null,
+        marketingArea: null,
+        marketingAreaName: null,
         salesOrg: null,
         salesOrgName: null,
         dept: null,
@@ -394,6 +439,15 @@ export default {
         this.form.customer = this.bo.customer;
         this.form.customerName = this.bo.customerName;
       }
+      if(this.source == 'TaskList'){
+        this.form.bo = this.bo.bo;
+        this.form.boName = this.bo.boName;
+        this.form.boStage = this.bo.boStage;
+        this.form.customer = this.bo.customer;
+        this.form.customerName = this.bo.customerName;
+        this.form.task = this.bo.id;
+        this.form.taskCode = this.bo.code;
+      }
       this.form.type = '0';
       this.form.staff = this.$store.state.user.id;
       this.form.staffName = this.$store.state.user.nickName;
@@ -460,6 +514,15 @@ export default {
       this.form.linkman = selections[0].id;
       this.form.linkmanName = selections[0].name;
     },
+    // 触发销售区域参照列表
+    refereSaleaea() {
+      this.$refs.saleaeaSelect.init()
+    },
+    //销售区域参照列表选择后
+    saleaeaSelectionsToInput (selections) {
+      this.form.marketingArea = selections[0].id;
+      this.form.marketingAreaName = selections[0].name;
+    },
   }
 };
 </script>

src/views/business/spd/bo/contact/contactList.vue

@@ -135,11 +135,9 @@
     />
 
     <!-- 添加或修改联系人管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          基本信息
-        </el-row>
+        <el-divider content-position="left">基本信息</el-divider>
         <el-row>
           <el-col :span="8">
             <el-form-item label="商机id" prop="boId" v-if="source == 'Contact'">
@@ -179,7 +177,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系人分类" prop="contactClassification">
-              <el-input v-model="form.contactClassification" placeholder="请输入联系人分类" />
+              <el-select v-model="form.contactClassification" placeholder="请输入联系人分类">
+                <el-option
+                  v-for="dict in dict.type.mk_bo_contact_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -200,7 +205,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="业务爱好" prop="hobby">
+            <el-form-item label="兴趣爱好" prop="hobby">
               <el-input v-model="form.hobby" placeholder="请输入业务爱好" />
             </el-form-item>
           </el-col>
@@ -217,9 +222,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          工作信息
-        </el-row>
+        <el-divider content-position="left">工作信息</el-divider>
         <el-row>
           <el-col :span="8">
             <el-form-item label="上级联系人" prop="superiorContact">
@@ -317,9 +320,7 @@
           <el-col :span="8">
           </el-col>
         </el-row>
-        <el-row>
-          联系信息
-        </el-row>
+        <el-divider content-position="left">联系信息</el-divider>
         <el-row>
           <el-col :span="8">
             <el-form-item label="联系电话" prop="telephone">
@@ -340,12 +341,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="最佳拜访时间" prop="visitTime">
-              <el-date-picker clearable
-                v-model="form.visitTime"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择最佳拜访时间">
-              </el-date-picker>
+              <el-input v-model="form.visitTime" placeholder="请选择最佳拜访时间" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -356,26 +352,23 @@
           <el-col :span="8">
           </el-col>
         </el-row>
-        <el-row>
-          其它信息
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="部门名称" prop="departmentName">
-              <el-input v-model="form.departmentName" placeholder="请输入部门名称" />
+        <div class="md-auditInfo">
+          <el-divider content-position="left">其它信息</el-divider>
+          <el-form :inline="true" label-position="right" :model="form">
+            <el-form-item label="创建人">
+              <el-input v-model="form.departmentName" size="small" readonly></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="销售区域" prop="area">
-              <el-input v-model="form.area" placeholder="请输入销售区域" />
+            <el-form-item label="创建时间">
+              <el-input v-model="form.departmentName" size="small" readonly></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="销售组织" prop="organization">
-              <el-input v-model="form.organization" placeholder="请输入销售组织" />
+            <el-form-item label="修改人">
+              <el-input v-model="form.departmentName" size="small" readonly></el-input>
             </el-form-item>
-          </el-col>
-        </el-row>
+            <el-form-item label="修改时间">
+              <el-input v-model="form.departmentName" size="small" readonly></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -398,7 +391,7 @@ import CustomerRef from '@/views/business/spd/bo/refer/customer/index.vue';
 export default {
   name: "contactList",
   props:["source","bo"],
-  dicts: ['sys_user_sex','mk_bo_contact_state','mk_bo_section','mk_bo_position','mk_bo_job_title','mk_bo_power','mk_bo_support','mk_bo_field_expertise','sys_yes_no'],
+  dicts: ['sys_user_sex','mk_bo_contact_state','mk_bo_section','mk_bo_position','mk_bo_job_title','mk_bo_power','mk_bo_support','mk_bo_field_expertise','sys_yes_no','mk_bo_contact_type'],
   components: {CustomerRef},
   data() {
     return {
@@ -479,6 +472,9 @@ export default {
     if(this.source == 'BoDetails'){
       this.queryParams.boId = this.bo.id;
     }
+    if(this.source == 'Contact'){
+      this.queryParams = this.bo;
+    }
     this.getList();
   },
   methods: {

src/views/business/spd/bo/contact/index.vue

@@ -222,7 +222,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <ContactList :key="timer" :source = "'Contact'" :bo="queryParams" />
+    <ContactList :key="timer" :source = "'Contact'" :bo="this.queryParams" />
   </div>
 </template>
 
@@ -395,6 +395,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      console.log('this.queryParams',this.queryParams);
       this.queryParams.pageNum = 1;
       this.timer = new Date().getTime();
       // this.getList();

src/views/business/spd/bo/pojpsn/pojpsnList.vue

@@ -181,6 +181,9 @@ export default {
     };
   },
   created() {
+    if(this.source == 'Pojpsn'){
+      this.queryParams = this.bo;
+    }
     if(this.source == 'BoDetails'){
       this.queryParams.bo = this.bo.id;
     }

src/views/business/spd/bo/refer/customer/index.vue

@@ -192,7 +192,8 @@ export default {
     },
     // 排序
     resetSearch() {
-      this.$refs.searchForm.resetFields();
+      // this.$refs.searchForm.resetFields();
+      this.resetForm("searchForm");
       this.getList();
     },
     // 选中数据

src/views/business/spd/bo/refer/saleaea/index.vue

@@ -0,0 +1,242 @@
+<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="getList()"
+              @submit.native.prevent
+            >
+              <el-form-item prop="code">
+                <el-input
+                  size="small"
+                  v-model="queryParams.code"
+                  placeholder="区域编码"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item prop="name">
+                <el-input
+                  size="small"
+                  v-model="queryParams.name"
+                  placeholder="区域名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  @click="getList()"
+                  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="区域编码"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                header-align="center"
+                align="left"
+                sortable="custom"
+                min-width="90"
+                label="区域名称"
+              >
+              </el-table-column>
+            </el-table>
+            <el-pagination
+              @size-change="sizeChangeHandle"
+              @current-change="currentChangeHandle"
+              :current-page="queryParams.pageNum"
+              :page-sizes="[5, 10, 15, 20]"
+              :page-size="queryParams.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 { listSaleArea } from "@/api/business/spd/bo/iuapquery/basic";
+export default {
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        code: undefined,
+        name: undefined,
+      },
+      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();
+      });
+    },
+    // 获取数据列表
+    getList() {
+      this.loading = true;
+      listSaleArea(this.addDateRange(this.queryParams)).then(response => {
+          this.dataList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.queryParams.pageSize = val;
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.queryParams.pageNum = val;
+      this.getList();
+    },
+    // 排序
+    resetSearch() {
+      this.$refs.searchForm.resetFields();
+      this.getList();
+    },
+    // 选中数据
+    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/business/spd/bo/task/index.vue

@@ -49,46 +49,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="联系人名称" prop="linkmanName">
-        <el-input
-          v-model="queryParams.linkmanName"
-          placeholder="请输入联系人名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="销售组织名称" prop="salesOrgName">
-        <el-input
-          v-model="queryParams.salesOrgName"
-          placeholder="请输入销售组织名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="负责人名称" prop="staffName">
-        <el-input
-          v-model="queryParams.staffName"
-          placeholder="请输入负责人名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="截止时间" prop="deadlineDate">
-        <el-date-picker clearable
-          v-model="queryParams.deadlineDate"
-          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>
@@ -151,7 +111,8 @@ export default {
         deptName: null,
         staff: null,
         staffName: null,
-        deadlineDate: null,
+        startTime: null,
+        deadlineTime: null,
         content: null,
         tenantId: null,
         revision: null,
@@ -202,7 +163,7 @@ export default {
         deptName: null,
         staff: null,
         staffName: null,
-        deadlineDate: null,
+        deadlineTime: null,
         content: null,
         tenantId: null,
         revision: null,

src/views/business/spd/bo/task/taskList.vue

@@ -38,8 +38,13 @@
 
     <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange" >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="商机id" align="center" prop="bo" v-if="source == 'Task'"/>
-      <el-table-column label="商机阶段" align="center" prop="boStage" v-if="source == 'Task'"/>
+      <!-- <el-table-column label="商机id" align="center" prop="bo" v-if="source == 'Task'"/> -->
+      <el-table-column label="商机名称" align="center" prop="boName" v-if="source == 'Task'"/>
+      <el-table-column label="商机阶段" align="center" prop="boStage">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mk_bo_stage" :value="scope.row.boStage"/>
+        </template>
+      </el-table-column>
       <el-table-column label="客户名称" align="center" prop="customerName" v-if="source == 'Task'"/>
       <el-table-column label="任务编码" align="center" prop="code" />
       <el-table-column label="任务名称" align="center" prop="name" />
@@ -57,9 +62,9 @@
       <el-table-column label="销售组织名称" align="center" prop="salesOrgName" />
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="负责人名称" align="center" prop="staffName" />
-      <el-table-column label="截止时间" align="center" prop="deadlineDate" width="180">
+      <el-table-column label="截止时间" align="center" prop="deadlineTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.deadlineDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.deadlineTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="任务内容" align="center" prop="content" />
@@ -147,18 +152,19 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="联系人" prop="linkmanName">
-              <el-input v-model="form.linkmanName" >
-                <el-button slot="append" icon="el-icon-more" @click="refereContact"></el-button>
-              </el-input>
+            <el-form-item label="开始时间" prop="startTime">
+              <el-date-picker clearable
+                v-model="form.startTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选开始时间">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="截止时间" prop="deadlineDate">
+            <el-form-item label="截止时间" prop="deadlineTime">
               <el-date-picker clearable
-                v-model="form.deadlineDate"
+                v-model="form.deadlineTime"
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="请选择截止时间">
@@ -180,6 +186,15 @@
         </el-row>
         <el-row>
           <el-col :span="8">
+            <el-form-item label="联系人" prop="linkmanName">
+              <el-input v-model="form.linkmanName" >
+                <el-button slot="append" icon="el-icon-more" @click="refereContact"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="销售组织" prop="salesOrgName">
               <el-input v-model="form.salesOrgName" :disabled="true">
                 <el-button slot="append" icon="el-icon-more" @click="refereOrg" :disabled="true"></el-button>
@@ -210,6 +225,34 @@
             v-model="form.content">
           </el-input>
         </el-form-item>
+        <BehaviorList  :key="timer" :source="'TaskList'" :bo="this.form" v-if="this.operatingState != 'Insert'"/>
+        <div class="md-auditInfo">
+          <el-divider content-position="left">其它信息</el-divider>
+          <el-form :inline="true" label-position="right" :model="form">
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="创建人">
+                  <el-input v-model="form.createBy" size="small" readonly></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="创建时间">
+                  <el-input v-model="form.createTime" size="small" readonly></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="修改人">
+                  <el-input v-model="form.updateBy" size="small" readonly></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="修改时间">
+                  <el-input v-model="form.updateTime" size="small" readonly></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -258,13 +301,14 @@ import ContactRef from '@/views/business/spd/bo/refer/contact/index.vue';
 import OrgRef from '@/views/business/spd/bo/refer/org/index.vue';
 import DeptRef from '@/views/business/spd/bo/refer/dept/index.vue';
 import StaffRef from '@/views/business/spd/bo/refer/staff/index.vue';
+import BehaviorList from '../behavior/behaviorList.vue'
 
 
 export default {
   name: "TaskList",
   props:["source","bo"],
   dicts: ['mk_bo_taskstate','mk_bo_tasktype','mk_bo_stage'],
-  components: {CustomerRef,ContactRef,OrgRef,DeptRef,StaffRef},
+  components: {CustomerRef,ContactRef,OrgRef,DeptRef,StaffRef,BehaviorList},
   data() {
     return {
       // 遮罩层
@@ -305,7 +349,8 @@ export default {
         deptName: null,
         staff: null,
         staffName: null,
-        deadlineDate: null,
+        startTime: null,
+        deadlineTime: null,
         content: null,
         tenantId: null,
         revision: null,
@@ -332,19 +377,28 @@ export default {
         staffName: [
           { required: true, message: "负责人不能为空", trigger: "blur" }
         ],
-        deadlineDate: [
-          { required: true, message: "截止日期不能为空", trigger: "blur" }
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        deadlineTime: [
+          { required: true, message: "截止时间不能为空", trigger: "blur" }
         ],
         content: [
           { required: true, message: "任务内容不能为空", trigger: "blur" }
         ],
-      }
+      },
+      //重新加载子组件参数
+      timer: '',
+      //当前操作状态
+      operatingState: '',
     };
   },
   created() {
     if(this.source == 'BoDetails'){
       this.queryParams.bo = this.bo.id;
-      this.queryParams.boStage = this.bo.boStage;
+    }
+    if(this.source == 'Task'){
+      this.queryParams = this.bo;
     }
     this.getList();
   },
@@ -383,7 +437,8 @@ export default {
         deptName: null,
         staff: null,
         staffName: null,
-        deadlineDate: null,
+        startTime: null,
+        deadlineTime: null,
         content: null,
         tenantId: null,
         revision: null,
@@ -413,6 +468,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.operatingState = "Insert";
       this.reset();
       if(this.source == 'BoDetails'){
         this.form.bo = this.bo.id;
@@ -427,12 +483,14 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.operatingState = "Update";
       this.reset();
       const id = row.id || this.ids
       getTask(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改任务";
+        this.timer = new Date().getTime();
       });
     },
     /** 提交按钮 */

src/views/material/basicFile/details.vue

@@ -29,7 +29,7 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-                                                                                                                                                                                                                                                                                                                                                                                                    <el-button size="small" @click="handleQuery">查询</el-button> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                              <el-button size="small" @click="handleQuery">查询</el-button> -->
             <el-button size="small" @click="handleRefresh">刷新</el-button>
 
           </el-button-group>
@@ -48,7 +48,7 @@
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="isInvoke(true)">启用</el-dropdown-item>
                 <el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item>
-                                                                                  </el-dropdown-menu></el-dropdown> -->
+                                                                                                                            </el-dropdown-menu></el-dropdown> -->
           </el-button-group>
         </el-col>
 
@@ -57,7 +57,7 @@
           <el-button-group>
             <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
           </el-button-group>
-                                                                                                                                                                                                                                                                                                                                                                                            </el-col> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                      </el-col> -->
 
         <!-- 导入导出 -->
       <!-- <el-col :span="1.5">
@@ -65,7 +65,7 @@
             <el-button size="small" @click="handleImport">批量导入</el-button>
             <el-button size="small" @click="handleExport">批量导出</el-button>
           </el-button-group>
-                                                                                                                                                                                                                                                                                                                                                                                              </el-col> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                        </el-col> -->
 
       </el-row>
 
@@ -111,7 +111,7 @@
           <!-- 附件管理 -->
         <!-- <el-button-group>
             <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button>
-                                                                                                                                                                                                                                                                                                                                                                                            </el-button-group> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                      </el-button-group> -->
 
           <!-- 切换 -->
         <!-- <el-button-group>
@@ -123,7 +123,7 @@
               @click="handleChangePage('next')" />
             <el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
               @click="handleChangePage('end')" />
-                                                                                                                                                                                                                                                                                                                                                                                            </el-button-group> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                      </el-button-group> -->
         </el-col>
       </el-row>
 
@@ -201,8 +201,8 @@
 
                         <!-- 图片 -->
                         <el-form-item v-else-if="f.attribute == 'image'" :label="f.name">
-                          <el-image :src="basicData.value[f.prop]" fit="contain"></el-image>
-                          <!-- <img :src="basicData.value[f.prop]" alt="加载失败"> -->
+                          <el-image :src="basicData.value[f.prop]" fit="contain" @clicks="handleUpImage"></el-image>
+                          <!-- <img :src="basicData.value[f.prop]" @clicks="handleUpImage" alt="加载失败"> -->
 
                         </el-form-item>
 
@@ -283,7 +283,7 @@
                                 @focus="m.apiUrl && handleQueryMore(m, '', { name: 'medcineData', prop: m.prop })">
 
                               <!-- <el-option v-if="m.dictId" v-for="d in m.dictValue" :key="d.dictValue"
-                                                                                                                                                                                                          :label="d.dictLabel" :value="d.dictValue"></el-option> -->
+                                                                                                                                                                                                                                                    :label="d.dictLabel" :value="d.dictValue"></el-option> -->
 
                                 <div slot="empty"></div>
                               </el-select>
@@ -435,7 +435,7 @@
               <el-option v-if="mt.dictId" v-for="d in mt.dictId" :key="d.dictValue" :label="d.dictLabel"
                 :value="d.dictValue">
               </el-option>
-                                                                                                                                                                                                                            </el-select> -->
+                                                                                                                                                                                                                                                                      </el-select> -->
 
             <!-- 其他类型 -->
 
@@ -487,7 +487,7 @@
           <el-collapse-item title="物料基本信息" name="basic">
             <el-form :inline="true" label-position="right" :model="basicData.value">
             <!-- <el-form-item label="所属组织">
-                                                                                                                                                                                                                                                                                    <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input></el-form-item> -->
+                                                                                                                                                                                                                                                                                                                              <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input></el-form-item> -->
               <el-form-item label="物料编码">
                 <el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
               </el-form-item>
@@ -498,7 +498,7 @@
                 <el-input v-model="basicData.value.enName" size="small" readonly placeholder="英文名称"></el-input>
               </el-form-item>
             <!-- <el-form-item label="版本号">
-                                                                                                                                                                                                                                                                                  <el-input v-model="basicData.value.version"  placeholder="版本号"></el-input></el-form-item> -->
+                                                                                                                                                                                                                                                                                                                            <el-input v-model="basicData.value.version"  placeholder="版本号"></el-input></el-form-item> -->
 
             </el-form>
           </el-collapse-item>
@@ -926,6 +926,10 @@ export default {
       console.log(e, '主页签 列表数据选择');
       this.mainMsg.checkedList = e;
     },
+    // 上传图片
+    handleUpImage() {
+      console.log('上传图片');
+    },
     // 编辑状态下，参照弹窗显示查询数据
     handleQueryMore(msg, val, target) {
       this.MoreDataDialog.loading = true;
@@ -1008,7 +1012,10 @@ export default {
         if (code == 200) {
 
           _this.basicData.value = data.data;
-          // this.basicData.form = data.form;
+
+          for (const key in data.data) {
+            _this.basicData.value[key] = (typeof data.data[key] === 'number') ? String(data.data[key]) : data.data[key];
+          }
 
           // _this.handleAddReferLabel('basicData');
 
@@ -1769,7 +1776,7 @@ export default {
         console.log('确认时选择的数据', this.MoreDataDialog.value);
 
         this.materialType.value = this.materialType.value.map(m => {
-          if ((m.id != '' && m.id == this.MoreDataDialog.target.prop['id']) ||
+          if ((m.id && m.id != '' && m.id == this.MoreDataDialog.target.prop['id']) ||
             (m.insertId && m.insertId == this.MoreDataDialog.target.prop['insertId'])
           ) {
             m.drugId = this.MoreDataDialog.value['id'];

src/views/material/basicFile/index.vue

@@ -26,7 +26,7 @@
               <el-dropdown-item :command="filterCondition('stop')">显示停用</el-dropdown-item>
               <el-dropdown-item :command="filterCondition('allot')">显示已分配</el-dropdown-item>
             </el-dropdown-menu>
-                                                                    </el-dropdown> -->
+                                                                                                                                    </el-dropdown> -->
 
           <!-- <el-button size="small" @click="handleQuery">查询</el-button> -->
           <el-button size="small" @click="handleRefresh">刷新</el-button>
@@ -45,14 +45,14 @@
             </el-dropdown-menu>
           </el-dropdown>
         </el-button-group>
-                                                                </el-col> -->
+                                                                                                                                </el-col> -->
 
       <!-- 申请单查询 -->
     <!-- <el-col :span="1.5">
         <el-button-group>
           <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
         </el-button-group>
-                                                                </el-col> -->
+                                                                                                                                </el-col> -->
 
       <!-- 导入导出 -->
       <el-col :span="1.5">
@@ -62,8 +62,8 @@
         </el-button-group>
       </el-col>
 
+      <!-- 查询框 -->
       <el-col :span="1.5">
-        <!-- 查询框 -->
         <el-form :inline="true" :model="queryForm" class="mb-query" @submit.native.prevent>
           <el-form-item label="物料名称">
             <el-input size="small" v-model="queryForm.name" placeholder="物料名称" clearable></el-input>
@@ -146,6 +146,7 @@ export default {
       // 查询表单字段
       queryForm: {
         name: '',
+        code: ''
       },
       // 总条数
       total: 1,
@@ -240,7 +241,7 @@ export default {
     handleQuery() {
 
       console.log('查询');
-      this.getMaterialList('material', this.queryForm);
+      this.getMaterialList('material');
     },
     // 刷新
     handleRefresh() {
@@ -381,7 +382,7 @@ export default {
 
       let param = {
         templateCode,
-        ...query
+        ...this.queryForm
       }
       console.log(param, 'param');
       materialApi.materialList(param, page).then((res) => {
@@ -412,9 +413,32 @@ export default {
 
   },
   created() {
-    this.getMaterialList('material');
-    this.getTagList('material');
+    // this.getMaterialList('material');
+    // this.getTagList('material');
+  },
+  beforeRouteEnter(to, from, next) {
+    console.log(to, 'to', from, 'beforeRouteEnter');
+
+    next((vm) => {
+      if (from.name == 'materialDetail') {
+        // this.$store.getQuery(this.queryForm);
+        console.log(vm, 'queryValue', vm.$store);
+        vm.queryForm = vm.$store.state.query.queryVlue;
+      }
+      vm.getTagList('material');
+      vm.getMaterialList('material');
+    });
   },
+  // 进入详情，保留查询条件
+  beforeRouteLeave(to, from, next) {
+    console.log(to, 'to', from, 'beforeRouteLeave');
+    if (to.name == 'materialDetail') {
+      this.$store.commit('SET_QUERY', this.queryForm);
+    } else {
+      this.$store.commit('SET_QUERY', { name: '', code: '' });
+    }
+    next();
+  }
 
 };
 </script>

src/views/material/changeApply/add.vue

@@ -10,7 +10,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="申请组织" prop="orgId">
+              <el-form-item label="所属组织" prop="orgId">
                 <el-input disabled v-model="basicForm.orgId"></el-input>
               </el-form-item>
             </el-col>
@@ -391,7 +391,7 @@ export default {
       isControl: true,
       basicForm: {
         code: '',
-        orgId: '',
+        orgId: '德荣医疗科技股份有限公司',
         // 物料id
         materialId:'',
         materialCode: '',
@@ -444,8 +444,8 @@ export default {
         twoClass: [{required: true, message: '请填写二级分类', trigger: 'blur'}],
         threeClass: [{required: true, message: '请填写三级分类', trigger: 'blur'}],
         fourClass: [{required: true, message: '请填写四级分类', trigger: 'blur'}],
-        specification: [{required: true, message: '请填写型号分类', trigger: 'blur'}],
-        model: [{required: true, message: '请填写四级分类', trigger: 'blur'}],
+        specification: [{required: true, message: '请填写规格', trigger: 'blur'}],
+        model: [{required: true, message: '请填写型号', trigger: 'blur'}],
         factory: [{required: true, message: '请选择生产厂家/代理人', trigger: 'blur'}],
         registrant: [{required: true, message: '请填写注册人/上市许可持有人', trigger: 'blur'}],
         storageConditions: [{required: true, message: '请选择存储条件', trigger: 'blur'}],
@@ -667,10 +667,14 @@ export default {
           this.basicForm.fourClass = data.fourClass
           this.basicForm.specification = data.specification
           this.basicForm.model = data.model
+          this.basicForm.factory = data.manufacturerId
           this.basicForm.registrant = data.registrant
           this.basicForm.storageConditions = data.storageCondition
           this.basicForm.transportCondition = data.transportationCondition
           this.basicForm.leadTime = data.deliveryPeriod
+          if(data.manufacturerId) {
+            this.getFactoryDetails(data.manufacturerId)
+          }
           if(data.medcines.length !== 0) {
             this.basicForm2.drug = data.medcines[0].isDrug
             this.basicForm2.registrationNo = data.medcines[0].registrationNo
@@ -714,6 +718,7 @@ export default {
   height: calc(100vh - 84px);
   padding: 12px;
   box-sizing: border-box;
+  overflow-y: auto;
 }
 .btn_group {
   width: 100%;

src/views/material/requisition/add.vue

@@ -32,9 +32,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.classifyId">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="chooseFourClass"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -107,9 +104,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.unitId">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="chooseUnit"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -129,9 +123,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.manufacturerId">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="chooseFactory"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -158,9 +149,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.originPlace">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -356,9 +344,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.materialRate">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -397,9 +382,6 @@
                       :value="item.code"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.puPersonnelId">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -458,16 +440,14 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.businessLine">
-                  <el-button :disabled="disable" 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="proposerId">
-                <el-input :disabled="disable" v-model="basicForm.proposerId"></el-input>
+                <el-input disabled v-model="this.$store.state.user.nickName"></el-input>
+                <el-input v-show="false" v-model="basicForm.proposerId"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -534,7 +514,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input disabled v-model="basicForm.purchasingOrganization"></el-input> -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -554,7 +533,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled = "disable || orgControl" v-model="basicForm.businessDepartment"></el-input> -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -570,6 +548,42 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row style="margin-bottom: 12px;">
+          <span>物料类别</span>
+          </el-row>
+          <el-row style="margin-bottom: 12px;">
+            <el-button :disabled="disable" type="primary" size="small" plain @click="addLine">新增</el-button>
+            <el-button :disabled="disable" type="primary" size="small" plain @click="handleDelete">删除</el-button>
+            <!-- <el-button :disabled="disable || isControl" type="primary" size="small" plain @click="testsave">暂存</el-button> -->
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-table 
+              :data="sysMaterialMedcineItemApply"
+              class="request-table"
+              @selection-change="handleSelectionChange"
+              >
+                <el-table-column type="selection" width="55" />
+                <el-table-column label="物料类别ID" align="center" prop="sort">
+                  <template slot-scope="scope">
+                    <el-input readonly v-model="scope.row.drugId">
+                      <!-- <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="chooseDrug"></el-button> -->
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="物料类别code" align="center" prop="medicineCode">
+                  <template slot-scope="scope">
+                    <el-input readonly v-model="scope.row.drugCode"></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="物料类别名称" align="center" prop="medicineName">
+                  <template slot-scope="scope">
+                    <el-input readonly v-model="scope.row.drugName"></el-input>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-col>
+          </el-row>
         </el-form>
         </div>
       </el-tab-pane>
@@ -645,9 +659,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm2.dosageFrom">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -676,40 +687,7 @@
             </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="fourth">
@@ -793,13 +771,6 @@
       </el-col>
     </div>
 
-    <popDialog
-      ref="contractSelect"
-      @doSubmit="selectionsToInput"
-      :selectData="selectData"
-      :single="true"
-    />
-
     <factory
       ref="factory"
       @doSubmit="acceptFactory"
@@ -869,11 +840,18 @@
       :selectData="selectData11"
       :single="true"
     />
+
+    <drug
+      ref="drug"
+      @doSubmit="acceptDrug"
+      :selectData="selectData12"
+      :single="true"
+    />
+
   </div>
 </template>
 
 <script>
-import popDialog from '@/components/PopDialog/index.vue'
 import factory from '@/components/PopDialog/productFactory.vue'
 import fourClass from '@/components/PopDialog/fourClass.vue'
 import unit from '@/components/PopDialog/unit.vue'
@@ -882,9 +860,12 @@ import tax from '@/components/PopDialog/tax.vue'
 import staff from '@/components/PopDialog/staff.vue'
 import serviceline from '@/components/PopDialog/serviceline.vue'
 import dose from '@/components/PopDialog/dose.vue'
+// 公用一个树形(组织部门传值不同)
 import orgs from '@/components/PopDialog/organization.vue'
 import depart from '@/components/PopDialog/organization.vue'
-// 公用一个树形
+// 药品类别子别
+import drug from '@/components/PopDialog/drug.vue'
+
 import { addReq, getReqDetail, editReq } from '@/api/requisition/basic'
 // 调用物料分类详情接口用于数据回显
 import { getDetail } from '@/api/classify/basic';
@@ -897,7 +878,6 @@ export default {
   name: 'requisition_add',
   dicts: ['sys_storage_condition', 'sys_conditions_carriage', 'sys_medicine', 'medical_instruments', 'curing_type', 'period_unit', 'expiry_date'],
   components: {
-    popDialog,
     factory,
     fourClass,
     unit,
@@ -907,7 +887,8 @@ export default {
     serviceline,
     dose,
     orgs,
-    depart
+    depart,
+    drug
   },
   props: ['pageStu', 'row', 'disable'],
   model: {
@@ -1048,6 +1029,8 @@ export default {
         // medicineTypeChanges:[
         // ],
       },
+      // 医药属性子表
+      sysMaterialMedcineItemApply: [],
       
       // tableList: [],
       // 子表选中
@@ -1064,7 +1047,8 @@ export default {
       selectData8: [],
       selectData9: [],
       selectData10: [],
-      selectData11: []
+      selectData11: [],
+      selectData12: []
     }
   },
   // watch: {
@@ -1098,11 +1082,8 @@ export default {
       // alert('详情页面:')
       console.log('页面状态',this.pageStu)
       console.log('数据', this.row)
+      console.log('取VUEX里面的数据：', this.$store.state.user.name)
       this.getDetails(this.row)
-      // 获取树形详情
-      if (this.row.classifyId) {
-        this.getTreeDetails(this.row.classifyId)
-      }
       // 生产厂家代理人用于回显
       if (this.row.manufacturerId) {
         this.getFactoryDetails(this.row.manufacturerId)
@@ -1144,10 +1125,6 @@ export default {
       } else {
         this.isControl = true
       }
-      // 获取树形详情
-      if (this.row.classifyId) {
-        this.getTreeDetails(this.row.classifyId)
-      }
       // 生产厂家代理人用于回显
       if (this.row.manufacturerId) {
         this.getFactoryDetails(this.row.manufacturerId)
@@ -1300,6 +1277,10 @@ export default {
         console.log('res',res)
         if(res.code === 200) {
           this.basicForm = res.data
+          // 获取树形详情
+          if (res.data.classifyId) {
+            this.getTreeDetails(res.data.classifyId)
+          }
           if(res.data.purchasingOrganization) {
             this.basicForm.purchasingOrganization = res.data.purchasingOrganization
             this.getOrgDetails(res.data.purchasingOrganization)
@@ -1319,63 +1300,97 @@ export default {
           if (res.data.sysMaterialMedcineApply && res.data.sysMaterialMedcineApply.dosageFrom) {
             this.getDoseDetails(res.data.sysMaterialMedcineApply.dosageFrom)
           }
+          // 物料类别回显
+          if (res.data.sysMaterialMedcineItemApply) {
+            this.sysMaterialMedcineItemApply = res.data.sysMaterialMedcineItemApply
+          }
         }
       })
     },
     save() {
       if(this.pageStu == 'edit') {
+        // 申请人取默认值 
+        this.basicForm.proposerId = this.$store.state.user.name
         let sparams = {...this.basicForm, ...{status: 0}}
         sparams.sysMaterialMedcineApply = this.basicForm2
+        sparams.sysMaterialMedcineItemApply = this.sysMaterialMedcineItemApply
         console.log('提交参数', sparams)
         this.$refs['basic'].validate((valid) => {
           if (valid) {
-            editReq(sparams).then(res => {
-              if(res.code === 200) {
-                this.$message({
-                  message: res.msg,
-                  type: 'success'
-                });
-                this.back()
-              }
-            })
+            if (this.sysMaterialMedcineItemApply.length !== 0) {
+              editReq(sparams).then(res => {
+                if(res.code === 200) {
+                  this.$message({
+                    message: res.msg,
+                    type: 'success'
+                  });
+                  this.back()
+                }
+              })
+            } else {
+              this.$message({
+                message: '请维护物料类别后再提交',
+                type: 'warning'
+              });
+            }
           }
         })
       } else {
         // alert('保存传status：0')
+        // 申请人取默认值 
+        this.basicForm.proposerId = this.$store.state.user.name
         let sparams = {...this.basicForm, ...{status: 0}}
         sparams.sysMaterialMedcineApply = this.basicForm2
+        sparams.sysMaterialMedcineItemApply = this.sysMaterialMedcineItemApply
         console.log('保存参数', sparams)
         this.$refs['basic'].validate((valid) => {
           if(valid) {
-            addReq(sparams).then(res => {
-              if(res.code === 200) {
-                this.$message({
-                  message: res.msg,
-                  type: 'success'
-                });
-                this.back()
-              }
-            })
+            if (this.sysMaterialMedcineItemApply.length !== 0) {
+              addReq(sparams).then(res => {
+                if(res.code === 200) {
+                  this.$message({
+                    message: res.msg,
+                    type: 'success'
+                  });
+                  this.back()
+                }
+              })
+            } else {
+              this.$message({
+                message: '请维护物料类别后再提交',
+                type: 'warning'
+              });
+            }
           }
         })
       }
     },
     submit() {
       // alert('提交传status：1')
+      // 申请人取默认值 
+      this.basicForm.proposerId = this.$store.state.user.name
       let sparams = {...this.basicForm, ...{status: 1}}
       sparams.sysMaterialMedcineApply = this.basicForm2
+      sparams.sysMaterialMedcineItemApply = this.sysMaterialMedcineItemApply
       console.log('提交参数', sparams)
       this.$refs['basic'].validate((valid) => {
         if(valid) {
-          editReq(sparams).then(res => {
-            if(res.code === 200) {
-              this.$message({
-                message: res.msg,
-                type: 'success'
-              });
-              this.back()
-            }
-          })
+          if (this.sysMaterialMedcineItemApply.length !== 0) {
+            editReq(sparams).then(res => {
+              if(res.code === 200) {
+                this.$message({
+                  message: res.msg,
+                  type: 'success'
+                });
+                this.back()
+              }
+            })
+          } else {
+            this.$message({
+              message: '请维护物料类别后再提交',
+              type: 'warning'
+            }); 
+          }
         }
       })
     },
@@ -1388,78 +1403,43 @@ export default {
       this.$emit('refresh', queryParams)
     },
     // 子表增删行
-    // 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
-          }
-        }
-      })
+    handleSelectionChange(val) {
+      this.ids = val
+      console.log('this.ids',this.ids)
     },
-    test01() {
-      console.log('测试点击')
-      this.$refs.contractSelect.init()
+    addLine() {
+      //添加行数
+      // let newValue = {
+      //   drugId:'',
+      //   drugCode: '',
+      //   drugName: '',
+      // };
+      // this.sysMaterialMedcineItemApply.push(newValue);
+      this.chooseDrug()
     },
+    handleDelete(index) {
+      if(this.ids.length == 0) {
+        this.$message({
+          message: '请选择删除条目',
+          type: 'warning'
+        });
+      } else {
+        // console.log('index',index)
+        // this.basicForm2.medicineTypeChanges.splice(index, 1);
+        this.sysMaterialMedcineItemApply = this.sysMaterialMedcineItemApply.filter(item =>
+         !this.ids.some(ele =>
+         ele.drugId == item.drugId))
+      }
+    },
+    testsave() {
+      console.log('暂存表格：', this.sysMaterialMedcineItemApply)
+      console.log('暂存表单1', this.basicForm)
+      let params = {...this.basicForm}
+      params.sysMaterialMedcineApply = this.basicForm2
+      params.sysMaterialMedcineItemApply = this.sysMaterialMedcineItemApply
+      console.log('暂存总表单', params)
+    },
+
     // 选择生产厂家/代理人
     acceptFactory (selections) {
       console.log('选择的数据',selections)
@@ -1576,7 +1556,20 @@ export default {
     chooseDepart () {
       this.$refs.departs.blur()
       this.$refs.depart.init('0')
-    }
+    },
+    // 选择医药类别
+    acceptDrug (selections) {
+      console.log('接收的物料类别', selections)
+      const sleObj = {}
+      sleObj.drugId = selections.id
+      sleObj.drugCode = selections.code
+      sleObj.drugName = selections.name
+      this.sysMaterialMedcineItemApply.push(sleObj)
+    },
+    // 医药类别子表的显示列表
+    chooseDrug () {
+      this.$refs.drug.init()
+    },
   }
 }
 </script>
@@ -1586,6 +1579,7 @@ export default {
   height: calc(100vh - 84px);
   padding: 12px;
   box-sizing: border-box;
+  overflow-y: auto;
 }
 .btn_group {
   width: 100%;