Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui

src/api/login.js

@@ -2,14 +2,15 @@ import request from '@/utils/request'
 
 // 登录方法 - 调试使用 - 产线环境需注释
 export function login(data) {
+  // return false
   return request({
-    // url: '/auth/login',
+    url: '/auth/login',
-    // headers: {
+    headers: {
-    //   isToken: false,
+      isToken: false,
-    //   repeatSubmit: false
+      repeatSubmit: false
-    // },
+    },
-    // method: 'post',
+    method: 'post',
-    // data
+    data: data
   })
 }
 

src/api/part/partArrived.js

@@ -80,3 +80,12 @@ export function getSelectPartListApi(query) {
     params: query
   })
 }
+
+// 配件库存
+export function getPartPersonNumApi(data){
+  return request({
+    url: '/material/complex_query/getPartPersonNum',
+    method: 'get',
+    params: data,
+  })
+}

src/views/business/leasePublish/component/homeApply.vue

@@ -114,7 +114,7 @@
 
     <!-- 弹框 -->
     <el-dialog title="业务联系单" :visible.sync="dialogVisible" width="46%">
-      <div id="print-content" style="padding: 0 30px">
+      <div id="print-content1" style="padding: 0 30px">
         <span>发：</span>
         <!-- 标题 -->
         <div style="text-align: center; font-size: 16px">
@@ -513,7 +513,7 @@ export default {
     // 打印
     print() {
       printJS({
-        printable: 'print-content',
+        printable: 'print-content1',
         type: 'html', //
         // targetStyles: ['*'], // 打印的元素样式
         scanStyles: false, // 是否扫描页面样式

src/views/material/back/component/dialogFormByCq.vue

@@ -10,7 +10,7 @@
   >
     <div id="printcontent" style="height: 600px; overflow-y: scroll; padding: 0 20px">
       <!-- <vue-easy-print tableShow ref="printRef"> -->
-      <div id="checkId">
+      <div id="checkId2">
         <div style="text-align: center; font-weight: 600; font-size: 16px">机具设备退料单</div>
         <div class="info" style="margin-top: 10px; display: flex; align-items: center">
           <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
@@ -343,7 +343,7 @@ export default {
     },
 
     print() {
-      const element = document.getElementById('checkId')
+      const element = document.getElementById('checkId2')
 
       // 确保元素存在
       if (!element) {
@@ -446,7 +446,7 @@ export default {
                       }
                     })
                     printJS({
-                      printable: 'checkId',
+                      printable: 'checkId2',
                       type: 'html',
                       targetStyles: ['*'],
                       maxWidth: '1400'
@@ -479,7 +479,7 @@ export default {
                     }
                   })
                   printJS({
-                    printable: 'checkId',
+                    printable: 'checkId2',
                     type: 'html',
                     targetStyles: ['*'],
                     maxWidth: '1400'

src/views/material/lease/apply/component/homeApply.vue

@@ -140,8 +140,8 @@
     <!-- 出库检验单弹窗 -->
     <el-dialog :title="title" :visible.sync="openPrint" width="70%" append-to-body>
       <div style="height: 600px; overflow-y: scroll; padding: 0 20px">
-        <!-- <vue-easy-print tableShow ref="remarksPrintRefCheck" class="print" :printable="'checkId'"> -->
+        <!-- <vue-easy-print tableShow ref="remarksPrintRefCheck" class="print" :printable="'checkId3'"> -->
-        <div id="checkId">
+        <div id="checkId3">
           <div class="title" style="text-align: center; font-weight: 600; font-size: 16px">
             施工机具设备出库检验记录表
           </div>
@@ -707,7 +707,7 @@ export default {
 
     //出库检验单打印
     printCheck() {
-      const element = document.getElementById('checkId')
+      const element = document.getElementById('checkId3')
 
       // 确保元素存在
       if (!element) {
@@ -803,7 +803,7 @@ export default {
 
                     // 上传成功后执行打印
                     printJS({
-                      printable: 'checkId',
+                      printable: 'checkId3',
                       type: 'html',
                       targetStyles: ['*'],
                       maxWidth: '1400'
@@ -813,7 +813,7 @@ export default {
 
                     // 即使保存失败也执行打印
                     printJS({
-                      printable: 'checkId',
+                      printable: 'checkId3',
                       type: 'html',
                       targetStyles: ['*'],
                       maxWidth: '1400'
@@ -825,7 +825,7 @@ export default {
 
                   // 即使上传失败也执行打印
                   printJS({
-                    printable: 'checkId',
+                    printable: 'checkId3',
                     type: 'html',
                     targetStyles: ['*'],
                     maxWidth: '1400'

src/views/material/lease/outBound/index.vue

@@ -347,8 +347,8 @@
         <!-- 验收单弹窗 -->
         <el-dialog :title="title" :visible.sync="openPrint" width="70%" append-to-body>
             <div style="height: 600px; overflow-y: scroll; padding: 0 20px">
-                <vue-easy-print tableShow ref="remarksPrintRefCheck" class="print" :printable="'checkId'">
+                <vue-easy-print tableShow ref="remarksPrintRefCheck" class="print" :printable="'checkId1'">
-                    <div id="checkId">
+                    <div id="checkId1">
                         <div class="title" style="text-align: center; font-weight: 600; font-size: 16px">
                             施工机具设备出库检验记录表
                         </div>
@@ -429,14 +429,14 @@
                                 <div>
                                     <span>检验单位：</span>
                                 </div>
-                                <div>
+                                <div v-if="openPrint">
                                     <canvas
                                         id="canvas"
                                         width="165"
                                         height="165"
                                         style="
                                             position: absolute;
-                                            top: 50%;
+                                            top: 180%;
                                             left: 90%;
                                             transform: translate(-100%, -50%);
                                             z-index: 9999;
@@ -834,6 +834,7 @@ export default {
             leaseLoading: false,
             taskType: '',
             currentRow: {},
+            oldTypeId: '',
             allNum: null,
         }
     },
@@ -1143,7 +1144,8 @@ export default {
                 leaseProject: this.currentRow.leaseProject,
                 leaseProjectId: this.currentRow.leaseProjectId,
                 taskId: this.currentRow.taskId,
-                code: this.currentRow.code
+                code: this.currentRow.code,
+                oldTypeId:row.oldTypeId
             }
             console.log('row', row)
             console.log('[obj]', [obj])
@@ -1162,6 +1164,7 @@ export default {
             this.outQuery.maStatus = 1
             this.outQuery.code = this.currentRow.code
             this.outObj = row
+            this.oldTypeId=row.oldTypeId
             this.handleOutQuery()
         },
 
@@ -1216,6 +1219,7 @@ export default {
                 this.maCodeList.forEach(item => {
                     item.code = this.currentRow.code
                     item.keyId = this.keyId
+                    item.oldTypeId=this.oldTypeId
                 })
                 let param = { leaseOutDetailsList: this.maCodeList }
                 submitOut(param).then(response => {
@@ -1313,13 +1317,25 @@ export default {
 
         //出库检验单打印
         printCheck() {
-            this.$refs.remarksPrintRefCheck.print()
+            // this.$refs.remarksPrintRefCheck.print()
             // printJS({
-            //     printable: 'checkId',
+            //     printable: 'checkId1',
             //     type: 'html',
             //     targetStyles: ['*']
             //     // 其他配置选项
             // })
+            this.$nextTick(() => {
+                printJS({
+                    printable: 'checkId1',
+                    type: 'html',
+                    style: `
+                        @page { size: A4; margin: 0; }
+                        body { margin: 0.5cm; font-family: SimSun; }
+                        #passId { font-size: 18px; padding: 0 20px; }
+                    `,
+                    scanStyles: false
+                })
+            })
         },
 
         //领料单打印

src/views/material/part/partAccept/index.vue

@@ -118,7 +118,7 @@
     >
       <div style="height: 500px; overflow-y: scroll">
         <!-- <vue-easy-print tableShow ref="remarksPrintRef" class="print"> -->
-        <div id="checkId">
+        <div id="checkId4">
           <div
             class="title"
             style="text-align: center; font-weight: 600; font-size: 16px"
@@ -410,7 +410,7 @@ import { getToken } from '@/utils/auth'
         print() {
           // this.$refs.remarksPrintRef.print()
           printJS({
-          printable: 'checkId',
+          printable: 'checkId4',
           type: 'html',
           targetStyles: ['*'],
           maxWidth:'1400'

src/views/material/part/partAcceptTwo/index.vue

@@ -117,7 +117,7 @@
     >
       <div style="height: 500px; overflow-y: scroll">
         <!-- <vue-easy-print tableShow ref="remarksPrintRef" class="print"> -->
-        <div id="checkId">
+        <div id="checkId5">
           <div
             class="title"
             style="text-align: center; font-weight: 600; font-size: 16px"
@@ -423,7 +423,7 @@ import { getToken } from '@/utils/auth'
         print() {
           // this.$refs.remarksPrintRef.print()
           printJS({
-            printable: 'checkId',
+            printable: 'checkId5',
             type: 'html',
             targetStyles: ['*'],
             maxWidth:'1400'

src/views/material/part/partArrived/component/home.vue

@@ -237,7 +237,7 @@
     >
       <div style="height: 500px; overflow-y: scroll">
         <!-- <vue-easy-print tableShow ref="remarksPrintRef" class="print"> -->
-        <div id="checkId">
+        <div id="checkId6">
           <div
             class="title"
             style="text-align: center; font-weight: 600; font-size: 16px"
@@ -629,7 +629,7 @@ export default {
     print() {
       // this.$refs.remarksPrintRef.print();
       printJS({
-        printable: 'checkId',
+        printable: 'checkId6',
         type: 'html',
         targetStyles: ['*'],
         maxWidth:'1400'

src/views/material/part/partLease/component/homeApply.vue

@@ -123,7 +123,7 @@
     <el-dialog :visible.sync="open" width="1000px" :title="title" append-to-body v-loading="loading">
       <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
         <!-- <vue-easy-print tableShow ref="remarksPrintRef" class="print"> -->
-        <div id="checkId">
+        <div id="checkId7">
           <div class="title" style="text-align: center; font-weight: 600; font-size: 16px">领料单</div>
           <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
             <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
@@ -362,7 +362,7 @@ export default {
     print() {
       // this.$refs.remarksPrintRef.print();
       printJS({
-        printable: 'checkId',
+        printable: 'checkId7',
         type: 'html',
         targetStyles: ['*'],
         maxWidth: '1400'

src/views/material/purchase/goodsAccept/detail.vue

@@ -604,7 +604,11 @@ export default {
           this.getList()
           this.getSignList()
           this.$refs.multipleTable.clearSelection()
-          this.jumpList()
+          // this.jumpList()
+          //关闭页面
+          this.$router.push({ name: 'GoodsAccept', params: { isReset: 'true' }}).then(res => {
+            this.$tab.closePage({ path: '/purchase/goodsAcceptDetail'})
+          })
         }
       })
     },

src/views/material/purchase/goodsAccept/editTools.vue

@@ -886,11 +886,12 @@ export default {
                                     }).then(response => {
                                         if (response.code == 200) {
                                             this.$modal.msgSuccess('编辑成功')
-                                            this.$emit('addToolsSuccess')
                                         }
                                         this.loading = false
                                         //关闭页面
-                                        this.$tab.closePage()
+                                        this.$router.push({ name: 'GoodsAccept', params: { isReset: 'true' }}).then(res => {
+                                            this.$tab.closePage({ path: '/purchase/editTools'})
+                                        })
                                     })
                                 })
                                 .catch(() => {

src/views/material/purchase/goodsAccept/index.vue

@@ -301,6 +301,11 @@
         }
       };
     },
+    activated() {
+        if (this.$route.params.isReset) {
+            this.resetQuery()
+        }
+    },
     created() {
         // 设置默认状态为第一个选项（未完成）
         if (this.taskStatusList.length > 0) {
@@ -360,7 +365,11 @@
         handleView(row){
             console.log(row)
             let query = { Id:row.id,taskId: row.taskId,isView:"true" }
-            this.$tab.closeOpenPage({
+            // this.$tab.closeOpenPage({
+            //     path: '/purchase/goodsAcceptDetail',
+            //     query,
+            // })
+            this.$router.push({
                 path: '/purchase/goodsAcceptDetail',
                 query,
             })

src/views/material/purchase/goodsArrived/index.vue

@@ -6,7 +6,10 @@
       :pageContent="pageContent"
       @goBack="goBack"
     />
+    <!-- 缓存 -->
+    <keep-alive include="Home">
       <component 
+        ref="componentRef"
         :is="isShowComponent" 
         :isEdit="isEdit"
         :editTaskId="editTaskId"
@@ -20,6 +23,7 @@
         @addToolsSuccess="addToolsSuccess"
         @queryTools="queryTools"
       />
+    </keep-alive>
   </div>
 </template>
   
@@ -62,6 +66,9 @@ export default {
       /* 新增成功 */
       addToolsSuccess() {
           this.isShowComponent = 'Home'
+          this.$nextTick(() => {
+            this.$refs.componentRef.resetQuery()
+          })
       },
       /* 编辑工机具 */
       editTools(taskId,id) {

src/views/material/purchase/goodsEntry/index.vue

@@ -289,6 +289,11 @@ export default {
       printTableData: []
     }
   },
+  activated() {
+    if (this.$route.params.isReset) {
+      this.resetQuery()
+    }
+  },
   created() {
     if (this.$route.query.code) {
       this.queryParams.keyWord = this.$route.query.code
@@ -337,8 +342,12 @@ export default {
     },
     handleUpdate(row) {
       console.log(row)
-      let query = { Id: row.id, taskId: row.taskId, isView: 'false' }
+      let query = { Id: row.id, taskId: row.taskId, isView: 'false', path: 'goodsEntry' }
-      this.$tab.closeOpenPage({
+      // this.$tab.closeOpenPage({
+      //   path: '/purchase/goodsEntryDetail',
+      //   query
+      // })
+      this.$router.push({
         path: '/purchase/goodsEntryDetail',
         query
       })
@@ -346,8 +355,12 @@ export default {
     //查看
     handleView(row) {
       console.log(row)
-      let query = { Id: row.id, taskId: row.taskId, isView: 'true' }
+      let query = { Id: row.id, taskId: row.taskId, isView: 'true', path: 'goodsEntry' }
-      this.$tab.closeOpenPage({
+      // this.$tab.closeOpenPage({
+      //   path: '/purchase/goodsEntryDetail',
+      //   query
+      // })
+      this.$router.push({
         path: '/purchase/goodsEntryDetail',
         query
       })

src/views/material/repair/repairManage/component/home.vue

@@ -96,7 +96,8 @@
               </div>
               <div class="item" style="width: 60%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
                 <span>承修单位：</span>
-                {{ repairTicketlLevelOne.backUnit }}
+                <!-- {{ repairTicketlLevelOne.backUnit }} -->
+                <span>机具（物流）分公司</span>
               </div>
               <!-- <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
                 <span>制单：</span>
@@ -114,9 +115,7 @@
                 <span>验收人：</span>
               </div> -->
             </div>
-            <el-table :data="repairTicketDevice" class="table" style="margin-top: 20px; width: 1000px; " border>
+            <!-- <el-table :data="repairTicketDevice" class="table" style="margin-top: 20px; width: 1000px; " border>
-              <!--          <el-table-column type="selection" width="55" align="center" />-->
-              <!-- <el-table-column label="序号" align="center" type="index" row="2" /> -->
               <el-table-column label="名称" align="center" prop="typeName" />
               <el-table-column label="型号" align="center" prop="type"/>
               <el-table-column label="编号" align="center" prop="code" >
@@ -148,13 +147,87 @@
               <div class="columnAll">{{ repairNum3 }}</div>
               <div class="columnAll">{{ "¥"+" "+repairNum4 }}</div>
               <div class="columnAll"></div>
+            </div> -->
+
+            <table
+              class="table"
+              style="
+                margin-top: 20px;
+                width: 1000px;
+                border: 1px solid #333;
+                border-collapse: collapse;
+                text-align: center;
+              "
+            >
+              <thead>
+                <tr style="background-color: #f5f7fa;">
+                  <th style="border: 1px solid #333; padding: 8px;">名称</th>
+                  <th style="border: 1px solid #333; padding: 8px;">型号</th>
+                  <th style="border: 1px solid #333; padding: 8px;">编号</th>
+                  <th style="border: 1px solid #333; padding: 8px;">单位</th>
+                  <th style="border: 1px solid #333; padding: 8px;">报修数量</th>
+                  <th style="border: 1px solid #333; padding: 8px;">修复数量</th>
+                  <th style="border: 1px solid #333; padding: 8px;">报废数量</th>
+                  <th style="border: 1px solid #333; padding: 8px;">维修费小计</th>
+                  <th style="border: 1px solid #333; padding: 8px;">报废图片</th>
+                </tr>
+              </thead>
+
+              <tbody>
+                <tr v-for="(row, index) in repairTicketDevice" :key="index">
+                  <td style="border: 1px solid #333; padding: 8px;">{{ row.typeName }}</td>
+                  <td style="border: 1px solid #333; padding: 8px;">{{ row.type }}</td>
+
+                  <td style="border: 1px solid #333; padding: 8px;">
+                    <div v-if="row.manageType == 1">计数</div>
+                    <div
+                      v-else-if="row.manageType == 0"
+                      style="color: blue; cursor: pointer;"
+                      @click="handleView(row)"
+                    >
+                      详见附件
                     </div>
+                  </td>
+
+                  <td style="border: 1px solid #333; padding: 8px;">{{ row.unitName }}</td>
+                  <td style="border: 1px solid #333; padding: 8px;">{{ row.typeRepairNum }}</td>
+                  <td style="border: 1px solid #333; padding: 8px;">{{ row.typeRepairedNum }}</td>
+                  <td style="border: 1px solid #333; padding: 8px;">{{ row.typeScrapNum }}</td>
+
+                  <td style="border: 1px solid #333; padding: 8px;">
+                    ¥ {{ Number(row.typeCost) }}
+                  </td>
+
+                  <td style="border: 1px solid #333; padding: 8px;">
+                    <div v-if="!row.fileList || row.fileList.length === 0"></div>
+                    <div
+                      v-else
+                      style="color: blue; cursor: pointer;"
+                      @click="picturesPreview(row)"
+                    >
+                      {{ row.fileList.length }}
+                    </div>
+                  </td>
+                </tr>
+
+                <!-- ✅ 总计行（内嵌在表格中） -->
+                <tr style="font-weight: bold; background-color: #f5f5f5;">
+                  <td style="border: 1px solid #333; padding: 8px;" colspan="4">总计</td>
+                  <td style="border: 1px solid #333; padding: 8px;">{{ repairNum1 }}</td>
+                  <td style="border: 1px solid #333; padding: 8px;">{{ repairNum2 }}</td>
+                  <td style="border: 1px solid #333; padding: 8px;">{{ repairNum3 }}</td>
+                  <td style="border: 1px solid #333; padding: 8px;">¥ {{ repairNum4 }}</td>
+                  <td style="border: 1px solid #333; padding: 8px;"></td>
+                </tr>
+              </tbody>
+            </table>
+
             <div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;">
               <div class="item" style="text-align: center;width: 100% ;font-weight: 600; font-size: 14px" >
                 <div><span>维修内容</span></div>
               </div>
             </div>
-            <el-table :data="repairTicketPart" class="table" style="margin-top: 20px; width: 1000px; " border>
+            <!-- <el-table :data="repairTicketPart" class="table" style="margin-top: 20px; width: 1000px; " border>
               <el-table-column label="修理项目" align="center" prop="repairName" >
                 <template slot-scope="scope">
                   <div>{{ scope.row.maTypeName }}-{{ scope.row.typeName }}</div>
@@ -177,7 +250,67 @@
             <div class="tabelAll">
               <div class="columnAllNumTwo">合计</div>
               <div class="columnAllNumThree">{{ "¥"+" "+acountAll }}</div>
+            </div> -->
+
+            <table
+              class="table"
+              style="
+                margin-top: 20px;
+                width: 1000px;
+                border: 1px solid #333;
+                border-collapse: collapse;
+                text-align: center;
+              "
+            >
+              <thead>
+                <tr style="background-color: #f5f7fa;">
+                  <th style="border: 1px solid #333; padding: 8px;">修理项目</th>
+                  <th style="border: 1px solid #333; padding: 8px;">
+                    配件名称 * 数量 / 单价
+                    <span style="margin-left: 20px;">总价</span>
+                  </th>
+                </tr>
+              </thead>
+
+              <tbody>
+                <tr v-for="(row, index) in repairTicketPart" :key="index">
+                  <!-- 修理项目 -->
+                  <td style="border: 1px solid #333; padding: 8px;">
+                    {{ row.maTypeName }} - {{ row.typeName }}
+                  </td>
+
+                  <!-- 配件详情 -->
+                  <td
+                    style="border: 1px solid #333; padding: 8px; text-align: left;"
+                  >
+                    <div>
+                      {{ row.partName }}
+                      ×
+                      {{ row.partNum }}
+                      /
+                      <span v-if="row.partPrice !== 0">¥ {{ row.partPrice }}</span>
+                      <span v-else>无</span>
+                      <span style="float: right;">¥ {{ row.partCost }}</span>
                     </div>
+                  </td>
+                </tr>
+
+                <!-- ✅ 合计行 -->
+                <tr style="font-weight: bold; background-color: #f5f5f5;">
+                  <td
+                    style="border: 1px solid #333; padding: 8px; text-align: center;"
+                  >
+                    合计
+                  </td>
+                  <td
+                    style="border: 1px solid #333; padding: 8px; text-align: center;"
+                  >
+                    ¥ {{ acountAll }}
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+
             <div class="fillIn" style=" margin-top: 20px; display: flex; justify-content: space-between;">
               <div class="item" style="width: 50%">
                 <div>

src/views/material/repair/repairManage/component/view.vue

@@ -133,7 +133,7 @@
 
     <!-- 弹框 -->
     <el-dialog title="试验记录表" :visible.sync="dialogVisible" width="46%" @close="closeDialog">
-      <div  id="print-content">
+      <div  id="print-content2">
         <vue-easy-print tableShow ref="remarksPrintRef2" class="print" style="margin: 0 20px">
           <div style="text-align: center; font-weight: 600; font-size: 30px">机具（物流）分公司动力设备维修及试验记录单</div>
             <div class="info" style="margin: 10px 20px 0; display: flex; justify-content: space-between;">
@@ -445,7 +445,7 @@ export default {
     // 打印
     print() {
       printJS({
-        printable: 'print-content',
+        printable: 'print-content2',
         type: 'html', //
         // targetStyles: ['*'], // 打印的元素样式
         scanStyles: false, // 是否扫描页面样式

src/views/material/repair/testRecord/index.vue

@@ -100,7 +100,7 @@
 
     <!-- 弹框 -->
     <el-dialog title="试验记录表" :visible.sync="dialogVisible" width="46%" @close="closeDialog">
-      <div  id="print-content">
+      <div  id="print-content3">
         <vue-easy-print tableShow ref="remarksPrintRef2" class="print" style="margin: 0 20px">
           <div style="text-align: center; font-weight: 600; font-size: 30px">机具（物流）分公司动力设备维修及试验记录单</div>
             <div class="info" style="margin: 10px 20px 0; display: flex; justify-content: space-between;">
@@ -498,7 +498,7 @@ export default {
         // 打印
         print() {
             printJS({
-            printable: 'print-content',
+            printable: 'print-content3',
             type: 'html', //
             // targetStyles: ['*'], // 打印的元素样式
             scanStyles: false, // 是否扫描页面样式

src/views/material/report/goodsEntryReport.vue

@@ -88,7 +88,7 @@
             <el-table-column label="采购价格(含税)" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
             <el-table-column label="采购价格(不含税)" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
             <el-table-column label="物资厂家" align="center" prop="supplierName" :show-overflow-tooltip="true"/>
-            <el-table-column label="采购时间" align="center" prop="purchaseTime" :show-overflow-tooltip="true"/>
+            <el-table-column label="到货时间" align="center" prop="purchaseTime" :show-overflow-tooltip="true"/>
             <el-table-column label="验收时间" align="center" prop="passTime" :show-overflow-tooltip="true"/>
             <el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true"/>
             <el-table-column label="入库人员" align="center" prop="inputUser" :show-overflow-tooltip="true"/>
@@ -501,6 +501,7 @@
             this.openWaitRecord = true
             this.dialogWaitQuery.keyWord = ""
             this.dialogWaitQuery.taskId = row.taskId;
+            this.dialogWaitQuery.typeId = row.typeId;
             this.getDialogWaitDataList()
         },
         /** 查询采购数量弹框列表 */

src/views/material/stquery/deviceStatusRecord.vue

@@ -61,7 +61,7 @@
                     <span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
                 </template>
           </el-table-column>
-          <el-table-column label="仓库信息" align="center" prop="whHouseName" :show-overflow-tooltip="true"/>
+          <!-- <el-table-column label="仓库信息" align="center" prop="whHouseName" :show-overflow-tooltip="true"/>-->
           <el-table-column label="施工类型" align="center" prop="constructionType" :show-overflow-tooltip="true"/>
           <el-table-column label="物资类型" align="center" prop="materialType" :show-overflow-tooltip="true"/>
           <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
@@ -90,7 +90,7 @@
               </span>
             </template>
           </el-table-column>
-        <el-table-column label="定损数量" align="center" prop="dsNum" :show-overflow-tooltip="true">
+        <el-table-column label="待修数量" align="center" prop="dsNum" :show-overflow-tooltip="true">
           <template slot-scope="scope">
               <span v-if="scope.$index !== 0" class="clickText" @click="openRepairRecords(scope.row,1)">
               {{ scope.row.dsNum }}
@@ -154,18 +154,18 @@
               </span>
           </template>
         </el-table-column> -->
-        <el-table-column label="已审核报废数量" align="center" prop="scrapNum" :show-overflow-tooltip="true">
+<!--        <el-table-column label="已审核报废数量" align="center" prop="scrapNum" :show-overflow-tooltip="true">
           <template slot-scope="scope">
               <span v-if="scope.$index !== 0" class="clickText" @click="openAuditedRecords(scope.row)">
               {{ scope.row.scrapNum }}
               </span>
-            <!-- 否则，直接显示数字 -->
+            &lt;!&ndash; 否则，直接显示数字 &ndash;&gt;
-            <!-- <span v-else>
+            &lt;!&ndash; <span v-else>
             {{ scope.row.repairInputNum }}
-            </span>  -->
+            </span>  &ndash;&gt;
-            <!-- <span class="clickText" @click="openTestedRecords(scope.row)">{{ scope.row.repairInputNum }}</span> -->
+            &lt;!&ndash; <span class="clickText" @click="openTestedRecords(scope.row)">{{ scope.row.repairInputNum }}</span> &ndash;&gt;
           </template>
-        </el-table-column>
+        </el-table-column>-->
           <el-table-column label="总保有量" align="center" prop="allNum" :show-overflow-tooltip="true">
           </el-table-column>
           <el-table-column label="总保有量资产（万元）" align="center" prop="totalPrice" :show-overflow-tooltip="true" />
@@ -222,9 +222,9 @@
           <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
           <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
           <el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true"/>
-          <el-table-column label="操作人" align="center" prop="inputUser" :show-overflow-tooltip="true"/>
+<!--          <el-table-column label="操作人" align="center" prop="inputUser" :show-overflow-tooltip="true"/>
           <el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true"/>
-          <el-table-column label="入库方式" align="center" prop="inputType" :show-overflow-tooltip="true"/>
+          <el-table-column label="入库方式" align="center" prop="inputType" :show-overflow-tooltip="true"/>-->
         </el-table>
           <pagination
             v-show="dialogTotal > 0"

src/views/material/stquery/deviceUsingRecord.vue

@@ -127,7 +127,7 @@
           <el-table-column label="归还数量" align="center" prop="backNum"></el-table-column>
           <el-table-column label="在用数量" align="center" prop="usNum"></el-table-column>
           <el-table-column label="在用总价值（元）" align="center" prop="usPrice"></el-table-column>
-          <el-table-column label="投入总价值（元）" align="center" prop="totalPrice" />
+          <!-- <el-table-column label="投入总价值（元）" align="center" prop="totalPrice" />-->
           <el-table-column label="协议状态" align="center" prop="isSltName" :show-overflow-tooltip="true"/>
       </el-table>
       <pagination

vue.config.js

@@ -35,14 +35,15 @@ module.exports = {
         proxy: {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
-                target: `http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api`, // 产线
+                // target: `http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api`, // 产线
                 // target: `http://192.168.0.96:18080`,//马
                 // target: `http://192.168.0.244:18580`,//测试
                 // target: `http://192.168.2.223:18080`,//山
                 // target: `http://192.168.2.23:18080`,//洪
                 // target: `http://192.168.0.234:18080`, //阮
                 // target: `http://192.168.137.1:18080`,//
-                // target: `http://192.168.0.15:18080`, // 韩傲宇
+                // target: `http://172.20.10.9:18080`, // 韩傲宇
+              target: `http://192.168.1.115:18080`, // 韩傲宇
                 // target: `http://192.168.0.60:18080`, // 赵福海
                 changeOrigin: true,
                 pathRewrite: {