Merge branch 'master' of http://lanpucloud.cn:1111/r/SC/gfzl

zhuguifei

7 天以前 2b31fa203f3435a582be51f45899d99164c9917a

 ruoyi-plus-soybean/src/views/qm/judge-details/modules/judge-details-operate-drawer.vue

@@ -45,31 +45,27 @@

function createDefaultModel(): Model {
  return {
      id: '',
      judgeId: '',
      itemCod: '',
      itemName: '',
      value3: null,
      value1: null,
      value2: null,
      location: '',
      cls: '',
      stdscore: null,
      ismix: null,
      rid: '',
      category: null,
      decisionDes: '',
      updateUser: '',
    id: '',
    judgeId: '',
    itemCod: '',
    itemName: '',
    value3: null,
    value1: null,
    value2: null,
    location: '',
    cls: '',
    stdscore: null,
    ismix: null,
    rid: '',
    category: null,
    decisionDes: '',
    updateUser: ''
  };
}

type RuleKey = Extract<
  keyof Model,
  | 'id'
>;
type RuleKey = Extract<keyof Model, 'id'>;

const rules: Record<RuleKey, App.Global.FormRule> = {
};
const rules: Record<RuleKey, App.Global.FormRule> = {};

function handleUpdateModelWhenEdit() {
  model.value = createDefaultModel();
@@ -86,16 +82,64 @@
async function handleSubmit() {
  await validate();

  const { id, judgeId, itemCod, itemName, value3, value1, value2, location, cls, stdscore, ismix, rid, category, decisionDes, updateUser } = model.value;
  const {
    id,
    judgeId,
    itemCod,
    itemName,
    value3,
    value1,
    value2,
    location,
    cls,
    stdscore,
    ismix,
    rid,
    category,
    decisionDes,
    updateUser
  } = model.value;

  // request
  if (props.operateType === 'add') {
    const { error } = await fetchCreateJudgeDetails({ id, judgeId, itemCod, itemName, value3, value1, value2, location, cls, stdscore, ismix, rid, category, decisionDes, updateUser });
    const { error } = await fetchCreateJudgeDetails({
      id,
      judgeId,
      itemCod,
      itemName,
      value3,
      value1,
      value2,
      location,
      cls,
      stdscore,
      ismix,
      rid,
      category,
      decisionDes,
      updateUser
    });
    if (error) return;
  }

  if (props.operateType === 'edit') {
    const { error } = await fetchUpdateJudgeDetails({ id, judgeId, itemCod, itemName, value3, value1, value2, location, cls, stdscore, ismix, rid, category, decisionDes, updateUser });
    const { error } = await fetchUpdateJudgeDetails({
      id,
      judgeId,
      itemCod,
      itemName,
      value3,
      value1,
      value2,
      location,
      cls,
      stdscore,
      ismix,
      rid,
      category,
      decisionDes,
      updateUser
    });
    if (error) return;
  }

@@ -144,13 +188,22 @@
          <NInput v-model:value="model.cls" placeholder="请输入判定级别 (A,B,C,D)" />
        </NFormItem>
        <NFormItem label="分值标准 (扣分标准，得分标准),比如不合格一次扣多少分" path="stdscore">
          <NInput v-model:value="model.stdscore" placeholder="请输入分值标准 (扣分标准，得分标准),比如不合格一次扣多少分" />
          <NInput
            v-model:value="model.stdscore"
            placeholder="请输入分值标准 (扣分标准，得分标准),比如不合格一次扣多少分"
          />
        </NFormItem>
        <NFormItem label="标记此项是否为合成项目，比如外观，实际上关联了很多子项目" path="ismix">
          <NInput v-model:value="model.ismix" placeholder="请输入标记此项是否为合成项目，比如外观，实际上关联了很多子项目" />
          <NInput
            v-model:value="model.ismix"
            placeholder="请输入标记此项是否为合成项目，比如外观，实际上关联了很多子项目"
          />
        </NFormItem>
        <NFormItem label="若此字段有UUID值，表明它可能为其他项目的子项，比如“空头”,它为烟支外观项目的子项" path="rid">
          <NInput v-model:value="model.rid" placeholder="请输入若此字段有UUID值，表明它可能为其他项目的子项，比如“空头”,它为烟支外观项目的子项" />
          <NInput
            v-model:value="model.rid"
            placeholder="请输入若此字段有UUID值，表明它可能为其他项目的子项，比如“空头”,它为烟支外观项目的子项"
          />
        </NFormItem>
        <NFormItem label="范围-备用" path="category">
          <NInput v-model:value="model.category" placeholder="请输入范围-备用" />