wangzhe преди 7 месеца
родител
ревизия
daac57a5cd
променени са 5 файла, в които са добавени 180 реда и са изтрити 148 реда
  1. 20 18
      src/api/gas/order.js
  2. 51 41
      src/views/zdsz_p1/anjian/index.vue
  3. 58 48
      src/views/zdsz_p1/kaishuan/index.vue
  4. 1 1
      src/views/zdsz_p1/otherEngine/index.vue
  5. 50 40
      src/views/zdsz_p1/weixiu/index.vue

+ 20 - 18
src/api/gas/order.js

@@ -20,7 +20,7 @@ export function getOrder(id) {
 // 新增工程管理
 export function addOrder(data) {
   return request({
-    url: '/gas/order',
+    url: '/yq/gas/order',
     method: 'post',
     data: data
   })
@@ -29,21 +29,21 @@ export function addOrder(data) {
 // 批量合格
 export function submitY(id,reason, versions) {
   return request({
-    url: '/gas/order/submitY?ids=' + id+'&reason='+reason+'&versions='+versions,
+    url: '/yq/gas/order/submitY?ids=' + id+'&reason='+reason+'&versions='+versions,
     method: 'get',
   })
 }
 // 批量不合格
 export function submitN(id,reason, versions) {
   return request({
-    url: '/gas/order/submitN?ids=' + id+'&reason='+reason+'&versions='+versions,
+    url: '/yq/gas/order/submitN?ids=' + id+'&reason='+reason+'&versions='+versions,
     method: 'get',
   })
 }
 // 修改工程管理
 export function updateOrder(data) {
   return request({
-    url: '/gas/order',
+    url: '/yq/gas/order',
     method: 'put',
     data: data
   })
@@ -51,49 +51,51 @@ export function updateOrder(data) {
 // 删除工程管理
 export function delOrder(id) {
   return request({
-    url: '/gas/order/' + id,
+    url: '/yq/gas/order/' + id,
     method: 'delete'
   })
 }
 // 职工下拉框
 export function getWorker() {
   return request({
-    url: '/gas/user/getWorker',
+    // url: '/yq/gas/user/getWorker',
+    url: '/yq/gas/user/getWorker',
     method: 'get',
   })
 }
 // 管子长度
 export function getPipeLength() {
   return request({
-    url: '/gas/pipeLength/getList',
+    url: '/yq/gas/pipeLength/getList',
     method: 'get',
   })
 }
 // 管子类型
 export function getPipeType() {
   return request({
-    url: '/gas/pipeType/getList',
+    url: '/yq/gas/pipeType/getList',
     method: 'get',
   })
 }
 // 管子类型
 export function getValveType() {
   return request({
-    url: '/gas/valve/getList',
+    url: '/yq/gas/valve/getList',
     method: 'get',
   })
 }
 // 小区下拉框
 export function getArea() {
   return request({
-    url: '/gas/area/getArea',
+    // url: '/yq/gas/area/getArea',
+    url: 'yq/gas/area/getArea',
     method: 'get',
   })
 }
 // 楼宇下拉框
 export function getBuilding(areaId) {
   return request({
-    url: '/gas/building/getBuilding?areaId='+ areaId,
+    url: '/yq/gas/building/getBuilding?areaId='+ areaId,
     method: 'get',
 
   })
@@ -101,21 +103,21 @@ export function getBuilding(areaId) {
 // 单元下拉框
 export function getUnit(buildingId) {
   return request({
-    url: '/gas/unit/getUnit?buildingId='+ buildingId,
+    url: '/yq/gas/unit/getUnit?buildingId='+ buildingId,
     method: 'get',
   })
 }
 // 房屋下拉框
 export function getHouse(unitId) {
   return request({
-    url: '/gas/house/getHouse?unitId='+ unitId,
+    url: '/yq/gas/house/getHouse?unitId='+ unitId,
     method: 'get',
   })
 }
 // 查询工程审核列表
 export function getListExamine(query) {
   return request({
-    url: '/gas/order/getListExamine',
+    url: '/yq/gas/order/getListExamine',
     method: 'get',
     params: query
   })
@@ -123,14 +125,14 @@ export function getListExamine(query) {
 
 export function getOrderForStatus(value,id) {
   return request({
-    url: '/gas/order/getOrderForStatus?houseId='+value+'&id='+id,
+    url: '/yq/gas/order/getOrderForStatus?houseId='+value+'&id='+id,
     method: 'get',
   })
 }
 // 统计图点击跳转列表
 export function getListByStatus(query) {
   return request({
-    url: '/gas/order/getListByStatus',
+    url: '/yq/gas/order/getListByStatus',
     method: 'get',
     params: query
   })
@@ -138,7 +140,7 @@ export function getListByStatus(query) {
 // 批量合格
 export function backup() {
   return request({
-    url: '/gas/order/backup',
+    url: '/yq/gas/order/backup',
     method: 'get',
   })
 }
@@ -161,7 +163,7 @@ export function getListWeiXiu(query) {
 //开栓列表
 export function getListKaiShuan(query) {
   return request({
-    url: '/gas/order/getListKaiShuan',
+    url: '/yq/gas/order/getListKaiShuan',
     method: 'get',
     params: query
   })

+ 51 - 41
src/views/zdsz_p1/anjian/index.vue

@@ -71,28 +71,28 @@
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['gas:order:add']"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['gas:order:remove']"
-        >删除</el-button>
-      </el-col>
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="primary"-->
+          <!--plain-->
+          <!--icon="el-icon-plus"-->
+          <!--size="mini"-->
+          <!--@click="handleAdd"-->
+          <!--v-hasPermi="['gas:order:add']"-->
+        <!--&gt;新增-->
+        <!--</el-button>-->
+      <!--</el-col>-->
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="danger"-->
+          <!--plain-->
+          <!--icon="el-icon-delete"-->
+          <!--size="mini"-->
+          <!--:disabled="multiple"-->
+          <!--@click="handleDelete"-->
+          <!--v-hasPermi="['gas:order:remove']"-->
+        <!--&gt;删除</el-button>-->
+      <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -141,18 +141,26 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['gas:order:edit']"
-          >修改
+          >详情
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['gas:order:remove']"
-          >删除</el-button>
+          <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-edit"-->
+            <!--@click="handleUpdate(scope.row)"-->
+            <!--v-hasPermi="['gas:order:edit']"-->
+          <!--&gt;修改-->
+          <!--</el-button>-->
+          <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-delete"-->
+            <!--@click="handleDelete(scope.row)"-->
+            <!--v-hasPermi="['gas:order:remove']"-->
+          <!--&gt;删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -172,7 +180,7 @@
           <imageUpload v-model="form.photoList"/>
         </el-form-item>
         <el-form-item label="职工" prop="userId">
-          <el-select v-model="form.userId" filterable placeholder="请选择职工">
+          <el-select v-model="form.userId" filterable placeholder="请选择职工" disabled>
             <el-option v-for="item in workerList" :key="item.id" :value="item.id" :label="item.name">{{
                 item.name
               }}
@@ -181,7 +189,7 @@
         </el-form-item>
         <el-form-item label="所属小区" prop="areaId">
           <el-select v-model="form.areaId" filterable placeholder="请选择小区"
-                     @change="getBuilding(form.areaId),resetform()">
+                     @change="getBuilding(form.areaId),resetform()" disabled>
             <el-option v-for="item in areaList" :key="item.id" :value="item.id" :label="item.name">{{
                 item.name
               }}
@@ -190,7 +198,7 @@
         </el-form-item>
         <el-form-item label="所属楼宇" prop="buildingId">
           <el-select v-model="form.buildingId" filterable placeholder="请选择楼宇"
-                     @change="getUnit(form.buildingId),resetunitform()">
+                     @change="getUnit(form.buildingId),resetunitform()" disabled>
             <el-option v-for="item in buildingList" :key="item.id" :value="item.id" :label="item.name">{{
                 item.name
               }}
@@ -199,7 +207,7 @@
         </el-form-item>
         <el-form-item label="所属单元" prop="unitId">
           <el-select v-model="form.unitId" filterable placeholder="请选择单元"
-                     @change="getHouse(form.unitId),resethouseform()">
+                     @change="getHouse(form.unitId),resethouseform()" disabled>
             <el-option v-for="item in unitList" :key="item.id" :value="item.id" :label="item.name">{{
                 item.name
               }}
@@ -207,23 +215,24 @@
           </el-select>
         </el-form-item>
         <el-form-item label="房屋" prop="houseId">
-          <el-select v-model="form.houseId" filterable placeholder="请选择房屋">
+          <el-select v-model="form.houseId" filterable placeholder="请选择房屋" disabled>
             <el-option v-for="item in houseList" :key="item.id" :value="item.id" :label="item.name">{{item.name}}
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="是否合格" prop="whether">
-          <el-select v-model="form.whether" filterable placeholder="请选择">
+          <el-select v-model="form.whether" filterable placeholder="请选择" disabled>
             <el-option v-for="item in whetherList" :value="item.value" :label="item.label">{{item.label}}</el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" disabled/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <!--<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>-->
+        <!--<el-button @click="cancel">取 消</el-button>-->
+        <el-button @click="cancel">关 闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -481,7 +490,8 @@ export default {
         this.loading = false;
         this.form = response.data;
         this.open = true;
-        this.title = "修改";
+        // this.title = "修改";
+        this.title = "详情";
         this.getBuilding(this.form.areaId);
       });
     },

+ 58 - 48
src/views/zdsz_p1/kaishuan/index.vue

@@ -70,42 +70,42 @@
         <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="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['gas:order:add']"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['gas:order:remove']"
-        >删除</el-button>
-      </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          :loading="exportLoading"-->
-<!--          @click="backup"-->
-<!--          v-hasPermi="['gas:order:export']"-->
-<!--        >备份</el-button>-->
-<!--      </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    <!--<el-row :gutter="10" class="mb8">-->
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="primary"-->
+          <!--plain-->
+          <!--icon="el-icon-plus"-->
+          <!--size="mini"-->
+          <!--@click="handleAdd"-->
+          <!--v-hasPermi="['gas:order:add']"-->
+        <!--&gt;新增-->
+        <!--</el-button>-->
+      <!--</el-col>-->
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="danger"-->
+          <!--plain-->
+          <!--icon="el-icon-delete"-->
+          <!--size="mini"-->
+          <!--:disabled="multiple"-->
+          <!--@click="handleDelete"-->
+          <!--v-hasPermi="['gas:order:remove']"-->
+        <!--&gt;删除</el-button>-->
+      <!--</el-col>-->
+<!--&lt;!&ndash;      <el-col :span="1.5">&ndash;&gt;-->
+<!--&lt;!&ndash;        <el-button&ndash;&gt;-->
+<!--&lt;!&ndash;          type="warning"&ndash;&gt;-->
+<!--&lt;!&ndash;          plain&ndash;&gt;-->
+<!--&lt;!&ndash;          icon="el-icon-download"&ndash;&gt;-->
+<!--&lt;!&ndash;          size="mini"&ndash;&gt;-->
+<!--&lt;!&ndash;          :loading="exportLoading"&ndash;&gt;-->
+<!--&lt;!&ndash;          @click="backup"&ndash;&gt;-->
+<!--&lt;!&ndash;          v-hasPermi="['gas:order:export']"&ndash;&gt;-->
+<!--&lt;!&ndash;        >备份</el-button>&ndash;&gt;-->
+<!--&lt;!&ndash;      </el-col>&ndash;&gt;-->
+      <!--<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+    <!--</el-row>-->
 
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
@@ -129,18 +129,26 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['gas:order:edit']"
-          >修改
+          >详情
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['gas:order:remove']"
-          >删除</el-button>
+          <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-edit"-->
+            <!--@click="handleUpdate(scope.row)"-->
+            <!--v-hasPermi="['gas:order:edit']"-->
+          <!--&gt;修改-->
+          <!--</el-button>-->
+          <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-delete"-->
+            <!--@click="handleDelete(scope.row)"-->
+            <!--v-hasPermi="['gas:order:remove']"-->
+          <!--&gt;删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -205,8 +213,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <!--<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>-->
+        <!--<el-button @click="cancel">取 消</el-button>-->
+        <el-button @click="cancel">关 闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -446,7 +455,8 @@ export default {
         this.loading = false;
         this.form = response.data;
         this.open = true;
-        this.title = "修改";
+        this.title = "详情";
+        // this.title = "修改";
         this.getBuilding(this.form.areaId);
       });
     },

+ 1 - 1
src/views/zdsz_p1/otherEngine/index.vue

@@ -175,7 +175,7 @@
           <el-input v-model="form.address" placeholder="请输入工程地址" disabled/>
         </el-form-item>
         <el-form-item label="照片">
-          <imageUpload v-model="form.photo"/>
+          <imageUpload v-model="form.photo" :disabled="true"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark" disabled>
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>

+ 50 - 40
src/views/zdsz_p1/weixiu/index.vue

@@ -71,28 +71,28 @@
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['gas:order:add']"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['gas:order:remove']"
-        >删除</el-button>
-      </el-col>
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="primary"-->
+          <!--plain-->
+          <!--icon="el-icon-plus"-->
+          <!--size="mini"-->
+          <!--@click="handleAdd"-->
+          <!--v-hasPermi="['gas:order:add']"-->
+        <!--&gt;新增-->
+        <!--</el-button>-->
+      <!--</el-col>-->
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="danger"-->
+          <!--plain-->
+          <!--icon="el-icon-delete"-->
+          <!--size="mini"-->
+          <!--:disabled="multiple"-->
+          <!--@click="handleDelete"-->
+          <!--v-hasPermi="['gas:order:remove']"-->
+        <!--&gt;删除</el-button>-->
+      <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -141,18 +141,26 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['gas:order:edit']"
           >修改
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['gas:order:remove']"
-          >删除</el-button>
+          <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-edit"-->
+            <!--@click="handleUpdate(scope.row)"-->
+            <!--v-hasPermi="['gas:order:edit']"-->
+          <!--&gt;修改-->
+          <!--</el-button>-->
+          <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-delete"-->
+            <!--@click="handleDelete(scope.row)"-->
+            <!--v-hasPermi="['gas:order:remove']"-->
+          <!--&gt;删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -172,7 +180,7 @@
           <imageUpload v-model="form.photoList"/>
         </el-form-item>
         <el-form-item label="职工" prop="userId">
-          <el-select v-model="form.userId" filterable placeholder="请选择职工">
+          <el-select v-model="form.userId" filterable placeholder="请选择职工" disabled>
             <el-option v-for="item in workerList" :key="item.id" :value="item.id" :label="item.name">{{
                 item.name
               }}
@@ -181,7 +189,7 @@
         </el-form-item>
         <el-form-item label="所属小区" prop="areaId">
           <el-select v-model="form.areaId" filterable placeholder="请选择小区"
-                     @change="getBuilding(form.areaId),resetform()">
+                     @change="getBuilding(form.areaId),resetform()" disabled>
             <el-option v-for="item in areaList" :key="item.id" :value="item.id" :label="item.name">{{
                 item.name
               }}
@@ -190,7 +198,7 @@
         </el-form-item>
         <el-form-item label="所属楼宇" prop="buildingId">
           <el-select v-model="form.buildingId" filterable placeholder="请选择楼宇"
-                     @change="getUnit(form.buildingId),resetunitform()">
+                     @change="getUnit(form.buildingId),resetunitform()" disabled>
             <el-option v-for="item in buildingList" :key="item.id" :value="item.id" :label="item.name">{{
                 item.name
               }}
@@ -199,7 +207,7 @@
         </el-form-item>
         <el-form-item label="所属单元" prop="unitId">
           <el-select v-model="form.unitId" filterable placeholder="请选择单元"
-                     @change="getHouse(form.unitId),resethouseform()">
+                     @change="getHouse(form.unitId),resethouseform()" disabled>
             <el-option v-for="item in unitList" :key="item.id" :value="item.id" :label="item.name">{{
                 item.name
               }}
@@ -207,23 +215,24 @@
           </el-select>
         </el-form-item>
         <el-form-item label="房屋" prop="houseId">
-          <el-select v-model="form.houseId" filterable placeholder="请选择房屋">
+          <el-select v-model="form.houseId" filterable placeholder="请选择房屋" disabled>
             <el-option v-for="item in houseList" :key="item.id" :value="item.id" :label="item.name">{{item.name}}
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="是否维修" prop="whether">
-          <el-select v-model="form.whether" filterable placeholder="请选择">
+          <el-select v-model="form.whether" filterable placeholder="请选择" disabled>
             <el-option v-for="item in whetherList" :value="item.value" :label="item.label">{{item.label}}</el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" disabled/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <!--<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>-->
+        <!--<el-button @click="cancel">取 消</el-button>-->
+        <el-button @click="cancel">关 闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -481,7 +490,8 @@ export default {
         this.loading = false;
         this.form = response.data;
         this.open = true;
-        this.title = "修改";
+        // this.title = "修改";
+        this.title = "详情";
         this.getBuilding(this.form.areaId);
 
       });