Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@@ -563,6 +563,11 @@ export default {
       viewTitle: '',
       viewState: 1,
       submitdisabled: false,
+      updateAction: process.env.VUE_APP_BASE_API + '/portal/file/upload',
+      fileList: [],
+      headers: {
+        token: window.sessionStorage.getItem('token')
+      },
       user_list: [], // 服务顾问
       subject_list: [], // 科目
       claimManufacturer_list: [], // 索赔厂家

yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue

@@ -188,11 +188,6 @@ export default {
         useOrgSid: '',
         userSid: ''
       },
-      updateAction: process.env.VUE_APP_BASE_API + '/portal/file/upload',
-      fileList: [],
-      headers: {
-        token: window.sessionStorage.getItem('token')
-      },
       btnList: [
         {
           type: 'primary',
@@ -204,8 +199,15 @@ export default {
         {
           type: 'primary',
           size: 'small',
-          icon: 'toSettle',
-          btnKey: 'toEdit',
+          icon: '',
+          btnKey: 'toPrintSettle',
+          btnLabel: '打印结算单'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'toSettle',
           btnLabel: '结算'
         },
         {
@@ -302,6 +304,9 @@ export default {
         case 'toEdit':
           this.toEdit()
           break
+        case 'toPrintSettle':
+          this.toPrintSettle()
+          break
         case 'toSettle':
           this.toSettle()
           break