From 39e843701bf637cd653bfdeb0d88ef4cacbc8152 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 07 四月 2024 18:00:21 +0800
Subject: [PATCH] 考核规则

---
 src/views/system/calculate/order/index.vue  |   31 +---
 src/api/platform/check-rule.js              |    2 
 src/views/system/rule/province/index.vue    |   38 ----
 src/views/system/contract/index.vue         |   23 --
 src/api/platform/check-template.js          |    4 
 src/views/system/calculate/record/index.vue |   10 
 src/api/system/dept.js                      |    9 +
 src/views/system/calculate/report/index.vue |    2 
 src/views/system/rule/city/index.vue        |  195 +++++++++++++--------------
 src/views/system/template/city/index.vue    |   93 ++++---------
 10 files changed, 155 insertions(+), 252 deletions(-)

diff --git a/src/api/platform/check-rule.js b/src/api/platform/check-rule.js
index 51d5326..6deb1ef 100644
--- a/src/api/platform/check-rule.js
+++ b/src/api/platform/check-rule.js
@@ -4,7 +4,7 @@
 export function listCheckRule(query) {
   return request({
     url: '/check/rule/list',
-    method: 'get',
+    method: 'post',
     data: query
   })
 }
diff --git a/src/api/platform/check-template.js b/src/api/platform/check-template.js
index c937b15..620fd8f 100644
--- a/src/api/platform/check-template.js
+++ b/src/api/platform/check-template.js
@@ -43,10 +43,10 @@
   })
 }
 
-// 鑾峰彇杩愮淮鍗曚綅涓嬫媺鍒楄〃
+// 鑾峰彇涓嬫媺鍒楄〃
 export function templateSelect() {
   return request({
-    url: '/check/template/list',
+    url: '/check/template/pullList',
     method: 'get'
   })
 }
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index b6c0f1d..277263c 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -51,10 +51,17 @@
   })
 }
 
-// 鑾峰彇杩愮淮鍗曚綅涓嬫媺鍒楄〃
+// 鑾峰彇閮ㄩ棬涓嬫媺鍒楄〃
 export function deptSelect() {
   return request({
     url: '/system/dept/all',
     method: 'get'
   })
 }
+// 鑾峰彇鍖哄煙涓嬫媺鍒楄〃
+export function areaSelect() {
+  return request({
+    url: '/system/dept/pullList',
+    method: 'get'
+  })
+}
diff --git a/src/views/system/calculate/order/index.vue b/src/views/system/calculate/order/index.vue
index 155ebdc..c944342 100644
--- a/src/views/system/calculate/order/index.vue
+++ b/src/views/system/calculate/order/index.vue
@@ -22,18 +22,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange">
-        <el-select v-model="queryParams.examineRange" clearable  @clear="handleQuery" placeholder="鑰冩牳鑼冨洿">
-          <el-option
-            label="甯傚眬鑰冩牳"
-            value="2">
-          </el-option>
-          <el-option
-            label="鍒嗗眬鑰冩牳"
-            value="1">
-          </el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="鑰冩牳鏃堕棿">
         <el-date-picker
           v-model="daterangeCheckTime"
@@ -86,10 +74,10 @@
 
     <el-card class="box-card" v-for="(item) in checkResultList">
       <div slot="header" class="clearfix">
-        <span>{{ item.checkUnitName }}</span>
+        <span>{{ checkUnitName }}</span>
         <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">璇︽儏</el-button>
       </div>
-      <div class="text item">鑰冩牳<span class="time">{{ item.examineName }}</span></div>
+      <div class="text item">鑰冩牳<span class="time">{{ examineName }}</span></div>
       <div class="text item">鑰冩牳棰戠巼<span class="time">{{ "瀛e害鑰冩牳" }}</span></div>
       <div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.checkScore }}</span></div>
       <div class="text item">鑰冩牳鏃堕棿
@@ -155,21 +143,14 @@
             <i class="el-icon-user"></i>
             鑰冩牳瀵硅薄
           </template>
-          {{detail.checkUnitName}}
+          {{checkUnitName}}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
             <i class="el-icon-s-management"></i>
             鑰冩牳鍚嶇О
           </template>
-          {{detail.examineName}}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            <i class="el-icon-full-screen"></i>
-            鑰冩牳鑼冨洿
-          </template>
-          <el-tag size="small">{{detail.examineRange === 1 ? '鍒嗗眬鑰冩牳' : '甯傚眬鑰冩牳'}}</el-tag>
+          {{examineName}}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
@@ -231,6 +212,8 @@
       detail:{
 
       },
+      checkUnitName: '鎴愰兘x杩愮淮',
+      examineName: '鎴愰兘x杩愮淮鑰冩牳',
       tableData: [{
         name: '瑙嗛骞冲潎鍦ㄧ嚎鐜�',
         content: '97%',
@@ -313,7 +296,7 @@
         this.queryParams["end"] = this.daterangeCheckTime[1];
       }
       listCheckResult(this.queryParams).then(response => {
-        this.checkResultList = response.data;
+        this.checkResultList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
diff --git a/src/views/system/calculate/record/index.vue b/src/views/system/calculate/record/index.vue
index bde3514..e132a74 100644
--- a/src/views/system/calculate/record/index.vue
+++ b/src/views/system/calculate/record/index.vue
@@ -90,7 +90,7 @@
           <div v-if="scope.row.unitId == 2">鎴愰兘x杩愮淮</div>
         </template>
       </el-table-column>
-      <el-table-column label="鎬绘湇鍔¤垂" align="center" prop="totalMount" />
+      <el-table-column label="鎬绘湇鍔¤垂" align="center" prop="totalAmount" />
       <el-table-column label="鎵e噺鏈嶅姟璐�" align="center" prop="deductAmount" />
       <el-table-column label="鑰冩牳鍒嗘暟" align="center" prop="score" />
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -144,8 +144,8 @@
             placeholder="璇烽�夋嫨鏍哥畻璁板綍鏃ユ湡">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="鎬绘湇鍔¤垂" prop="totalMount">
-          <el-input v-model="form.totalMount" placeholder="璇疯緭鍏ユ�绘湇鍔¤垂" />
+        <el-form-item label="鎬绘湇鍔¤垂" prop="totalAmount">
+          <el-input v-model="form.totalAmount" placeholder="璇疯緭鍏ユ�绘湇鍔¤垂" />
         </el-form-item>
         <el-form-item label="鎵e噺鏈嶅姟璐�" prop="deductAmount">
           <el-input v-model="form.deductAmount" placeholder="璇疯緭鍏ユ墸鍑忔湇鍔¤垂" />
@@ -194,7 +194,7 @@
         date: null,
         ruleId: null,
         unitId: null,
-        totalMount: null,
+        totalAmount: null,
         deductAmount: null,
         score: null
       },
@@ -233,7 +233,7 @@
         date: null,
         ruleId: null,
         unitId: null,
-        totalMount: null,
+        totalAmount: null,
         deductAmount: null,
         score: null
       };
diff --git a/src/views/system/calculate/report/index.vue b/src/views/system/calculate/report/index.vue
index 6ed15a4..25100df 100644
--- a/src/views/system/calculate/report/index.vue
+++ b/src/views/system/calculate/report/index.vue
@@ -77,8 +77,6 @@
       <el-button size="small" round style="float: right;margin-bottom: 18px;" @click="handlePublish(item)" v-show="item.publish == 1"  v-hasPermi="['result:contract:publish']">宸插彂甯�</el-button>
     </el-card>
 
-
-
     <pagination
       v-show="total>0"
       :total="total"
diff --git a/src/views/system/contract/index.vue b/src/views/system/contract/index.vue
index 27ccd9f..86713ae 100644
--- a/src/views/system/contract/index.vue
+++ b/src/views/system/contract/index.vue
@@ -27,26 +27,15 @@
           @click="handleAdd"
         >鏂板</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
-          type="success"
+          type="warning"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-top"
           size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >淇敼</el-button>
-      </el-col> -->
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >鍒犻櫎</el-button>
-      </el-col> -->
+          @click="handleImportPoint"
+        >瀵煎叆</el-button>
+      </el-col>
     </el-row>
 
 
diff --git a/src/views/system/rule/city/index.vue b/src/views/system/rule/city/index.vue
index a12a111..9bf4d02 100644
--- a/src/views/system/rule/city/index.vue
+++ b/src/views/system/rule/city/index.vue
@@ -11,16 +11,25 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
-        <el-date-picker
-          v-model="daterangeCreateTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡"
-        />
+      <el-form-item label="鑰冩牳妯℃澘" prop="templateId">
+        <el-select v-model="queryParams.templateId" placeholder="鑰冩牳妯℃澘" clearable>
+          <el-option
+            v-for="item in templateList"
+            :key="item.id"
+            :label="item.templateName"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="瑙勫垯绫诲瀷" prop="ruleCategory">
+        <el-select v-model="queryParams.ruleCategory" placeholder="瑙勫垯绫诲瀷" clearable>
+          <el-option
+            v-for="dict in dict.type.platform_rule_category"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -75,12 +84,14 @@
           <dict-tag :options="dict.type.platform_rule_category" :value="scope.row.ruleCategory"/>
         </template>
       </el-table-column>
-      <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
+      <el-table-column label="鑰冩牳妯℃澘" align="center" prop="templateName" />
+
       <el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditState">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.platform_audit_state" :value="scope.row.auditState"/>
         </template>
       </el-table-column>
+      <el-table-column label="瀹℃牳璇存槑" align="center" prop="auditDescription"/>
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -118,60 +129,43 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="瑙勫垯鍚嶇О" prop="ruleName">
-          <el-input v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
+          <el-input v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�"/>
         </el-form-item>
         <el-form-item label="鑰冩牳绫诲瀷" prop="examineCategory">
-          <el-radio-group v-model="form.examineCategory" placeholder="鑰冩牳绫诲瀷">
-            <el-radio
-              v-for="dict in dict.type.plateform_examine_category"
+          <el-select v-model="form.examineCategory" placeholder="鑰冩牳绫诲瀷" disabled>
+            <el-option
+              v-for="dict in dict.type.platform_examine_category"
               :key="dict.value"
-              :value="dict.value">
-            {{dict.label}}</el-radio>
-          </el-radio-group>
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="瑙勫垯绫诲瀷" prop="category">
-          <el-radio-group v-model="form.examineCategory" placeholder="鑰冩牳绫诲瀷">
-            <el-radio
-              v-for="dict in dict.type.plateform_rule_category"
+        <el-form-item label="瑙勫垯绫诲瀷" prop="ruleCategory">
+          <el-select v-model="form.ruleCategory" placeholder="鑰冩牳绫诲瀷" disabled>
+            <el-option
+              v-for="dict in dict.type.platform_rule_category"
               :key="dict.value"
-              :value="dict.value">
-              {{dict.label}}</el-radio>
-          </el-radio-group>
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="瑙勫垯鎻忚堪" prop="ruleDescription">
-          <el-input v-model="form.ruleDetail" type="textarea" show-word-limit maxlength="150" placeholder="璇疯緭鍏ヨ鍒欐弿杩�"/>
+          <el-input v-model="form.ruleDescription" type="textarea" placeholder="璇疯緭鍏ヨ鍒欏悕绉�"/>
         </el-form-item>
-        <el-form-item label="鍙傛暟閰嶇疆" prop="ruleDetail">
-          <div class="row-warp">
-            <div class="row">
-              <div class="row-left">鍙傛暟鍚�</div>
-              <div class="row-right">鏉′欢</div>
-            </div>
-            <div class="row">
-              <div class="row-left">澶╃綉瑙嗛鐐逛綅鏁�</div>
-              <div class="row-right">
-                <div>涓嶅皯浜�</div>
-                <div>
-                  <el-input class="input-w" type="number" v-model="form.videoPointNum"/>{{" %"}}
-                </div>
-              </div>
-            </div>
-            <div class="row">
-              <div class="row-left">杞﹁締鍗″彛鐐逛綅鏁�</div>
-              <div class="row-right">
-                <div>涓嶅皯浜�</div>
-                <div><el-input class="input-w" type="number" v-model="form.vehicleCheckpointNum"/></div>{{" %"}}
-              </div>
-            </div>
-            <div class="row">
-              <div class="row-left">浜鸿劯鍗″彛鐐逛綅鏁�</div>
-              <div class="row-right">
-                <div>涓嶅皯浜�</div>
-                <div>
-                  <el-input class="input-w" type="number" v-model="form.faceChceckpointNum" /></div>{{" %"}}
-                </div>
-            </div>
-          </div>
+        <el-form-item label="鑰冩牳妯℃澘" prop="templateId">
+          <el-select v-model="form.templateId" placeholder="璇烽�夋嫨">
+            <el-option
+              v-for="item in templateList"
+              :key="item.id"
+              :label="item.templateName"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鏉冮噸" prop="weight">
+          <el-input type="number" v-model="form.weight" placeholder="璇疯緭鍏ユ潈閲�"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -188,58 +182,42 @@
         <el-input v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" disabled/>
       </el-form-item>
       <el-form-item label="鑰冩牳绫诲瀷" prop="examineCategory">
-        <el-radio-group v-model="form.examineCategory" placeholder="鑰冩牳绫诲瀷">
-          <el-radio
-            v-for="dict in dict.type.plateform_examine_category"
+        <el-select v-model="form.examineCategory" placeholder="鑰冩牳绫诲瀷" disabled>
+          <el-option
+            v-for="dict in dict.type.platform_examine_category"
             :key="dict.value"
-            :value="dict.value">
-            {{dict.label}}</el-radio>
-        </el-radio-group>
+            :label="dict.label"
+            :value="parseInt(dict.value)"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="瑙勫垯绫诲瀷" prop="category">
-        <el-radio-group v-model="form.examineCategory" placeholder="鑰冩牳绫诲瀷">
-          <el-radio
-            v-for="dict in dict.type.plateform_rule_category"
+      <el-form-item label="瑙勫垯绫诲瀷" prop="ruleCategory">
+        <el-select v-model="form.ruleCategory" placeholder="鑰冩牳绫诲瀷" disabled>
+          <el-option
+            v-for="dict in dict.type.platform_rule_category"
             :key="dict.value"
-            :value="dict.value">
-            {{dict.label}}</el-radio>
-        </el-radio-group>
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="瑙勫垯鎻忚堪" prop="ruleDescription">
-        <el-input v-model="form.ruleDetail" type="textarea" show-word-limit maxlength="150" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" disabled/>
+        <el-input v-model="form.ruleDescription" type="textarea" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" disabled/>
       </el-form-item>
-      <el-form-item label="鍙傛暟閰嶇疆" prop="ruleDetail" disabled>
-        <div class="row-warp">
-          <div class="row">
-            <div class="row-left">鍙傛暟鍚�</div>
-            <div class="row-right">鏉′欢</div>
-          </div>
-          <div class="row">
-            <div class="row-left">澶╃綉瑙嗛鐐逛綅鏁�</div>
-            <div class="row-right">
-              <div>涓嶅皯浜�</div>
-              <div>
-                <el-input class="input-w" type="number" v-model="form.videoPointNum" disabled/>
-              </div>
-            </div>
-          </div>
-          <div class="row">
-            <div class="row-left">杞﹁締鍗″彛鐐逛綅鏁�</div>
-            <div class="row-right">
-              <div>涓嶅皯浜�</div>
-              <div><el-input class="input-w" type="number" v-model="form.vehicleCheckpointNum" disabled/></div>
-            </div>
-          </div>
-          <div class="row">
-            <div class="row-left">浜鸿劯鍗″彛鐐逛綅鏁�</div>
-            <div class="row-right">
-              <div>涓嶅皯浜�</div>
-              <div>
-                <el-input class="input-w" type="number" v-model="form.faceChceckpointNum" disabled/></div>
-            </div>
-          </div>
-        </div>
+      <el-form-item label="鑰冩牳妯℃澘" prop="templateId">
+        <el-select v-model="form.templateId" placeholder="璇烽�夋嫨" disabled>
+          <el-option
+            v-for="item in templateList"
+            :key="item.id"
+            :label="item.templateName"
+            :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
+      <el-form-item label="鏉冮噸" prop="weight">
+        <el-input type="number" v-model="form.weight" placeholder="璇疯緭鍏ユ潈閲�" disabled/>
+      </el-form-item>
+
       <el-form-item label="瀹℃牳缁撴灉" prop="auditState" >
         <el-radio-group v-model="form.auditState">
         <el-radio :label="1">閫氳繃</el-radio>
@@ -261,7 +239,7 @@
 
 <script>
 import { listCheckRule, getCheckRule, delCheckRule, addCheckRule, updateCheckRule } from "@/api/platform/check-rule";
-
+import { templateSelect} from   "@/api/platform/check-template"
 export default {
   name: "CheckRule",
   dicts: ['platform_audit_state','platform_examine_category','platform_rule_category'],
@@ -279,6 +257,7 @@
       showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
+      templateList:[],
       // 鑰冩牳瑙勫垯琛ㄦ牸鏁版嵁
       checkRuleList: [],
       daterangeCreateTime: [],
@@ -294,6 +273,9 @@
         pageSize: 10,
         ruleName: null,
         createTime: null,
+        ruleCategory: null,
+        templateId: null,
+        examineCategory: 1,
       },
       // 琛ㄥ崟鍙傛暟
       form: {},
@@ -307,8 +289,15 @@
   },
   created() {
     this.getList();
+    this.getTemplateSelect();
   },
   methods: {
+    /** 鑰冩牳妯℃澘涓嬫媺鍒楄〃 */
+    getTemplateSelect() {
+      templateSelect().then((res) => {
+        this.templateList = res.data;
+      })
+    },
     /** 鏌ヨ鑰冩牳瑙勫垯鍒楄〃 */
     getList() {
       this.loading = true;
diff --git a/src/views/system/rule/province/index.vue b/src/views/system/rule/province/index.vue
index c6200ca..66d64a8 100644
--- a/src/views/system/rule/province/index.vue
+++ b/src/views/system/rule/province/index.vue
@@ -76,7 +76,7 @@
         </template>
       </el-table-column>
       <el-table-column label="瑙勫垯鎻忚堪" align="center" prop="ruleDetail" />
-      <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
+      <el-table-column label="鑰冩牳妯℃澘" align="center" prop="ruleDetail" />
       <el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditState">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.platform_audit_state" :value="scope.row.auditState"/>
@@ -213,38 +213,7 @@
       <el-form-item label="瑙勫垯鎻忚堪" prop="ruleDetail">
         <el-input v-model="form.ruleDetail" type="textarea" show-word-limit maxlength="150" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" disabled/>
       </el-form-item>
-      <el-form-item label="鍙傛暟閰嶇疆" prop="ruleDetail" disabled>
-        <div class="row-warp">
-          <div class="row">
-            <div class="row-left">鍙傛暟鍚�</div>
-            <div class="row-right">鏉′欢</div>
-          </div>
-          <div class="row">
-            <div class="row-left">澶╃綉瑙嗛鐐逛綅鏁�</div>
-            <div class="row-right">
-              <div>涓嶅皯浜�</div>
-              <div>
-                <el-input class="input-w" type="number" v-model="form.videoPointNum" disabled/>
-              </div>
-            </div>
-          </div>
-          <div class="row">
-            <div class="row-left">杞﹁締鍗″彛鐐逛綅鏁�</div>
-            <div class="row-right">
-              <div>涓嶅皯浜�</div>
-              <div><el-input class="input-w" type="number" v-model="form.vehicleCheckpointNum" disabled/></div>
-            </div>
-          </div>
-          <div class="row">
-            <div class="row-left">浜鸿劯鍗″彛鐐逛綅鏁�</div>
-            <div class="row-right">
-              <div>涓嶅皯浜�</div>
-              <div>
-                <el-input class="input-w" type="number" v-model="form.faceChceckpointNum" disabled/></div>
-            </div>
-          </div>
-        </div>
-      </el-form-item>
+      <el-table-column label="鑰冩牳妯℃澘" align="center" prop="templateId" />
       <el-form-item label="瀹℃牳缁撴灉" prop="auditState" >
         <el-radio-group v-model="form.auditState">
         <el-radio :label="1">閫氳繃</el-radio>
@@ -299,6 +268,7 @@
         pageSize: 10,
         ruleName: null,
         createTime: null,
+        examineCategory: 0,
       },
       // 琛ㄥ崟鍙傛暟
       form: {},
@@ -322,7 +292,7 @@
         this.queryParams["end"] = this.daterangeCreateTime[1];
       }
       listCheckRule(this.queryParams).then(response => {
-        this.checkRuleList = response.data;
+        this.checkRuleList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
diff --git a/src/views/system/template/city/index.vue b/src/views/system/template/city/index.vue
index 4b0cce7..c38e5ef 100644
--- a/src/views/system/template/city/index.vue
+++ b/src/views/system/template/city/index.vue
@@ -79,16 +79,14 @@
     <el-table v-loading="loading" :data="checkTemplateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="妯℃澘鍚嶇О" align="center" prop="templateName" width="220px"/>
-      <el-table-column label="鑰冩牳绫诲瀷" align="center" prop="examineCategory" />
-      <el-table-column label="鑰冩牳瀵硅薄" align="center" prop="unitId" width="400px" >
+      <el-table-column label="鑰冩牳绫诲瀷" align="center" prop="examineCategory" >
         <template slot-scope="scope">
-          <div v-if="scope.row.unitId === 2">鎴愰兘x杩愮淮</div>
-          <div v-else-if="scope.row.unitId === 3">瀵岄『鍘�,鑽e幙,楂樻柊鍖�,鑷祦浜曞尯,璐′簳鍖�,澶у畨鍖�,娌挎哗鍖�</div>
+          <dict-tag :options="dict.type.platform_examine_category" :value="scope.row.examineCategory"/>
         </template>
       </el-table-column>
+      <el-table-column label="鑰冩牳瀵硅薄" align="center" prop="deptId" width="400px" />
       <el-table-column label="璋冩暣绯绘暟" align="center" prop="adjustCoefficient" />
       <el-table-column label="璋冩暣绯绘暟璁$畻鏂瑰紡" align="center" prop="adjustWay"/>
-      <el-table-column label="鐘舵��" align="center" prop="status" />
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -122,22 +120,24 @@
           <el-input v-model="form.templateName" placeholder="璇疯緭鍏ユā鏉垮悕绉�" />
         </el-form-item>
         <el-form-item label="鑰冩牳绫诲瀷" prop="examineCategory">
-          <el-select v-model="form.examineCategory"  placeholder="璇烽�夋嫨鑰冩牳绫诲瀷">
-            <el-option label="鐪佸巺鑰冩牳" value="鐪佸巺鑰冩牳"/>
-            <el-option label="鍖哄幙鑰冩牳" value="鍖哄幙鑰冩牳"/>
-            <el-option label="杩愮淮鑰冩牳" value="鍏徃鑰冩牳"/>
+          <el-select v-model="form.examineCategory" placeholder="鑰冩牳绫诲瀷">
+            <el-option
+              v-for="dict in dict.type.platform_examine_category"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            />
           </el-select>
         </el-form-item>
-        <el-form-item label="鑰冩牳瀵硅薄" prop="unitName">
-          <div class="block">
-            <span class="demonstration"></span>
-            <el-cascader
-              v-model="value"
-              :options="options"
-              :props = "props"
-              @change="handleChange"></el-cascader>
-          </div>
-
+        <el-form-item label="鑰冩牳瀵硅薄" prop="deptId">
+          <el-select v-model="form.deptId" multiple placeholder="璇烽�夋嫨">
+            <el-option
+              v-for="item in areaList"
+              :key="item.id"
+              :label="item.value"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="鑰冩牳瑙勫垯" prop="tempRuleFormList">
           <div class="row-warp">
@@ -201,52 +201,16 @@
 <script>
 import { listCheckTemplate, getCheckTemplate, delCheckTemplate, addCheckTemplate, updateCheckTemplate } from "@/api/platform/check-template";
 // import { ruleSelect } from '@/api/platform/check-rule'
-import { unitSelect } from '@/api/platform/unit'
+ import { areaSelect } from '@/api/system/dept'
 
 export default {
   name: "CheckTemplate",
+  dicts: ['platform_audit_state','platform_examine_category','platform_rule_category'],
   data() {
     return {
       props: { multiple: true },
       value: [],
-      options: [{
-        value: 'city',
-        label: '鍖哄幙',
-        children: [{
-          value: 'fushun',
-          label: '瀵岄『鍘�',
-        }, {
-          value: 'rong',
-          label: '鑽e幙',
-        },{
-          value: 'gaoxin',
-          label: '楂樻柊鍖�',
-        },{
-          value: 'ziliujing',
-          label: '鑷祦浜曞尯',
-        },{
-          value: 'gongjing',
-          label: '璐′簳鍖�',
-        },{
-          value: 'daan',
-          label: '澶у畨鍖�',
-        },{
-          value: 'yantan',
-          label: '娌挎哗鍖�',
-        },
-        ]
-      }, {
-        value: 'company',
-        label: '鍏徃',
-        children: [{
-          value: 'yunwei',
-          label: '鎴愰兘x杩愮淮',
-        }, {
-          value: 'yunwei2',
-          label: '鑷础x杩愮淮',
-        }, ]
-      },
-      ],
+      areaList:[],
       ruleList: [],
       unitList: [],
       // 涓存椂瑙勫垯琛ㄥ崟
@@ -300,8 +264,11 @@
   },
   created() {
     this.getList();
+    this.areaSelect();
     this.selectCheckRule();
-    this.selectUnit();
+    if (typeof this.form.deptId === 'string' && this.form.deptId.length > 0) {
+      this.form.deptId = this.form.deptId.split(',').map(Number); // 鍋囪deptId鐨勫�兼槸浠ラ�楀彿鍒嗛殧鐨勬暟瀛楀瓧绗︿覆
+    }
   },
   methods: {
     handleChange(value) {
@@ -329,9 +296,9 @@
       })
     },
     // 杩愮淮鍏徃涓嬫媺鏁版嵁
-    selectUnit() {
-      unitSelect().then(res => {
-        this.unitList = res.data;
+    areaSelect() {
+      areaSelect().then(res => {
+        this.areaList = res.data;
       })
     },
     /** 鏌ヨ鑰冩牳妯℃澘鍒楄〃 */
@@ -342,7 +309,7 @@
         this.queryParams["end"] = this.daterangeCreateTime[1];
       }
       listCheckTemplate(this.queryParams).then(response => {
-        this.checkTemplateList = response.data;
+        this.checkTemplateList = response.rows;
         this.total = response.total;
         this.loading = false;
       });

--
Gitblit v1.8.0