Browse Source

1、修改窑车状态表前台多余的空行

周兴 2 years ago
parent
commit
a52ddd4284
1 changed files with 56 additions and 65 deletions
  1. 56 65
      src/view/report/kiln-car-status-report/index.vue

+ 56 - 65
src/view/report/kiln-car-status-report/index.vue

@@ -1,6 +1,5 @@
 <!-- @desc:窑车状态表  @auth:王英杰  @time:2023/3/4 19:31 -->
 <template>
-
   <div class="main-div" ref="mainDiv">
     <!--加载中-->
     <loading :loading="loading"></loading>
@@ -37,78 +36,73 @@
           <!-- 窑炉类型 -->
           <DkTableColumn field="kilnType"></DkTableColumn>
           <!-- 窑车编码 -->
-          <DkTableColumn field="carCode"  ></DkTableColumn>
+          <DkTableColumn field="carCode"></DkTableColumn>
           <!-- 当前工序 -->
-          <DkTableColumn field="currentNode" ></DkTableColumn>
+          <DkTableColumn field="currentNode"></DkTableColumn>
           <!-- 最大产品数量 -->
-          <DkTableColumn field="maxProductNum" ></DkTableColumn>
-
+          <DkTableColumn field="maxProductNum"></DkTableColumn>
         </DkTable>
 
         <!--明细-->
         <div slot="bottom">
-          <DkTabs v-model="detailModel" :options="detailOptions" @on-click="detailTabsClick"> </DkTabs>
-            <!--生产数据-->
-              <DkTable v-show ="detailModel===this.$config.KilnCarStatusText.productionData" :pageFlag="true" multiple primaryKey="itemId"
-                       :id="'table-'+$options.name"
-                       :height="this.tableHeight * (1-split) - 15"
-                       ref="not-counted-select"
-                       name="notCountedTable"
-                       :choose-flag="false"
-                       :data="productionDataData">
-                <!-- 当前工序-->
-                <DkTableColumn field="currentNode" width="180px"></DkTableColumn>
-                <!-- 开始时间-->
-                <DkTableColumn field="startTime"></DkTableColumn>
-                <!-- 生产工号-->
-                <DkTableColumn field="makeUserId"></DkTableColumn>
-                <!-- 操作者-->
-                <DkTableColumn field="opnUserName"></DkTableColumn>
-                <!-- 操作说明-->
-                <DkTableColumn field="operatingInstructions"></DkTableColumn>
-              </DkTable>
-
-            <!--窑车产品-->
-              <DkTable  v-show ="detailModel===this.$config.KilnCarStatusText.KilnCarProducts" :pageFlag="true" multiple primaryKey="itemId"
-
-                       :id="'table-'+$options.name"
-                       :height="this.tableHeight * (1-split) - 15"
-                       ref="counted-select"
-                       name="countedTable"
-                       :choose-flag="false"
-                       :data="kilnCarProductsData">
-                <!-- 产品条码-->
-                <DkTableColumn field="pdtBarcode"></DkTableColumn>
-                <!-- 产品编码-->
-                <DkTableColumn field="productCode"></DkTableColumn>
-                <!-- 窑车位置-->
-                <DkTableColumn field="kilnCarPlace"></DkTableColumn>
-                <!-- 生产工号-->
-                <DkTableColumn field="prodUserCode"></DkTableColumn>
-                <!-- 员工姓名-->
-                <DkTableColumn field="staffNames"></DkTableColumn>
-                <!-- 操作时间-->
-                <DkTableColumn field="operationTime"></DkTableColumn>
-                <!-- 操作者-->
-                <DkTableColumn field="opnUserName"></DkTableColumn>
-              </DkTable>
-
-
+          <DkTabs v-model="detailModel" :options="detailOptions" @on-click="detailTabsClick"></DkTabs>
+          <!--生产数据-->
+          <DkTable v-show="detailModel===this.$config.KilnCarStatusText.productionData" :pageFlag="true" multiple
+                   primaryKey="itemId"
+                   :id="'table-'+$options.name"
+                   :height="this.tableHeight * (1-split) - 15"
+                   ref="not-counted-select"
+                   name="notCountedTable"
+                   :choose-flag="false"
+                   :data="productionDataData">
+            <!-- 当前工序-->
+            <DkTableColumn field="currentNode" width="180px"></DkTableColumn>
+            <!-- 开始时间-->
+            <DkTableColumn field="startTime"></DkTableColumn>
+            <!-- 生产工号-->
+            <DkTableColumn field="makeUserId"></DkTableColumn>
+            <!-- 操作者-->
+            <DkTableColumn field="opnUserName"></DkTableColumn>
+            <!-- 操作说明-->
+            <DkTableColumn field="operatingInstructions"></DkTableColumn>
+          </DkTable>
+
+          <!--窑车产品-->
+          <DkTable v-show="detailModel===this.$config.KilnCarStatusText.KilnCarProducts" :pageFlag="true" multiple
+                   primaryKey="itemId"
+                   :id="'table-'+$options.name"
+                   :height="this.tableHeight * (1-split) - 15"
+                   ref="counted-select"
+                   name="countedTable"
+                   :choose-flag="false"
+                   :data="kilnCarProductsData">
+            <!-- 产品条码-->
+            <DkTableColumn field="pdtBarcode"></DkTableColumn>
+            <!-- 产品编码-->
+            <DkTableColumn field="productCode"></DkTableColumn>
+            <!-- 窑车位置-->
+            <DkTableColumn field="kilnCarPlace"></DkTableColumn>
+            <!-- 生产工号-->
+            <DkTableColumn field="prodUserCode"></DkTableColumn>
+            <!-- 员工姓名-->
+            <DkTableColumn field="staffNames"></DkTableColumn>
+            <!-- 操作时间-->
+            <DkTableColumn field="operationTime"></DkTableColumn>
+            <!-- 操作者-->
+            <DkTableColumn field="opnUserName"></DkTableColumn>
+          </DkTable>
         </div>
       </DkSplit>
     </div>
-
   </div>
 </template>
 
 <script>
 import {indexMixin} from "@/mixins";
-import PrintModal from "_c/business/print/modal.vue";
 
 export default {
   name: "kiln-car-status-report",
   mixins: [indexMixin],
-  components: {PrintModal},
   data() {
     let self = this
     return {
@@ -129,8 +123,8 @@ export default {
       //明细tab默认
       detailModel: self.$config.KilnCarStatusText.productionData,
       //明细tab可选
-      detailOptions: [{label: self.$t('productionData'), name:  self.$config.KilnCarStatusText.productionData}, //生产数据
-        {label: self.$t('KilnCarProducts'), name:  self.$config.KilnCarStatusText.KilnCarProducts},//窑车产品
+      detailOptions: [{label: self.$t('productionData'), name: self.$config.KilnCarStatusText.productionData}, //生产数据
+        {label: self.$t('KilnCarProducts'), name: self.$config.KilnCarStatusText.KilnCarProducts},//窑车产品
       ],
       checkId: null,//总单id
     }
@@ -145,10 +139,8 @@ export default {
       if (row != null) {
         this.checkId = row.checkId
         if (this.tableData && this.tableData.length > 0) {
-          // this.getDetail(1)
           this.getCarrierFlow(row.carrierId)
           this.getProduction(row.carrierId)
-
         }
       }
     },
@@ -162,15 +154,14 @@ export default {
         this.detailModel = val
       }
     },
-
     /**
      * @desc   : 查询总单 item对应的 窑车产品
      * @author : 王英杰
      * @date   : 2023/4/28 16:42
      */
     getCarrierFlow(carrierId) {
-
-      this.excute(this.$service.reportCarrieFlowService, this.$service.reportCarrieFlowService.selectCarrierFlow, {"carrierId": carrierId}).then(res => {
+      this.excute(this.$service.reportCarrieFlowService, this.$service.reportCarrieFlowService.selectCarrierFlow,
+        {carrierId: carrierId}).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.kilnCarProductsData = res.data
         }
@@ -182,7 +173,8 @@ export default {
      * @date   : 2023/4/28 16:42
      */
     getProduction(carrierId) {
-      this.excute(this.$service.reportCarrieFlowService, this.$service.reportCarrieFlowService.selectProduction, {"carrierId": carrierId}).then(res => {
+      this.excute(this.$service.reportCarrieFlowService, this.$service.reportCarrieFlowService.selectProduction,
+        {carrierId: carrierId}).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.productionDataData = res.data
         }
@@ -209,8 +201,7 @@ export default {
         if (res.code === this.$config.SUCCESS_CODE) {
           let list = this.searchContent.filter(it => it.valueFormat.code == 'kilnIds')
           if (list.length > 0) {
-           list[0].valueFormat.data = res.data
-
+            list[0].valueFormat.data = res.data
           }
         }
       })