1.新增 控制指定车间是否末道工序报工

小小儁爺

21 小时以前 7985764aa551ca2a74041e35f76e86ab67f0b3b3

1.新增  控制指定车间是否末道工序报工

 src/views/basicSettings/organizationList.vue

@@ -92,6 +92,16 @@
            </template>
          </el-table-column>
          <el-table-column
            prop="islastreport"
            label="是否末道报工"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <el-tag v-if="row.islastreport==='Y'" size="small" type="success">是</el-tag>
              <el-tag v-if="row.islastreport==='N'" size="small" type="danger">否</el-tag>
            </template>
          </el-table-column>
          <el-table-column
            prop="username"
            label="创建人员"
            sortable="custom"
@@ -164,6 +174,7 @@
            ref="cascader"
            v-model="dialogForm.storgcode"
            :options="cascaderOptions"
            style="width: 492px;"
            filterable
            :props="defaultProps"
            :show-all-levels="false"
@@ -174,6 +185,12 @@
          <el-radio-group v-model="dialogForm.status">
            <el-radio label="Y">正常</el-radio>
            <el-radio label="N">停用</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item required label="是否末道报工" label-width="120px">
          <el-radio-group v-model="dialogForm.islastreport">
            <el-radio label="Y">是</el-radio>
            <el-radio label="N">否</el-radio>
          </el-radio-group>
        </el-form-item>
      </el-form>
@@ -235,6 +252,7 @@
        storgcode: '', // 父级编码
        parent_id: '', // 原pid
        torg_seq: '', // 排序
        islastreport: 'N', //
        status: 'Y'// 状态
      },
      operation: '',
@@ -332,6 +350,7 @@
        this.dialogForm.leve = parseFloat(row.leve)
        this.dialogForm.torg_seq = row.torg_seq
        this.dialogForm.status = row.status
        this.dialogForm.islastreport = row.islastreport
        this.dialogForm.storgcode = this.findParent([], row.parent_id, this.cascaderOptions).reverse()
        this.dialogForm.parent_id = row.parent_id
      })
@@ -398,6 +417,7 @@
      this.dialogForm.storgcode = ''
      this.dialogForm.parent_id = ''
      this.dialogForm.status = 'Y'
      this.dialogForm.islastreport = 'N'
      this.dialogForm.leve = 0
      this.$refs.cascader.checkedValue = ''
      this.$refs.dialogForm.clearValidate()

 src/views/workOrder/workOrderList.vue

@@ -514,18 +514,18 @@
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
        >
          <!--          <el-table-column-->
          <!--            width="50"-->
          <!--            type="index"-->
          <!--            prop="序号"-->
          <!--            fixed-->
          <!--          />   -->
          <el-table-column
            width="50"
            prop="seq"
            label="序号"
            type="index"
            prop="序号"
            fixed
          />
          <!--          <el-table-column-->
          <!--            width="50"-->
          <!--            prop="seq"-->
          <!--            label="序号"-->
          <!--            fixed-->
          <!--          />-->
          <el-table-column
            prop="wo_code"
            show-tooltip-when-overflow
@@ -4463,7 +4463,12 @@
        data_sources: row.data_sources
      }
      const { data: res } = await UpdateMesOrderStepSearch(data)
      this.tableDataDetail = res.stepdata

      if (row.islastreport === 'Y') {
        this.tableDataDetail = res.stepdata.filter(i => i.isend === 'Y')
      } else {
        this.tableDataDetail = res.stepdata
      }
    },
    // 工序删除
    stepDel(row) {
@@ -4539,7 +4544,7 @@
    getSummaries(param) {
      const { columns, data } = param
      const sums = []
      const i = 9
      const i = 11
      columns.forEach((column, index) => {
        if (index === i) {
          sums[index] = '总数'