Merge branch 'project1' of http://gitlab.91isoft.com:90/yangshuo/template_vue into project1

src/api/equipment/application.js

+import request from '@/utils/request'
+// 根据key值查询数据字典数据
+export function getDictData(params) {
+  return request({
+    url: '/wbapply/queryDict',
+    method: 'get',
+    params
+  })
+}
+// 新增设备新增
+export function addApplication(data) {
+  return request({
+    url: '/wbapply/add',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}

src/api/equipment/basicInfo.js

 import request from '@/utils/request'
-import Qs from 'qs'
 // 查询基础信息列表
 export function listBasicInfo(query) {
   return request({
@@ -8,57 +7,27 @@ export function listBasicInfo(query) {
     params: query
   })
 }
-export function getlistRole() {
-  return request({
-    url: 'system/role/listAll',
-    method: 'get'
-  })
-}
-
-// 查询角色详细
-export function getRole(businessId) {
-  return request({
-    url: '/system/role/detail/' + businessId,
-    method: 'get'
-  })
-}
 
-// 新增角色
-export function addRole(data) {
-  data = Qs.stringify(data)
+// 新增设备基本信息
+export function add(data) {
   return request({
-    url: '/system/role/add',
+    url: '/wbbaseinfo/add',
     method: 'post',
     data: data,
     headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
-  })
-}
-
-// 修改角色
-export function updateRole(data) {
-  const businessId = data.businessId
-  data = Qs.stringify(data)
-  return request({
-    url: '/system/role/update/' + businessId,
-    method: 'put',
-    data,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
+      'Content-Type': 'application/json;charset=UTF-8'
     }
   })
 }
 
-// 角色数据权限
-export function dataScope(data) {
-  data = Qs.stringify(data)
+// 修改基础信息接口
+export function updataInfo(data) {
   return request({
-    url: '/system/role/dataScope',
+    url: '/wbbaseinfo/update',
     method: 'put',
     data,
     headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
+      'Content-Type': 'application/json;charset=UTF-8'
     }
   })
 }

src/api/sample/sampleType.js

+import request from '@/utils/request'
+
+// 查询列表
+export function queryList(params) {
+  return request({
+    url: '/wbchemistrymapping/queryWbChemistryMappingByPagination',
+    method: 'get',
+    params
+  })
+}
+// 添加基础信息接口
+export function add(data) {
+  return request({
+    url: '/wbchemistrymapping/add',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+// 根据id查询基础信息接口
+export function getDetailById(id) {
+  return request({
+    url: '/wbchemistrymapping/detail/' + id,
+    method: 'get'
+  })
+}
+// 编辑基础信息接口
+export function updataInfo(data) {
+  return request({
+    url: '/wbchemistrymapping/update',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+// 逻辑删除基础信息接口
+export function deleteLogical(id) {
+  return request({
+    url: '/wbchemistrymapping/deleteLogical/' + id,
+    method: 'delete'
+  })
+}

src/views/equipment/basicInfo.vue

@@ -34,7 +34,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
-        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right;padding:3px 15px;">
         <el-button
@@ -49,7 +49,7 @@
     <div class="placeholder" />
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">设备基本信息列表</div>
-      <el-table v-loading="loading" border :data="basicInfoList" @selection-change="handleSelectionChange" >
+      <el-table v-loading="loading" border :data="basicInfoList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="50" />
         <el-table-column label="pn" prop="pn">
           <template slot-scope="scope">
@@ -73,7 +73,8 @@
         </el-table-column>
         <el-table-column label="pissb" prop="pissb">
           <template slot-scope="scope">
-            {{ scope.row.prank || '-' }}
+            <span v-if="scope.row.pissb === '0'">否</span>
+            <span v-else>是</span>
           </template>
         </el-table-column>
         <el-table-column label="psm" prop="psm">
@@ -123,7 +124,7 @@
     />
 
     <!-- 添加或修改设备基本信息配置对话框 -->
-    <el-dialog title="设备基本信息" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="pn" prop="pn">
           <el-input v-model.trim="form.pn" show-word-limit :maxlength="30" placeholder="请输入pn" />
@@ -132,10 +133,10 @@
           <el-input v-model.trim="form.ptype" show-word-limit :maxlength="30" placeholder="请输入ptype" />
         </el-form-item>
         <el-form-item label="pgx" prop="pgx">
-          <el-input-number v-model="form.pgx" style="width: 100%" controls-position="right" :min="0" placeholder="请输入pgx" />
+          <el-input v-model.trim="form.pgx" show-word-limit :maxlength="30" placeholder="请输入pgx" />
         </el-form-item>
         <el-form-item label="prank" prop="prank">
-          <el-input-number v-model="form.prank" style="width: 100%" controls-position="right" :min="0" placeholder="请输入prank" />
+          <el-input v-model.trim="form.prank" show-word-limit :maxlength="30" placeholder="请输入prank" />
         </el-form-item>
         <el-form-item label="pissb" prop="pissb">
           <el-select
@@ -154,10 +155,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="psm" prop="psm">
-          <el-input-number v-model="form.psm" style="width: 100%" controls-position="right" :min="0" placeholder="请输入psm" />
+          <el-input v-model.trim="form.psm" show-word-limit :maxlength="30" placeholder="请输入psm" />
         </el-form-item>
         <el-form-item label="psy" prop="psy">
-          <el-input-number v-model="form.psy" style="width: 100%" controls-position="right" :min="0" placeholder="请输入psy" />
+          <el-input v-model.trim="form.psy" show-word-limit :maxlength="30" placeholder="请输入psy" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -169,20 +170,8 @@
 </template>
 
 <script>
-// import {
-//   addRole,
-//   changeRoleStatus,
-//   dataScope,
-//   delRole,
-//   exportRole,
-//   getRole,
-//   listBasicInfo,
-//   updateRole
-// } from '@/api/equipment/basicInfo'
-import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
-import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
-import { listBasicInfo } from '@/api/equipment/basicInfo'
-// import { getRolesByInsId } from '../../../api/businessManage/template'
+import { add, listBasicInfo, updataInfo} from '@/api/equipment/basicInfo'
+import { parseTime } from '@/utils'
 export default {
   name: 'Role',
   data() {
@@ -255,7 +244,8 @@ export default {
         rows: 10,
         pn: undefined,
         ptype: undefined,
-        pgx: undefined
+        pgx: undefined,
+        delFlag: 0
       },
       // 表单参数
       form: {},
@@ -315,33 +305,13 @@ export default {
     /** 查询基础信息列表 */
     getList() {
       this.loading = true
-      listBasicInfo(this.queryParams).then(
-        response => {
-          this.basicInfoList = response.rows
-          this.total = response.total
-          this.loading = false
-        }
-      )
-    },
-    /** 查询菜单树结构 */
-    getMenuTreeselect() {
-      menuTreeselect().then(response => {
-        this.menuOptions = response.data
-      })
-    },
-    /** 查询菜单列表 */
-    getMenuList(roleId) {
-      roleMenuTreeselectMC(roleId).then(response => {
-        this.menuList = this.handleTree(response.data.menus, 'businessId')
+      listBasicInfo(this.queryParams).then(res => {
+        res.rows.createDate = parseTime(res.rows.createDate,'{y}-{m}-{d}')
+        this.total = res.total
+        this.basicInfoList = res.rows
         this.loading = false
       })
     },
-    /** 查询部门树结构 */
-    getDeptTreeselect() {
-      deptTreeselect().then(response => {
-        this.deptOptions = response.data
-      })
-    },
     // 所有菜单节点数据
     getMenuAllCheckedKeys() {
       // 目前被选中的菜单节点
@@ -376,24 +346,6 @@ export default {
         return response
       })
     },
-    // 角色状态修改
-    handleStatusChange(row) {
-      const text = row.flag === '1' ? '启用' : '停用'
-      this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return changeRoleStatus(row.businessId, row.flag)
-      }).then(() => {
-        this.$message({
-          message: text + '成功',
-          type: 'success'
-        })
-      }).catch(function() {
-        row.flag = row.flag === '0' ? '1' : '0'
-      })
-    },
     // 取消按钮
     cancel() {
       this.open = false
@@ -478,10 +430,8 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
-      this.getMenuTreeselect()
       this.open = true
-      this.title = '添加角色'
+      this.title = '添加设备基础信息表单'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -502,23 +452,30 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function() {
-      this.$refs['form'].validate(valid => {
+      this.$refs.form.validate((valid) => {
         if (valid) {
           if (this.form.businessId !== undefined) {
-            this.form.menuIds = this.getMenuAllCheckedKeys()
             // eslint-disable-next-line no-undef
-            updateBasicInfo(this.form).then(response => {
-              this.msgSuccess('修改成功')
+            updataInfo(this.form).then(res => {
+              if (res.code === 200) {
                 this.open = false
+                this.$message.success('操作成功')
                 this.getList()
+                this.reFrom()
+              } else if (res.code === null) {
+                this.$message.error(res.message)
+              }
             })
           } else {
-            this.form.menuIds = this.getMenuAllCheckedKeys()
-            // eslint-disable-next-line no-undef
-            addBasicInfo(this.form).then(response => {
-              this.msgSuccess('新增成功')
+            add(this.form).then(res => {
+              if (res.code === 200) {
                 this.open = false
+                this.$message.success('操作成功')
                 this.getList()
+                this.reFrom()
+              } else if (res.code === null) {
+                this.$message.error(res.message)
+              }
             })
           }
         }

src/views/equipment/draw.vue

@@ -34,7 +34,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
-        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <div class="placeholder" />
@@ -64,7 +64,8 @@
         </el-table-column>
         <el-table-column label="pissb" prop="pissb">
           <template slot-scope="scope">
-            {{ scope.row.pissb || '-' }}
+            <span v-if="scope.row.pissb === '0'">否</span>
+            <span v-else >是</span>
           </template>
         </el-table-column>
         <el-table-column label="状态" prop="pstatus">
@@ -244,7 +245,8 @@ export default {
         pn: undefined,
         lot: undefined,
         plocation: undefined,
-        ptype: 1
+        ptype: 1,
+        delFlag: 0
       },
       // 表单参数
       form: {},

src/views/login/login.vue

@@ -20,20 +20,20 @@
             <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
           </el-input>
         </el-form-item>
-        <el-form-item prop="code">
-          <el-input
-            v-model="loginForm.code"
-            auto-complete="off"
-            placeholder="验证码"
-            style="width: 63%"
-            @keyup.enter.native="handleLogin"
-          >
-            <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-          </el-input>
-          <!--<div class="login-code">
-            <img :src="codeUrl" @click="getCode">
-          </div>-->
-        </el-form-item>
+<!--        <el-form-item prop="code">-->
+<!--          <el-input-->
+<!--            v-model="loginForm.code"-->
+<!--            auto-complete="off"-->
+<!--            placeholder="验证码"-->
+<!--            style="width: 63%"-->
+<!--            @keyup.enter.native="handleLogin"-->
+<!--          >-->
+<!--            <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
+<!--          </el-input>-->
+<!--          &lt;!&ndash;<div class="login-code">-->
+<!--            <img :src="codeUrl" @click="getCode">-->
+<!--          </div>&ndash;&gt;-->
+<!--        </el-form-item>-->
         <el-form-item style="width:80%;margin-bottom: 20px">
           <el-button
             class="blue-btn"

src/views/processManagement/draw.vue

@@ -34,7 +34,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
-        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <div class="placeholder" />
@@ -64,7 +64,8 @@
         </el-table-column>
         <el-table-column label="pissb" prop="pissb">
           <template slot-scope="scope">
-            {{ scope.row.pissb || '-' }}
+            <span v-if="scope.row.pissb === '0'">否</span>
+            <span v-else >是</span>
           </template>
         </el-table-column>
         <el-table-column label="状态" prop="pstatus">
@@ -244,7 +245,8 @@ export default {
         pn: undefined,
         lot: undefined,
         plocation: undefined,
-        ptype: 2
+        ptype: 2,
+        delFlag: 0
       },
       // 表单参数
       form: {},

src/views/processManagement/inventoryRecord/index.vue

@@ -36,7 +36,6 @@
           />
         </el-form-item>
 
-
         <el-form-item label="库类型" prop="ptype">
           <el-select
             v-model="queryParams.ptype"
@@ -114,7 +113,7 @@
       <component
         :is="BaseTable"
         :key="queryParams.rows"
-        :nIndex="nIndex"
+        :n-index="nIndex"
         :all-table-arguments="allTableArguments"
         @handle-detail="handleDetail"
       />
@@ -133,7 +132,7 @@
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
 
         <el-row :gutter="10" justify="start" align="middle">
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="pn：" prop="pn">
               <el-input v-model.trim="singleDetails.pn" :readonly="isReadOnly" />
             </el-form-item>
@@ -143,23 +142,36 @@
             <el-form-item label="plocation：" prop="plocation">
               <el-input v-model.trim="singleDetails.plocation" :readonly="isReadOnly" />
             </el-form-item>
+            <el-form-item label="操作员：" prop="user">
+              <el-input v-model.trim="singleDetails.user" :readonly="isReadOnly" />
+            </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="库类型：" prop="ptype">
-              <el-input v-model.trim="singleDetails.ptype" :readonly="isReadOnly" />
+              {{ selectedPtype(singleDetails.ptype) }}
             </el-form-item>
             <el-form-item label="库状态：" prop="poperate">
-              <el-input v-model.trim="singleDetails.poperate" :readonly="isReadOnly" />
+              {{ selectedPoperate(singleDetails.poperate) }}
+            </el-form-item>
+            <el-form-item label="fqYs：" prop="fqYs">
+              {{ singleDetails.fqYs }}
             </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
             <el-form-item label="操作时间：" prop="createDate">
               <el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" />
             </el-form-item>
-            <el-form-item label="操作员：" prop="user">
-              <el-input v-model.trim="singleDetails.user" :readonly="isReadOnly" />
+          </el-col>
+        </el-row>
+
+        <el-row v-if=" singleDetails.poperate==='4' ">
+          <el-col :span="12">
+            <el-form-item label="创建人：" prop="createBy">
+              <el-input v-model.trim="singleDetails.createBy" :readonly="isReadOnly" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="创建时间：" prop="createDate">
+              <el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -175,7 +187,7 @@ import { listLog } from '@/api/processLibrary/InventoryRecord'
 import BaseTable from '@/components/Table/BaseTable/index.vue'
 
 export default {
-  name: 'LoginInfo',
+  name: 'InventoryRecord',
   components: [
     BaseTable
   ],
@@ -279,14 +291,7 @@ export default {
             prop: 'ptype',
             label: '库类型',
             ownDefinedReturn: (row, $index) => {
-              switch (row.ptype) {
-                case '1':
-                  return '设备库'
-                case '2':
-                  return '工序库'
-                default:
-                  return ''
-              }
+              return this.selectedPtype(row.ptype)
             }
           },
           {
@@ -295,18 +300,7 @@ export default {
             label: '库状态',
             width: '180px',
             ownDefinedReturn: (row, $index) => {
-              switch (row.poperate) {
-                case '1':
-                  return '入库'
-                case '2':
-                  return '出库'
-                case '3':
-                  return '修正'
-                case '4':
-                  return '废弃'
-                default:
-                  return ''
-              }
+              return this.selectedPoperate(row.poperate)
             }
           },
           {
@@ -348,7 +342,6 @@ export default {
         ]
       },
 
-
       title: '',
       openDetails: false,
       isReadOnly: true,
@@ -373,7 +366,6 @@ export default {
     BaseTable() {
       return BaseTable
     },
-
     /* TODO:自定义分页索引，实现索引继承 */
     nIndex(index) {
       // TODO: 当前页数 - 1 * 每页数据条数 + 1
@@ -381,7 +373,6 @@ export default {
       const rows = this.queryParams.rows // TODO: 每页条数
       return index + 1 + (page - 1) * rows
     },
-
     // TODO: 用来汇总Table组件所需要的全部数据并一次性传输给子组件
     allTableArguments() {
       return {
@@ -419,6 +410,33 @@ export default {
         this.loading = false
       })
     },
+
+    /* TODO: ptype 库类型判断的公用方法 */
+    selectedPtype(ptype) {
+      switch (ptype) {
+        case '1':
+          return '设备库'
+        case '2':
+          return '工序库'
+        default:
+          return ''
+      }
+    },
+    /* TODO: poperate的库状态判断的公用方法 */
+    selectedPoperate(poperate) {
+      switch (poperate) {
+        case '1':
+          return '入库'
+        case '2':
+          return '出库'
+        case '3':
+          return '修正'
+        case '4':
+          return '废弃'
+        default:
+          return ''
+      }
+    },
     handleClose() {
       this.clearVisible = false
       this.exportVisible = false
@@ -458,8 +476,6 @@ export default {
       margin-bottom:10px
     }
 
-
-
   /*TODO: 这里是调整ToolBar的样式的噢！*/
     .ToolBar{
       .el-form{
@@ -475,9 +491,9 @@ export default {
     }
   }
 
-
   /* TODO: 专门用来解决el-input边框的问题 */
   .aboutSingleDetails{
+    .el-form{
       .el-form-item{
         .el-input >>> .el-input__inner {
           -webkit-appearance: none;
@@ -490,5 +506,7 @@ export default {
       }
     }
 
+  }
+
   </style>
 

src/views/sample/sampleType/index.vue

@@ -15,7 +15,7 @@
       </el-form-item>
       <el-form-item label="name" prop="name">
         <el-input
-          v-model="queryParams.name"
+          v-model="queryParams.dname"
           placeholder="请输入名称"
           clearable
           size="small"
@@ -25,7 +25,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
-        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
@@ -57,29 +57,19 @@
             {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
+        <el-table-column label="dname" prop="dname" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.qty || '-' }}
+            {{ scope.row.dname || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="name" prop="name" :show-overflow-tooltip="true">
+        <el-table-column label="dno" prop="dno" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.name || '-' }}
+            {{ scope.row.dno || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="max_qty" prop="max_qty" :show-overflow-tooltip="true">
+        <el-table-column label="remarks" prop="remarks" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.max_qty || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="min_qty" prop="min_qty" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.min_qty || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="unit" prop="unit" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.unit || '-' }}
+            {{ scope.row.remarks || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作人" prop="createName" :show-overflow-tooltip="true">
@@ -87,9 +77,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" prop="create_date" :show-overflow-tooltip="true">
+        <el-table-column label="操作时间" prop="createDate" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.create_date || '-' }}
+            {{ scope.row.createDate || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作">
@@ -122,28 +112,56 @@
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.page"
-      :limit.sync="queryParams.page"
+      :limit.sync="queryParams.rows"
       @pagination="getList"
     />
     <!--  新增修改弹出  -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="pn" prop="pn">
+          <el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" />
+        </el-form-item>
+        <el-form-item label="dname" prop="dname">
+          <el-input v-model.trim="form.dname" :maxlength="30" placeholder="请输入dname" />
+        </el-form-item>
+        <el-form-item label="dno" prop="dno">
+          <el-input v-model.trim="form.dno" :maxlength="30" placeholder="请输入dno" />
+        </el-form-item>
+        <el-form-item label="remarks" prop="remarks">
+          <el-input v-model.trim="form.remarks" :maxlength="30" placeholder="请输入remarks" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </div>
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
-import {queryList} from '@/api/sample/basicInformation'
+import { add, deleteLogical, getDetailById, queryList, updataInfo } from '@/api/sample/sampleType'
+import { parseTime } from '@/utils'
 
 export default {
   name: 'Index',
   data() {
     return {
+      title: '',
+      open: false,
+      form: {},
+      rules: {
+        pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
+        dname: [{ required: true, message: '请输入name', trigger: 'blur' }]
+      },
       total: 0,
       loading: false,
       queryParams: {
         page: 1,
         rows: 10,
         pn: '',
-        name: ''
+        dname: ''
       },
       statusOptions: {},
       basicinfoMationList: []
@@ -153,17 +171,67 @@ export default {
     this.getList()
   },
   methods: {
-    handleDelete() {
-
+    // 删除
+    handleDelete(row) {
+      const id = row.businessId
+      this.$confirm('是否确认操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(res => {
+        deleteLogical(id).then(res => {
+          if (res.code === 200) {
+            this.$message.success('操作成功')
+            this.getList()
+          }
+        })
+      })
     },
-    handleUpdate() {
-
+    // 修改
+    handleUpdate(row) {
+      const id = row.businessId
+      getDetailById(id).then(res => {
+        this.form = res.data
+        this.open = true
+        this.title = '修改样品种类表单'
+      })
+    },
+    // 提交
+    submitForm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          // 校验通过，提交表单或进行其他操作
+          if (this.form.businessId !== undefined) {
+            updataInfo(this.form).then(res => {
+              if (res.code === 200) {
+                this.open = false
+                this.$message.success('操作成功')
+                this.getList()
+                this.reFrom()
+              } else if (res.code === null) {
+                this.$message.error(res.message)
+              }
+            })
+          } else {
+            add(this.form).then(res => {
+              if (res.code === 200) {
+                this.open = false
+                this.$message.success('操作成功')
+                this.getList()
+                this.reFrom()
+              } else if (res.code === null) {
+                this.$message.error(res.message)
+              }
+            })
+          }
+        }
+      })
     },
     // 初始化获取数据
     getList() {
       this.loading = true
       queryList(this.queryParams).then(res => {
-        console.log('res', res)
+        res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
         this.total = res.total
         this.basicinfoMationList = res.rows
         this.loading = false
@@ -180,15 +248,31 @@ export default {
         page: 1,
         rows: 10,
         pn: '',
-        name: ''
+        dname: ''
       }
       this.getList()
     },
     handleAdd() {
-
+      this.open = true
+      this.title = '添加样品种类表单'
     },
     handleExport() {
 
+    },
+    cancel() {
+      this.open = false
+      this.reFrom()
+    },
+    // 清空表单
+    reFrom() {
+      this.form = {
+        businessId: undefined,
+        pn: '',
+        dname: '',
+        dno: '',
+        remarks: ''
+      }
+      this.$refs.form.clearValidate()
     }
   }
 }

src/views/system/dept/index.vue

 <template>
   <div class="app-container">
-    <el-form v-show="showSearch" ref="queryForm" :model="queryParams" :inline="true">
+    <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
       <el-form-item label="部门名称" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
@@ -22,12 +22,19 @@
       </el-form-item>
       <el-form-item>
         <el-button
+          style="padding: 8px 7px;"
+          icon="el-icon-search"
           class="filter-item"
           type="primary"
           size="small"
           @click="getList"
         >查询</el-button>
+      </el-form-item>
+      <div style="float: right">
+        <el-form-item>
           <el-button
+            style="padding: 8px 7px;"
+            icon="el-icon-plus"
             class="filter-item"
             type="primary"
             size="small"
@@ -35,8 +42,10 @@
           >新增</el-button>
           <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
         </el-form-item>
+      </div>
     </el-form>
 
+    <div style="padding:5px 10px">
       <el-table
         v-loading="Loading"
         :data="deptList"
@@ -125,6 +134,7 @@
           </template>
         </el-table-column>
       </el-table>
+    </div>
 
     <!-- 添加或修改部门对话框 -->
     <el-dialog title="部门信息" :visible.sync="open" width="600px" append-to-body>
@@ -190,7 +200,7 @@
 </template>
 
 <script>
-import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} from '@/api/system/dept'
+import { addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept } from '@/api/system/dept'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
@@ -426,3 +436,31 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+.app-container {
+  font-size: 18px;
+  padding: 0;
+
+  .placeholder {
+    height: 1.3vh;
+    background-color: #F4F4F4;
+    margin-bottom: 10px
+  }
+
+  .table-drop {
+    vertical-align: 2px;
+    line-height: 20px;
+    margin-left: 15px
+  }
+
+  .el-switch {
+    margin-left: 15px;
+  }
+}
+.el-divider--vertical{
+  height: 12em;
+  width: 4px;
+}
+</style>
+

src/views/system/role/index.vue

@@ -39,12 +39,14 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="handleQuery">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
           <el-button
+            style="padding: 8px 7px;"
             type="primary"
+            icon="el-icon-plus"
             size="small"
             @click="handleAdd"
           >新增</el-button>

src/views/system/user/index.vue

@@ -40,7 +40,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
-          <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+          <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
         </el-form-item>
         <el-form-item style="float: right">
           <!--          <el-button-->