Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

Fixiaobai

2023-12-07 24c2d968b683c1b5b15bed651dd088cdd0f0839d

 src/views/plan/customerorder/index.vue

@@ -93,7 +93,6 @@
          > -->
        </template>
      </ttable>

      <!-- 弹窗, 日期选择 -->
      <ConfirmPullCustomerorder
        v-if="showPullCustomerOrderVisible"
@@ -449,7 +448,7 @@
          {
            minWidth: '100',
            width: '100px',
            prop: 'customerOrderNo',
            prop: 'contractNo',
            label: '合同编号',
            sort: true,
            isTrue: true,