fix:form表单冲突调整

This commit is contained in:
shijing 2026-06-17 08:37:46 +08:00
parent 74db604c91
commit 2028889587
3 changed files with 735 additions and 747 deletions

View File

@ -6,282 +6,312 @@
style="width: 90%;" style="width: 90%;"
@closed="$emit('closed')" @closed="$emit('closed')"
> >
<el-container v-loading="loading"> <el-form
<el-main style="padding: 0"> ref="dialogForm"
<el-form :model="form"
ref="dialogForm" :rules="rules"
:model="form" label-position="right"
:rules="rules" label-width="100px"
label-position="right" style="padding: 0"
label-width="100px" >
style="padding: 0" <el-row>
> <el-col v-if="route==null&&!is_fix">
<el-row> <el-form-item label="工艺步骤">
<el-col v-if="route==null&&!is_fix"> <el-select
<el-form-item label="工艺步骤"> v-model="form.route"
<el-select placeholder="工艺步骤"
v-model="form.route" clearable
placeholder="工艺步骤" filterable
clearable style="width: 100%"
filterable @change="changeRoute"
style="width: 100%" >
@change="changeRoute" <el-option
> v-for="item in routeOptions"
<el-option :key="item.id"
v-for="item in routeOptions" :label="item.name"
:key="item.id" :value="item.id"
:label="item.name"
:value="item.id"
>
<span>[{{ item.routepack_name }}]{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="批次号" prop="wm_in">
<xtSelect
:apiObj="apiObj"
:params="params"
v-model="form.wm_in"
:labelField="'batch'"
v-model:obj="materialrow"
v-model:label="form.batch"
style="width:100%"
@change="materialChange"
>
<el-table-column label="批次号" prop="batch"></el-table-column>
<el-table-column label="名称" prop="material_name"></el-table-column>
<el-table-column label="数量" prop="count"></el-table-column>
<el-table-column label="不良项" prop="defect_name"></el-table-column>
</xtSelect>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="班组">
<el-select
v-model="form.team"
placeholder="班组"
:disabled="mode == 'edit'"
style="width: 100%"
@change="teamChange"
>
<el-option
v-for="item in teamOptions"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="生产设备">
<el-select
v-model="form.equipment"
placeholder="生产设备"
clearable
filterable
class="width100"
>
<el-option
v-for="item in options"
:key="item.id"
:label="item.label"
:value="item.id"
>
<span style="float:left">{{item.name}}</span>
<span style="float:right">{{item.number}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- 操作员多选 -->
<el-col :md="12" :sm="24" v-if="route_code=='saobian'||route_code=='saobianb'||route_code=='chengpinpao'">
<el-form-item label="操作员">
<el-select
v-model="form.handle_users"
placeholder="操作员"
clearable
filterable
multiple
class="width100"
@change="handleUsersChange"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-else>
<el-form-item label="操作员">
<el-select
v-model="form.handle_user"
placeholder="操作员"
clearable
filterable
class="width100"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
<el-form-item :label="item.name">
<el-input-number
v-if="item.field_type=='input-number'"
v-model="item.value"
:min="0"
class="width-100"
controls-position="right"
>
</el-input-number>
<el-input-number
v-if="item.field_type=='input-int'"
v-model="item.value"
:min="0"
class="width-100"
controls-position="right"
>
</el-input-number>
<el-input
v-if="item.field_type=='input-text'"
v-model="item.value"
class="width-100"
>
</el-input>
<el-select
v-if="item.field_type=='select-text'"
v-model="item.value"
clearable
class="width-100"
>
<el-option
v-for="item0 in item.choices"
:key="item0"
:label="item0"
:value="item0"
>
</el-option>
</el-select>
<el-select
v-if="item.field_type=='selects-text'"
v-model="item.value"
clearable
multiple
class="width-100"
>
<el-option
v-for="item1 in item.choices"
:key="item1"
:label="item1"
:value="item1"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="mgroupName=='成品抛'">
<el-form-item label="批次序号">
<el-input-number
v-model="form.index"
:min="0"
:max="99"
placeholder="第几炉,追加到批次"
style="width: 100%"
controls-position="right"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item
label="开始时间"
prop="work_start_time"
> >
<el-date-picker <span>[{{ item.routepack_name }}]{{ item.name }}</span>
v-model="form.work_start_time" </el-option>
type="datetime" </el-select>
value-format="YYYY-MM-DD HH:mm:ss" </el-form-item>
style="width: 100%" </el-col>
/> <el-col>
</el-form-item> <el-form-item label="批次号" prop="wm_in">
</el-col> <xtSelect
<el-col :md="12" :sm="24"> :apiObj="apiObj"
<el-form-item label="领用数量"> :params="params"
v-model="form.wm_in"
:labelField="'batch'"
v-model:obj="materialrow"
v-model:label="form.batch"
style="width:100%"
@change="materialChange"
>
<el-table-column label="批次号" prop="batch"></el-table-column>
<el-table-column label="名称" prop="material_name"></el-table-column>
<el-table-column label="数量" prop="count"></el-table-column>
<el-table-column label="不良项" prop="defect_name"></el-table-column>
</xtSelect>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="班组">
<el-select
v-model="form.team"
placeholder="班组"
:disabled="mode == 'edit'"
style="width: 100%"
@change="teamChange"
>
<el-option
v-for="item in teamOptions"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="生产设备">
<el-select
v-model="form.equipment"
placeholder="生产设备"
clearable
filterable
class="width100"
>
<el-option
v-for="item in options"
:key="item.id"
:label="item.label"
:value="item.id"
>
<span style="float:left">{{item.name}}</span>
<span style="float:right">{{item.number}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- 操作员多选 -->
<el-col :md="12" :sm="24" v-if="route_code=='saobian'||route_code=='saobianb'||route_code=='chengpinpao'">
<el-form-item label="操作员">
<el-select
v-model="form.handle_users"
placeholder="操作员"
clearable
filterable
multiple
class="width100"
@change="handleUsersChange"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-else>
<el-form-item label="操作员">
<el-select
v-model="form.handle_user"
placeholder="操作员"
clearable
filterable
class="width100"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
<el-form-item :label="item.name">
<el-input-number
v-if="item.field_type=='input-number'"
v-model="item.value"
:min="0"
class="width-100"
controls-position="right"
>
</el-input-number>
<el-input-number
v-if="item.field_type=='input-int'"
v-model="item.value"
:min="0"
class="width-100"
controls-position="right"
>
</el-input-number>
<el-input
v-if="item.field_type=='input-text'"
v-model="item.value"
class="width-100"
>
</el-input>
<el-select
v-if="item.field_type=='select-text'"
v-model="item.value"
clearable
class="width-100"
>
<el-option
v-for="item0 in item.choices"
:key="item0"
:label="item0"
:value="item0"
>
</el-option>
</el-select>
<el-select
v-if="item.field_type=='selects-text'"
v-model="item.value"
clearable
multiple
class="width-100"
>
<el-option
v-for="item1 in item.choices"
:key="item1"
:label="item1"
:value="item1"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="mgroupName=='成品抛'">
<el-form-item label="批次序号">
<el-input-number
v-model="form.index"
:min="0"
:max="99"
placeholder="第几炉,追加到批次"
style="width: 100%"
controls-position="right"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item
label="开始时间"
prop="work_start_time"
>
<el-date-picker
v-model="form.work_start_time"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="领用数量">
<el-input-number
v-model="form.count_use"
:min="0"
controls-position="right"
class="width100"
@change = "countUseChange"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="加工前不良" prop="count_pn_jgqbl">
<el-input-number
v-model="form.count_pn_jgqbl"
:min="0"
class="width100"
:disabled="true"
controls-position="right"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="实际生产数">
<el-input-number
v-model="form.count_real"
:min="0"
class="width100"
controls-position="right"
:disabled="true"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="合格数量">
<el-input-number
v-model="form.count_ok"
class="width100"
:disabled="true"
controls-position="right"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="不合格数量">
<el-input-number
v-model="form.count_notok"
:disabled="true"
class="width100"
controls-position="right"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="备注">
<el-input
v-model="form.note"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row v-if="is_fix">
<el-col style="padding-left: 10px;">不良记录</el-col>
<el-col :md="6" :sm="12" v-for="item in qct_defects" :key="item.id">
<el-form-item :label="item.defect_name">
<el-input-number
v-model="defectform[item.defect_name]"
:min="0"
class="width-100"
controls-position="right"
@change="countChange"
/>
</el-form-item>
</el-col>
</el-row>
<el-row v-else>
<el-col :span=12>
<el-col>加工前不良</el-col>
<el-row style="width: 98%;">
<el-col :md="12" :sm="24" v-for="item in qct_indefects" :key="item.id">
<el-form-item :label="item.defect_name">
<el-input-number <el-input-number
v-model="form.count_use" v-model="defectinform[item.defect_name]"
:min="0" :min="0"
style="width:100%"
controls-position="right" controls-position="right"
class="width100" @change="countinChange"
@change = "countUseChange"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24">
<el-form-item label="加工前不良" prop="count_pn_jgqbl">
<el-input-number
v-model="form.count_pn_jgqbl"
:min="0"
class="width100"
:disabled="true"
controls-position="right"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="实际生产数">
<el-input-number
v-model="form.count_real"
:min="0"
class="width100"
controls-position="right"
:disabled="true"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="合格数量">
<el-input-number
v-model="form.count_ok"
class="width100"
:disabled="true"
controls-position="right"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="不合格数量">
<el-input-number
v-model="form.count_notok"
:disabled="true"
class="width100"
controls-position="right"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="备注">
<el-input
v-model="form.note"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-divider></el-divider> </el-col>
<el-row v-if="is_fix"> <el-col :span=12 style="border-left:dotted 1px #ccc;">
<el-col style="padding-left: 10px;">不良记录</el-col> <el-col style="padding-left: 10px;">本工段不良</el-col>
<el-col :md="6" :sm="12" v-for="item in qct_defects" :key="item.id"> <el-row style="width: 98%;">
<el-col :md="12" :sm="24" v-for="item in qct_defects" :key="item.id">
<el-form-item :label="item.defect_name"> <el-form-item :label="item.defect_name">
<el-input-number <el-input-number
v-model="defectform[item.defect_name]" v-model="defectform[item.defect_name]"
@ -293,49 +323,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-else> </el-col>
<el-col :span=12> </el-row>
<el-col>加工前不良</el-col> </el-form>
<el-row style="width: 98%;"> <el-footer>
<el-col :md="12" :sm="24" v-for="item in qct_indefects" :key="item.id"> <el-button type="primary" :loading="isSaveing" @click="submit"
<el-form-item :label="item.defect_name"> >保存</el-button
<el-input-number >
v-model="defectinform[item.defect_name]" <el-button @click="visible = false">取消</el-button>
:min="0" </el-footer>
style="width:100%"
controls-position="right"
@change="countinChange"
/>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span=12 style="border-left:dotted 1px #ccc;">
<el-col style="padding-left: 10px;">本工段不良</el-col>
<el-row style="width: 98%;">
<el-col :md="12" :sm="24" v-for="item in qct_defects" :key="item.id">
<el-form-item :label="item.defect_name">
<el-input-number
v-model="defectform[item.defect_name]"
:min="0"
class="width-100"
controls-position="right"
@change="countChange"
/>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
</el-form>
</el-main>
<el-footer>
<el-button type="primary" :loading="isSaveing" @click="submit"
>保存</el-button
>
<el-button @click="visible = false">取消</el-button>
</el-footer>
</el-container>
</el-dialog> </el-dialog>
</template> </template>

View File

@ -6,265 +6,261 @@
style="width: 80%;" style="width: 80%;"
@closed="$emit('closed')" @closed="$emit('closed')"
> >
<el-container v-loading="loading"> <el-form
<el-main style="padding: 0 20px 20px 20px"> ref="dialogForm"
<el-form :model="form"
ref="dialogForm" :rules="rules"
:model="form" label-position="right"
:rules="rules" label-width="80px"
label-position="right" style="padding: 0 10px"
label-width="80px" >
style="padding: 0 10px" <el-row>
> <el-col :md="12" :sm="24" v-if="mgroupMtype == 20">
<el-row> <el-form-item
<el-col :md="12" :sm="24" v-if="mgroupMtype == 20"> label="外协单位"
<el-form-item prop="supplier"
label="外协单位" >
prop="supplier" <el-select
v-model="form.supplier"
placeholder="外协单位"
clearable
:disabled="mode == 'edit'"
style="width: 100%"
>
<el-option
v-for="item in supplierOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="mlogtype!=='rework'">
<el-form-item label="工艺步骤">
<el-select
v-model="form.route"
placeholder="工艺步骤"
clearable
filterable
style="width: 100%"
:disabled="mode == 'edit'"
>
<el-option
v-for="item in routeOptions"
:key="item.id"
:label="item.name"
:value="item.id"
> >
<el-select <span>[{{ item.routepack_name }}]{{ item.name }}</span>
v-model="form.supplier" </el-option>
placeholder="外协单位" </el-select>
clearable </el-form-item>
:disabled="mode == 'edit'" </el-col>
style="width: 100%" <el-col :md="12" :sm="24">
> <el-form-item label="班组">
<el-option <el-select
v-for="item in supplierOptions" v-model="form.team"
:key="item.id" placeholder="班组"
:label="item.name" :disabled="mode == 'edit'"
:value="item.id" style="width: 100%"
></el-option> >
</el-select> <el-option
</el-form-item> v-for="item in teamOptions"
</el-col> :key="item.id"
<el-col :md="12" :sm="24" v-if="mlogtype!=='rework'"> :label="item.name"
<el-form-item label="工艺步骤"> :value="item.id"
<el-select
v-model="form.route"
placeholder="工艺步骤"
clearable
filterable
style="width: 100%"
:disabled="mode == 'edit'"
>
<el-option
v-for="item in routeOptions"
:key="item.id"
:label="item.name"
:value="item.id"
>
<span>[{{ item.routepack_name }}]{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="班组">
<el-select
v-model="form.team"
placeholder="班组"
:disabled="mode == 'edit'"
style="width: 100%"
>
<el-option
v-for="item in teamOptions"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="mgroupName=='磨抛一次抛'">
<el-form-item label="批次序号">
<el-input-number
v-model="form.index"
:min="0"
:max="99"
placeholder="第几炉,追加到批次"
style="width: 100%"
controls-position="right"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item
label="开始时间"
prop="work_start_time"
> >
<el-date-picker </el-option>
:disabled="mode == 'edit'" </el-select>
v-model="form.work_start_time" </el-form-item>
type="datetime" </el-col>
value-format="YYYY-MM-DD HH:mm:ss" <el-col :md="12" :sm="24" v-if="mgroupName=='磨抛一次抛'">
style="width: 100%" <el-form-item label="批次序号">
/> <el-input-number
</el-form-item> v-model="form.index"
</el-col> :min="0"
<el-col :md="12" :sm="24" v-if="mode == 'edit'"> :max="99"
<el-form-item label="结束时间" prop="work_end_time"> placeholder="第几炉,追加到批次"
<el-date-picker style="width: 100%"
v-model="form.work_end_time" controls-position="right"
type="datetime" />
:disabledDate="disabledDateFn" </el-form-item>
value-format="YYYY-MM-DD HH:mm:ss" </el-col>
style="width: 100%" <el-col :md="12" :sm="24">
/> <el-form-item
</el-form-item> label="开始时间"
</el-col> prop="work_start_time"
<el-col :md="12" :sm="24" v-if="route_code=='chaoxi'||route_code=='chaoxi2'||route_code=='chaoxi3'"> >
<el-form-item label="操作人"> <el-date-picker
<el-select :disabled="mode == 'edit'"
v-model="form.handle_users" v-model="form.work_start_time"
placeholder="操作人" type="datetime"
clearable value-format="YYYY-MM-DD HH:mm:ss"
filterable style="width: 100%"
multiple />
:disabled="mode == 'edit'" </el-form-item>
style="width: 100%" </el-col>
@change="handleUsersChange" <el-col :md="12" :sm="24" v-if="mode == 'edit'">
> <el-form-item label="结束时间" prop="work_end_time">
<el-option <el-date-picker
v-for="item in userOptions" v-model="form.work_end_time"
:key="item.id" type="datetime"
:label="item.name" :disabledDate="disabledDateFn"
:value="item.id" value-format="YYYY-MM-DD HH:mm:ss"
></el-option> style="width: 100%"
</el-select> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-else> <el-col :md="12" :sm="24" v-if="route_code=='chaoxi'||route_code=='chaoxi2'||route_code=='chaoxi3'">
<el-form-item label="操作人"> <el-form-item label="操作人">
<el-select <el-select
v-model="form.handle_user" v-model="form.handle_users"
placeholder="操作人" placeholder="操作人"
:disabled="mode == 'edit'" clearable
style="width: 100%" filterable
filterable multiple
> :disabled="mode == 'edit'"
<el-option style="width: 100%"
v-for="item in userOptions" @change="handleUsersChange"
:key="item.id" >
:label="item.name" <el-option
:value="item.id" v-for="item in userOptions"
> :key="item.id"
</el-option> :label="item.name"
</el-select> :value="item.id"
</el-form-item> ></el-option>
</el-col> </el-select>
<el-col :md="12" :sm="24"> </el-form-item>
<el-form-item label="生产设备"> </el-col>
<el-select <el-col :md="12" :sm="24" v-else>
v-model="form.equipment" <el-form-item label="操作人">
placeholder="生产设备" <el-select
clearable v-model="form.handle_user"
filterable placeholder="操作人"
:disabled="mode == 'edit'" :disabled="mode == 'edit'"
style="width: 100%" style="width: 100%"
> filterable
<el-option >
v-for="item in options" <el-option
:key="item.id" v-for="item in userOptions"
:label="item.label" :key="item.id"
:value="item.id" :label="item.name"
> :value="item.id"
<span style="float:left">{{item.name}}</span> >
<span style="float:right">{{item.number}}</span> </el-option>
</el-option> </el-select>
</el-select> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :md="12" :sm="24">
<!-- 黑化 --> <el-form-item label="生产设备">
<el-col :md="12" :sm="24" v-if="mgroupName=='黑化'"> <el-select
<el-form-item label="检验文件"> v-model="form.equipment"
<sc-upload-file placeholder="生产设备"
v-model="fileList" clearable
:multiple="false" filterable
:limit="1" :disabled="mode == 'edit'"
:accept="['.xlsx', '.xls']" style="width: 100%"
@success = "fileUPSuccess" >
> <el-option
<el-button type="primary" icon="el-icon-upload"> </el-button> v-for="item in options"
</sc-upload-file> :key="item.id"
</el-form-item> :label="item.label"
</el-col> :value="item.id"
</el-row> >
<el-row> <span style="float:left">{{item.name}}</span>
<el-col :md="8" :sm="12" :xs="24" v-for="item in testitems" :key="item.id"> <span style="float:right">{{item.number}}</span>
<el-form-item :label="item.name"> </el-option>
<el-input-number </el-select>
v-if="item.field_type=='input-number'" </el-form-item>
v-model="item.value" </el-col>
:min="0" <!-- 黑化 -->
class="width-100" <el-col :md="12" :sm="24" v-if="mgroupName=='黑化'">
controls-position="right" <el-form-item label="检验文件">
> <sc-upload-file
</el-input-number> v-model="fileList"
<el-input-number :multiple="false"
v-if="item.field_type=='input-int'" :limit="1"
v-model="item.value" :accept="['.xlsx', '.xls']"
:min="0" @success = "fileUPSuccess"
class="width-100" >
controls-position="right" <el-button type="primary" icon="el-icon-upload"> </el-button>
> </sc-upload-file>
</el-input-number> </el-form-item>
<el-input </el-col>
v-if="item.field_type=='input-text'" </el-row>
v-model="item.value" <el-row>
class="width-100" <el-col :md="8" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
> <el-form-item :label="item.name">
</el-input> <el-input-number
<el-select v-if="item.field_type=='input-number'"
v-if="item.field_type=='select-text'" v-model="item.value"
v-model="item.value" :min="0"
clearable class="width-100"
class="width-100" controls-position="right"
> >
<el-option </el-input-number>
v-for="item0 in item.choices" <el-input-number
:key="item0" v-if="item.field_type=='input-int'"
:label="item0" v-model="item.value"
:value="item0" :min="0"
> class="width-100"
</el-option> controls-position="right"
</el-select> >
<el-select </el-input-number>
v-if="item.field_type=='selects-text'" <el-input
v-model="item.value" v-if="item.field_type=='input-text'"
clearable v-model="item.value"
multiple class="width-100"
class="width-100" >
> </el-input>
<el-option <el-select
v-for="item1 in item.choices" v-if="item.field_type=='select-text'"
:key="item1" v-model="item.value"
:label="item1" clearable
:value="item1" class="width-100"
> >
</el-option> <el-option
</el-select> v-for="item0 in item.choices"
</el-form-item> :key="item0"
</el-col> :label="item0"
</el-row> :value="item0"
<el-row> >
<el-col :md="12" :sm="24"> </el-option>
<el-form-item label="备注"> </el-select>
<el-input <el-select
v-model="form.note" v-if="item.field_type=='selects-text'"
clearable v-model="item.value"
></el-input> clearable
</el-form-item> multiple
</el-col> class="width-100"
</el-row> >
</el-form> <el-option
</el-main> v-for="item1 in item.choices"
<el-footer> :key="item1"
<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button> :label="item1"
<el-button @click="visible = false">取消</el-button> :value="item1"
</el-footer> >
</el-container> </el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="备注">
<el-input
v-model="form.note"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-footer>
<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
<el-button @click="visible = false">取消</el-button>
</el-footer>
</el-dialog> </el-dialog>
</template> </template>

View File

@ -6,185 +6,181 @@
destroy-on-close destroy-on-close
@closed="$emit('closed')" @closed="$emit('closed')"
> >
<el-container v-loading="loading"> <el-form
<el-main style="padding: 0 0 20px 0"> ref="dialogForm"
<el-form :model="form"
ref="dialogForm" :rules="rules"
:model="form" label-position="right"
:rules="rules" label-width="100px"
label-position="right" >
label-width="100px" <el-row>
> <el-col v-if="!hasRoute&&!is_fix">
<el-row> <el-form-item label="工艺步骤" prop="route">
<el-col v-if="!hasRoute&&!is_fix"> <el-select
<el-form-item label="工艺步骤" prop="route"> v-model="form.route"
<el-select placeholder="工艺步骤"
v-model="form.route" clearable
placeholder="工艺步骤" filterable
clearable style="width: 100%"
filterable :disabled="mode == 'edit'"
style="width: 100%" @change="routeChange"
:disabled="mode == 'edit'" >
@change="routeChange" <el-option
> v-for="item in routeOptions"
<el-option :key="item.id"
v-for="item in routeOptions" :label="item.name"
:key="item.id" :value="item.id"
:label="item.name" >
:value="item.id" <span>[{{ item.routepack_name }}]{{ item.name }}</span>
> </el-option>
<span>[{{ item.routepack_name }}]{{ item.name }}</span> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col>
</el-col> <el-form-item label="批次号" prop="wm_in">
<el-col> <xtSelect
<el-form-item label="批次号" prop="wm_in"> :apiObj="apiObjM"
<xtSelect v-model="form.wm_in"
:apiObj="apiObjM" v-model:obj="selectObj"
v-model="form.wm_in" v-model:label="wmInLabel"
v-model:obj="selectObj" :labelField="'batch'"
v-model:label="wmInLabel" style="width: 100%;"
:labelField="'batch'" :params = "paramsM"
style="width: 100%;" @change="materialBatchChange"
:params = "paramsM" >
@change="materialBatchChange" <!-- :params = "{type__in: '10,20',is_hidden: false}" -->
> <el-table-column label="物料" prop="full_name">
<!-- :params = "{type__in: '10,20',is_hidden: false}" --> <template #default="scope">
<el-table-column label="物料" prop="full_name"> <span v-if="scope.row.state==20" style="color: red;border: 1px solid red;border-radius: 3px;">不合格</span>
<template #default="scope"> <span v-if="scope.row.state==30" style="color: orange;border: 1px solid orange;border-radius: 3px;">返工</span>
<span v-if="scope.row.state==20" style="color: red;border: 1px solid red;border-radius: 3px;">不合格</span> <span>{{ scope.row.batch }}({{ scope.row.material_name }})</span>
<span v-if="scope.row.state==30" style="color: orange;border: 1px solid orange;border-radius: 3px;">返工</span> <el-tag v-if="scope.row.defect_name" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ scope.row.defect_name }}</el-tag>
<span>{{ scope.row.batch }}({{ scope.row.material_name }})</span> </template>
<el-tag v-if="scope.row.defect_name" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ scope.row.defect_name }}</el-tag> </el-table-column>
</template> <el-table-column label="车间库存" prop="count" width="110px"></el-table-column>
</el-table-column> <el-table-column label="可用数量" prop="count_cando" width="110px"></el-table-column>
<el-table-column label="车间库存" prop="count" width="110px"></el-table-column> </xtSelect>
<el-table-column label="可用数量" prop="count_cando" width="110px"></el-table-column> </el-form-item>
</xtSelect> </el-col>
</el-form-item> <el-col :md="12" :sm="24">
</el-col> <el-form-item label="关联任务">
<el-col :md="12" :sm="24"> <el-select
<el-form-item label="关联任务"> v-model="form.mtask"
<el-select placeholder="关联任务"
v-model="form.mtask" clearable
placeholder="关联任务" style="width: 100%"
clearable @change="getMaterial"
style="width: 100%" >
@change="getMaterial" <el-option
> v-for="item in options"
<el-option :key="item.id"
v-for="item in options" :label="item.number"
:key="item.id" :value="item.id"
:label="item.number" >
:value="item.id" </el-option>
> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="mgroupName=='黑化'||mgroupName=='退火'"> <el-col :md="12" :sm="24" v-if="mgroupName=='黑化'||mgroupName=='退火'">
<el-form-item label="进炉数"> <el-form-item label="进炉数">
<el-input-number <el-input-number
v-model="batch_count" v-model="batch_count"
class="width-100" class="width-100"
:disabled="true" :disabled="true"
controls-position="right" controls-position="right"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item :label="mgroupMtype==10?'领用数量':'批次总数'"> <el-form-item :label="mgroupMtype==10?'领用数量':'批次总数'">
<el-input-number <el-input-number
v-model="form.count_use" v-model="form.count_use"
:max="selectObj.count_cando" :max="selectObj.count_cando"
:min="0" :min="0"
class="width-100" class="width-100"
controls-position="right" controls-position="right"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="mgroupMtype==10"> <el-col :md="12" :sm="24" v-if="mgroupMtype==10">
<el-form-item label="加工前不良" prop="count_pn_jgqbl"> <el-form-item label="加工前不良" prop="count_pn_jgqbl">
<el-input-number <el-input-number
v-model="form.count_pn_jgqbl" v-model="form.count_pn_jgqbl"
:min="0" :min="0"
:disabled="true" :disabled="true"
style="width: 100%" style="width: 100%"
controls-position="right" controls-position="right"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.note"/> <el-input v-model="form.note"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-divider v-if="(mgroupName=='黑化'||mgroupName=='退火')&&cellsList.length>0"></el-divider> <el-divider v-if="(mgroupName=='黑化'||mgroupName=='退火')&&cellsList.length>0"></el-divider>
<el-button <el-button
v-if="mgroupName=='黑化'||mgroupName=='退火'" v-if="mgroupName=='黑化'||mgroupName=='退火'"
icon="el-icon-plus" icon="el-icon-plus"
type="primary" type="primary"
@click="cellsAdd" @click="cellsAdd"
></el-button> ></el-button>
<template v-if="mgroupName=='黑化'||mgroupName=='退火'"> <template v-if="mgroupName=='黑化'||mgroupName=='退火'">
<el-row v-for="(item,$index) in cellsList" :key="item"> <el-row v-for="(item,$index) in cellsList" :key="item">
<el-col style="display: flex;"> <el-col style="display: flex;">
<el-form-item label="第" label-width="50"> <el-form-item label="第" label-width="50">
<el-input-number <el-input-number
v-model="item.start" v-model="item.start"
:min="1" :min="1"
placeholder="层数" placeholder="层数"
controls-position="right" controls-position="right"
/> />
</el-form-item> </el-form-item>
<el-form-item label="层到第" label-width="65"> <el-form-item label="层到第" label-width="65">
<el-input-number <el-input-number
v-model="item.end" v-model="item.end"
:min="1" :min="1"
placeholder="层数" placeholder="层数"
controls-position="right" controls-position="right"
/> />
</el-form-item> </el-form-item>
<el-form-item label="层,总数:" label-width="80"> <el-form-item label="层,总数:" label-width="80">
<el-input-number <el-input-number
v-model="item.count_t" v-model="item.count_t"
:min="0" :min="0"
placeholder="总数量" placeholder="总数量"
controls-position="right" controls-position="right"
@change="countTotalChange" @change="countTotalChange"
/> />
</el-form-item> </el-form-item>
<el-button <el-button
type="danger" type="danger"
style="margin: 0 20px;" style="margin: 0 20px;"
@click="cellsDel($index)">删除</el-button> @click="cellsDel($index)">删除</el-button>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>
<el-divider v-if="qct_defects.length>0"></el-divider> <el-divider v-if="qct_defects.length>0"></el-divider>
<el-row> <el-row>
<el-col :md="12" :sm="24" v-for="item in qct_defects" :key="item.id"> <el-col :md="12" :sm="24" v-for="item in qct_defects" :key="item.id">
<el-form-item :label="item.defect_name"> <el-form-item :label="item.defect_name">
<el-input-number <el-input-number
v-model="defectform[item.defect_name]" v-model="defectform[item.defect_name]"
:min="0" :min="0"
style="width: 100%" style="width: 100%"
controls-position="right" controls-position="right"
@change="countChange" @change="countChange"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-main> <el-footer>
<el-footer> <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button> <el-button @click="visible = false">取消</el-button>
<el-button @click="visible = false">取消</el-button> </el-footer>
</el-footer>
</el-container>
</el-dialog> </el-dialog>
</template> </template>