张丁 关联票号和票据内容修改

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

@@ -22,9 +22,7 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.security.LoginUser;
 import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
-import com.ruoyi.project.invoice.domain.TInvoiceContractor;
-import com.ruoyi.project.invoice.domain.TInvoiceWorkcontent;
+import com.ruoyi.project.invoice.domain.*;
 import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
 import com.ruoyi.project.invoice.service.ITInvoiceContractorService;
 import com.ruoyi.project.invoice.service.ITInvoiceWorkcontentService;
@@ -51,7 +49,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
 import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
@@ -79,29 +76,59 @@ public class TInvoiceBookingworkticketController extends BaseController
 
     @Autowired
     private ITApproveReserveInvoiceService tApproveReserveInvoiceService;
+
+
     /**
      * 查询预约作业票台账列表
      */
     @PreAuthorize("@ss.hasPermi('invoice:bookingworkticket:list')")
-    @GetMapping("/list")
+    @GetMapping("/old")
     public TableDataInfo list(TInvoiceBookingworkticket tInvoiceBookingworkticket)
     {
         startPage();
         List<TInvoiceWorkcontent>  newtInvoiceWorkcontentList =new ArrayList<>();
+        List<TInvoiceWorkcontent>  worktInvoiceWorkcontentList =new ArrayList<>();
         List<TInvoiceBookingworkticket> bookingworkticketList = tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketList(tInvoiceBookingworkticket);
         for(int i=0;i<bookingworkticketList.size();i++){
             //遍历每一条主表  找到所有的子表 根据每条子表 将主表也同步到每一条数据
             TInvoiceBookingworkticket bookingworkticket= bookingworkticketList.get(i);
            List<TInvoiceWorkcontent>  workcontentList = tInvoiceBookingworkticketService.selectTInvoiceWorkcontentBybookingticketId(bookingworkticket.getId());
            for (TInvoiceWorkcontent workcontent : workcontentList) {
-                       workcontent.setBookingworkticket(bookingworkticket);
+               workcontent.setBookingworkticket(bookingworkticket);
                newtInvoiceWorkcontentList.add(workcontent);
+             /*  if(tInvoiceBookingworkticket.getWorkType()!=null&&tInvoiceBookingworkticket.getWorkType().toString().equals(workcontent.getWorkType().toString())){
+                   workcontent.setBookingworkticket(bookingworkticket);
+                   worktInvoiceWorkcontentList.add(workcontent);
+                   continue;
+               }*/
            }
 
         }
-        return getDataTable(newtInvoiceWorkcontentList , bookingworkticketList);
+            return getDataTable(newtInvoiceWorkcontentList , bookingworkticketList);
+
+    }
+
+    /**
+     * 筛选出不同作业类型的台账数据
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:bookingworkticket:list')")
+    @GetMapping("/list")
+    public TableDataInfo workType(TInvoiceBookingworkticket tInvoiceBookingworkticket)
+    {
+        startPage();
+        //先找到子表内容
+        List<TInvoiceWorkcontent> tInvoiceWorkcontentList = tInvoiceBookingworkticketService.selectTInvoiceWorkcontentList(tInvoiceBookingworkticket);
+        for (TInvoiceWorkcontent workcontent : tInvoiceWorkcontentList) {
+            TInvoiceBookingworkticket bookingworkticket=tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketById(workcontent.getBookingticketId());
+            workcontent.setBookingworkticket(bookingworkticket);
+        }
+
+        return getDataTable(tInvoiceWorkcontentList );
     }
 
+
+
+
     /**
      * 导出预约作业票台账列表
      */
@@ -377,8 +404,8 @@ public class TInvoiceBookingworkticketController extends BaseController
             wt.setBookingticketId(didi);
             //关联的票号
             tInvoiceBookingworkticketService.insertTInvoiceWorkcontent(wt);
-            wt.setReservationNumber("Steam Cracker"+tInvoiceBookingworkticket.getId().toString()+"-"+wt.getId().toString());
-            tInvoiceBookingworkticketService.updateTInvoiceWorkcontent(wt);
+       /*     wt.setReservationNumber("Steam Cracker"+tInvoiceBookingworkticket.getId().toString()+"-"+wt.getId().toString());
+            tInvoiceBookingworkticketService.updateTInvoiceWorkcontent(wt);*/
         }
 
         return AjaxResult.success(didi);

master/src/main/java/com/ruoyi/project/invoice/domain/TInvoiceBookingworkticket.java

@@ -96,9 +96,13 @@ public class TInvoiceBookingworkticket extends BaseEntity
     @TableField(exist = false)
     private List<TInvoiceWorkcontent> tInvoiceWorkcontentList;
 
+    /** 筛选工作类型 */
+    @TableField(exist = false)
+    private Long workType
+            ;
     /** 预约票号 */
     @Excel(name = "预约票号")
-    private Long reservationNumber;
+    private String reservationNumber;
 
     /** 预约作业申请单文件名 */
     @Excel(name = "预约作业申请单文件名")
@@ -281,12 +285,12 @@ public class TInvoiceBookingworkticket extends BaseEntity
         return userUnit;
     }
 
-    public void setReservationNumber(Long reservationNumber)
+    public void setReservationNumber(String reservationNumber)
     {
         this.reservationNumber = reservationNumber;
     }
 
-    public Long getReservationNumber()
+    public String getReservationNumber()
     {
         return reservationNumber;
     }
@@ -334,4 +338,12 @@ public class TInvoiceBookingworkticket extends BaseEntity
     public void settInvoiceWorkcontentList(List<TInvoiceWorkcontent> tInvoiceWorkcontentList) {
         this.tInvoiceWorkcontentList = tInvoiceWorkcontentList;
     }
+
+    public Long getWorkType() {
+        return workType;
+    }
+
+    public void setWorkType(Long workType) {
+        this.workType = workType;
+    }
 }

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

@@ -73,4 +73,7 @@ public interface TInvoiceBookingworkticketMapper  extends BaseMapper<TInvoiceBoo
      * @return 结果
      */
     List<TInvoiceWorkcontent> selectTInvoiceWorkcontentBybookingticketId(Long bookingticketId);
+
+
+    List<TInvoiceWorkcontent> selectTInvoiceWorkcontentList(TInvoiceBookingworkticket tInvoiceBookingworkticket);
 }

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

@@ -121,4 +121,7 @@ public interface ITInvoiceBookingworkticketService extends IService<TInvoiceBook
      * @return 结果
      */
     public  TInvoiceContractor selectTInvoiceContractorByName(String username);
+
+
+    List<TInvoiceWorkcontent> selectTInvoiceWorkcontentList(TInvoiceBookingworkticket tInvoiceBookingworkticket);
 }

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

@@ -181,4 +181,9 @@ public class TInvoiceBookingworkticketServiceImpl extends ServiceImpl<TInvoiceBo
     public TInvoiceContractor selectTInvoiceContractorByName(String userId) {
         return  tInvoiceContractorMapper.selectTInvoiceContractorByName(userId);
     }
+
+    @Override
+    public List<TInvoiceWorkcontent> selectTInvoiceWorkcontentList(TInvoiceBookingworkticket tInvoiceBookingworkticket) {
+        return tInvoiceBookingworkticketMapper.selectTInvoiceWorkcontentList(tInvoiceBookingworkticket);
+    }
 }

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/InvoiceEndSuccessListener.java

@@ -252,9 +252,9 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
             if(tInvoiceWorkcontent.getReservationNumber()!=null){
                 params.put("associated"+i, Texts.of(tInvoiceWorkcontent.getReservationNumber()).fontSize(10).bold().create());
             }
-            //申请单编号
+            //申请单编号  字体红色
             if (!params.containsKey("application")) {
-                params.put("application", Texts.of(DateUtils.dateTimeNow()).fontSize(10).bold().create());
+                params.put("application", Texts.of(DateUtils.dateTimeNow()).fontSize(10).color("FF0000").bold().create());
             }
             //暂定的批准日期
             if(tApproveReserveInvoice.getEnddate()!=null) {

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

@@ -26,6 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reservationNumber"    column="reservation_number"    />
         <result property="filename"    column="filename"    />
         <result property="userUnit"    column="user_unit"    />
+        <!--关联属性的映射关系-->
+        <!-- column: 对应的外键。  -->
+      <!--  <collection property="tInvoiceWorkcontentList" ofType="TInvoiceWorkcontent" column="id"
+                    select="getWorkcontentList"></collection>-->
+
     </resultMap>
 
     <resultMap type="TInvoiceBookingworkticketVo" id="TInvoiceBookingworkticketResultVo">
@@ -45,23 +50,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bookingticketId"    column="id"    />
     </resultMap>
 
+    <resultMap type="TInvoiceWorkcontent" id="TInvoiceWorkcontentResult">
+        <result property="id"    column="id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="workType"    column="work_type"    />
+        <result property="riskLevel"    column="risk_level"    />
+        <result property="workDescription"    column="work_description"    />
+        <result property="workPeopleNumber"    column="work_people_number"    />
+        <result property="guardianUnit"    column="guardian_unit"    />
+        <result property="estimateWorktime"    column="estimate_worktime"    />
+        <result property="bookingticketId"    column="bookingticket_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName" column="dept_name" />
+        <result property="reservationNumber"    column="reservation_number"    />
+    </resultMap>
+
     <sql id="selectTInvoiceBookingworkticketVo">
         select d.id, d.work_unit, d.work_area, d.unit_number, d.floor_location, d.work_start_time, d.work_end_time, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.contact, d.phonenumber, d.status, d.dept_id, d.user_mg ,d.user_unit,s.dept_name,d.filename,d.reservation_number from t_invoice_bookingworkticket d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
+    <sql id="selectTInvoiceWorkcontentVo">
+        select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.work_type, d.risk_level, d.work_description, d.work_people_number, d.guardian_unit, d.estimate_worktime, d.bookingticket_id, d.dept_id ,d.reservation_number,s.dept_name from t_invoice_workcontent d
+       left join sys_dept s on s.dept_id = d.dept_id  left join t_invoice_bookingworkticket b on d.bookingticket_id =b.id
+    </sql>
+
     <select id="selectTInvoiceBookingworkticketList" parameterType="TInvoiceBookingworkticket" resultMap="TInvoiceBookingworkticketResult">
         <include refid="selectTInvoiceBookingworkticketVo"/>
         <where>
-            <if test="workUnit != null "> and work_unit = #{workUnit}</if>
-            <if test="workArea != null "> and work_area = #{workArea}</if>
-            <if test="unitNumber != null "> and unit_number = #{unitNumber}</if>
-            <if test="floorLocation != null "> and floor_location = #{floorLocation}</if>
+            <if test="workUnit != null and workUnit != ''"> and work_unit = #{workUnit}</if>
+            <if test="workArea != null and workArea != ''"> and work_area = #{workArea}</if>
+            <if test="unitNumber != null and unitNumber != ''"> and unit_number = #{unitNumber}</if>
+            <if test="floorLocation != null and floorLocation != ''"> and floor_location = #{floorLocation}</if>
             <if test="workStartTime != null "> and work_start_time = #{workStartTime}</if>
             <if test="workEndTime != null "> and work_end_time = #{workEndTime}</if>
-            <if test="createrCode != null "> and creater_code = #{createrCode}</if>
+            <if test="createrCode != null and createrCode != ''"> and creater_code = #{createrCode}</if>
             <if test="createdate != null "> and createdate = #{createdate}</if>
-            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updaterCode != null and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="contact != null  and contact != ''"> and contact = #{contact}</if>
             <if test="phonenumber != null  and phonenumber != ''"> and phonenumber = #{phonenumber}</if>
@@ -71,6 +100,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userUnit != null "> and user_unit = #{userUnit}</if>
             <if test="reservationNumber != null "> and reservation_number = #{reservationNumber}</if>
             <if test="filename != null  and filename != ''"> and filename like concat(concat('%', #{filename}), '%')</if>
+            <if test="workType != null "> and b.work_type = #{workType}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <!-- 新的list方法 -->
+    <select id="selectTInvoiceWorkcontentList" parameterType="TInvoiceBookingworkticket" resultMap="TInvoiceWorkcontentResult">
+        <include refid="selectTInvoiceWorkcontentVo"/>
+        <where>
+            <if test="createrCode != null "> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="workType != null "> and work_type = #{workType}</if>
+        <!--   &lt;!&ndash; <if test="riskLevel != null "> and risk_level = #{riskLevel}</if>&ndash;&gt;
+            <if test="workDescription != null  and workDescription != ''"> and work_description = #{workDescription}</if>
+            <if test="workPeopleNumber != null "> and work_people_number = #{workPeopleNumber}</if>
+            <if test="guardianUnit != null  and guardianUnit != ''"> and guardian_unit = #{guardianUnit}</if>
+            <if test="estimateWorktime != null  and estimateWorktime != ''"> and estimate_worktime = #{estimateWorktime}</if>
+            <if test="bookingticketId != null "> and bookingticket_id = #{bookingticketId}</if>
+            <if test="reservationNumber != null  and reservationNumber != ''"> and reservation_number = #{reservationNumber}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>-->
+            <if test="workUnit != null and workUnit != ''"> and b.work_unit = #{workUnit}</if>
+            <if test="workArea != null and workArea != ''"> and b.work_area = #{workArea}</if>
+            <if test="floorLocation != null and floorLocation != ''"> and b.floor_location = #{floorLocation}</if>
+            <if test="workStartTime != null "> and b.work_start_time = #{workStartTime}</if>
+            <if test="workEndTime != null "> and b.work_end_time = #{workEndTime}</if>
+            <if test="contact != null  and contact != ''"> and b.contact = #{contact}</if>
+            <if test="phonenumber != null  and phonenumber != ''"> and  b.phonenumber = #{phonenumber}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -89,6 +149,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and d.del_flag = 0
     </select>
 
+ <!--   <select id="getWorkcontentList" resultType="TInvoiceWorkcontent" parameterType="int">
+        SELECT
+            b.id ,b.work_description, b.work_type , b.bookingticket_id
+        FROM t_invoice_workcontent b
+        <where>
+           b.bookingticket_id = #{id}
+            <if test="workType != null "> and work_type = #{workType}</if>
+        </where>
+    </select>-->
+
     <insert id="insertTInvoiceBookingworkticket" parameterType="TInvoiceBookingworkticket" useGeneratedKeys = "true" keyProperty = "id">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT t_bookingworkticket_seq.NEXTVAL as id FROM DUAL

ui/src/api/invoice/bookingworkticket.js

@@ -60,3 +60,12 @@ export function seeBookingworkticket(query) {
     params: query
   })
 }
+
+//筛选出不同作业类型的台账数据
+export function workType(query) {
+  return request({
+    url: '/invoice/bookingworkticket/workType',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -7,21 +7,21 @@
           placeholder="请输入作业单位"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+         @input="handleQuery"
         />
       </el-form-item>
       <el-form-item label="作业区域" prop="workArea">
-        <el-select v-model="queryParams.workArea" placeholder="请选择作业区域" clearable size="small">
-             <el-option
+        <el-select v-model="queryParams.workArea" placeholder="请选择作业区域" clearable size="small" @change="handleQuery">
+                <el-option
             v-for="dict in workAreaOptions"
-             :key="dict.id"
-            :label="dict.workArea"
-            :value="dict.workArea"
+            :key="dict.id"
+            :label="dict"
+            :value="dict"
                  ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="楼层位置" prop="floorLocation">
-        <el-select v-model="queryParams.floorLocation" placeholder="请选择楼层位置" clearable size="small">
+        <el-select v-model="queryParams.floorLocation" placeholder="请选择楼层位置" clearable size="small" @change="handleQuery">
             <el-option
             v-for="dict in floorLocationOptions"
             :key="dict.dictValue"
@@ -35,7 +35,8 @@
           v-model="queryParams.workStartTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择 作业开始时间">
+          placeholder="选择 作业开始时间"
+           @input="handleQuery">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="作业结束时间" prop="workEndTime">
@@ -43,8 +44,19 @@
           v-model="queryParams.workEndTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择作业结束时间">
+          placeholder="选择作业结束时间"
+           @input="handleQuery">
         </el-date-picker>
+      </el-form-item>
+       <el-form-item label="作业类型" prop="workType">
+        <el-select v-model="queryParams.workType" placeholder="请选择作业类型" clearable size="small" @change="handleQuery">
+       <el-option
+            v-for="dict in workTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="联系人" prop="contact">
         <el-input
@@ -52,7 +64,7 @@
           placeholder="请输入联系人"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+        @input="handleQuery"
         />
       </el-form-item>
       <el-form-item label="联系方式" prop="phonenumber">
@@ -61,7 +73,7 @@
           placeholder="请输入联系方式"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+        @input="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -115,11 +127,25 @@
       <el-table-column label="预计作业时间" align="center" prop="estimateWorktime" :show-overflow-tooltip="true"/>
       <el-table-column label="联系人" align="center" prop="bookingworkticket.contact" :show-overflow-tooltip="true"/>
       <el-table-column label="联系方式" align="center" prop="bookingworkticket.phonenumber" :show-overflow-tooltip="true"/>
-      <el-table-column label="状态" align="center" prop="bookingworkticket.status" width="100" :formatter="statusFormat" />
+      <el-table-column label="状态" align="center" prop="bookingworkticket.status" :formatter="statusFormat" />
+      <el-table-column label="预约票" align="center" >
+      <el-table-column label="票号"  align="center" prop="reservationNumber" width="180"></el-table-column>
+       <el-table-column label="关联"  align="center">
+         <template slot-scope="scope">
+          <el-button
+            v-if="scope.row.bookingworkticket.status== 3"
+            size="mini"
+            type="text"
+            icon="el-icon-s-promotion"
+            @click="association(scope.row)"
+          >关联票号</el-button>
+           </template>
+         </el-table-column>
+      </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-          v-if="scope.row.status== 0"
+          v-if="scope.row.bookingworkticket.status== 0"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -127,28 +153,21 @@
             v-hasPermi="['invoice:bookingworkticket:edit']"
           >修改</el-button>
           <el-button
-            v-if="scope.row.status== 0"
+            v-if="scope.row.bookingworkticket.status== 0"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleDelete(scope.row)"
           >删除</el-button>
-           <el-button
-            v-if="scope.row.status== 3"
-            size="mini"
-            type="text"
-            icon="el-icon-s-promotion"
-            @click="association(scope.row)"
-          >关联票号</el-button>
           <el-button
-             v-if="scope.row.status== 3"
+             v-if="scope.row.bookingworkticket.status== 3"
               size="mini"
               type="text"
               icon="el-icon-view"
               @click="billSee(scope.row)"
             > {{ $t('票据预览') }}</el-button>
            <el-button
-              v-if="scope.row.status== 3"
+              v-if="scope.row.bookingworkticket.status== 3"
             size="mini"
              type="text"
               icon="el-icon-download"
@@ -736,17 +755,8 @@ export default {
         //得到用户名-承包商名称
        listBookingworkticket(this.queryParams).then(response => {
          this.bookingworkticketList=response.rows;
-          for(let i = 0; i <  this.bookingworkticketList.length; i++) {
-                  Object.assign(this.bookingworkticketList[i],{workUnit:this.bookingworkticketList[i].bookingworkticket.workUnit}
-                  ,{workArea:this.bookingworkticketList[i].bookingworkticket.workArea}
-                  ,{floorLocation:this.bookingworkticketList[i].bookingworkticket.floorLocation}
-                  ,{contact:this.bookingworkticketList[i].bookingworkticket.contact}
-                  ,{phonenumber:this.bookingworkticketList[i].bookingworkticket.phonenumber}
-                  ,{status:this.bookingworkticketList[i].bookingworkticket.status});
-
-          }
-
-    //      console.log(this.bookingworkticketList)
+     
+        
        this.total = response.total;
         this.loading = false;
       });
@@ -759,7 +769,7 @@ export default {
      },
  // 状态字典翻译
     statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status);
+      return this.selectDictLabel(this.statusOptions, row.bookingworkticket.status);
     },
     // 字典翻译
     workUnitFormat(row, column) {
@@ -776,7 +786,7 @@ export default {
     // 字典翻译
     floorLocationFormat(row, column) {
 
-      return this.selectDictLabels(this.floorLocationOptions, row.floorLocation);
+      return this.selectDictLabels(this.floorLocationOptions, row.bookingworkticket.floorLocation);
     },
      // 字典翻译
     userMgFormat(row, column) {
@@ -794,10 +804,6 @@ export default {
     riskLevelFormat(row, column) {
       return this.selectDictLabel(this.riskLevelOptions, row.riskLevel);
     },
-    // 字典翻译
-    guardianUnitFormat(row, column) {
-      return this.selectDictLabel(this.guardianUnitOptions, row.guardianUnit);
-    },
 
     // 取消按钮
     cancel() {
@@ -886,7 +892,7 @@ export default {
            //  回显用户主管
         this.checkCategoryPromotion(this.form.userUnit);
     //  console.log(row.floorLocation)  将后台的字符串数组重新转换为el-select要的数组格式
-       let arr=row.floorLocation.split(",")
+       let arr=row.bookingworkticket.floorLocation.split(",")
        let st=[]
 		// 将字符串数组的每一项转换成Number，生成一个新的数组
       	for (var arrInt in arr) {
@@ -1016,6 +1022,9 @@ export default {
       association(row){
        this.guanlianVisible=true
        this.associationParams=row
+       getWorkcontent(row.id).then(response => {
+           this.reservationNumber=response.data.reservationNumber
+          });
       },
       //提交票号
        submitassociation(){
@@ -1094,7 +1103,7 @@ export default {
             colspan: _col
           };
         }
-        if (columnIndex === 14) {
+        if (columnIndex === 15) {
           const _row = this.setTable(this.bookingworkticketList).merge[rowIndex];
           const _col = _row > 0 ? 1 : 0;
           return {