【修改】bug

src/utils/panel.js

@@ -14,7 +14,7 @@ export default {
         "field": "company",
         "fontSize": 19,
         "fontWeight": "600",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "textAlign": "center",
         "lineHeight": 26
       }, "printElementType": { "title": "", "type": "text" }
@@ -26,7 +26,7 @@ export default {
         "width": 328,
         "fontSize": 11,
         "title": "经销商编码",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "customerNumber",
         "color": "#000",
         "textAlign": "left"
@@ -40,7 +40,7 @@ export default {
         "width": 328,
         "fontSize": 11,
         "title": "打印次数",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "printNum",
         "color": "#000",
         "textAlign": "left"
@@ -53,7 +53,7 @@ export default {
         "width": 328,
         "fontSize": 11,
         "title": "打印日期",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "nowDate",
         "testData": "",
         "color": "#000",
@@ -69,7 +69,7 @@ export default {
         "width": 328,
         "fontSize": 11,
         "title": "经销商",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "customerName",
         "color": "#000",
         "textAlign": "left"
@@ -82,7 +82,7 @@ export default {
         "width": 328,
         "fontSize": 11,
         "title": "仓库",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "correspondName",
         "testData": "",
         "color": "#000",
@@ -98,7 +98,7 @@ export default {
         "width": 328,
         "fontSize": 11,
         "title": "出库单号",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "salesId",
         "color": "#000",
         "textAlign": "left"
@@ -112,7 +112,7 @@ export default {
         "width": 328,
         "fontSize": 11,
         "title": "发货单号",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "invoiceId",
         "color": "#000",
         "textAlign": "left"
@@ -126,7 +126,7 @@ export default {
         "width": 633,
         "fontSize": 11,
         "title": "备注",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "headerRemark",
         "testData": "",
         "color": "#000",
@@ -141,7 +141,7 @@ export default {
         "width": 633,
         "fontSize": 11,
         "field": "table",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "lineHeight": 16,
         "tableFooterRepeat": "",
         "columns": [[
@@ -245,7 +245,7 @@ export default {
         "width": 218,
         "fontSize": 11,
         "title": "",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "takerName",
         "testData": "",
         "color": "#000",
@@ -261,7 +261,7 @@ export default {
         "width": 218,
         "fontSize": 11,
         "title": "打单",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "createBy",
         "testData": "",
         "color": "#000",
@@ -276,7 +276,7 @@ export default {
         "width": 218,
         "fontSize": 11,
         "title": "车辆",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "pickCar",
         "testData": "",
         "color": "#000",
@@ -291,7 +291,7 @@ export default {
         "width": 218,
         "fontSize": 11,
         "title": "联系方式",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "takerPhone",
         "testData": "",
         "color": "#000",
@@ -306,7 +306,7 @@ export default {
         "width": 218,
         "fontSize": 11,
         "title": "提单",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "takerDa",
         "testData": "",
         "color": "#000",
@@ -321,7 +321,7 @@ export default {
         "width": 218,
         "fontSize": 11,
         "title": "仓库",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "correspondNames",
         "testData": "",
         "color": "#000",
@@ -336,7 +336,7 @@ export default {
         "width": 218,
         "fontSize": 16,
         "title": "",
-        "fontFamily": '黑体',
+        "fontFamily": '黑体,宋体,微软雅黑',
         "field": "pageNumber",
         "testData": "",
         "color": "#000",

src/views/finance/receipt_list.vue

@@ -126,14 +126,14 @@
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
-          <el-button
+          <!-- <el-button
             type="primary"
             size="mini"
             v-if="$checkBtnRole('print', $route.meta.roles)"
             @click="toPrint"
             :disabled="tableSelection.length < 1"
             >打印发货单
-          </el-button>
+          </el-button> -->
         </div>
         <div class="fr">
           <!-- <ExportButton :exUrl="'/k3/receipt/export'" :exParams="exParams" class="exportClass" /> -->
@@ -367,13 +367,13 @@
                   @click="seeFn(scope.row.id)"
                   >查看</el-button
                 >
-                <el-button
+                <!-- <el-button
                   type="text"
                   class="textColor"
                   v-if="$checkBtnRole('print', $route.meta.roles)"
                   @click="toPrint(scope.row, 2)"
                   >打印</el-button
-                >
+                > -->
               </template>
             </el-table-column>
           </el-table>

src/views/supply/deliver/home_list.vue

@@ -80,8 +80,13 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refRegionWork">
+                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域"></el-input>
+              </el-form-item>
+            </el-col>
 
-            <el-col :xs="24" :sm="24" :lg="12" class="tr">
+            <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -280,6 +285,7 @@ export default {
         jxsNum: '',
         status: '',
         salesMan: '',
+        refRegionWork:''
       },
       salesmanList: [],
       categoryList: [],
@@ -309,6 +315,7 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
         serviceId: this.screenForm.salesMan,
+        refRegionWork:this.screenForm.refRegionWork,
         orderType: 2, // 2家用工程 3商用工程
       }
     },
@@ -367,6 +374,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
+        refRegionWork:this.screenForm.refRegionWork,
         serviceId: this.screenForm.salesMan,
         orderType: 2, // 2家用工程 3商用工程
       };
@@ -414,7 +422,7 @@ export default {
       this.$nextTick(()=>{
         this.$refs.refDetail.initPrint()
       })
-      
+
     },
 
     backList() {