From a48fa4a7469b87f830251161f812a19dc9729ee9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 28 四月 2024 14:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/contract/index.vue | 236 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 189 insertions(+), 47 deletions(-)
diff --git a/src/views/system/contract/index.vue b/src/views/system/contract/index.vue
index a0551cf..61ac223 100644
--- a/src/views/system/contract/index.vue
+++ b/src/views/system/contract/index.vue
@@ -1,12 +1,11 @@
<template>
<div class="app-container">
- <el-row>
- <el-col :span="8" v-for="(item) in contractList" :key="item" style="margin: 10px;width: 30%;">
+ <el-row v-loading="loading">
+ <el-col :span="8" v-for="(item, index) in contractList" :key="index" style="margin: 10px;width: 30%;">
<el-card :body-style="{ padding: '0px' }">
- <el-image style="width: 420px;height: 187px;"
- :preview-src-list="['https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357']"
- fit="cover" src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357"
+ <ImagePreview style="width: 100%;height: 187px;"
+ fit="cover" :src="item.attachment"
class="image" />
<div style="padding: 14px;">
<span>{{ item.name }}</span>
@@ -30,59 +29,104 @@
<!-- 鍚堝悓璇︽儏 -->
<el-dialog :title="detailName" :visible.sync="detail" width="800px" append-to-body>
<el-form label-position="left" inline class="table-expand">
- <el-collapse v-model="activeNames" @change="handleChange">
+ <el-collapse v-model="activeNames">
<el-collapse-item v-for="(item, index) in ruleData" :key="index" :title="item.ruleName" :name="index">
<div class="inline-input-container" v-for="(item, index) in item.children" :key="index">
- {{ item.ruleDesc }} <br/>
- {{ item.ruleCondition }} {{ item.deductCategory }} {{ item.calcFraction }}{{ item.calcUnit ? "/" + item.calcUnit : item.calcUnit }}
+ <b>{{ item.ruleDesc }}</b> <br v-if="item.ruleDesc"/>
+ <el-tooltip class="item" v-for="(item, index) in item.children" :key="index" effect="dark" :content="item.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + item.calcFraction + '涔樹互鏁伴噺 ' : item.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + item.calcFraction + '鍒�/' + item.calcUnit + '灏忔椂' : item.deductCategory + ' ' + item.calcFraction" placement="top">
+ <span>{{ item.ruleCondition }}<br/></span>
+ <!-- {{ item.deductCategory }} {{ item.calcFraction }}{{ item.calcUnit ? "/" + item.calcUnit : '' }} -->
+ </el-tooltip>
</div>
</el-collapse-item>
- <el-form-item label="鍚堝悓闄勪欢" prop="certificates">
- <el-upload>
- <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
- <div slot="tip" class="el-upload__tip">璇蜂笂浼犲ぇ灏忎笉瓒呰繃 5MB 鏍煎紡涓� doc/xls/ppt/txt/pdf/png/jpg 鐨勬枃浠�</div>
- </el-upload>
+ <el-collapse-item title="鑰冩牳缁撴灉搴旂敤瑙勫垯" :name="ruleData.length">
+ <div class="inline-input-container">
+ <span v-for="(item, index) in moneyRules" :key="index">
+ <div>
+ <span>{{ item.scoreCondition }}</span>
+ <el-tooltip class="item" effect="dark" :content="item.description" placement="top">
+ <span style="margin-left: 20px;">{{ item.description }}</span>
+ </el-tooltip>
+ </div>
+ </span>
+ </div>
+ </el-collapse-item>
+ <el-form-item label="鍚堝悓闄勪欢" prop="attachment" class="top">
+ <file-upload v-model="form.attachment"/>
</el-form-item>
- <el-dialog :visible.sync="dialogVisible" append-to-body="false">
- <img width="100%" :src="dialogImageUrl" alt="">
- </el-dialog>
+ <el-link class="top" v-for="item in contractInfo.attachment != null ? contractInfo.attachment.split(',') : contractInfo.attachment" :underline="false" :key="item" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
<div style="text-align: right; margin-top: 10px;">
- <el-button type="primary" @click="submitForm1(props.row)">鎻愪氦</el-button>
+ <el-button type="primary" @click="submitForm">鎻愪氦</el-button>
</div>
</el-collapse>
</el-form>
</el-dialog>
<!-- 鍚堝悓瀵煎叆瀵硅瘽妗� -->
- <el-dialog :title="upload.title" :visible.sync="upload.open" width="550px" append-to-body>
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="1000px" append-to-body>
<el-form ref="form" :model="upload" :rules="rules" label-width="80px">
- <el-form-item label="鍚堝悓鍚嶇О" prop="name">
- <el-input v-model="upload.name" />
- </el-form-item>
- <el-form-item label="鍏徃鍚嶇О" prop="unitId">
- <el-select v-model="upload.unitId" placeholder="璇烽�夋嫨">
- <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍚堝悓鏃堕棿" prop="timezone">
- <el-date-picker :disabled="title === '淇敼鍚堝悓鏃堕棿'" @change="dateChange" v-model="upload.timezone"
- value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" align="right" unlink-panels range-separator="鑷�"
- start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
- :action="upload.url + '?unitId=' + upload.unitId + '&startTime=' + upload.startTime + '&endTime=' + upload.endTime + '&name=' + upload.name"
- :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
- :auto-upload="false" drag style="text-align: center;">
- <i class="el-icon-upload"></i>
- <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
- <div class="el-upload__tip text-center" slot="tip">
- <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
- <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
- @click="importTemplate">涓嬭浇妯℃澘</el-link>
+ <el-divider content-position="left">鍚堝悓淇℃伅</el-divider>
+ <div class="row-warp">
+ <div class="row">
+ <div class="row-left">
+ <div class="block">
+ <el-form-item label="鍚堝悓鍚嶇О" prop="name">
+ <el-input v-model="upload.name" />
+ </el-form-item>
+ <el-form-item label="鍏徃鍚嶇О" prop="unitId">
+ <el-select v-model="upload.unitId" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍚堝悓鏃堕棿" prop="timezone">
+ <el-date-picker :disabled="title === '淇敼鍚堝悓鏃堕棿'" @change="dateChange" v-model="upload.timezone"
+ value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" align="right" unlink-panels range-separator="鑷�"
+ start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="row-right" style="margin-left: 80px;">
+ <div class="margin-5">
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+ :action="upload.url"
+ :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
+ :data="upload"
+ :auto-upload="false" drag style="text-align: center;">
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+ <div class="el-upload__tip text-center" slot="tip">
+ <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
+ <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+ @click="importTemplate">涓嬭浇妯℃澘</el-link>
+ </div>
+ </el-upload>
+ </div>
+ </div>
+ </div>
</div>
- </el-upload>
+ <el-divider content-position="left">鑰冩牳缁撴灉搴旂敤瑙勫垯</el-divider>
+ <div class="row-warp">
+ <div class="row" v-for="(item, index) in upload.ruleList" :key="index">
+ <div class="row-left" style="flex: 0.7;">
+ <div class="block">
+ <el-form-item label="鑰冩牳鏉′欢" prop="ruleList">
+ <el-input v-model="item.scoreCondition" style="width: 250px;" />
+ </el-form-item>
+ </div>
+ </div>
+ <div class="row-right">
+ <div class="margin-5">
+ <el-form-item label="瑙勫垯鎻忚堪" prop="ruleList">
+ <el-input type="textarea" v-model="item.description" style="width: 300px;" />
+ <el-button style="margin-left: 50px;" type="danger" icon="el-icon-delete" circle @click="deleteRule(index)"></el-button>
+ </el-form-item>
+ </div>
+ </div>
+ </div>
+ </div>
+ <el-button style="margin-left: 50px;" type="success" icon="el-icon-plus" circle @click="addRule"></el-button>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -95,16 +139,21 @@
</template>
<script>
-import { listContract, getContract } from "@/api/platform/contract";
+import { listContract, getContract, updateContract } from "@/api/platform/contract";
import { getRuleListByContractId } from "../../../api/platform/calculate-rule";
+import { getMoneyRulesByContractId } from "../../../api/platform/calculate-money-rule";
import { unitSelect } from "../../../api/platform/unit";
import { deptSelect } from "../../../api/system/dept";
import { getToken } from "@/utils/auth";
+import { ImagePreview } from "@/components/ImagePreview";
export default {
name: "Contract",
+ comments: { ImagePreview },
data() {
return {
+ loading: false,
+ contractInfo: {},
// 鍚堝悓瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鍚堝悓瀵煎叆锛�
@@ -117,6 +166,7 @@
headers: { Authorization: "Bearer " + getToken() },
// 涓婁紶鐨勫湴鍧�
url: process.env.VUE_APP_BASE_API + "/system/contract/importData",
+ ruleList: [],
unitId: '',
startTime: '',
endTime: ''
@@ -155,6 +205,7 @@
// 鏄惁鏄剧ず璇︽儏
detail: false,
ruleData: [],
+ moneyRules: [],
// 琛ㄥ崟鍙傛暟
form: {
},
@@ -168,6 +219,9 @@
],
timezone: [
{ type: "array", required: true, message: "鍚堝悓鏃堕棿涓嶈兘涓虹┖", trigger: "change" }
+ ],
+ ruleList: [
+ { type: "array", required: true, message: "鑰冩牳缁撴灉搴旂敤瑙勫垯涓嶈兘涓虹┖", trigger: "submit" }
]
}
};
@@ -178,6 +232,25 @@
this.selectDept();
},
methods: {
+ addRule() {
+ this.upload.ruleList.push({
+ scoreCondition: '',
+ description: ''
+ });
+ },
+ deleteRule(index) {
+ this.upload.ruleList.splice(index, 1);
+ },
+ submitForm() {
+ updateContract(this.form).then(response => {
+ this.detail = false;
+ if (response.code != 200) {
+ this.$message.error("鎿嶄綔澶辫触");
+ } else {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ }
+ });
+ },
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
this.upload.title = "鍚堝悓瀵煎叆";
@@ -197,7 +270,11 @@
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
- this.$message.success("鎿嶄綔鎴愬姛");
+ if (response.code != 200) {
+ this.$message.warning(response.msg);
+ } else {
+ this.$message.success(response.msg);
+ }
this.getList();
},
// 鎻愪氦涓婁紶鏂囦欢
@@ -205,7 +282,13 @@
let that = this;
this.$refs["form"].validate(valid => {
if (valid) {
- that.$refs.upload.submit();
+ that.upload.ruleList = JSON.stringify(this.upload.ruleList);
+ that.loading = true;
+ that.upload.open = false;
+ that.$refs.upload.submit().then(() => {
+ that.loading = false;
+ that.reset();
+ });
}
})
},
@@ -246,6 +329,11 @@
getRuleList(item) {
getRuleListByContractId(item.id).then(response => {
this.ruleData = response.data;
+ this.form.id = item.id;
+ this.contractInfo = item;
+ });
+ getMoneyRulesByContractId(item.id).then(response => {
+ this.moneyRules = response.data;
});
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -270,6 +358,20 @@
this.title = "淇敼鍚堝悓";
});
},
+ /** 涓嬭浇鎸夐挳鎿嶄綔 */
+ handleDownload (data) {
+ this.$download.resource(data);
+ },
+ reset () {
+ this.upload = {
+ open: false,
+ name: undefined,
+ unitId: undefined,
+ timezone: undefined,
+ ruleList: []
+ };
+ this.resetForm("form");
+ }
}
};
</script>
@@ -321,4 +423,44 @@
.clearfix:after {
clear: both
}
+
+.top {
+ display: block;
+ margin-top: 10px;
+}
+</style>
+<style scoped>
+.margin-5 {
+ margin-left: 5px;
+}
+.row-warp {
+ display: flex;
+ flex-direction: column;
+}
+.row {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: center;
+ margin: 5px 0;
+}
+.row-left {
+ flex: 1;
+ display: flex;
+ flex-direction: row;
+}
+.row-right {
+ flex: 1;
+ display: flex;
+ flex-direction: row;
+}
+</style>
+<style>
+.el-cascader-node {
+ max-width: 300px;
+}
+.el-divider--horizontal {
+ margin-top: 50px;
+ margin-bottom: 50px;
+}
</style>
--
Gitblit v1.8.0