From 2a8f797528b4ca8b765c78d64733b52dc2a2bee7 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 16 Jun 2025 17:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/cost/component/applyHome.vue     | 20 ++++++-------
 .../material/cost/component/examHome.vue      |  2 +-
 .../material/purchase/goodsAccept/detail.vue  |  2 +-
 .../goodsBind/component/bindTools.vue         | 30 ++++++++++++++++---
 .../material/purchase/goodsEntry/detail.vue   |  2 +-
 5 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/views/material/cost/component/applyHome.vue b/src/views/material/cost/component/applyHome.vue
index 5a4c4bdf..61406154 100644
--- a/src/views/material/cost/component/applyHome.vue
+++ b/src/views/material/cost/component/applyHome.vue
@@ -31,7 +31,7 @@
                     :options="proList" :normalizer="normalizer"
                     :show-count="true" style="width: 240px" :disable-branch-nodes="true"
                     noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
-                    placeholder="请选择结算工程" @select="proChange"
+                    placeholder="请选择结算工程" @select="proChange" :disabled="unitIds.length == 0"
                 />
                 <!-- <el-cascader v-model="projectIds"
                         :show-all-levels="false"
@@ -255,7 +255,7 @@ import printJS from 'print-js'
 export default {
     name: 'CostApplyList',
     dicts: ['cost_status'],
-    components: { Treeselect },
+    components: { Treeselect, vueEasyPrint },
     data() {
         return {
             // 遮罩层
@@ -479,14 +479,14 @@ export default {
         },
         //维修任务单打印
         print() {
-          // this.$refs.remarksPrintRef.print();
-          printJS({
-            printable: 'checkId',
-            type: 'html',
-            targetStyles: ['*'],
-            maxWidth:'1400'
-            // 其他配置选项
-          });
+          this.$refs.remarksPrintRef.print();
+        //   printJS({
+        //     printable: 'checkId',
+        //     type: 'html',
+        //     targetStyles: ['*'],
+        //     maxWidth:'1400'
+        //     // 其他配置选项
+        //   });
         },
 
         /** 删除按钮操作 */
diff --git a/src/views/material/cost/component/examHome.vue b/src/views/material/cost/component/examHome.vue
index f1d315e8..85047ea1 100644
--- a/src/views/material/cost/component/examHome.vue
+++ b/src/views/material/cost/component/examHome.vue
@@ -233,7 +233,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
     name: 'CostApplyList',
     dicts: ['cost_status'],
-    components: { Treeselect },
+    components: { Treeselect, vueEasyPrint },
     data() {
         return {
             // 遮罩层
diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue
index f980c85c..b4cbf1c6 100644
--- a/src/views/material/purchase/goodsAccept/detail.vue
+++ b/src/views/material/purchase/goodsAccept/detail.vue
@@ -11,7 +11,7 @@
           label-width="90px"
         >
           <el-form-item label="类型规格：" prop="typeId">
-            <el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable filterable>
+            <el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable filterable style="width: 240px">
               <el-option v-for="dict in materialModelList" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/material/purchase/goodsBind/component/bindTools.vue b/src/views/material/purchase/goodsBind/component/bindTools.vue
index a8aec5cb..0476d135 100644
--- a/src/views/material/purchase/goodsBind/component/bindTools.vue
+++ b/src/views/material/purchase/goodsBind/component/bindTools.vue
@@ -8,14 +8,22 @@
       ref="maFormRef"
       label-width="100px"
     >
-      <el-form-item label="类型规格" prop="keyWord">
-        <el-input
+      <el-form-item label="类型规格" prop="typeId">
+        <!-- <el-input
           clearable
           maxlength="50"
           style="width: 240px"
           v-model="maForm.keyWord"
           placeholder="请输入类型规格"
-        />
+        /> -->
+        <el-select v-model="maForm.typeId" placeholder="请选择类型规格" clearable filterable style="width: 240px">
+          <el-option
+            v-for="dict in materialModelList"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
 
       <!-- <el-form-item label="机具厂家" prop="typeId">
@@ -419,7 +427,7 @@ import {
   uploadPurchaseFile,
   getPurchaseFileList,
 } from "@/api/purchase/goodsAccept";
-import { number } from "echarts";
+import { getDeviceType} from "@/api/ma/device"
 
 export default {
   name: "BindTools",
@@ -508,7 +516,9 @@ export default {
         keyWord: "",
         productionTime: "",
         taskStage: 3,
+        typeId: ''
       },
+      materialModelList: [],
       taskId: "",
       // 是否显示弹出层
       open: false,
@@ -539,8 +549,20 @@ export default {
   mounted() {
     this.taskId = this.queryTaskId;
     this.getCodeList();
+    this.getDeviceType()
   },
   methods: {
+    getDeviceType(){
+          getDeviceType({level:4,skipPermission:1}).then(response => {
+          let matModelRes = response.data;
+          this.materialModelList = matModelRes.map((item) => {
+                  return {
+                  label: item.typeName,
+                  value: item.typeId,
+                  };
+              });
+          });
+      },
     // 获取列表数据
     async getCodeList() {
       this.loading = true;
diff --git a/src/views/material/purchase/goodsEntry/detail.vue b/src/views/material/purchase/goodsEntry/detail.vue
index 2ec5e167..5e29195b 100644
--- a/src/views/material/purchase/goodsEntry/detail.vue
+++ b/src/views/material/purchase/goodsEntry/detail.vue
@@ -2,7 +2,7 @@
   <div class="app-container" id="entryDetail">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="类型规格："  prop="typeId" >
-        <el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable>
+        <el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable filterable style="width: 240px">
           <el-option
             v-for="dict in materialModelList"
             :key="dict.value"