问题样式修改

3 days ago · 461b8e03e3
parent ff586b2b2e
commit 461b8e03e3
24 changed files with 44 additions and 56 deletions
--- a/src/views/productionManagement/WIPChange/index.vue
+++ b/src/views/productionManagement/WIPChange/index.vue
@ -105,6 +105,7 @@ export default {
        menuAlign: 'left',
        gridBtn: false,
        searchMenuPosition: 'right',
+        searchLabelWidth:'auto',
        column: [
          {
            label: '物料号',
--- a/src/views/productionManagement/beforeAndAfterPlating/afterPlating.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/afterPlating.vue
@ -106,6 +106,7 @@ export default {
        viewBtnIcon: ' ',
        delBtnIcon: ' ',
        editBtnIcon: ' ',
+        searchLabelWidth:'auto',
        column: [],
      },
      data: [],
--- a/src/views/productionManagement/beforeAndAfterPlating/components/handoverRec.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/components/handoverRec.vue
@ -108,6 +108,7 @@ export default {
        gridBtn: false,
        searchMenuPosition: 'right',
        align: 'center',
+        searchLabelWidth:'auto',
        menu: false,
        column: [
          {
--- a/src/views/productionManagement/beforeAndAfterPlating/components/maintainRecords.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/components/maintainRecords.vue
@ -82,6 +82,7 @@ export default {
        searchMenuPosition: 'right',
        align: 'center',
        menu:false,
+        searchLabelWidth:'auto',
        column: [
          {
            label: '车间订单',
--- a/src/views/productionManagement/beforeAndAfterPlating/index.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/index.vue
@ -114,6 +114,7 @@ export default {
        menuAlign: 'left',
        gridBtn: false,
        searchMenuPosition: 'right',
+        searchLabelWidth:'auto',
        addBtnIcon: ' ',
        viewBtnIcon: ' ',
        delBtnIcon: ' ',
--- a/src/views/productionManagement/blbWorkOrder/components/glass.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue
@ -206,6 +206,7 @@ export default {
        gridBtn: false,
        searchMenuPosition: 'right',
        align: 'center',
+        searchLabelWidth:'auto',
        column: [
          {
            label: '当前工序',
@ -369,7 +370,6 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,
-            searchLabelWidth: 100,
          
          },
          {
@ -380,7 +380,6 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,
-            searchLabelWidth: 100,
            hide:true,
            dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
            props: {
@ -426,7 +425,6 @@ export default {
            prop: 'sendDownTime',
            sortable: true,
            filter: true,
-            searchLabelWidth: 90,
            span: 12,
            search: true,
            width: 150,
@ -460,7 +458,6 @@ export default {
            format: 'YYYY-MM-DD HH:mm:ss',
            valueFormat: 'YYYY-MM-DD HH:mm:ss',
          
-            searchLabelWidth: 90,
          },
         
          {
--- a/src/views/productionManagement/blbWorkOrder/components/others.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/others.vue
@ -204,6 +204,7 @@ export default {
        gridBtn: false,
        searchMenuPosition: 'right',
        align: 'center',
+         searchLabelWidth:'auto',
        column: [
          {
            label: '当前工序',
@ -368,8 +369,6 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,          
-            searchLabelWidth: 100,
-          
          },
          {
            label: '订单优先级',
@ -379,7 +378,6 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,
-            searchLabelWidth: 100,
            hide:true,
            dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
            props: {
@ -433,7 +431,6 @@ export default {
            type: 'datetime',
            format: 'YYYY-MM-DD HH:mm:ss',
            valueFormat: 'YYYY-MM-DD HH:mm:ss',
-            searchLabelWidth: 90,
          },
          {
            label: '计划完工时间',
@ -446,7 +443,6 @@ export default {
            valueFormat: 'YYYY-MM-DD HH:mm:ss',
           
            width: 150,
-            searchLabelWidth: 90,
          },
          {
            label: '镀后入库时间',
@ -460,7 +456,6 @@ export default {
            type: 'datetimerange',
            format: 'YYYY-MM-DD HH:mm:ss',
            valueFormat: 'YYYY-MM-DD HH:mm:ss',
-            searchLabelWidth: 90,
          },
          
          {
--- a/src/views/productionManagement/frontTooling/index.vue
+++ b/src/views/productionManagement/frontTooling/index.vue
@ -69,7 +69,7 @@ export default {
        editBtnIcon: ' ',
        viewBtnText: '详情',
        labelWidth: 120,
-        // searchLabelWidth: 120,
+        searchLabelWidth: 'auto',
        menu: false,
        menuWidth: 220,
        dialogWidth: 1200,
@ -214,7 +214,6 @@ export default {
            search: true,
            sortable: true,
            overHidden: true,
-            searchLabelWidth: 90,
          },
          {
            label: '需求交期',
--- a/src/views/productionManagement/productionMonitoring/index.vue
+++ b/src/views/productionManagement/productionMonitoring/index.vue
@ -219,6 +219,7 @@ export default {
        menuAlign: 'left',
        gridBtn: false,
        searchMenuPosition: 'right',
+        searchLabelWidth:'auto',
        align: 'center',
        column: [
          {
@ -276,7 +277,6 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,
-            // searchLabelWidth: 100,
          },
          {
            label: '加工单位',
@ -305,7 +305,6 @@ export default {
            overHidden: true,
            width: 150,
            hide: true,
-            // searchLabelWidth: 100,
          },
          {
            label: '生产订单号',
@ -315,7 +314,6 @@ export default {
            overHidden: true,
            // hide: true,
            width: 150,
-            // searchLabelWidth: 100,
          },
          {
            label: '计划单号',
@ -433,7 +431,6 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,
-            // searchLabelWidth: 100,
          },
          {
            label: '订单优先级',
@ -443,7 +440,6 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,
-            // searchLabelWidth: 100,
            hide: true,
            dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
            props: {
@ -497,7 +493,6 @@ export default {
            sortable: true,
            filter: true,
            selectWidth: 150,
-            searchLabelWidth: 90,
            span: 12,
            search: true,
            width: 150,
@ -512,7 +507,6 @@ export default {
            search: false,
            sortable: true,
            overHidden: true,
-            searchLabelWidth: 100,
            type: 'date',
            format: 'YYYY-MM-DD HH:mm:ss',
            valueFormat: 'YYYY-MM-DD HH:mm:ss',
@ -528,7 +522,6 @@ export default {
            search: true,
            searchSpan: 8,
            width: 150,
-            searchLabelWidth: 90,
            type: 'date',
            format: 'YYYY-MM-DD HH:mm:ss',
            valueFormat: 'YYYY-MM-DD HH:mm:ss',
--- a/src/views/productionManagement/reworkOrder/index.vue
+++ b/src/views/productionManagement/reworkOrder/index.vue
@ -116,6 +116,7 @@ export default {
        menuAlign: 'left',
        gridBtn: false,
        searchMenuPosition: 'right',
+        searchLabelWidth:'auto',
        column: [
          {
            label: '返工单号',
--- a/src/views/productionManagement/reworkPlan/index.vue
+++ b/src/views/productionManagement/reworkPlan/index.vue
@ -100,6 +100,7 @@ export default {
        searchMenuPosition: 'right',
        align: 'center',
        menu: false,
+        searchLabelWidth:'auto',
        column: [
          {
            label: '返工订单',
--- a/src/views/productionManagement/sameFurnaceQuery/index.vue
+++ b/src/views/productionManagement/sameFurnaceQuery/index.vue
@ -75,6 +75,7 @@ export default {
        delBtnIcon: ' ',
        editBtnIcon: ' ',
        align: 'center',
+        searchLabelWidth: 'auto',
        column: [
          {
            label: '绑定编号',
@ -89,7 +90,6 @@ export default {
            search: true,
            sortable: true,
            overHidden: true,
-            searchLabelWidth: 120,
          },
          {
            label: '物料号',
@ -140,7 +140,7 @@ export default {
            sortable: true,
            overHidden: true,
            search: true,
-            searchLabelWidth: 'auto',
+            
            width: 150,
            type: 'date',
            searchRange: true,
--- a/src/views/productionManagement/shortageApplication/index.vue
+++ b/src/views/productionManagement/shortageApplication/index.vue
@ -100,6 +100,7 @@ export default {
        gridBtn: false,
        searchMenuPosition: 'right',
        align: 'center',
+        searchLabelWidth:'auto',
        column: [
          {
            label: '领用单号',
@ -108,7 +109,6 @@ export default {
            filter: true,
            span: 12,
            search: false,
-            searchLabelWidth: 140,
            width: 120,
            display: false,
          },
@ -120,7 +120,6 @@ export default {
            filter: true,
            span: 12,
            width: 140,
-            searchLabelWidth: 90,
          },
          {
            label: '零件号',
--- a/src/views/productionManagement/sinTerWorkOrder/index.vue
+++ b/src/views/productionManagement/sinTerWorkOrder/index.vue
@ -199,7 +199,7 @@ export default {
        editBtnIcon: ' ',
        viewBtnText: '详情',
        labelWidth: 120,
-        // searchLabelWidth: 120,
+        searchLabelWidth: 'auto',
        menuWidth: 180,
        dialogWidth: 1200,
        dialogClickModal: false,
@ -383,7 +383,6 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,
-            // searchLabelWidth: 100,
          },
          {
            label: '订单优先级',
@ -393,7 +392,6 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,
-            searchLabelWidth: 100,
            hide: true,
            dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
            props: {
@ -447,8 +445,6 @@ export default {
            type: 'datetime',
            format: 'YYYY-MM-DD HH:mm:ss',
            valueFormat: 'YYYY-MM-DD HH:mm:ss',
-
-            searchLabelWidth: 90,
          },
          {
            label: '计划完工时间',
@ -461,7 +457,6 @@ export default {
            valueFormat: 'YYYY-MM-DD HH:mm:ss',

            width: 150,
-            searchLabelWidth: 90,
          },
          {
            label: '镀后入库时间',
@ -475,7 +470,6 @@ export default {
            type: 'datetime',
            format: 'YYYY-MM-DD HH:mm:ss',
            valueFormat: 'YYYY-MM-DD HH:mm:ss',
-            searchLabelWidth: 90,
          },
          
          {
--- a/src/views/productionManagement/workReportingManagement/workRecord.vue
+++ b/src/views/productionManagement/workReportingManagement/workRecord.vue
@ -81,6 +81,7 @@ export default {
        searchMenuPosition: 'right',
        align: 'center',
        menu:false,
+        searchLabelWidth:'auto',
        column: [
          {
            label: '车间订单号',
--- a/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
+++ b/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
@ -123,6 +123,7 @@ export default {
        gridBtn: false,
        searchMenuPosition: 'right',
        align: 'center',
+        searchLabelWidth:'auto',
        column: [
          {
            label: '作业中心',
--- a/src/views/productionSchedulingPlan/basic/inspectionHours.vue
+++ b/src/views/productionSchedulingPlan/basic/inspectionHours.vue
@ -90,6 +90,7 @@ export default {
        gridBtn: false,
        searchMenuPosition: 'right',
        align: 'center',
+        searchLabelWidth:'auto',
        column: [
          {
            label: '检验项目',
--- a/src/views/productionSchedulingPlan/basic/nonSameFurnace.vue
+++ b/src/views/productionSchedulingPlan/basic/nonSameFurnace.vue
@ -90,6 +90,7 @@ export default {
        gridBtn: false,
        searchMenuPosition: 'right',
        align: 'center',
+        searchLabelWidth:'auto',
        column: [
           {
            label: '作业中心',
--- a/src/views/productionSchedulingPlan/basic/oemProcess.vue
+++ b/src/views/productionSchedulingPlan/basic/oemProcess.vue
@ -92,6 +92,7 @@ export default {
        gridBtn: false,
        searchMenuPosition: 'right',
        align: 'center',
+        searchLabelWidth:'auto',
        column: [
          {
            label: '工序',
@ -134,7 +135,6 @@ export default {
            sortable: 'custom',
            span: 12,
            type: 'number',
-            precision: 0,
            rules: [
              {
                required: true,
--- a/src/views/productionSchedulingPlan/basic/personnelCapacity.vue
+++ b/src/views/productionSchedulingPlan/basic/personnelCapacity.vue
@ -124,6 +124,7 @@ export default {
        gridBtn: false,
        searchMenuPosition: 'right',
        align: 'center',
+        searchLabelWidth:'auto',
        column: [
          {
            label: '作业中心',
--- a/src/views/productionSchedulingPlan/basic/principalProducer.vue
+++ b/src/views/productionSchedulingPlan/basic/principalProducer.vue
@ -131,7 +131,6 @@ export default {
            search: true,
            sortable: 'custom',
            span: 12,
-            searchLabelWidth: 150,
            labelWidth: 160,
            type: 'select',
            rules: [
--- a/src/views/productionSchedulingPlan/schedulingException/index.vue
+++ b/src/views/productionSchedulingPlan/schedulingException/index.vue
@ -113,6 +113,7 @@ export default {
        searchMenuPosition: 'right',
        align: 'center',
        menu: true,
+        searchLabelWidth:'auto',
        column: [
          {
            label: '时间',
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/index.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/index.vue
@ -278,11 +278,11 @@ export default {
      }
      // 已排产订单
      if (type == 'schedulingCount') {
-        this.showType = '10004';
+        this.showType = '10004,10005,10006,10015,10021';
      }
      // 未排产订单
      if (type == 'unschedulingCount') {
-        this.showType = '10003';
+        this.showType = '10003,10008';
      }
      // 异常订单
      if (type == 'errorCount') {
--- a/src/views/statisticalAnalysis/productionReport.vue
+++ b/src/views/statisticalAnalysis/productionReport.vue
@ -11,8 +11,7 @@
                <el-col :span="6">
                    <el-form-item label="统计类型">
                        <el-select v-model="formInline.type" class="m-2" placeholder="请选择" size="small"
-                            style="width: 200px" filterable
-    clearable>
+                            style="width: 200px" filterable clearable>
                            <el-option v-for="item in productionData[tabPosition]" :key="item.value" :label="item.label"
                                :value="item.value" size="small" />
                        </el-select>