1

src/views/distributionnetwork/maintenance/process/index.vue

@@ -1,147 +1,182 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="月计划编号" prop="planCode" label-width="120">
-        <el-input
-          v-model="queryParams.planCode"
-          placeholder="请输入月计划编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      </el-form-item>
-    
-      </el-form-item>
-      <el-form-item label="区县单位" prop="county">
-        <el-input
-          v-model="queryParams.county"
-          placeholder="请输入区县单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供电所" prop="station">
-        <el-input
-          v-model="queryParams.station"
-          placeholder="请输入所属供电所"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!--el-form-item label="线路编号" prop="lineCode">
-        <el-input
-          v-model="queryParams.lineCode"
-          placeholder="请输入线路编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item-->
-      <el-form-item label="线路名称" prop="lineName">
-        <el-input
-          v-model="queryParams.lineName"
-          placeholder="请输入线路名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+       <el-form-item label="月计划编号" prop="planCode" label-width="120">
+           <el-input
+             v-model="queryParams.planCode"
+             placeholder="请输入月计划编号"
+             clearable
+           
+           />
+         </el-form-item>
+       <el-form-item label="周计划编号" prop="planCodeW" label-width="120">
+         <el-input
+           v-model="queryParams.planCodeW"
+           placeholder="请输周计划编号"
+           clearable
+         />
+       </el-form-item>
+         </el-form-item>
+       
+         </el-form-item>
+         <el-form-item label="区县单位" prop="county">
+           <el-input
+             v-model="queryParams.county"
+             placeholder="请输入区县单位"
+             clearable
+           />
+         </el-form-item>
+         <el-form-item label="供电所" prop="station">
+           <el-input
+             v-model="queryParams.station"
+             placeholder="请输入所属供电所"
+             clearable
+           />
+         </el-form-item>
+        
+         <el-form-item label="线路名称" prop="lineName">
+           <el-input
+             v-model="queryParams.lineName"
+             placeholder="请输入线路名称"
+             clearable
+             @keyup.enter.native="handleQuery"
+           />
+         </el-form-item>
 
-     
-      
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-upload"
-          size="mini"
-          :disabled="single"
-          @click=""
-          v-hasPermi="['powerdistribution:process:edit']"
-        >人工计划上传</el-button>
-      </el-col>
-     
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="el-icon-upload"
-          size="mini"
-		   :disabled="maintenancePalan"
-          @click="uploadMaintenanceFile()"
-        >上传检修方案</el-button>
+           type="warning"
+           plain
+           icon="el-icon-upload"
+           size="mini"
+        :disabled="maintenancePalan"
+           @click="uploadMaintenanceFile()"
+         >上传检修方案</el-button>
+		 
+		 <el-button
+		   type="danger"
+		   plain
+		   icon="el-icon-upload"
+		   size="mini"
+		  :disabled="maintenancePalan"
+		   @click="uploadApproveFile"
+		 >上传审批单</el-button>
       </el-col>
-	  <el-col :span="1.5">
-	    <el-button
-	      type="danger"
-	      plain
-	      icon="el-icon-upload"
-	      size="mini"
-		   :disabled="maintenancePalan"
-	      @click="uploadApproveFile"
-	    >上传审批单</el-button>
-	  </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange"
-	    :row-class-name="getRowClassName"
-	>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="月计划编号" align="center" prop="planCode"  width="150">
-		  <template slot-scope="scope">
-				<a @click="table_show(scope.row, scope.$index)" style="color: #00afff;cursor: pointer">{{scope.row.planCode}}</a>
-		  </template>
-	  </el-table-column>
-      <el-table-column label="停电设备数" align="center" prop="powerOutageDevices" />
-      <el-table-column label="月计划停电时户数" align="center" prop="perHourHouseholdsM" />
-      <el-table-column label="周计划停电时户数" align="center" prop="perHourHouseholdsW" />
-      <el-table-column label="市州单位" align="center" prop="city" width="150" />
-      <el-table-column label="区县单位" align="center" prop="county" width="180"/>
-      <el-table-column label="供电服务站/所" align="center" prop="station" width="120" :show-overflow-tooltip="true"/>
-      <el-table-column label="线路编号" align="center" prop="lineCode"  width="120"/>
-      <el-table-column label="线路名称" align="center" prop="lineName" width="130" />
-	  <el-table-column label="人工计划停电时户数" align="center" prop="perHourHouseholdsArtif" />
-	  <el-table-column label="是否超目标" align="center">
-		  <template slot-scope="scope" width="130">
-		  		<span  v-if="scope.row.perHourHouseholdsArtif>0 && scope.row.perHourHouseholdsArtif>scope.row.perHourHouseholdsM">超目标</span>
-		  		<span type="success" effect="dark"  v-if="scope.row.perHourHouseholdsArtif>0 && scope.row.perHourHouseholdsArtif<scope.row.perHourHouseholdsM">正常</span>
-				<span type="info" v-else>未知</span>
-		  </template>
-	  </el-table-column>
-      <el-table-column label="申报单位" align="center" prop="declarAgency"  width="150"/>
-      <el-table-column label="检修方案" align="center" prop="isMaintenance">
-		  <template slot-scope="scope">
-		  		<span v-if="scope.row.isMaintenance=='1'">待上传</span>
-		  		<span type="info" effect="dark"  v-if="scope.row.isMaintenance=='0'">不需要</span>
-				<span type="success" effect="dark"  v-if="scope.row.isMaintenance=='2'">已上传</span>
-		  </template>
-	  </el-table-column>
-      <el-table-column label="审批单" align="center" prop="isApprove">
-		  <template slot-scope="scope">
-		  		<span v-if="scope.row.isApprove=='1'">待上传</span>
-		  		<span type="info" effect="dark"  v-if="scope.row.isApprove=='0'">不需要</span>
-		  		<span type="success" effect="dark"  v-if="scope.row.isApprove=='2'">已上传</span>
-		  </template>
-	  </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['powerdistribution:process:edit']"
-          >修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+     <el-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange"
+         :row-class-name="getRowClassName"
+     >
+         <el-table-column type="selection" width="55" align="center" />
+         <el-table-column label="月计划编号" align="center" prop="planCode"  width="150" fixed>
+     	  <template slot-scope="scope">
+     			<a @click="table_show(scope.row, scope.$index)" style="color: #00afff;cursor: pointer">{{scope.row.planCode}}</a>
+     	  </template>
+       </el-table-column>
+         <el-table-column label="停电设备数" align="center" prop="powerOutageDevices" fixed/>
+         <el-table-column label="月计划停电时户数" align="center" prop="perHourHouseholdsM" fixed/>
+         <el-table-column label="周计划停电时户数" align="center" prop="perHourHouseholdsW" fixed/>
+         <el-table-column label="市州单位" align="center" prop="city" width="150" />
+         <el-table-column label="区县单位" align="center" prop="county" width="180"/>
+         <el-table-column label="供电服务站/所" align="center" prop="station" width="120" :show-overflow-tooltip="true"/>
+         <el-table-column label="线路编号" align="center" prop="lineCode"  width="120"/>
+         <el-table-column label="线路名称" align="center" prop="lineName" width="130" />
+       <el-table-column label="实际时户数" width="130" align="center" prop="hourNum" />
+       <el-table-column label="是否超目标" width="130"align="center">
+     	  <template slot-scope="scope" >
+     	  		<el-tag type="danger" effect="dark" v-if="scope.row.perHourHouseholdsArtif>0 && scope.row.perHourHouseholdsArtif>scope.row.perHourHouseholdsM">超目标</el-tag>
+     	  		<el-tag type="success" effect="dark"  v-if="scope.row.perHourHouseholdsArtif>0 && scope.row.perHourHouseholdsArtif<scope.row.perHourHouseholdsM">正常</el-tag>
+     			<el-tag type="info" v-else>未知</el-tag>
+     	  </template>
+       </el-table-column>
+         <el-table-column label="申报单位" align="center" prop="declarAgency"  width="150"/>
+	 <el-table-column label="检修计划" align="center">
+		 <el-table-column label="检修方案" align="center" prop="isMaintenance">
+			  <template slot-scope="scope">
+					<span v-if="scope.row.isMaintenance=='1'">待上传</span>
+					<span type="info" effect="dark"  v-if="scope.row.isMaintenance=='0'">不需要</span>
+					<span type="success" effect="dark"  v-if="scope.row.isMaintenance=='2'">已上传</span>
+			  </template>
+		   </el-table-column>
+		  <el-table-column label="审批单" align="center" prop="isApprove">
+			  <template slot-scope="scope">
+					<span v-if="scope.row.isApprove=='1'">待上传</span>
+					<span type="info" effect="dark"  v-if="scope.row.isApprove=='0'">不需要</span>
+					<span type="success" effect="dark"  v-if="scope.row.isApprove=='2'">已上传</span>
+			  </template>
+		   </el-table-column>
+	   </el-table-column>
+	   <el-table-column label="考核金额" align="center">
+	     <el-table-column
+	       label="党政一把手"
+	       prop="manageAmt"
+	       align="center"
+	       :show-overflow-tooltip="true"
+	     >
+	     </el-table-column>
+	     <el-table-column
+	       label="分管副经理"
+	       prop="manageAssistantAmt"
+	       align="center"
+	       :show-overflow-tooltip="true"
+	     >
+	     </el-table-column>
+	     <el-table-column
+	       label="部室主任"
+	       prop="deptDirectorAmt"
+	       align="center"
+	       :show-overflow-tooltip="true"
+	     />
+	     <el-table-column
+	       label="部室分管主任"
+	       prop="deptDirectorAssistantAmt"
+	       align="center"
+	       :show-overflow-tooltip="true"
+	     >
+	     </el-table-column>
+	     <el-table-column
+	       label="部室责任专责"
+	       prop="deptManageAmt"
+	       align="center"
+	       :show-overflow-tooltip="true"
+	     />
+	     <el-table-column
+	       label="总负责人"
+	       prop="principAmt"
+	       align="center"
+	       :show-overflow-tooltip="true"
+	     />
+	     <el-table-column
+	       label="工作负责人"
+	       prop="workPrincipAmt"
+	       align="center"
+	     />
+	     <el-table-column
+	       label="设备主人"
+	       prop="ownerAmt"
+	       align="center"
+	       :show-overflow-tooltip="true"
+	     >
+	     </el-table-column>
+	   </el-table-column>
+         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+           <template slot-scope="scope">
+             <el-button
+               size="mini"
+               type="text"
+               icon="el-icon-edit"
+               @click="handleUpdate(scope.row)"
+               v-hasPermi="['powerdistribution:process:edit']"
+             >修改</el-button>
+           </template>
+         </el-table-column>
+       </el-table>
     
     <pagination
       v-show="total>0"
@@ -150,69 +185,67 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改检修计划全流程管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="月计划编号" prop="planCode">
-          <el-input v-model="form.planCode" placeholder="请输入月计划编号"  readonly/>
-        </el-form-item>
-		<el-row :gutter="24">
-			<el-col :lg="12">
-				<el-form-item label="停电设备数" prop="powerOutageDevices">
-				  <el-input-number v-model="form.powerOutageDevices" placeholder="请输入月计划停电设备数" min="0"/>
-				</el-form-item>
-			</el-col>
-			<el-col :lg="12">
-        <el-form-item label="停电时户数" prop="perHourHouseholdsM">
-				<el-input-number v-model="form.perHourHouseholdsM" placeholder="请输入月计划时户数" min="0"/>
-        </el-form-item>
+	
+	<!-- 添加或修改检修计划全流程管理对话框 -->
+	<el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
+	  <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+	    <el-form-item label="月计划编号" prop="planCode">
+	      <el-input v-model="form.planCode" placeholder="请输入月计划编号"  readonly/>
+	    </el-form-item>
+	<el-row :gutter="24">
+		<el-col :lg="12">
+			<el-form-item label="停电设备数" prop="powerOutageDevices">
+			  <el-input-number v-model="form.powerOutageDevices" placeholder="请输入月计划停电设备数" min="0"/>
+			</el-form-item>
 		</el-col>
-		</el-row>
-        <el-row :gutter="24">
-			<el-col :lg="12">
-        <el-form-item label="市州单位" prop="city">
-          <el-input v-model="form.city" placeholder="请输入市州单位" readonly/>
-        </el-form-item>
-			</el-col>
 		<el-col :lg="12">
-        <el-form-item label="区县单位" prop="county">
-          <el-input v-model="form.county" placeholder="请输入区县单位" readonly/>
-        </el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="24">
-			<el-col :lg="12">
-        <el-form-item label="供电服务站/所" prop="station">
-          <el-input v-model="form.station" placeholder="请输入所属供电所" readonly/>
-        </el-form-item>
-			</el-col>
+	    <el-form-item label="停电时户数" prop="perHourHouseholdsM">
+			<el-input-number v-model="form.perHourHouseholdsM" placeholder="请输入月计划时户数" min="0"/>
+	    </el-form-item>
+	</el-col>
+	</el-row>
+	    <el-row :gutter="24">
 		<el-col :lg="12">
-		<el-form-item label="申报单位" prop="declarAgency">
-		  <el-input v-model="form.declarAgency" placeholder="请输入申报单位" readonly/>
-		</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="24">
-			<el-col :lg="12">
-        <el-form-item label="线路编号" prop="lineCode">
-          <el-input v-model="form.lineCode" placeholder="请输入线路编号" readonly/>
-        </el-form-item>
-			</el-col>
+	    <el-form-item label="市州单位" prop="city">
+	      <el-input v-model="form.city" placeholder="请输入市州单位" readonly/>
+	    </el-form-item>
+		</el-col>
+	<el-col :lg="12">
+	    <el-form-item label="区县单位" prop="county">
+	      <el-input v-model="form.county" placeholder="请输入区县单位" readonly/>
+	    </el-form-item>
+		</el-col>
+	</el-row>
+	<el-row :gutter="24">
 		<el-col :lg="12">
-        <el-form-item label="线路名称" prop="lineName">
-          <el-input v-model="form.lineName" placeholder="请输入线路名称" readonly/>
-        </el-form-item>
-			</el-col>
-       	</el-row>
-			
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+	    <el-form-item label="供电服务站/所" prop="station">
+	      <el-input v-model="form.station" placeholder="请输入所属供电所" readonly/>
+	    </el-form-item>
+		</el-col>
+	<el-col :lg="12">
+	<el-form-item label="申报单位" prop="declarAgency">
+	  <el-input v-model="form.declarAgency" placeholder="请输入申报单位" readonly/>
+	</el-form-item>
+		</el-col>
+	</el-row>
+	<el-row :gutter="24">
+		<el-col :lg="12">
+	    <el-form-item label="线路编号" prop="lineCode">
+	      <el-input v-model="form.lineCode" placeholder="请输入线路编号" readonly/>
+	    </el-form-item>
+		</el-col>
+		<el-col :lg="12">
+	    <el-form-item label="线路名称" prop="lineName">
+	      <el-input v-model="form.lineName" placeholder="请输入线路名称" readonly/>
+	    </el-form-item>
+		</el-col>
+	 </el-row>
+	  </el-form>
+	  <div slot="footer" class="dialog-footer">
+	    <el-button type="primary" @click="submitForm">确 定</el-button>
+	    <el-button @click="cancel">取 消</el-button>
+	  </div>
+	</el-dialog>
 	
 	<!-- 文件上传对话框 -->
 	<el-dialog :title="fileShow" :visible.sync="uploadVisible" width="550px" append-to-body>
@@ -230,7 +263,8 @@
 		  </div>
 	 </el-dialog>
 	<recordDetails v-if="dialog.detailsSave" ref="detailsDialog" @closed="dialog.detailsSave=false"></recordDetails>
-  </div>
+	</div>
+	
 </template>
 
 <script>
@@ -276,6 +310,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         planCode: null,
+		planCodeW:null,
         powerOutageDevices: null,
         perHourHouseholdsM: null,
         perHourHouseholdsW: null,
@@ -324,6 +359,7 @@ export default {
       this.form = {
         id: null,
         planCode: null,
+		planCodeW: null,
         powerOutageDevices: null,
         perHourHouseholdsM: null,
         perHourHouseholdsW: null,
@@ -360,7 +396,7 @@ export default {
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
-	  if(selection.length==1 && selection[0].isMaintenance>0){
+	  if(selection.length==1 && selection[0].perHourHouseholdsM>150){
 		   this.maintenancePalan=false;
 		   this.process= selection[0];
 	  }else{

src/views/distributionnetwork/power-outage-control/rules/index.vue

@@ -65,7 +65,7 @@
       <el-col :span="12">
         <el-card>
           <div slot="header" class="clearfix">
-            <span>时户数考核规则分级</span>
+            <span>计划时户数</span>
             <el-button
               style="float: right; padding: 3px 0"
               type="text"
@@ -104,7 +104,7 @@
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
               <el-table-column
-                label="目标时户数规则"
+                label="目标时户数"
                 align="center"
                 prop="targetName"
                 :show-overflow-tooltip="true"
@@ -149,9 +149,9 @@
         </el-card>
       </el-col>
       <el-col :span="12">
-        <el-card header="时户数考核规则明细">
+        <el-card header="完成时户数">
           <div slot="header" class="clearfix">
-            <span>时户数考核规则明细</span>
+            <span>完成时户数</span>
             <el-button
               style="float: right; padding: 3px 0"
               type="text"
@@ -173,7 +173,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="完成时户数规则"
+                label="完成时户数"
                 align="center"
                 prop="detailName"
                 width="130"