commit 等级评定调整

ruoyi-ui/src/views/business/fwjggl/djpd/bgdjpdSh/index.vue

@@ -28,7 +28,7 @@
       <el-form-item label="变更申请日期">
         <el-date-picker
           v-model="daterangeSqsj"
-          style="width: 240px"
+          style="width: 215px"
           value-format="yyyyMMdd"
           type="daterange"
           range-separator="-"
@@ -82,11 +82,11 @@
           <dict-tag :options="dict.type.CZ012" :value="scope.row.sqdj"/>
         </template>
       </el-table-column>
-      <el-table-column label="评定等级" align="center" prop="pddj">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ015" :value="scope.row.pddj"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="评定等级" align="center" prop="pddj">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.CZ015" :value="scope.row.pddj"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="变更申请等级" align="center" prop="sqbgdj">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CZ019" :value="scope.row.sqbgdj"/>
@@ -102,7 +102,7 @@
           <dict-tag :options="dict.type.CZ018" :value="scope.row.sqbgzt"/>
         </template>
       </el-table-column>
-      <el-table-column label="来源" align="center" prop="ly" />
+<!--      <el-table-column label="数据来源" align="center" prop="ly" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button

ruoyi-ui/src/views/business/fwjggl/djpd/bgdjpdSq/index.vue

@@ -11,7 +11,7 @@
         <RegionCascaderSelect v-model="xzqh" style="width: 100%" endLevel="2" valueProp="code"></RegionCascaderSelect>
       </el-form-item>
       <el-form-item label="变更申请日期">
-        <el-date-picker v-model="daterangeSqsj" style="width: 240px" value-format="yyyyMMdd" type="daterange"
+        <el-date-picker v-model="daterangeSqsj" style="width: 215px" value-format="yyyyMMdd" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         <!-- 一般情况不需要选择到时间，如果需要使用日期时间范围搜索，修改value-format="yyyyMMddHHmmss"  type="datetimerange"即可 -->
       </el-form-item>
@@ -74,7 +74,7 @@
           <dict-tag :options="dict.type.CZ018" :value="scope.row.sqbgzt" />
         </template>
       </el-table-column>
-      <el-table-column label="来源" align="center" prop="ly" />
+<!--      <el-table-column label="数据来源" align="center" prop="ly" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetails(scope.row)"

ruoyi-ui/src/views/business/fwjggl/djpd/djpdGx/index.vue

@@ -24,10 +24,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="申请状态" prop="sqzt">
+      <el-form-item label="流转状态" prop="sqzt">
         <el-select
           v-model="queryParams.sqzt"
-          placeholder="请选择申请状态"
+          placeholder="请选择流转状态"
           clearable
         >
           <el-option
@@ -49,7 +49,7 @@
       <el-form-item label="申请日期">
         <el-date-picker
           v-model="daterangeSqsj"
-          style="width: 240px"
+          style="width: 215px"
           value-format="yyyyMMdd"
           type="daterange"
           range-separator="-"
@@ -104,6 +104,7 @@
       <el-table-column label="统一社会信用代码" align="center" prop="xydm" />
       <el-table-column label="单位名称" align="center" prop="dwmc" />
       <el-table-column label="所在区划" align="center" prop="szxzqh" />
+	    <el-table-column label="申请人" align="center" prop="sqrxm" />
       <el-table-column label="申请等级" align="center" prop="sqdj">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CZ012" :value="scope.row.sqdj" />
@@ -114,12 +115,12 @@
           <span>{{ special(scope.row.sqsj) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="申请状态" align="center" prop="sqzt">
+      <el-table-column label="流转状态" align="center" prop="sqzt">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt" />
         </template>
       </el-table-column>
-      <el-table-column label="数据来源" align="center" prop="ly" />
+<!--      <el-table-column label="数据来源" align="center" prop="ly" />-->
       <el-table-column
         label="操作"
         align="center"
@@ -270,7 +271,7 @@ export default {
       // 弹出层标题
       title: "",
       // 是否显示弹出层
-      // 申请状态时间范围
+      // 流转状态时间范围
       daterangeSqsj: [],
       xzqh: [],
       open: false,
@@ -315,7 +316,7 @@ export default {
         this.queryParams.params["endSqsj"] = this.daterangeSqsj[1];
       }
       listDjpdGx(this.queryParams).then((response) => {
-        this.djpdGxList = decryptRowData_ECB(response.rows, [], []);
+        this.djpdGxList = decryptRowData_ECB(response.rows, ['sqrxm'], [1]);
         this.total = response.total;
         this.loading = false;
       });

ruoyi-ui/src/views/business/fwjggl/djpd/djpdSl/index.vue

@@ -24,10 +24,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="申请状态" prop="sqzt">
+      <el-form-item label="状态" prop="sqzt">
         <el-select
           v-model="queryParams.sqzt"
-          placeholder="请选择申请状态"
+          placeholder="请选择状态"
           clearable
         >
           <el-option
@@ -49,7 +49,7 @@
       <el-form-item label="申请日期">
         <el-date-picker
           v-model="daterangeSqsj"
-          style="width: 240px"
+          style="width: 215px"
           value-format="yyyyMMdd"
           type="daterange"
           range-separator="-"
@@ -97,30 +97,29 @@
     <el-table v-loading="loading" :data="djpdSqList">
       <el-table-column label="序号" align="center">
         <template slot-scope="scope">
-          {{
-            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-          }}
+          {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
         </template>
       </el-table-column>
       <el-table-column label="统一社会信用代码" align="center" prop="xydm" />
       <el-table-column label="单位名称" align="center" prop="dwmc" />
       <el-table-column label="所在区划" align="center" prop="szxzqh" />
-      <el-table-column label="申请等级" align="center" prop="sqdj">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ012" :value="scope.row.sqdj" />
-        </template>
-      </el-table-column>
+	    <el-table-column label="申请人" align="center" prop="sqrxm" />
+	    <el-table-column label="申请等级" align="center" prop="sqdj">
+		    <template slot-scope="scope">
+			    <dict-tag :options="dict.type.CZ012" :value="scope.row.sqdj" />
+		    </template>
+	    </el-table-column>
       <el-table-column label="申请日期" align="center" prop="sqsj" width="180">
         <template slot-scope="scope">
           <span>{{ special(scope.row.sqsj) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="申请状态" align="center" prop="sqzt">
+      <el-table-column label="状态" align="center" prop="sqzt" width="180">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt" />
         </template>
       </el-table-column>
-      <el-table-column label="数据来源" align="center" prop="ly" />
+<!--      <el-table-column label="数据来源" align="center" prop="ly" />-->
       <el-table-column
         label="操作"
         align="center"
@@ -276,7 +275,7 @@ export default {
       // 是否显示弹出层
       open: false,
       isXQ:false,
-      // 申请状态时间范围
+      // 状态时间范围
       daterangeSqsj: [],
       // 查询参数
       queryParams: {
@@ -396,7 +395,7 @@ export default {
         this.queryParams.params["endSqsj"] = this.daterangeSqsj[1];
       }
       listDjpdSl(this.queryParams).then((response) => {
-        this.djpdSqList = decryptRowData_ECB(response.rows, [], []);
+        this.djpdSqList = decryptRowData_ECB(response.rows, ['sqrxm'], [1,]);
         this.total = response.total;
         this.loading = false;
       });

ruoyi-ui/src/views/business/fwjggl/djpd/djpdSq/index.vue

@@ -17,7 +17,7 @@
         <RegionCascaderSelect v-model="xzqh" style="width: 100%" endLevel="2" valueProp="code"></RegionCascaderSelect>
       </el-form-item>
       <el-form-item label="申请日期">
-        <el-date-picker v-model="daterangeSqsj" style="width: 240px" value-format="yyyyMMdd" type="daterange"
+        <el-date-picker v-model="daterangeSqsj" style="width: 215px" value-format="yyyyMMdd" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         <!-- 一般情况不需要选择到时间，如果需要使用日期时间范围搜索，修改value-format="yyyyMMddHHmmss"  type="datetimerange"即可 -->
       </el-form-item>
@@ -53,11 +53,12 @@
       <el-table-column label="统一社会信用代码" align="center" prop="xydm" />
       <el-table-column label="单位名称" align="center" prop="dwmc" />
       <el-table-column label="所在区划" align="center" prop="szxzqh" />
-      <el-table-column label="申请等级" align="center" prop="sqdj">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ012" :value="scope.row.sqdj" />
-        </template>
-      </el-table-column>
+	    <el-table-column label="申请人" align="center" prop="sqrxm" />
+	    <el-table-column label="申请等级" align="center" prop="sqdj">
+		    <template slot-scope="scope">
+			    <dict-tag :options="dict.type.CZ012" :value="scope.row.sqdj" />
+		    </template>
+	    </el-table-column>
       <el-table-column label="申请日期" align="center" prop="sqsj" width="180">
         <template slot-scope="scope">
           <span>{{ special(scope.row.sqsj) }}</span>
@@ -68,7 +69,7 @@
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt" />
         </template>
       </el-table-column>
-      <el-table-column label="数据来源" align="center" prop="ly" />
+<!--      <el-table-column label="数据来源" align="center" prop="ly" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.sqzt === '21'" size="mini" type="text" icon="el-icon-edit"
@@ -330,13 +331,13 @@ export default {
       }
       if (this.user.userData.userType != '00') {
         listDjpdSqByUser(this.queryParams).then((response) => {
-          this.djpdSqList = decryptRowData_ECB(response.rows, [], [])
+          this.djpdSqList = decryptRowData_ECB(response.rows, ['sqrxm'], [1])
           this.total = response.total
           this.loading = false
         })
       } else {
         listDjpdSq(this.queryParams).then((response) => {
-          this.djpdSqList = decryptRowData_ECB(response.rows, [], [])
+          this.djpdSqList = decryptRowData_ECB(response.rows, ['sqrxm'], [1])
           this.total = response.total
           this.loading = false
         })

ruoyi-ui/src/views/business/fwjggl/djpd/djzsCx/index.vue

@@ -59,7 +59,7 @@
           <span>{{ special(scope.row.zsyxjsrq) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="数据来源" align="center" prop="ly" />
+<!--      <el-table-column label="数据来源" align="center" prop="ly" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="['13', '14', '15', '16'].includes(scope.row.sqzt)" size="mini" type="text"

ruoyi-ui/src/views/business/fwjggl/djpd/djzspb/index.vue

@@ -16,7 +16,7 @@
         <RegionCascaderSelect v-model="xzqh" style="width: 100%" endLevel="2" valueProp="code"></RegionCascaderSelect>
       </el-form-item>
       <el-form-item label="申请日期">
-        <el-date-picker v-model="daterangeSqsj" style="width: 240px" value-format="yyyyMMdd" type="daterange"
+        <el-date-picker v-model="daterangeSqsj" style="width: 215px" value-format="yyyyMMdd" type="daterange"
                         range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         <!-- 一般情况不需要选择到时间，如果需要使用日期时间范围搜索，修改value-format="yyyyMMddHHmmss"  type="datetimerange"即可 -->
       </el-form-item>
@@ -66,7 +66,7 @@
           <span>{{ special(scope.row.sqsj) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="数据来源" align="center" prop="ly" />
+<!--      <el-table-column label="数据来源" align="center" prop="ly" />-->
       <el-table-column label="操作" align="center" width="220" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.sqzt === '12' && !(scope.row.sqdj === '04' && user.userData.dept.ancestors.split(',').length <= 1)" size="mini" type="text" icon="el-icon-edit"
@@ -690,7 +690,7 @@ export default {
               // dictValue: "16"
               // form.pbthzt
               // form.zsthzt
-              
+
               let formData = this.comparisonObject(this.form, this.copyForm)
               if (formData) {
                 let sqzt='';

ruoyi-ui/src/views/business/fwjggl/djpd/gsjgFk/index.vue

@@ -93,12 +93,12 @@
           <span>{{ special(scope.row.sqsj) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="公示类型" align="center" prop="gslx" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ014" :value="scope.row.gslx" />
-        </template>
-      </el-table-column>
-      <el-table-column label="数据来源" align="center" prop="ly" />
+<!--      <el-table-column label="公示类型" align="center" prop="gslx" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.CZ014" :value="scope.row.gslx" />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="数据来源" align="center" prop="ly" />-->
       <el-table-column
         label="操作"
         align="center"
@@ -620,4 +620,4 @@ export default {
     text-align: right;
     background: #f5f5f5;
   }
-</style>
+</style>

ruoyi-ui/src/views/business/fwjggl/djpd/pdjgGx/index.vue

@@ -24,10 +24,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="申请状态" prop="sqzt">
+      <el-form-item label="流转状态" prop="sqzt">
         <el-select
           v-model="queryParams.sqzt"
-          placeholder="请选择申请状态"
+          placeholder="请选择流转状态"
           clearable
         >
           <el-option
@@ -49,7 +49,7 @@
       <el-form-item label="申请日期">
         <el-date-picker
           v-model="daterangeSqsj"
-          style="width: 240px"
+          style="width: 215px"
           value-format="yyyyMMdd"
           type="daterange"
           range-separator="-"
@@ -114,12 +114,12 @@
           <span>{{ special(scope.row.sqsj) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="申请状态" align="center" prop="sqzt">
+      <el-table-column label="流转状态" align="center" prop="sqzt">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt" />
         </template>
       </el-table-column>
-      <el-table-column label="数据来源" align="center" prop="ly" />
+<!--      <el-table-column label="数据来源" align="center" prop="ly" />-->
       <el-table-column
         label="操作"
         align="center"
@@ -267,7 +267,7 @@ export default {
       // 弹出层标题
       title: "",
       // 是否显示弹出层
-      // 申请状态时间范围
+      // 流转状态时间范围
       daterangeSqsj: [],
       open: false,
       opensq: false,

ruoyi-ui/src/views/business/fwjggl/djpd/djpdSh/index.vue

@@ -24,10 +24,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="申请状态" prop="sqzt">
+      <el-form-item label="流转状态" prop="sqzt">
         <el-select
           v-model="queryParams.sqzt"
-          placeholder="请选择申请状态"
+          placeholder="请选择流转状态"
           clearable
         >
           <el-option
@@ -49,7 +49,7 @@
       <el-form-item label="申请日期">
         <el-date-picker
           v-model="daterangeSqsj"
-          style="width: 240px"
+          style="width: 215px"
           value-format="yyyyMMdd"
           type="daterange"
           range-separator="-"
@@ -113,7 +113,7 @@
           <dict-tag :options="dict.type.CZ012" :value="scope.row.sqdj"/>
         </template>
       </el-table-column>
-      <el-table-column label="申请状态" align="center" prop="sqzt">
+      <el-table-column label="流转状态" align="center" prop="sqzt">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt"/>
         </template>
@@ -139,7 +139,7 @@
         fixed="right"
       >
         <template slot-scope="scope">
-          <span v-hasPermi="['business:djpdSh:county']" style="margin-right: 10px">
+          <span v-hasPermi="['business:pdjgSh:county']" style="margin-right: 10px">
           <el-button
             size="mini"
             type="text"
@@ -149,7 +149,7 @@
           >县区审核</el-button
           >
           </span>
-          <span v-hasPermi="['business:djpdSh:city']" style="margin-right: 10px">
+          <span v-hasPermi="['business:pdjgSh:city']" style="margin-right: 10px">
 
           <el-button
             size="mini"
@@ -166,7 +166,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:djpdSh:pro']"
+            v-hasPermi="['business:pdjgSh:pro']"
           >省审核
           </el-button
           >
@@ -175,7 +175,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleXQ(scope.row)"
-            v-hasPermi="['business:djpdSh:query']"
+            v-hasPermi="['business:pdjgSh:query']"
           >详情
           </el-button
           >
@@ -302,7 +302,7 @@ export default {
         // 是否显示弹出层
         open: false,
         isXQ: false,
-        // 申请状态时间范围
+        // 流转状态时间范围
         daterangeSqsj: [],
         // 查询参数
         queryParams: {

ruoyi-ui/src/views/business/fwjggl/djpd/pdzj/index.vue

@@ -96,7 +96,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="pdzjList">
-      <el-table-column label="序号" align="center">
+      <el-table-column label="序号" align="center" width="80">
         <template slot-scope="scope">
           {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}
         </template>
@@ -119,7 +119,8 @@
         </template>
       </el-table-column>
       <el-table-column label="联系电话" align="center" prop="dh"/>
-      <el-table-column label="单位所在区划" align="center" prop="dwqhId"/>
+	    <el-table-column label="单位名称" align="center" prop="dwmc"/>
+	    <el-table-column label="单位所在区划" align="center" prop="dwqhId"/>
       <el-table-column
         label="操作"
         align="center"

ruoyi-ui/src/views/business/fwjggl/djpd/pdzjCq/indexnew.vue

@@ -24,10 +24,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="申请状态" prop="sqzt">
+      <el-form-item label="状态" prop="sqzt">
         <el-select
           v-model="queryParams.sqzt"
-          placeholder="请选择申请状态"
+          placeholder="请选择状态"
           clearable
         >
           <el-option
@@ -49,7 +49,7 @@
       <el-form-item label="申请日期">
         <el-date-picker
           v-model="daterangeSqsj"
-          style="width: 240px"
+          style="width: 215px"
           value-format="yyyyMMdd"
           type="daterange"
           range-separator="-"
@@ -90,14 +90,13 @@
     <el-table v-loading="loading" :data="djpdSqList">
       <el-table-column label="序号" align="center">
         <template slot-scope="scope">
-          {{
-            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-          }}
+          {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
         </template>
       </el-table-column>
       <el-table-column label="统一社会信用代码" align="center" prop="xydm" />
       <el-table-column label="单位名称" align="center" prop="dwmc" />
       <el-table-column label="所在区划" align="center" prop="szxzqh" />
+	    <el-table-column label="申请人" align="center" prop="sqrxm" />
       <el-table-column label="申请等级" align="center" prop="sqdj">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CZ012" :value="scope.row.sqdj" />
@@ -108,12 +107,12 @@
           <span>{{ special(scope.row.sqsj) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="申请状态" align="center" prop="sqzt">
+      <el-table-column label="状态" align="center" prop="sqzt">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt" />
         </template>
       </el-table-column>
-      <el-table-column label="数据来源" align="center" prop="ly" />
+<!--      <el-table-column label="数据来源" align="center" prop="ly" />-->
       <el-table-column
         label="操作"
         align="center"
@@ -495,7 +494,7 @@ export default {
       open: false,
       xqopen: false,
       zjxzqh: null,
-      // 申请状态时间范围
+      // 状态时间范围
       daterangeSqsj: [],
       openAuto: false,
       // 查询参数
@@ -583,7 +582,7 @@ export default {
         this.queryParams.params["endSqsj"] = this.daterangeSqsj[1];
       }
       listDjpdCq(this.queryParams).then((response) => {
-        this.djpdSqList = decryptRowData_ECB(response.rows, [], []);
+        this.djpdSqList = decryptRowData_ECB(response.rows, ['sqrxm'], [1]);
         this.total = response.total;
         this.loading = false;
       });

ruoyi-ui/src/views/business/fwjggl/djpd/pdzj/indexCx.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
-   <pdzjxq :isComponent="false"></pdzjxq>
+   <pdzj :isComponent="false"></pdzj>
   </div>
 </template>
 
 <script>
 
-import pdzjxq from './index'
+import pdzj from '../pdzj'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
   name: "Pdzj",
   components: {
-    pdzjxq: pdzjxq
+    pdzj: pdzj
   },
   data() {
     return {