Merge branch 'langfang-develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into langfang-test

src/api/retrospect/product.js

@@ -10,7 +10,7 @@ export function exportheadexcel (params) {
 // 获取工单工序追溯数据
 export function getPotrace (params) {
 	return request({
-		url: '/admin/om/serialorder/potrace',
+		url: '/admin/om/serialorder/tracewithdetail',
 		method: 'get',
 		params
 	})
@@ -21,4 +21,14 @@ export function getWorkLineList () {
 		url: '/admin/base/workline/query',
 		method: 'get'
 	})
+}
+
+var a={
+	"SerialOrderOPTrace-ArtId": "4997757",
+	"SerialOrderOPTrace-WorkPlaceId": "OP20",
+	"SerialOrderOPTrace-StepDesc": " ",
+	"SerialOrderOPTrace-RecvData": "0",
+	"SerialOrderOPTrace-Status": "是",
+	"SerialOrderOPTrace-Remark1": "",
+	"SerialOrderOPTrace-ExecuteTime": "2021-09-26 14:20:34"
 }

src/views/retrospect/product/index.vue

@@ -119,7 +119,7 @@
           :key="item"
           :label="getColumnName(item)"
           :show-overflow-tooltip="true"
-          width="200px"
+          min-width="200px"
         >
           <template slot-scope="scope">
             <span
@@ -128,9 +128,30 @@
               >{{ scope.row.poLi[index].startTime }}</span
             >
             <span v-else></span>
+            <!-- <el-table
+              :data="scope.row.poLi[index].oPDetailLi || []"
+              style="width: 100%"
+              border
+              size="mini"
+            >
+              <el-table-column
+                v-for="itemH in detailsHeaders"
+                :key="itemH"
+                :prop="itemH"
+                min-width="150px"
+                :label="getColumnName(itemH)"
+              />
+            </el-table> -->
           </template>
         </el-table-column>
       </el-table>
+      <pagination
+        v-show="pagination.total > 0"
+        :total="pagination.total"
+        :page.sync="pagination.pageNumber"
+        :limit.sync="pagination.pageSize"
+        @pagination="getPotrace"
+      />
     </div>
   </div>
 </template>
@@ -159,7 +180,20 @@ export default {
       loading:false,
       cellItem:{},
       tableHeight:0,
-      tableDetailsHeight:0
+      pagination:{
+        pageNumber: 1,
+        pageSize: 10,
+        total:0
+      },
+      detailsHeaders:[
+        "SerialOrderOPTrace-ArtId",
+        "SerialOrderOPTrace-WorkPlaceId",
+        "SerialOrderOPTrace-StepDesc",
+        "SerialOrderOPTrace-RecvData",
+        "SerialOrderOPTrace-Status",
+        "SerialOrderOPTrace-Remark1",
+        "SerialOrderOPTrace-ExecuteTime"
+      ]
     }
   },
   created(){
@@ -176,7 +210,7 @@ export default {
   methods:{
     // tableHeight高度
     setTableHeight(){
-      this.tableHeight = (this.$refs.tableHeightRef.offsetHeight-5) || 400;
+      this.tableHeight = (this.$refs.tableHeightRef.offsetHeight-70) || 400;
     },
     // 导出文件
     exportExcel() {
@@ -191,11 +225,13 @@ export default {
     // table数据
     getPotrace(){
       getPotrace({
-        ...this.formData
-        }).then(({code, data})=>{
+        ...this.formData,
+        ...this.pagination
+        }).then(({code, data:{records:{data=[], titleLi=[]}, count}})=>{
         if(code==200){
-          this.headers=data.titleLi;
-          this.tableData=data.data;
+          this.headers=titleLi;
+          this.tableData=data;
+          this.pagination.total=count;
         }
       })
     },

src/views/retrospect/productOverview/index.vue

@@ -123,8 +123,10 @@
           width="200px"
         >
           <template slot-scope="scope">
+            <!-- <div v-if="scope.row.poLi[index].status===0" style="background:red"/> -->
+            <div v-if="scope.row.poLi[index].status===0" style="background:#e6e6e6; width:100%; height:20px;" />
             <span
-              v-if="scope.row.poLi[index]"
+              v-else-if="scope.row.poLi[index]"
               :class="[classData[scope.row.poLi[index].status]]"
               >{{ scope.row.poLi[index].startTime }}</span
             >
@@ -166,7 +168,8 @@ export default {
     return{
       classData:{
         39:'status-39',
-        40:'status-40'
+        40:'status-40',
+        98:'status-98'
       },
       formData:{
         workOrderId:undefined
@@ -315,5 +318,12 @@ export default {
     background: url('../../../assets/imgs/status-40.png') no-repeat 0px -2px;
     background-size: 23px 23px;
   }
+  .status-98{
+    display: inline-block;
+    width: 100%;
+    height: 20px;
+    background: #9172CE;
+    color: #FFFFFF;
+  }
 }
 </style>