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

云

2 天以前 c7ac44a1004dcf791fe7282368f1f657e035c961

 src/components/ProcessParamListDialog.vue

@@ -16,7 +16,7 @@
              <Plus />
            </el-icon>新增
          </el-button>
          <el-button v-if="editable"
          <!-- <el-button v-if="editable"
                     type="primary"
                     link
                     size="small"
@@ -24,7 +24,7 @@
            <el-icon>
              <Refresh />
            </el-icon>同步工序参数
          </el-button>
          </el-button> -->
        </div>
      </div>
      <div class="params-list">
@@ -144,9 +144,8 @@
        </div>
      </div>
      <template #footer>
        <el-button type="primary" @click="handleParamSelectSubmit">确定</el-button>
        <el-button @click="selectParamDialogVisible = false">取消</el-button>
        <el-button type="primary"
                   @click="handleParamSelectSubmit">确定</el-button>
      </template>
    </el-dialog>
    <!-- 编辑参数对话框 -->
@@ -179,9 +178,8 @@
        </el-form-item>
      </el-form>
      <template #footer>
        <el-button type="primary" @click="handleEditParamSubmit">确定</el-button>
        <el-button @click="editParamDialogVisible = false">取消</el-button>
        <el-button type="primary"
                   @click="handleEditParamSubmit">确定</el-button>
      </template>
    </el-dialog>
  </el-dialog>
@@ -380,9 +378,6 @@
        paramId: selectedParam.value.id,
        standardValue: selectedParam.value.standardValue || "",
        isRequired: selectedParam.value.isRequired || 0,
        technologyOperationId: props.process.id,
        technologyOperationParamId: selectedParam.value.id,
        technologyRoutingOperationId: Number(props.routeId),
      })
        .then(res => {
          if (res.code === 200) {
@@ -432,6 +427,7 @@
            id: editParamForm.value.id,
            standardValue: editParamForm.value.standardValue || "",
            isRequired: editParamForm.value.isRequired || 0,
            // productionOrderRoutingOperationId: props.process.id,
          })
            .then(res => {
              if (res.code === 200) {