Finish Hotfix-zh-123

src/components/Common/print-common.vue

@@ -32,10 +32,11 @@
             <el-col :span="2">发货单号</el-col>
             <el-col :span="2">发货日期</el-col>
             <el-col :span="2">订单号</el-col>
-            <el-col :span="2">工程编号</el-col>
+            <!-- <el-col :span="2">工程编号</el-col> -->
             <el-col :span="4">存货名称</el-col>
-            <el-col :span="8">规格型号</el-col>
+            <el-col :span="6">规格型号</el-col>
             <el-col :span="2">数量</el-col>
+            <el-col :span="2">备注说明</el-col>
           </el-row>
         </div>
         <div class="body">
@@ -44,11 +45,12 @@
               <el-col :span="2">{{ it.salesId }}</el-col>
               <el-col :span="2">{{ it.invoiceId }}</el-col>
               <el-col :span="2">{{ it.id ? dateToDayFilter(item.orderTime) : '' }}</el-col>
-              <el-col :span="2">{{ it.mainOrderId }}</el-col>
-              <el-col :span="2">{{ it.refEnginRecordNo }}</el-col>
+              <el-col :span="2">{{ it.orderId }}</el-col>
+              <!-- <el-col :span="2">{{ it.refEnginRecordNo }}</el-col> -->
               <el-col :span="4">{{ it.materialName }}</el-col>
-              <el-col :span="8">{{ it.specification }}</el-col>
+              <el-col :span="6">{{ it.specification }}</el-col>
               <el-col :span="2">{{ it.refundableQty }}</el-col>
+               <el-col :span="2">{{ it.pjxh1Text }}</el-col>
             </el-row>
           </div>
         </div>
@@ -147,7 +149,7 @@ export default {
       console.log(showData);
       return showData;
     },
-    
+
     nowDate() {
       var date = new Date();
       var seperator1 = "-";
@@ -307,4 +309,4 @@ export default {
     }
   }
 
-</style>
+</style>

src/components/Common/print-foshan.vue

@@ -134,7 +134,7 @@ export default {
       console.log(showData);
       return showData;
     },
-    
+
     nowDate() {
       var date = new Date();
       var seperator1 = "-";
@@ -297,4 +297,4 @@ export default {
     }
   }
 
-</style>
+</style>

src/views/basic_data/material/price_list.vue

@@ -356,7 +356,7 @@
                 v-if="!scope.row.isRevoke"
                 style="margin-right: 10px"
                 title="作废吗？"
-                @click="handleRevoke(scope.row.id)"
+                @onConfirm="handleRevoke(scope.row.id)"
               >
                 <el-button
                   slot="reference"

src/views/supply/apply/components/engin_form.vue

@@ -79,6 +79,11 @@
             <el-input v-model="mainForm.fileNo" placeholder="请输入文件编号" disabled></el-input>
           </el-form-item>
         </el-col>
+         <!-- <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="行业类别" prop="fileNo">
+            <el-input v-model="mainForm.fileNo" placeholder="请输入文件编号" disabled></el-input>
+          </el-form-item>
+        </el-col> -->
       </el-row>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
@@ -252,7 +257,7 @@
           </el-table-column>
           <el-table-column align="center" label="工程登录编号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip></el-table-column>
                   <el-table-column align="center" label="表头登录类型" prop="refPromiseStatus" min-width="200" show-overflow-tooltip></el-table-column>
-                  <el-table-column align="center" label="项目类别" prop="refProjectType" min-width="200" show-overflow-tooltip></el-table-column>
+                  <el-table-column align="center" label="项目类别" prop="refProjectCategory" min-width="200" show-overflow-tooltip></el-table-column>
                   <el-table-column align="center" label="行业类别" prop="refTradeCategory" min-width="200" show-overflow-tooltip></el-table-column>
 
         <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/deliver/components/sum_print.vue

@@ -124,12 +124,29 @@ export default {
 
 <style scoped lang="scss">
 
+@media print {
+  @page {
+
+    size: A4;
+
+}
+    .detail-container {
+    width: 100%;
+    height: auto !important;
+    margin-bottom: 50px;
+    font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
+    color: #000 !important;
+  }
+  .top-container {
+    margin: 20px;
+  }
+
+  }
+
   .detail-container {
     width: 100%;
     height: auto !important;
     margin-bottom: 50px;
-    font-family:'STKaiti','KaiTi','Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif !important;
-    font-weight: bold !important;
     color: #000 !important;
   }
   .top-container {

src/views/supply/deliver/sum_list.vue

@@ -126,6 +126,7 @@
             show-summary
             :summary-method="$getSummaries">
             <el-table-column align="center" type="selection" width="55"></el-table-column>
+
             <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="发货单号" prop="id" min-width="130" show-overflow-tooltip>
@@ -134,6 +135,12 @@
                 <span>{{scope.row.id}}</span>
               </template>
             </el-table-column>
+               <el-table-column align="left" label="订单号" prop="orderId" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.orderId" />
+                <span>{{scope.row.orderId}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />