Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventor...

huminmin

8 天以前 de83f5112fecda011bce0192dce152e66bb56f87

 src/views/productionManagement/processRoute/processRouteItem/index.vue

@@ -31,6 +31,14 @@
        </div>
        <div class="info-item">
          <div class="info-label-wrapper">
            <span class="info-label">料号</span>
          </div>
          <div class="info-value-wrapper">
            <span class="info-value">{{ routeInfo.materialCode || '-' }}</span>
          </div>
        </div>
        <div class="info-item">
          <div class="info-label-wrapper">
            <span class="info-label">BOM编号</span>
          </div>
          <div class="info-value-wrapper">
@@ -81,7 +89,13 @@
      </el-table-column>
      <el-table-column label="产品名称" prop="productName" min-width="160" />
      <el-table-column label="规格名称" prop="model" min-width="140" />
      <el-table-column label="料号" prop="materialCode" min-width="140" />
      <el-table-column label="单位" prop="unit" width="100" />
      <el-table-column label="是否质检" prop="isQuality" width="100">
        <template #default="scope">
          {{scope.row.isQuality ? "是" : "否"}}
        </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>
@@ -130,6 +144,7 @@
                {{ item.model }}
                <!-- <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>
            <div v-else class="product-info empty">暂无产品信息</div>
          </div>
@@ -189,6 +204,10 @@
              :disabled="true" 
          />
        </el-form-item>

        <el-form-item label="是否质检" prop="isQuality">
          <el-switch v-model="form.isQuality" :active-value="true" inactive-value="false"/>
        </el-form-item>
      </el-form>

      <template #footer>
@@ -236,6 +255,7 @@
  processRouteCode: '',
  productName: '',
  model: '',
  materialCode: '',
  bomNo: '',
  description: ''
});
@@ -262,6 +282,7 @@
  productName: "",
  model: "",
  unit: "",
  isQuality: false,
});

const rules = {
@@ -317,6 +338,7 @@
    processRouteCode: route.query.processRouteCode || '',
    productName: route.query.productName || '',
    model: route.query.model || '',
    materialCode: route.query.materialCode || '',
    bomNo: route.query.bomNo || '',
    description: route.query.description || ''
  };
@@ -340,6 +362,7 @@
    productName: row.productName || "",
    model: row.model || "",
    unit: row.unit || "",
    isQuality: row.isQuality,
  };
  dialogVisible.value = true;
};
@@ -402,12 +425,14 @@
              productRouteId: routeId.value,
              processId: form.value.processId,
              productModelId: form.value.productModelId,
              isQuality: form.value.isQuality,
              dragSort,
            })
          : addOrUpdateProcessRouteItem({
              routeId: routeId.value,
              processId: form.value.processId,
              productModelId: form.value.productModelId,
              isQuality: form.value.isQuality,
              dragSort,
            });

@@ -432,12 +457,14 @@
              id: form.value.id,
              processId: form.value.processId,
              productModelId: form.value.productModelId,
              isQuality: form.value.isQuality,
            })
          : addOrUpdateProcessRouteItem({
              routeId: routeId.value,
              processId: form.value.processId,
              productModelId: form.value.productModelId,
              id: form.value.id,
              isQuality: form.value.isQuality,
            });

        updatePromise
@@ -733,6 +760,10 @@
  color: #409eff;
}

.product-tag {
  margin: 10px 0;
}

.card-footer {
  display: flex;
  justify-content: space-around;