|
@@ -287,7 +287,10 @@
|
|
|
<el-form-item label="选择配件" prop="accessoriesId">
|
|
<el-form-item label="选择配件" prop="accessoriesId">
|
|
|
<el-select v-model="transferForm.accessoriesId" multiple>
|
|
<el-select v-model="transferForm.accessoriesId" multiple>
|
|
|
<el-option v-for="(item,index) in accessoryList" :label="item.accessoryName" :key="index"
|
|
<el-option v-for="(item,index) in accessoryList" :label="item.accessoryName" :key="index"
|
|
|
- :value="item.id"></el-option>
|
|
|
|
|
|
|
+ :value="item.id">
|
|
|
|
|
+ <span style="float: left">{{ item.accessoryName }}</span>
|
|
|
|
|
+ <span style="float: right; color: #8492a6; font-size: 10px">{{ item.location }}</span>
|
|
|
|
|
+ </el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="接收人" prop="receiveUserId">
|
|
<el-form-item label="接收人" prop="receiveUserId">
|
|
@@ -332,6 +335,12 @@
|
|
|
<span>)</span>
|
|
<span>)</span>
|
|
|
<span>{{ ':' + transfer.transferRemark }}</span>
|
|
<span>{{ ':' + transfer.transferRemark }}</span>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <div style="margin-top: 5px" v-if="transfer.accessoryList.length>0">
|
|
|
|
|
+ <span style="font-size: 10px">配件:</span>
|
|
|
|
|
+ <el-tag v-for="(item,index) in transfer.accessoryList" :key="index" size="mini"
|
|
|
|
|
+ style="margin-left: 5px">{{ item.assetName }}
|
|
|
|
|
+ </el-tag>
|
|
|
|
|
+ </div>
|
|
|
</el-timeline-item>
|
|
</el-timeline-item>
|
|
|
</el-timeline>
|
|
</el-timeline>
|
|
|
</div>
|
|
</div>
|
|
@@ -375,7 +384,7 @@ import {addTransfer, getTransferList} from "@/api/material/transfer";
|
|
|
export default {
|
|
export default {
|
|
|
name: "asset",
|
|
name: "asset",
|
|
|
components: {Category, DeptUserTree, AssetDetail, Treeselect},
|
|
components: {Category, DeptUserTree, AssetDetail, Treeselect},
|
|
|
- dicts: ['asset_type', 'asset_status', 's_source','transfer_type'],
|
|
|
|
|
|
|
+ dicts: ['asset_type', 'asset_status', 's_source', 'transfer_type'],
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
queryParams: {
|
|
queryParams: {
|