bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
bns_han 2023-12-20 14:41:03 +08:00
parent e5cbbafb14 7e85418e31
commit 50f8c0b524
9 changed files with 97 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java
View File

@ -12,7 +12,7 @@ public class CommonConstants {
/** 安全工器具*/
public static final String AQGQJ = "安全工器具";
/** 机具分公司*/
public static final String JJ = "机具分公司";
public static final String JJ = "机具设备分公司";
/** 调试分公司*/
public static final String TS = "调试分公司";

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
View File

@ -241,7 +241,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
List<Integer> valueList = commonUtil.setMaterialReturnData(list);
num = valueList.get(0);
num2 = valueList.get(1);
rate = commonUtil.getRate(num, num + num2);
rate = commonUtil.getRate(num2, num);
} catch (Exception e) {
log.error("当月退料分析", e);
}

7
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java
View File

@ -48,7 +48,8 @@ public class SysFileServiceImpl implements SysFileService {
FileInfo file = new FileInfo();
StandardMultipartHttpServletRequest req = (StandardMultipartHttpServletRequest) request;
String photoType = req.getParameter("fileType");
String userId = req.getParameter("userId");
// String userId = req.getParameter("userId");
Long userId = SecurityUtils.getUserId();
HashMap<String, Object> map = getFile(req);
List<MultipartFile> items = (List<MultipartFile>) map.get("filePath");
MultipartFile item = items.get(0);
@ -61,7 +62,7 @@ public class SysFileServiceImpl implements SysFileService {
long size = item.getSize()/1024/1024;
file.setFileName(fileName);
file.setFileUrl(url);
file.setCreator(userId);
file.setCreator(userId.toString());
file.setType(type);
file.setSize(size + "M");
file.setWords(words);
@ -97,7 +98,7 @@ public class SysFileServiceImpl implements SysFileService {
String tmpName = multipartFile.getOriginalFilename();// 完整路径 IE
tmpName = tmpName.substring(tmpName.lastIndexOf("\\") + 1);
tmpName = IdUtil.fastSimpleUUID() + tmpName;
String imageFiles="/data/sz/zstp/" + fileType + "/";
String imageFiles="/data/sgzb/" + fileType + "/";
String os = System.getProperty("os.name");
if(os.toLowerCase().startsWith("win")){
imageFiles="D://files/" + fileType + "/";

4
sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
View File

@ -703,4 +703,8 @@ export default {
font-weight: 600;
}
}
::v-deep.el-table .fixed-width .el-button--mini {
width: 70px !important;
margin-bottom: 10px;
}
</style>

45
sgzb-ui/src/views/repairTest/brokenExamine/index.vue
View File

@ -48,22 +48,27 @@
</el-select>
</el-form-item>
<el-form-item label="工机具类型" prop="type">
<!-- <selectTree-->
<!-- ref="mychild"-->
<!-- style="width: 240px"-->
<!-- :treeList="deptList"-->
<!-- :treeProps="{-->
<!-- children: 'children',-->
<!-- label: 'label',-->
<!-- }"-->
<!-- nodeKey="id"-->
<!-- :defaultSelect="true"-->
<!-- :defaultData="defaultData"-->
<!-- :clearable="false"-->
<!-- :placeholder="'请选择'"-->
<!-- @handleNodeClick="selectDrop"-->
<!-- ></selectTree>-->
<Tree ref="mychildSon" :width="240" :dataList="deptList" @changeId="selectDrop"></Tree>
<!-- <selectTree-->
<!-- ref="mychild"-->
<!-- style="width: 240px"-->
<!-- :treeList="deptList"-->
<!-- :treeProps="{-->
<!-- children: 'children',-->
<!-- label: 'label',-->
<!-- }"-->
<!-- nodeKey="id"-->
<!-- :defaultSelect="true"-->
<!-- :defaultData="defaultData"-->
<!-- :clearable="false"-->
<!-- :placeholder="'请选择'"-->
<!-- @handleNodeClick="selectDrop"-->
<!-- ></selectTree>-->
<Tree
ref="mychildSon"
:width="240"
:dataList="deptList"
@changeId="selectDrop"
></Tree>
</el-form-item>
<el-form-item label="报废单号" prop="backCode">
<el-input
@ -497,7 +502,7 @@ import selectTree from '../repair/selectTree.vue'
import Tree from '@/views/repairTest/repair/tree.vue'
export default {
name: "Dict",
components: { selectTree,Tree },
components: { selectTree, Tree },
dicts: ['sys_normal_disable'],
data() {
return {
@ -573,10 +578,6 @@ export default {
})
this.getTree()
},
updated() {
this.$refs.mychild.clearSelect();
this.defaultData = null
},
methods: {
/** 查询字典类型列表 */
getList() {
@ -666,7 +667,7 @@ export default {
this.resetForm("queryForm");
// this.$refs.mychild.clearSelect();
this.queryParams.type = ''
this.$refs.mychildSon.inputValue='';
this.$refs.mychildSon.inputValue = '';
this.handleQuery();
},
/** 新增按钮操作 */

32
sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
View File

@ -6,14 +6,14 @@
:title="dialogTitle"
:visible.sync="dialogShowFlag"
append-to-body
width="500px"
width="600px"
>
<div class="form_box_one">
<el-form
ref="dynamicValidateForm"
:model="dynamicValidateForm"
class="demo-dynamic"
label-width="100px"
label-width="90px"
>
<div
v-for="(domain, index) in dynamicValidateForm.premiumList"
@ -29,7 +29,7 @@
>
<treeselect
v-model="domain.partId"
style="width: 250px"
style="width: 350px"
:options="deptList"
:normalizer="normalizer"
placeholder="选择上级"
@ -44,7 +44,7 @@
v-model="domain.repairer"
placeholder="请选择"
size="small"
style="width: 250px"
style="width: 350px"
>
<el-option
v-for="dict in userSelectList"
@ -58,7 +58,7 @@
:prop="'premiumList.' + index + '.partType'"
label="是否收费："
>
<el-radio-group style="width: 250px" v-model="domain.partType">
<el-radio-group style="width: 350px" v-model="domain.partType">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
@ -77,7 +77,7 @@
v-model="domain.partNum"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item
@ -93,7 +93,7 @@
v-model="domain.partCost"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item
@ -106,7 +106,7 @@
placeholder="请输入"
show-word-limit
size="small"
style="width: 250px"
style="width: 350px"
type="textarea"
></el-input>
</el-form-item>
@ -139,7 +139,7 @@
ref="dynamicValidateFormTwo"
:model="dynamicValidateFormTwo"
class="demo-dynamic"
label-width="100px"
label-width="90px"
>
<div
v-for="(domain, index) in dynamicValidateFormTwo.premiumListTwo"
@ -163,7 +163,7 @@
v-model="domain.repairNum"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item
@ -175,7 +175,7 @@
v-model="domain.repairer"
placeholder="请选择"
size="small"
style="width: 250px"
style="width: 350px"
>
<el-option
v-for="dict in userSelectList"
@ -190,7 +190,7 @@
label="选择配件："
>
<treeselect
style="width: 250px"
style="width: 350px"
v-model="domain.partId"
:options="deptList"
:normalizer="normalizer"
@ -201,7 +201,7 @@
:prop="'premiumListTwo.' + index + '.partType'"
label="是否收费："
>
<el-radio-group style="width: 250px" v-model="domain.partType">
<el-radio-group style="width: 350px" v-model="domain.partType">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
@ -219,7 +219,7 @@
v-model="domain.partNum"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item
@ -235,7 +235,7 @@
v-model="domain.partCost"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item
@ -248,7 +248,7 @@
placeholder="请输入"
show-word-limit
size="small"
style="width: 250px"
style="width: 350px"
type="textarea"
></el-input>
</el-form-item>

20
sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
View File

@ -6,14 +6,14 @@
:title="dialogTitle"
:visible.sync="dialogShowFlag"
append-to-body
width="500px"
width="600px"
>
<div class="form_box_one" v-if="!isShow">
<el-form
ref="dynamicValidateForm"
:model="dynamicValidateForm"
class="demo-dynamic"
label-width="100px"
label-width="90px"
>
<div class="bor_box">
<p class="form_box_title">编码管理设备</p>
@ -24,12 +24,12 @@
v-model="dynamicValidateForm.scrapReason"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item label="损坏原因：">
<el-radio-group
style="width: 250px"
style="width: 350px"
v-model="dynamicValidateForm.scrapType"
>
<el-radio :label="1">人为</el-radio>
@ -47,7 +47,7 @@
@fileListChange="fileListChange"
></uploadImage> -->
<upload
style="width: 250px"
style="width: 350px"
:file-list="fileList"
:action-url="actionUrl"
:limit="3"
@ -74,7 +74,7 @@
ref="dynamicValidateFormTwo"
:model="dynamicValidateFormTwo"
class="demo-dynamic"
label-width="100px"
label-width="90px"
>
<p class="form_box_title">数量管理设备</p>
<div class="form_box_line"></div>
@ -84,12 +84,12 @@
v-model="dynamicValidateFormTwo.scrapReason"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item label="损坏原因：">
<el-radio-group
style="width: 250px"
style="width: 350px"
v-model="dynamicValidateFormTwo.scrapType"
>
<el-radio :label="1">人为</el-radio>
@ -109,7 +109,7 @@
v-model="dynamicValidateFormTwo.scrapNum"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item label="损坏照片：">
@ -123,7 +123,7 @@
@fileListChange="fileListChange"
></uploadImage> -->
<upload
style="width: 250px"
style="width: 350px"
:file-list="fileList"
:action-url="actionUrl"
:limit="3"

32
sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue
View File

@ -6,14 +6,14 @@
:title="dialogTitle"
:visible.sync="dialogShowFlag"
append-to-body
width="500px"
width="600px"
>
<div class="form_box_one">
<el-form
ref="dynamicValidateForm"
:model="dynamicValidateForm"
class="demo-dynamic"
label-width="100px"
label-width="90px"
>
<div
v-for="(domain, index) in dynamicValidateForm.premiumList"
@ -37,14 +37,14 @@
v-model="domain.partName"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item
:prop="'premiumList.' + index + '.partType'"
label="是否收费："
>
<el-radio-group style="width: 250px" v-model="domain.partType">
<el-radio-group style="width: 350px" v-model="domain.partType">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
@ -58,7 +58,7 @@
v-model="domain.supplierId"
placeholder="请选择"
size="small"
style="width: 250px"
style="width: 350px"
>
<el-option
v-for="dict in supplierSelectList"
@ -82,7 +82,7 @@
v-model="domain.partPrice"
placeholder="请输入"
size="small"
style="width: 230px"
style="width: 330px"
></el-input>
</el-form-item>
<el-form-item
@ -98,7 +98,7 @@
v-model="domain.partNum"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item
@ -111,7 +111,7 @@
placeholder="请输入"
show-word-limit
size="small"
style="width: 250px"
style="width: 350px"
type="textarea"
></el-input>
</el-form-item>
@ -132,7 +132,7 @@
ref="dynamicValidateFormTwo"
:model="dynamicValidateFormTwo"
class="demo-dynamic"
label-width="100px"
label-width="90px"
>
<div
v-for="(domain, index) in dynamicValidateFormTwo.premiumListTwo"
@ -156,14 +156,14 @@
v-model="domain.partName"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item
:prop="'premiumList.' + index + '.partType'"
label="是否收费："
>
<el-radio-group style="width: 250px" v-model="domain.partType">
<el-radio-group style="width: 350px" v-model="domain.partType">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
@ -177,7 +177,7 @@
v-model="domain.supplierId"
placeholder="请选择"
size="small"
style="width: 250px"
style="width: 350px"
>
<el-option
v-for="dict in supplierSelectList"
@ -201,7 +201,7 @@
v-model="domain.partPrice"
placeholder="请输入"
size="small"
style="width: 230px"
style="width: 330px"
></el-input>
</el-form-item>
<el-form-item
@ -217,7 +217,7 @@
v-model="domain.partNum"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item
@ -233,7 +233,7 @@
v-model="domain.repairNum"
placeholder="请输入"
size="small"
style="width: 250px"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item
@ -246,7 +246,7 @@
placeholder="请输入"
show-word-limit
size="small"
style="width: 250px"
style="width: 350px"
type="textarea"
></el-input>
</el-form-item>

43
sgzb-ui/src/views/repairTest/testExamine/index.vue
View File

@ -49,22 +49,27 @@
</el-select>
</el-form-item>
<el-form-item label="工机具类型" prop="type">
<!-- <selectTree-->
<!-- ref="mychild"-->
<!-- style="width: 240px"-->
<!-- :treeList="deptList"-->
<!-- :treeProps="{-->
<!-- children: 'children',-->
<!-- label: 'label',-->
<!-- }"-->
<!-- nodeKey="id"-->
<!-- :defaultSelect="true"-->
<!-- :defaultData="defaultData"-->
<!-- :clearable="true"-->
<!-- :placeholder="'请选择'"-->
<!-- @handleNodeClick="selectDrop"-->
<!-- ></selectTree>-->
<Tree ref="mychildSon" :width="240" :dataList="deptList" @changeId="selectDrop"></Tree>
<!-- <selectTree-->
<!-- ref="mychild"-->
<!-- style="width: 240px"-->
<!-- :treeList="deptList"-->
<!-- :treeProps="{-->
<!-- children: 'children',-->
<!-- label: 'label',-->
<!-- }"-->
<!-- nodeKey="id"-->
<!-- :defaultSelect="true"-->
<!-- :defaultData="defaultData"-->
<!-- :clearable="true"-->
<!-- :placeholder="'请选择'"-->
<!-- @handleNodeClick="selectDrop"-->
<!-- ></selectTree>-->
<Tree
ref="mychildSon"
:width="240"
:dataList="deptList"
@changeId="selectDrop"
></Tree>
</el-form-item>
<el-form-item label="维修单号" prop="backCode">
<el-input
@ -568,10 +573,6 @@ export default {
})
this.getTree()
},
updated() {
this.$refs.mychild.clearSelect();
this.defaultData = null
},
methods: {
/** 查询字典类型列表 */
@ -660,7 +661,7 @@ export default {
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.$refs.mychildSon.inputValue='';
this.$refs.mychildSon.inputValue = '';
this.queryParams.type = ''
this.handleQuery();
},