名词修改

master
zhaoxiaolin 10 months ago
parent f10585e41f
commit edb7e91ba9

@ -35,14 +35,14 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料名称" prop="materialName"> <el-form-item label="产品名称" prop="materialName">
<el-input v-model="form.materialName"/> <el-input v-model="form.materialName"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料号" prop="materialCode"> <el-form-item label="产品号" prop="materialCode">
<el-input v-model="form.materialCode"/> <el-input v-model="form.materialCode"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -147,13 +147,13 @@
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="确认人" prop="confirmManName"> <el-form-item label="审核主管" prop="confirmManName">
<el-input v-model="form.confirmManName" disabled> <el-input v-model="form.confirmManName" disabled>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="确认人工号" prop="confirmManCode" > <el-form-item label="审核主管工号" prop="confirmManCode" >
<el-input v-model="form.confirmManCode" disabled/> <el-input v-model="form.confirmManCode" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -171,13 +171,13 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="确认意见" prop="confirmRemark"> <el-form-item label="审核意见" prop="confirmRemark">
<el-input type="textarea" v-model="form.confirmRemark" placeholder="请输入确认意见" /> <el-input type="textarea" v-model="form.confirmRemark" placeholder="请输入审核意见" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item style="aling:right"> <el-form-item style="aling:right">
<el-button type="primary" @click="submitConfirmFunc" v-show="form.confirmTime == null && form.myself"></el-button> <el-button type="primary" @click="submitConfirmFunc" v-show="form.confirmTime == null && form.myself"></el-button>
<el-button @click="cancelForm"> </el-button> <el-button @click="cancelForm"> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>

@ -40,14 +40,14 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料名称" prop="materialName"> <el-form-item label="产品名称" prop="materialName">
<el-input v-model="form.materialName"/> <el-input v-model="form.materialName"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料号" prop="materialCode"> <el-form-item label="产品号" prop="materialCode">
<el-input v-model="form.materialCode"/> <el-input v-model="form.materialCode"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -98,13 +98,13 @@
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="确认人" prop="confirmManName"> <el-form-item label="审核主管" prop="confirmManName">
<el-input v-model="form.confirmManName" disabled> <el-input v-model="form.confirmManName" disabled>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="确认人工号" prop="confirmManCode" > <el-form-item label="审核主管工号" prop="confirmManCode" >
<el-input v-model="form.confirmManCode" disabled/> <el-input v-model="form.confirmManCode" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -122,13 +122,13 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="确认意见" prop="confirmRemark"> <el-form-item label="审核意见" prop="confirmRemark">
<el-input type="textarea" v-model="form.confirmRemark" placeholder="请输入确认意见" /> <el-input type="textarea" v-model="form.confirmRemark" placeholder="请输入审核意见" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item style="aling:right"> <el-form-item style="aling:right">
<el-button type="primary" @click="submitConfirmFunc" v-show="form.confirmTime == null && form.myself"></el-button> <el-button type="primary" @click="submitConfirmFunc" v-show="form.confirmTime == null && form.myself"></el-button>
<el-button @click="cancelForm"> </el-button> <el-button @click="cancelForm"> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>

@ -19,10 +19,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料编码" prop="materialCode"> <el-form-item label="产品编码" prop="materialCode">
<el-input <el-input
v-model="queryParams.materialCode" v-model="queryParams.materialCode"
placeholder="请输入物料编码" placeholder="请输入产品编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -96,7 +96,7 @@
<el-table-column label="任务日期" align="center" prop="createTimeStr" width="100" fixed/> <el-table-column label="任务日期" align="center" prop="createTimeStr" width="100" fixed/>
<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120" fixed/> <el-table-column label="检验任务编号" align="center" prop="checkNo" width="120" fixed/>
<el-table-column label="订单号" align="center" prop="orderNo" width="150" fixed/> <el-table-column label="订单号" align="center" prop="orderNo" width="150" fixed/>
<el-table-column label="物料名称" align="center" prop="materialName" width="200" fixed :show-overflow-tooltip="true"/> <el-table-column label="产品名称" align="center" prop="materialName" width="200" fixed :show-overflow-tooltip="true"/>
<el-table-column label="收货数量" align="center" prop="quality" /> <el-table-column label="收货数量" align="center" prop="quality" />
<el-table-column label="单位" align="center" prop="unit" /> <el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="产线名称" align="center" prop="supplierName" width="120"/> <el-table-column label="产线名称" align="center" prop="supplierName" width="120"/>
@ -111,12 +111,12 @@
<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult"/> <dict-tag :options="dict.type.check_result" :value="scope.row.checkResult"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结果确认" align="center" width="100"> <el-table-column label="结果审核" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.device_yes_no" :value="parseInt(scope.row.confirm)"/> <dict-tag :options="dict.type.device_yes_no" :value="parseInt(scope.row.confirm)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="确认人" align="center" prop="confirmManName" /> <el-table-column label="审核主管" align="center" prop="confirmManName" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button

Loading…
Cancel
Save