代码优化

src/api/claimAndRefund/receive.js

@@ -90,7 +90,7 @@ export function getLeaseAuditListAll(query) {
 // 获取 来往单位 列表
 export function getUnitData(params = {}) {
   return request({
-    url: '/system/select/getUnitCbx',
+    url: '/material/select/getUnitCbx',
     method: 'post',
     data: params
   })
@@ -99,7 +99,7 @@ export function getUnitData(params = {}) {
 // 获取 工程 列表
 export function getProData(params = {}) {
   return request({
-    url: '/system/select/getSectionEngineeringCbx',
+    url: '/material/select/getSectionEngineeringCbx',
     method: 'post',
     data: params
   })
@@ -108,7 +108,7 @@ export function getProData(params = {}) {
 //  获取 设备树
 export function getDeviceTypeTree(params = {}) {
   return request({
-    url: '/system/select/getDeviceTypeTree',
+    url: '/material/select/getDeviceTypeTree',
     method: 'post',
     data: params
   })
@@ -117,7 +117,7 @@ export function getDeviceTypeTree(params = {}) {
 // 根据单位id和工程id  获取 协议id
 export function getAgreementInfoById(params = {}) {
   return request({
-    url: '/system/select/getAgreementInfoById',
+    url: '/material/select/getAgreementInfoById',
     method: 'post',
     data: params
   })

src/api/claimAndRefund/return.js

@@ -169,7 +169,7 @@ export function getBackMachine(query) {
 // 退料接收 查看记录
 export function backReceiveRecordWeb(data) {
   return request({
-    url: 'base/backReceive/backReceiveRecordWeb ',
+    url: 'material/base/backReceive/backReceiveRecordWeb ',
     method: 'post',
     data: data
   })
@@ -177,7 +177,7 @@ export function backReceiveRecordWeb(data) {
 
 export function backReceiveRecordWebPt(data) {
   return request({
-    url: 'base/backReceive/backReceiveRecordWebPt ',
+    url: 'material/base/backReceive/backReceiveRecordWebPt ',
     method: 'post',
     data: data
   })
@@ -186,7 +186,7 @@ export function backReceiveRecordWebPt(data) {
 // 退料接收 数量接收
 export function setNumBack(data) {
   return request({
-    url: 'base/backReceive/setNumBack',
+    url: 'material/base/backReceive/setNumBack',
     method: 'post',
     data: data
   })
@@ -195,7 +195,7 @@ export function setNumBack(data) {
 // 退料接收 编码接收
 export function setCodeBack(data) {
   return request({
-    url: 'base/backReceive/setCodeBack',
+    url: 'material/base/backReceive/setCodeBack',
     method: 'post',
     data: data
   })
@@ -204,7 +204,7 @@ export function setCodeBack(data) {
 // 退料接收 完成前判断是否存在记录
 export function getRecord(query) {
   return request({
-    url: 'base/backReceive/getRecord',
+    url: 'material/base/backReceive/getRecord',
     method: 'get',
     params: query
   })
@@ -213,7 +213,7 @@ export function getRecord(query) {
 // 退料接收 撤回操作
 export function revoke(data) {
   return request({
-    url: 'base/backReceive/revoke',
+    url: 'material/base/backReceive/revoke',
     method: 'post',
     data: data
   })
@@ -222,7 +222,7 @@ export function revoke(data) {
 // 退料接收 完成接收
 export function endBack(data) {
   return request({
-    url: 'base/backReceive/endBack',
+    url: 'material/base/backReceive/endBack',
     method: 'post',
     data: data
   })

src/api/inventoryLogs/index.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 
 /* 日志列表 */
 export const getLogsListApi = (params) => {
-    return request.get('/system/bm_num_logs/list', {
+    return request.get('/system/bm_storage_logs/list', {
         params:params
     })
 }
 
 /* 日志详情 */
 export const getLogsDetailsApi = (id) => {
-    return request.get(`/system/bm_num_logs/selectByPrimaryKey`, {
+    return request.get(`/system/bm_storage_logs/selectByPrimaryKey`, {
         params: {
             id
         }

src/api/store/newBuy.js

@@ -209,7 +209,7 @@ export function warehousingEntry(query) {
 // 配件所属上级树
 export function getAccessoryTree(data) {
   return request({
-    url: '/system/select/getAccessoryTree',
+    url: '/material/select/getAccessoryTree',
     method: 'post',
     data: data,
   })

src/api/store/poleConfig.js

@@ -5,7 +5,7 @@ const addOrUpdateUrl = '/material/maWhole/addOrUpdate' // 添加
 const selectListUrl = '/material/maWhole/selectList' // 查询首页
 const selectListByIdUrl = '/material/maWhole/selectListById' // 查询详情
 const deleteByIdUrl = '/material/maWhole/deleteById' // 删除
-const treeTypeUrl = '/system/select/getDeviceTypeTree' // 设备树
+const treeTypeUrl = '/material/select/getDeviceTypeTree' // 设备树
 const selectListTreeUrl = '/material/maWhole/selectListTree' // 编辑查询
 
 // 物品类型 选择配件

src/api/store/putInStore.js

@@ -49,7 +49,7 @@ export function inputByType(data) {
 //  获取 设备树
 export function getDeviceTypeTree(params = {}){
   return request({
-    url: '/system/select/getDeviceTypeTree',
+    url: '/material/select/getDeviceTypeTree',
     method: 'post',
     data: params
   })

src/api/stquery/backRecord.js

@@ -22,7 +22,7 @@ export function exportList(params = {}){
 // 获取 来往单位 列表
 export function getUnitData(params = {}){
   return request({
-    url: '/system/select/getUnitCbx',
+    url: '/material/select/getUnitCbx',
     method: 'post',
     data: params
   })
@@ -31,7 +31,7 @@ export function getUnitData(params = {}){
 // 获取 工程 列表
 export function getProData(params = {}){
   return request({
-    url: '/system/select/getSectionEngineeringCbx',
+    url: '/material/select/getSectionEngineeringCbx',
     method: 'post',
     data: params
   })

src/api/stquery/deviceFixQuery.js

@@ -22,7 +22,7 @@ export function exportList(params = {}){
 // 获取 来往单位 列表
 export function getUnitData(params = {}){
   return request({
-    url: '/system/select/getUnitCbx',
+    url: '/material/select/getUnitCbx',
     method: 'post',
     data: params
   })
@@ -31,7 +31,7 @@ export function getUnitData(params = {}){
 // 获取 工程 列表
 export function getProData(params = {}){
   return request({
-    url: '/system/select/getSectionEngineeringCbx',
+    url: '/material/select/getSectionEngineeringCbx',
     method: 'post',
     data: params
   })

src/api/stquery/deviceInStoreQuery.js

@@ -22,7 +22,7 @@ export function exportList(params = {}){
 // 获取 来往单位 列表
 export function getUnitData(params = {}){
   return request({
-    url: '/system/select/getUnitCbx',
+    url: '/material/select/getUnitCbx',
     method: 'post',
     data: params
   })
@@ -31,7 +31,7 @@ export function getUnitData(params = {}){
 // 获取 工程 列表
 export function getProData(params = {}){
   return request({
-    url: '/system/select/getSectionEngineeringCbx',
+    url: '/material/select/getSectionEngineeringCbx',
     method: 'post',
     data: params
   })

src/api/stquery/deviceScrapQuery.js

@@ -22,7 +22,7 @@ export function exportList(params = {}){
 // 获取 来往单位 列表
 export function getUnitData(params = {}){
   return request({
-    url: '/system/select/getUnitCbx',
+    url: '/material/select/getUnitCbx',
     method: 'post',
     data: params
   })
@@ -31,7 +31,7 @@ export function getUnitData(params = {}){
 // 获取 工程 列表
 export function getProData(params = {}){
   return request({
-    url: '/system/select/getSectionEngineeringCbx',
+    url: '/material/select/getSectionEngineeringCbx',
     method: 'post',
     data: params
   })

src/api/stquery/deviceStatusRecord.js

@@ -22,7 +22,7 @@ export function exportList(params = {}){
 // 获取 来往单位 列表
 export function getUnitData(params = {}){
   return request({
-    url: '/system/select/getUnitCbx',
+    url: '/material/select/getUnitCbx',
     method: 'post',
     data: params
   })
@@ -31,7 +31,7 @@ export function getUnitData(params = {}){
 // 获取 工程 列表
 export function getProData(params = {}){
   return request({
-    url: '/system/select/getSectionEngineeringCbx',
+    url: '/material/select/getSectionEngineeringCbx',
     method: 'post',
     data: params
   })

src/api/stquery/projUsingRecord.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 // 获取 来往单位 列表
 export function getUnitData(params = {}){
   return request({
-    url: '/system/select/getUnitCbx',
+    url: '/material/select/getUnitCbx',
     method: 'post',
     data: params
   })
@@ -13,7 +13,7 @@ export function getUnitData(params = {}){
 // 获取 工程 列表
 export function getProData(params = {}){
   return request({
-    url: '/system/select/getSectionEngineeringCbx',
+    url: '/material/select/getSectionEngineeringCbx',
     method: 'post',
     data: params
   })

src/api/stquery/stquery.js

@@ -22,7 +22,7 @@ export function exportList(params = {}){
 // 获取 来往单位 列表
 export function getUnitData(params = {}){
   return request({
-    url: '/system/select/getUnitCbx',
+    url: '/material/select/getUnitCbx',
     method: 'post',
     data: params
   })
@@ -31,7 +31,7 @@ export function getUnitData(params = {}){
 // 获取 工程 列表
 export function getProData(params = {}){
   return request({
-    url: '/system/select/getSectionEngineeringCbx',
+    url: '/material/select/getSectionEngineeringCbx',
     method: 'post',
     data: params
   })

src/api/system/dept.js

@@ -54,7 +54,7 @@ export function delDept(deptId) {
 // 上级获取
 export function apiGetPartTree() {
   return request({
-    url: '/system/select/getPartTree',
+    url: '/material/select/getPartTree',
     method: 'post',
     data: {}
   })

src/views/claimAndreturn/return/apply/component/home1.vue

@@ -52,7 +52,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="工机具类型" prop="typeId">
-                <el-cascader
+                <!-- <el-cascader
                     v-model="queryParams.typeId"
                     :options="deptOptions"
                     :props="{
@@ -64,7 +64,14 @@
                     @change="handleNodeClick"
                     aria-placeholder="请选择极具类型"
                     style="width: 240px"
-                ></el-cascader>
+                ></el-cascader> -->
+
+                <Tree
+                    ref="mychildSon"
+                    :width="240"
+                    :dataList="deptList"
+                    @changeId="selectDrop"
+                ></Tree>
             </el-form-item>
             <el-form-item label="退料申请时间" prop="time">
                 <el-date-picker
@@ -599,17 +606,20 @@ import {
     // getUseNumByTypeId
 } from '@/api/claimAndRefund/receive.js'
 import dialogFormByCq from '@/views/claimAndRefund/return/dialogFormByCq.vue'
+import Tree from '@/views/claimAndRefund/return/tree.vue'
+import { listPartTypeApi } from '@/api/repairTest/repair'
 // 10:42开始日期startTime,结束日期endTime     机具类型typeId
 // http://localhost/claimAndRefund/return/returnApply
 export default {
     name: '',
     dicts: ['sys_normal_disable'],
-    components: { dialogFormByCq },
+    components: { dialogFormByCq, Tree },
     data() {
         return {
             fullscreenLoading: false,
             type: '',
             isShowOneFlag: false,
+            deptList: [],
             priKey: '',
             // 遮罩层
             loading: true,
@@ -710,11 +720,21 @@ export default {
         // this.getList();
         this.initSelectData()
         this.InitIGetInfo()
+        this.getTree()
+        // this.initGetUseTypeTree()
     },
     methods: {
         // claimAndRefund/return/returnApplyAdd
         // claimAndRefund/return/returnApplyAdd
         /** 查询字典类型列表 startTime,结束日期endTime  */
+        selectDrop(value) {
+            this.queryParams.typeId = value
+        },
+        getTree() {
+            listPartTypeApi().then((response) => {
+                this.deptList = response.data
+            })
+        },
         async getList() {
             this.loading = true
             if (this.queryParams.time && this.queryParams.time.length > 0) {
@@ -757,6 +777,7 @@ export default {
         /** 重置按钮操作 */
         resetQuery() {
             this.queryParams.time = []
+            this.queryParams.typeId = ''
             // this.resetForm("queryForm");
             this.$refs.queryForm.resetFields()
             this.initSelectData()
@@ -782,7 +803,10 @@ export default {
             //         isEdit: true,
             //     },
             // })
-            this.$emit('rejectSubmit', { id: row.id, agreementId: row.agreementId })
+            this.$emit('rejectSubmit', {
+                id: row.id,
+                agreementId: row.agreementId,
+            })
         },
         // 退料单
         handleUpdateOrder() {
@@ -965,7 +989,7 @@ export default {
             const res = await getAgreementInfoById(params)
             // this.proList = res.data
             this.queryParams.agreementCode = res.data.agreementCode
-            // this.initGetUseTypeTree(res.data.agreementId)
+            this.initGetUseTypeTree(res.data.agreementId)
         },
         getAgreementByUnitAndProId() {
             this.InitGetAgreementInfoById()

src/views/inventoryLogs/index.vue

@@ -33,21 +33,28 @@
     <el-table :data="tableList" border>
       <el-table-column align="center" label="序号" type="index" width="60" />
       <el-table-column align="center" prop="modelTitle" label="模块名称" show-overflow-tooltip />
-      <el-table-column show-overflow-tooltip align="center" prop="method" label="请求方式" />
+<!--      <el-table-column show-overflow-tooltip align="center" prop="method" label="请求方式" />-->
-      <el-table-column show-overflow-tooltip align="center" prop="requestMethod" label="请求地址" />
+<!--      <el-table-column show-overflow-tooltip align="center" prop="method" label="请求地址" />-->
-      <el-table-column show-overflow-tooltip align="center" prop="task" label="实例" />
+<!--      <el-table-column show-overflow-tooltip align="center" prop="taskId" label="任务ID" />-->
       <el-table-column show-overflow-tooltip align="center" prop="typeParentName" label="机具类型" />
       <el-table-column show-overflow-tooltip align="center" prop="typeName" label="机具规格" />
-      <el-table-column show-overflow-tooltip align="center" prop="description" label="描述" />
+      <el-table-column show-overflow-tooltip align="center" prop="preStoreNum" label="操作前库存" />
-      <el-table-column show-overflow-tooltip align="center" prop="time" label="日期" />
+      <el-table-column show-overflow-tooltip align="center" prop="inNum" label="入库数量" />
+      <el-table-column show-overflow-tooltip align="center" prop="outNum" label="出库数量" />
+      <el-table-column show-overflow-tooltip align="center" prop="passNum" label="(退库)合格数量" />
+      <el-table-column show-overflow-tooltip align="center" prop="maintenanceNum" label="(退库)维修数量" />
+      <el-table-column show-overflow-tooltip align="center" prop="scrapNum" label="(退库)报废数量" />
+<!--      <el-table-column show-overflow-tooltip align="center" prop="description" label="描述" />-->
+      <el-table-column show-overflow-tooltip align="center" prop="postStoreNum" label="操作后库存" />
+      <el-table-column show-overflow-tooltip align="center" prop="createTime" label="日期" />
       <el-table-column align="center" label="状态">
         <template slot-scope="{ row }">
           <el-tag size="mini" type="success" v-if="row.status == 0">正常</el-tag>
           <el-tag size="mini" type="warning" v-else>异常</el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="creator" label="创建人" />
+<!--      <el-table-column align="center" prop="creator" label="创建人" />-->
-      <el-table-column align="center" prop="remark" label="备注" />
+<!--      <el-table-column align="center" prop="remark" label="备注" />-->
       <el-table-column align="center" label="操作">
         <template slot-scope="{ row }">
           <el-button size="mini" type="text" @click="previewLogsDetails(row)">详情</el-button>
@@ -105,13 +112,22 @@ export default {
       /* 日志详情label以及内容 */
       detailsLabelList: [
         { label: '创建人', content: 'creator' },
-        { label: '请求方式', content: 'method' },
         { label: '模块名称', content: 'modelTitle' },
-        { label: '请求地址', content: 'requestMethod' },
+        { label: '任务ID', content: 'taskId' },
-        { label: '机具名称', content: 'typeParentName' },
+        { label: '机具类型', content: 'typeParentName' },
         { label: '机具规格', content: 'typeName' },
-        { label: '日期', content: 'time' },
+        { label: '日期', content: 'createTime' },
-        { label: '实例', content: 'task' },
+        // { label: '申请数量', content: 'preNum' },
+        // { label: '审核数量', content: 'auditNum' },
+        { label: '操作前库存', content: 'preStoreNum' },
+        { label: '入库数量', content: 'inNum' },
+        { label: '出库数量', content: 'outNum' },
+        { label: '(退库)总数量', content: 'backNum' },
+        { label: '(退库)合格数量', content: 'passNum' },
+        { label: '(退库)维修数量', content: 'maintenanceNum' },
+        { label: '(退库)报废数量', content: 'scrapNum' },
+        { label: '操作后库存', content: 'postStoreNum' },
+        { label: '请求地址', content: 'method' },
       ],
       logsDetailsInfo: {},
       deviceTypeTree: [], // 设备 树结构数据
@@ -167,3 +183,4 @@ export default {
         margin-top: -15px;
     }
 </style>
+

src/views/store/warehousing/putInStore.vue

@@ -66,7 +66,7 @@
                 "
             />
             <el-table-column label="入库来源" align="center" prop="putInType" />
-            <el-table-column
+            <!-- <el-table-column
                 label="工程名称"
                 align="center"
                 prop="projectName"
@@ -77,7 +77,7 @@
                 align="center"
                 prop="unitName"
                 :show-overflow-tooltip="true"
-            />
+            /> -->
             <el-table-column
                 label="单号"
                 align="center"

vue.config.js

@@ -44,7 +44,7 @@ module.exports = {
 
         // target: `http://192.168.2.151:48080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
-        target: `http://192.168.2.77:49080`,//旭/
+        target: `http://192.168.2.82:49080`,//旭/
         // target: `http://192.168.2.248:28080`, //帅
         // target: `http://192.168.2.216:49080`, //福