张丁 修改合并数据页面bug

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

@@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTInvoiceWorkcontentVo"/>
         <where>
             <if test="createrCode != null "> and creater_code = #{createrCode} </if>
-            <if test="createdate != null "> and to_char(d.createdate, 'yyyy-mm-dd') = to_char(SYSDATE, 'yyyy-mm-dd')</if>
+            <if test="createdate != null "> and to_char(b.createdate, 'yyyy-mm-dd') = to_char(#{createdate}, 'yyyy-mm-dd')</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>
@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by b.work_start_time desc
+        order by b.work_start_time ,d.bookingticket_id desc
     </select>
 
     <select id="selectDetailById" parameterType="Long" resultMap="TInvoiceBookingworkticketResultVo">

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

@@ -47,6 +47,15 @@
           placeholder="选择作业结束时间"
            @input="handleQuery">
         </el-date-picker>
+      </el-form-item>
+         <el-form-item label="作业创建时间" prop="createdate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.createdate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          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">
@@ -127,6 +136,11 @@
       <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="createdate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="bookingworkticket.status" :formatter="statusFormat" />
       <el-table-column label="票号"  align="center" prop="reservationNumber" width="180">
          <template slot-scope="scope">
@@ -135,7 +149,7 @@
             v-if="scope.row.bookingworkticket.status== 3"
             size="mini"
             type="text"
-            icon="el-icon-s-promotion"
+            icon="el-icon-s-edit"
             @click="association(scope.row)"
             v-hasPermi="['invoice:bookingworkticket:edit','invoice:bookingworkticket:query']"
           ></el-button>
@@ -852,13 +866,12 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      //搜索时全放开
-      this.queryParams.createdate=null;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.createdate=null
       this.handleQuery();
     },
     //取消搜索
@@ -1135,6 +1148,7 @@ export default {
       },
       //单元格整理
         setTable(tableData) {
+      //    console.log(tableData)
         let spanArr = [],
           concat = 0;
         tableData.forEach((item, index) => {