Skip to content

M
mes-ui
Commit fdcce4e4 authored by 李驰骋's avatar 李驰骋
Browse files
Options

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

parents 1b43764c f1508248
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 30 deletions
src/i18n/lang/th_TH.json
View file @ fdcce4e4
......@@ -2965,5 +2965,6 @@
"开始": "เริ่ม",
"标签模板": "เทมเพลตแท็ก",
"请选择标签模板": "โปรดเลือกแม่แบบฉลาก",
"没有配置标签模版": "ไม่มีการกำหนดค่าลายฉลุฉลาก"
"没有配置标签模版": "ไม่มีการกำหนดค่าลายฉลุฉลาก",
"是否允许超报": "是否允许超报"
}
\ No newline at end of file
src/i18n/lang/zh_CN.json
View file @ fdcce4e4
......@@ -2965,5 +2965,6 @@
"开始": "开始",
"标签模板": "标签模板",
"请选择标签模板": "请选择标签模板",
"没有配置标签模版": "没有配置标签模版"
"没有配置标签模版": "没有配置标签模版",
"是否允许超报": "是否允许超报"
}
src/views/mes/pro/process/index.vue
View file @ fdcce4e4
......@@ -183,18 +183,11 @@
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group> -->
<el-radio-group v-model="form.isSerialReport" disabled v-if="optType=='view'">
<el-radio-group v-model.number="form.isSerialReport" :disabled="optType=='view'" >
<el-radio
v-for="dict in dict.type.sys_yes_non"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
<el-radio-group v-model="form.isSerialReport" v-else>
<el-radio
v-for="dict in dict.type.sys_yes_non"
:key="dict.value"
:label="dict.value"
:label="Number(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
......@@ -269,7 +262,7 @@ export default {
title: "",
form: {
isPackage: '0',
isSerialReport: '0',
isSerialReport: 0,
isExistTool: '0'
},
// 是否显示弹出层
......@@ -333,7 +326,7 @@ export default {
updateTime: null
};
this.$set(this.form, 'isPackage', '0')
this.$set(this.form, 'isSerialReport', '0')
this.$set(this.form, 'isSerialReport', 0)
this.$set(this.form, 'isExistTool', '0')
this.autoGenFlag = false;
// this.resetForm("form");
......
src/views/mes/pro/productionSolution/components/ProogingProcess.vue
View file @ fdcce4e4
......@@ -688,7 +688,6 @@ export default {
searchRow(row, idx) {
this.form = Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "detail";
this.showFlag = true;
},
/**查看质检 */
......
src/views/mes/pro/productionSolution/components/uploadTuzhi.vue
View file @ fdcce4e4
......@@ -32,11 +32,14 @@
<template slot-scope="scope">
<div>
<i class="el-icon-document"></i>
{{scope.row.fileOriginalName}}
{{scope.row.fileOriginalName || scope.row.originalFilename}}
</div>
</template>
</el-table-column>
<el-table-column align="left" :label="$t('大小')" prop="fileSize" >
<template slot-scope="scope">
{{scope.row.fileSize || scope.row.size}}
</template>
</el-table-column>
<el-table-column align="center" :label="$t('common.option')" >
<template slot-scope="scope">
......@@ -60,6 +63,10 @@ export default {
process: {
type: Object,
default: () => ({}),
},
orgination: {
type: Boolean,
default: false
}
},
data() {
......@@ -75,12 +82,17 @@ export default {
}
},
watch: {
process(val) {
if (val && val.drawingList && val.drawingList.length > 0) {
this.drawingList = val.drawingList
} else {
this.drawingList = []
}
process: {
handler(val) {
console.log('sad0', val)
if (val && val.drawingList && val.drawingList.length > 0) {
this.drawingList = val.drawingList
} else {
this.drawingList = []
}
},
immediate: true,
deep: true
}
},
created (){
......@@ -147,6 +159,13 @@ export default {
this.drawingList.splice(index, 1)
},
handleUploadSuccess(res, file, fileList) {
if (res.code == 200) {
// this.$message.success("文件上传成功");
} else {
this.$message.error(this.$t("文件上传失败"));
}
this.$refs.upload.clearFiles();
this.loading = false
if (fileList.every(item => item.status == 'success')) {
fileList.map((item, index) => {
/** 这时只需要push进带有response的数据就好 */
......@@ -156,7 +175,11 @@ export default {
name: item.response.data.originalFilename,
url: item.response.data.filePath
})
this.drawingList.push({filePath: item.response.data.filePath, fileOriginalName: item.response.data.originalFilename, fileSize: item.response.data.size})
if (this.orgination) {
this.drawingList.push(item.response.data)
} else {
this.drawingList.push({filePath: item.response.data.filePath, fileOriginalName: item.response.data.originalFilename, fileSize: item.response.data.size})
}
}
if(index === fileList.length - 1) {
console.log('清除')
......@@ -165,14 +188,9 @@ export default {
})
}
// console.log('resresres', res, fileList)
this.loading = false
// // 如果上传成功
// if (res.code == 200) {
// this.$message.success("文件上传成功");
// } else {
// this.$message.error("文件上传失败");
// }
// this.$refs.upload.clearFiles();
},
handleUploadError() {
this.loading = false
......
src/views/mes/pro/productionSolution/proofingInfo.vue
View file @ fdcce4e4
......@@ -6,11 +6,17 @@
<template slot="buttons" v-if="mode == 'apply'">
<el-button size="mini" @click="resetForm">{{ $t('common.reset') }}</el-button>
<el-button size="mini" type="primary" @click="saveForm">{{ $t('common.submit') }}</el-button>
<el-button size="mini" type="primary" @click="$refs.uploadTuzhiRef.showOpen = true">{{ $t('图纸上传') }}</el-button>
</template>
<!-- 修改 按钮显示 -->
<template slot="buttons" v-if="mode == 'edit'">
<el-button size="mini" type="primary" @click="saveForm">{{ $t('common.submit') }}</el-button>
<el-button size="mini" type="primary" @click="$refs.uploadTuzhiRef.showOpen = true">{{ $t('图纸上传') }}</el-button>
</template>
<template slot="buttons" v-if="mode == 'info'">
<el-button size="mini" type="primary" @click="$refs.uploadTuzhiRef.showOpen = true">{{ $t('查看文件') }}</el-button>
</template>
</PageTitle>
......@@ -99,6 +105,23 @@
></el-input-number>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('是否允许超报')" prop="surpassState">
<el-select
v-model="form.surpassState"
clearable
>
<el-option
:label="$t('是')"
:value="true"
/>
<el-option
:label="$t('否')"
:value="false"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('common.remark')" prop="remark">
<el-input
......@@ -122,6 +145,7 @@
</el-tabs>
</PageWrapper>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"> </ItemSelect>
<uploadTuzhi ref="uploadTuzhiRef" :process="form" :orgination="true" @updateItem="updateItemUpload" />
</div>
</template>
......@@ -135,6 +159,7 @@ import ItemSelect from "@/components/itemSelect/single.vue";
import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
import { listRouteprocess } from "@/api/mes/pro/routeprocess";
import tabPlugins from "@/plugins/tab";
import uploadTuzhi from "./components/uploadTuzhi.vue";
import {
addProductionSolution,
// getPrototypeRequest,
......@@ -145,6 +170,7 @@ import {
export default {
components: {
uploadTuzhi,
ProogingBom,
ProogingProcess,
ItemSelect,
......@@ -166,6 +192,7 @@ export default {
productionSolutionCode: "",
productionSolutionName: "",
productionSolutionType: "",
surpassState: false,
itemId: "",
itemName: "",
routeId: "",
......@@ -192,6 +219,7 @@ export default {
itemCode: "",
updateBy: "",
updateTime: "",
drawingList: []
},
rules: {
productionSolutionName: [
......@@ -238,6 +266,9 @@ export default {
this.form.productionSolutionCode = response;
});
},
updateItemUpload(items) {
this.form.drawingList = items;
},
//物料选择弹出框
onItemSelected(obj) {
if (obj != undefined && obj != null) {
......@@ -259,6 +290,9 @@ export default {
getProductionSolution(id)
.then(({ data }) => {
Object.assign(this.form, data);
this.$set(this.form, 'drawingList', JSON.parse(data.filePath))
console.log('this.form', this.form)
console.log('this.form.drawingList', this.form.drawingList)
this.bomList = data.bomHead.bomItemList;
// 设置组件数据
this.$refs["ProogingBomRef"].form2 = data.bomHead;
......@@ -289,11 +323,13 @@ export default {
const processList = this.$refs.ProogingProcessRef.getComData();
if (typeof processList === 'boolean') return
const params = {
...this.form,
...JSON.parse(JSON.stringify(this.form)),
bomHead,
processList,
specificationSheet: {}
};
params['filePath'] = JSON.stringify(params.drawingList)
delete params.drawingList
this.$refs.form.validate( valid => {
if (valid) {
this.loading = true;
......
src/views/mes/pro/qrcodeRecord/index.vue
View file @ fdcce4e4
......@@ -195,6 +195,11 @@
align="center"
prop="itemDesc"
/>
<el-table-column
:label="$t('标签模板')"
align="center"
prop="templateName"
/>
<el-table-column
:label="$t('创建日期')"
align="center"
......
src/views/mes/pro/scheduleList/orderList.vue
View file @ fdcce4e4
......@@ -49,6 +49,7 @@
</el-table-column>
<el-table-column :label="$t('产品编码')" align="center" prop="productCode"/>
<el-table-column :label="$t('产品名称')" align="center" prop="productName"/>
<el-table-column :label="$t('预交日期')" align="center" prop="requestDate"/>
<el-table-column :label="$t('未排数量')" align="center" prop="disQuantity"/>
<el-table-column :label="$t('本次数量')" align="center" prop="scheduleQuantity">
<template slot-scope="scope">
......
src/views/mes/qc/report/index.vue
View file @ fdcce4e4
......@@ -124,6 +124,7 @@
<span>{{ parseTime(scope.row.abnormalTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('备注')" align="center" prop="remarks" />
<el-table-column :label="$t('单据状态')" align="center" prop="abnormalStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.qc_submit_status" :value="scope.row.abnormalStatus"/>
......
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