材料站联调

src/api/materialsStation/index.js

@@ -491,7 +491,7 @@ export function updatePrintStatus(id) {
 // 保有设备总量查询
 export function getRetainedEquipmentListApi(query) {
   return request({
-    url: '/material/complex_query/getRetainedEquipmentList',
+    url: '/material/material_maMachine/getRetainedEquipmentList',
     method: 'get',
     params: query
   })
@@ -500,7 +500,7 @@ export function getRetainedEquipmentListApi(query) {
 // 保有设备总量查询-无分页
 export function getRetainedEquipmentListNoPageApi(query) {
   return request({
-    url: '/material/complex_query/getRetainedEquipmentListNoPage',
+    url: '/material/material_maMachine/getRetainedEquipmentListNoPage',
     method: 'get',
     params: query
   })
@@ -572,7 +572,7 @@ export function getAuditInputListApi(query) {
 // 机具追溯-列表
 export const getMachineInfoApi = data => {
   return request({
-    url: '/material/ma_machine/getMachineInfo',
+    url: '/material/material_maMachine/getMachineInfo',
     method: 'get',
     params: data
   })

src/views/materialsStation/equipment/equipmentTracking/index.vue

@@ -11,7 +11,7 @@
           style="width: 240px"
         />
       </el-form-item>
-      <el-form-item label="设备类型" prop="typeCodeId">
+      <!-- <el-form-item label="设备类型" prop="typeCodeId">
         <el-select
           v-model="queryParams.typeCodeId"
           placeholder="请选择设备类型"
@@ -22,18 +22,15 @@
         >
           <el-option v-for="(item, index) in typeCodeOpts" :key="index" :label="item.typeName" :value="item.typeId" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
-      <el-form-item label="规格型号" prop="maModelId">
+      <el-form-item label="规格型号" prop="maModel">
-        <el-select
+        <el-input
-          v-model="queryParams.maModelId"
+          v-model="queryParams.maModel"
-          placeholder="请选择设备类型"
+          placeholder="请输入规格型号"
           clearable
-          filterable
+          :maxlength="99"
           style="width: 240px"
-          @change="handleModel"
+        />
-        >
-          <el-option v-for="(item, index) in modelTypeOpts" :key="index" :label="item.typeName" :value="item.typeId" />
-        </el-select>
       </el-form-item>
       <!-- 表单按钮 -->
       <el-form-item>
@@ -103,7 +100,7 @@ export default {
         keyWord: '', // 关键字
         typeCodeId: undefined, // 设备类型ID
         typeCode: '', // 设备类型
-        maModelId: undefined, // 规格型号ID
+        maModel: undefined, // 规格型号ID
         maModel: '' // 规格型号
       },
       typeCodeOpts: [], // 设备类型
@@ -111,7 +108,7 @@ export default {
       total: 0, // 总条数
       // 表头
       tableColumns: [
-        { label: '物品类型', prop: 'typeName' },
+        { label: '物品类型', prop: 'materialName' },
         { label: '设备类型', prop: 'typeCode' },
         { label: '规格型号', prop: 'maModel' },
         { label: '设备编号', prop: 'maCode' },
@@ -129,7 +126,7 @@ export default {
   },
   created() {
     this.getList()
-    this.getModelType()
+    // this.getModelType()
   },
   methods: {
     // 查询

src/views/materialsStation/equipment/totalLeaseRecord/index.vue

@@ -109,7 +109,7 @@
         :total="dlgTotal"
         :page.sync="dialogForm.pageNum"
         :limit.sync="dialogForm.pageSize"
-        @pagination="handleDlgQuery"
+        @pagination="getDetailsList"
       />
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">关 闭</el-button>
@@ -212,9 +212,9 @@ export default {
       }
     },
     // 获取详情列表
-    async getDetailsList(code) {
+    async getDetailsList() {
       try {
-        const res = await getDetailsListApi({ ...this.dialogForm, code })
+        const res = await getDetailsListApi({ ...this.dialogForm })
         console.log('🚀 ~ 获取详情列表 ~ res:', res)
         this.dialogList = res.data.rows
         this.dlgTotal = res.data.total
@@ -230,7 +230,8 @@ export default {
       this.dialogTitle = '查看'
       this.dialogVisible = true
       setTimeout(() => {
-        this.getDetailsList(row.code)
+        this.dialogForm.code = row.code
+        this.getDetailsList()
       }, 100)
     },
     // 领料单
@@ -266,23 +267,6 @@ export default {
       } catch (error) {
         console.log('导出数据失败', error)
       }
-    },
-    // 弹框查询
-    handleDlgQuery() {
-      console.log('弹框查询', this.dialogForm)
-      try {
-        // const res = await
-      } catch (error) {
-        console.log('弹框查询失败', error)
-      }
-    },
-    // 弹框重置
-    handleDlgReset() {
-      console.log('弹框重置')
-      this.dialogForm.pageNum = 1
-      this.dialogForm.pageSize = 10
-      this.dialogForm.keyWord = ''
-      this.handleDlgQuery()
     }
   }
 }

src/views/materialsStation/equipment/totalReturnRecord/index.vue

@@ -106,7 +106,7 @@
         :total="dlgTotal"
         :page.sync="dialogForm.pageNum"
         :limit.sync="dialogForm.pageSize"
-        @pagination="handleDlgQuery"
+        @pagination="getDetailsList"
       />
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">关 闭</el-button>
@@ -200,9 +200,9 @@ export default {
       }
     },
     // 获取详情列表
-    async getDetailsList(code) {
+    async getDetailsList() {
       try {
-        const res = await getBackDetailsListApi({ code, ...this.dialogForm })
+        const res = await getBackDetailsListApi({ ...this.dialogForm })
         console.log('🚀 ~ 获取详情列表 ~ res:', res)
         this.dialogList = res.data.rows
         this.dlgTotal = res.data.total
@@ -218,7 +218,8 @@ export default {
       this.dialogTitle = '查看'
       this.dialogVisible = true
       setTimeout(() => {
-        this.getDetailsList(row.code)
+        this.dialogForm.code = row.code
+        this.getDetailsList()
       }, 100)
     },
     // 退料单
@@ -246,23 +247,6 @@ export default {
       } catch (error) {
         console.log('导出数据失败', error)
       }
-    },
-    // 弹框查询
-    handleDlgQuery() {
-      console.log('弹框查询', this.dialogForm)
-      try {
-        // const res = await
-      } catch (error) {
-        console.log('弹框查询失败', error)
-      }
-    },
-    // 弹框重置
-    handleDlgReset() {
-      console.log('弹框重置')
-      this.dialogForm.pageNum = 1
-      this.dialogForm.pageSize = 10
-      this.dialogForm.keyWord = ''
-      this.handleDlgQuery()
     }
   }
 }

src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue

@@ -145,6 +145,7 @@
       <el-table-column align="center" label="规格型号" prop="typeName" show-overflow-tooltip />
       <el-table-column align="center" label="计量单位" prop="unitName" />
       <el-table-column align="center" label="当前库存" prop="storageNum" />
+      <el-table-column align="center" label="在用数量" prop="useNum" />
       <el-table-column label="预领数量" prop="preNum" align="center">
         <template v-slot="scope">
           <el-input