From 222a623191c8dbd934a45c5da32c6c6883c8587f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 00:18:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/system/contract/contract/index.vue |   53 ++++++++++++++++++++++++++---------------------------
 1 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/views/system/contract/contract/index.vue b/src/views/system/contract/contract/index.vue
index fac3031..1d99865 100644
--- a/src/views/system/contract/contract/index.vue
+++ b/src/views/system/contract/contract/index.vue
@@ -31,24 +31,24 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          v-hasPermi="['system:contract:import']"
+          v-hasPermi="['system:contract:add']"
           @click="handleImport"
           >鏂板</el-button
         >
       </el-col>
     </el-row>
-    <el-row v-loading="loading" :gutter="20">
+    <el-row v-if="contractList && contractList.length > 0" v-loading="loading" :gutter="20">
       <el-col
-        :span="8"
+        :span="6"
         v-for="(item, index) in contractList"
         :key="index"
         style="margin-bottom: 10px"
       >
         <el-card :body-style="{ padding: '0px' }">
-          <ImagePreview
+          <el-image
             style="width: 100%; height: 187px"
             fit="cover"
-            :src="item.attachment"
+            :src="require('../../../../assets/images/ht.jpg')"
             class="image"
           />
           <div style="padding: 14px">
@@ -68,6 +68,7 @@
         </el-card>
       </el-col>
     </el-row>
+    <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
 
     <!-- 鍚堝悓璇︽儏 -->
     <el-dialog
@@ -79,33 +80,22 @@
       <el-form label-position="left" inline class="table-expand">
         <el-collapse v-model="activeNames">
           <el-collapse-item
-            v-for="(item, index) in ruleData"
+            v-for="(name, index) in ruleName"
             :key="index"
-            :title="item.ruleName"
-            :name="index"
+            :title="name"
           >
             <div
               class="inline-input-container"
-              v-for="(item, index) in item.children"
+              v-for="(item, index) in ruleData"
               :key="index"
             >
-              <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.calcFraction + '鍒�'
-                "
-                placement="top"
-              >
-                <span>{{ item.ruleCondition }}<br /></span>
-                <!-- {{ item.deductCategory }} {{ item.calcFraction }}{{ item.calcUnit ? "/" + item.calcUnit : ''  }} -->
+              <el-tooltip :content="
+                item.deductCategory == '鍒嗘暟涔樹互鏁伴噺'
+                ? '鎵�' + item.calcFraction + '鍒�*鏁伴噺 '
+                : item.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�'
+                ? '鎵�' + item.calcFraction + '鍒�/' + item.calcUnit + '灏忔椂'
+                : '鎵�' + item.calcFraction + '鍒�'">
+                <b v-if="item.ruleName === name">{{ item.ruleCondition }}<br /></b>
               </el-tooltip>
             </div>
           </el-collapse-item>
@@ -126,6 +116,7 @@
                   </el-tooltip>
                 </div>
               </span>
+              <el-empty v-if="moneyRules.length == 0" :image-size="100" />
             </div>
           </el-collapse-item>
           <el-form-item label="鍚堝悓闄勪欢" prop="attachment" class="top">
@@ -274,8 +265,8 @@
       </el-form>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
         <el-button @click="upload.open = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
       </div>
     </el-dialog>
   </div>
@@ -352,6 +343,7 @@
       // 鏄惁鏄剧ず璇︽儏
       detail: false,
       ruleData: [],
+      ruleName: [],
       moneyRules: [],
       // 琛ㄥ崟鍙傛暟
       form: {},
@@ -484,6 +476,13 @@
     getRuleList(item) {
       getRuleListByContractId(item.id).then((response) => {
         this.ruleData = response.data;
+        if (this.ruleData) {
+          this.ruleName = this.ruleData.map((item) => {
+            return item.ruleName;
+          });
+          this.ruleName = [...new Set(this.ruleName)];
+          console.log('this.ruleName', this.ruleName);
+        }
         this.form.id = item.id;
         this.contractInfo = item;
       });

--
Gitblit v1.8.0