|
@@ -6,30 +6,40 @@
|
|
<!-- 自定义的二级文字标题 -->
|
|
<!-- 自定义的二级文字标题 -->
|
|
<template slot="subTitle">
|
|
<template slot="subTitle">
|
|
<a id="bulkWarehousingOrderEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
|
|
<a id="bulkWarehousingOrderEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
|
|
- <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '' }}</p>
|
|
|
|
|
|
+ <p style="display: inline-block;margin: 0 30px 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '' }}</p>
|
|
|
|
+ <a-button type="primary" ghost @click="isShowBisiceInfo=!isShowBisiceInfo">
|
|
|
|
+ 基础信息
|
|
|
|
+ <a-icon :type="isShowBisiceInfo ? 'up' : 'down'"/>
|
|
|
|
+ </a-button>
|
|
</template>
|
|
</template>
|
|
<!-- 操作区,位于 title 行的行尾 -->
|
|
<!-- 操作区,位于 title 行的行尾 -->
|
|
- <template slot="extra" v-if="$hasPermissions('B_bulkWarehousingOrder_print')">
|
|
|
|
|
|
+ <template
|
|
|
|
+ slot="
|
|
|
|
+ extra"
|
|
|
|
+ v-if="$hasPermissions('B_bulkWarehousingOrder_print')">
|
|
<Print :disabled="chooseLoadDataSource.length==0" :showExport="false" @handlePrint="handlePrint"></Print>
|
|
<Print :disabled="chooseLoadDataSource.length==0" :showExport="false" @handlePrint="handlePrint"></Print>
|
|
- </template>
|
|
|
|
|
|
+ </p></template>
|
|
</a-page-header>
|
|
</a-page-header>
|
|
<!-- 基础信息 -->
|
|
<!-- 基础信息 -->
|
|
- <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
|
|
|
|
|
|
+ <div v-show="isShowBisiceInfo" class="bulkWarehousingOrderEdit-cont">
|
|
<a-collapse :activeKey="['1']">
|
|
<a-collapse :activeKey="['1']">
|
|
- <a-collapse-panel key="1">
|
|
|
|
- <template slot="header">
|
|
|
|
- 基础信息
|
|
|
|
- </template>
|
|
|
|
- <a-descriptions :column="3">
|
|
|
|
- <a-descriptions-item label="供应商">{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}</a-descriptions-item>
|
|
|
|
- <a-descriptions-item label="散件入库类型">{{ (basicInfoData&&basicInfoData.sparePartsTypeName) || '--' }}</a-descriptions-item>
|
|
|
|
- <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remarks) || '--' }}</a-descriptions-item>
|
|
|
|
- </a-descriptions>
|
|
|
|
|
|
+ <a-collapse-panel key="1" header="基础信息" :disabled="true">
|
|
|
|
+ <a-row :gutter="16">
|
|
|
|
+ <a-col class="gutter-row" :span="8">
|
|
|
|
+ 供应商:{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col class="gutter-row" :span="8">
|
|
|
|
+ 散件入库类型:{{ (basicInfoData&&basicInfoData.sparePartsTypeName) || '--' }}
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col class="gutter-row" :span="8">
|
|
|
|
+ 备注:{{ (basicInfoData&&basicInfoData.remarks) || '--' }}
|
|
|
|
+ </a-col>
|
|
|
|
+ </a-row>
|
|
</a-collapse-panel>
|
|
</a-collapse-panel>
|
|
</a-collapse>
|
|
</a-collapse>
|
|
- </a-card>
|
|
|
|
|
|
+ </div>
|
|
<!-- 选择产品 -->
|
|
<!-- 选择产品 -->
|
|
- <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
|
|
|
|
|
|
+ <div class="bulkWarehousingOrderEdit-cont">
|
|
<a-collapse :activeKey="['1']">
|
|
<a-collapse :activeKey="['1']">
|
|
<a-collapse-panel key="1">
|
|
<a-collapse-panel key="1">
|
|
<template slot="header">
|
|
<template slot="header">
|
|
@@ -40,35 +50,35 @@
|
|
<!-- 搜索条件 -->
|
|
<!-- 搜索条件 -->
|
|
<div class="table-page-search-wrapper">
|
|
<div class="table-page-search-wrapper">
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
- <a-row :gutter="15">
|
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-row type="flex" :gutter="12" justify="start">
|
|
|
|
+ <a-col flex="250px">
|
|
<a-form-model-item label="产品编码">
|
|
<a-form-model-item label="产品编码">
|
|
<a-input id="bulkWarehousingOrderEdit-code" ref="searchProductCode" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
|
|
<a-input id="bulkWarehousingOrderEdit-code" ref="searchProductCode" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col flex="350px">
|
|
<a-form-model-item label="产品名称">
|
|
<a-form-model-item label="产品名称">
|
|
<a-input id="bulkWarehousingOrderEdit-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
|
|
<a-input id="bulkWarehousingOrderEdit-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col flex="250px">
|
|
<a-form-model-item label="原厂编码">
|
|
<a-form-model-item label="原厂编码">
|
|
<a-input id="bulkWarehousingOrderEdit-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
|
|
<a-input id="bulkWarehousingOrderEdit-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
- <a-form-item label="产品分类">
|
|
|
|
- <ProductType id="productInfoList-productType" @change="changeProductType" v-model="productType"></ProductType>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
<template v-if="advanced">
|
|
<template v-if="advanced">
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col flex="250px">
|
|
|
|
+ <a-form-item label="产品分类">
|
|
|
|
+ <ProductType id="productInfoList-productType" @change="changeProductType" v-model="productType"></ProductType>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col flex="250px">
|
|
<a-form-item label="产品品牌">
|
|
<a-form-item label="产品品牌">
|
|
<ProductBrand id="bulkWarehousingOrderEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
|
|
<ProductBrand id="bulkWarehousingOrderEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
</template>
|
|
</template>
|
|
- <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
|
|
|
|
|
|
+ <a-col flex="auto" style="margin-bottom: 10px;">
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-refresh">查询</a-button>
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-refresh">查询</a-button>
|
|
<a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-reset">重置</a-button>
|
|
<a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-reset">重置</a-button>
|
|
<a @click="advanced=!advanced" style="margin:0 30px 0 10px">
|
|
<a @click="advanced=!advanced" style="margin:0 30px 0 10px">
|
|
@@ -86,7 +96,7 @@
|
|
size="small"
|
|
size="small"
|
|
:rowKey="(record) => record.id"
|
|
:rowKey="(record) => record.id"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
- :customRow="handleClickRow"
|
|
|
|
|
|
+ @dblclick="handleClickRow"
|
|
:data="loadData"
|
|
:data="loadData"
|
|
:defaultLoadData="false"
|
|
:defaultLoadData="false"
|
|
:scroll="{ y: 150 }"
|
|
:scroll="{ y: 150 }"
|
|
@@ -102,6 +112,7 @@
|
|
:min="0"
|
|
:min="0"
|
|
:max="999999"
|
|
:max="999999"
|
|
placeholder="请输入"
|
|
placeholder="请输入"
|
|
|
|
+ class="rightPrice"
|
|
style="width: 100%;" />
|
|
style="width: 100%;" />
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -138,15 +149,15 @@
|
|
</template>
|
|
</template>
|
|
<!-- 操作 -->
|
|
<!-- 操作 -->
|
|
<template slot="action" slot-scope="text, record">
|
|
<template slot="action" slot-scope="text, record">
|
|
- <a-button size="small" type="link" class="button-primary" @click.stop="handleAdd(record)" id="bulkWarehousingOrderEdit-add-btn">添加</a-button>
|
|
|
|
|
|
+ <a-button size="small" type="link" class="button-primary" @click="handleAdd(record)" id="bulkWarehousingOrderEdit-add-btn">添加</a-button>
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
</div>
|
|
</div>
|
|
</a-collapse-panel>
|
|
</a-collapse-panel>
|
|
</a-collapse>
|
|
</a-collapse>
|
|
- </a-card>
|
|
|
|
|
|
+ </div>
|
|
<!-- 已选产品 -->
|
|
<!-- 已选产品 -->
|
|
- <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
|
|
|
|
|
|
+ <div class="bulkWarehousingOrderEdit-cont">
|
|
<a-collapse :activeKey="['1']">
|
|
<a-collapse :activeKey="['1']">
|
|
<a-collapse-panel key="1">
|
|
<a-collapse-panel key="1">
|
|
<template slot="header">
|
|
<template slot="header">
|
|
@@ -159,7 +170,7 @@
|
|
<div slot="message">
|
|
<div slot="message">
|
|
总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
|
|
总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
|
|
总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
|
|
总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
|
|
- 总成本 <strong>{{ (productTotal&&(productTotal.productTotalCost || productTotal.productTotalCost==0)) ? '¥'+productTotal.productTotalCost : '--' }}</strong>
|
|
|
|
|
|
+ 总成本 <strong>{{ (productTotal&&(productTotal.productTotalCost || productTotal.productTotalCost==0)) ? toThousands(productTotal.productTotalCost,2) : '--' }}</strong>
|
|
</div>
|
|
</div>
|
|
</a-alert>
|
|
</a-alert>
|
|
<div class="table-page-search-wrapper">
|
|
<div class="table-page-search-wrapper">
|
|
@@ -217,6 +228,7 @@
|
|
:min="0"
|
|
:min="0"
|
|
:max="999999"
|
|
:max="999999"
|
|
placeholder="请输入"
|
|
placeholder="请输入"
|
|
|
|
+ class="rightPrice"
|
|
@blur="e => putCostBlur(e.target.value, record)"
|
|
@blur="e => putCostBlur(e.target.value, record)"
|
|
style="width: 100%;" />
|
|
style="width: 100%;" />
|
|
</template>
|
|
</template>
|
|
@@ -255,7 +267,7 @@
|
|
</div>
|
|
</div>
|
|
</a-collapse-panel>
|
|
</a-collapse-panel>
|
|
</a-collapse>
|
|
</a-collapse>
|
|
- </a-card>
|
|
|
|
|
|
+ </div>
|
|
</a-spin>
|
|
</a-spin>
|
|
<div class="affix-cont">
|
|
<div class="affix-cont">
|
|
<a-button
|
|
<a-button
|
|
@@ -267,7 +279,6 @@
|
|
@click="handleSubmit"
|
|
@click="handleSubmit"
|
|
style="padding: 0 60px;">提交</a-button>
|
|
style="padding: 0 60px;">提交</a-button>
|
|
</div>
|
|
</div>
|
|
- <!-- 导入弹框 -->
|
|
|
|
<!-- 导入费用明细 -->
|
|
<!-- 导入费用明细 -->
|
|
<importGuideModal
|
|
<importGuideModal
|
|
:openModal="openGuideModal"
|
|
:openModal="openGuideModal"
|
|
@@ -315,6 +326,7 @@ import ProductType from '../../common/productType.js'
|
|
import ProductBrand from '../../common/productBrand.js'
|
|
import ProductBrand from '../../common/productBrand.js'
|
|
import Print from '@/views/common/print.vue'
|
|
import Print from '@/views/common/print.vue'
|
|
import importGuideModal from './importGuideModal.vue'
|
|
import importGuideModal from './importGuideModal.vue'
|
|
|
|
+import { toThousands } from '@/libs/tools'
|
|
import newProduct from '@/views/productManagement/productInfo/edit.vue'
|
|
import newProduct from '@/views/productManagement/productInfo/edit.vue'
|
|
import { hdPrint } from '@/libs/JGPrint'
|
|
import { hdPrint } from '@/libs/JGPrint'
|
|
export default {
|
|
export default {
|
|
@@ -323,6 +335,7 @@ export default {
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
|
|
+ isShowBisiceInfo: false,
|
|
advanced: false,
|
|
advanced: false,
|
|
spinning: false,
|
|
spinning: false,
|
|
loading: false,
|
|
loading: false,
|
|
@@ -397,7 +410,7 @@ export default {
|
|
{ title: '单位', dataIndex: 'productUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单位', dataIndex: 'productUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '成本价', scopedSlots: { customRender: 'putCost' }, width: '7%', align: 'center' },
|
|
{ title: '成本价', scopedSlots: { customRender: 'putCost' }, width: '7%', align: 'center' },
|
|
{ title: '数量', scopedSlots: { customRender: 'putQty' }, width: '7%', align: 'center' },
|
|
{ title: '数量', scopedSlots: { customRender: 'putQty' }, width: '7%', align: 'center' },
|
|
- { title: '成本小计', dataIndex: 'costSubtotal', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
|
|
+ { title: '成本小计', dataIndex: 'costSubtotal', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } },
|
|
{ title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: '13%', align: 'center' },
|
|
{ title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: '13%', align: 'center' },
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
|
|
],
|
|
],
|
|
@@ -521,14 +534,7 @@ export default {
|
|
},
|
|
},
|
|
// 双击快速添加
|
|
// 双击快速添加
|
|
handleClickRow (record) {
|
|
handleClickRow (record) {
|
|
- return {
|
|
|
|
- on: {
|
|
|
|
- dblclick: (event) => {
|
|
|
|
- event.stopPropagation()
|
|
|
|
- this.handleAdd(record)
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ this.handleAdd(record)
|
|
},
|
|
},
|
|
// 基本信息
|
|
// 基本信息
|
|
getDetail () {
|
|
getDetail () {
|
|
@@ -744,8 +750,8 @@ export default {
|
|
item.warehouseLocationList.filter(subItem => {
|
|
item.warehouseLocationList.filter(subItem => {
|
|
if (subItem.defaultFlag == 1 && subItem.wasteFlag == 0) {
|
|
if (subItem.defaultFlag == 1 && subItem.wasteFlag == 0) {
|
|
_this.defaultWarehouseCascade[1] = subItem.warehouseLocationSn
|
|
_this.defaultWarehouseCascade[1] = subItem.warehouseLocationSn
|
|
- _this.$refs.table.refresh(true)
|
|
|
|
- _this.$refs.chooseTable.refresh(true)
|
|
|
|
|
|
+ // _this.$refs.table.refresh(true)
|
|
|
|
+ // _this.$refs.chooseTable.refresh(true)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
@@ -817,5 +823,11 @@ export default {
|
|
margin-left: 10px;
|
|
margin-left: 10px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ .rightPrice.ant-input-number-sm input{
|
|
|
|
+ text-align: right;
|
|
|
|
+ }
|
|
|
|
+ .ant-collapse .ant-collapse-item-disabled > .ant-collapse-header{
|
|
|
|
+ color:#333;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
</style>
|
|
</style>
|