Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

云

7 天以前 d52e2f28df81f42c00fa6b0468c16602016784ba

Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

 src/views/productionManagement/productionOrder/index.vue

@@ -570,7 +570,7 @@

  const openBindRouteDialog = async (row, type) => {
    bindForm.orderId = row.id;
    bindForm.routeId = type === "add" ? null : row.processRouteCode;
    bindForm.routeId = type === "add" ? null : row.technologyRoutingId;
    bindRouteDialogVisible.value = true;
    routeOptions.value = [];
    if (!row.productModelId) {

 src/views/productionManagement/productionProcess/index.vue

@@ -162,7 +162,8 @@
      </el-form>
      <template #footer>
        <span class="dialog-footer">
          <el-button type="primary" @click="handleProcessSubmit">确定</el-button>
          <el-button type="primary"
                     @click="handleProcessSubmit">确定</el-button>
          <el-button @click="processDialogVisible = false">取消</el-button>
        </span>
      </template>
@@ -251,7 +252,9 @@
      </div>
      <template #footer>
        <span class="dialog-footer">
          <el-button type="primary" :disabled="!selectedParam" @click="handleParamSubmit">确定</el-button>
          <el-button type="primary"
                     :disabled="!selectedParam"
                     @click="handleParamSubmit">确定</el-button>
          <el-button @click="paramDialogVisible = false">取消</el-button>
        </span>
      </template>
@@ -275,9 +278,9 @@
      </el-form>
      <template #footer>
        <span class="dialog-footer">
          <el-button @click="editParamDialogVisible = false">取消</el-button>
          <el-button type="primary"
                     @click="handleEditParamSubmit">确定</el-button>
          <el-button @click="editParamDialogVisible = false">取消</el-button>
        </span>
      </template>
    </el-dialog>

 src/views/productionManagement/workOrderEdit/index.vue

@@ -111,9 +111,9 @@
      </div>
      <template #footer>
        <span class="dialog-footer">
          <el-button @click="assignReporterDialogVisible = false">取消</el-button>
          <el-button type="primary"
                     @click="handleSaveReporters">确定</el-button>
          <el-button @click="assignReporterDialogVisible = false">取消</el-button>
        </span>
      </template>
    </el-dialog>

 src/views/productionPlan/productionPlan/index.vue

@@ -134,7 +134,8 @@
      </el-form>
      <template #footer>
        <span class="dialog-footer">
          <el-button type="primary" @click="handleMergeSubmit">确定下发</el-button>
          <el-button type="primary"
                     @click="handleMergeSubmit">确定下发</el-button>
          <el-button @click="isShowNewModal = false">取消</el-button>
        </span>
      </template>
@@ -227,7 +228,8 @@
      </el-form>
      <template #footer>
        <span class="dialog-footer">
          <el-button type="primary" @click="handleSubmit">确定</el-button>
          <el-button type="primary"
                     @click="handleSubmit">确定</el-button>
          <el-button @click="dialogVisible = false">取消</el-button>
        </span>
      </template>
@@ -256,6 +258,7 @@
    productionPlanUpdate,
    productionPlanDelete,
    productionPlanCombine,
    exportProductionPlan,
  } from "@/api/productionPlan/productionPlan.js";
  import { productTreeList, modelListPage } from "@/api/basicData/product.js";
  import PIMTable from "./components/PIMTable.vue";
@@ -267,11 +270,6 @@
  const loadProdData = () => {
    console.log("Mock loadProdData called");
    return Promise.resolve({ code: 200, msg: "同步成功" });
  };

  const exportProductionPlan = () => {
    console.log("Mock exportProductionPlan called");
    return Promise.resolve();
  };

  // const productionPlanCombine = payload => {