fix:bug

jshERP-web/src/views/bill/dialog/BillDetail.vue

@@ -61,23 +61,23 @@
       <template v-if="billType === '零售出库'">
         <section ref="print" id="retailOutPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
                 <a-input v-decorator="['id']" hidden />
                 {{ model.organName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款类型">
                 {{ model.payType }}
               </a-form-item>
@@ -119,7 +119,7 @@
                 </a-table>
               </div>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-row class="form-row" :gutter="24">
                 <a-col :lg="24" :md="6" :sm="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据金额">
@@ -170,23 +170,23 @@
       <template v-else-if="billType === '零售退货入库'">
         <section ref="print" id="retailBackPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
                 <a-input v-decorator="['id']" hidden />
                 {{ model.organName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
                 <a @click="myHandleDetail(model.linkNumber)">{{ model.linkNumber }}</a>
               </a-form-item>
@@ -204,6 +204,7 @@
                   :loading="loading"
                   :columns="columns"
                   :dataSource="dataSource"
+                  :scroll="{ x: '100%' }"
                 >
                   <template slot="customBarCode" slot-scope="text, record">
                     <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">
@@ -226,7 +227,7 @@
                 </a-table>
               </div>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-row class="form-row" :gutter="24">
                 <a-col :lg="24" :md="6" :sm="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据金额">
@@ -269,18 +270,18 @@
       <template v-else-if="billType === '请购单'">
         <section ref="print" id="purchaseApplyPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6"> </a-col>
-            <a-col :span="6"> </a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"> </a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"> </a-col>
           </a-row>
           <div :style="tableWidth">
             <a-table
@@ -292,6 +293,7 @@
               :loading="loading"
               :columns="columns"
               :dataSource="dataSource"
+              :scroll="{ x: '100%' }"
             >
               <template slot="customBarCode" slot-scope="text, record">
                 <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
@@ -329,23 +331,23 @@
       <template v-else-if="billType === '采购订单'">
         <section ref="print" id="purchaseOrderPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
                 <a-input v-decorator="['id']" hidden />
                 {{ model.organName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6" v-if="model.linkApply">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24" v-if="model.linkApply">
               <a-form-item
                 :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="wrapperCol"
@@ -354,18 +356,19 @@
                 <a @click="myHandleDetail(model.linkApply)">{{ model.linkApply }}</a>
               </a-form-item>
             </a-col>
-            <a-col :span="6" v-if="model.linkNumber">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24" v-if="model.linkNumber">
               <a-form-item v-if="purchaseBySaleFlag" :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
                 {{ model.linkNumber }}
               </a-form-item>
             </a-col>
           </a-row>
-          <div :style="tableWidth">
+          <div style="width: 100%">
             <a-table
               ref="table"
               size="middle"
               bordered
               rowKey="id"
+              :scroll="{ x: '100%' }"
               :pagination="false"
               :loading="loading"
               :columns="columns"
@@ -402,17 +405,17 @@
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
                 {{ model.discount }}%
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款优惠">
                 {{ model.discountMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item
                 :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="wrapperCol"
@@ -421,26 +424,22 @@
                 {{ model.discountLastMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6"></a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
                 {{ model.accountName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支付订金">
                 {{ model.changeAmount }}
               </a-form-item>
             </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="二维码">
                 <!-- <vue-qr :text="model.number" :size="200" /> -->
-                <vue-qrcode :value="model.number" :options="{ width: 200, margin:2 }"></vue-qrcode>
+                <vue-qrcode :value="model.number" :options="{ width: 200, margin:1 }"></vue-qrcode>
               </a-form-item>
             </a-col>
-            <a-col :span="6"></a-col>
           </a-row>
         </section>
       </template>
@@ -448,23 +447,23 @@
       <template v-else-if="billType === '采购入库'">
         <section ref="print" id="purchaseInPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
                 <a-input v-decorator="['id']" hidden />
                 {{ model.organName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
                 <a @click="myHandleDetail(model.linkNumber)">{{ model.linkNumber }}</a>
               </a-form-item>
@@ -513,17 +512,17 @@
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
                 {{ model.discount }}%
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款优惠">
                 {{ model.discountMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item
                 :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="wrapperCol"
@@ -532,40 +531,40 @@
                 {{ model.discountLastMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
                 {{ model.otherMoney }}
               </a-form-item>
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
                 {{ model.accountName }}
               </a-form-item>
             </a-col>
-            <a-col v-if="model.deposit" :span="6">
+            <a-col v-if="model.deposit" :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="扣除订金">
                 {{ model.deposit }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款">
                 {{ model.changeAmount }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
                 {{ model.debt }}
               </a-form-item>
             </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="二维码">
                 <!-- <vue-qr :text="model.number" :size="200" /> -->
                 <vue-qrcode :value="model.number" :options="{ width: 200,margin:2 }"></vue-qrcode>
               </a-form-item>
             </a-col>
-            <a-col v-if="model.hasBackFlag" :span="6">
+            <a-col v-if="model.hasBackFlag" :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退货单号">
                 <template v-for="(item, index) in linkNumberList">
                   <a @click="myHandleDetail(item.number)">{{ item.number }}</a
@@ -575,7 +574,7 @@
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col v-if="financialBillNoList.length" :span="6">
+            <a-col v-if="financialBillNoList.length" :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款单号">
                 <template v-for="(item, index) in financialBillNoList">
                   <a @click="myHandleFinancialDetail(item.billNo)">{{ item.billNo }}</a
@@ -590,23 +589,23 @@
       <template v-else-if="billType === '采购退货出库'">
         <section ref="print" id="purchaseBackPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
                 <a-input v-decorator="['id']" hidden />
                 {{ model.organName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
                 <a @click="myHandleDetail(model.linkNumber)">{{ model.linkNumber }}</a>
               </a-form-item>
@@ -622,6 +621,7 @@
               :loading="loading"
               :columns="columns"
               :dataSource="dataSource"
+              :scroll="{ x: '100%' }"
             >
               <template slot="customBarCode" slot-scope="text, record">
                 <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
@@ -654,17 +654,17 @@
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
                 {{ model.discount }}%
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
                 {{ model.discountMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item
                 :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="wrapperCol"
@@ -673,29 +673,29 @@
                 {{ model.discountLastMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
                 {{ model.otherMoney }}
               </a-form-item>
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
                 {{ model.accountName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
                 {{ model.changeAmount }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
                 {{ model.debt }}
               </a-form-item>
             </a-col>
-            <a-col :span="6"> </a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"> </a-col>
           </a-row>
         </section>
       </template>
@@ -703,23 +703,23 @@
       <template v-else-if="billType === '销售订单'">
         <section ref="print" id="saleOrderPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
                 <a-input v-decorator="['id']" hidden />
                 {{ model.organName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
                 {{ model.salesManStr }}
               </a-form-item>
@@ -735,6 +735,7 @@
               :loading="loading"
               :columns="columns"
               :dataSource="dataSource"
+              :scroll="{ x: '100%'}"
             >
               <template slot="customBarCode" slot-scope="text, record">
                 <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
@@ -767,17 +768,17 @@
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
                 {{ model.discount }}%
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款优惠">
                 {{ model.discountMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item
                 :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="wrapperCol"
@@ -786,26 +787,26 @@
                 {{ model.discountLastMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6"></a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"></a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
                 {{ model.accountName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收取订金">
                 {{ model.changeAmount }}
               </a-form-item>
             </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="二维码">
                 <!-- <vue-qr :text="model.number" :size="200" /> -->
                 <vue-qrcode :value="model.number" :options="{ width: 200,margin:2 }"></vue-qrcode>
               </a-form-item>
             </a-col>
-            <a-col :span="6"></a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"></a-col>
           </a-row>
         </section>
       </template>
@@ -813,23 +814,23 @@
       <template v-else-if="billType === '销售出库'">
         <section ref="print" id="saleOutPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
                 <a-input v-decorator="['id']" hidden />
                 {{ model.organName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
                 <a @click="myHandleDetail(model.linkNumber)">{{ model.linkNumber }}</a>
               </a-form-item>
@@ -845,6 +846,7 @@
               :loading="loading"
               :columns="columns"
               :dataSource="dataSource"
+              :scroll="{ x: '100%' }"
             >
               <template slot="customBarCode" slot-scope="text, record">
                 <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
@@ -877,17 +879,17 @@
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
                 {{ model.discount }}%
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款优惠">
                 {{ model.discountMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item
                 :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="wrapperCol"
@@ -896,40 +898,40 @@
                 {{ model.discountLastMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
                 {{ model.otherMoney }}
               </a-form-item>
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
                 {{ model.accountName }}
               </a-form-item>
             </a-col>
-            <a-col v-if="model.deposit" :span="6">
+            <a-col v-if="model.deposit" :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="扣除订金">
                 {{ model.deposit }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款">
                 {{ model.changeAmount }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="二维码">
                 <!-- <vue-qr :text="model.number" :size="200" /> -->
                 <vue-qrcode :value="model.number" :options="{ width: 200,margin:2 }"></vue-qrcode>
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
                 {{ model.debt }}
               </a-form-item>
             </a-col>
-            <a-col v-if="model.hasBackFlag" :span="6">
+            <a-col v-if="model.hasBackFlag" :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退货单号">
                 <template v-for="(item, index) in linkNumberList">
                   <a @click="myHandleDetail(item.number)">{{ item.number }}</a
@@ -939,12 +941,12 @@
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
                 {{ model.salesManStr }}
               </a-form-item>
             </a-col>
-            <a-col v-if="financialBillNoList.length" :span="6">
+            <a-col v-if="financialBillNoList.length" :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款单号">
                 <template v-for="(item, index) in financialBillNoList">
                   <a @click="myHandleFinancialDetail(item.billNo)">{{ item.billNo }}</a
@@ -959,23 +961,23 @@
       <template v-else-if="billType === '销售退货入库'">
         <section ref="print" id="saleBackPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
                 <a-input v-decorator="['id']" hidden />
                 {{ model.organName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
                 <a @click="myHandleDetail(model.linkNumber)">{{ model.linkNumber }}</a>
               </a-form-item>
@@ -991,6 +993,7 @@
               :loading="loading"
               :columns="columns"
               :dataSource="dataSource"
+              :scroll="{ x: '100%' }"
             >
               <template slot="customBarCode" slot-scope="text, record">
                 <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
@@ -1023,17 +1026,17 @@
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
                 {{ model.discount }}%
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
                 {{ model.discountMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item
                 :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="wrapperCol"
@@ -1042,29 +1045,29 @@
                 {{ model.discountLastMoney }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
                 {{ model.otherMoney }}
               </a-form-item>
             </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
                 {{ model.accountName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
                 {{ model.changeAmount }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
                 {{ model.debt }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
                 {{ model.salesManStr }}
               </a-form-item>
@@ -1076,23 +1079,23 @@
       <template v-else-if="billType === '其它入库'">
         <section ref="print" id="otherInPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
                 <a-input v-decorator="['id']" hidden />
                 {{ model.organName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item v-if="model.billType" :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
                 {{ model.linkNumber }} {{ model.billType }}
               </a-form-item>
@@ -1111,6 +1114,7 @@
               :loading="loading"
               :columns="columns"
               :dataSource="dataSource"
+              :scroll="{ x: '100%' }"
             >
               <template slot="customBarCode" slot-scope="text, record">
                 <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
@@ -1148,23 +1152,23 @@
       <template v-else-if="billType === '其它出库'">
         <section ref="print" id="otherOutPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
                 <a-input v-decorator="['id']" hidden />
                 {{ model.organName }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item v-if="model.billType" :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
                 {{ model.linkNumber }} {{ model.billType }}
               </a-form-item>
@@ -1183,6 +1187,7 @@
               :loading="loading"
               :columns="columns"
               :dataSource="dataSource"
+              :scroll="{ x: '100%' }"
             >
               <template slot="customBarCode" slot-scope="text, record">
                 <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
@@ -1220,18 +1225,18 @@
       <template v-else-if="billType === '调拨出库'">
         <section ref="print" id="allocationOutPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6"></a-col>
-            <a-col :span="6"></a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"></a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"></a-col>
           </a-row>
           <div :style="tableWidth">
             <a-table
@@ -1281,18 +1286,18 @@
       <template v-else-if="billType === '组装单'">
         <section ref="print" id="assemblePrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6"></a-col>
-            <a-col :span="6"></a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"></a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"></a-col>
           </a-row>
           <div :style="tableWidth">
             <a-table
@@ -1304,6 +1309,7 @@
               :loading="loading"
               :columns="columns"
               :dataSource="dataSource"
+              :scroll="{ x: '100%' }"
             >
               <template slot="customBarCode" slot-scope="text, record">
                 <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
@@ -1341,18 +1347,18 @@
       <template v-else-if="billType === '拆卸单'">
         <section ref="print" id="disassemblePrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6"></a-col>
-            <a-col :span="6"></a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"></a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"></a-col>
           </a-row>
           <div :style="tableWidth">
             <a-table
@@ -1364,6 +1370,7 @@
               :loading="loading"
               :columns="columns"
               :dataSource="dataSource"
+              :scroll="{ x: '100%' }"
             >
               <template slot="customBarCode" slot-scope="text, record">
                 <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
@@ -1401,22 +1408,22 @@
       <template v-else-if="billType === '盘点复盘'">
         <section ref="print" id="stockCheckReplayPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
                 {{ model.operTimeStr }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
                 {{ model.number }}
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :xl="6" :lg="8" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
                 {{ model.linkNumber }}
               </a-form-item>
             </a-col>
-            <a-col :span="6"></a-col>
+            <a-col :xl="6" :lg="8" :md="12" :sm="24"></a-col>
           </a-row>
           <div :style="tableWidth">
             <a-table
@@ -1428,6 +1435,7 @@
               :loading="loading"
               :columns="columns"
               :dataSource="dataSource"
+              :scroll="{ x: '100%' }"
             >
               <template slot="customBarCode" slot-scope="text, record">
                 <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
@@ -1550,7 +1558,7 @@ export default {
       },
       labelCol: {
         xs: { span: 24 },
-        sm: { span: 5 },
+        sm: { span: 6 },
       },
       wrapperCol: {
         xs: { span: 24 },

jshERP-web/src/views/bill/dialog/WaitBillList.vue

@@ -239,7 +239,7 @@ export default {
       } else {
         if (this.selectedDetailRowKeys.length) {
           this.getSelectBillDetailRows()
-          this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.remark)
+          this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.remark, this.organId)
           this.close()
         } else {
           this.$message.warning('抱歉，请选择单据明细！')

jshERP-web/src/views/bill/modules/OtherInModal.vue

@@ -488,7 +488,7 @@ export default {
       this.$refs.waitBillList.show('入库', '采购,销售退货', '1,3')
       this.$refs.waitBillList.title = '请选择采购入库或销售退货'
     },
-    waitBillListOk(selectBillDetailRows, linkNumber, remark) {
+    waitBillListOk(selectBillDetailRows, linkNumber, remark, organId) {
       this.rowCanEdit = false
       this.materialTable.columns[1].type = FormTypes.normal
       this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
@@ -511,6 +511,7 @@ export default {
           this.form.setFieldsValue({
             linkNumber: linkNumber,
             remark: remark,
+            organId: organId?String(organId):'',
           })
         })
       }

jshERP-web/src/views/stock/components/checkModal.vue

@@ -363,7 +363,7 @@ export default {
           positionRange,
           creator,
           id,
-          operBy,
+          operByName:operBy,
           operTime,
           number
         } = res.data