Commit f3c5e072 authored by renjintao's avatar renjintao

files

parent 4af18f0b
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
singleFile: { singleFile: {//上传单文件
type: Boolean, type: Boolean,
default: false default: false
}, },
...@@ -97,6 +97,9 @@ export default { ...@@ -97,6 +97,9 @@ export default {
this.vshowPro = true; this.vshowPro = true;
const hbaseFileList = []; const hbaseFileList = [];
const filesList = []; const filesList = [];
if (this.singleFile) {
this.nameList = [];
}
if (file.response.status == 0) { if (file.response.status == 0) {
let objImag = {}; let objImag = {};
objImag.fileName = file.response.data.fileName; objImag.fileName = file.response.data.fileName;
...@@ -200,6 +203,34 @@ export default { ...@@ -200,6 +203,34 @@ export default {
} }
}); });
}, },
//克隆后修改时使用
intFilesClone() {
this.postUrl =
fileUrl +
"/upload/?token=Bearer " +
window.sessionStorage.getItem("token") +
"&" +
this.convertObj(this.parms);
//是否显示上传按钮
if (this.unClosable) {
this.style = "display:none;";
} else {
this.style = "";
}
this.nameList = [];
//查询上传到文件服务器上的文件
this.$http.sysUser.getFile(this.parms).then(res => {
if (res.data != [] && res.data.length > 0) {
res.data.forEach(data => {
let objImag = {};
objImag.fileName = data.fileName;
objImag.filePath = data.downloadPath;
objImag.id = data.id;
this.nameList.push(objImag);
});
}
});
},
//新增时重新定义posturl使用 //新增时重新定义posturl使用
intFiles1() { intFiles1() {
this.postUrl = this.postUrl =
......
...@@ -93,7 +93,6 @@ ...@@ -93,7 +93,6 @@
<Col :span="24"> <Col :span="24">
<FormItem :label="l('qualityTemplateName')" prop="qualityTemplateName"> <FormItem :label="l('qualityTemplateName')" prop="qualityTemplateName">
<files ref="refFile" :parms="parms" files singleFile /> <files ref="refFile" :parms="parms" files singleFile />
<!-- <Input v-model="entity.qualityTemplateName"></Input> -->
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</Filed> </Filed>
<Filed :span="12" :name="l('productionRequirement')">{{entity.productionRequirement}}</Filed> <Filed :span="12" :name="l('productionRequirement')">{{entity.productionRequirement}}</Filed>
<Filed :span="12" :name="l('checkContent')">{{entity.checkContent}}</Filed> <Filed :span="12" :name="l('checkContent')">{{entity.checkContent}}</Filed>
<Filed :span="12" :name="l('qualityTemplateName')"><files ref="refFile" :parms="parms" unClosable style="display:inline" /></Filed> <Filed :span="12" :name="l('qualityTemplateName')"><a :href="downUrl+entity.qualityTemplate" target="_blank">{{entity.qualityTemplateName}}</a></Filed>
<Filed :span="12" :name="l('isImportant')"> <Filed :span="12" :name="l('isImportant')">
<state code="Process.state" :value="entity.isImportant+''" type="text"></state> <state code="Process.state" :value="entity.isImportant+''" type="text"></state>
</Filed> </Filed>
...@@ -25,9 +25,6 @@ ...@@ -25,9 +25,6 @@
</Filed> </Filed>
<Filed :span="12" :name="l('samplingBatch')">{{entity.samplingBatch}}</Filed> <Filed :span="12" :name="l('samplingBatch')">{{entity.samplingBatch}}</Filed>
<Filed :span="12" :name="l('checkType')"> <Filed :span="12" :name="l('checkType')">
<state code="QC.checktype" v-modev="entity.checkType+''"></state> <state code="QC.checktype" v-modev="entity.checkType+''"></state>
</Filed> </Filed>
...@@ -35,8 +32,6 @@ ...@@ -35,8 +32,6 @@
<Filed :span="12" :name="l('checkParams')">{{entity.checkParams}}</Filed> <Filed :span="12" :name="l('checkParams')">{{entity.checkParams}}</Filed>
<Filed :span="12" :name="l('measurementUnit')">{{entity.measurementUnit}}</Filed> <Filed :span="12" :name="l('measurementUnit')">{{entity.measurementUnit}}</Filed>
<Filed :span="12" :name="l('qualityTemplate')">{{entity.qualityTemplate}}</Filed>
<Filed :span="12" :name="l('isphotograph')">{{entity.isphotograph}}</Filed> <Filed :span="12" :name="l('isphotograph')">{{entity.isphotograph}}</Filed>
<Filed :span="12" :name="l('status')"> <Filed :span="12" :name="l('status')">
<state code="Process.state" :value="entity.status+''" type="text"></state> <state code="Process.state" :value="entity.status+''" type="text"></state>
...@@ -76,6 +71,8 @@ export default { ...@@ -76,6 +71,8 @@ export default {
name: '', name: '',
field: '' field: ''
}, },
downUrl: fileUrlDown,
fileUrlPath: "",
}; };
}, },
props: { props: {
......
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
<Col :span="24"> <Col :span="24">
<FormItem :label="l('qualityTemplateName')" prop="qualityTemplateName"> <FormItem :label="l('qualityTemplateName')" prop="qualityTemplateName">
<Input v-model="entity.qualityTemplateName"></Input> <Input v-model="entity.qualityTemplateName"></Input>
<files ref="refFile" :parms="parms" files singleFile/>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -164,7 +165,13 @@ export default { ...@@ -164,7 +165,13 @@ export default {
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }] name: [{ required: true, message: "必填", trigger: "blur" }]
}, },
routingDetailList: [] routingDetailList: [],
parms: {
app: 'qccard',
eid: null,
name: '',
field: ''
}
}; };
}, },
props: { props: {
...@@ -179,6 +186,7 @@ export default { ...@@ -179,6 +186,7 @@ export default {
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then(r => {
this.$refs.refFile.intFilesClone()
this.entity = r.result; this.entity = r.result;
}); });
}, },
......
<template> <template>
<div> <div>
{{info}} {{info}}
<DataGrid :columns="columns" ref="grid" :action="action"> <DataGrid :columns="columns" ref="grid" :action="action">
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
...@@ -129,13 +129,6 @@ export default { ...@@ -129,13 +129,6 @@ export default {
high: true, high: true,
code: "QC.fillintype" code: "QC.fillintype"
}, },
{
key: "qualityTemplate",
title: this.l("qualityTemplate"),
align: "left",
easy: true,
high: true
},
{ {
key: "isphotograph", key: "isphotograph",
title: this.l("isphotograph"), title: this.l("isphotograph"),
...@@ -169,7 +162,19 @@ export default { ...@@ -169,7 +162,19 @@ export default {
title: this.l("qualityTemplateName"), title: this.l("qualityTemplateName"),
align: "left", align: "left",
easy: true, easy: true,
high: true high: true,
render: (h, params) => {
return h("div", { class: "action" }, [
h(
"op",
{
attrs: { oprate: "detail" },
on: { click: () => this.view(params.row.id) }
},
params.row.qualityTemplateName
)
]);
}
}, },
{ {
key: "isImportant", key: "isImportant",
...@@ -247,7 +252,9 @@ export default { ...@@ -247,7 +252,9 @@ export default {
]); ]);
} }
} }
] ],
downUrl: fileUrlDown,
fileUrlPath: ""
}; };
}, },
mounted() { mounted() {
...@@ -301,6 +308,10 @@ export default { ...@@ -301,6 +308,10 @@ export default {
this.curId = 0; this.curId = 0;
this.modal = false; this.modal = false;
}, },
openTemplate(url) {
this.fileUrlPath = this.downUrl + path;
alert(this.fileUrlPath)
},
l(key) { l(key) {
let vkey = "routing_qc_card" + "." + key; let vkey = "routing_qc_card" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
......
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