更新巡检计划页面

WebService/src/main/resources/components/inspectionPlanPackage/add-inspectionPlan/addInspectionPlan.js

@@ -26,14 +26,14 @@
         },
         _initMethod: function () {
             vc.component._initAddInspectionPlanDateInfo();
-            vc.getDict('pay_fee_config',"fee_type_cd",function(_data){
+            vc.getDict('inspection_plan',"inspection_plan_period",function(_data){
                 console.log("收到字典参数:"+_data);
                 vc.component.addInspectionPlanInfo.inspectionPlanPeriods = _data;
             });
-            vc.getDict('pay_fee_config',"fee_type_cd",function(_data){
+            vc.getDict('inspection_plan',"state",function(_data){
                 vc.component.addInspectionPlanInfo.states = _data;
             });
-            vc.getDict('pay_fee_config',"fee_type_cd",function(_data){
+            vc.getDict('inspection_plan',"sign_type",function(_data){
                 vc.component.addInspectionPlanInfo.signTypes = _data;
             });
 

WebService/src/main/resources/components/inspectionPlanPackage/edit-inspectionPlan/editInspectionPlan.js

@@ -27,13 +27,13 @@
             }
         },
         _initMethod: function () {
-            vc.getDict('pay_fee_config',"fee_type_cd",function(_data){
+            vc.getDict('inspection_plan',"sign_type",function(_data){
                 vc.component.editInspectionPlanInfo.signTypes = _data;
             });
-            vc.getDict('pay_fee_config',"fee_type_cd",function(_data){
+            vc.getDict('inspection_plan',"inspection_plan_period",function(_data){
                 vc.component.editInspectionPlanInfo.inspectionPlanPeriods = _data;
             });
-            vc.getDict('pay_fee_config',"fee_type_cd",function(_data){
+            vc.getDict('inspection_plan',"state",function(_data){
                 vc.component.editInspectionPlanInfo.states = _data;
             });
 

WebService/src/main/resources/components/inspectionPlanPackage/inspectionPlan-manage/inspectionPlanManage.html

@@ -18,10 +18,16 @@
                         </div>
                         <div class="col-sm-4">
                             <select class="custom-select" v-model="inspectionPlanManageInfo.conditions.state">
-                                <option selected value="">请选择当前状态</option>
-                                <option value="888800010001">处理中</option>
-                                <option value="888800010002">已完成</option>
+                                <option selected disabled value="">必填，请选择状态</option>
+                                <option v-for="(item,index) in inspectionPlanManageInfo.states" :key="index"
+                                        v-bind:value="item.statusCd">{{item.name}}
+                                </option>
                             </select>
+<!--                            <select class="custom-select" v-model="inspectionPlanManageInfo.conditions.state">-->
+<!--                                <option selected value="">请选择当前状态</option>-->
+<!--                                <option value="888800010001">处理中</option>-->
+<!--                                <option value="888800010002">已完成</option>-->
+<!--                            </select>-->
                         </div>
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm"

WebService/src/main/resources/components/inspectionPlanPackage/inspectionPlan-manage/inspectionPlanManage.js

@@ -12,6 +12,7 @@
                 records: 1,
                 moreCondition: false,
                 inspectionPlanName: '',
+                states:'',
                 conditions: {
                     keyWord: '',
                     state: '',
@@ -21,6 +22,9 @@
         },
         _initMethod: function () {
             vc.component._listInspectionPlans(DEFAULT_PAGE, DEFAULT_ROWS);
+            vc.getDict('inspection_plan',"state",function(_data){
+                vc.component.inspectionPlanManageInfo.states = _data;
+            });
         },
         _initEvent: function () {
 

WebService/src/main/resources/components/inspectionPlanPackage/view-inspectionPlan-info/viewInspectionPlanInfo.html

@@ -4,74 +4,78 @@
             <div class="ibox-title">
                 <h5>巡检计划信息</h5>
                 <div class="ibox-tools" style="top:10px;">
-                    <button type="button" v-if="viewInspectionPlanInfo.index != 2" class="btn btn-primary btn-sm" style="margin-right:10px;"  v-on:click="_openSelectInspectionPlanInfoModel()">
-                        <i class="glyphicon glyphicon-search"></i> 选择巡检计划</button>
+                    <button type="button" v-if="viewInspectionPlanInfo.index != 2" class="btn btn-primary btn-sm"
+                            style="margin-right:10px;" v-on:click="_openSelectInspectionPlanInfoModel()">
+                        <i class="glyphicon glyphicon-search"></i> 选择巡检计划
+                    </button>
 
-                    <button type="button" v-if="viewInspectionPlanInfo.index != 2" class="btn btn-primary btn-sm" v-on:click="_openAddInspectionPlanInfoModel()">
-                        <i class="glyphicon glyphicon-plus"></i> 添加巡检计划</button>
+                    <button type="button" v-if="viewInspectionPlanInfo.index != 2" class="btn btn-primary btn-sm"
+                            v-on:click="_openAddInspectionPlanInfoModel()">
+                        <i class="glyphicon glyphicon-plus"></i> 添加巡检计划
+                    </button>
                 </div>
             </div>
             <div class="ibox-content">
                 <div class="row">
-<div class="col-sm-4">
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >计划名称：</label>
+                            <label class="col-form-label">计划名称：</label>
                             <label class="">{{viewInspectionPlanInfo.inspectionPlanName}}</label>
                         </div>
-</div>
-<div class="col-sm-4">
+                    </div>
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >巡检路线：</label>
+                            <label class="col-form-label">巡检路线：</label>
                             <label class="">{{viewInspectionPlanInfo.inspectionRouteId}}</label>
                         </div>
-</div>
-<div class="col-sm-4">
+                    </div>
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >执行周期：</label>
+                            <label class="col-form-label">执行周期：</label>
                             <label class="">{{viewInspectionPlanInfo.inspectionPlanPeriod}}</label>
                         </div>
-</div>
-</div>
-<div class="row">
-<div class="col-sm-4">
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >执行人员：</label>
+                            <label class="col-form-label">执行人员：</label>
                             <label class="">{{viewInspectionPlanInfo.staffId}}</label>
                         </div>
-</div>
-<div class="col-sm-4">
+                    </div>
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >开始时间：</label>
+                            <label class="col-form-label">开始时间：</label>
                             <label class="">{{viewInspectionPlanInfo.startTime}}</label>
                         </div>
-</div>
-<div class="col-sm-4">
+                    </div>
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >结束时间：</label>
+                            <label class="col-form-label">结束时间：</label>
                             <label class="">{{viewInspectionPlanInfo.endTime}}</label>
                         </div>
-</div>
-</div>
-<div class="row">
-<div class="col-sm-4">
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >签到方式：</label>
+                            <label class="col-form-label">签到方式：</label>
                             <label class="">{{viewInspectionPlanInfo.signType}}</label>
                         </div>
-</div>
-<div class="col-sm-4">
+                    </div>
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >状态：</label>
+                            <label class="col-form-label">状态：</label>
                             <label class="">{{viewInspectionPlanInfo.state}}</label>
                         </div>
-</div>
-<div class="col-sm-4">
+                    </div>
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >备注：</label>
+                            <label class="col-form-label">备注：</label>
                             <label class="">{{viewInspectionPlanInfo.remark}}</label>
                         </div>
-</div>
-</div>
+                    </div>
+                </div>
 
             </div>
         </div>