wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Compare commits

base: wuhongjian:8be597f9cf193a02302d00990457922150e60cea
Branches Tags
wuhongjian:master
wuhongjian:hi-ucs-dev
wuhongjian:release
wuhongjian:hi-ucs-pre
wuhongjian:hi-ucs-dev-xha
wuhongjian:hi-ucs-bt
wuhongjian:hi-ucs-xha
wuhongjian:v0.8.2.2.release.sj
wuhongjian:v0.8.2.1.release
wuhongjian:v0.8.2.2.release
wuhongjian:v0.8.1.6.release
wuhongjian:v0.8.1.5.release
wuhongjian:v0.8.1.4.release
wuhongjian:v0.8.1.3.release
wuhongjian:v0.8.1.2.release
wuhongjian:v0.8.1.1.release
wuhongjian:v0.8.1.dev
wuhongjian:v0.8.1.release
wuhongjian:v0.8.0
..
compare: wuhongjian:73ef6f5bdc527fa53d1d9602bd911af1d40c3d53
Branches Tags
wuhongjian:hi-ucs-dev
wuhongjian:release
wuhongjian:master
wuhongjian:hi-ucs-pre
wuhongjian:hi-ucs-dev-xha
wuhongjian:hi-ucs-bt
wuhongjian:hi-ucs-xha
wuhongjian:v0.8.2.2.release.sj
wuhongjian:v0.8.2.1.release
wuhongjian:v0.8.2.2.release
wuhongjian:v0.8.1.6.release
wuhongjian:v0.8.1.5.release
wuhongjian:v0.8.1.4.release
wuhongjian:v0.8.1.3.release
wuhongjian:v0.8.1.2.release
wuhongjian:v0.8.1.1.release
wuhongjian:v0.8.1.dev
wuhongjian:v0.8.1.release
wuhongjian:v0.8.0

No commits in common. "8be597f9cf193a02302d00990457922150e60cea" and "73ef6f5bdc527fa53d1d9602bd911af1d40c3d53" have entirely different histories.
8be597f9cf ... 73ef6f5bdc

2 changed files with 70 additions and 115 deletions
Show Stats Expand all files Collapse all files

21
front/src/views/capacityOnTheShelf/Application.vue
View File

@ -301,9 +301,6 @@
if (!dataFrom.value.name) { if (!dataFrom.value.name) {
notFilled.value.push('应用名称') notFilled.value.push('应用名称')
} }
if (!dataFrom.value.shareCondition) {
notFilled.value.push('共享条件')
}
if (!dataFrom.value.description) { if (!dataFrom.value.description) {
notFilled.value.push('应用描述') notFilled.value.push('应用描述')
} }
@ -340,15 +337,15 @@
) { ) {
notFilled.value.push('应用类型') notFilled.value.push('应用类型')
} }
// if ( if (
// !dataFrom.value.infoList.filter( !dataFrom.value.infoList.filter(
// (val) => val.attrType === '共享条件' (val) => val.attrType === '共享条件'
// )[0] || )[0] ||
// !dataFrom.value.infoList.filter((val) => val.attrType === '共享条件')[0] !dataFrom.value.infoList.filter((val) => val.attrType === '共享条件')[0]
// .attrValue .attrValue
// ) { ) {
// notFilled.value.push('共享条件') notFilled.value.push('共享条件')
// } }
if (notFilled.value.length > 0) { if (notFilled.value.length > 0) {
message.warning('请填写必填字段') message.warning('请填写必填字段')
console.log(notFilled.value) console.log(notFilled.value)

164
front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
View File

@ -14,8 +14,9 @@
<div></div> <div></div>
</div> </div>
<template v-if="title.isConfigure"> <template v-if="title.isConfigure">
<div class="bottom"> <a-form ref="formRef" :model="data" name="basic">
<!-- <div class="items" v-if="data[title.name].length > 0"> <div class="bottom">
<!-- <div class="items" v-if="data[title.name].length > 0">
<div <div
class="item" class="item"
v-for="(val, index) in data[title.name]" v-for="(val, index) in data[title.name]"
@ -43,74 +44,75 @@
</div> </div>
</div> </div>
</div> --> </div> -->
<div
v-for="(val, index) in data[title.name]"
:key="'key1' + val.name + index"
>
<div <div
style=" v-for="(val, index) in data[title.name]"
font-size: 0.18rem; :key="'key1' + val.name + index"
font-weight: 600;
display: flex;
justify-content: flex-start;
"
> >
<span>{{ title.name }}-{{ index + 1 }}</span> <div
<a-popconfirm style="
:title="'是否删除该条' + title.name + '?'" font-size: 0.18rem;
ok-text="是" font-weight: 600;
cancel-text="否" display: flex;
@confirm="del(title.name, index)" justify-content: flex-start;
"
> >
<div class="del"> <span>{{ title.name }}-{{ index + 1 }}</span>
<i class="delImg"></i> <a-popconfirm
<div>删除</div> :title="'是否删除该条' + title.name + '?'"
</div> ok-text="是"
</a-popconfirm> cancel-text="否"
</div> @confirm="del(title.name, index)"
<div >
class="form" <div class="del">
v-for="attr in props.configure.filter( <i class="delImg"></i>
(item, index2) => item.name === title.name <div>删除</div>
)[0].list" </div>
:key="'key2' + attr.name + index2" </a-popconfirm>
> </div>
<span>{{ attr.name }}</span> <div
<a-input class="form"
disabled v-for="attr in props.configure.filter(
v-model:value="val[attr.field]" (item, index2) => item.name === title.name
:maxlength="24" )[0].list"
:placeholder="'请填写' + attr.name + ',不超过24个字符'" :key="'key2' + attr.name + index2"
v-if="attr.type == 'input'" >
/> <span>{{ attr.name }}</span>
<template v-if="attr.type == 'input2'">
<a-input <a-input
disabled disabled
v-model:value="val[attr.field]" v-model:value="val[attr.field]"
:placeholder="'请填写' + attr.name" :maxlength="24"
:placeholder="'请填写' + attr.name + ',不超过24个字符'"
v-if="attr.type == 'input'"
/> />
</template> <template v-if="attr.type == 'input2'">
<a-textarea <a-input
disabled disabled
v-model:value="val[attr.field]" v-model:value="val[attr.field]"
:showCount="true" :placeholder="'请填写' + attr.name"
:maxlength="200" />
:placeholder="'请填写' + attr.name" </template>
v-else-if="attr.type == 'textArea'" <a-textarea
/> disabled
<!-- <a-radio-group v-model:value="val[attr.field]"
:showCount="true"
:maxlength="200"
:placeholder="'请填写' + attr.name"
v-else-if="attr.type == 'textArea'"
/>
<!-- <a-radio-group
v-model:value="val[attr.field]" v-model:value="val[attr.field]"
:options="val.options" :options="val.options"
@change="radioChange" @change="radioChange"
v-else-if="attr.type == 'radio'" v-else-if="attr.type == 'radio'"
/> --> /> -->
<div v-else-if="attr.type == 'radio'"> <div v-else-if="attr.type == 'radio'">
{{ val[attr.field] + (attr.company || '') }} {{ val[attr.field] + (attr.company || '') }}
</div> </div>
<span v-else-if="attr.type === 'image'"> <span v-else-if="attr.type === 'image'">
<a-image :width="85" :height="60" :src="val.img" /> <a-image :width="85" :height="60" :src="val.img" />
</span> </span>
<!-- <upload <!-- <upload
:key="showKey" :key="showKey"
type="图片" type="图片"
btnName="上传图片" btnName="上传图片"
@ -436,51 +438,7 @@
请选择{{ item.name }}！ 请选择{{ item.name }}！
</div> </div>
</div> </div>
<!-- 来源应用 --> </a-form>
<div class="AssociatedApplication">
<a-modal
v-model:visible="visibleAssociatedApplication"
:title="titleName"
@ok="handleOk"
@cancel="handleCancel"
style="width: 9.6rem"
>
<div>
<a-transfer
v-model:target-keys="targetKeys"
v-model:selected-keys="selectedKeys"
:data-source="mockData"
:titles="titles"
:render="(item) => item.title"
@change="handleChange"
@selectChange="handleSelectChange"
/>
</div>
</a-modal>
</div>
<!-- 关联组件 -->
<div class="AssociatedApplication">
<a-modal
v-model:visible="visibleAssociatedApplicationOther"
:title="titleName"
@ok="handleOk"
@cancel="handleCancel"
style="width: 960px"
>
<div>
<a-transfer
v-model:target-keys="targetKeysOther"
v-model:selected-keys="selectedKeysOther"
:data-source="mockDataOther"
:titles="titles"
:render="(item) => item.title"
@change="handleChangeOther"
@selectChange="handleSelectChangeOther"
/>
</div>
</a-modal>
</div>
</div>
</template> </template>
</div> </div>
</div> </div>