UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 设备入库、变更、报废

Browse Source
dev_ksck2.0
chenhc 1 year ago
parent 531a873e99
commit 24abcee7e9
5 changed files with 321 additions and 195 deletions
Show Stats Download Patch File Download Diff File

54
src/api/dev/deviceChangeOrderApi.js
Unescape Escape View File

@ -19,6 +19,19 @@ export function saveDraftOrder(query) {
} }
) )
} }
export function generateOrderId(query) {
return axios(
{
url: "/udi/device/changeOrder/generateOrderId",
method: "get",
params: query
}
)
}
export function delDraftOrder(query) { export function delDraftOrder(query) {
return axios( return axios(
{ {
@ -79,3 +92,44 @@ export function rejectChangeOrder(orderId, query) {
} }
) )
} }
export function delOrderItem(deviceCode) {
return axios(
{
url: `/udi/device/changeOrderItem/del/${deviceCode}`,
method: "DELETE"
}
)
}
export function entryOrderItem(query) {
return axios(
{
url: "/udi/device/changeOrderItem/entry",
method: "POST",
data: query
}
)
}
export function entryOrderItemChange(query) {
return axios(
{
url: "/udi/device/changeOrderItem/entryChange",
method: "POST",
data: query
}
)
}
export function updateOrderItem(data) {
return axios(
{
url: "/udi/device/changeOrderItem/update",
method: "POST",
data: data
}
)
}

6
src/views/dev/deviceChangeOrder.vue
Unescape Escape View File

@ -235,7 +235,7 @@
<div class="fr"> <div class="fr">
<el-button type="primary" @click="openChoose(1)" v-if="createData.type==deviceChangeType.ADD.key">产品录入</el-button> <el-button type="primary" @click="openChoose(1)" v-if="createData.type==deviceChangeType.ADD.key">产品录入</el-button>
<el-button type="primary" @click="openChoose(2)" v-if="createData.type==deviceChangeType.ADD.key">库存物资录入</el-button> <el-button type="primary" @click="openChoose(2)" v-if="createData.type==deviceChangeType.ADD.key">库存物资录入</el-button>
<el-button type="primary" @click="openChoose(3)" v-if="createData.type==deviceChangeType.CHANGE.key" :disabled="!this.createData.deptCode">添加设备</el-button> <el-button type="primary" @click="openChoose(3)" v-if="createData.type==deviceChangeType.CHANGE.key || createData.type==deviceChangeType.DESTROY.key" :disabled="!this.createData.deptCode">添加设备</el-button>
<!-- <el-switch--> <!-- <el-switch-->
<!-- class="ml10"--> <!-- class="ml10"-->
<!-- v-model="fullScreenFlag"--> <!-- v-model="fullScreenFlag"-->
@ -318,10 +318,10 @@
<!-- <el-button type="text" @click="scope.row.editFlag=true"--> <!-- <el-button type="text" @click="scope.row.editFlag=true"-->
<!-- v-if="createData.type==deviceChangeType.ADD.key&&scope.row.editFlag==false">编辑--> <!-- v-if="createData.type==deviceChangeType.ADD.key&&scope.row.editFlag==false">编辑-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button type="text" v-if="createData.type==deviceChangeType.ADD.key" @click="copyRow(scope.$index)"> <el-button type="text" v-if="createData.type==deviceChangeType.ADD.key" @click="copyRow(scope.row)">
复制 复制
</el-button> </el-button>
<el-button type="text" @click="delDeviceRow(scope.$index)">删除</el-button> <el-button type="text" @click="delDeviceRow(scope.row.deviceCode)">删除</el-button>
<!-- <el-button type="text" v-if="createData.type==deviceChangeType.ADD.key"--> <!-- <el-button type="text" v-if="createData.type==deviceChangeType.ADD.key"-->
<!-- @click="batchCopyRow(scope.$index)">批量--> <!-- @click="batchCopyRow(scope.$index)">批量-->

12
src/views/dev/deviceFinanceModifyDialog.vue
Unescape Escape View File

@ -82,18 +82,22 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="5">
<el-form-item class="query-form-item" label="折旧年:"> <el-form-item class="query-form-item" label="折旧年:">
<el-input-number :min="0" v-model="formData.number" style="width: 100%" <el-input-number :min="0" v-model="formData.depreciationYear" style="width: 100%"
clearable></el-input-number> clearable></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<el-form-item class="query-form-item" label="折旧月:"> <el-form-item class="query-form-item" label="折旧月:">
<el-input-number :min="0" v-model="formData.number" p style="width: 100%" <el-input-number :min="0" v-model="formData.depreciationMonth" style="width: 100%"
clearable></el-input-number> clearable></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="2">
<el-form-item>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="存储仓库:" style="width: 91%"> <el-form-item class="query-form-item" label="存储仓库:" style="width: 91%">

312
src/views/dev/deviceSubModifyDialog.vue
Unescape Escape View File

@ -11,8 +11,8 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="资产分类:" style="width: 91%"> <el-form-item class="query-form-item" label="资产品名:" style="width: 91%">
<el-select v-model="formData.assetType" style="width: 100%" placeholder="请选择资产分类" > <el-select v-model="formData.assetName" style="width: 100%" placeholder="请选择资产品名" >
<el-option <el-option
v-for="item in dict.type.device_source_type" v-for="item in dict.type.device_source_type"
:key="item.value" :key="item.value"
@ -24,8 +24,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="国资分类:" style="width: 91%"> <el-form-item class="query-form-item" label="资产备用类型:" style="width: 91%">
<el-select v-model="formData.sasacType" style="width: 100%" placeholder="请选择国资分类" > <el-select v-model="formData.assetReserveType" style="width: 100%" placeholder="请选择资产备用类型" >
<el-option <el-option
v-for="item in dict.type.device_source_type" v-for="item in dict.type.device_source_type"
:key="item.value" :key="item.value"
@ -38,37 +38,63 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="4">
<el-form-item class="query-form-item" label="资产助记码:"> <el-form-item class="query-form-item" label="是否强检:" >
<el-input v-model="formData.assetMnemonicCode" placeholder="请输入资产助记码" style="width: 90%" <el-checkbox v-model="formData.isImperative" ></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="1"><el-form-item></el-form-item></el-col>
<el-col :span="7">
<el-form-item class="query-form-item" label="检定周期(月):">
<el-input v-model="formData.imperativeCycle" style="width: 80%"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="数量:"> <el-form-item class="query-form-item" label="开始检定日期:">
<el-input-number :min="1" v-model="formData.number" placeholder="请输入数量" style="width: 90%" <el-date-picker
clearable></el-input-number> style="width: 90%"
v-model="formData.startImperativeDate"
type="date"
placeholder="请输入开始检定日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4">
<el-form-item class="query-form-item" label="是否保养:" >
<el-checkbox v-model="formData.isMaintain" ></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="1"><el-form-item></el-form-item></el-col>
<el-col :span="7">
<el-form-item class="query-form-item" label="保养周期(月):">
<el-input v-model="formData.maintainCycle" style="width: 80%"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="取得方式:" style="width: 91%"> <el-form-item class="query-form-item" label="开始保养日期:">
<el-select v-model="formData.acquisitionMethod" style="width: 100%" placeholder="请选择取得方式" > <el-date-picker
<el-option style="width: 90%"
v-for="item in dict.type.device_source_type" v-model="formData.startMaintainDate"
:key="item.value" type="date"
:label="item.label" placeholder="请输入开始保养日期"
:value="item.value"> format="yyyy 年 MM 月 dd 日"
<span style="float: left">{{ item.label }}</span> value-format="yyyy-MM-dd">
</el-option> </el-date-picker>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="用途:" style="width: 91%"> <el-form-item class="query-form-item" label="维修组:" style="width: 91%">
<el-select v-model="formData.purpose" style="width: 100%" placeholder="请选择用途" > <el-select v-model="formData.serviceType" style="width: 100%" placeholder="请选择维修组" >
<el-option <el-option
v-for="item in dict.type.device_source_type" v-for="item in dict.type.device_source_type"
:key="item.value" :key="item.value"
@ -79,25 +105,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="折旧年:">
<el-input-number :min="0" v-model="formData.number" style="width: 100%"
clearable></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="折旧月:">
<el-input-number :min="0" v-model="formData.number" p style="width: 100%"
clearable></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="存储仓库:" style="width: 91%"> <el-form-item class="query-form-item" label="保养组:" style="width: 91%">
<el-select v-model="formData.purpose" style="width: 100%" placeholder="请选择存储仓库" > <el-select v-model="formData.maintainType" style="width: 100%" placeholder="请选择保养组" >
<el-option <el-option
v-for="item in dict.type.device_source_type" v-for="item in dict.type.device_source_type"
:key="item.value" :key="item.value"
@ -109,18 +119,29 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="预计总工时:"> <el-form-item class="query-form-item" label="管理人:" style="width: 91%">
<el-input-number :min="0" v-model="formData.estimatedTotalHour" placeholder="请输入预计总工时" style="width: 90%" <el-select v-model="formData.managerUser" style="width: 100%" placeholder="请选择管理人" >
clearable></el-input-number> <el-option v-for="item in userList"
:key="item.employeeName"
:label="item.employeeName"
:value="item.userId">
<span>{{ item.employeeName }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="单日工时:"> <el-form-item class="query-form-item" label="审核人:" style="width: 91%">
<el-input-number :min="0" v-model="formData.dayHour" placeholder="请输入单日工时" style="width: 90%" <el-select v-model="formData.approveUser" style="width: 100%" placeholder="请选择审核人" >
clearable></el-input-number> <el-option v-for="item in userList"
:key="item.employeeName"
:label="item.employeeName"
:value="item.userId">
<span>{{ item.employeeName }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -128,59 +149,40 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="单个资产价值:"> <el-form-item class="query-form-item" label="对应会计科目:">
<el-input-number :min="0" :precision='2' :step='1' v-model="formData.assetValue" placeholder="请输入单个资产价值" style="width: 90%" <el-input v-model="formData.ledgerAccount" style="width: 90%"
clearable></el-input-number> clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="自有资金:"> <el-form-item class="query-form-item" label="减值准备:">
<el-input-number :min="0" :precision='2' :step='1' v-model="formData.ownFund" placeholder="请输入自有资金" style="width: 90%" <el-input v-model="formData.impairmentProvision" style="width: 90%"
clearable></el-input-number> clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="财政拨款:"> <el-form-item class="query-form-item" label="预计工作量:">
<el-input-number :min="0" :precision='2' :step='1' v-model="formData.financialAppropriation" placeholder="请输入财政拨款" style="width: 90%" <el-input v-model="formData.estimatedWorkload" style="width: 90%"
clearable></el-input-number> clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="query-form-item" label="科教基金:">
<el-input-number :min="0" :precision='2' :step='1' v-model="formData.educationFund" placeholder="请输入科教基金" style="width: 90%"
clearable></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="其他资金:"> <el-form-item class="query-form-item" label="已完成工作量:">
<el-input-number :min="0" :precision='2' :step='1' v-model="formData.otherFund" placeholder="请输入其他资金" style="width: 90%" <el-input v-model="formData.completedWorkload" style="width: 90%"
clearable></el-input-number> clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item class="query-form-item">
<span slot="label">
<span style="font-size: 11px">非同级财政拨款:</span>
</span>
<el-input-number :min="0" :precision='2' :step='1' v-model="formData.nonPeerFinancialAppropriation" placeholder="请输入非同级财政拨款" style="width: 90%"
clearable></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="管理类别:" style="width: 91%"> <el-form-item class="query-form-item" label="维保类型:" style="width: 91%">
<el-select v-model="formData.managementCategory" style="width: 100%" placeholder="请选择管理类别" > <el-select v-model="formData.maintenanceType" style="width: 100%" placeholder="请选择维保类型" >
<el-option <el-option
v-for="item in dict.type.device_source_type" v-for="item in dict.type.device_source_type"
:key="item.value" :key="item.value"
@ -192,19 +194,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="使用人:"> <el-form-item class="query-form-item" label="维保周期(月):">
<el-select v-model="formData.endUser" <el-input-number :min="1" v-model="formData.maintenanceCycle" style="width: 90%" controls-position="right"
placeholder="请输入使用人" clearable></el-input-number>
clearable="true"
style="width: 90%"
>
<el-option v-for="item in userList"
:key="item.employeeName"
:label="item.employeeName"
:value="item.userId">
<span>{{ item.employeeName }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -212,69 +204,68 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="预计残值:" style="font-size: 11px"> <el-form-item class="query-form-item" label="维保开始日期:">
<el-input-number :min="0" :precision='2' :step='1' v-model="formData.estimatedResidualValue" placeholder="请输入预计残值" style="width: 90%" <el-date-picker
clearable></el-input-number> style="width: 90%"
v-model="formData.startMaintenancDate"
type="date"
placeholder="请输入维保开始日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="币种:" style="width: 91%"> <el-form-item class="query-form-item" label="维保结束日期:">
<el-select v-model="formData.currencyType" style="width: 100%" placeholder="请选择币种" > <el-date-picker
<el-option style="width: 90%"
v-for="item in dict.type.device_source_type" v-model="formData.endMaintenancDate"
:key="item.value" type="date"
:label="item.label" placeholder="请输入维保结束日期"
:value="item.value"> format="yyyy 年 MM 月 dd 日"
<span style="float: left">{{ item.label }}</span> value-format="yyyy-MM-dd">
</el-option> </el-date-picker>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="采购类型:" style="width: 91%"> <el-form-item class="query-form-item" label="内外网:" style="width: 91%">
<el-select v-model="formData.purType" style="width: 100%" placeholder="请选择采购类型" > <input type="radio" name="networkType" value="1" v-model="formData.networkType"/>内网
<el-option <input type="radio" name="networkType" value="2" v-model="formData.networkType"/>外网
v-for="item in dict.type.device_source_type"
:key="item.value"
:label="item.label"
:value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="购置日期:"> <el-form-item class="query-form-item" label="使用角色:" style="width: 91%">
<el-date-picker <input type="radio" name="userRole" value="1" v-model="formData.userRole"/>医生站
style="width: 90%" <input type="radio" name="userRole" value="2" v-model="formData.userRole"/>护士站
v-model="formData.purchaseDate"
type="date"
placeholder="请输入购置日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5">
<el-form-item class="query-form-item" label="是否加域:" >
<el-checkbox v-model="formData.isAddDomain" style="width: 90%"></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item class="query-form-item" label="u盘是否禁用:" >
<el-checkbox v-model="formData.isUDisc" style="width: 90%"></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="query-form-item" label="添加日期:"> <el-form-item class="query-form-item" label="设备归类:" style="width: 91%">
<el-date-picker <input type="radio" name="ascriptionType" value="1" v-model="formData.ascriptionType"/>专用设备
style="width: 90%" <input type="radio" name="ascriptionType" value="2" v-model="formData.ascriptionType"/>通用办公设备
v-model="formData.addDate"
type="date"
placeholder="请输入添加日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -374,31 +365,32 @@ export default {
if (!valid) { if (!valid) {
this.$message.error("请完善必填信息"); this.$message.error("请完善必填信息");
} else { } else {
this.rowData.assetType = this.formData.assetType; this.rowData.assetName = this.formData.assetName;
this.rowData.sasacType = this.formData.sasacType; this.rowData.isImperative = this.formData.isImperative;
this.rowData.assetMnemonicCode = this.formData.assetMnemonicCode; this.rowData.isMaintain = this.formData.isMaintain;
this.rowData.number = this.formData.number; this.rowData.imperativeCycle = this.formData.imperativeCycle;
this.rowData.acquisitionMethod = this.formData.acquisitionMethod; this.rowData.maintainCycle = this.formData.maintainCycle;
this.rowData.purpose = this.formData.purpose; this.rowData.startImperativeDate = this.formData.startImperativeDate;
this.rowData.depreciationYear = this.formData.depreciationYear; this.rowData.startMaintainDate = this.formData.startMaintainDate;
this.rowData.depreciationMonth = this.formData.depreciationMonth; this.rowData.serviceType = this.formData.serviceType;
this.rowData.invCode = this.formData.invCode; this.rowData.maintainType = this.formData.maintainType;
this.rowData.estimatedTotalHour = this.formData.estimatedTotalHour; this.rowData.managerUser = this.formData.managerUser;
this.rowData.dayHour = this.formData.dayHour; this.rowData.approveUser = this.formData.approveUser;
this.rowData.assetValue = this.formData.assetValue; this.rowData.ledgerAccount = this.formData.ledgerAccount;
this.rowData.ownFund = this.formData.ownFund; this.rowData.impairmentProvision = this.formData.impairmentProvision;
this.rowData.financialAppropriation = this.formData.financialAppropriation; this.rowData.estimatedWorkload = this.formData.estimatedWorkload;
this.rowData.educationFund = this.formData.educationFund; this.rowData.completedWorkload = this.formData.completedWorkload;
this.rowData.otherFund = this.formData.otherFund; this.rowData.maintenanceType = this.formData.maintenanceType;
this.rowData.nonPeerFinancialAppropriation = this.formData.nonPeerFinancialAppropriation; this.rowData.maintenanceCycle = this.formData.maintenanceCycle;
this.rowData.managementCategory = this.formData.managementCategory; this.rowData.startMaintenancDate = this.formData.startMaintenancDate;
this.rowData.endUser = this.formData.endUser; this.rowData.endMaintenancDate = this.formData.endMaintenancDate;
this.rowData.estimatedResidualValue = this.formData.estimatedResidualValue; this.rowData.networkType = this.formData.networkType;
this.rowData.currencyType = this.formData.currencyType; this.rowData.userRole = this.formData.userRole;
this.rowData.purType = this.formData.purType; this.rowData.isAddDomain = this.formData.isAddDomain;
this.rowData.purchaseDate = this.formData.purchaseDate; this.rowData.isUDisc = this.formData.isUDisc;
this.rowData.addDate = this.formData.addDate; this.rowData.ascriptionType = this.formData.ascriptionType;
this.rowData.assetReserveType = this.formData.assetReserveType;
this.editSaveDev(); this.editSaveDev();

122
src/views/dev/js/deviceChangeOrder.js
Unescape Escape View File

@ -2,7 +2,8 @@ import {
cancelChangeOrder, cancelChangeOrder,
changeOrderDetailByUser, changeOrderDetailByUser,
changeOrderPage, changeOrderPage,
confirmChangeOrder, delDraftOrder, rejectChangeOrder, saveChangeOrder, saveDraftOrder confirmChangeOrder, delDraftOrder, rejectChangeOrder, saveChangeOrder, saveDraftOrder,
generateOrderId,delOrderItem,entryOrderItem,updateOrderItem,entryOrderItemChange
} from "@/api/dev/deviceChangeOrderApi"; } from "@/api/dev/deviceChangeOrderApi";
import {deviceChangeStatus, deviceChangeType} from "@/utils/enum"; import {deviceChangeStatus, deviceChangeType} from "@/utils/enum";
import "@/store/getters"; import "@/store/getters";
@ -103,6 +104,7 @@ export default {
createData: {...createData}, createData: {...createData},
itemMap: new Map(), itemMap: new Map(),
itemList: [], itemList: [],
itemAddList: [],
createRule: { createRule: {
toDeptCode: [{ toDeptCode: [{
required: true, required: true,
@ -278,8 +280,23 @@ export default {
}) })
}, },
//移除设备 //移除设备
delDeviceRow(index) { delDeviceRow(deviceCode) {
this.itemList.splice(index, 1) //判断是否最后一条
if (this.detailList.length == 1){
this.$message.error("请注意，最后一条明细不可单独删除；如需删除，请直接删除整个单据。");
return
}
delOrderItem(deviceCode).then(res => {
if (res.code != 20000) {
this.$message.error(res.message)
return
}
this.getDetailList()
this.$message.success(res.message)
}).catch(() => {
})
}, },
//编辑设备 //编辑设备
@ -290,23 +307,30 @@ export default {
//设备编辑保存 //设备编辑保存
editSaveDev(row) { editSaveDev(row) {
this.curDevRow = row; // this.curDevRow = row;
this.deviceInfoFlag = false; // console.log(this.curDevRow)
this.deviceInfoFlag = false; updateOrderItem(this.curDevRow).then(res => {
if (res.code != 20000) {
this.$message.error(res.message)
return
}
this.getDetailList()
this.$message.success(res.message)
})
// this.deviceInfoFlag = false;
}, },
copyRow(row) {
this.itemAddList = []
this.itemAddList.push(row)
copyRow(index) { entryOrderItem(this.itemAddList).then(res => {
let data = { if (res.code != 20000) {
...this.itemList[index], this.$message.error(res.message)
editFlag: true, return
batchNo: null,
serialNo: null,
productionDate: null,
expireDate: null,
udi: null
} }
this.genCode(data) this.getDetailList()
this.itemList.splice(index, 0, data) this.$message.success(res.message)
})
}, },
batchCopyRow(index) { batchCopyRow(index) {
this.$prompt('请输入复制数量', '提示', { this.$prompt('请输入复制数量', '提示', {
@ -393,6 +417,17 @@ export default {
// this.refreshCodesPanel() // this.refreshCodesPanel()
}, },
openChoose(index) { openChoose(index) {
//如果orderId 空 就先生成
if (this.createData.orderId == null){
generateOrderId(this.createData).then(res => {
if (res.code != 20000) {
return
}
this.createData.orderId = res.data
this.detailQuery.orderId = res.data
}).catch(e => {
})
}
if (index == 1) { if (index == 1) {
this.chooseProductFlag = true this.chooseProductFlag = true
}else if (index == 2) { }else if (index == 2) {
@ -431,22 +466,59 @@ export default {
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });
this.itemAddList = []
for (let row of lists) { for (let row of lists) {
let data = copyProperties(row, item) let data = copyProperties(row, item)
data.editFlag = true data.editFlag = true
if(!row.deviceCode){ data.orderId = this.createData.orderId
this.genCode(data) // if(!row.deviceCode){
} // this.genCode(data)
// }
data.productName = row.cpmctymc data.productName = row.cpmctymc
data.productId = row.id data.productId = row.id
data.sourceType = this.createData.sourceType data.sourceType = this.createData.sourceType
this.itemList.push(data) this.itemAddList.push(data)
loading.close() }
if (this.itemAddList.length > 0){
if (this.type == deviceChangeType.ADD) {
entryOrderItem(this.itemAddList).then( res =>{
if (res.code != 20000) {
this.$message.error(res.message)
return
}
this.getDetailList()
this.chooseProductFlag = false
this.selectInvProductVisible = false
this.selectDeviceAddVisible = false
this.$message.success(res.message)
})
} else if (this.type == deviceChangeType.CHANGE) {
entryOrderItemChange(this.itemAddList).then( res =>{
if (res.code != 20000) {
this.$message.error(res.message)
return
}
this.getDetailList()
this.chooseProductFlag = false
this.selectInvProductVisible = false
this.selectDeviceAddVisible = false
this.$message.success(res.message)
})
} else if (this.type == deviceChangeType.DESTROY) {
entryOrderItemChange(this.itemAddList).then( res =>{
if (res.code != 20000) {
this.$message.error(res.message)
return
} }
this.getDetailList()
this.chooseProductFlag = false this.chooseProductFlag = false
this.selectInvProductVisible = false this.selectInvProductVisible = false
this.selectDeviceAddVisible = false this.selectDeviceAddVisible = false
this.$message.success(res.message)
})
}
}
loading.close()
}, },
parseItemMap() { parseItemMap() {
this.$nextTick(() => { this.$nextTick(() => {
@ -643,6 +715,10 @@ export default {
}, },
getDetailList() { getDetailList() {
this.detailLoading = true this.detailLoading = true
if ( this.detailQuery.type == null){
this.detailQuery.type = this.type.key
}
console.log(this.detailQuery)
changeOrderDetailByUser(this.detailQuery).then(res => { changeOrderDetailByUser(this.detailQuery).then(res => {
this.detailLoading = false this.detailLoading = false
if (res.code != 20000) { if (res.code != 20000) {

Write Preview
Loading…
Cancel
Save