From 41caeb2fcfa50ba120d4c8c89ff7386256abd885 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 八月 2023 17:49:59 +0800
Subject: [PATCH] da
---
web_standard/src/components/ext/SelectMaterail.vue | 4 +++-
server/src/main/java/doumeemes/dao/ext/vo/WorkorderCheckExtListVO.java | 2 +-
web_standard/src/views/ext/workorderRecordExt.vue | 10 ++++++++++
web_standard/src/components/ext/OperaWInboundExtWindow.vue | 2 +-
server/src/main/resources/mappers/WorkPlansExtMapper.xml | 2 +-
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderCheckExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderCheckExtListVO.java
index eda4cfa..4ed63b8 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderCheckExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderCheckExtListVO.java
@@ -41,7 +41,7 @@
private String smodelMobile;
@ApiModelProperty(value = "宸ヨ瀹瑰櫒缂栧彿")
- @ExcelColumn(name="宸ヨ瀹瑰櫒缂栧彿",index = 4,width =15)
+// @ExcelColumn(name="宸ヨ瀹瑰櫒缂栧彿",index = 4,width =15)
private String amodelcode;
diff --git a/server/src/main/resources/mappers/WorkPlansExtMapper.xml b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
index a4c3a55..724617d 100644
--- a/server/src/main/resources/mappers/WorkPlansExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
@@ -182,7 +182,7 @@
a.DELETED = 0 AND a.ROOT_DEPART_ID = #{rootDepartId} AND a.DEPART_ID = #{departId} AND a.`STATUS` = 1
</select>
<select id="selectStatisticsList" parameterType="doumeemes.dao.ext.dto.QueryWorkPlansDTO" resultType="doumeemes.dao.business.dto.statistics.WorkPlansPageModel">
- select a.status,a.id,a.NUM,m.id as materialId,m.name as categoryName,m.code as materialCode
+ select a.status,a.plan_code as code,a.num,a.id,a.NUM,m.id as materialId,m.name as materialName,m.code as materialCode
<!-- ,(select sum(b.num) from workorder_record b left join plans c on b.PLAN_ID=c.id where b.type=1 and b.DELETED=0 and c.WORK_PLANS_ID=a.id) as doneNum
,(select sum(b.QUALIFIED_NUM) from workorder_record b left join plans c on b.PLAN_ID=c.id where b.type=1 and b.DELETED=0 and c.WORK_PLANS_ID=a.id) as qualifiedNum
-->,(select b.route_id from bom b where b.MATERIAL_ID=c.id and b.ROOT_DEPART_ID=a.ROOT_DEPART_ID) as routeId
diff --git a/web_standard/src/components/ext/OperaWInboundExtWindow.vue b/web_standard/src/components/ext/OperaWInboundExtWindow.vue
index 35681a7..8c51fc6 100644
--- a/web_standard/src/components/ext/OperaWInboundExtWindow.vue
+++ b/web_standard/src/components/ext/OperaWInboundExtWindow.vue
@@ -383,7 +383,7 @@
addMaterial () {
// console.log('澧炲姞鐗╂枡')
// const ids = this.form.woutboundInBodyBeanList.map(e => { return e.materialId }).join(',')
- this.$refs.selectMaterail.open('閫夋嫨鐗╂枡', { ids: '', multiple: true, isPurchase:true })
+ this.$refs.selectMaterail.open('閫夋嫨鐗╂枡', { ids: '', multiple: true, isPurchase:false,queryType:1 })
},
deleteMaterail (row) {
// console.log('鍒犻櫎鐗╂枡')
diff --git a/web_standard/src/components/ext/SelectMaterail.vue b/web_standard/src/components/ext/SelectMaterail.vue
index f2b27e0..3425fec 100644
--- a/web_standard/src/components/ext/SelectMaterail.vue
+++ b/web_standard/src/components/ext/SelectMaterail.vue
@@ -102,7 +102,8 @@
form: {
ids: '',
multiple: false,
- isPurchase: false
+ isPurchase: false,
+ queryType: null
},
isSearch: false,
materialTypes: [],
@@ -277,6 +278,7 @@
cmodel2Id: this.selectedTree.meddileId,
cmodel3Id: this.selectedTree.smallId,
formation: this.form.isPurchase ? '1' : '',
+ queryType: this.form.queryType,
status: '1'
},
sorts: null
diff --git a/web_standard/src/views/ext/workorderRecordExt.vue b/web_standard/src/views/ext/workorderRecordExt.vue
index efe86cf..e16e13e 100644
--- a/web_standard/src/views/ext/workorderRecordExt.vue
+++ b/web_standard/src/views/ext/workorderRecordExt.vue
@@ -146,6 +146,16 @@
<span>{{ timesToStr(row.duration) }}</span>
</template>
</el-table-column>
+ <el-table-column prop="salaryType" label="璁′环鏂瑰紡" min-width="100px">
+ <template slot-scope="{row}">
+ {{ row.salaryType == 0 ? '璁′欢' : (row.salaryType == 1 ? '璁℃椂' : '-') }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="salary" label="璁′环宸ヨ祫(鍏�)" min-width="100px">
+ <template slot-scope="{row}">
+ <span>{{accDiv(Math.round(row.salary),1) }}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="deviceCode" label="璁惧" show-overflow-tooltip min-width="100px">
<template slot-scope="{row}">
<span class="long-title-style" :title="row.deviceCode + ' | ' + row.deviceName">{{ row.deviceCode + ' | ' + row.deviceName}}</span>
--
Gitblit v1.9.3