Merge tag 'Hotfix-zh-105' into develop

Finish Hotfix-zh-105

src/views/finance/details/loan_list.vue

@@ -6,7 +6,7 @@
         <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="钱包" prop="type">
+              <el-form-item label="钱包类型" prop="type">
                 <el-select v-model="searchForm.type" class="selectStyle" placeholder="请选择" filterable clearable>
                   <el-option v-for="(v, i) in walletType" :key="i" :label="v.label" :value="v.value" />
                 </el-select>
@@ -14,12 +14,12 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="月份" prop="month">
-              <el-date-picker
-                style="width: 100%"
-                v-model="searchForm.month"
-                type="month"
-                placeholder="选择月">
-              </el-date-picker>
+                <el-date-picker
+                  v-model="searchForm.month"
+                  style="width: 100%"
+                  type="month"
+                  placeholder="选择月"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -42,17 +42,17 @@
       <div class="btn-group clearfix">
         <div class="fl">
           <el-button :disabled="dataList.length == 0" type="primary" size="mini" @click="reconciliationFn">一键对账</el-button>
-<!--          <el-button type="primary" size="mini" @click="recordFn">记录</el-button>-->
+          <!--          <el-button type="primary" size="mini" @click="recordFn">记录</el-button>-->
         </div>
-<!--        <div class="fr">-->
-<!--          <ExportButton :ex-url="'/finance/standing/book/export'" :ex-params="exParams" />-->
-<!--        </div>-->
+        <!--        <div class="fr">-->
+        <!--          <ExportButton :ex-url="'/finance/standing/book/export'" :ex-params="exParams" />-->
+        <!--        </div>-->
       </div>
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
           <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
-<!--            <el-table-column align="left" label="序号" type="index" width="80" show-overflow-tooltip />-->
+            <!--            <el-table-column align="left" label="序号" type="index" width="80" show-overflow-tooltip />-->
             <el-table-column align="left" label="月份" prop="month" min-width="100" show-overflow-tooltip />
             <el-table-column align="left" label="对账状态" prop="isReconciliation" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -76,7 +76,7 @@
             <el-table-column align="left" label="订单占款" prop="orderFee" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="支付货款" prop="payFee" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-              {{ scope.row.billNo }}
+                {{ scope.row.billNo }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="押金" prop="depositFee" min-width="160" show-overflow-tooltip />
@@ -118,30 +118,30 @@ export default {
         billNo: '',
         startTime: '',
         endTime: '',
-        type:null,
-        month:'',
-        isReconciliation:null,
+        type: null,
+        month: '',
+        isReconciliation: null
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       showReconciliation: true,
       statusList: [
         {
-          value:true,
-          label:'是'
+          value: true,
+          label: '是'
         },
         {
-          value:false,
-          label:'否'
+          value: false,
+          label: '否'
         }
       ],
       walletType: [
         {
-          value:'COMMONLY',
-          label:'普通钱包'
+          value: 'COMMONLY',
+          label: '普通钱包'
         },
         {
-          value:'REBATE',
-          label:'返利钱包'
+          value: 'REBATE',
+          label: '返利钱包'
         }
       ]
     }
@@ -160,7 +160,7 @@ export default {
     this.getDataList({
       pageSize: this.pageSize,
       pageNum: this.currentPage,
-      ...this.searchForm,
+      ...this.searchForm
     })
     this.getCustomerDataList({
       pageSize: -1,
@@ -171,11 +171,11 @@ export default {
     // 清空
     clearFn() {
       this.$refs.searchForm.resetFields()
-      this.currentPage = 1;
+      this.currentPage = 1
       this.getDataList({
         ...this.searchForm,
         pageSize: this.pageSize,
-        pageNum: this.currentPage,
+        pageNum: this.currentPage
       })
     },
     // 搜索
@@ -183,7 +183,7 @@ export default {
       this.getDataList({
         ...this.searchForm,
         pageSize: this.pageSize,
-        pageNum: this.currentPage,
+        pageNum: this.currentPage
 
       })
     },

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

@@ -118,12 +118,12 @@
       </div>
 
       <div class="table" style="margin-top: 20px">
-        <el-table 
-          :data="detailData.orders" 
-          element-loading-text="Loading" 
-          border 
-          fit 
-          highlight-current-row 
+        <el-table
+          :data="detailData.orders"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
           stripe
           show-summary
           :summary-method="$getSummaries">
@@ -159,7 +159,7 @@
           <el-table-column align="right" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column> -->
           <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
@@ -187,7 +187,7 @@
           </el-row>
         </div>
       </div>
-      
+
       <div class="page-footer">
         <div class="footer">
           <el-button  type="primary" icon="el-icon-printer" @click="toPrint" :disabled="detailData.examineStatus !== 'OK'">打 印</el-button>
@@ -336,4 +336,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

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

@@ -7,17 +7,17 @@
     </div> -->
 
     <div id="printMe">
-
-      <PrintCommon :detailData="detailData" :company="company" v-if="currentType === 0" />
-      <PrintFoshan :detailData="detailData" :company="company" v-if="currentType === 1" />
-      <PrintGuangzhou :detailData="detailData" :company="company" v-if="currentType === 2" />
-      <PrintShaoguan :detailData="detailData" :company="company" v-if="currentType === 3" />
-
+      <template v-for="(item,i) in detailArr">
+        <PrintCommon v-if="currentType === 0" :key="i" :detail-data="item" :company="company" />
+        <PrintFoshan v-if="currentType === 1" :key="i" :detail-data="item" :company="company" />
+        <PrintGuangzhou v-if="currentType === 2" :key="i" :detail-data="item" :company="company" />
+        <PrintShaoguan v-if="currentType === 3" :key="i" :detail-data="item" :company="company" />
+      </template>
     </div>
 
     <div class="page-footer">
       <div class="footer">
-        <el-button  type="primary" icon="el-icon-printer" v-print="printObj">打 印</el-button>
+        <el-button v-print="printObj" type="primary" icon="el-icon-printer">打 印</el-button>
         <el-button @click="goBack">关 闭</el-button>
       </div>
     </div>
@@ -27,27 +27,27 @@
 
 <script>
 import print from 'vue-print-nb'
-import { getDeliverDetail, getEnginDetail } from "@/api/supply/deliver";
-import { addPrint } from "@/api/supply/pickup";
-import { getCompanyList } from "@/api/user";
-import PrintCommon from "@/components/Common/print-common";
-import PrintFoshan from "@/components/Common/print-foshan";
-import PrintGuangzhou from "@/components/Common/print-guangzhou";
-import PrintShaoguan from "@/components/Common/print-shaoguan";
+import { getDeliverDetail } from '@/api/supply/deliver'
+import { addPrint } from '@/api/supply/pickup'
+import { getCompanyList } from '@/api/user'
+import PrintCommon from '@/components/Common/print-common'
+import PrintFoshan from '@/components/Common/print-foshan'
+import PrintGuangzhou from '@/components/Common/print-guangzhou'
+import PrintShaoguan from '@/components/Common/print-shaoguan'
 
 export default {
   name: 'ReturnDetail',
   componentName: 'ReturnDetail',
-  props: ['listItem'],
   components: {
     PrintFoshan,
     PrintGuangzhou,
     PrintShaoguan,
-    PrintCommon,
+    PrintCommon
   },
   directives: {
     print
   },
+  props: ['listItem'],
   data() {
     return {
       currentType: 0,
@@ -55,55 +55,60 @@ export default {
         { label: '通用', value: 0 },
         { label: '佛山', value: 1 },
         { label: '广州', value: 2 },
-        { label: '韶关', value: 3 },
+        { label: '韶关', value: 3 }
       ],
       printObj: {
         id: 'printMe',
         closeCallback: () => {
-          this.addPrint();
+          this.addPrint()
         }
       },
       detailData: {},
       company: '',
+      detailArr: []
     }
   },
 
   created() {
-    this.getDetail();
-    this.getCompanyList();
+    console.log(this.listItem,'454')
+    this.listItem.map(k => {
+      this.getDetail(k.id)
+    })
+
+    this.getCompanyList()
   },
 
   methods: {
     // 返回列表
     goBack() {
-      this.$emit('backListFormDetail');
+      this.$emit('backListFormDetail')
     },
-
     changeType() {
 
     },
 
     // 获取详情
-    getDetail() {
-      getDeliverDetail({id: this.listItem[0].id}).then(res => {
-        this.detailData = res.data;
+    getDetail(id) {
+      getDeliverDetail({ id: id }).then(res => {
+        this.detailArr.push(res.data)
+
       })
     },
 
     getCompanyList() {
       getCompanyList().then(res => {
-        this.company = res.data ? res.data[0].companyName : '';
+        this.company = res.data ? res.data[0].companyName : ''
       })
     },
 
     // 添加次数
     addPrint() {
-      let ids = this.listItem.map(item => {
-        return item.invoiceOrderId;
-      });
-      addPrint({ids: ids.join(',')}).then(res => {
+      const ids = this.listItem.map(item => {
+        return item.invoiceOrderId
+      })
+      addPrint({ ids: ids.join(',') }).then(res => {
         // this.$successMsg('提交成功');
-        this.$parent.getList();
+        this.$parent.getList()
       })
     }
   }
@@ -120,9 +125,10 @@ export default {
 
   .detail-container {
     width: 100%;
-
+    margin-bottom: 50px;
   }
   .top-container {
     margin-bottom: 20px;
   }
+
 </style>

src/views/supply/sales/sales_list.vue

@@ -105,29 +105,29 @@
                 {{scope.row.examineStatus | statusFilter}}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="开票状态" prop="billStatus" min-width="100" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{scope.row.billStatus | billStatusFilter}}
-              </template>
-            </el-table-column>
+<!--            <el-table-column align="left" label="开票状态" prop="billStatus" min-width="100" show-overflow-tooltip>-->
+<!--              <template slot-scope="scope">-->
+<!--                {{scope.row.billStatus | billStatusFilter}}-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column align="left" label="出库单号" prop="id" min-width="110" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
                 <span>{{scope.row.id}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="发货单号" prop="orderNo" min-width="130" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.orderNo" />
-                <span>{{scope.row.orderNo}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="left" label="订单号" prop="orderNo" min-width="140" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.orderType === 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId" />
-                <span>{{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HMOE' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>
-              </template>
-            </el-table-column>
+<!--            <el-table-column align="left" label="发货单号" prop="orderNo" min-width="130" show-overflow-tooltip>-->
+<!--              <template slot-scope="scope">-->
+<!--                <CopyButton :copyText="scope.row.orderNo" />-->
+<!--                <span>{{scope.row.orderNo}}</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column align="left" label="订单号" prop="orderNo" min-width="140" show-overflow-tooltip>-->
+<!--              <template slot-scope="scope">-->
+<!--                <CopyButton :copyText="scope.row.orderType === 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId" />-->
+<!--                <span>{{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HMOE' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -167,21 +167,21 @@
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{ scope.row.price | numToFixed }}
-              </template>
-            </el-table-column>
-            <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{ scope.row.payAmount | numToFixed }}
-              </template>
-            </el-table-column>
+<!--            <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>-->
+<!--              <template slot-scope="scope">-->
+<!--                {{ scope.row.price | numToFixed }}-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip>-->
+<!--              <template slot-scope="scope">-->
+<!--                {{ scope.row.payAmount | numToFixed }}-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+<!--            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>-->
+<!--            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>-->
+<!--            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>-->
+<!--            <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>-->
             <el-table-column align="center" label="操作" width="120" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>