|
@@ -13,9 +13,8 @@
|
|
|
<el-input v-model="tenant.no" readonly="readonly" />
|
|
|
</el-form-item>
|
|
|
<el-form-item :label='$t("resource.form.pgUpload")+":"' prop="filePath">
|
|
|
- <el-input v-model="tenant.filePath" :readOnly="true" :placeholder='$t("common.pleaseEnter")'/>
|
|
|
+ <el-input v-model="tenant.filePath" :placeholder='$t("common.pleaseEnter")'/>
|
|
|
<el-upload
|
|
|
- accept=".txt"
|
|
|
class="upload-demo"
|
|
|
:headers="headers"
|
|
|
:action="action"
|
|
@@ -34,7 +33,29 @@
|
|
|
<div slot="tip" class="el-upload__tip">{{$t("resource.tips.fileTips")}}</div>
|
|
|
</el-upload>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
+ <el-form-item :label='$t("resource.form.pgTime")+":"' prop="runTime">
|
|
|
+ <el-input v-model="tenant.runTime" :readOnly="true" :placeholder='$t("common.pleaseEnter")'/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item :label='$t("resource.form.pgSize")+":"' prop="size">
|
|
|
+ <el-input v-model="tenant.size" :readOnly="true" :placeholder='$t("common.pleaseEnter")' style="width: 85%;" />
|
|
|
+ <span style="margin-left: 20px;">B(Bytes)</span>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item :label='$t("resource.form.pgContent")+":"' prop="pgContent">
|
|
|
+ <el-input v-model="pgContent" :readOnly="true" type="textarea" :rows="5" style="width: 100%;"/>
|
|
|
+ </el-form-item>
|
|
|
+<!-- <div>-->
|
|
|
+<!-- <h2 class="editTitle">刀具</h2>-->
|
|
|
+<!-- <el-table-->
|
|
|
+<!-- :data="toolList"-->
|
|
|
+<!-- style="width: 100%"-->
|
|
|
+<!-- >-->
|
|
|
+<!-- <el-table-column prop="specification" :label='$t("resource.table.programTool.specification")'></el-table-column>-->
|
|
|
+<!-- <el-table-column prop="model" :label='$t("resource.table.programTool.model")'></el-table-column>-->
|
|
|
+<!-- <el-table-column prop="brand" :label='$t("resource.table.programTool.brand")'></el-table-column>-->
|
|
|
+<!-- <el-table-column prop="usageTime" :label='$t("resource.table.programTool.usageTime")'></el-table-column>-->
|
|
|
+<!-- <el-table-column prop="duration" :label='$t("resource.table.programTool.duration")'></el-table-column>-->
|
|
|
+<!-- </el-table>-->
|
|
|
+<!-- </div>-->
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button plain type="warning" @click="isVisible = false">{{ $t('common.cancel') }}</el-button>
|
|
@@ -90,12 +111,7 @@
|
|
|
*/],
|
|
|
roles: [],
|
|
|
rules: {
|
|
|
- filePath: [
|
|
|
- { required: true, message: this.$t("rules.require"), trigger: 'blur' }
|
|
|
- ],
|
|
|
- version: [
|
|
|
- { required: true, message: this.$t("rules.require"), trigger: 'blur' }
|
|
|
- ]
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -170,6 +186,7 @@
|
|
|
},
|
|
|
initTenant () {
|
|
|
return {
|
|
|
+ resourceId:null,
|
|
|
id: '',
|
|
|
no: '',
|
|
|
name: '',
|
|
@@ -203,6 +220,7 @@
|
|
|
this.tenant = { ...val }
|
|
|
//赋值
|
|
|
this.tenant.no = val.name
|
|
|
+ this.tenant.resourceId = val.id
|
|
|
// 如果附件存在 /
|
|
|
if(!!val.filePath){
|
|
|
let arr = val.filePath.split("/");
|
|
@@ -234,11 +252,7 @@
|
|
|
// return false
|
|
|
if (valid) {
|
|
|
this.confirmDisabled = true
|
|
|
- if (this.type === 'add') {
|
|
|
- this.save()
|
|
|
- } else {
|
|
|
- this.update()
|
|
|
- }
|
|
|
+ this.save()
|
|
|
} else {
|
|
|
return false
|
|
|
}
|