Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/BusinessBenchmark

src/components/assessment/assessmentApplicationPage.vue

@@ -501,7 +501,7 @@ export default {
                         });
                     }
                 })
-            },100)
+            },300)
         },
         clickDes(row, column, cell, event) {
             if (row.stage === '流程已结束') {

src/components/assessment/monthQuarterYearFrom.vue

@@ -85,41 +85,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- <el-table :data="monthQuarterYearData" style="width: 100%" ref="monthQuarterYearTT" 
-                            v-if="activeName === 'ZDZX' || activeName === 'GLSX'"
-                             :row-class-name="tableRowClassName" :border="true" >
-                                <el-table-column type="index" label="排名" align="center"></el-table-column>
-                                <el-table-column label="考评单位" prop="organizationShortName" width="300">
-                                    <template #default="scope">
-                                        <el-select v-model="scope.row.organizationShortName" placeholder="请选择审核状态">
-                                            <el-option
-                                            v-for="item in organizationData"
-                                            :key="item.organizationId"
-                                            :label="item.organizationShortName"
-                                            :value="item.organizationId">
-                                            </el-option>
-                                        </el-select>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column  v-for="(it, index) in monthQuarterYearHeader" :key="index"
-                                 :label="it.name" align="center">
-                                    <el-table-column v-for="(iv, index) in it.children" :key="index" :label="iv.key"
-                                     align="center" width="150" sortable :sort-method="(a,b)=>sortMethods(a,b,iv.code)">
-                                        <template #default="scope">
-                                            <el-select v-model="scope.row[iv.code]" class="selectSty" placeholder="请选择审核状态" v-if="scope.row['IS_LH_'+iv.code] === '3'">
-                                                <el-option
-                                                v-for="item in statusData"
-                                                :key="item.id"
-                                                :label="item.name"
-                                                :value="item.id">
-                                                </el-option>
-                                            </el-select>
-                                            <span class="inputSty" v-else>{{scope.row[iv.code]}}</span>
-                                            <span class="indicitem" v-if="iv.code === 'operation'" @click="changeDetail(scope.row)">详情</span>
-                                        </template>
-                                    </el-table-column>
-                                </el-table-column>
-                            </el-table> v-else-->
                             <el-table :data="monthQuarterYearData" style="width: 100%" ref="monthQuarterYearTT"
                              :row-class-name="tableRowClassName" :border="true" >
                                 <el-table-column type="index" label="排名" align="center"></el-table-column>
@@ -161,8 +126,8 @@
                                                     :value="item.id">
                                                     </el-option>
                                                 </el-select>
-                                                <span class="inputSty" v-else>{{scope.row[iv.code]}}</span>
                                                 <span class="indicitem" v-if="iv.code === 'operation'" @click="changeDetail(scope.row)">详情</span>
+                                                <span class="inputSty" v-else>{{scope.row[iv.code]}}</span>
                                             </template>
                                         </template>
                                     </el-table-column>
@@ -879,11 +844,6 @@ export default {
                                 .el-table__body-wrapper {
                                     height: 47vh !important;
                                     .el-scrollbar{
-                                        .is-horizontal{
-                                            .el-scrollbar__thumb{
-                                                // width: 100% !important;
-                                            }
-                                        }
                                         .el-table__body{
                                             .error-row {
                                                 --el-table-tr-bg-color: #fdecec;

src/components/evaluationSystem/ruleDetailPage.vue

@@ -26,7 +26,7 @@
                                 <el-button
                                 type="success"
                                 size="mini"
-                                @click="handleEdit"
+                                @click="handleEdit()"
                                 :disabled="changeDateSelect.length === 0 || changeDateSelect.length>1"
                                 >
                                 <img :src="editW" style="margin-right: 10px">
@@ -47,7 +47,8 @@
                         </el-row>
                     </div>
                     <div class="ruleItemTableData">
-                        <el-table :data="ruleDetailData" style="width: 100%" @select="rowClick" @select-all="rowClick">
+                        <el-table :data="ruleDetailData" style="width: 100%"
+                         @select="rowClick" @select-all="rowClick" @row-dblclick="handleEdit">
                             <el-table-column type="selection" label="操作" align="center"></el-table-column>
                             <el-table-column type="index" label="序号" align="center"></el-table-column>
                             <el-table-column label="指标名称" prop="indicatorName" />
@@ -211,11 +212,11 @@ export default {
                 // this.$refs['itemForm'].resetFields()
             })
         },
-        handleEdit() {
+        handleEdit(row) {
             this.dialogVisible = true
             this.isSave = true
             this.title = '修改规则详情'
-            this.evalradio = this.changeDateSelect[0]
+            this.evalradio = row ? row : this.changeDateSelect[0]
             this.itemForm = {
                 indicator: this.evalradio.indicatorId,
                 minScore: this.evalradio.minScore,

src/components/taskCenter/taskApplicationFrom.vue

@@ -662,7 +662,7 @@ export default {
                     that.leaderVisible = false
                     setTimeout(() =>{
                         that.submitIsdoAction('leader')
-                    }, 100)
+                    }, 300)
                 }
             })
         },
@@ -713,7 +713,7 @@ export default {
                 bizKey: that.instanceChild.bizKey
             }
             if (nodeSc) {
-                params.destinaticn = 'EndNoneEvent1'
+                params.destination = 'EndNoneEvent1'
             }
             apiPostIsdoAction(params).then(datas =>{
                 if (datas && datas.data) {

src/components/taskCenter/taskCenterEvlNewFrom.vue

@@ -84,43 +84,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <el-table :data="monthQuarterYearData" style="width: 100%" ref="monthQuarterYearTT" 
-                            v-if="activeName === 'ZDZX' || activeName === 'GLSX'"
-                             :row-class-name="tableRowClassName" :border="true" >
-                                <el-table-column type="index" label="排名" align="center"></el-table-column>
-                                <el-table-column label="考评单位" prop="organizationShortName" width="300">
-                                    <template #default="scope">
-                                        <el-select v-model="scope.row.organizationShortName" placeholder="请选择审核状态">
-                                            <el-option
-                                            v-for="item in organizationData"
-                                            :key="item.organizationId"
-                                            :label="item.organizationShortName"
-                                            :value="item.organizationId">
-                                            </el-option>
-                                        </el-select>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column  v-for="(it, index) in monthQuarterYearHeader" :key="index"
-                                 :label="it.name" align="center">
-                                    <el-table-column v-for="(iv, index) in it.children" :key="index" :label="iv.key"
-                                     align="center" width="150" sortable :sort-method="(a,b)=>sortMethods(a,b,iv.code)">
-                                        <template #default="scope">
-                                            <el-select v-model="scope.row[iv.code]" class="selectSty" placeholder="请选择审核状态" v-if="scope.row['IS_LH_'+iv.code] === '3'">
-                                                <el-option
-                                                v-for="item in statusData"
-                                                :key="item.id"
-                                                :label="item.name"
-                                                :value="item.id">
-                                                </el-option>
-                                            </el-select>
-                                            <span class="inputSty" v-else>{{scope.row[iv.code]}}</span>
-                                            <span class="indicitem" v-if="iv.code === 'operation'" @click="changeDetail(scope.row)">详情</span>
-                                        </template>
-                                    </el-table-column>
-                                </el-table-column>
-                            </el-table>
                             <el-table :data="monthQuarterYearData" style="width: 100%" ref="monthQuarterYearTT"
-                            v-else
                              :row-class-name="tableRowClassName" :border="true" >
                                 <el-table-column type="index" label="排名" align="center"></el-table-column>
                                 <el-table-column label="考评单位" prop="organizationShortName" width="300">
@@ -140,16 +104,30 @@
                                     <el-table-column v-for="(iv, index) in it.children" :key="index" :label="iv.key"
                                      align="center" width="150" sortable :sort-method="(a,b)=>sortMethods(a,b,iv.code)">
                                         <template #default="scope">
-                                            <el-select v-model="scope.row[iv.code]" class="selectSty" placeholder="请选择审核状态" v-if="scope.row['IS_LH_'+iv.code] === '3'">
-                                                <el-option
-                                                v-for="item in statusData"
-                                                :key="item.id"
-                                                :label="item.name"
-                                                :value="item.id">
-                                                </el-option>
-                                            </el-select>
-                                            <el-input v-model="scope.row[iv.code]" class="inputSty" v-else-if="scope.row['IS_LH_'+iv.code] === '2'"></el-input>
-                                            <el-input-number v-model="scope.row[iv.code]" class="numberSty" :precision="2" :step="0.1" v-else />
+                                            <template v-if="!scope.row['operation']">
+                                                <el-select v-model="scope.row[iv.code]" class="selectSty" placeholder="请选择审核状态" v-if="scope.row['IS_LH_'+iv.code] === '3'">
+                                                    <el-option
+                                                    v-for="item in statusData"
+                                                    :key="item.id"
+                                                    :label="item.name"
+                                                    :value="item.id">
+                                                    </el-option>
+                                                </el-select>
+                                                <el-input v-model="scope.row[iv.code]" class="inputSty" v-else-if="scope.row['IS_LH_'+iv.code] === '2'"></el-input>
+                                                <el-input-number v-model="scope.row[iv.code]" class="numberSty" :precision="2" :step="0.1" v-else />
+                                            </template>
+                                            <template v-else>
+                                                <el-select v-model="scope.row[iv.code]" class="selectSty" placeholder="请选择审核状态" v-if="scope.row['IS_LH_'+iv.code] === '3'">
+                                                    <el-option
+                                                    v-for="item in statusData"
+                                                    :key="item.id"
+                                                    :label="item.name"
+                                                    :value="item.id">
+                                                    </el-option>
+                                                </el-select>
+                                                <span class="indicitem" v-if="iv.code === 'operation'" @click="changeDetail(scope.row)">详情</span>
+                                                <span class="inputSty" v-else>{{scope.row[iv.code]}}</span>
+                                            </template>
                                         </template>
                                     </el-table-column>
                                 </el-table-column>
@@ -928,11 +906,6 @@ export default {
                                 .el-table__body-wrapper {
                                     height: 35vh !important;
                                     .el-scrollbar{
-                                        .is-horizontal{
-                                            .el-scrollbar__thumb{
-                                                // width: 100% !important;
-                                            }
-                                        }
                                         .el-table__body{
                                             .error-row {
                                                 --el-table-tr-bg-color: #fdecec;