张丁 测试预约作业票

master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceDeviceController.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,6 +40,18 @@ public class TInvoiceDeviceController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     *  查询装置区域下拉列表数据
+     */
+    @GetMapping("/select")
+    public AjaxResult select()
+    {
+
+        List<String> list = tInvoiceDeviceService.selectTInvoiceDeviceAllList();
+
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出装置区域管理列表
      */

master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceUserUnitController.java

@@ -72,7 +72,6 @@ public class TInvoiceUserUnitController extends BaseController
     /**
      * 获取用户单位找到对应的用户主管的信息
      */
-    @PreAuthorize("@ss.hasPermi('invoice:unit:query')")
     @GetMapping(value = "/getUserByUnit/{Unit}")
     public AjaxResult getInfoByUnit(@PathVariable("Unit") Long id)
     {

master/src/main/java/com/ruoyi/project/invoice/mapper/TInvoiceDeviceMapper.java

@@ -60,4 +60,12 @@ public interface TInvoiceDeviceMapper
      * @return 结果
      */
     public int deleteTInvoiceDeviceByIds(Long[] ids);
+
+    /**
+     * 查询所有区域下拉列表
+     *
+     * @param
+     * @return 结果
+     */
+    List<String> selectTInvoiceDeviceAllList();
 }

master/src/main/java/com/ruoyi/project/invoice/service/ITInvoiceDeviceService.java

@@ -58,4 +58,12 @@ public interface ITInvoiceDeviceService
      * @return 结果
      */
     public int deleteTInvoiceDeviceById(Long id);
+
+    /**
+     * 查询所有区域下拉列表
+     *
+     * @param
+     * @return 结果
+     */
+    List<String> selectTInvoiceDeviceAllList();
 }

master/src/main/java/com/ruoyi/project/invoice/service/impl/TInvoiceDeviceServiceImpl.java

@@ -90,4 +90,16 @@ public class TInvoiceDeviceServiceImpl implements ITInvoiceDeviceService
     {
         return tInvoiceDeviceMapper.deleteTInvoiceDeviceById(id);
     }
+
+    /**
+     * 查询所有区域下拉列表
+     *
+     * @param
+     * @return 结果
+     */
+    @Override
+    public List<String> selectTInvoiceDeviceAllList() {
+
+        return tInvoiceDeviceMapper.selectTInvoiceDeviceAllList();
+    }
 }

master/src/main/resources/mybatis/invoice/TInvoiceDeviceMapper.xml

@@ -41,11 +41,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
+
+    <select id="selectTInvoiceDeviceAllList"  resultType="java.lang.String">
+        select d.work_area  from t_invoice_device d                                                                                                                                                   left join sys_dept s on s.dept_id = d.dept_id
+        where d.del_flag = 0
+    </select>
     
     <select id="selectTInvoiceDeviceById" parameterType="Long" resultMap="TInvoiceDeviceResult">
         <include refid="selectTInvoiceDeviceVo"/>
         where id = #{id}
     </select>
+
         
     <insert id="insertTInvoiceDevice" parameterType="TInvoiceDevice">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">

ui/src/api/invoice/device.js

@@ -9,6 +9,15 @@ export function listDevice(query) {
   })
 }
 
+// 查询装置区域下拉列表数据
+export function selectDevice(query) {
+  return request({
+    url: '/invoice/device/select',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询装置区域管理详细
 export function getDevice(id) {
   return request({

ui/src/views/invoice/bookingworkticket/index.vue

@@ -193,12 +193,12 @@
           </el-col>
         <el-col :span="8">
         <el-form-item label="作业区域" prop="workArea">
-          <el-select v-model="form.workArea" placeholder="请选择作业区域"     @change="getDeviceup">
+          <el-select v-model="form.workArea" placeholder="请选择作业区域">
              <el-option
             v-for="dict in workAreaOptions"
             :key="dict.id"
-            :label="dict.workArea"
-            :value="dict.workArea"
+            :label="dict"
+            :value="dict"
                  ></el-option>
           </el-select>
         </el-form-item>
@@ -389,11 +389,10 @@
 <script>
 import { listBookingworkticket, getBookingworkticket, delBookingworkticket, addBookingworkticket, updateBookingworkticket, exportBookingworkticket, importTemplate, seeBookingworkticket} from "@/api/invoice/bookingworkticket";
 import { listWorkcontent, getWorkcontent, delWorkcontent, addWorkcontent, updateWorkcontent, exportWorkcontent,getWorkcontentBybookingticketId} from "@/api/invoice/workcontent";
-import { listDevice, getDevice, delDevice, updateDevice, exportDevice} from "@/api/invoice/device";
+import { listDevice, getDevice, delDevice, updateDevice, exportDevice, selectDevice} from "@/api/invoice/device";
 import { listUnit, getUnit, delUnit, addUnit, updateUnit, exportUnit,getUserByUnit} from "@/api/invoice/unit";
 import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus,userDataScope } from "@/api/system/user";
 import { treeselect } from "@/api/system/dept";
-import { checkPermi} from "@/utils/permission"; // 权限判断函数
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -402,7 +401,7 @@ import {addInvoice} from "@/api/invoice/invoice";
 
 export default {
   name: "Bookingworkticket",
-  components: { Treeselect,AddApprove,checkPermi},
+  components: { Treeselect,AddApprove},
   data() {
     return {
       //禁用
@@ -581,9 +580,10 @@ export default {
         deptId: null,
         remarks: null
       };
-          listDevice(queryForm).then(response => {
-           this.workAreaOptions=response.rows
+          selectDevice(queryForm).then(response => {
+           this.workAreaOptions=response.data
           });
+          console.log(this.workAreaOptions)
     },
     addAprrove(row) {
       this.reset();
@@ -701,7 +701,7 @@ export default {
 
           }
 
-          console.log(this.bookingworkticketList)
+    //      console.log(this.bookingworkticketList)
        this.total = response.total;
         this.loading = false;
       });