dedsudiyu 1 éve
szülő
commit
8252d56db0

BIN
src/assets/ZDimages/chemicalManage/icom_xzspr_sf.png


+ 13 - 13
src/views/chemicalManage/basicManagement/chemicalInfo/index.vue

@@ -5,17 +5,8 @@
       <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm"
                  :inline="true" style="width:100%;">
-          <el-form-item label="名称" prop="queryParamsData1" label-width="50px">
-            <el-input
-              maxLength="30"
-              v-model="queryParams.queryParamsData1"
-              placeholder="化学品/别名/CAS号"
-              clearable
-              style="width: 200px"
-            />
-          </el-form-item>
-          <el-form-item label="类别" prop="queryParamsData2">
-            <el-select v-model="queryParams.queryParamsData2" clearable placeholder="请选择" style="width: 200px">
+          <el-form-item label="" prop="queryParamsData2">
+            <el-select v-model="queryParams.queryParamsData2" clearable placeholder="请选择类别" style="width: 200px">
               <el-option
                 v-for="dict in optionListA"
                 :key="dict.value"
@@ -24,8 +15,8 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="级别" prop="queryParamsData3">
-            <el-select v-model="queryParams.queryParamsData3" clearable placeholder="请选择" style="width: 200px">
+          <el-form-item label="" prop="queryParamsData3">
+            <el-select v-model="queryParams.queryParamsData3" clearable placeholder="请选择级别" style="width: 200px">
               <el-option
                 v-for="dict in optionListB"
                 :key="dict.value"
@@ -34,6 +25,15 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="" prop="queryParamsData1" label-width="50px">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.queryParamsData1"
+              placeholder="化学品/别名/CAS号"
+              clearable
+              style="width: 200px"
+            />
+          </el-form-item>
           <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
           <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
           <p class="page-add-common-style-button"

+ 5 - 2
src/views/chemicalManage/basicManagement/chemicalInfo/msdsPage.vue

@@ -8,7 +8,7 @@
       <div class="msdsPage-min">
         <div class="page-form-title-box" style="padding:20px 5px 0 0;">
           <el-form :model="queryParamsData" class="form-box" ref="queryForm" :inline="true">
-            <el-form-item label="关键字" prop="name">
+            <el-form-item label="" prop="name">
               <el-input
                 maxLength="20"
                 v-model="queryParamsData.name"
@@ -31,7 +31,7 @@
             </el-form-item>
           </el-form>
         </div>
-        <div class="page-content-box" style="padding:20px 0;">
+        <div class="page-content-box" style="padding: 0 0 20px 0;">
           <el-table class="table-box" border :data="tableList" ref="multipleTable" :row-key="getRowKeys"
                     tooltip-effect="dark" @select-all="dialogCheck" @select="dialogCheck">
             <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
@@ -249,6 +249,9 @@
         display: flex;
         flex-direction: column;
         overflow: hidden;
+        .page-form-title-box{
+          border:none;
+        }
       }
     }
   }

+ 13 - 12
src/views/chemicalManage/basicManagement/chemicalsCabinetManage/index.vue

@@ -5,17 +5,8 @@
       <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm"
                  :inline="true" style="width:100%;">
-          <el-form-item label="关键字" prop="queryParamsData1">
-            <el-input
-              maxLength="30"
-              v-model="queryParams.queryParamsData1"
-              placeholder="化学品名/别名/CAS号"
-              clearable
-              style="width: 200px"
-            />
-          </el-form-item>
-          <el-form-item label="学院" prop="queryParamsData2">
-            <el-select v-model="queryParams.queryParamsData2" placeholder="请选择" style="width: 200px">
+          <el-form-item label="" prop="queryParamsData2">
+            <el-select v-model="queryParams.queryParamsData2" placeholder="请选择学院" style="width: 200px">
               <el-option
                 v-for="item in deptOptions"
                 :key="item.deptId"
@@ -24,13 +15,23 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="楼栋楼层" prop="queryParamsData3">
+          <el-form-item label="" prop="queryParamsData3">
             <el-cascader
+              placeholder="请选择楼栋楼层"
               :props="{value: 'id', label: 'name',children:'buildFloorVoList'}"
               v-model="queryParams.queryParamsData3"
               :options="buildFloorOptions">
             </el-cascader>
           </el-form-item>
+          <el-form-item label="" prop="queryParamsData1">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.queryParamsData1"
+              placeholder="化学品名/别名/CAS号"
+              clearable
+              style="width: 200px"
+            />
+          </el-form-item>
           <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
           <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
           <p class="page-add-common-style-button"

+ 10 - 10
src/views/chemicalManage/basicManagement/chemicalsCabinetManage/infoPage.vue

@@ -29,7 +29,7 @@
         <div class="page-form-title-box">
           <el-form :model="queryParams" class="form-box" ref="queryForm"
                    :inline="true" style="width:100%;">
-            <el-form-item label="开门时间" prop="state">
+            <el-form-item label="" prop="state">
               <el-date-picker
                 :clearable="false"
                 v-model="dateRangeA"
@@ -38,11 +38,11 @@
                 value-format="yyyy-MM-dd"
                 type="daterange"
                 range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                start-placeholder="开门时间"
+                end-placeholder="开门时间"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item label="关门时间" prop="state">
+            <el-form-item label="" prop="state">
               <el-date-picker
                 :clearable="false"
                 v-model="dateRangeB"
@@ -51,12 +51,12 @@
                 value-format="yyyy-MM-dd"
                 type="daterange"
                 range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                start-placeholder="关门时间"
+                end-placeholder="关门时间"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item label="业务类型" prop="queryParamsData2">
-              <el-select v-model="queryParams.queryParamsData2" placeholder="请选择" style="width: 120px">
+            <el-form-item label="" prop="queryParamsData2">
+              <el-select v-model="queryParams.queryParamsData2" placeholder="请选择业务类型" style="width: 160px">
                 <el-option
                   v-for="item in optionsA"
                   :key="item.value"
@@ -65,8 +65,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="认证方式" prop="queryParamsData2">
-              <el-select v-model="queryParams.queryParamsData2" placeholder="请选择" style="width: 120px">
+            <el-form-item label="" prop="queryParamsData2">
+              <el-select v-model="queryParams.queryParamsData2" placeholder="请选择认证方式" style="width: 160px">
                 <el-option
                   v-for="item in optionsB"
                   :key="item.value"

+ 19 - 19
src/views/chemicalManage/basicManagement/chemicalsCabinetManage/listPage.vue

@@ -17,19 +17,9 @@
       <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm"
                  :inline="true" style="width:100%;">
-          <el-form-item label="关键字" prop="queryParamsData1">
-            <el-input
-              maxLength="30"
-              v-model="queryParams.queryParamsData1"
-              placeholder="化学品名/CAS/编码/归属人"
-              clearable
-              style="width: 220px"
-            />
-          </el-form-item>
-
-          <el-form-item label="状态" prop="queryParamsData2">
+          <el-form-item label="" prop="queryParamsData2">
             <el-select v-model="queryParams.queryParamsData2"
-                       placeholder="请选择" style="width: 140px">
+                       placeholder="请选择状态" style="width: 140px">
               <el-option
                 v-for="item in statusOptions"
                 :key="item.value"
@@ -38,9 +28,9 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="类别" prop="queryParamsData3">
+          <el-form-item label="" prop="queryParamsData3">
             <el-select v-model="queryParams.queryParamsData2"
-                       placeholder="请选择" style="width: 140px">
+                       placeholder="请选择类别" style="width: 140px">
               <el-option
                 v-for="item in categoryOptions"
                 :key="item.value"
@@ -49,9 +39,9 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="级别" prop="queryParamsData3">
+          <el-form-item label="" prop="queryParamsData3">
             <el-select v-model="queryParams.queryParamsData2"
-                       placeholder="请选择" style="width: 140px">
+                       placeholder="请选择级别" style="width: 140px">
               <el-option
                 v-for="item in levelOptions"
                 :key="item.value"
@@ -60,7 +50,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="过期时间" prop="state">
+          <el-form-item label="" prop="state">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -69,10 +59,19 @@
               value-format="yyyy-MM-dd"
               type="daterange"
               range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="过期时间"
+              end-placeholder="过期时间"
             ></el-date-picker>
           </el-form-item>
+          <el-form-item label="" prop="queryParamsData1">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.queryParamsData1"
+              placeholder="化学品名/CAS/编码/归属人"
+              clearable
+              style="width: 220px"
+            />
+          </el-form-item>
           <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
           <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
         </el-form>
@@ -264,6 +263,7 @@
       }
       .page-form-title-box{
         border:none;
+        padding-left: 0;
       }
       .num-min-box{
         background-color:rgba(1,131,250,0.2);

+ 1 - 1
src/views/chemicalManage/basicManagement/msdsSpecification/index.vue

@@ -4,7 +4,7 @@
     <div class="page-container msdsSpecificationPage" v-if="pageType === 1">
       <div class="page-form-title-box">
         <el-form :model="queryParamsData" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px">
-          <el-form-item label="化学品名称" prop="name">
+          <el-form-item label="" prop="name">
             <el-input
               v-model="queryParamsData.name"
               placeholder="请输入化学品名称"

+ 1 - 1
src/views/chemicalManage/earlyWarningEvent/infoPage.vue

@@ -124,7 +124,7 @@
           <el-form :model="infoDataForm" ref="form" label-width="0">
             <el-form-item label="" prop="name">
               <span style="font-size:16px;">处理备注:</span>
-              <el-input v-model="infoDataForm.name" placeholder="请输入名称" maxLength="70" style="width:1335px;"></el-input>
+              <el-input v-model="infoDataForm.name" placeholder="请输入名称" maxLength="70" style="width:1325px;"></el-input>
             </el-form-item>
           </el-form>
           <div class="button-bottom-box">

+ 1 - 0
src/views/chemicalManage/inventoryManagement/inventoryStatistics/listPage.vue

@@ -262,6 +262,7 @@
       }
       .page-form-title-box{
         border:none;
+        padding-left:0;
       }
       .num-min-box{
         background-color:rgba(1,131,250,0.2);

+ 1 - 0
src/views/chemicalManage/inventoryManagement/savePending/infoPage.vue

@@ -226,6 +226,7 @@
       }
       .border-p{
         border-top:20px solid #F5F5F5;
+        margin-top:40px;
       }
       .for-table-box{
         margin-top:30px;

+ 0 - 603
src/views/chemicalManage/purchaseManage/examineProcess/examineUserDialog.vue

@@ -1,603 +0,0 @@
-<!--审批流程-->
-<template>
-  <div class="app-container approvalProcess">
-    <el-dialog title="选择人员" :visible.sync="userDialogType" :close-on-click-modal="false" v-if="userDialogType"
-               width="900px" append-to-body id="approvalProcess-dialog-box">
-      <div class="dialog-max-big-box">
-        <div class="dialog-left-max-big-box">
-          <p class="title-p">选择:</p>
-          <div class="big-box">
-            <!--input部分-->
-            <div class="input-box">
-              <input type="text" placeholder="搜索姓名或工号、身份"
-                     v-model="queryParamsData.searchValue">
-              <p class="el-icon-search" @click="handleQuery"></p>
-            </div>
-            <!--可滚动数据部分-->
-            <div class="list-max-box scrollbar-box">
-              <!--人员部分-->
-              <div class="user-box" v-for="(item,index) in userList" :key="index" @click="addObjButton(item)">
-                <img v-if="item.type" src="@/assets/ZDimages/basicsModules/icon_xzqx_xz.png">
-                <img v-if="!item.type" src="@/assets/ZDimages/basicsModules/icon_xzqx_zc.png">
-                <p>{{item.nickName}}</p>
-                <p>{{item.positionName}}</p>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="dialog-right-max-big-box">
-          <p class="title-p">已选:</p>
-          <div class="big-box scrollbar-box">
-            <div class="user-for-box" v-for="(item,index) in userDialogRightList.actAudituserInfo" :key="index">
-              <img v-if="item.avatar" :src="item.avatar">
-              <img v-if="!item.avatar" src="@/assets/ZDimages/basicsModules/tx_cion.png">
-              <p>{{item.nickName}}</p>
-              <p class="el-icon-circle-close" @click="delRightUser(index)"></p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="dialog-bottom-box">
-        <div class="pagination-box">
-          <pagination :page-sizes="[20, 30, 40, 50]"
-                      v-show="total>0"
-                      :total="total"
-                      :pager-count="5"
-                      layout="total, prev, pager, next"
-                      :page.sync="queryParams.pageNum"
-                      :limit.sync="queryParams.pageSize"
-                      @pagination="getUserList()"
-          />
-        </div>
-        <div class="radio-box">
-          <el-radio-group v-model="userDialogRightList.auditType">
-            <el-radio :label="1" style="color:#999;">依次审批</el-radio>
-            <el-radio :label="2" style="color:#999;">或签</el-radio>
-          </el-radio-group>
-        </div>
-        <div class="text-box">选择不能超过10人</div>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <p class="dialog-footer-null-p"></p>
-        <el-button @click="offDialog">取 消</el-button>
-        <el-button type="primary" @click="upDataButton">确 定</el-button>
-        <p class="dialog-footer-null-p"></p>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import { getConfigList,treeselect,listUser,auditconfig } from "@/apiDemo/medicUniversity-3_1/index";
-  export default {
-    name: "index",
-    data(){
-      return{
-        //流程数据
-        dataList:[],
-        //人员选择页面开关
-        userDialogType:false,
-        //选中流程的index
-        userDialogTypeIndex:null,
-        //窗口右侧已选中人员数据
-        userDialogRightList:{},
-        //面包屑数据
-        titleList:[],
-        //院系数据
-        deptList:[],
-        //人员数据
-        userList:[
-          {name:"柴云龙1",type:true,text:"安全责任人",id:1,},
-          {name:"柴云龙2",type:false,text:"安全责任人",id:2,},
-          {name:"柴云龙3",type:true,text:"安全责任人",id:3,},
-          {name:"柴云龙4",type:false,text:"安全责任人",id:4,},
-          {name:"柴云龙5",type:true,text:"安全责任人",id:5,},
-          {name:"柴云龙6",type:false,text:"安全责任人",id:6,},
-        ],
-        //查询数据
-        queryParamsData:{
-          pageNum:1,
-          pageSize:20,
-        },
-        // 搜索实际发送数据
-        queryParams:{
-          pageNum:1,
-          pageSize:20,
-        },
-        //数据数量
-        total:0,
-        deptId:"",
-      }
-    },
-    created() {
-
-    },
-    mounted(){
-      this.getConfigList();
-    },
-    methods: {
-      //关闭弹窗
-      offDialog(){
-        this.$set(this,'userDialogType',false);
-        this.$set(this.queryParamsData,'searchValue',"");
-        this.$set(this.queryParams,'nickName',"");
-        this.$set(this,'deptId',"");
-        this.$set(this,'userDialogRightList',[]);
-        this.$set(this,'userDialogTypeIndex',"");
-      },
-      // 查询设置
-      getConfigList(){
-        getConfigList().then(response => {
-          this.dataList = response.rows
-        });
-      },
-      //添加勾选人员
-      addObjButton(item){
-        if(!item.type){
-          if(this.userDialogRightList.actAudituserInfo.length<10){
-            this.userDialogRightList.actAudituserInfo.push(item);
-            this.checkDataProcess();
-          }else{
-            this.msgError('选择不能超过10人')
-          }
-        }
-      },
-      //删除选中人员
-      delRightUser(index){
-        this.userDialogRightList.actAudituserInfo.splice(index,1);
-        this.checkDataProcess();
-      },
-      // 勾选数据处理
-      checkDataProcess(){
-        let self = this;
-        for(let i=0;i<self.userList.length;i++){
-          let num = 0;
-          for(let o=0;o<self.userDialogRightList.actAudituserInfo.length;o++){
-            if(self.userList[i].userId == self.userDialogRightList.actAudituserInfo[o].userId){
-              num++
-            }
-          }
-          self.userList[i].type = num != 0;
-        }
-        self.$forceUpdate();
-      },
-      //面包屑点击事件
-      titleClick(index){
-        let self = this;
-        this.getCatalogListOne(this.titleList[index].id);
-        this.$set(this.queryParams,'pageNum',1);
-        this.$set(this,'deptId',this.titleList[index].id);
-        this.getUserList();
-        let list = [];
-        let data = JSON.parse(JSON.stringify(self.titleList))
-        for(let i=index;i>=0;i--){
-          list.unshift(data[i]);
-        }
-        this.$set(this,'titleList',list);
-      },
-      // 目录点击事件
-      deptClick(item){
-        this.titleList.push(item);
-        this.getCatalogListOne(item.id);
-        this.$set(this.queryParams,'pageNum',1);
-        this.$set(this,'deptId',item.id);
-        this.getUserList();
-      },
-      // 查询目录
-      getCatalogListOne(id){
-        treeselect({parentId:id}).then(response => {
-          this.deptList = response.data;
-        });
-      },
-      // 查询目录初始化
-      getCatalogList(id){
-        treeselect({parentId:id}).then(response => {
-          this.deptList = response.data[0].children;
-          this.$set(this,'titleList',[response.data[0]]);
-        });
-      },
-      // 查询人员列表
-      getUserList(){
-        this.queryParamsData = JSON.parse(JSON.stringify(this.queryParams));
-        this.queryParamsData.deptId = this.deptId;
-        listUser(this.queryParamsData).then(response => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.checkDataProcess();
-        });
-      },
-      handleQuery() {
-        this.$set(this.queryParamsData,'pageNum',1);
-        this.queryParams = JSON.parse(JSON.stringify(this.queryParamsData));
-        this.getUserList();
-      },
-      // 编辑人员页面开启
-      openDialogButton(index){
-        let self = this;
-        this.$set(this.queryParamsData,'searchValue',"");
-        this.$set(this.queryParams,'nickName',"");
-        this.$set(this,'deptId',"");
-        this.getCatalogList("");
-        this.getUserList("");
-        this.$set(this,'userDialogRightList',JSON.parse(JSON.stringify(this.dataList[index])));
-        this.$set(this,'userDialogTypeIndex',index);
-        this.$set(this,'userDialogType',true);
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .approvalProcess{
-    flex:1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden!important;
-    p{
-      margin:0;
-      padding:0;
-    }
-    .title-box{
-      display: flex;
-      height:90px;
-      border-bottom: 1px solid #D8D8D8;
-      p:nth-child(1){
-        flex:1;
-        font-size:16px;
-        line-height:90px;
-        margin-left:18px;
-        color:#0045AF;
-      }
-      p:nth-child(2){
-        margin:25px 25px 0 0;
-      }
-    }
-    .approvalProcess-page{
-      flex:1;
-      font-weight:500;
-      padding:40px 0;
-      .process-max-box{
-        width:350px;
-        height:215px;
-        margin:0 auto;
-        .process-big-box{
-          width:350px;
-          height:130px;
-          .process-text-box{
-            width:350px;
-            height:50px;
-            background: #0183fa;
-            display: flex;
-            img{
-              width:24px;
-              height:24px;
-              margin:13px 8px 13px 20px;
-            }
-            p{
-              flex:1;
-              font-size:16px;
-              color:#fff;
-              line-height:50px;
-            }
-          }
-          .process-name-p{
-            width:350px;
-            height:80px;
-            border:1px solid #e0e0e0;
-            line-height:80px;
-            font-size:16px;
-            padding-left:20px;
-          }
-        }
-        .process-img-box{
-          position: relative;
-          height:85px;
-          .process-img-bottom{
-            display: block;
-            width:17px;
-            height:85px;
-            margin:0 auto;
-          }
-          .process-add-button-img{
-            cursor: pointer;
-            position: absolute;
-            bottom:36px;
-            left:163px;
-            width:24px;
-            height:24px;
-          }
-        }
-      }
-      .process-max-box-for-over{
-        height:300px!important;
-      }
-      .process-max-box-for{
-        width:350px;
-        height:215px;
-        margin:0 auto;
-        .process-big-box{
-          width:350px;
-          height:130px;
-          .process-text-box{
-            width:350px;
-            height:50px;
-            background: #FFA50A;
-            display: flex;
-            img{
-              width:24px;
-              height:24px;
-              margin:13px 8px 13px 20px;
-            }
-            p{
-              flex:1;
-              font-size:16px;
-              color:#fff;
-              line-height:50px;
-            }
-            i{
-              cursor: pointer;
-              color:#fff;
-              font-size:24px;
-              line-height:50px;
-              margin:0 18px 0 0;
-            }
-          }
-          .process-name-box{
-            display: flex;
-            border:1px solid #e0e0e0;
-            cursor: pointer;
-            .process-name-p{
-              width:350px;
-              height:80px;
-              line-height:80px;
-              font-size:16px;
-              padding-left:20px;
-            }
-            .el-icon-arrow-right{
-              line-height:80px;
-              font-size:24px;
-              margin-right:13px;
-              color:#999;
-            }
-          }
-          .process-img-box{
-            position: relative;
-            height:85px;
-            .process-img-bottom{
-              display: block;
-              width:17px;
-              height:85px;
-              margin:0 auto;
-            }
-            .process-add-button-img{
-              cursor: pointer;
-              position: absolute;
-              bottom:36px;
-              left:163px;
-              width:24px;
-              height:24px;
-            }
-          }
-          .over-text-one{
-            text-align: center;
-            font-size:16px;
-            line-height:20px;
-            color:#3D3D3D;
-            margin:15px 0 10px 0;
-          }
-          .over-text-two{
-            text-align: center;
-            font-size:14px;
-            line-height:20px;
-            color:#999999;
-          }
-        }
-      }
-    }
-  }
-</style>
-<style lang="scss">
-  #approvalProcess-dialog-box{
-    p{
-      margin:0;
-    }
-    .el-dialog__body{
-      padding:0 30px;
-      .dialog-max-big-box{
-        display: flex;
-        .dialog-left-max-big-box{
-          flex:1;
-          .title-p{
-            margin:18px 0 14px 0;
-            font-size:16px;
-            color:#333;
-          }
-          .big-box{
-            width: 400px;
-            height:515px;
-            background: #F5F5F5;
-            border-radius: 6px;
-            overflow: hidden;
-            .input-box{
-              width:358px;
-              height:40px;
-              margin:21px 21px 0;
-              display: flex;
-              border-radius:6px;
-              overflow: hidden;
-              input{
-                border:none;
-                outline:none;
-                color:#333;
-                height:40px;
-                width:300px;
-                padding-left:10px;
-              }
-              input::placeholder{
-                color:#CCCCCC;
-              }
-              p{
-                cursor: pointer;
-                width:58px;
-                line-height:40px;
-                font-size:24px;
-                background: #fff;
-                color:#E0E0E0;
-                text-align: center;
-              }
-            }
-            .title-list-box{
-              width:400px;
-              padding:0 20px;
-              height:54px;
-              overflow-x: scroll;
-              overflow-y: hidden;
-              white-space: nowrap;
-              .title-for{
-                display: inline-block;
-                /*display: flex;*/
-                .spanColor{
-                  color:#0045AF;
-                  cursor: pointer;
-                }
-                span:nth-child(1){
-                  display: inline-block;
-                  line-height:54px;
-                  font-size:14px;
-                }
-                span:nth-child(2){
-                  display: inline-block;
-                  width:24px;
-                  text-align: center;
-                  line-height:54px;
-                  color:#333333;
-                  font-size:14px;
-                }
-              }
-            }
-            .list-max-box{
-              height:400px;
-              .dept-box:hover{
-                background: rgba(0,69,175,0.1);
-              }
-              .dept-box{
-                cursor: pointer;
-                display: flex;
-                img:nth-child(1){
-                  width:30px;
-                  height:30px;
-                  margin:11px 16px 0 23px;
-                }
-                p:nth-child(2){
-                  flex:1;
-                  line-height:52px;
-                  font-size:14px;
-                  color:#333;
-                }
-                img:nth-child(3){
-                  width:20px;
-                  height:20px;
-                  margin: 16px 9px;
-                }
-                p:nth-child(4){
-                  line-height:52px;
-                  font-size:14px;
-                  color:#0045af;
-                  margin-right:22px;
-                }
-              }
-              .user-box:hover{
-                background: rgba(0,69,175,0.1);
-              }
-              .user-box{
-                cursor: pointer;
-                display: flex;
-                img:nth-child(1){
-                  width:14px;
-                  height:14px;
-                  margin:12px 13px 0 28px;
-                }
-                p:nth-child(2){
-                  line-height:40px;
-                  color:#333;
-                  font-size:14px;
-                  flex:1;
-                }
-                p:nth-child(3){
-                  line-height:40px;
-                  color:#333;
-                  font-size:14px;
-                  margin-right:30px;
-                }
-              }
-            }
-          }
-        }
-        .dialog-right-max-big-box{
-          flex:1;
-          .title-p{
-            margin:18px 0 14px 20px;
-            font-size:16px;
-            color:#333;
-          }
-          .big-box{
-            width: 400px;
-            height:515px;
-            background: #F5F5F5;
-            border-radius: 6px;
-            margin-left:20px;
-            .user-for-box:hover{
-              background: rgba(0,69,175,0.1);
-            }
-            .user-for-box{
-              display: flex;
-              img{
-                width:40px;
-                height:40px;
-                margin:10px 23px 0 26px;
-                border-radius:50%;
-              }
-              p:nth-child(2){
-                flex:1;
-                line-height:60px;
-                font-size:14px;
-                color:#333;
-              }
-              p:nth-child(3){
-                cursor: pointer;
-                line-height:60px;
-                font-size:24px;
-                color:#A2A2A2;
-                margin-right:27px;
-              }
-            }
-          }
-        }
-      }
-    }
-    .dialog-bottom-box{
-      height:56px;
-      display: flex;
-      .pagination-box{
-        width:400px;
-      }
-      .radio-box{
-        flex:1;
-        font-size:14px;
-        margin-left:50px;
-        margin-top:22px;
-      }
-      .text-box{
-        margin-top:20px;
-        font-size:14px;
-        color:#999999;
-      }
-    }
-    .dialog-footer{
-      display: flex;
-      .dialog-footer-null-p{
-        flex:1;
-      }
-    }
-  }
-</style>

+ 179 - 54
src/views/chemicalManage/purchaseManage/examineProcess/index.vue

@@ -58,7 +58,7 @@
                 <div class="form-for-user-select-box">
                   <p>*</p>
                   <p>审核人</p>
-                  <p>{{item.data2[0]?'已选择'+item.data2.length+'人':'请选择审批人'}}</p>
+                  <p @click="dialogOpen">{{item.data2[0]?'已选择'+item.data2.length+'人':'请选择审批人'}}</p>
                 </div>
                 <div class="form-for-user-check-box">
                   <div class="check-img-box">
@@ -86,18 +86,30 @@
       <div class="user-max-big-box">
         <div class="user-big-left-box">
           <div class="title-max-box">
-            <p>请选择该节点的审批人:</p>
-            <p :class="examineType == 1 ? 'check-p' : ''" @click="examineButton(1)">身份列表</p>
-            <p :class="examineType == 2 ? 'check-p' : ''" @click="examineButton(2)">指定人员</p>
-          </div>
-          <div class="user-max-box">
             <div class="input-box">
-              <el-input class="input-user" placeholder="请输入内容" v-model="input2"></el-input>
+              <p class="left-table" :class="examineType == 1 ? 'check-p' : ''" @click="examineButton(1)">身份列表</p>
+              <p class="right-table" :class="examineType == 2 ? 'check-p' : ''" @click="examineButton(2)">指定人员</p>
+              <el-input class="input-user" placeholder="请搜索选择节点审批人" v-model="queryParams.searchValue"></el-input>
               <p class="input-icon el-icon-search"></p>
             </div>
           </div>
+          <div class="user-max-box">
+            <div class="user-for-box" v-for="(item,index) in userListLeft" :key="index">
+              <img v-if="item.type == 1" src="@/assets/ZDimages/chemicalManage/icom_xzspr_sf.png">
+              <img v-if="item.type == 2 && !item.avatar" src="@/assets/ZDimages/basicsModules/tx_cion.png">
+              <img v-if="item.type == 2 && item.avatar" :src="item.avatar">
+              <p class="user-for-name">{{item.name}}</p>
+              <p class="user-for-add el-icon-circle-plus-outline"></p>
+            </div>
+          </div>
           <div class="user-bottom-box">
-
+            <pagination :page-sizes="[20, 30, 40, 50]"
+                        v-show="total>0"
+                        :total="total"
+                        :page.sync="queryParams.page"
+                        :limit.sync="queryParams.pageSize"
+                        @pagination="getList"
+            />
           </div>
         </div>
         <div class="user-big-right-box">
@@ -105,7 +117,13 @@
             <p>已选:</p>
           </div>
           <div class="user-max-box">
-
+            <div class="user-for-box" v-for="(item,index) in userListRight" :key="index">
+              <img v-if="item.type == 1" src="@/assets/ZDimages/chemicalManage/icom_xzspr_sf.png">
+              <img v-if="item.type == 2 && !item.avatar" src="@/assets/ZDimages/basicsModules/tx_cion.png">
+              <img v-if="item.type == 2 && item.avatar" :src="item.avatar">
+              <p class="user-for-name">{{item.name}}</p>
+              <p class="user-for-del el-icon-circle-close"></p>
+            </div>
           </div>
           <div class="user-bottom-box">
             <p></p>
@@ -143,9 +161,59 @@
           },
         ],
         //人员选择页面开关
-        examineProcessDialogType:true,
+        examineProcessDialogType:false,
         //身份/人员类型
         examineType:1,
+        queryParams:{
+          searchValue:'',
+          page:1,
+          pageSize:20,
+        },
+        total:10,
+        userListLeft:[
+          {
+            type:1,
+            avatar:'',
+            name:'身份类型1',
+          },
+          {
+            type:1,
+            avatar:'',
+            name:'身份类型2',
+          },
+          {
+            type:2,
+            avatar:'https://img2.baidu.com/it/u=853340836,1127893721&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500',
+            name:'姓名-工号1',
+          },
+          {
+            type:2,
+            avatar:'',
+            name:'姓名-工号2',
+          },
+        ],
+        userListRight:[
+          {
+            type:1,
+            avatar:'',
+            name:'身份类型3',
+          },
+          {
+            type:1,
+            avatar:'',
+            name:'身份类型4',
+          },
+          {
+            type:2,
+            avatar:'https://img0.baidu.com/it/u=1016138010,1907110459&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500',
+            name:'姓名-工号3',
+          },
+          {
+            type:2,
+            avatar:'https://img0.baidu.com/it/u=3121974779,1726178990&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500',
+            name:'姓名-工号4',
+          },
+        ],
 
       }
     },
@@ -207,6 +275,9 @@
         }).catch(() => {});
       },
       //***********************************人员相关***********************************
+      dialogOpen(){
+        this.$set(this,'examineProcessDialogType',true);
+      },
       //关闭弹窗
       dialogOut(){
         this.$set(this,'examineProcessDialogType',false);
@@ -527,70 +598,91 @@
         margin-right:30px;
         .title-max-box{
           display: flex;
+          height:40px;
           margin-bottom:10px;
-          p{
-            height:30px;
-            line-height:28px;
-          }
-          p:nth-child(1){
-            font-size:16px;
-            flex:1;
-          }
-          p:nth-child(2){
-            cursor: pointer;
-            width:80px;
-            font-size:14px;
-            text-align: center;
-            border:1px solid #A2A2A2;
-            border-right:none;
-            border-top-left-radius: 15px;
-            border-bottom-left-radius: 15px;
-          }
-          p:nth-child(3){
-            cursor: pointer;
-            width:80px;
-            font-size:14px;
-            text-align: center;
-            border:1px solid #A2A2A2;
-            border-left:none;
-            border-top-right-radius: 15px;
-            border-bottom-right-radius: 15px;
-          }
-          .check-p{
-            border:1px solid #0183FA!important;
-            background-color: #0183FA;
-            color:#fff;
-          }
-        }
-        .user-max-box{
-          border:1px solid #dedede;
-          flex:1;
           .input-box{
-            margin:20px;
             border:1px solid #dedede;
             height:40px;
-            width:542px;
             display: flex;
             overflow: hidden;
             border-radius:4px;
+            .left-table{
+              width:80px;
+              line-height:38px;
+              text-align: center;
+              cursor: pointer;
+              color:#C0C4CC;
+            }
+            .right-table{
+              width:80px;
+              line-height:38px;
+              text-align: center;
+              cursor: pointer;
+              color:#C0C4CC;
+            }
             .input-user{
-              width:510px;
+              width:382px;
+              border-left:1px solid #dedede;
               input{
                 border:none;
               }
             }
             .input-icon{
-              width:32px;
+              width:40px;
               height:40px;
               line-height:40px;
               text-align: center;
               cursor: pointer;
               font-size:14px;
             }
+            .input-icon:hover{
+              color:#fff;
+              background-color: #0183FA;
+            }
+            .check-p{
+              border:1px solid #0183FA!important;
+              background-color: #0183FA;
+              color:#fff;
+            }
+          }
+        }
+        .user-max-box{
+          border:1px solid #dedede;
+          flex:1;
+          padding-top:20px;
+          .user-for-box{
+            display: flex;
+            cursor: pointer;
+            padding:5px 0;
+            img{
+              margin:0 20px 0 20px;
+              display: block;
+              width:30px;
+              height:30px;
+              border-radius:50%;
+            }
+            .user-for-name{
+              line-height:30px;
+              font-size:16px;
+              flex:1;
+            }
+            .user-for-add{
+              line-height:30px;
+              font-size:20px;
+              color:#0183FA;
+              margin-right:20px;
+            }
+          }
+          .user-for-box:hover{
+            background-color: rgba(30,144,255,0.1);
+
           }
         }
         .user-bottom-box{
           height:60px;
+          .pagination-container{
+            padding:15px 20px!important;
+          }
         }
       }
       .user-big-right-box{
@@ -599,22 +691,53 @@
         flex-direction:column;
         .title-max-box{
           display: flex;
+          height:40px;
           margin-bottom:10px;
+          padding:0 20px;
           p{
-            height:30px;
-            line-height:28px;
+            font-size:16px;
+            height:40px;
+            line-height:40px;
           }
           p:nth-child(1){
-            font-size:16px;
             flex:1;
           }
         }
         .user-max-box{
           border:1px solid #dedede;
           flex:1;
+          padding-top:20px;
+          .user-for-box{
+            display: flex;
+            cursor: pointer;
+            padding:5px 0;
+            img{
+              margin:0 20px 0 20px;
+              display: block;
+              width:30px;
+              height:30px;
+              border-radius:50%;
+            }
+            .user-for-name{
+              line-height:30px;
+              font-size:16px;
+              flex:1;
+            }
+            .user-for-del{
+              line-height:30px;
+              font-size:20px;
+              color:#0183FA;
+              margin-right:20px;
+            }
+          }
+          .user-for-box:hover{
+            background-color: rgba(30,144,255,0.1);
+
+          }
         }
         .user-bottom-box{
           height:60px;
+          display: flex;
           p:nth-child(1){
             flex:1;
           }
@@ -625,6 +748,8 @@
             line-height:40px;
             font-size:16px;
             color:#0183FA;
+            margin-top:10px;
+            cursor: pointer;
           }
         }
       }