Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js

@@ -135,6 +135,15 @@ export function getRetrievalApplyInfo(data) {
   })
 }
 
+// 待出库车辆选择后--返回出库申请页面调用初始化
+export function getRetrievalApplyInfoBySid(data) {
+  return request({
+    url: '/buscenter/v1/busdeliveredapply/getRetrievalApplyInfoBySid',
+    method: 'get',
+    params: data
+  })
+}
+
 // 补充待出库车辆选择后--返回出库申请页面调用--仅返回车辆列表信息
 export function selectInfo(data) {
   return request({

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue

@@ -163,7 +163,7 @@
 </template>
 
 <script>
-import { getRetrievalApplyInfo, trailerList } from '@/api/chukuguanli/chukubanli'
+import { getRetrievalApplyInfoBySid, trailerList } from '@/api/chukuguanli/chukubanli'
 import userInfoLook from './relation/userInfoLook'
 import guacheInfo from './relation/guacheInfo'
 import shangzhuangInfo from './relation/shangzhuangInfo'
@@ -222,14 +222,6 @@ export default {
         userSid: '',
         discountLeave: []
       },
-      arguments: {
-        list: [],
-        userSid: '',
-        orgPath: '',
-        contractId: '',
-        outboundSid: '',
-        pcView: true
-      },
       rules: {}
     }
   },
@@ -242,8 +234,7 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
-      this.arguments.outboundSid = sid
-      getRetrievalApplyInfo(this.arguments).then((response) => {
+      getRetrievalApplyInfoBySid({ sid: sid }).then((response) => {
         if (response.success) {
           this.formobj = response.data
         }

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue

@@ -201,7 +201,7 @@
 </template>
 
 <script>
-import { getRetrievalApplyInfo, trailerList, complete, breakProcess, reject, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/chukuguanli/chukubanli'
+import { getRetrievalApplyInfoBySid, trailerList, complete, breakProcess, reject, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/chukuguanli/chukubanli'
 import userInfo from './relation/userInfo'
 import guacheInfo from './relation/guacheInfo'
 import shangzhuangInfo from './relation/shangzhuangInfo'
@@ -335,7 +335,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
       })
       this.arguments.outboundSid = sid
-      getRetrievalApplyInfo(this.arguments).then((response) => {
+      getRetrievalApplyInfoBySid(this.arguments).then((response) => {
         if (response.success) {
           this.formobj = response.data
         }

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue

@@ -173,7 +173,7 @@
 </template>
 
 <script>
-import { getRetrievalApplyInfo, trailerList, revokeProcess } from '@/api/chukuguanli/chukubanli'
+import { getRetrievalApplyInfoBySid, trailerList, revokeProcess } from '@/api/chukuguanli/chukubanli'
 import userInfo from './relation/userInfo'
 import guacheInfo from './relation/guacheInfo'
 import shangzhuangInfo from './relation/shangzhuangInfo'
@@ -293,7 +293,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
       })
       this.arguments.outboundSid = sid
-      getRetrievalApplyInfo(this.arguments).then((response) => {
+      getRetrievalApplyInfoBySid(this.arguments).then((response) => {
         if (response.success) {
           this.formobj = response.data
         }

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue

@@ -270,6 +270,12 @@
         </div>
         <div v-if="formobj.typeKey == '02'">
           <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="24">
+              <div class="span-sty">资方及产品政策</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.policyName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="8">
               <div class="span-sty">厂家贴息</div>
               <el-form-item>
@@ -310,7 +316,7 @@ export default {
   },
   methods: {
     showInfo(value) {
-      this.viewTitle = '金融方案'
+      this.viewTitle = '单车金融方案'
       this.formobj = value
     },
     handleReturn() {
@@ -322,10 +328,10 @@ export default {
 
 <style scoped>
 .span-sty {
-  width: 130px !important;
+  width: 140px !important;
 }
 .addinputInfo {
-  margin-left: 120px !important;
+  margin-left: 130px !important;
 }
 .tlineheightb {
   display: flex;

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue

@@ -365,6 +365,14 @@
         </div>
         <div v-if="formobj.typeKey == '02'">
           <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="24">
+              <div class="span-sty">资方及产品政策</div>
+              <el-form-item>
+                <el-input class="addinputw" v-model="formobj.policyName" placeholder="" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>厂家贴息</div>
               <el-form-item>
@@ -492,7 +500,7 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.viewTitle = '金融方案'
+      this.viewTitle = '单车金融方案'
       // vue将一个data/DataSource对象变量赋值给另一个，结果两个对象变量同时变化的解决办法
       // this.formobj = JSON.parse(JSON.stringify(value))
       selectDetailss({ businessSid: val }).then((res) => {
@@ -786,13 +794,13 @@ export default {
 
 <style scoped>
 .span-sty {
-  width: 130px !important;
+  width: 140px !important;
 }
 .addinputInfo {
-  margin-left: 120px !important;
+  margin-left: 130px !important;
 }
 .addinputw {
-  margin-left: 120px !important;
+  margin-left: 130px !important;
 }
 
 .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue

@@ -270,6 +270,12 @@
         </div>
         <div v-if="formobj.typeKey == '02'">
           <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="24">
+              <div class="span-sty">资方及产品政策</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.policyName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="8">
               <div class="span-sty">厂家贴息</div>
               <el-form-item>
@@ -310,7 +316,7 @@ export default {
   },
   methods: {
     showInfo(value) {
-      this.viewTitle = '金融方案'
+      this.viewTitle = '单车金融方案'
       this.formobj = value
     },
     handleReturn() {
@@ -322,10 +328,10 @@ export default {
 
 <style scoped>
 .span-sty {
-  width: 130px !important;
+  width: 140px !important;
 }
 .addinputInfo {
-  margin-left: 120px !important;
+  margin-left: 130px !important;
 }
 .tlineheightb {
   display: flex;

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue

@@ -263,6 +263,7 @@ export default {
       index: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
+      nodeState_list: [],
       FormLoading: false,
       listLoading: false,
       contractLoading: false,
@@ -385,10 +386,13 @@ export default {
     // 信息条数 获取点击时当前的sid
     handleSelectionChange(row) {
       const aa = []
+      const bb = []
       row.forEach(element => {
         aa.push(element.sid)
+        bb.push(element.nodeState)
       })
       this.sids = aa
+      this.nodeState_list = bb
     },
     // 表中序号
     indexMethod(index) {
@@ -470,8 +474,13 @@ export default {
     },
     toArrear() {
       if (this.sids.length === 1) {
-        this.viewState = 5
-        this.$refs['divArrearScollection'].showAdd(this.sids[0])
+        if (this.nodeState_list[0] === '已办结') {
+          this.viewState = 5
+          this.$refs['divArrearScollection'].showAdd(this.sids[0])
+        } else {
+          this.$message({ showClose: true, type: 'error', message: '请选择状态为已办结的进行欠款领票操作' })
+          return
+        }
       } else {
         this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行欠款领票操作' })
         return

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue

@@ -91,7 +91,7 @@
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column label="操作" align="center" width="80">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
+                <el-button type="danger" size="mini" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
               </template>
             </el-table-column>
             <el-table-column label="车架号" align="center">
@@ -464,14 +464,14 @@ export default {
       })
     },
     handleDelete(row, index) {
-      this.formobj.finBillVehicles.splice(index, 1)
-      if (this.formobj.trailersList.length > 0) {
-        this.formobj.trailersList.forEach((e, item) => {
+      if (this.formobj.finBillTrailers.length > 0) {
+        this.formobj.finBillTrailers.forEach((e, item) => {
           if (e.vinNo === row.vinNo) {
-            this.formobj.trailersList.splice(item, 1)
+            this.formobj.finBillTrailers.splice(item, 1)
           }
         })
       }
+      this.formobj.finBillVehicles.splice(index, 1)
     },
     handleSave() {
       this.$refs['form_obj'].validate((valid) => {

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue

@@ -372,8 +372,8 @@ export default {
       if (this.sids.length === 1) {
         if (this.nodeState_list.length > 0) {
           for (var i = 0; i < this.nodeState_list.length; i++) {
-            if (this.nodeState_list[i] === '作废' || this.nodeState_list[i] === '已移交') {
-              this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含作废或已移交的,操作失败' })
+            if (this.nodeState_list[i] === '作废' || this.nodeState_list[i] === '已开票') {
+              this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含作废或已开票的,操作失败' })
               return
             }
           }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue

@@ -61,23 +61,23 @@
             <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="span-sty">开票日期</div>
+            <div class="span-sty"><span class="icon">*</span>开票日期</div>
             <el-form-item><el-date-picker v-model="formobj.createTime" class="addinputw" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <div class="span-sty">发票号</div>
+            <div class="span-sty"><span class="icon">*</span>发票号</div>
             <el-form-item><el-input v-model="formobj.invoiceNo" clearable class="addinputw" /></el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="span-sty">发票代码</div>
+            <div class="span-sty"><span class="icon">*</span>发票代码</div>
             <el-form-item><el-input v-model="formobj.invoiceCode" clearable class="addinputw" /></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">发票照片</div>
+            <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"><span class="icon">*</span>发票照片</div>
             <el-form-item>
               <upload ref="uploadImg" v-model="diploma_list" :accept="accept" class="addinputw" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
             </el-form-item>
@@ -220,7 +220,23 @@ export default {
     handleSubmit() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.invoiceNo === '') {
+            this.$message({ showClose: true, type: 'error', message: '发票号不能为空' })
+            return
+          }
+          if (this.formobj.invoiceCode === '') {
+            this.$message({ showClose: true, type: 'error', message: '发票代码不能为空' })
+            return
+          }
+          if (this.formobj.createTime === '') {
+            this.$message({ showClose: true, type: 'error', message: '开票日期不能为空' })
+            return
+          }
           this.getUrl()
+          if (this.formobj.filePaths === 0) {
+            this.$message({ showClose: true, type: 'error', message: '请上传发票照片' })
+            return
+          }
           this.submitdisabled = true
           this.formobj.tempSave = false
           saveOrUpdate(this.formobj).then((res) => {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByDivisionDaiBanInfo.vue

@@ -125,40 +125,42 @@
             <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
         </el-row>
-        <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center" width="160">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center" width="120">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证" align="center" width="100">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-            </template>
-          </el-table-column>
-        </el-table>
+        <div v-if="formobj.finBillTrailers !== null">
+          <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center" width="160">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceInfo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" align="center" width="100">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
         <div class="title">证件(营业执照或身份证)</div>
         <el-row>
           <el-col :span="24">

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByFileDaiBanInfo.vue

@@ -125,40 +125,42 @@
             <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
         </el-row>
-        <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center" width="160">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center" width="120">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证" align="center" width="100">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-            </template>
-          </el-table-column>
-        </el-table>
+        <div v-if="formobj.finBillTrailers !== null">
+          <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center" width="160">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceInfo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" align="center" width="100">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
         <div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
         <el-row>
           <el-col :span="24">

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingDaiBanInfo.vue

@@ -125,40 +125,42 @@
             <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
         </el-row>
-        <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center" width="160">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center" width="120">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证" align="center" width="100">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-            </template>
-          </el-table-column>
-        </el-table>
+        <div v-if="formobj.finBillTrailers !== null">
+          <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center" width="160">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceInfo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" align="center" width="100">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
         <div class="title">证件(营业执照或身份证)</div>
         <el-row>
           <el-col :span="24">

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue

@@ -88,7 +88,7 @@
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column label="操作" align="center" width="80">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
+                <el-button type="danger" size="mini" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
               </template>
             </el-table-column>
             <el-table-column label="车架号" align="center">
@@ -432,14 +432,14 @@ export default {
       })
     },
     handleDelete(row, index) {
-      this.formobj.finBillVehicles.splice(index, 1)
-      if (this.formobj.trailersList.length > 0) {
-        this.formobj.trailersList.forEach((e, item) => {
+      if (this.formobj.finBillTrailers.length > 0) {
+        this.formobj.finBillTrailers.forEach((e, item) => {
           if (e.vinNo === row.vinNo) {
-            this.formobj.trailersList.splice(item, 1)
+            this.formobj.finBillTrailers.splice(item, 1)
           }
         })
       }
+      this.formobj.finBillVehicles.splice(index, 1)
     },
     handleSave() {
       this.$refs['form_obj'].validate((valid) => {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue

@@ -123,40 +123,42 @@
             <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
         </el-row>
-        <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center" width="160">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center" width="120">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证" align="center" width="100">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-            </template>
-          </el-table-column>
-        </el-table>
+        <div v-if="formobj.finBillTrailers !== null">
+          <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center" width="160">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceInfo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" align="center" width="100">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
         <div class="title">证件(营业执照或身份证)</div>
         <el-row>
           <el-col :span="24">

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -1553,6 +1553,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
         List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
         List<FinBillFileDto> fjApplicationAppendxs = dto.getFjApplicationAppendxs();
+        if ("是".equals(dto.getIsLQOrigInvoice())){
+            return rb.setMsg("请选择未领取发票原件的申请");
+        }
         if (StringUtils.isBlank(dtoSid)) {//新增
             String qkkpBillNo = dto.getBillNo();
             FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.fetchByQkkpBillNo(qkkpBillNo);

anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue

@@ -142,7 +142,8 @@ export default {
         createTime: '',
         money: '',
         taskId: '',
-        detailsList: []
+        detailsList: [],
+        orgSidPath: ''
       },
       rules: {
         reason: [{ required: true, message: '请填写退库原因', trigger: 'blur' }]
@@ -221,7 +222,8 @@ export default {
         createTime: '',
         money: '',
         taskId: '',
-        detailsList: []
+        detailsList: [],
+        orgSidPath: ''
       }
       this.list = []
       this.submitdisabled = false
@@ -236,6 +238,7 @@ export default {
       this.init()
       this.formobj.name = window.sessionStorage.getItem('name')
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
       this.formobj.money = 0
       req.detailsInfo(this.formobj.sid).then(resp => {
         const data = resp.data