hjg
2024-03-18 8d48c59d5d3bcc4148ef97dc6f98e3a8cf9ca436
显示排队序号
已修改3个文件
54 ■■■■ 文件已修改
JavaSource/com/mandi/fendan/mapper/xmls/BusinessMapper.xml 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebContent/basic/js/vehicleTask.js 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebContent/basic/vehicleTask.xhtml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
JavaSource/com/mandi/fendan/mapper/xmls/BusinessMapper.xml
@@ -25,51 +25,14 @@
        ,min('') sendmsg,min(a.shdw) shdw,min(a.status) status,min(a.vehicleId) vehicleId,min(a.bsNo) bussinessNo
        ,min(a.status) sstatus,min('产品销售') name,min('') dcompany,min(a.shdw) rcompany
        ,min('businesstype00002') businesstypeNo,min('') instanceID,min('') canedit,min(0) fdnum,min(0) fdweight
        ,min(0) fdCnum,min(0) fdCweight, ('false') hasCard
         from fd_bsheet a left join fd_company_vehicle v on a.vehicleId=v.vehicleId and a.sdepartNo=v.sdepartNo
    <!--      <choose>
             <when test=" companyNo !=null and companyNo !='' ">
                 left join fd_company_vehicle v on a.vehicleId=v.vehicleId and a.sdepartNo=v.sdepartNo
                 <if test="cqV !=null and cqV !='' " >
                    <choose>
                        <when test="cqV=='03' || cqV=='05' ">
                            and v.sdepartNo=#{cqV}
                        </when>
                        <otherwise>
                            and v.sdepartNo !='03' and v.sdepartNo !='05'
                        </otherwise>
                    </choose>
                </if>
             </when>
             <otherwise>
                 left join  fd_company_vehicle v on a.vehicleId=v.vehicleId and a.sdepartNo=v.sdepartNo
                 <if test="cqV !=null and cqV !='' " >
                    <choose>
                        <when test="cqV=='03' || cqV=='05' ">
                            and v.sdepartNo=#{cqV}
                        </when>
                        <otherwise>
                            and v.sdepartNo !='03' and v.sdepartNo !='05'
                        </otherwise>
                    </choose>
                </if>
             </otherwise>
         </choose> -->
        ,min(0) fdCnum,min(0) fdCweight, ('false') hasCard,max(vq.xspdindx) xspdindx
         from fd_bsheet a left join fd_company_vehicle v on a.vehicleId=v.vehicleId and a.sdepartNo=v.sdepartNo
        left join vehicle_queuing vq on vq.numberplates=a.vehicleId and (a.sdepartNo=vq.sdepartNo or vq.sdepartNO is null)
        <where>
             a.status='在办' 
             <if test="cqV !=null and cqV !='' ">
                     and a.sdepartNo=#{cqV}
                 </if>
            <!-- <if test='cqV &gt;= 0'>
                <choose>
                    <when test="cqV==0">
                        and a.sdepartNo!='03'
                    </when>
                    <otherwise>
                        and a.sdepartNo='03'
                    </otherwise>
                </choose>
            </if> -->
            <if test="companyNo !=null and companyNo !='' ">
                and v.companyNo=#{companyNo} and v.vehicleId !='' and v.vehicleId is not null 
            </if>
WebContent/basic/js/vehicleTask.js
@@ -86,7 +86,11 @@
    }
    self.vList = ko.observableArray();
    self.getSdepartName = function (sdepartNo) {
        if(sdepartNo == '08') return "义瑞新材";
        if(sdepartNo == '04') return "明泰科技";
        if(sdepartNo == '06') return "郑州明泰";
    }
    //厂区
    self.cqVal=ko.observable(0);
    self.cqList=ko.observableArray();
@@ -109,6 +113,7 @@
    pageInit();
});
function pageInit() {
    I.sendBtn.click(function (e) { 
        e.preventDefault();
WebContent/basic/vehicleTask.xhtml
@@ -96,6 +96,7 @@
                            <th style="min-width: 100px"><span class="th">本公司配车数量</span></th>
                            <th style="min-width: 80px"><span class="th">配车总重量</span></th>
                            <th style="min-width: 80px"><span class="th">配车总数量</span></th>
                            <th style="min-width: 80px"><span class="th">排队序号</span></th>
                            <th style="min-width: 100px"><span class="th">司机</span></th>
                            <th style="min-width: 75px"><span class="th">联系电话</span></th>
                            <th style="min-width: 120px; width: 100px"><span class="th">邀请码</span></th>
@@ -127,6 +128,7 @@
                            <td data-bind="text: fdnum"></td>
                            <td data-bind="text: fdCweight"></td>
                            <td data-bind="text: fdCnum"></td>
                            <td data-bind="text: $data.xspdindx"></td>
                            <td data-bind="text: driver"></td>
                            <td data-bind="text: phone"></td>
                            <td>
@@ -137,7 +139,7 @@
                            </td>
                            <td data-bind="text: companyName" style="text-align: left"></td>
                            <td data-bind="text: rcompany" style="text-align: left"></td>
                            <td data-bind="text: sdepartNo=='04'?'明泰科技':'河南明晟' " style="text-align: left"></td>
                            <td data-bind="text: $root.getSdepartName(sdepartNo)" style="text-align: left"></td>
                        </tr>
                    </tbody>