LY 工作票 bugfix

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

@@ -73,6 +73,7 @@
         <result property="mbzyxkzh" column="mbzyxkzh"/>
         <result property="gczyxkzh" column="gczyxkzh"/>
         <result property="gczyjb" column="gczyjb"/>
+        <result property="addStatus" column="add_status"/>
     </resultMap>
 
     <sql id="selectTInvoiceBookingworkticketVo">
@@ -126,7 +127,8 @@
                d.gczyjb,
                d.tag,
                d.yqxkzh,
-               d.xpxp
+               d.xpxp,
+               d.add_status
         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

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

@@ -30,11 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tag"    column="tag"    />
         <result property="yqxkzh"    column="yqxkzh"    />
         <result property="xpxp"    column="xpxp"    />
+        <result property="addStatus"    column="add_status"    />
     </resultMap>
 
     <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.hpjb, d.estimate_worktime, d.bookingticket_id, d.dept_id ,
-               d.whgzxkzh,d.dhzyxkzh,d.xzkjxkzh,d.mbzyxkzh,d.gczyxkzh,d.gczyjb,d.reservation_number,d.tag,d.yqxkzh,d.xpxp,s.dept_name from t_invoice_workcontent d
+               d.whgzxkzh,d.dhzyxkzh,d.xzkjxkzh,d.mbzyxkzh,d.gczyxkzh,d.gczyjb,d.reservation_number,d.tag,d.yqxkzh,d.xpxp,d.add_status, s.dept_name from t_invoice_workcontent d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -180,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tag != null">tag = #{tag},</if>
             <if test="yqxkzh != null">yqxkzh = #{yqxkzh},</if>
             <if test="xpxp != null">xpxp = #{xpxp},</if>
+            <if test="addStatus != null">add_status = #{addStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -835,7 +835,7 @@ export default {
     getDeviceup() {
       const queryForm = {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 99999,
         devName: null,
         workArea: null,
         regionalHead: null,
@@ -1183,6 +1183,9 @@ export default {
               this.ruleForm[b].workType = this.ruleForm[b].workType.join(',')
             }
             addBookingworkticket(this.form).then(response => {
+              if (response.code == 500) {
+                return
+              }
               // console.log(this.form)
               //   console.log(this.ruleForm)
               this.approveForm.invoiceId = response.data
@@ -1261,6 +1264,9 @@ export default {
           this.form.tInvoiceWorkcontentList[0].xpxp = 12    //续票
           this.form.status = 0
           addBookingworkticket(this.form).then(response => {
+            if (response.code == 500) {
+              return
+            }
             this.approveForm.invoiceId = response.data
             this.approveForm.userSupId = this.form.userMg
             addInvoice(this.approveForm).then(response => {