Finish Hotfix-zh-231

src/views/deposit_commerce/components/deposit-apply-surrender.vue

@@ -337,7 +337,7 @@
             </div>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="申请人" prop="submitBy">
+            <el-form-item label="申请人" prop="submitName">
               <el-input
                 v-model="details.submitName"
                 readonly

src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -345,7 +345,7 @@
             </div>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="申请人" prop="submitBy">
+            <el-form-item label="申请人" prop="submitName">
               <el-input
                 v-model="details.submitName"
                 readonly

src/views/finance/components/design/print-data.js

@@ -66,7 +66,7 @@ function getDetail(ids, nickName) {
               invoiceId: e.invoiceId,
               id: e.id,
               createTime: e.id ? dateToDayFilter(item.createTime) : '',
-              enginOrderType: e.enginOrderType == 'HOME' || e.enginOrderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
+              enginOrderType: e.orderType == 'HOME' || e.orderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
               materialName: e.materialName || '',
               specification: e.specification || '',
               refundableQty: e.refundableQty || 0,

src/views/supply/apply/components/design/print-data.js

@@ -25,7 +25,7 @@ function getDetail(id) {
                       invoiceId: e.invoiceId,
                       id: e.id,
                       createTime: e.id ? dateToDayFilter(item.createTime) : '',
-                      enginOrderType: e.enginOrderType == 'HOME' || e.enginOrderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
+                      enginOrderType: e.orderType == 'HOME' || e.orderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
                       materialName: e.materialName || '',
                       specification: e.specification || '',
                       refundableQty: e.refundableQty || 0,

src/views/supply/deliver/components/design/print-data.js

@@ -40,7 +40,7 @@ function getDetail(ids,nickName) {
                     invoiceId: e.invoiceId,
                     id: e.id,
                     createTime: e.id ? dateToDayFilter(item.createTime) : '',
-                    enginOrderType: e.enginOrderType == 'HOME' || e.enginOrderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
+                    enginOrderType: e.orderType == 'HOME' || e.orderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
                     materialName: e.materialName || '',
                     specification: e.specification || '',
                     refundableQty: e.refundableQty || 0,

src/views/supply/pickup/components/design/print-data.js

@@ -46,7 +46,7 @@ function getDetails(ids, nickName) {
                 invoiceId: e.invoiceId,
                 id: e.id,
                 createTime: e.id ? dateToDayFilter(k.createTime) : '',
-                enginOrderType: e.enginOrderType == 'HOME' || e.enginOrderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
+                enginOrderType: e.orderType == 'HOME' || e.orderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
                 materialName: e.materialName || '',
                 specification: e.specification || '',
                 refundableQty: e.refundableQty || 0,
@@ -101,7 +101,7 @@ function getDetails(ids, nickName) {
               invoiceId: e.invoiceId,
               id: e.id,
               createTime: e.id ? dateToDayFilter(item.createTime) : '',
-              enginOrderType: e.enginOrderType == 'HOME' || e.enginOrderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
+              enginOrderType: e.orderType == 'HOME' || e.orderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
               materialName: e.materialName || '',
               specification: e.specification || '',
               refundableQty: e.refundableQty || 0,