Selaa lähdekoodia

Finish Hotfix-zh-143

howie 3 vuotta sitten
vanhempi
commit
5f974e7955

+ 2 - 0
src/components/Common/print-common.vue

@@ -177,9 +177,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
   .detail-container {
     width: 100%;
     height: 100%;
+
   }
   .print-page {
     margin: 20px 0;

+ 4 - 2
src/views/supply/apply/components/engin_return_form.vue

@@ -487,8 +487,8 @@ export default {
         this.mainForm.orderDate = data.orderTime.slice(0, 10);
         this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
-        this.mainForm.loginNum = data.enginOrderNo;
-        this.mainForm.refProjectCategory = data.refProjectName;
+        this.mainForm.loginNum = data.refEnginRecordNo;
+        this.mainForm.refProjectCategory = data.refProjectCategory;
         this.mainForm.loginType = data.enginOrderType;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
@@ -571,6 +571,7 @@ export default {
         pageSize: 10,
         refEnginRecordNo: this.screenForm.loginNum,
         refProjectName: this.screenForm.refProjectCategory,
+        refProjectCategory: this.screenForm.refProjectCategory,
         specification: this.screenForm.model,
         correspondId: this.screenForm.warehouse,
         categoryName: this.screenForm.type,
@@ -788,6 +789,7 @@ export default {
             remark: this.mainForm.remark,
             enginOrderNo: this.mainForm.loginNum,
             refProjectName: this.mainForm.refProjectCategory,
+            refProjectCategory:this.mainForm.refProjectCategory,
             enginOrderType: this.mainForm.loginType,
             refFactoryNo: this.mainForm.factoryNum,
             refUseUnit: this.mainForm.company,

+ 7 - 0
src/views/supply/deliver/components/sum_print.vue

@@ -135,6 +135,13 @@ export default {
 
 @media print {
 
+    // 1 毫米 [mm] = 3,779 527 559 055 1 像素 [px]
+    //  241mm = ~911px
+    //  140mm = ~529px
+    // @page{
+    // width: 911px;
+    // height: 529px;
+    // }
     .detail-container {
     width: 100%;
     height: auto !important;

+ 2 - 2
src/views/supply/deliver/sum_list.vue

@@ -80,8 +80,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="表业务员" prop="k3ServiceId">
-                <el-select v-model="screenForm.k3ServiceId" placeholder="选择表业务员" clearable filterable style="width: 100%">
+              <el-form-item label="表业务员" prop="k3ServiceId">
+                <el-select v-model="screenForm.k3ServiceId" placeholder="选择表业务员" clearable filterable style="width: 100%">
                   <el-option
                     v-for="item in salesmanList"
                     :key="item.adminUserId"