Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue

@@ -284,7 +284,7 @@ export default {
     getType() {
       // 付款方式
       typeValues({
-        type: 'paymentType'
+        type: 'customerPayType'
       }).then((res) => {
         if (res.code === '200') {
           this.paymentType_list = res.data

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue

@@ -235,6 +235,7 @@ export default {
         if (response.code) {
           this.temp = response.data
           this.temp.depositBillType = depositBillType
+          this.temp.instanceId = response.data.procInsId
         }
       })
     },
@@ -279,6 +280,10 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请选择客户' })
         return
       }
+      if (this.temp.carList.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '预顶车辆信息表不能为空' })
+        return
+      }
       if (this.temp.carList.length > 0) {
         for (var i = 0; i < this.temp.carList.length; i++) {
           if (this.temp.carList[i].depositDate === '') {

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanguanli.vue

@@ -38,7 +38,7 @@
             <el-table-column width="130px" label="操作" align="center">
               <template slot-scope="scope">
                 <div class="searchbtns">
-                  <el-button size="mini" type="primary" :disabled="scope.row.nodeState == '待提交' ? false : scope.row.nodeState == '销售专员' ? false : true" @click="handleEdit(scope.row)">办理
+                  <el-button size="mini" type="primary" :disabled="scope.row.nodeState == '待提交' ? false : scope.row.nodeState == '销售专员申请' ? false : true" @click="handleEdit(scope.row)">办理
                   </el-button>
                   <el-button size="mini" type="primary" @click="handleCheck(scope.row)">查看</el-button>
                 </div>

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue

@@ -268,7 +268,7 @@ export default {
     getType() {
       // 付款方式
       typeValues({
-        type: 'paymentType'
+        type: 'customerPayType'
       }).then((res) => {
         if (res.code === '200') {
           this.paymentType_list = res.data
@@ -393,6 +393,7 @@ export default {
           this.temp = response.data
           this.temp.sid = response.data.virtualOrderSid
           this.temp.depositBillType = depositBillType
+          this.temp.instanceId = response.data.procInsId
           if (response.data.payImages.length > 0) {
             const imgName = response.data.payImages[response.data.payImages.length - 1].split('/')
             this.list1.push({

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue

@@ -466,7 +466,7 @@ export default {
       this.dialogUrl = row.payFile
     },
     handlePrint(row) {
-      req.createPdf({ sid: row.sid }).then((resp) => {
+      req.createPdf({ sid: row.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
         if (resp.success && resp.data.pdfPath !== '') {
           var xhr = new XMLHttpRequest()
           xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '出纳', true)