add:配方同步hcp球磨时间
This commit is contained in:
@@ -157,11 +157,12 @@
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
type="success"
|
||||
:disabled="Export_flag"
|
||||
icon="el-icon-position"
|
||||
size="mini"
|
||||
@click="saveDetection()"
|
||||
>
|
||||
导入检测结果
|
||||
同步检测结果
|
||||
</el-button>
|
||||
<el-button
|
||||
slot="right"
|
||||
@@ -193,6 +194,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="workorder_code" width="130" label="工令号" />
|
||||
<el-table-column prop="status" :formatter="stateFormat" min-width="80" label="状态" />
|
||||
<el-table-column prop="remark2" min-width="200" label="备注"/>
|
||||
<el-table-column prop="bucket_type" :formatter="bucket_typeFormat" min-width="80" label="桶类型" />
|
||||
<el-table-column prop="material_code" min-width="130" label="物料编码" />
|
||||
@@ -203,7 +205,6 @@
|
||||
<el-table-column prop="ball_time" min-width="100" label="球磨时间" />
|
||||
<el-table-column prop="hcp_standard" min-width="100" label="hcp标准值" />
|
||||
<el-table-column prop="hcp_detection" min-width="100" label="hcp检测值" />
|
||||
<el-table-column prop="status" :formatter="stateFormat" min-width="80" label="状态" />
|
||||
<el-table-column prop="is_audit" :formatter="stateFormat2" min-width="80" label="是否审核" />
|
||||
<el-table-column prop="audit_time" min-width="140" label="审核时间" />
|
||||
<el-table-column prop="audit_name" min-width="80" label="审核人" />
|
||||
@@ -442,10 +443,6 @@ export default {
|
||||
this.fileList = []
|
||||
this.file1 = ''
|
||||
this.crud.toQuery()
|
||||
}).catch(err => {
|
||||
this.dialogUpload2 = false
|
||||
this.fileList = []
|
||||
this.file1 = ''
|
||||
})
|
||||
this.dialogUpload2 = false
|
||||
this.fileList = []
|
||||
@@ -556,7 +553,6 @@ export default {
|
||||
}
|
||||
const data = _selectData[0]
|
||||
download('/api/formula/preview', { 'formula_id': data.formula_id }).then(result => {
|
||||
debugger
|
||||
const name = data.material_code + data.pcsn
|
||||
downloadFile(result, name, 'xlsx')
|
||||
crud.downloadLoading = false
|
||||
@@ -575,7 +571,20 @@ export default {
|
||||
this.dialogUpload = true
|
||||
},
|
||||
saveDetection() {
|
||||
this.dialogUpload2 = true
|
||||
const _selectData = this.$refs.table.selection
|
||||
if (_selectData.length === 0 ) {
|
||||
this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
|
||||
return false
|
||||
}
|
||||
const data = _selectData[0]
|
||||
this.formula_id = data.formula_id
|
||||
formula.excelImport(_selectData).then((res) => {
|
||||
this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
this.dialogUpload2 = false
|
||||
this.fileList = []
|
||||
this.file1 = ''
|
||||
this.crud.toQuery()
|
||||
})
|
||||
},
|
||||
upclose() {
|
||||
this.dialogUpload2 = false
|
||||
|
||||
Reference in New Issue
Block a user