Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/api/ManufacturingCenter/ShopScheduling.js

@@ -24,8 +24,7 @@ export function getParts(num1, num2, pageCurrent, pageSize) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_车间排产_零件查询',
-      param: `零件图号_check=${num1}&零件图号=${num2}`,
+      param: `零件图号_check=${num1}&零件图号=${num2}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
-      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -24,18 +24,10 @@
       <el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
     </el-card>
     <el-card>
-      <h3 style="text-align: center;">车间生产</h3>
+      <el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
-      <el-table
+        <el-tab-pane label="车间生产" name="车间生产">
-        v-loading="loading"
+          <!--<h3 style="text-align: center;">车间生产</h3>-->
-        :data="tableData"
+          <el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" style="width: 100%;margin-top: 6px" highlight-current-row height="600" size="mini" show-summary border stripe>
-        :summary-method="getSummaries"
-        style="width: 100%;margin-top: 6px"
-        highlight-current-row
-        height="400"
-        size="mini"
-        show-summary
-        border
-        stripe>
             <el-table-column align="center" label="零件图号">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
@@ -87,12 +79,12 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"/>
           </div>
-    </el-card>
+        </el-tab-pane>
-    <el-card>
+        <el-tab-pane label="采购部采购" name="采购部采购">
-      <h3 style="text-align: center;">采购部采购</h3>
+          <!--<h3 style="text-align: center;">采购部采购</h3>-->
           <el-tabs v-model="PartType" type="border-card" style="margin-top: 10px" @tab-click="searchTable()">
             <el-tab-pane label="标准件" name="标准件">
-          <el-table :data="tableData00" size="mini" height="400px" border stripe>
+              <el-table :data="tableData00" size="mini" height="530px" border stripe>
                 <el-table-column align="center" label="机床图号">
                   <template slot-scope="scope">
                     {{ scope.row.机床图号 }}
@@ -118,21 +110,31 @@
                     {{ scope.row.物料规格 }}
                   </template>
                 </el-table-column>
-            <el-table-column align="center" label="技术下达数量">
+                <el-table-column align="center" label="投产数量">
                   <template slot-scope="scope">
                     {{ scope.row.零件数量 || '—' }}
                   </template>
                 </el-table-column>
-            <el-table-column align="center" label="合同采购数量">
+                <el-table-column align="center" label="采购数量">
                   <template slot-scope="scope">
                     {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
                   </template>
                 </el-table-column>
+                <el-table-column align="center" label="采购时间">
+                  <template slot-scope="scope">
+                    采购时间
+                  </template>
+                </el-table-column>
                 <el-table-column align="center" label="到货数量">
                   <template slot-scope="scope">
                     {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
                   </template>
                 </el-table-column>
+                <el-table-column align="center" label="到货时间">
+                  <template slot-scope="scope">
+                    到货时间
+                  </template>
+                </el-table-column>
               </el-table>
               <div class="block">
                 <el-pagination
@@ -147,7 +149,7 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="外购件" name="外购件">
-          <el-table :data="tableData01" size="mini" height="400px" border stripe>
+              <el-table :data="tableData01" size="mini" height="530px" border stripe>
                 <el-table-column align="center" label="机床图号">
                   <template slot-scope="scope">
                     {{ scope.row.机床图号 }}
@@ -202,7 +204,7 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="基本件" name="基本件">
-          <el-table :data="tableData02" size="mini" height="400px" border stripe>
+              <el-table :data="tableData02" size="mini" height="530px" border stripe>
                 <el-table-column align="center" label="机床图号">
                   <template slot-scope="scope">
                     {{ scope.row.机床图号 }}
@@ -233,7 +235,7 @@
                     {{ scope.row.材料 }}
                   </template>
                 </el-table-column>
-            <el-table-column align="center" label="技术下达数量">
+                <el-table-column align="center" label="投产数量">
                   <template slot-scope="scope">
                     {{ scope.row.零件数量 || '—' }}
                   </template>
@@ -243,11 +245,21 @@
                     {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}
                   </template>
                 </el-table-column>
+                <el-table-column align="center" label="采购时间">
+                  <template slot-scope="scope">
+                    采购时间
+                  </template>
+                </el-table-column>
                 <el-table-column align="center" label="到货数量">
                   <template slot-scope="scope">
                     {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }}
                   </template>
                 </el-table-column>
+                <el-table-column align="center" label="到货时间">
+                  <template slot-scope="scope">
+                    到货时间
+                  </template>
+                </el-table-column>
               </el-table>
               <div class="block">
                 <el-pagination
@@ -262,15 +274,10 @@
               </div>
             </el-tab-pane>
           </el-tabs>
-    </el-card>
+        </el-tab-pane>
-
+        <el-tab-pane label="制造部采购" name="制造部采购">
-    <el-card>
+          <!--<h3 style="text-align: center;">制造部采购</h3>-->
-      <h3 style="text-align: center;">制造部采购</h3>
+          <el-table :data="tableData1" border style="width: 100%;margin-top: 6px;" height="600">
-      <el-table
-        :data="tableData1"
-        border
-        style="width: 100%;margin-top: 6px;"
-        height="400">
             <el-table-column label="机床图号" align="center" min-width="80">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -317,16 +324,12 @@
               @size-change="handleSizeChange5"
               @current-change="handleCurrentChange5"/>
           </div>
+        </el-tab-pane>
+      </el-tabs>
     </el-card>
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" :title="titleaa" center style="min-height: 300px">
-      <el-table
+      <el-table :data="tableData5" style="width: 100%;max-height: 400px;" size="mini" height="300" highlight-current-row border>
-        :data="tableData5"
-        style="width: 100%;max-height: 400px;"
-        size="mini"
-        height="300"
-        highlight-current-row
-        border>
         <el-table-column align="center" label="工序顺序" width="80">
           <template slot-scope="scope">
             {{ scope.row.工序顺序 }}
@@ -342,19 +345,24 @@
             {{ scope.row.工艺要求 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="计划日期" width="100">
+        <el-table-column align="center" label="计划完成" width="100">
           <template slot-scope="scope">
             {{ scope.row.计划日期 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺是否完成" width="100">
+        <el-table-column align="center" label="实际完成" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.完成日期 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="状态" width="100">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺是否质检" width="100">
+        <el-table-column align="center" label="质检" width="100">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>
             <el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>
@@ -388,6 +396,7 @@ export default {
       partNumber: '', // 零件号
       num: null,
       PartType: '标准件',
+      PartType2: '车间生产',
       pageCurrent00: 1,
       pageSize00: 1000,
       pageCurrent01: 1,
@@ -501,7 +510,6 @@ export default {
       })
       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[i].入库时间, 123)
           if (response.data[i].入库时间 !== null) {
             this.totalNum += 1
           }
@@ -519,6 +527,7 @@ export default {
         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]
+            response.data[i].完成日期 = response.data[i].完成日期.split(' ')[0]
           }
         }
         this.tableData5 = response.data

src/views/ManufacturingCenter/MachiningParts/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
     <el-row>
-      <el-col style="width: 610px">
+      <el-col style="width: 720px">
-        <el-card style="width:610px">
+        <el-card style="width:720px">
           <span style="margin-left: 45%;font-size: 25px;">正在加工零件</span>
           <div>加工日期：{{ dateTime }}</div>
-          <el-table :data="tableData" border size="mini" highlight-current-row style="width: 610px" stripe height="640px">
+          <el-table :data="tableData" border size="mini" highlight-current-row style="width: 720px" stripe height="640px">
             <el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -68,10 +68,10 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width: 610px">
+      <el-col style="width: 620px">
         <el-card>
           <div style="margin-left: 45%;margin-bottom: 20px; font-size: 25px">待加工零件</div>
-          <el-table :data="tableData3" border size="mini" highlight-current-row style="width: 610px" stripe height="640px">
+          <el-table :data="tableData3" border size="mini" highlight-current-row style="width: 620px" stripe height="640px">
             <el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -138,14 +138,7 @@
         <span>零件名称:</span>
         <el-input v-model="SparePartsName" style="width: 150px" size="small"/>
       </el-row>
-      <el-table
+      <el-table :data="tableData2" style="width: 615px;margin-top: 20px" size="mini" height="320" stripe highlight-current-row border>
-        :data="tableData2"
-        style="width: 615px;margin-top: 20px"
-        size="mini"
-        height="320"
-        stripe
-        highlight-current-row
-        border>
         <el-table-column align="center" label="工序" width="70">
           <template slot-scope="scope">
             {{ scope.row.工序顺序 }}
@@ -163,7 +156,7 @@
         </el-table-column>
         <el-table-column align="center" label="操作工" width="70">
           <template slot-scope="scope">
-            {{ scope.row.操作员 }}
+            {{ scope.row.工序间是否外协 === 2 ? '外协' : scope.row.操作员 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="工序完成" width="80">

src/views/ManufacturingCenter/ShopScheduling/index.vue

@@ -14,11 +14,17 @@
             </el-select>
           </el-row>
           <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="600" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
-            <el-table-column
+            <el-table-column label="序号" type="index" align="center" width="50"/>
-              label="序号"
+            <el-table-column label="机床图号" show-overflow-tooltip align="center" width="110px">
-              type="index"
+              <template slot-scope="scope">
-              align="center"
+                {{ scope.row.机床图号 }}
-              width="50"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="图号及规格" show-overflow-tooltip align="center" width="150px">
+              <template slot-scope="scope">
+                {{ scope.row.图号及规格 }}
+              </template>
+            </el-table-column>
             <el-table-column label="图号及规格" show-overflow-tooltip align="center" width="150px">
               <template slot-scope="scope">
                 {{ scope.row.图号及规格 }}
@@ -29,16 +35,11 @@
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="数量" align="center" width="70px">
+            <el-table-column label="投产数" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.投产数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="计划开始" align="center" width="90px">
-              <template slot-scope="scope">
-                {{ scope.row.计划开始时间 }}
-              </template>
-            </el-table-column>
             <el-table-column label="计划完成" align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.计划结束时间 }}
@@ -165,18 +166,19 @@ export default {
       let check
       this.Parts ? check = 1 : check = 0
       getParts(check, this.Parts, this.pageCurrent, this.pageSize).then(response => {
-        response.data.rows.map(v => {
+        response.data.result.map(v => {
           this.tableData1.push({
             工艺计划流水号: v.工艺计划流水号,
             图号及规格: v.图号及规格,
             零件名称: v.零件名称,
+            机床图号: v.机床图号,
             投产数量: v.投产数量,
             计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '',
             计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '',
             状态: v.状态
           })
         })
-        this.total = response.data.total
+        this.total = parseInt(response.data.output[0].ItemCount)
         this.loading1 = false
       })
     },