bom

src/BIZComponents/homogeneityInspect/orderHomogeneityInspectDialog.vue

@@ -13,12 +13,12 @@
         <el-form label-width="80px" :model="dataObj" class="order_form">
           <el-row :gutter="20" type="flex" style="flex-wrap: wrap">
             <el-col :span="8">
-              <el-form-item label="单据编号:">
+              <el-form-item label="单据编码:">
                 <el-input readonly v-model="dataObj.code"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="编号:">
+              <el-form-item label="编码:">
                 <el-input readonly v-model="dataObj.productCode"></el-input>
               </el-form-item>
             </el-col>
@@ -178,27 +178,7 @@
                     {{ row.finalStateText }}
                   </div>
                 </template>
-                <!-- <template v-slot:stockColor="{ row }">
-                  <div :class="{ statusRed: row.stockStatus == '缺料' }">
-                    {{ row.stockStatus }}
-                  </div>
-                </template>
-                <template v-slot:currentColor="{ row }">
-                  <div :class="{ statusRed: row.currentStatus == '缺料' }">
-                    {{ row.currentStatus }}
-                  </div>
-                </template>
-                <template v-slot:finishColor="{ row }">
-                  <div :class="{ statusRed: row.finishStatus == '缺料' }">
-                    {{ row.finishStatus }}
-                  </div>
-                </template>
-                <template v-slot:finishCount="{ row }">
-                  <div>
-                    <div v-if="row.finishCount > 0">{{ row.finishCount }}</div>
-                    <div v-else>-</div>
-                  </div>
-                </template> -->
+               
               </ele-pro-table>
             </div>
           </div>
@@ -206,7 +186,6 @@
       </div>
       <div slot="footer">
         <el-button plain @click="cancel">取消</el-button>
-        <!-- <el-button type="primary" @click="confirm">确定</el-button> -->
       </div>
     </ele-modal>
 

src/mixins/tableColumnsMixin.js

@@ -55,6 +55,13 @@ export default {
         }
       }
     },
+    getColumns() {
+      if (typeof this.columns == 'function') {
+        return this.columns();
+      } else {
+        return this.columns;
+      }
+    },
     //服务器和本地配置columns对比
     columnsContrast(list) {
       const key = 'label';
@@ -62,15 +69,9 @@ export default {
       let sList = list.filter((d, i, r) => {
         return d[key];
       });
-      let devColumns = [];
-      if (this.newColumns?.length) {
-        devColumns = this.newColumns;
-      }
-      if (typeof this.columns == 'function') {
-        devColumns = this.columns();
-      } else {
-        devColumns = this.columns;
-      }
+      let devColumns = this.newColumns?.length
+        ? this.newColumns
+        : this.getColumns();
 
       let dList = devColumns.filter((d, i, r) => {
         return d[key] && d[key] !== '序号';