spring
10 小时以前 473189750d56fcd56a062e0c6ea0849672d40380
fix: 工序要加是否质检、是否入库、是否报工
已修改4个文件
57 ■■■■■ 文件已修改
src/views/productionManagement/processRoute/processRouteItem/index.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionProcess/Edit.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionProcess/New.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionProcess/index.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/processRoute/processRouteItem/index.vue
@@ -87,6 +87,16 @@
          {{scope.row.isQuality ? "是" : "否"}}
        </template>
      </el-table-column>
      <el-table-column label="是否入库" prop="isInbound" width="100">
        <template #default="scope">
          {{ scope.row.isInbound ? "是" : "否" }}
        </template>
      </el-table-column>
      <el-table-column label="是否报工" prop="isReportWork" width="100">
        <template #default="scope">
          {{ scope.row.isReportWork ? "是" : "否" }}
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" fixed="right" width="150">
        <template #default="scope">
          <el-button type="primary" link size="small" @click="handleEdit(scope.row)" :disabled="scope.row.isComplete">编辑</el-button>
@@ -136,6 +146,10 @@
                <!-- <span v-if="item.unit" class="product-unit">{{ item.unit }}</span> -->
              </div>
              <el-tag type="primary" class="product-tag" v-if="item.isQuality">质检</el-tag>
              <div class="product-flags">
                <span>入库:{{ item.isInbound ? "是" : "否" }}</span>
                <span>报工:{{ item.isReportWork ? "是" : "否" }}</span>
              </div>
            </div>
            <div v-else class="product-info empty">暂无产品信息</div>
          </div>
@@ -753,6 +767,15 @@
  margin: 10px 0;
}
.product-flags {
  margin-top: 8px;
  display: flex;
  justify-content: center;
  gap: 12px;
  color: #606266;
  font-size: 12px;
}
.card-footer {
  display: flex;
  justify-content: space-around;
src/views/productionManagement/productionProcess/Edit.vue
@@ -46,6 +46,12 @@
        <el-form-item label="是否质检" prop="isQuality">
          <el-switch v-model="formState.isQuality" :active-value="true" inactive-value="false"/>
        </el-form-item>
        <el-form-item label="是否入库" prop="isInbound">
          <el-switch v-model="formState.isInbound" :active-value="true" inactive-value="false"/>
        </el-form-item>
        <el-form-item label="是否报工" prop="isReportWork">
          <el-switch v-model="formState.isReportWork" :active-value="true" inactive-value="false"/>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formState.remark" type="textarea" />
        </el-form-item>
@@ -87,6 +93,8 @@
  remark: props.record.remark,
  salaryQuota: props.record.salaryQuota,
  isQuality: props.record.isQuality,
  isInbound: props.record.isInbound,
  isReportWork: props.record.isReportWork,
});
const isShow = computed({
@@ -109,6 +117,8 @@
      remark: newRecord.remark || '',
      salaryQuota: newRecord.salaryQuota || '',
      isQuality: props.record.isQuality,
      isInbound: newRecord.isInbound,
      isReportWork: newRecord.isReportWork,
    };
  }
}, { immediate: true, deep: true });
@@ -124,6 +134,8 @@
      remark: props.record.remark || '',
      salaryQuota: props.record.salaryQuota || '',
      isQuality: props.record.isQuality,
      isInbound: props.record.isInbound,
      isReportWork: props.record.isReportWork,
    };
  }
});
src/views/productionManagement/productionProcess/New.vue
@@ -48,6 +48,12 @@
        <el-form-item label="是否质检" prop="isQuality">
          <el-switch v-model="formState.isQuality" :active-value="true" inactive-value="false"/>
        </el-form-item>
        <el-form-item label="是否入库" prop="isInbound">
          <el-switch v-model="formState.isInbound" :active-value="true" inactive-value="false"/>
        </el-form-item>
        <el-form-item label="是否报工" prop="isReportWork">
          <el-switch v-model="formState.isReportWork" :active-value="true" inactive-value="false"/>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formState.remark" type="textarea" />
        </el-form-item>
@@ -82,6 +88,8 @@
  remark: '',
  salaryQuota:  '',
  isQuality: false,
  isInbound: false,
  isReportWork: false,
});
const isShow = computed({
src/views/productionManagement/productionProcess/index.vue
@@ -114,6 +114,20 @@
      },
    },
    {
      label: "是否入库",
      prop: "isInbound",
      formatData: (params) => {
        return params ? "是" : "否";
      },
    },
    {
      label: "是否报工",
      prop: "isReportWork",
      formatData: (params) => {
        return params ? "是" : "否";
      },
    },
    {
      label: "备注",
      prop: "remark",
    },