Merge tag 'Hotfix-zh-131' into develop

Finish Hotfix-zh-131

src/components/Common/print-common.vue

@@ -56,8 +56,8 @@
         </div>
         <div class="foot">
           <el-row :gutter="20">
-            <el-col :span="22"></el-col>
-            <el-col :span="2">{{ item.total_num }}</el-col>
+            <el-col :span="18"></el-col>
+            <el-col :span="6">{{ item.total_num }}</el-col>
           </el-row>
         </div>
       </div>

src/views/stock/stock_list.vue

@@ -18,13 +18,13 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
+          <!-- <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品大类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择产品大类" @change="changeType" clearable>
                 <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品类别" prop="smallType">
               <el-select v-model="screenForm.smallType" placeholder="请选择产品类别" clearable>

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

@@ -114,11 +114,12 @@ export default {
             }
 
       })
-      console.log(document.execCommand,'4545');
-      // addPrint({ ids: ids.join(',') }).then(res => {
-      //   // this.$successMsg('提交成功');
-      //    this.$parent.getList()
-      // })
+
+      // console.log(document.execCommand('print'),'4545');
+      addPrint({ ids: ids.join(',') }).then(res => {
+        // this.$successMsg('提交成功');
+         this.$parent.getList()
+      })
     }
   }
 }
@@ -138,7 +139,8 @@ export default {
     width: 100%;
     height: auto !important;
     margin-bottom: 50px;
-    font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
+    font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+    // font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
     color: #000 !important;
   }
   .top-container {