Merge remote-tracking branch 'origin/project1' into project1

src/api/equipment/basicInfo.js

@@ -39,33 +39,11 @@ export function updataInfo(data) {
   })
 }
 
-// 角色状态修改
-export function changeRoleStatus(businessId, flag) {
-  const data = {
-    businessId,
-    flag
-  }
+// 逻辑删除基础信息接口
+export function deleteLogical(id) {
   return request({
-    url: '/system/role/changeStatus',
-    method: 'put',
-    params: data
-  })
-}
-
-// 删除角色
-export function delRole(roleId) {
-  return request({
-    url: '/system/role/deleteLogical/' + roleId,
+    url: '/wbbaseinfo/deleteLogical/' + id,
     method: 'delete'
   })
 }
 
-// 导出角色
-export function exportRole(query) {
-  return request({
-    url: '/system/role/export',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/equipment/check.js

@@ -20,3 +20,28 @@ export function abandon(data) {
     }
   })
 }
+
+export function checkType(data){
+  return request({
+    url: '/wbwarehouseinventorytemp/checkType/' + data,
+    method:'get'
+  })
+}
+
+export function addList(data){
+  return request({
+    url: '/wbwarehouseinventorytemp/addList',
+    method:'post',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function deleteByType(data){
+  return request({
+    url: '/wbwarehouseinventorytemp/deleteByType/' + data,
+    method:'delete'
+  })
+}
\ No newline at end of file

src/api/magnagement.js

@@ -8,4 +8,30 @@ export function listdevice(query) {
     params: query
   })
 }
+export function updatadevice(data) {
+  return request({
+    url: '/wbwarehouse/update',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+export function getDetailById(id) {
+  return request({
+    url: '/wbwarehouse/detail/' + id,
+    method: 'get'
+  })
+}
+export function add(data) {
+  return request({
+    url: '/wbwarehouse/add',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 

src/api/processLibrary/InventoryRecord.js → src/api/processMangement/InventoryRecord.js

 import request from '@/utils/request'
 
+// TODO: 用来进行工序库的出入库记录的 分页+时间+普通字段的查询
 export function listLog(queryParams) {
-  console.log('this is date:', queryParams.dateRange)
   return request({
     url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
     method: 'get',
     params: queryParams
   })
 }
+
+export function findSingleLogDetail(singleLogIdAndFqYs) {
+  return request({
+    url: '/wbwarehouselog/detail',
+    method: 'post',
+    data: singleLogIdAndFqYs,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}

src/components/Table/AllTableArguments/BaseTableArguments.js

@@ -81,7 +81,7 @@ export function BaseTableArguments(selection, loading, processList, queryParams,
 }
 
 // TODO: 组件表单所需的所有参数
-export function BaseTableArgumentsTest(nIndex, selection, loading, processList, queryParams, columnData) {
+export function BaseTableArgumentsTest(nIndex, selection, loading, List, queryParams, columnData) {
   // TODO: 选择框是否需要存在    (selection判断表单选择框是否需要存在)
   if (typeof selection !== 'boolean') {
     console.warn('selection下拉框参数的type类型错误!请检查后重新赋值')
@@ -108,5 +108,5 @@ export function BaseTableArgumentsTest(nIndex, selection, loading, processList,
     this.queryParams = queryParamsType
   }
   this.columnData = columnData
-  this.processList = processList
+  this.List = List
 }

src/components/Table/BaseTable/index.vue

@@ -7,12 +7,12 @@
           v-loading="allTableArguments.loading"
           class="processList"
           border
-          :data="allTableArguments.processList"
+          :data="allTableArguments.List"
           style="width: 100%"
           @selection-change="handleSelectionChange"
         >
 
-          <el-table-column type="index" label="序号" width="50" :index="nIndex" />
+          <el-table-column type="index" label="序号" width="50"/>
 
           <!-- TODO: 选择框是否开启，selectable控制是否单行禁用 -->
           <el-table-column v-if="allTableArguments.columObj.selection" type="selection" :selectable="allTableArguments.columObj.selectable" width="50px" />
@@ -30,7 +30,7 @@
             :index="columIndex"
             show-overflow-tooltip
           >
-            <template slot-scope="{row,$index}">
+            <template  slot-scope="{row,$index}">
 
               <!-- 默认展示 -->
               <span v-if="column.text && column.editRow !== $index">{{ row[column.prop] || '-' }}</span>
@@ -88,7 +88,7 @@ export default {
           selection: Boolean,
           loading: Boolean,
           queryParams: Object,
-          processList: Array,
+          List: Array,
           columnData: Array
         }
       }

src/views/equipment/application.vue

@@ -117,18 +117,24 @@ export default {
     },
     // 提价时要调的接口
     submitForm() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          addApplication(this.form).then(res => {
-            console.log('res', res)
-            if (res.code === 200) {
-              this.$message.success('操作成功')
-              this.resetFrom()
-            } else if (res.code === null) {
-              this.$message.success(res.message)
-            }
-          })
-        }
+      this.$confirm('是否确认提交?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(res => {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            addApplication(this.form).then(res => {
+              console.log('res', res)
+              if (res.code === 200) {
+                this.$message.success('操作成功')
+                this.resetFrom()
+              } else if (res.code === null) {
+                this.$message.success(res.message)
+              }
+            })
+          }
+        })
       })
     },
     // 调数据字典查询

src/views/equipment/basicInfo.vue

@@ -92,9 +92,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate" width="200px">
           <template slot-scope="scope">
-            <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
@@ -170,7 +170,7 @@
 </template>
 
 <script>
-import { add, listBasicInfo, updataInfo, getDetailById } from '@/api/equipment/basicInfo'
+import { add, listBasicInfo, updataInfo, getDetailById, deleteLogical } from '@/api/equipment/basicInfo'
 import { parseTime } from '@/utils'
 export default {
   name: 'Role',
@@ -264,15 +264,11 @@ export default {
         pgx: [
           { required: true, message: '请输入pgx', trigger: 'blur' }
         ],
-        prank: [
-          { required: true, message: '请输入prank', trigger: 'blur' }
-        ],
+        prank: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
         pissb: [
           { required: true, message: '请输入pissb', trigger: 'blur' }
         ],
-        psm: [
-          { required: true, message: '请输入psm', trigger: 'blur' }
-        ],
+        psm: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
         psy: [
           { required: true, message: '请输入psy', trigger: 'blur' }
         ]
@@ -306,7 +302,7 @@ export default {
     getList() {
       this.loading = true
       listBasicInfo(this.queryParams).then(res => {
-        res.rows.createDate = parseTime(res.rows.createDate,'{y}-{m}-{d}')
+        res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
         this.total = res.total
         this.basicInfoList = res.rows
         this.loading = false
@@ -475,25 +471,24 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const roleIds = row.businessId || this.ids
-      this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', {
+      const id = row.businessId
+      this.$confirm('是否确认操作?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function() {
-        return delRole(roleIds)
-      }).then(() => {
-        this.getList()
-        this.$message({
-          message: '删除成功',
-          type: 'success'
+      }).then(res => {
+        deleteLogical(id).then(res => {
+          if (res.code === 200) {
+            this.$message.success('操作成功')
+            this.getList()
+          }
         })
-      }).catch(function() {
       })
     }
   }
 }
 </script>
+
 <style lang="scss" scoped>
 .app-container {
   font-size: 18px;

src/views/equipment/check.vue

@@ -38,19 +38,13 @@
       </el-form-item>
       <div style="float: right">
         <el-form-item>
-          <el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="handleAdd">开始盘点 {{ check }} </el-button>
+          <el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="checkType">开始盘点 {{ check }} </el-button>
         </el-form-item>
-        <!-- 这俩都没写接口以及方法 -->
+        
         <el-form-item>
-          <el-button
-            style="padding: 8px 7px;"
-            type="danger"
-            :size="smallSize"
-            icon="el-icon-minus"
-          >结束盘点
-            {{ check }}
-          </el-button>
+          <el-button style="padding: 8px 7px;" type="danger" :size="smallSize" @click="deleteByType" icon="el-icon-minus">结束盘点 {{ check }}</el-button>
         </el-form-item>
+        
       </div>
     </el-form>
     <div class="placeholder" />
@@ -229,7 +223,7 @@ import {
   getRole,
   updateRole
 } from '@/api/system/role'
-import { listCheck} from '@/api/equipment/check'
+import { checkType, listCheck,addList,deleteByType} from '@/api/equipment/check'
 import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
 import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
@@ -237,6 +231,13 @@ export default {
   name: 'Role',
   data() {
     return {
+      // 需要盘点的list
+      checkFrom: {
+         Ptype: '',
+         checkList: [],
+      },
+      // 选中的列表
+      selectList:[],
       // TODO: 表单里的单项详情参数
       singleDetails: {
         equipmentName: '',
@@ -400,6 +401,37 @@ export default {
       this.title = '详情信息'
       this.openDetails = !this.openDetails
     },
+    deleteByType(){
+      deleteByType(1).then(flag => {
+        if(flag.data > 0 && flag.code === 200){
+          this.$message.success("结束盘点成功")
+        }else{
+            this.$message.error("结束盘点失败")
+        }
+      })
+    },
+    checkType(){
+      checkType(1).then(total => {
+        if(total.data !== 0){
+          this.$message.error("请先结束盘点")
+        }else{
+          let data = []
+          if(this.selectList.length === 0){
+            data = this.equipmentList
+          }else{
+            data = this.selectList
+          }
+          addList(data).then(flag => {
+            if(flag.data.influence > 0){
+              this.$message.success("盘点成功")
+            }else{
+              this.$message.error("盘点失败")
+            }
+          })
+        }
+      })
+    },
+
     handelTab(i, e) {
       const that = this
       if (!that.$refs['input' + i]) {
@@ -565,6 +597,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.roleId)
+      this.selectList = selection
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },

src/views/equipment/checkProcess.vue

@@ -38,24 +38,11 @@
       </el-form-item>
       <div style="float: right">
         <el-form-item>
-          <el-button
-            style="padding: 8px 7px;"
-            :type="typePrimary"
-            :size="smallSize"
-            :icon="addIcon"
-          >开始盘点
-            {{ check }}
-          </el-button>
+          <el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="checkType">开始盘点 {{ check }} </el-button>
         </el-form-item>
+        
         <el-form-item>
-          <el-button
-            style="padding: 8px 7px;"
-            type="danger"
-            :size="smallSize"
-            icon="el-icon-minus"
-          >结束盘点
-            {{ check }}
-          </el-button>
+          <el-button style="padding: 8px 7px;" type="danger" :size="smallSize" @click="deleteByType" icon="el-icon-minus">结束盘点 {{ check }}</el-button>
         </el-form-item>
       </div>
     </el-form>
@@ -236,7 +223,8 @@ import {
   listRole,
   updateRole
 } from '@/api/system/role'
-import {listCheck} from '@/api/equipment/check'
+import {listCheck } from '@/api/equipment/checkProcess'
+import { checkType, addList,deleteByType} from '@/api/equipment/check'
 import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
 import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
@@ -258,6 +246,7 @@ export default {
       openDetails: false,
       // // TODO: 模拟测试数据
       equipmentList: [],
+      selectList: [],
       // check: '开始盘点',
       typeParent: 'text',
       typePrimary: 'primary',
@@ -403,6 +392,36 @@ export default {
       this.title = '详情信息'
       this.openDetails = !this.openDetails
     },
+    deleteByType(){
+      deleteByType(2).then(flag => {
+        if(flag.data > 0){
+          this.$message.success("结束盘点成功")
+        }else{
+              this.$message.error("结束盘点失败")
+        }
+      })
+    },
+    checkType(){
+      checkType(2).then(total => {
+        if(total.data !== 0){
+          this.$message.error("请先结束盘点")
+        }else{
+          let data = []
+          if(this.selectList.length === 0){
+            data = this.equipmentList
+          }else{
+            data = this.selectList
+          }
+          addList(data).then(flag => {
+            if(flag.data.influence > 0){
+              this.$message.success("盘点成功")
+            }else{
+              this.$message.error("盘点失败")
+            }
+          })
+        }
+      })
+    },
     handelTab(i, e) {
       const that = this
       if (!that.$refs['input' + i]) {

src/views/equipment/draw.vue

@@ -79,9 +79,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate" width="200px">
           <template slot-scope="scope">
-            <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">

src/views/equipment/management.vue

@@ -35,8 +35,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
-        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</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" />
@@ -44,12 +44,12 @@
       <div class="mb12 font-small-bold">设备管理列表</div>
       <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="80" />
-        <el-table-column label="pn" prop="businessId" width="120">
+        <el-table-column label="pn" prop="businessId">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="lot" prop="lot" width="120">
+        <el-table-column label="lot" prop="lot">
           <template slot-scope="scope">
             {{ scope.row.lot || '-' }}
           </template>
@@ -74,7 +74,7 @@
             <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
           <template slot-scope="scope">
             <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
               详情
@@ -167,19 +167,19 @@
         <el-form-item label="parnk：" prop="prank">
           <el-input v-model.trim="singleDetails.prank" :readonly="true" />
         </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="操作员：" prop="createName">
+              <el-input v-model.trim="singleDetails.createName" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label=" 操作时间：" prop="createDate">
+              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="操作员：" prop="createName">
-            <el-input v-model.trim="singleDetails.createName" :readonly="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label=" 操作时间：" prop="createDate">
-            <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-dialog>
   </div>
 </template>
@@ -305,8 +305,9 @@ export default {
         pn: undefined,
         lot: undefined,
         plocation: undefined,
-        pstatus: 1,
-        ptype: 1
+        pstatus: 0,
+        ptype: 1,
+        delFlag: 0
       },
       // 表单参数
       form: {

src/views/processManagement/basicProcessManagement/index.vue

@@ -35,21 +35,21 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
-        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</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" />
     <div style="padding:5px 10px">
-      <div class="mb12 font-small-bold">设备管理列表</div>
+      <div class="mb12 font-small-bold">工序库列表</div>
       <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="80" />
-        <el-table-column label="pn" prop="businessId" width="120">
+        <el-table-column label="pn" prop="businessId">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="lot" prop="lot" width="120">
+        <el-table-column label="lot" prop="lot">
           <template slot-scope="scope">
             {{ scope.row.lot || '-' }}
           </template>
@@ -74,7 +74,7 @@
             <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
           <template slot-scope="scope">
             <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
               详情
@@ -176,19 +176,19 @@
         <el-form-item label="parnk：" prop="prank">
           <el-input v-model.trim="singleDetails.prank" :readonly="true" />
         </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="操作员：" prop="createName">
+              <el-input v-model.trim="singleDetails.createName" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label=" 操作时间：" prop="createDate">
+              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="操作员：" prop="createName">
-            <el-input v-model.trim="singleDetails.createName" :readonly="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label=" 操作时间：" prop="createDate">
-            <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-dialog>
   </div>
 </template>
@@ -314,8 +314,9 @@ export default {
         pn: undefined,
         lot: undefined,
         plocation: undefined,
-        pstatus: 1,
-        ptype: 2
+        pstatus: 0,
+        ptype: 2,
+        delFlag: 0
       },
       // 表单参数
       form: {

src/views/processManagement/draw.vue

@@ -79,9 +79,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate" width="200px">
           <template slot-scope="scope">
-            <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">

src/views/processManagement/inventoryRecord/index.vue

@@ -128,7 +128,15 @@
     />
 
     <!-- TODO: 单项详情信息表单配置 -->
-    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" :close-on-click-modal="false" width="800px" append-to-body>
+    <el-dialog
+      class="aboutSingleDetails"
+      :title="title"
+      :visible.sync="openDetails"
+      :close-on-click-modal="false"
+      width="800px"
+      append-to-body
+      @closed="handleClose"
+    >
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
 
         <el-row :gutter="10" justify="start" align="middle">
@@ -142,9 +150,6 @@
             <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="12">
@@ -154,36 +159,60 @@
             <el-form-item label="库状态：" prop="poperate">
               {{ selectedPoperate(singleDetails.poperate) }}
             </el-form-item>
-            <el-form-item label="fqYs：" prop="fqYs">
-              {{ singleDetails.fqYs }}
-            </el-form-item>
-            <el-form-item label="操作时间：" prop="createDate">
-              <el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" />
-            </el-form-item>
-          </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>
 
-      </el-form>
+        <!-- TODO: 这里是 库状态为废弃时才会触发显示的模块 -->
+        <transition name="fade-transform" mode="out-in">
+
+          <el-row v-if=" activateAbandonedState " style="height: 160px">
+            <el-col :span="12">
+              <el-form-item label="fq_ys：" prop="fq_ys">
+                {{ singleDetails.fq_ys }}
+              </el-form-item>
+              <el-form-item label="fq_bz：" prop="fq_bz">
+                {{ singleDetails.fq_bz }}
+              </el-form-item>
+              <el-form-item label="fq_dbxi：" prop="fq_dbxi">
+                {{ singleDetails.fq_dbxi }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="fq_dd：" prop="fq_dd">
+                {{ singleDetails.fq_dd }}
+              </el-form-item>
+              <el-form-item label="fq_mcode：" :label-width="10" prop="fq_mcode">
+                {{ singleDetails.fq_mcode }}
+              </el-form-item>
+              <el-form-item label="fq_yy：" prop="fq_yy">
+                {{ singleDetails.fq_yy }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <transition />
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="操作员：" prop="userName">
+                <el-input v-model.trim="singleDetails.userName" :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>
+
+        </transition></el-form>
     </el-dialog>
 
   </div>
 </template>
 
 <script>
-import { listLog } from '@/api/processLibrary/InventoryRecord'
+import { listLog, findSingleLogDetail } from '@/api/processMangement/InventoryRecord'
 import BaseTable from '@/components/Table/BaseTable/index.vue'
 
 export default {
@@ -225,10 +254,10 @@ export default {
           label: '出库'
         },
         {
-          value: '1',
+          value: '3',
           label: '修正'
         }, {
-          value: '2',
+          value: '4',
           label: '废弃'
         }
       ],
@@ -273,8 +302,8 @@ export default {
             return true
           }
         },
-        // column列,columType(列类型,可选text(默认为普通文字模式),input(input可编辑框),switch(switch开关),image(图片),operation(操作按钮))
-        // prop(参数),label(列名),width(宽度),align(对齐方式),sortable(是否支持排序)
+        // TODO: column列,columType(列类型,可选text(默认为普通文字模式),input(input可编辑框),switch(switch开关),image(图片),operation(操作按钮))
+        // TODO: :prop(参数),label(列名),width(宽度),align(对齐方式),sortable(是否支持排序)
         columnData: [
           {
             text: true,
@@ -312,7 +341,7 @@ export default {
           },
           {
             text: true,
-            prop: 'user',
+            prop: 'userName',
             label: '操作员',
             sortable: false,
             width: '150px'
@@ -346,20 +375,10 @@ export default {
       openDetails: false,
       isReadOnly: true,
       // TODO: 表单里的单项详情参数
-      singleDetails: {
-        pn: '',
-        lot: '',
-        ptype: '',
-        poperate: '',
-        plocation: '',
-        remarks: '',
-        fqYs: '',
-        user: '',
-        createBy: '',
-        updateBy: '',
-        createDate: '',
-        updateDate: ''
-      }
+      singleDetails: {},
+      // TODO: 获取表单单项详情的参数
+      singleLogIdAndFqYs: {},
+      activateAbandonedState: false
     }
   },
   computed: {
@@ -378,7 +397,7 @@ export default {
       return {
         listName: '出入库记录列表',
         loading: this.loading,
-        processList: this.inventoryRecordList,
+        List: this.inventoryRecordList,
         queryParams: this.queryParams,
         columObj: this.columObj
       }
@@ -437,14 +456,7 @@ export default {
           return ''
       }
     },
-    handleClose() {
-      this.clearVisible = false
-      this.exportVisible = false
-    },
-    // 登录状态字典翻译
-    // statusFormat(row, column) {
-    //   return this.selectDictLabel(this.statusOptions, row.status)
-    // },
+
     /** TODO: 查询按钮操作 */
     handleQuery() {
       this.queryParams.page = 1
@@ -456,10 +468,40 @@ export default {
       this.handleQuery()
     },
 
+    /* TODO: 控制单项表单关闭的详情 */
+    handleClose() {
+      this.activateAbandonedState = false
+      this.singleLogIdAndFqYs = {}
+    },
+    /* TODO: 获取详情信息*/
     handleDetail: function(row) {
-      console.log('success!')
+      /* TODO: 如果库状态为‘废弃’，即为‘4’时，则可以进入 */
+      if (row.poperate !== '4') {
+        this.singleDetails = { ...row }
+      } else {
+        /* TODO: 设置单项详情的查询的条件 */
+        this.singleLogIdAndFqYs['businessId'] = row.businessId
+        this.singleLogIdAndFqYs['fqYs'] = row.fqYs
+        /* TODO: 进行查询，如果返回的code为200，则表示返回的值成功 */
+        findSingleLogDetail(this.singleLogIdAndFqYs).then(
+          response => {
+            if (response.code === 200) {
+              this.singleDetails = Object.assign({}, response.data, { ...row })
+              /* TODO: 如果库状态==='4'  并且返回的状态码为200的时候，才会将可变的详情字段设置为true，去激活并打开 */
+              this.activateAbandonedState = true
+            } else {
+              /* TODO: 如果状态码不对则不会激活可变字段，并且抛出错误信息response.message */
+              this.$message({
+                showClose: true,
+                message: response.message,
+                type: 'warning'
+              })
+              this.singleDetails = { ...row }
+            }
+          }
+        )
+      }
       this.title = '记录详情'
-      this.singleDetails = { ...row }
       this.openDetails = true
     }
   }

src/views/sample/basicInformation/index.vue

@@ -157,7 +157,7 @@
 
 <script>
 import { queryList, add, getDetailById, updataInfo, deleteLogical } from '@/api/sample/basicInformation'
-import {parseTime} from "@/utils";
+import { parseTime } from "@/utils";
 
 export default {
   name: 'Index',

src/views/system/dept/index.vue

@@ -10,16 +10,16 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="部门状态">
-        <el-select v-model="queryParams.flag" placeholder="请选择部门状态" clearable size="small">
-          <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="部门状态">-->
+<!--        <el-select v-model="queryParams.flag" placeholder="请选择部门状态" clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="dict in statusOptions"-->
+<!--            :key="dict.dictValue"-->
+<!--            :label="dict.dictLabel"-->
+<!--            :value="dict.dictValue"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button
           style="padding: 8px 7px;"
@@ -81,7 +81,7 @@
             <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作"  align="center" class-name="small-padding fixed-width">
           <!--        <template slot-scope="scope">-->
           <!--          <el-button-->
           <!--            v-hasPermi="['system:dept:edit']"-->
@@ -222,7 +222,7 @@ export default {
       // 是否显示弹出层
       open: false,
       // 状态数据字典
-      statusOptions: [],
+      // statusOptions: [],
       // 查询参数
       queryParams: {
         deptName: undefined,
@@ -275,9 +275,9 @@ export default {
       this.queryParams = { ...param }
     }
     this.getList()
-    this.getDicts('sys_normal_disable'.toUpperCase()).then(response => {
-      this.statusOptions = response.data
-    })
+    // this.getDicts('sys_normal_disable'.toUpperCase()).then(response => {
+    //   this.statusOptions = response.data
+    // })
   },
   methods: {
     /** 查询部门列表 */
@@ -317,9 +317,9 @@ export default {
       }
     },
     // 字典状态字典翻译
-    statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.flag)
-    },
+    // statusFormat(row, column) {
+    //   return this.selectDictLabel(this.statusOptions, row.flag)
+    // },
     // 取消按钮
     cancel() {
       this.open = false

src/views/system/dict/index.vue

@@ -23,22 +23,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="flag">
-        <el-select
-          v-model="queryParams.flag"
-          placeholder="字典状态"
-          clearable
-          size="small"
-          style="width: 200px"
-        >
-          <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
+      <!--      <el-form-item label="状态" prop="flag">-->
+      <!--        <el-select-->
+      <!--          v-model="queryParams.flag"-->
+      <!--          placeholder="字典状态"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--          style="width: 200px"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="dict in statusOptions"-->
+      <!--            :key="dict.dictValue"-->
+      <!--            :label="dict.dictLabel"-->
+      <!--            :value="dict.dictValue"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="dateRange"
@@ -52,12 +52,25 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          style="padding: 8px 7px;"
+          icon="el-icon-search"
+          size="small"
+          @click="handleQuery"
+        >搜索</el-button>
+        <el-button
+          style="padding: 8px 7px;"
+          icon="el-icon-refresh"
+          size="small"
+          @click="resetQuery"
+        >重置
+        </el-button>
       </el-form-item>
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
+            style="padding: 8px 7px;"
             type="primary"
             icon="el-icon-plus"
             size="small"
@@ -66,9 +79,10 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
+            style="padding: 8px 7px;"
             type="success"
             icon="el-icon-edit"
-            size="mini"
+            size="small"
             :disabled="single"
             @click="handleUpdate"
           >修改
@@ -76,9 +90,10 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
+            style="padding: 8px 7px;"
             type="danger"
             icon="el-icon-delete"
-            size="mini"
+            size="small"
             :disabled="multiple"
             @click="handleDelete"
           >删除
@@ -86,6 +101,7 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
+            style="padding: 8px 7px;"
             type="success"
             icon="el-icon-download"
             size="small"
@@ -161,8 +177,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.rows"
       @pagination="getList"
     />
     <!-- 添加或修改参数配置对话框 -->
@@ -174,14 +190,21 @@
         <el-form-item label="字典类型" prop="dictType">
           <el-input v-model.trim="form.dictType" :maxlength="30" placeholder="请输入字典类型" />
         </el-form-item>
+
         <el-form-item label="状态" prop="flag">
+          <!--        <el-form-item label="状态" prop="flag">-->
+          <!--          <el-radio-group v-model="form.flag">-->
+          <!--            <el-radio-->
+          <!--              v-for="dict in statusOptions"-->
+          <!--              :key="dict.dictValue"-->
+          <!--              :label="dict.dictValue"-->
+          <!--            >{{ dict.dictLabel }}-->
+          <!--            </el-radio>-->
+          <!--          </el-radio-group>-->
+          <!--        </el-form-item>-->
           <el-radio-group v-model="form.flag">
-            <el-radio
-              v-for="dict in statusOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{ dict.dictLabel }}
-            </el-radio>
+            <el-radio label="1">启用</el-radio>
+            <el-radio label="0">停用</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="父字典名称">
@@ -313,14 +336,14 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
-      // 状态数据字典
-      statusOptions: [],
+      // // 状态数据字典
+      // statusOptions: [],
       // 日期范围
       dateRange: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         dictName: undefined,
         dictType: undefined,
         flag: undefined
@@ -364,9 +387,9 @@ export default {
       this.queryParams = { ...param }
     }
     this.getList()
-    this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
-      this.statusOptions = response.data
-    })
+    // this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
+    //   this.statusOptions = response.data
+    // })
     optionselect().then(response => {
       this.options = response.data
     })
@@ -419,9 +442,9 @@ export default {
       })
     },
     // 字典状态字典翻译
-    statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.flag)
-    },
+    // statusFormat(row, column) {
+    //   return this.selectDictLabel(this.statusOptions, row.flag)
+    // },
     // 取消按钮
     cancel() {
       this.open = false
@@ -442,7 +465,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.page = 1
       this.getList()
     },
     /** 重置按钮操作 */

src/views/system/role/index.vue

@@ -22,24 +22,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="角色状态" prop="flag">
-        <el-select
-          v-model="queryParams.flag"
-          placeholder="请选择角色状态"
-          clearable
-          size="small"
-          style="width: 150px"
-        >
-          <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
+        <el-button
+          style="padding: 8px 7px;"
+          type="primary"
+          icon="el-icon-search"
+          size="small"
+          @click="handleQuery">
+          查询
+        </el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
@@ -128,8 +119,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.rows"
       @pagination="getList"
     />
 
@@ -510,7 +501,7 @@ export default {
     },
     /** 查询按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.page = 1
       this.getList()
     },
     /** 重置按钮操作 */

src/views/system/user/index.vue

@@ -22,22 +22,6 @@
             style="width: 150px"
           />
         </el-form-item>
-        <el-form-item label="状态" prop="flag">
-          <el-select
-            v-model="queryParams.flag"
-            placeholder="请选择用户状态"
-            clearable
-            size="small"
-            style="width: 150px"
-          >
-            <el-option
-              v-for="dict in statusOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            />
-          </el-select>
-        </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 style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>