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

Fixiaobai

2023-11-17 f19edc96af3261347f48cb8f66f1f5b2feb6071e

 src/views/plan/manufacturingorder/index.vue

@@ -22,9 +22,9 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :key="index"
                :command="item.command"
                v-for="item in taskTypeArr"
                v-for="(item,index) in taskTypeArr"
                :disabled="canCreateTask"
                >{{ item.label }}</el-dropdown-item
              >
@@ -41,20 +41,20 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :key="index"
                :command="item.command"
                v-for="item in stateTagArr"
                v-for="(item,index) in stateTagArr"
                :disabled="item.disabled"
                >{{ item.label }}</el-dropdown-item
              >
            </el-dropdown-menu>
          </el-dropdown>

          <el-dropdown
          <!-- <el-dropdown
            v-if="permissions.manufacturingorder_issue_material"
            @command="issueMaterialHandleCommand"
            style="margin-left:10px;"
          >
          > -->
            <!-- <el-button>
              发料<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button> -->
@@ -66,7 +66,7 @@
                >{{ item.label }}</el-dropdown-item
              >
            </el-dropdown-menu> -->
          </el-dropdown>
          <!-- </el-dropdown> -->
          <!-- <el-button
            v-if="permissions.manufacturingorder_orderto_ifs"
            @click="commitOrderIfs()"
@@ -326,7 +326,7 @@
            sort: true,
            isTrue: true,
            formatter: this.formatState,
            propVal: '01planned',
            // propVal: '01planned',
            isSearch: true,
            searchInfoType: 'select',
            optList: () => {
@@ -492,27 +492,25 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'outerColor',
          //   label: '外护颜色',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },

          {
            minWidth: '120',
            prop: 'outerColor',
            label: '外护颜色',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },

          {
            minWidth: '120',
            prop: 'insulationColor',
            label: '绝缘颜色',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },

          // {
          //   minWidth: '120',
          //   prop: 'insulationColor',
          //   label: '绝缘颜色',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '120',
            prop: 'qtyRequired',
@@ -632,42 +630,42 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '100',
            prop: 'oriIfsOrderNo',
            label: '原IFS订单号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '100',
            prop: 'ifsOrderNo',
            label: 'IFS订单号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '100',
            prop: 'ifsReleaseNo',
            label: 'IFS下达号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '100',
            prop: 'ifsSequenceNo',
            label: 'IFS序列号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '100',
          //   prop: 'oriIfsOrderNo',
          //   label: '原IFS订单号',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '100',
          //   prop: 'ifsOrderNo',
          //   label: 'IFS订单号',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '100',
          //   prop: 'ifsReleaseNo',
          //   label: 'IFS下达号',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '100',
          //   prop: 'ifsSequenceNo',
          //   label: 'IFS序列号',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '100',
            prop: 'qtyApply',
@@ -692,7 +690,7 @@
            minWidth: '140',
            width: '120',
            prop: 'endDate',
            label: '到期日',
            label: '到期时间',
            sort: true,
            isTrue: true,
            isSearch: true,
@@ -1035,13 +1033,13 @@
    },
    initQueryParams() {
      const queryParam = []
      queryParam.push(
        Object.assign({
          prop: 'state',
          searchInfoType: 'select',
          propVal: '01planned'
        })
      )
      // queryParam.push(
      //   Object.assign({
      //     prop: 'state',
      //     searchInfoType: 'select',
      //     propVal: '01planned'
      //   })
      // )
      this.$refs.manufacturingOrderTable.setQueryParam(queryParam)
      this.getData()
    },