Merge branch 'master' of ssh://123.56.95.229:29418/高精

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -375,7 +375,7 @@
 </template>
 
 <script>
-import { searchTable, searchmachine, searchgroup, searchTable1, processingStatus, searchTable22, searchTable01, searchTable02 } from '@/api/ManufacturingCenter/GroupMatching'
+import { searchTable, searchmachine, searchgroup, searchTable1, processingStatus, searchTable01, searchTable02 } from '@/api/ManufacturingCenter/GroupMatching'
 export default {
   data() {
     return {
@@ -400,7 +400,7 @@ export default {
       pageCurrent00: 1,
       pageSize00: 50,
       pageCurrent01: 1,
-      pageSize01: 10,
+      pageSize01: 50,
       pageCurrent02: 1,
       pageSize02: 50,
       pageCurrent: 1,
@@ -412,7 +412,7 @@ export default {
       pageCurrent4: 1,
       pageSize4: 10,
       pageCurrent5: 1,
-      pageSize5: 10,
+      pageSize5: 50,
       tableData7: [],
       tableData6: [],
       tableData: [],
@@ -499,6 +499,7 @@ export default {
         for (let i = 0; i < response.data.result.length; i++) {
           if (response.data.result[i].入库时间) {
             response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
+            this.totalNum += 1
           }
           if (response.data.result[i].计划完成时间) {
             response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
@@ -511,13 +512,14 @@ export default {
         this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       })
-      searchTable22(this.check1, this.Machine, this.check2, this.Group, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
+      // searchTable22(this.check1, this.Machine, this.check2, this.Group, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
+      //   console.log(response.data, 123243)
-          if (response.data[i].入库时间 !== null) {
+      //   for (let i = 0; i < response.data.length; i++) {
-            this.totalNum += 1
+      //     if (response.data[i].入库时间 !== null) {
-          }
+      //       this.totalNum += 1
-        }
+      //     }
-      })
+      //   }
+      // })
       searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
         this.tableData1 = response.data.rows
         this.total5 = parseInt(response.data.total)
@@ -527,9 +529,12 @@ export default {
       this.dialogFormVisible4 = true
       this.titleaa = row.零件图号
       processingStatus(row.工艺计划流水号).then(response => {
+        console.log(response.data, 1123)
         for (let i = 0; i < response.data.length; i++) {
           if (response.data[i].计划日期 !== '' && response.data[i].计划日期 !== null) {
             response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
+          }
+          if (response.data[i].完成日期 !== '' && response.data[i].完成日期 !== null) {
             response.data[i].完成日期 = response.data[i].完成日期.split(' ')[0]
           }
         }

src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue

@@ -32,7 +32,7 @@
       </el-row>
     </el-card>
     <el-row>
-      <el-col style="width: 1325px;">
+      <el-col style="width: 1315px;">
         <el-card>
           <!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
           <el-table v-loading="loading" :data="tableData" height="315" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">

src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue

@@ -45,7 +45,7 @@
       </el-row>
     </el-card>
     <el-row>
-      <el-col style="width: 1325px;">
+      <el-col style="width: 1315px;">
         <el-card>
           <el-table v-loading="loading" :data="tableData" height="320" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
             <el-table-column label="项目编号" align="center" width="170px" fixed="left">

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -562,7 +562,7 @@ export default {
         this.returns = response.data[0].合同内容
       }).then(() => {
         $('#contractName').next('td').html(`<img id="img">`)
-        this.useqrcode(row.采购合同流水号) // 显示二维码
+        this.useqrcode(row.采购合同编号) // 显示二维码
       })
     }
   }

src/views/layout/components/TagsView.vue

@@ -67,14 +67,14 @@ export default {
           document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
           break
         case 'ProjectPlanningManagementNew': // 项目计划管理
-          document.getElementById('app-main').style.width = '1710px'
+          document.getElementById('app-main').style.width = '1700px'
-          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1700px'
-          document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1700px'
           break
-        case 'ProjectPlanningManagementQuery': // 项目计划管理
+        case 'ProjectPlanningManagementQuery': // 项目计划查询
-          document.getElementById('app-main').style.width = '1710px'
+          document.getElementById('app-main').style.width = '1700px'
-          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1700px'
-          document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1700px'
           break
         case 'CreatingPurchasingMaterials': // 外购备料
           document.getElementById('app-main').style.width = '1865px'