Finish Hotfix-zh-281

src/mixin/print.js

@@ -162,6 +162,7 @@ export default {
             this.setPrintData(data);
           } catch (error) {
             this.$endLoading();
+            this.$errorMsg(error)
             console.error("获取打印数据失败");
           }
           loadingLen--;
@@ -276,6 +277,9 @@ export default {
       let salesOrderId, invoiceId; //出库单号，发货单号 默认数据中的第一个
       salesOrderId = data.invoicePickBeans[0].salesOrderId;
       invoiceId = data.invoicePickBeans[0].invoiceId;
+      let refUseUnit,refEnginRecordNo
+      refUseUnit=data.refUseUnit||''
+      refEnginRecordNo=data.refEnginRecordNo||''
       let tuiHuoRen = data.createBy
       // 数量合计
       let total = 0
@@ -321,8 +325,8 @@ export default {
           printNum: printNum + 1,
           salesId: salesOrderId,
           invoiceId: invoiceId,
-          refUseUnit:data.refUseUnit||'',
-          refEnginRecordNo:data.refEnginRecordNo||'',
+          refUseUnit:refUseUnit,
+          refEnginRecordNo:refEnginRecordNo,
           type: data.type,
           tiTui: data.type === 2 ? `退货人` : `提货人`,
           takerPhone: data.takerPhone || "",

src/utils/panel.js

@@ -11,7 +11,6 @@ export default {
             left: 0,
             top: 5,
             height: 27,
-            lineHeight: 27,
             width: 656,
             field: "company",
             fontSize: 19,
@@ -77,7 +76,7 @@ export default {
             top: 35,
             height: 13,
             lineHeight: 13,
-            width: 280,
+            width: 250,
             fontSize: 12.5,
             title: "经销商",
             fontFamily: "黑体,宋体,微软雅黑",
@@ -91,11 +90,11 @@ export default {
         ,
         {
           options: {
-            left: 250,
+            left: 300,
             top: 35,
             height: 13,
             lineHeight: 13,
-            width: 200,
+            width: 150,
             fontSize: 12.5,
             title: "出库单号",
             fontFamily: "黑体,宋体,微软雅黑",
@@ -157,7 +156,7 @@ export default {
         },
         {
           options: {
-            left: 250,
+            left: 300,
             top: 55,
             height: 13,
             lineHeight: 13,

src/views/supply/deliver/sum_list.vue

@@ -258,6 +258,13 @@
               @click="$router.push('/supply/deliver/engin_list?isShow=true')"
               >工程退货申请</el-button
             >
+             <!-- <el-button   size="mini"
+              type="primary"
+              icon="el-icon-download"
+              @click="handleFilterData"
+              >
+              导出数据
+             </el-button> -->
             <ExportButton
               :exUrl="'invoice/exportInvoice'"
               :exParams="exParams"
@@ -815,6 +822,22 @@
         <el-button type="primary" @click="submitDialogForm">确 定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+      title="导出项"
+      :visible.sync="dialogVisible"
+      width="50%"
+    >
+    <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+  <div style="margin: 15px 0;"></div>
+  <el-checkbox-group v-model="check" @change="handleCheckedCitiesChange">
+    <el-checkbox v-for="item in excelData" :label="item.value"  >{{item.name}}</el-checkbox>
+  </el-checkbox-group>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -907,6 +930,20 @@ export default {
       dialogFormRules: {
         password: [{ required: true, message: "请输入密码", trigger: "blur" }],
       },
+      dialogVisible:false,
+      excelData:[
+        {
+          value:1,
+          name:'状态'
+        },
+        {
+          value:2,
+          name:'打印时间'
+        }
+      ],
+      check:[],
+      checkAll:false,
+      isIndeterminate: false
     };
   },
   computed: {
@@ -988,6 +1025,23 @@ export default {
     this.initPrint();
   },
   methods: {
+    handleFilterData(){
+      this.dialogVisible = true
+    },
+
+    handleCheckAllChange(val) {
+      // let arr = []
+      // if (val) {
+      //   for (let i = 1; i <=this.excelData.length; i++) {
+      //     arr.push(i)
+      //   }
+      // }
+      // this.excelData = val ? arr : [];
+      this.isIndeterminate = false;
+      },
+      handleCheckedCitiesChange(){
+          console.log(this.checkAll);
+      },
     // 获取业务员列表
     getSalesmanList() {
       getSalesmanList({

src/views/supply/policy/components/retail_examine.vue

@@ -312,7 +312,7 @@
           :loading="formLoading"
           >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
         >
-        <el-button @click="goBack">关 闭</el-button>
+        <el-button @click="goBack">关闭页面</el-button>
       </div>
     </div>
   </div>

src/views/supply/retail/components/retail_examine.vue

@@ -26,7 +26,7 @@
         </el-col>
         <el-col :span="16" class="item">
           <div class="label">文件编号</div>
-          <div class="value">  
+          <div class="value">
             <el-input v-model="detailData.fileNo" placeholder="填写文件编号" clearable></el-input>
             <!-- {{ detailData.fileNo }} -->
           </div>
@@ -159,7 +159,7 @@
           :loading="formLoading"
           >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
         >
-        <el-button @click="goBack">关 闭</el-button>
+        <el-button @click="goBack">关闭页面</el-button>
       </div>
     </div>
   </div>
@@ -228,7 +228,7 @@ export default {
         examineStatus: this.mainForm.status ? "OK" : "FAIL",
         examineRemark: this.mainForm.remark,
         remark: this.detailData.remark,
-        fileNo:this.detailData.fileNo 
+        fileNo:this.detailData.fileNo
       })
         .then((res) => {
           this.$successMsg("审批成功");