Commit 49007801 authored by 李驰骋's avatar 李驰骋

订单编号、产品编号调整字段

parent d02bf4b2
......@@ -4,7 +4,7 @@
<!-- <el-form-item label="工单编码" prop="workorderCode">
<el-input
v-model="queryParams.workorderCode"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -27,7 +27,7 @@
<!-- <el-form-item label="产品编号" prop="productCode">
<el-input
v-model="queryParams.productCode"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -39,7 +39,7 @@
<!-- <el-form-item label="客户编码" prop="clientCode">
<el-input
v-model="queryParams.clientCode"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -53,8 +53,8 @@
</el-form-item>
<el-form-item :label="$t('工单类型')" prop="workorderType">
<el-select v-model="queryParams.workorderType" clearable >
<el-option v-for="dict in dict.type.mes_workorder_type"
:key="dict.value"
<el-option v-for="dict in dict.type.mes_workorder_type"
:key="dict.value"
:label="dict.label"
:value="dict.value">
</el-option>
......@@ -64,7 +64,7 @@
<!-- <el-form-item label="工单类型" prop="workorderType">
<el-input
v-model="queryParams.workorderType"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -185,9 +185,9 @@
<dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType" />
</template>
</el-table-column>
<el-table-column :label="$t('订单编号')" width="140" align="center" prop="salesVoucher" />
<el-table-column :label="$t('订单编号')" width="140" align="center" prop="orderCode" />
<el-table-column :label="$t('产品分类')" width="200" align="center" prop="itemTypeName" :show-overflow-tooltip="true" />
<el-table-column :label="$t('产品编号')" width="120" align="center" prop="sapItemCode" />
<el-table-column :label="$t('产品编号')" width="120" align="center" prop="productCode" />
<el-table-column :label="$t('产品名称')" width="200" align="center" prop="productName" :show-overflow-tooltip="true" />
<el-table-column :label="$t('规格型号')" align="center" prop="productSpc" :show-overflow-tooltip="true" />
<el-table-column :label="$t('需求日期')" align="center" prop="requestDate" width="180">
......@@ -328,7 +328,7 @@
</el-form-item>
</el-col> -->
<el-col :span="8" v-if="form.orderSource == 'ORDER'">
<el-form-item :label="$t('订单编号')" prop="salesVoucher">
<el-form-item :label="$t('订单编号')" prop="orderCode">
<el-input v-model="form.salesVoucher" />
</el-form-item>
</el-col>
......@@ -478,7 +478,7 @@
</el-dialog>
<WorkorderRecordSelect ref="WorkorderRecordSelectRef" :data="currentData" />
<div style="overflow: hidden;width: 0;height: 0;">
<div id="productOrderDetail">
<div v-for="(item, index) in productionSolutionTable" :key="'productionSolutionTable' + index">
<productOrderSpecification :productionSolutionTable="item" style="page-break-after:always"></productOrderSpecification>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment