|
@@ -164,11 +164,11 @@
|
|
|
>
|
|
|
<el-table-column type="selection"/>
|
|
|
<el-table-column label="序号" type="index" align="center"/>
|
|
|
- <el-table-column label="行状态" align="center" prop="status" :formatter="hangStatus"/>
|
|
|
+ <el-table-column label="行状态" align="center" prop="status" :formatter="hangStatus" width="150px"/>
|
|
|
<el-table-column label="行号" align="center" prop="rowNo" />
|
|
|
<!-- <el-table-column label="业务部门名称" align="center" width="180px"/> -->
|
|
|
<!-- <el-table-column label="业务部门" align="center" width="180px"/> -->
|
|
|
- <el-table-column label="需求客户" align="center" prop="customerName"/>
|
|
|
+ <el-table-column label="需求客户" align="center" prop="demandCustomerName" width="200px"/>
|
|
|
<el-table-column label="一级品类" align="center" prop="materialClassifyOneName" width="180px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
@@ -200,7 +200,7 @@
|
|
|
<el-table-column label="预留比例" align="center" prop="reservedProportion" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-select :disabled="sonDisable" size="small" v-model="scope.row.reservedProportion">
|
|
|
+ <el-select clearable :disabled="sonDisable" size="small" v-model="scope.row.reservedProportion">
|
|
|
<el-option v-for=" dict in dict.type.sys_reserve_ratio" :key="dict.value" :label="dict.label" :value="dict.value">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
@@ -211,14 +211,14 @@
|
|
|
<el-table-column label="预留周期" align="center" prop="reservedPeriod" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input :readonly="sonDisable" size="small" v-model="scope.row.reservedPeriod"/>
|
|
|
+ <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.reservedPeriod"/>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="预留数量" align="center" prop="reservedQty" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input :readonly="sonDisable" size="small" v-model="scope.row.reservedQty"/>
|
|
|
+ <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.reservedQty"/>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -227,7 +227,7 @@
|
|
|
<el-table-column label="物料编码" align="center" prop="materialCode" width="230px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input readonly size="small" v-model="scope.row.materialCode">
|
|
|
+ <el-input clearable size="small" v-model="scope.row.materialCode" @focus="chooseMaterial(scope.$index)">
|
|
|
<el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseMaterial(scope.$index)"></el-button>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
@@ -235,26 +235,26 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="物料名称" align="center" prop="materialName" width="230px" />
|
|
|
<el-table-column label="规格" align="center" prop="specification" />
|
|
|
- <el-table-column label="型号" align="center" prop="model" />
|
|
|
- <el-table-column label="单位" align="center" prop="unit" />
|
|
|
+ <el-table-column label="型号" align="center" prop="model"/>
|
|
|
+ <el-table-column label="单位" align="center" prop="unitName"/>
|
|
|
<el-table-column label="生产厂家/代理人" align="center" prop="manufacturerName" width="230px"/>
|
|
|
<el-table-column label="注册人" align="center" prop="registrant" width="150px"/>
|
|
|
<el-table-column label="采购周期" align="center" prop="puPeriod" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input :readonly="sonDisable" size="small" v-model="scope.row.puPeriod"/>
|
|
|
+ <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.puPeriod"/>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="有效期单位" align="center" prop="expiryUnit" width="120px"/>
|
|
|
<el-table-column label="有效期" align="center" prop="expiry" width="120px"/>
|
|
|
+ <el-table-column label="有效期单位" align="center" prop="expiryUnit" width="120px"/>
|
|
|
<el-table-column label="最小包装" align="center" prop="minPackage" width="120px"/>
|
|
|
<el-table-column label="最小订货量" align="center" prop="minOrderQty" width="120px"/>
|
|
|
<el-table-column label="最小批量" align="center" prop="minBatch" width="120px"/>
|
|
|
<el-table-column label="安全库存" align="center" prop="safeStock" width="120px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input :readonly="sonDisable" size="small" v-model="scope.row.safeStock"/>
|
|
|
+ <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.safeStock"/>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -262,7 +262,7 @@
|
|
|
<el-table-column label="实际(业务)需求量" align="center" prop="qty" width="120px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input :readonly="sonDisable" size="small" v-model="scope.row.qty"/>
|
|
|
+ <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.qty"/>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -274,6 +274,7 @@
|
|
|
<el-date-picker
|
|
|
v-model="scope.row.deliveryDate"
|
|
|
:readonly="sonDisable"
|
|
|
+ clearable
|
|
|
type="datetime"
|
|
|
size="small"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
@@ -313,24 +314,24 @@
|
|
|
<el-table-column label="业务备注" align="center" prop="remark" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input :readonly="sonDisable" size="small" v-model="scope.row.remark"/>
|
|
|
+ <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.remark"/>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="采购备注" align="center" prop="puRemark" width="150px"/>
|
|
|
<!-- <el-table-column label="末级供应仓库存量" align="center" prop="lastWarehouseQty" /> -->
|
|
|
- <!-- <el-table-column label="调拨占有量" align="center" prop="superiorAllotQty"></el-table-column> -->
|
|
|
+ <el-table-column label="调拨占有量" align="center" prop="superiorAllotQty" width="150px"/>
|
|
|
<el-table-column label="最终净需求量" align="center" prop="resDemandQty" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input :readonly="sonDisable" size="small" v-model="scope.row.resDemandQty"/>
|
|
|
+ <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.resDemandQty"/>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="收货仓库" align="center" prop="deliveryWarehouseName" width="200px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input readonly size="small" v-model="scope.row.deliveryWarehouseName">
|
|
|
+ <el-input clearable readonly size="small" v-model="scope.row.deliveryWarehouseName">
|
|
|
<el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseDept(scope.$index, 'WAREHOUSE_PARAM', true, '选择收货仓库')"></el-button>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
@@ -339,7 +340,7 @@
|
|
|
<el-table-column label="收货货位" align="center" prop="deliveryAllocationName" width="200px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input readonly size="small" v-model="scope.row.deliveryAllocationName">
|
|
|
+ <el-input clearable readonly size="small" v-model="scope.row.deliveryAllocationName">
|
|
|
<el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="choosehuoWei(scope.$index, 'ALLOCATION_PARAM', true, '选择收货货位', scope.row.deliveryWarehouse)"></el-button>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
@@ -385,7 +386,7 @@
|
|
|
<el-table-column label="补单供应商编码" align="center" prop="additionalSupplier" width="200px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input readonly size="small" v-model="scope.row.additionalSupplier">
|
|
|
+ <el-input clearable readonly size="small" v-model="scope.row.additionalSupplier">
|
|
|
<el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseDept(scope.$index, 'SUPPLIER_PARAM', true, '选择补单供应商')"></el-button>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
@@ -394,28 +395,27 @@
|
|
|
<el-table-column label="补单供应商名称" align="center" prop="additionalSupplierName" width="200px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input readonly size="small" v-model="scope.row.additionalSupplierName"/>
|
|
|
+ <el-input clearable readonly size="small" v-model="scope.row.additionalSupplierName"/>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="周期单位" align="center" prop="periodUnit" width="150px">
|
|
|
+ <!-- <el-table-column label="周期单位" align="center" prop="periodUnit" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-select :disabled="sonDisable" size="small" v-model="scope.row.periodUnit">
|
|
|
+ <el-select clearable :disabled="sonDisable" size="small" v-model="scope.row.periodUnit">
|
|
|
<el-option v-for=" dict in dict.type.sys_period_unit" :key="dict.value" :label="dict.label" :value="dict.value">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <!-- <el-input v-model="scope.row.periodUnit"/> -->
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
<el-table-column label="末级供应库存组织" align="center" prop="superiorStockOrgName" width="200px"></el-table-column>
|
|
|
- <el-table-column label="中心仓可用量" align="center" prop="updateTime" width="200px"></el-table-column>
|
|
|
+ <el-table-column label="中心仓可用量" align="center" prop="centralWarehouseQty" width="200px"/>
|
|
|
<el-table-column label="调拨单号" align="center" prop="allotCode"></el-table-column>
|
|
|
<el-table-column label="收货地址" align="center" prop="deliveryAddressName" width="200px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-input readonly size="small" v-model="scope.row.deliveryAddressName">
|
|
|
+ <el-input clearable size="small" v-model="scope.row.deliveryAddressName" @focus="chooseDept(scope.$index, 'ADDRESS_PARAM', true, '选择收货地址')">
|
|
|
<el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseDept(scope.$index, 'ADDRESS_PARAM', true, '选择收货地址')"></el-button>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
@@ -428,7 +428,7 @@
|
|
|
<el-table-column label="价格类型" align="center" prop="priceType" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item class="hang">
|
|
|
- <el-select :disabled="sonDisable" size="small" v-model="scope.row.priceType">
|
|
|
+ <el-select clearable :disabled="sonDisable" size="small" v-model="scope.row.priceType">
|
|
|
<el-option v-for=" dict in dict.type.sys_price_type" :key="dict.value" :label="dict.label" :value="dict.value">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
@@ -910,6 +910,7 @@ export default {
|
|
|
this.basicForm.puDemandItemList[this.tableIndex].registrant = selection[0].registrant
|
|
|
this.basicForm.puDemandItemList[this.tableIndex].manufacturerName = selection[0].manufacturerIdName
|
|
|
this.basicForm.puDemandItemList[this.tableIndex].puPeriod = selection[0].deliveryPeriod
|
|
|
+ this.basicForm.puDemandItemList[this.tableIndex].expiry = selection[0].usefulLife
|
|
|
this.basicForm.puDemandItemList[this.tableIndex].expiryUnit = selection[0].expiryUnitIdName
|
|
|
// this.basicForm.puDemandItemList[this.tableIndex].minPackage = selection[0].usefulLife
|
|
|
this.basicForm.puDemandItemList[this.tableIndex].minPackage = selection[0].minPackQty
|