Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes

Mr.Shi

2023-08-14 5f5f07db32be63e6112ddff7722c1ada10472da5

 web_standard/src/views/business/workPlans.vue

@@ -55,7 +55,7 @@
        <!-- deleteByIdInBatch -->
        <li><el-button type="danger" @click="deleteByIds" icon="el-icon-delete" v-permissions="['ext:workplans:delete']">批量删除</el-button></li>
      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table v-loading="isWorking.search" :data="tableData.list" border stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="planCode" label="成品计划编码" min-width="150px">
          <template slot-scope="{row}">
@@ -66,7 +66,8 @@
        </el-table-column>
        <el-table-column prop="materialName" label="物料名称" min-width="100px"></el-table-column>
        <el-table-column prop="materialCode" label="物料编码" min-width="100px"></el-table-column>
        <el-table-column prop="planDate" label="计划日期" min-width="100px"></el-table-column>
        <el-table-column prop="startDate" label="计划开始日期" min-width="100px"></el-table-column>
        <el-table-column prop="planDate" label="计划完成日期" min-width="100px"></el-table-column>
        <el-table-column prop="factoryName" label="工厂" min-width="100px"></el-table-column>
        <el-table-column prop="batch" label="生产批次号" min-width="100px"></el-table-column>
        <el-table-column prop="num" label="计划数量" min-width="100px"></el-table-column>
@@ -81,12 +82,6 @@
            <span v-else-if="row.status == 6">已完工</span>
            <!-- <span v-else-if="row.status == 7">已入库</span> -->
            <span v-else-if="row.status == 8">已关闭</span>
          </template>
        </el-table-column>
        <el-table-column label="暂停" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.paused == 1">是</span>
            <span v-else>否</span>
          </template>
        </el-table-column>
        <el-table-column label="完工数" min-width="100px">
@@ -107,7 +102,27 @@
            <span v-else>-</span>
          </template>
        </el-table-column>
        <el-table-column label="发布时间" min-width="100px">

        <el-table-column label="销售订单" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.salesorder">{{ row.salesorder }}</span>
            <span v-else>-</span>
          </template>
        </el-table-column>
        <el-table-column label="优先级" min-width="80px">
          <template slot-scope="{row}">
            <span v-if="row.urgent">{{ row.urgent }}</span>
            <span v-else>-</span>
          </template>
        </el-table-column>
        <el-table-column label="暂停" min-width="80px">
          <template slot-scope="{row}">
            {{ row.paused==0?'否':'是' }}
           
          </template>
        </el-table-column>

        <el-table-column label="发布日期" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.publishDate">{{ row.publishDate }}</span>
            <span v-else>-</span>